From ee6356f4bc4038b7b94fdf7ddc1f2aca50038d04 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 7 Mar 2011 12:42:44 +0000 Subject: [PATCH 001/587] * created branch for package-management related changes From 2a7468c0b0f9ad12720a1b91466dc025769d0752 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 7 Mar 2011 13:07:41 +0000 Subject: [PATCH 002/587] * adjusted build of development-related ports to comply with package management (especially to make the packages relocatable) --- dev-lang/perl/patches/perl-5.10.1.patch | 110 +++++++++++++++++------ dev-lang/perl/perl-5.10.1.bep | 15 +++- sys-apps/sed/sed-4.2.1.bep | 12 ++- sys-devel/autoconf/autoconf-2.68.bep | 14 ++- sys-devel/automake/automake-1.11.1.bep | 14 +-- sys-devel/bison/bison-2.4.3.bep | 15 ++-- sys-devel/flex/flex-2.5.35.bep | 13 ++- sys-devel/flex/patches/flex-2.5.35.patch | 31 +++++++ sys-devel/libtool/libtool-2.4.bep | 14 ++- sys-devel/m4/m4-1.4.14.bep | 12 ++- sys-devel/m4/m4-1.4.15.bep | 12 ++- sys-devel/m4/m4-1.4.16.bep | 15 +++- sys-devel/make/make-3.81.bep | 17 ++-- sys-devel/make/make-3.82.bep | 17 ++-- sys-devel/patch/patch-2.6.1.bep | 10 ++- 15 files changed, 254 insertions(+), 67 deletions(-) create mode 100644 sys-devel/flex/patches/flex-2.5.35.patch diff --git a/dev-lang/perl/patches/perl-5.10.1.patch b/dev-lang/perl/patches/perl-5.10.1.patch index 8aaa47ae7..052f80bbb 100644 --- a/dev-lang/perl/patches/perl-5.10.1.patch +++ b/dev-lang/perl/patches/perl-5.10.1.patch @@ -1,7 +1,65 @@ -diff -up perl-5.10.1/installperl.orig perl-5.10.1/installperl ---- perl-5.10.1/installperl.orig 2009-08-13 16:40:10.023330816 -0600 -+++ perl-5.10.1/installperl 2010-04-22 19:31:00.720633856 -0600 -@@ -409,6 +409,11 @@ elsif ($Is_Cygwin) { # On Cygwin symlink +diff -ruw perl-5.10.1/ext/Errno/Errno_pm.PL perl-5.10.1-haiku/ext/Errno/Errno_pm.PL +--- perl-5.10.1/ext/Errno/Errno_pm.PL 2009-06-27 16:09:45.059768832 +0000 ++++ perl-5.10.1-haiku/ext/Errno/Errno_pm.PL 2011-03-01 18:01:57.984350720 +0000 +@@ -159,10 +159,14 @@ + # we might miss out on compiler-specific ones + $file{"$ENV{GUSI}include:sys:errno.h"} = 1; + +- } elsif ($^O eq 'beos' || $^O eq 'haiku') { ++ } elsif ($^O eq 'beos') { + # hidden in a special place + $file{'/boot/develop/headers/posix/errno.h'} = 1; + ++ } elsif ($^O eq 'haiku') { ++ # hidden in a special place ++ $file{'/boot/system/develop/headers/posix/errno.h'} = 1; ++ + } elsif ($^O eq 'vos') { + # avoid problem where cpp returns non-POSIX pathnames + $file{'/system/include_library/errno.h'} = 1; +diff -ruw perl-5.10.1/hints/haiku.sh perl-5.10.1-haiku/hints/haiku.sh +--- perl-5.10.1/hints/haiku.sh 2009-02-12 23:58:12.063176704 +0100 ++++ perl-5.10.1-haiku/hints/haiku.sh 1970-01-01 01:00:00.000000000 +0100 +@@ -1,34 +1 @@ +-# Haiku hints file +-# $Id$ +- +-prefix="/boot/common" +- +-libpth='/boot/home/config/lib /boot/common/lib /system/lib' +-usrinc='/boot/develop/headers/posix' +-locinc='/boot/home/config/include /boot/common/include /boot/develop/headers' +- +-libc='/system/lib/libroot.so' +-libs='-lnetwork' +- +-# Use Haiku's malloc() by default. +-case "$usemymalloc" in +-'') usemymalloc='n' ;; +-esac +- +-# Haiku generally supports hard links, but the default file system (BFS) +-# doesn't. So better avoid using hard links. +-d_link='undef' +-dont_use_nlink='define' +- +-# The array syserrlst[] is useless for the most part. +-# Large negative numbers really kind of suck in arrays. +-d_syserrlst='undef' +- +-# Haiku uses gcc. +-cc="gcc" +-ld='gcc' +- +-# The runtime loader library path variable is LIBRARY_PATH. +-case "$ldlibpthname" in +-'') ldlibpthname=LIBRARY_PATH ;; +-esac ++# haiku sets all its specifics via Configure +diff -ruw perl-5.10.1/installperl perl-5.10.1-haiku/installperl +--- perl-5.10.1/installperl 2009-08-13 22:40:10.066846720 +0000 ++++ perl-5.10.1-haiku/installperl 2011-02-28 17:24:45.324272128 +0000 +@@ -409,6 +409,11 @@ mkpath("$installarchlib/CORE/mpeix", $opts{verbose}, 0777); push(@corefiles,'mpeix/mpeixish.h'); } @@ -13,23 +71,10 @@ diff -up perl-5.10.1/installperl.orig perl-5.10.1/installperl # If they have built sperl.o... push(@corefiles,'sperl.o') if -f 'sperl.o'; } -diff -up perl-5.10.1/lib/File/Temp.pm.orig perl-5.10.1/lib/File/Temp.pm ---- perl-5.10.1/lib/File/Temp.pm.orig 2009-06-30 07:13:54.062914560 -0600 -+++ perl-5.10.1/lib/File/Temp.pm 2010-04-22 19:25:11.867172352 -0600 -@@ -1978,7 +1978,8 @@ sub unlink0 { - # on Win9x the link count remains 1 - # On NFS the link count may still be 1 but we cant know that - # we are on NFS -- return ( $fh[3] == 0 or $^O eq 'cygwin' ? 1 : 0); -+ # On haiku, the link count seems to be always 1 (at least for BFS) -+ return ( $fh[3] == 0 or $^O eq 'cygwin' or $^O eq 'haiku' ? 1 : 0); - - } else { - _deferred_unlink($fh, $path, 0); -diff -up perl-5.10.1/lib/File/Temp/t/lock.t.orig perl-5.10.1/lib/File/Temp/t/lock.t ---- perl-5.10.1/lib/File/Temp/t/lock.t.orig 2009-02-12 15:58:13.059506688 -0700 -+++ perl-5.10.1/lib/File/Temp/t/lock.t 2010-04-22 19:25:11.860094464 -0600 -@@ -8,7 +8,8 @@ use Fcntl; +diff -ruw perl-5.10.1/lib/File/Temp/t/lock.t perl-5.10.1-haiku/lib/File/Temp/t/lock.t +--- perl-5.10.1/lib/File/Temp/t/lock.t 2009-02-12 22:58:13.009699328 +0000 ++++ perl-5.10.1-haiku/lib/File/Temp/t/lock.t 2011-02-28 17:24:45.354418688 +0000 +@@ -8,7 +8,8 @@ BEGIN { # see if we have O_EXLOCK eval { &Fcntl::O_EXLOCK; }; @@ -39,10 +84,23 @@ diff -up perl-5.10.1/lib/File/Temp/t/lock.t.orig perl-5.10.1/lib/File/Temp/t/loc plan skip_all => 'Do not seem to have O_EXLOCK'; } else { plan tests => 4; -diff -up perl-5.10.1/t/run/exit.t.orig perl-5.10.1/t/run/exit.t ---- perl-5.10.1/t/run/exit.t.orig 2009-08-04 09:48:30.001310720 -0600 -+++ perl-5.10.1/t/run/exit.t 2010-04-22 19:25:11.870580224 -0600 -@@ -57,18 +57,18 @@ is( ${^CHILD_ERROR_NATIVE}, $native_succ +diff -ruw perl-5.10.1/lib/File/Temp.pm perl-5.10.1-haiku/lib/File/Temp.pm +--- perl-5.10.1/lib/File/Temp.pm 2009-06-30 13:13:54.013369344 +0000 ++++ perl-5.10.1-haiku/lib/File/Temp.pm 2011-02-28 17:24:45.347602944 +0000 +@@ -1978,7 +1978,8 @@ + # on Win9x the link count remains 1 + # On NFS the link count may still be 1 but we cant know that + # we are on NFS +- return ( $fh[3] == 0 or $^O eq 'cygwin' ? 1 : 0); ++ # On haiku, the link count seems to be always 1 (at least for BFS) ++ return ( $fh[3] == 0 or $^O eq 'cygwin' or $^O eq 'haiku' ? 1 : 0); + + } else { + _deferred_unlink($fh, $path, 0); +diff -ruw perl-5.10.1/t/run/exit.t perl-5.10.1-haiku/t/run/exit.t +--- perl-5.10.1/t/run/exit.t 2009-08-04 15:48:30.014155776 +0000 ++++ perl-5.10.1-haiku/t/run/exit.t 2011-02-28 17:24:45.362283008 +0000 +@@ -57,18 +57,18 @@ if (!$vms_exit_mode) { my $posix_ok = eval { require POSIX; }; my $wait_macros_ok = defined &POSIX::WIFEXITED; @@ -66,7 +124,7 @@ diff -up perl-5.10.1/t/run/exit.t.orig perl-5.10.1/t/run/exit.t } SKIP: { -@@ -87,9 +87,9 @@ if (!$vms_exit_mode) { +@@ -87,9 +87,9 @@ SKIP: { skip("No POSIX", 3) unless $posix_ok; skip("No POSIX wait macros", 3) unless $wait_macros_ok; diff --git a/dev-lang/perl/perl-5.10.1.bep b/dev-lang/perl/perl-5.10.1.bep index 29159a1ac..1506e0784 100644 --- a/dev-lang/perl/perl-5.10.1.bep +++ b/dev-lang/perl/perl-5.10.1.bep @@ -7,7 +7,20 @@ DEPEND="" CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" BUILD { cd perl-5.10.1 - ./Configure -Dcf_email=zooey@hirschkaefer.de -Uusenm -de + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/perl-5.10.1 + ./Configure -Dprefix=$prefix -Dcf_email=zooey@hirschkaefer.de \ + -Uusenm -Duseshrplib -Uusemymalloc \ + -Dlibpth="$(finddir B_USER_LIB_DIRECTORY) $(finddir B_COMMON_LIB_DIRECTORY) $(finddir B_SYSTEM_LIB_DIRECTORY)" \ + -Dusrinc="$(finddir B_SYSTEM_DEVELOP_DIRECTORY)/headers/posix" \ + -Dlocinc="$(finddir B_USER_CONFIG_DIRECTORY)/headers $(finddir B_COMMON_DEVELOP_DIRECTORY)/headers $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/headers" \ + -Dlibc="$(finddir B_SYSTEM_LIB_DIRECTORY)/libroot.so" \ + -Dlibs=-lnetwork -Dcc=gcc -Dld=gcc \ + -Ud_link -Ddont_use_nlink -Ud_syserrlst \ + -Dldlibpthname=LIBRARY_PATH -Dstartperl="#! perl" -de + + # force-remove path from sed + sed -i -e 's/LOC_SED\s*"\/boot\/common\/bin\/sed/LOC_SED "sed/' config.h + make } diff --git a/sys-apps/sed/sed-4.2.1.bep b/sys-apps/sed/sed-4.2.1.bep index 5c52e1639..97fad8c84 100644 --- a/sys-apps/sed/sed-4.2.1.bep +++ b/sys-apps/sed/sed-4.2.1.bep @@ -8,7 +8,17 @@ DEPEND="" BUILD { cd sed-4.2.1 autoconf - ./configure --prefix=/boot/system + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/sed-4.2.1 + ./configure --prefix=$prefix \ + --datarootdir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --docdir=$prefix/documentation/sed \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man \ + --enable-regex-tests --without-included-regex \ + --disable-rpath --with-gnu-ld make } diff --git a/sys-devel/autoconf/autoconf-2.68.bep b/sys-devel/autoconf/autoconf-2.68.bep index 50dd698f6..8b5155e7c 100644 --- a/sys-devel/autoconf/autoconf-2.68.bep +++ b/sys-devel/autoconf/autoconf-2.68.bep @@ -7,10 +7,16 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd autoconf-2.68 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/autoconf-2.68 + PERL="/bin/env perl" M4="/bin/env m4" SED="/bin/env sed" \ + ./configure --prefix=$prefix \ + --datarootdir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --docdir=$prefix/documentation/autoconf \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man make } diff --git a/sys-devel/automake/automake-1.11.1.bep b/sys-devel/automake/automake-1.11.1.bep index b35c604d2..0fdb399d8 100644 --- a/sys-devel/automake/automake-1.11.1.bep +++ b/sys-devel/automake/automake-1.11.1.bep @@ -7,11 +7,15 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd automake-1.11.1 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/automake-1.11.1 + PERL="/bin/env perl" ./configure --prefix=$prefix \ + --datarootdir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --docdir=$prefix/documentation/automake \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man make } diff --git a/sys-devel/bison/bison-2.4.3.bep b/sys-devel/bison/bison-2.4.3.bep index b97aa9410..5630e1a92 100644 --- a/sys-devel/bison/bison-2.4.3.bep +++ b/sys-devel/bison/bison-2.4.3.bep @@ -7,11 +7,16 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd bison-2.4.3 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --disable-nls + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/bison-2.4.3 + ./configure --prefix=$prefix \ + --datarootdir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --docdir=$prefix/documentation/bison \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man \ + --disable-rpath --with-gnu-ld make } diff --git a/sys-devel/flex/flex-2.5.35.bep b/sys-devel/flex/flex-2.5.35.bep index 145b2ccad..f3ed54faa 100644 --- a/sys-devel/flex/flex-2.5.35.bep +++ b/sys-devel/flex/flex-2.5.35.bep @@ -12,9 +12,16 @@ BUILD { aclocal -I m4 autoconf automake --add-missing --force-missing - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/flex-2.5.35 + ./configure --prefix=$prefix \ + --datarootdir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --docdir=$prefix/documentation/flex \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man \ + --disable-rpath --with-gnu-ld make } diff --git a/sys-devel/flex/patches/flex-2.5.35.patch b/sys-devel/flex/patches/flex-2.5.35.patch new file mode 100644 index 000000000..2f7258f81 --- /dev/null +++ b/sys-devel/flex/patches/flex-2.5.35.patch @@ -0,0 +1,31 @@ +diff -ruw flex-2.5.35/configure.in flex-2.5.35-haiku/configure.in +--- flex-2.5.35/configure.in 2008-02-09 16:46:28.027525120 +0100 ++++ flex-2.5.35-haiku/configure.in 2011-03-05 18:05:15.222822400 +0100 +@@ -45,12 +45,12 @@ + AC_PROG_AWK + AC_PROG_INSTALL + +-AC_PATH_PROG(BISON, bison,bison) ++AC_CHECK_PROG(BISON, bison,bison) + AC_PATH_PROG(HELP2MAN, help2man, help2man) + + # Check for a GNU m4 that supports --prefix-builtins + +-AC_PATH_PROGS(M4, gm4 gnum4 m4, m4) ++AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4) + + if test x"$M4" != x; then + AC_MSG_CHECKING([for GNU m4]) +diff -ruw flex-2.5.35/tests/test-pthread/Makefile.am flex-2.5.35-haiku/tests/test-pthread/Makefile.am +--- flex-2.5.35/tests/test-pthread/Makefile.am 2006-11-09 21:14:49.001310720 +0100 ++++ flex-2.5.35-haiku/tests/test-pthread/Makefile.am 2011-03-05 18:04:53.553648128 +0100 +@@ -27,7 +27,8 @@ + OBJS = scanner.o # parser.o + + AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) +-LDFLAGS = -lpthread ++ ++#LDFLAGS = -lpthread + #LFLAGS = --header="scanner.h" + #YFLAGS = --defines --output=parser.c + diff --git a/sys-devel/libtool/libtool-2.4.bep b/sys-devel/libtool/libtool-2.4.bep index 85330f714..8e380f285 100644 --- a/sys-devel/libtool/libtool-2.4.bep +++ b/sys-devel/libtool/libtool-2.4.bep @@ -8,10 +8,16 @@ DEPEND="" BUILD { cd libtool-2.4 ./bootstrap - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/libtool-2.4 + SED='sed' NM='nm' ./configure --prefix=$prefix \ + --datarootdir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --docdir=$prefix/documentation/libtool \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man \ + --with-gnu-ld make } diff --git a/sys-devel/m4/m4-1.4.14.bep b/sys-devel/m4/m4-1.4.14.bep index 6cd9eb5e2..c657837eb 100644 --- a/sys-devel/m4/m4-1.4.14.bep +++ b/sys-devel/m4/m4-1.4.14.bep @@ -8,7 +8,17 @@ DEPEND="" BUILD { cd m4-1.4.14 - ./configure --prefix=/boot/common --enable-changeword + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/m4-1.4.14 + ./configure --prefix=$prefix \ + --datarootdir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --docdir=$prefix/documentation/m4 \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man \ + --disable-rpath --with-gnu-ld \ + --enable-changeword make } diff --git a/sys-devel/m4/m4-1.4.15.bep b/sys-devel/m4/m4-1.4.15.bep index ed67467a5..f6230772d 100644 --- a/sys-devel/m4/m4-1.4.15.bep +++ b/sys-devel/m4/m4-1.4.15.bep @@ -15,7 +15,17 @@ BUILD { libtoolize --force --copy --install aclocal -I m4 autoreconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-changeword + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/m4-1.4.15 + ./configure --prefix=$prefix \ + --datarootdir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --docdir=$prefix/documentation/m4 \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man \ + --disable-rpath --with-gnu-ld \ + --enable-changeword make } diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index c8fdfe4c5..5f7aa8f6c 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -8,10 +8,17 @@ DEPEND="" BUILD { cd m4-1.4.16 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-changeword \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/m4-1.4.16 + ./configure --prefix=$prefix \ + --datarootdir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --docdir=$prefix/documentation/m4 \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man \ + --disable-rpath --with-gnu-ld \ + --enable-changeword make } diff --git a/sys-devel/make/make-3.81.bep b/sys-devel/make/make-3.81.bep index 5038fab80..33fafa9b7 100644 --- a/sys-devel/make/make-3.81.bep +++ b/sys-devel/make/make-3.81.bep @@ -7,12 +7,17 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd make-3.81 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --disable-nls \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - ./build.sh + libtoolize -fci + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/make-3.81 + ./configure --prefix=$prefix \ + --datadir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man \ + --disable-rpath --with-gnu-ld + make } INSTALL { diff --git a/sys-devel/make/make-3.82.bep b/sys-devel/make/make-3.82.bep index cd32f8eab..f749ec0f5 100644 --- a/sys-devel/make/make-3.82.bep +++ b/sys-devel/make/make-3.82.bep @@ -3,15 +3,22 @@ HOMEPAGE="http://www.gnu.org/software/make/" SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2" CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f" REVISION="1" -STATUS_HAIKU="stable" +STATUS_HAIKU="broken" + # make-3.82 has problems/incompatibilities when doing 'make install DESTDIR' + # on other packages (e.g. perl) DEPEND="" BUILD { cd make-3.82 libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --disable-nls \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/make-3.82 + ./configure --prefix=$prefix \ + --datadir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man \ + --disable-rpath --with-gnu-ld ./build.sh } diff --git a/sys-devel/patch/patch-2.6.1.bep b/sys-devel/patch/patch-2.6.1.bep index ac0a918f6..cdd860d86 100644 --- a/sys-devel/patch/patch-2.6.1.bep +++ b/sys-devel/patch/patch-2.6.1.bep @@ -7,7 +7,15 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd patch-2.6.1 - ./configure --prefix=/boot/common + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/patch-2.6.1 + ./configure --prefix=$prefix \ + --datarootdir=$prefix/data \ + --sbindir=$prefix/bin \ + --includedir=$prefix/develop/headers \ + --sysconfdir=$prefix/settings \ + --docdir=$prefix/documentation/patch \ + --infodir=$prefix/documentation/info \ + --mandir=$prefix/documentation/man make } From 6d42af7e564660043667d973ddf2cb5a0ddac0cd Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 7 Mar 2011 18:17:59 +0000 Subject: [PATCH 003/587] * convince bison to use m4 without path --- sys-devel/bison/bison-2.4.3.bep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/bison/bison-2.4.3.bep b/sys-devel/bison/bison-2.4.3.bep index 5630e1a92..b5c671042 100644 --- a/sys-devel/bison/bison-2.4.3.bep +++ b/sys-devel/bison/bison-2.4.3.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd bison-2.4.3 prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/bison-2.4.3 - ./configure --prefix=$prefix \ + M4="m4" ./configure --prefix=$prefix \ --datarootdir=$prefix/data \ --sbindir=$prefix/bin \ --includedir=$prefix/develop/headers \ From 76bc471ff6eb51720613da1f06451a50880d9661 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 14 Jun 2011 19:51:04 +0000 Subject: [PATCH 004/587] * work-in-progress commit of my changes for Ingo to pick up --- dev-lang/perl/perl-5.10.1.bep | 21 +++++++++++++++------ sys-devel/autoconf/autoconf-2.68.bep | 5 +++-- sys-devel/automake/automake-1.11.1.bep | 2 +- sys-devel/bison/bison-2.4.3.bep | 7 +++++-- sys-devel/flex/flex-2.5.35.bep | 2 +- sys-devel/libtool/libtool-2.4.bep | 2 +- sys-devel/m4/m4-1.4.14.bep | 2 +- sys-devel/m4/m4-1.4.15.bep | 2 +- sys-devel/m4/m4-1.4.16.bep | 2 +- sys-devel/patch/patch-2.6.1.bep | 2 +- 10 files changed, 30 insertions(+), 17 deletions(-) diff --git a/dev-lang/perl/perl-5.10.1.bep b/dev-lang/perl/perl-5.10.1.bep index 1506e0784..02cb4d7c7 100644 --- a/dev-lang/perl/perl-5.10.1.bep +++ b/dev-lang/perl/perl-5.10.1.bep @@ -6,9 +6,18 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" BUILD { - cd perl-5.10.1 - prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/perl-5.10.1 - ./Configure -Dprefix=$prefix -Dcf_email=zooey@hirschkaefer.de \ + version=5.10.1 + arch=BePC-Haiku + cd perl-$version + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/perl-$version + ./Configure \ + -Dprefix=$prefix \ + -Dprivlib=$prefix/lib/perl5/core_perl/$version \ + -Dsiteprefix=$prefix/non-packaged \ + -Dsitelib=$prefix/non-packaged/lib/perl5/site_perl/$version \ + -Dvendorprefix=$prefix \ + -Dvendorlib=$prefix/lib/perl5/vendor_perl/$version \ + -Dcf_email=zooey@hirschkaefer.de \ -Uusenm -Duseshrplib -Uusemymalloc \ -Dlibpth="$(finddir B_USER_LIB_DIRECTORY) $(finddir B_COMMON_LIB_DIRECTORY) $(finddir B_SYSTEM_LIB_DIRECTORY)" \ -Dusrinc="$(finddir B_SYSTEM_DEVELOP_DIRECTORY)/headers/posix" \ @@ -21,15 +30,15 @@ BUILD { # force-remove path from sed sed -i -e 's/LOC_SED\s*"\/boot\/common\/bin\/sed/LOC_SED "sed/' config.h - make +# make } INSTALL { cd perl-5.10.1 make install - cd "${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`" + cd "${DESTDIR}/bin" chmod a+x perl psed pstruct perlthanks - cd "${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`" + cd "${DESTDIR}/lib" ln -sf perl5/5.10.1/BePC-haiku/CORE/libperl.so . } LICENSE="GNU GPL v1 diff --git a/sys-devel/autoconf/autoconf-2.68.bep b/sys-devel/autoconf/autoconf-2.68.bep index 8b5155e7c..28e83df23 100644 --- a/sys-devel/autoconf/autoconf-2.68.bep +++ b/sys-devel/autoconf/autoconf-2.68.bep @@ -7,14 +7,15 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd autoconf-2.68 + autoreconf prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/autoconf-2.68 - PERL="/bin/env perl" M4="/bin/env m4" SED="/bin/env sed" \ + PERL="perl" M4="m4" SED="sed" \ ./configure --prefix=$prefix \ --datarootdir=$prefix/data \ --sbindir=$prefix/bin \ --includedir=$prefix/develop/headers \ --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/autoconf \ + --docdir=$prefix/documentation/packages/autoconf \ --infodir=$prefix/documentation/info \ --mandir=$prefix/documentation/man make diff --git a/sys-devel/automake/automake-1.11.1.bep b/sys-devel/automake/automake-1.11.1.bep index 0fdb399d8..1fa3fa6ea 100644 --- a/sys-devel/automake/automake-1.11.1.bep +++ b/sys-devel/automake/automake-1.11.1.bep @@ -13,7 +13,7 @@ BUILD { --sbindir=$prefix/bin \ --includedir=$prefix/develop/headers \ --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/automake \ + --docdir=$prefix/documentation/packages/automake \ --infodir=$prefix/documentation/info \ --mandir=$prefix/documentation/man make diff --git a/sys-devel/bison/bison-2.4.3.bep b/sys-devel/bison/bison-2.4.3.bep index b5c671042..721e0ed4b 100644 --- a/sys-devel/bison/bison-2.4.3.bep +++ b/sys-devel/bison/bison-2.4.3.bep @@ -8,12 +8,15 @@ DEPEND="" BUILD { cd bison-2.4.3 prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/bison-2.4.3 - M4="m4" ./configure --prefix=$prefix \ + + # bison looks for m4 in an absolute path, but uses that only within + # its own testsuite, so we let it be ... + ./configure --prefix=$prefix \ --datarootdir=$prefix/data \ --sbindir=$prefix/bin \ --includedir=$prefix/develop/headers \ --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/bison \ + --docdir=$prefix/documentation/packages/bison \ --infodir=$prefix/documentation/info \ --mandir=$prefix/documentation/man \ --disable-rpath --with-gnu-ld diff --git a/sys-devel/flex/flex-2.5.35.bep b/sys-devel/flex/flex-2.5.35.bep index f3ed54faa..93de9b59d 100644 --- a/sys-devel/flex/flex-2.5.35.bep +++ b/sys-devel/flex/flex-2.5.35.bep @@ -18,7 +18,7 @@ BUILD { --sbindir=$prefix/bin \ --includedir=$prefix/develop/headers \ --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/flex \ + --docdir=$prefix/documentation/packages/flex \ --infodir=$prefix/documentation/info \ --mandir=$prefix/documentation/man \ --disable-rpath --with-gnu-ld diff --git a/sys-devel/libtool/libtool-2.4.bep b/sys-devel/libtool/libtool-2.4.bep index 8e380f285..366411b16 100644 --- a/sys-devel/libtool/libtool-2.4.bep +++ b/sys-devel/libtool/libtool-2.4.bep @@ -14,7 +14,7 @@ BUILD { --sbindir=$prefix/bin \ --includedir=$prefix/develop/headers \ --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/libtool \ + --docdir=$prefix/documentation/packages/libtool \ --infodir=$prefix/documentation/info \ --mandir=$prefix/documentation/man \ --with-gnu-ld diff --git a/sys-devel/m4/m4-1.4.14.bep b/sys-devel/m4/m4-1.4.14.bep index c657837eb..6584ca424 100644 --- a/sys-devel/m4/m4-1.4.14.bep +++ b/sys-devel/m4/m4-1.4.14.bep @@ -14,7 +14,7 @@ BUILD { --sbindir=$prefix/bin \ --includedir=$prefix/develop/headers \ --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/m4 \ + --docdir=$prefix/documentation/packages/m4 \ --infodir=$prefix/documentation/info \ --mandir=$prefix/documentation/man \ --disable-rpath --with-gnu-ld \ diff --git a/sys-devel/m4/m4-1.4.15.bep b/sys-devel/m4/m4-1.4.15.bep index f6230772d..25fff6c84 100644 --- a/sys-devel/m4/m4-1.4.15.bep +++ b/sys-devel/m4/m4-1.4.15.bep @@ -21,7 +21,7 @@ BUILD { --sbindir=$prefix/bin \ --includedir=$prefix/develop/headers \ --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/m4 \ + --docdir=$prefix/documentation/packages/m4 \ --infodir=$prefix/documentation/info \ --mandir=$prefix/documentation/man \ --disable-rpath --with-gnu-ld \ diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index 5f7aa8f6c..d0176aadf 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -14,7 +14,7 @@ BUILD { --sbindir=$prefix/bin \ --includedir=$prefix/develop/headers \ --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/m4 \ + --docdir=$prefix/documentation/packages/m4 \ --infodir=$prefix/documentation/info \ --mandir=$prefix/documentation/man \ --disable-rpath --with-gnu-ld \ diff --git a/sys-devel/patch/patch-2.6.1.bep b/sys-devel/patch/patch-2.6.1.bep index cdd860d86..87002778c 100644 --- a/sys-devel/patch/patch-2.6.1.bep +++ b/sys-devel/patch/patch-2.6.1.bep @@ -13,7 +13,7 @@ BUILD { --sbindir=$prefix/bin \ --includedir=$prefix/develop/headers \ --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/patch \ + --docdir=$prefix/documentation/packages/patch \ --infodir=$prefix/documentation/info \ --mandir=$prefix/documentation/man make From 7a526be692077abb05c6c96d3d0a1dafd00ac253 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 10 Jul 2011 12:18:25 +0000 Subject: [PATCH 005/587] Merge dev-util/cmake from trunk. --- dev-util/cmake/Haiku.cmake | 14 - dev-util/cmake/cmake-2.6.4.bep | 2 +- dev-util/cmake/cmake-2.8.0.bep | 2 +- dev-util/cmake/cmake-2.8.1.bep | 2 +- dev-util/cmake/cmake-2.8.2.bep | 2 +- dev-util/cmake/cmake-2.8.3.bep | 2 +- dev-util/cmake/cmake-2.8.4.bep | 8 +- dev-util/cmake/cmake-2.8.5.bep | 28 ++ dev-util/cmake/patches/cmake-2.8.4.patch | 116 +++++ dev-util/cmake/patches/cmake-2.8.5.patch | 525 +++++++++++++++++++++++ 10 files changed, 678 insertions(+), 23 deletions(-) delete mode 100644 dev-util/cmake/Haiku.cmake create mode 100644 dev-util/cmake/cmake-2.8.5.bep create mode 100644 dev-util/cmake/patches/cmake-2.8.4.patch create mode 100644 dev-util/cmake/patches/cmake-2.8.5.patch diff --git a/dev-util/cmake/Haiku.cmake b/dev-util/cmake/Haiku.cmake deleted file mode 100644 index b3c2ea330..000000000 --- a/dev-util/cmake/Haiku.cmake +++ /dev/null @@ -1,14 +0,0 @@ -SET(BEOS 1) - -# GCC is the default compiler on Haiku. -INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake) - -SET(CMAKE_DL_LIBS root be) -SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") -SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") -SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") -SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,") - -INCLUDE(Platform/UnixPaths) diff --git a/dev-util/cmake/cmake-2.6.4.bep b/dev-util/cmake/cmake-2.6.4.bep index 1a6d64807..58ad39107 100644 --- a/dev-util/cmake/cmake-2.6.4.bep +++ b/dev-util/cmake/cmake-2.6.4.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd cmake-2.6.4 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-util/cmake/cmake-2.8.0.bep b/dev-util/cmake/cmake-2.8.0.bep index a2a4ae1d2..f35325ced 100644 --- a/dev-util/cmake/cmake-2.8.0.bep +++ b/dev-util/cmake/cmake-2.8.0.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd cmake-2.8.0 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-util/cmake/cmake-2.8.1.bep b/dev-util/cmake/cmake-2.8.1.bep index 7e2235272..461a14f7b 100644 --- a/dev-util/cmake/cmake-2.8.1.bep +++ b/dev-util/cmake/cmake-2.8.1.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd cmake-2.8.1 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-util/cmake/cmake-2.8.2.bep b/dev-util/cmake/cmake-2.8.2.bep index 691b688e0..4d8645f05 100644 --- a/dev-util/cmake/cmake-2.8.2.bep +++ b/dev-util/cmake/cmake-2.8.2.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd cmake-2.8.2 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-util/cmake/cmake-2.8.3.bep b/dev-util/cmake/cmake-2.8.3.bep index 42248f1db..aa753fa5a 100644 --- a/dev-util/cmake/cmake-2.8.3.bep +++ b/dev-util/cmake/cmake-2.8.3.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd cmake-2.8.3 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-util/cmake/cmake-2.8.4.bep b/dev-util/cmake/cmake-2.8.4.bep index febe96ca3..7725b1668 100644 --- a/dev-util/cmake/cmake-2.8.4.bep +++ b/dev-util/cmake/cmake-2.8.4.bep @@ -11,11 +11,11 @@ BUILD { # so using ../../ to back that part out but for some reason # the doc was also picking up /boot, so had to back it out 3 times # this seems to work but might still need some further adjusting - +# sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=../../`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --datadir=../../`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=../../../`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc + --datadir=/data/cmake \ + --docdir=/documentation/doc/CMake \ + --mandir=/documentation/man make } diff --git a/dev-util/cmake/cmake-2.8.5.bep b/dev-util/cmake/cmake-2.8.5.bep new file mode 100644 index 000000000..b08109c16 --- /dev/null +++ b/dev-util/cmake/cmake-2.8.5.bep @@ -0,0 +1,28 @@ +DESCRIPTION="cmake - Cross platform Make" +HOMEPAGE="http://www.cmake.org" +SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz" +CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd cmake-2.8.5 + # cmake appends the prefix to mandir and datadir + # so using ../../ to back that part out but for some reason + # the doc was also picking up /boot, so had to back it out 3 times + # this seems to work but might still need some further adjusting +# sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=/data/cmake \ + --docdir=/documentation/doc/CMake \ + --mandir=/documentation/man + make +} + +INSTALL { + cd cmake-2.8.5 + make install +} + +LICENSE="CMake" +COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/patches/cmake-2.8.4.patch b/dev-util/cmake/patches/cmake-2.8.4.patch new file mode 100644 index 000000000..910b48e92 --- /dev/null +++ b/dev-util/cmake/patches/cmake-2.8.4.patch @@ -0,0 +1,116 @@ +diff -urN cmake-2.8.4/Modules/FindGLUT.cmake cmake-2.8.4-haiku/Modules/FindGLUT.cmake +--- cmake-2.8.4/Modules/FindGLUT.cmake 2011-02-15 17:47:27.017301504 +0000 ++++ cmake-2.8.4-haiku/Modules/FindGLUT.cmake 2011-04-26 07:50:24.890241024 +0000 +@@ -46,12 +46,14 @@ + /usr/openwin/include + /opt/graphics/OpenGL/include + /opt/graphics/OpenGL/contrib/libglut ++ /boot/develop/headers/os/opengl + ) + + FIND_LIBRARY( GLUT_glut_LIBRARY glut + /usr/openwin/lib ++ /boot/develop/lib/x86/ + ) +- ++ IF(NOT BEOS) + FIND_LIBRARY( GLUT_Xi_LIBRARY Xi + /usr/openwin/lib + ) +@@ -59,7 +61,7 @@ + FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu + /usr/openwin/lib + ) +- ++ ENDIF(NOT BEOS) + ENDIF (APPLE) + + ENDIF (WIN32) +@@ -69,12 +71,18 @@ + IF(GLUT_glut_LIBRARY) + # Is -lXi and -lXmu required on all platforms that have it? + # If not, we need some way to figure out what platform we are on. ++ IF(BEOS) ++ SET( GLUT_LIBRARIES ++ ${GLUT_glut_LIBRARY} ++ ) ++ ELSE(BEOS) + SET( GLUT_LIBRARIES + ${GLUT_glut_LIBRARY} + ${GLUT_Xmu_LIBRARY} + ${GLUT_Xi_LIBRARY} + ${GLUT_cocoa_LIBRARY} + ) ++ ENDIF(BEOS) + SET( GLUT_FOUND "YES" ) + + #The following deprecated settings are for backwards compatibility with CMake1.4 +@@ -84,9 +92,16 @@ + ENDIF(GLUT_glut_LIBRARY) + ENDIF(GLUT_INCLUDE_DIR) + ++IF(BEOS) ++MARK_AS_ADVANCED( ++ GLUT_INCLUDE_DIR ++ GLUT_glut_LIBRARY ++ ) ++ELSE(BEOS) + MARK_AS_ADVANCED( + GLUT_INCLUDE_DIR + GLUT_glut_LIBRARY + GLUT_Xmu_LIBRARY + GLUT_Xi_LIBRARY + ) ++ENDIF(BEOS) +diff -urN cmake-2.8.4/Modules/FindLua51.cmake cmake-2.8.4-haiku/Modules/FindLua51.cmake +--- cmake-2.8.4/Modules/FindLua51.cmake 2011-02-15 17:47:27.019660800 +0000 ++++ cmake-2.8.4-haiku/Modules/FindLua51.cmake 2011-04-26 07:50:24.944504832 +0000 +@@ -57,13 +57,13 @@ + + IF(LUA_LIBRARY) + # include the math library for Unix +- IF(UNIX AND NOT APPLE) ++ IF(UNIX AND NOT APPLE AND NOT BEOS) + FIND_LIBRARY(LUA_MATH_LIBRARY m) + SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") + # For Windows and Mac, don't need to explicitly include the math library + ELSE(UNIX AND NOT APPLE) + SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries") +- ENDIF(UNIX AND NOT APPLE) ++ ENDIF(UNIX AND NOT APPLE AND NOT BEOS) + ENDIF(LUA_LIBRARY) + + INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +diff -urN cmake-2.8.4/Modules/FindOpenGL.cmake cmake-2.8.4-haiku/Modules/FindOpenGL.cmake +--- cmake-2.8.4/Modules/FindOpenGL.cmake 2011-02-15 17:47:27.020447232 +0000 ++++ cmake-2.8.4-haiku/Modules/FindOpenGL.cmake 2011-04-26 07:50:25.026214400 +0000 +@@ -80,6 +80,7 @@ + /usr/share/doc/NVIDIA_GLX-1.0/include + /usr/openwin/share/include + /opt/graphics/OpenGL/include /usr/X11R6/include ++ /boot/develop/headers/os/opengl + ) + + FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h +@@ -94,6 +95,7 @@ + /usr/openwin/lib + /usr/shlib /usr/X11R6/lib + ${HPUX_IA_OPENGL_LIB_PATH} ++ /boot/develop/lib/x86/ + ) + + # On Unix OpenGL most certainly always requires X11. +diff -urN cmake-2.8.4/bootstrap cmake-2.8.4-haiku/bootstrap +--- cmake-2.8.4/bootstrap 2011-02-15 17:47:26.054001664 +0000 ++++ cmake-2.8.4-haiku/bootstrap 2011-04-26 07:50:25.222035968 +0000 +@@ -142,7 +142,9 @@ + cmake_default_prefix="c:/Program Files/CMake" + fi + elif ${cmake_system_haiku}; then +- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` ++ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` ++ cmake_man_dir="/documentation/man" ++ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" + else + cmake_default_prefix="/usr/local" + fi diff --git a/dev-util/cmake/patches/cmake-2.8.5.patch b/dev-util/cmake/patches/cmake-2.8.5.patch new file mode 100644 index 000000000..fd25ce927 --- /dev/null +++ b/dev-util/cmake/patches/cmake-2.8.5.patch @@ -0,0 +1,525 @@ +diff -ur cmake-2.8.5_orig/bootstrap cmake-2.8.5/bootstrap +--- cmake-2.8.5_orig/bootstrap 2011-07-08 12:21:43.031981568 +0000 ++++ cmake-2.8.5/bootstrap 2011-07-09 17:59:50.059768832 +0000 +@@ -142,7 +142,9 @@ + cmake_default_prefix="c:/Program Files/CMake" + fi + elif ${cmake_system_haiku}; then +- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` ++ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` ++ cmake_man_dir="/documentation/man" ++ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" + else + cmake_default_prefix="/usr/local" + fi +diff -ur cmake-2.8.5_orig/Modules/CheckForPthreads.c cmake-2.8.5/Modules/CheckForPthreads.c +--- cmake-2.8.5_orig/Modules/CheckForPthreads.c 2011-07-08 12:21:44.040632320 +0000 ++++ cmake-2.8.5/Modules/CheckForPthreads.c 2011-07-09 17:59:50.060817408 +0000 +@@ -16,7 +16,7 @@ + pthread_create(&tid[0], 0, runner, (void*)1); + pthread_create(&tid[1], 0, runner, (void*)2); + +-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no usleep on BeOS 5.) ++#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) + usleep(1); // for strange behavior on single-processor sun + #endif + +diff -ur cmake-2.8.5_orig/Modules/CMakeFortranCompilerId.F.in cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in +--- cmake-2.8.5_orig/Modules/CMakeFortranCompilerId.F.in 2011-07-08 12:21:44.047448064 +0000 ++++ cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in 2011-07-09 17:59:50.062128128 +0000 +@@ -74,12 +74,8 @@ + PRINT *, 'INFO:platform[IRIX]' + #elif defined(__hpux) || defined(__hpux__) + PRINT *, 'INFO:platform[HP-UX]' +-#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) ++#elif defined(__HAIKU__) + PRINT *, 'INFO:platform[Haiku]' +-# if 0 +-! Haiku also defines __BEOS__ so we must +-! put it prior to the check for __BEOS__ +-# endif + #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) + PRINT *, 'INFO:platform[BeOS]' + #elif defined(__QNX__) || defined(__QNXNTO__) +diff -ur cmake-2.8.5_orig/Modules/CMakePlatformId.h.in cmake-2.8.5/Modules/CMakePlatformId.h.in +--- cmake-2.8.5_orig/Modules/CMakePlatformId.h.in 2011-07-08 12:21:44.048758784 +0000 ++++ cmake-2.8.5/Modules/CMakePlatformId.h.in 2011-07-09 17:59:50.063176704 +0000 +@@ -35,11 +35,8 @@ + #elif defined(__hpux) || defined(__hpux__) + # define PLATFORM_ID "HP-UX" + +-#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) ++#elif defined(__HAIKU__) + # define PLATFORM_ID "Haiku" +-/* Haiku also defines __BEOS__ so we must +- put it prior to the check for __BEOS__ +-*/ + + #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) + # define PLATFORM_ID "BeOS" +diff -ur cmake-2.8.5_orig/Modules/FindGLUT.cmake cmake-2.8.5/Modules/FindGLUT.cmake +--- cmake-2.8.5_orig/Modules/FindGLUT.cmake 2011-07-08 12:21:44.063438848 +0000 ++++ cmake-2.8.5/Modules/FindGLUT.cmake 2011-07-09 18:02:18.662437888 +0000 +@@ -46,20 +46,22 @@ + /usr/openwin/include + /opt/graphics/OpenGL/include + /opt/graphics/OpenGL/contrib/libglut ++ /boot/develop/headers/os/opengl + ) + + FIND_LIBRARY( GLUT_glut_LIBRARY glut + /usr/openwin/lib ++ /boot/develop/lib/x86/ + ) +- +- FIND_LIBRARY( GLUT_Xi_LIBRARY Xi +- /usr/openwin/lib +- ) +- +- FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu +- /usr/openwin/lib +- ) +- ++ IF(NOT BEOS AND NOT HAIKU) ++ FIND_LIBRARY( GLUT_Xi_LIBRARY Xi ++ /usr/openwin/lib ++ ) ++ ++ FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu ++ /usr/openwin/lib ++ ) ++ ENDIF(NOT BEOS AND NOT HAIKU) + ENDIF (APPLE) + + ENDIF (WIN32) +@@ -69,12 +71,18 @@ + IF(GLUT_glut_LIBRARY) + # Is -lXi and -lXmu required on all platforms that have it? + # If not, we need some way to figure out what platform we are on. +- SET( GLUT_LIBRARIES +- ${GLUT_glut_LIBRARY} +- ${GLUT_Xmu_LIBRARY} +- ${GLUT_Xi_LIBRARY} +- ${GLUT_cocoa_LIBRARY} +- ) ++ IF(BEOS OR HAIKU) ++ SET( GLUT_LIBRARIES ++ ${GLUT_glut_LIBRARY} ++ ) ++ ELSE(BEOS OR HAIKU) ++ SET( GLUT_LIBRARIES ++ ${GLUT_glut_LIBRARY} ++ ${GLUT_Xmu_LIBRARY} ++ ${GLUT_Xi_LIBRARY} ++ ${GLUT_cocoa_LIBRARY} ++ ) ++ ENDIF(BEOS OR HAIKU) + SET( GLUT_FOUND "YES" ) + + #The following deprecated settings are for backwards compatibility with CMake1.4 +@@ -84,9 +92,16 @@ + ENDIF(GLUT_glut_LIBRARY) + ENDIF(GLUT_INCLUDE_DIR) + +-MARK_AS_ADVANCED( +- GLUT_INCLUDE_DIR +- GLUT_glut_LIBRARY +- GLUT_Xmu_LIBRARY +- GLUT_Xi_LIBRARY +- ) ++IF(BEOS OR HAIKU) ++ MARK_AS_ADVANCED( ++ GLUT_INCLUDE_DIR ++ GLUT_glut_LIBRARY ++ ) ++ELSE(BEOS OR HAIKU) ++ MARK_AS_ADVANCED( ++ GLUT_INCLUDE_DIR ++ GLUT_glut_LIBRARY ++ GLUT_Xmu_LIBRARY ++ GLUT_Xi_LIBRARY ++ ) ++ENDIF(BEOS OR HAIKU) +diff -ur cmake-2.8.5_orig/Modules/FindLua51.cmake cmake-2.8.5/Modules/FindLua51.cmake +--- cmake-2.8.5_orig/Modules/FindLua51.cmake 2011-07-08 12:21:44.066060288 +0000 ++++ cmake-2.8.5/Modules/FindLua51.cmake 2011-07-09 17:59:50.090439680 +0000 +@@ -57,13 +57,13 @@ + + IF(LUA_LIBRARY) + # include the math library for Unix +- IF(UNIX AND NOT APPLE) ++ IF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) + FIND_LIBRARY(LUA_MATH_LIBRARY m) + SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") + # For Windows and Mac, don't need to explicitly include the math library + ELSE(UNIX AND NOT APPLE) + SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries") +- ENDIF(UNIX AND NOT APPLE) ++ ENDIF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) + ENDIF(LUA_LIBRARY) + + INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +diff -ur cmake-2.8.5_orig/Modules/FindOpenGL.cmake cmake-2.8.5/Modules/FindOpenGL.cmake +--- cmake-2.8.5_orig/Modules/FindOpenGL.cmake 2011-07-08 12:21:44.066846720 +0000 ++++ cmake-2.8.5/Modules/FindOpenGL.cmake 2011-07-09 17:59:50.091488256 +0000 +@@ -80,6 +80,7 @@ + /usr/share/doc/NVIDIA_GLX-1.0/include + /usr/openwin/share/include + /opt/graphics/OpenGL/include /usr/X11R6/include ++ /boot/develop/headers/os/opengl + ) + + FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h +@@ -94,6 +95,7 @@ + /usr/openwin/lib + /usr/shlib /usr/X11R6/lib + ${HPUX_IA_OPENGL_LIB_PATH} ++ /boot/develop/lib/x86/ + ) + + # On Unix OpenGL most certainly always requires X11. +diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platform/Haiku.cmake +--- cmake-2.8.5_orig/Modules/Platform/Haiku.cmake 2011-07-08 12:21:44.016777216 +0000 ++++ cmake-2.8.5/Modules/Platform/Haiku.cmake 2011-07-09 17:59:50.092798976 +0000 +@@ -1,18 +1,29 @@ +-SET(BEOS 1) ++SET(HAIKU 1) ++SET(UNIX 1) + +-SET(CMAKE_DL_LIBS root be) ++SET(CMAKE_DL_LIBS "") + SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") +-SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") ++SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") + SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") + SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") ++SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") + SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") ++ SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") + +-INCLUDE(Platform/UnixPaths) +-LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) +-LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) +-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) +-LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) +-LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) ++LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH ++ /boot/home/config/non-packaged ++ /boot/home/config ++ /boot/common/non-packaged ++ /boot/common ++ /boot/system ++ ) ++LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ++ /boot/home/config/non-packaged/lib ++ /boot/home/config/lib ++ /boot/common/non-packaged/lib ++ /boot/common/lib ++ /boot/develop/lib/x86 ++ ) + LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) + LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) + +diff -ur cmake-2.8.5_orig/Source/cmCTest.cxx cmake-2.8.5/Source/cmCTest.cxx +--- cmake-2.8.5_orig/Source/cmCTest.cxx 2011-07-08 12:21:45.037486592 +0000 ++++ cmake-2.8.5/Source/cmCTest.cxx 2011-07-09 17:59:50.095682560 +0000 +@@ -53,7 +53,7 @@ + #include + #include + +-#if defined(__BEOS__) && !defined(__HAIKU__) ++#if defined(__BEOS__) + #include /* disable_debugger() API. */ + #endif + +diff -ur cmake-2.8.5_orig/Source/cmExportCommand.cxx cmake-2.8.5/Source/cmExportCommand.cxx +--- cmake-2.8.5_orig/Source/cmExportCommand.cxx 2011-07-08 12:21:45.046923776 +0000 ++++ cmake-2.8.5/Source/cmExportCommand.cxx 2011-07-09 18:36:22.770179072 +0000 +@@ -20,7 +20,8 @@ + #include "cmExportBuildFileGenerator.h" + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + cmExportCommand::cmExportCommand() +@@ -297,14 +298,15 @@ + const char* hash) + { + #if defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) != ++ B_OK) + { + return; + } +- dir.Append("cmake/packages"); +- dir.Append(package.c_str()); +- std::string fname = dir.Path(); ++ std::string fname = dir; ++ fname += "/cmake/packages/"; ++ fname += package; + #else + const char* home = cmSystemTools::GetEnv("HOME"); + if(!home) +diff -ur cmake-2.8.5_orig/Source/cmFindPackageCommand.cxx cmake-2.8.5/Source/cmFindPackageCommand.cxx +--- cmake-2.8.5_orig/Source/cmFindPackageCommand.cxx 2011-07-08 12:21:46.051118080 +0000 ++++ cmake-2.8.5/Source/cmFindPackageCommand.cxx 2011-07-09 18:26:27.005242880 +0000 +@@ -19,7 +19,9 @@ + #endif + + #if defined(__HAIKU__) +-#include ++#include ++#include ++#include + #endif + + void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, +@@ -1292,12 +1294,13 @@ + #if defined(_WIN32) && !defined(__CYGWIN__) + this->LoadPackageRegistryWinUser(); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == ++ B_OK) + { +- dir.Append("cmake/packages"); +- dir.Append(this->Name.c_str()); +- this->LoadPackageRegistryDir(dir.Path()); ++ strlcat(dir, "/cmake/packages/", sizeof(dir)); ++ strlcat(dir, this->Name.c_str(), sizeof(dir)); ++ this->LoadPackageRegistryDir(dir); + } + #else + if(const char* home = cmSystemTools::GetEnv("HOME")) +diff -ur cmake-2.8.5_orig/Source/cmLocalGenerator.cxx cmake-2.8.5/Source/cmLocalGenerator.cxx +--- cmake-2.8.5_orig/Source/cmLocalGenerator.cxx 2011-07-08 12:21:46.065273856 +0000 ++++ cmake-2.8.5/Source/cmLocalGenerator.cxx 2011-07-09 18:30:30.565182464 +0000 +@@ -37,7 +37,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + cmLocalGenerator::cmLocalGenerator() +@@ -354,12 +355,12 @@ + prefix = prefix_win32.c_str(); + } + #elif defined(__HAIKU__) ++ char dir[B_PATH_NAME_LENGTH]; + if (!prefix) + { +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- prefix = dir.Path(); ++ prefix = dir; + } + else + { +diff -ur cmake-2.8.5_orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx +--- cmake-2.8.5_orig/Source/CPack/cmCPackGenerator.cxx 2011-07-08 12:21:47.017563648 +0000 ++++ cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx 2011-07-09 18:33:59.244842496 +0000 +@@ -27,7 +27,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + //---------------------------------------------------------------------- +@@ -1206,10 +1207,10 @@ + this->InstallPath += "-"; + this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- this->InstallPath = dir.Path(); ++ this->InstallPath = dir; + } + else + { +diff -ur cmake-2.8.5_orig/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx +--- cmake-2.8.5_orig/Source/CPack/cmCPackGeneratorFactory.cxx 2011-07-08 12:21:47.017825792 +0000 ++++ cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx 2011-07-09 17:59:50.096731136 +0000 +@@ -32,7 +32,7 @@ + #endif + + #if !defined(_WIN32) && !defined(__APPLE__) \ +- && !defined(__QNXNTO__) && !defined(__BEOS__) ++ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) + # include "cmCPackDebGenerator.h" + # include "cmCPackRPMGenerator.h" + #endif +@@ -73,7 +73,7 @@ + cmCPackOSXX11Generator::CreateGenerator); + #endif + #if !defined(_WIN32) && !defined(__APPLE__) \ +- && !defined(__QNXNTO__) && !defined(__BEOS__) ++ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) + this->RegisterGenerator("DEB", "Debian packages", + cmCPackDebGenerator::CreateGenerator); + this->RegisterGenerator("RPM", "RPM packages", +diff -ur cmake-2.8.5_orig/Source/kwsys/ProcessUNIX.c cmake-2.8.5/Source/kwsys/ProcessUNIX.c +--- cmake-2.8.5_orig/Source/kwsys/ProcessUNIX.c 2011-07-08 12:21:48.042729472 +0000 ++++ cmake-2.8.5/Source/kwsys/ProcessUNIX.c 2011-07-09 17:59:50.100401152 +0000 +@@ -63,10 +63,6 @@ + #include /* DIR, dirent */ + #include /* isspace */ + +-#ifdef __HAIKU__ +-#undef __BEOS__ +-#endif +- + #if defined(__VMS) + # define KWSYSPE_VMS_NONBLOCK , O_NONBLOCK + #else +diff -ur cmake-2.8.5_orig/Source/kwsys/SystemTools.cxx cmake-2.8.5/Source/kwsys/SystemTools.cxx +--- cmake-2.8.5_orig/Source/kwsys/SystemTools.cxx 2011-07-08 12:21:48.044826624 +0000 ++++ cmake-2.8.5/Source/kwsys/SystemTools.cxx 2011-07-09 17:59:50.103284736 +0000 +@@ -150,7 +150,7 @@ + #include + #endif + +-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) ++#if defined(__BEOS__) && !defined(__ZETA__) + #include + #include + +diff -ur cmake-2.8.5_orig/Source/kwsys/testDynamicLoader.cxx cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx +--- cmake-2.8.5_orig/Source/kwsys/testDynamicLoader.cxx 2011-07-08 12:21:49.045613056 +0000 ++++ cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx 2011-07-09 17:59:50.105119744 +0000 +@@ -15,7 +15,7 @@ + #include KWSYS_HEADER(ios/iostream) + #include KWSYS_HEADER(stl/string) + +-#if defined(__BEOS__) && !defined(__HAIKU__) ++#if defined(__BEOS__) + #include /* disable_debugger() API. */ + #endif + +diff -ur cmake-2.8.5_orig/Source/kwsys/testProcess.c cmake-2.8.5/Source/kwsys/testProcess.c +--- cmake-2.8.5_orig/Source/kwsys/testProcess.c 2011-07-08 12:21:49.046399488 +0000 ++++ cmake-2.8.5/Source/kwsys/testProcess.c 2011-07-09 17:59:50.108265472 +0000 +@@ -32,7 +32,7 @@ + # pragma warn -8060 /* possibly incorrect assignment */ + #endif + +-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) ++#if defined(__BEOS__) && !defined(__ZETA__) + /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ + # include + static inline void testProcess_usleep(unsigned int msec) +diff -ur cmake-2.8.5_orig/Tests/Complex/Library/CMakeLists.txt cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt +--- cmake-2.8.5_orig/Tests/Complex/Library/CMakeLists.txt 2011-07-08 12:21:50.003670016 +0000 ++++ cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt 2011-07-09 17:59:50.114294784 +0000 +@@ -52,9 +52,9 @@ + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-IF(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++IF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") +-ENDIF(NOT BEOS AND NOT WIN32) ++ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) + GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) + IF(${FOO_BAR_VAR} MATCHES "BAR") + ELSE(${FOO_BAR_VAR} MATCHES "BAR") +diff -ur cmake-2.8.5_orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt +--- cmake-2.8.5_orig/Tests/ComplexOneConfig/Library/CMakeLists.txt 2011-07-08 12:21:50.007864320 +0000 ++++ cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt 2011-07-09 17:59:50.116654080 +0000 +@@ -52,9 +52,9 @@ + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-IF(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++IF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") +-ENDIF(NOT BEOS AND NOT WIN32) ++ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) + GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) + IF(${FOO_BAR_VAR} MATCHES "BAR") + ELSE(${FOO_BAR_VAR} MATCHES "BAR") +diff -ur cmake-2.8.5_orig/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt +--- cmake-2.8.5_orig/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2011-07-08 12:21:50.012320768 +0000 ++++ cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2011-07-09 17:59:50.119013376 +0000 +@@ -52,9 +52,9 @@ + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-IF(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++IF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") +-ENDIF(NOT BEOS AND NOT WIN32) ++ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) + GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) + IF(${FOO_BAR_VAR} MATCHES "BAR") + ELSE(${FOO_BAR_VAR} MATCHES "BAR") +diff -ur cmake-2.8.5_orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c +--- cmake-2.8.5_orig/Utilities/cmcurl/CMake/CurlTests.c 2011-07-08 12:21:54.052953088 +0000 ++++ cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c 2011-07-09 17:59:50.122421248 +0000 +@@ -38,7 +38,7 @@ + # define PLATFORM_AIX_V3 + #endif + +-#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) ++#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) + #error "O_NONBLOCK does not work on this platform" + #endif + int socket; +diff -ur cmake-2.8.5_orig/Utilities/cmcurl/select.c cmake-2.8.5/Utilities/cmcurl/select.c +--- cmake-2.8.5_orig/Utilities/cmcurl/select.c 2011-07-08 12:21:55.063176704 +0000 ++++ cmake-2.8.5/Utilities/cmcurl/select.c 2011-07-09 17:59:50.125829120 +0000 +@@ -39,7 +39,7 @@ + #error "We can't compile without select() support!" + #endif + +-#if defined(__BEOS__) && !defined(__HAIKU__) ++#if defined(__BEOS__) + /* BeOS has FD_SET defined in socket.h */ + #include + #endif +diff -ur cmake-2.8.5_orig/Utilities/cmzlib/zconf.h cmake-2.8.5/Utilities/cmzlib/zconf.h +--- cmake-2.8.5_orig/Utilities/cmzlib/zconf.h 2011-07-08 12:21:58.054001664 +0000 ++++ cmake-2.8.5/Utilities/cmzlib/zconf.h 2011-07-09 17:59:50.128712704 +0000 +@@ -237,7 +237,7 @@ + # endif + #endif + +-#if defined (__BEOS__) && !defined (__HAIKU__) ++#if defined (__BEOS__) + # ifdef ZLIB_DLL + # ifdef ZLIB_INTERNAL + # define ZEXPORT __declspec(dllexport) +diff -ur cmake-2.8.5_orig/Utilities/cmzlib/zutil.h cmake-2.8.5/Utilities/cmzlib/zutil.h +--- cmake-2.8.5_orig/Utilities/cmzlib/zutil.h 2011-07-08 12:21:58.054525952 +0000 ++++ cmake-2.8.5/Utilities/cmzlib/zutil.h 2011-07-09 17:59:50.129761280 +0000 +@@ -147,12 +147,6 @@ + # define OS_CODE 0x0f + #endif + +-/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ +-/* many BeOS workarounds are no longer needed in Haiku */ +-#if defined(__HAIKU__) && defined(__BEOS__) +-#undef __BEOS__ +-#endif +- + #if defined(_BEOS_) || defined(RISCOS) + # define fdopen(fd,mode) NULL /* No fdopen() */ + #endif From 615f480f33937996cc6d7dc531260abc5a416275 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 10 Jul 2011 12:30:36 +0000 Subject: [PATCH 006/587] Hand-edited patch for package management. --- dev-util/cmake/patches/cmake-2.8.5.patch | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dev-util/cmake/patches/cmake-2.8.5.patch b/dev-util/cmake/patches/cmake-2.8.5.patch index fd25ce927..5a77b6557 100644 --- a/dev-util/cmake/patches/cmake-2.8.5.patch +++ b/dev-util/cmake/patches/cmake-2.8.5.patch @@ -181,7 +181,7 @@ diff -ur cmake-2.8.5_orig/Modules/FindOpenGL.cmake cmake-2.8.5/Modules/FindOpenG diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platform/Haiku.cmake --- cmake-2.8.5_orig/Modules/Platform/Haiku.cmake 2011-07-08 12:21:44.016777216 +0000 +++ cmake-2.8.5/Modules/Platform/Haiku.cmake 2011-07-09 17:59:50.092798976 +0000 -@@ -1,18 +1,29 @@ +@@ -1,20 +1,31 @@ -SET(BEOS 1) +SET(HAIKU 1) +SET(UNIX 1) @@ -203,6 +203,8 @@ diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf -LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) -LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) -LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) +-LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) +-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) +LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH + /boot/home/config/non-packaged + /boot/home/config @@ -215,11 +217,13 @@ diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf + /boot/home/config/lib + /boot/common/non-packaged/lib + /boot/common/lib -+ /boot/develop/lib/x86 ++ /boot/system/develop/lib/x86 + ) - LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) - LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) ++LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/system/develop/headers/3rdparty) ++LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/system/develop/lib/x86) + IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + SET(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH diff -ur cmake-2.8.5_orig/Source/cmCTest.cxx cmake-2.8.5/Source/cmCTest.cxx --- cmake-2.8.5_orig/Source/cmCTest.cxx 2011-07-08 12:21:45.037486592 +0000 +++ cmake-2.8.5/Source/cmCTest.cxx 2011-07-09 17:59:50.095682560 +0000 From b7091df0680c6f442b7a57bc065d8ab5aa19ac9e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 10 Jul 2011 22:41:09 +0000 Subject: [PATCH 007/587] Remove the /boot/home/config paths again for alignment with the Unixes. --- dev-util/cmake/patches/cmake-2.8.5.patch | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dev-util/cmake/patches/cmake-2.8.5.patch b/dev-util/cmake/patches/cmake-2.8.5.patch index 5a77b6557..9cd379392 100644 --- a/dev-util/cmake/patches/cmake-2.8.5.patch +++ b/dev-util/cmake/patches/cmake-2.8.5.patch @@ -181,7 +181,7 @@ diff -ur cmake-2.8.5_orig/Modules/FindOpenGL.cmake cmake-2.8.5/Modules/FindOpenG diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platform/Haiku.cmake --- cmake-2.8.5_orig/Modules/Platform/Haiku.cmake 2011-07-08 12:21:44.016777216 +0000 +++ cmake-2.8.5/Modules/Platform/Haiku.cmake 2011-07-09 17:59:50.092798976 +0000 -@@ -1,20 +1,31 @@ +@@ -1,20 +1,27 @@ -SET(BEOS 1) +SET(HAIKU 1) +SET(UNIX 1) @@ -195,7 +195,7 @@ diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") +SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -+ SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") ++SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") -INCLUDE(Platform/UnixPaths) -LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) @@ -206,15 +206,11 @@ diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf -LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) -LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) +LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH -+ /boot/home/config/non-packaged -+ /boot/home/config + /boot/common/non-packaged + /boot/common + /boot/system + ) +LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -+ /boot/home/config/non-packaged/lib -+ /boot/home/config/lib + /boot/common/non-packaged/lib + /boot/common/lib + /boot/system/develop/lib/x86 From b03596ce2a78e3abee8a638410929d228131fb44 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 18 Jul 2011 22:23:57 +0000 Subject: [PATCH 008/587] Add SUMMARY field --- sys-devel/m4/m4-1.4.16.bep | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index d0176aadf..6e19c4bb5 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -1,4 +1,5 @@ -DESCRIPTION="m4 - GNU macro processor" +SUMMARY="m4 - GNU macro processor" +DESCRIPTION="m4 - GNU macro processor." HOMEPAGE="http://www.gnu.org/software/m4/" SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz" CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" From c6af7df0df653d697756776efa42cbd19eb14345 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 18 Jul 2011 22:41:11 +0000 Subject: [PATCH 009/587] Make use of SOURCE_DIR --- sys-devel/m4/m4-1.4.16.bep | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index 6e19c4bb5..e48b1025f 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -6,9 +6,9 @@ CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" REVISION="1" STATUS_HAIKU="stable" DEPEND="" +SOURCE_DIR="m4-1.4.16" BUILD { - cd m4-1.4.16 prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/m4-1.4.16 ./configure --prefix=$prefix \ --datarootdir=$prefix/data \ @@ -24,12 +24,10 @@ BUILD { } INSTALL { - cd m4-1.4.16 make install } TEST { - cd m4-1.4.16 make check } From 35b93828173322228dd0ca5ecfa2a838b5617ba7 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 18 Jul 2011 23:39:11 +0000 Subject: [PATCH 010/587] Make use of the new shell variables --- sys-devel/m4/m4-1.4.16.bep | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index e48b1025f..77c3b74ae 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -6,10 +6,10 @@ CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -SOURCE_DIR="m4-1.4.16" +SOURCE_DIR="$portVersionedName" BUILD { - prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/m4-1.4.16 + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName ./configure --prefix=$prefix \ --datarootdir=$prefix/data \ --sbindir=$prefix/bin \ From 42dce38b5005dcbe3b17f18d359004854075a030 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 19 Jul 2011 00:51:36 +0000 Subject: [PATCH 011/587] Fix prefix dir and add PROVIDES --- sys-devel/m4/m4-1.4.16.bep | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index 77c3b74ae..be692af9e 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -5,11 +5,12 @@ SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz" CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" REVISION="1" STATUS_HAIKU="stable" +PROVIDES="cmd:m4 = $portVersion compat >= 1.4" DEPEND="" SOURCE_DIR="$portVersionedName" BUILD { - prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName + prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName/.self ./configure --prefix=$prefix \ --datarootdir=$prefix/data \ --sbindir=$prefix/bin \ From 7691189d6a713553cff417bade282720cf6f36fd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 19 Jul 2011 00:53:18 +0000 Subject: [PATCH 012/587] Set DEPEND --- sys-devel/m4/m4-1.4.16.bep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index be692af9e..6fc6489f0 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -6,7 +6,7 @@ CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" REVISION="1" STATUS_HAIKU="stable" PROVIDES="cmd:m4 = $portVersion compat >= 1.4" -DEPEND="" +DEPEND="haiku >= r1-alpha3" SOURCE_DIR="$portVersionedName" BUILD { From 143a33cffd4d094e770b95d06b28c5429f98b3db Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 19 Jul 2011 13:05:50 +0000 Subject: [PATCH 013/587] Make use of the configureDirArgs variable --- sys-devel/m4/m4-1.4.16.bep | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index 6fc6489f0..7270b9850 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -3,22 +3,14 @@ DESCRIPTION="m4 - GNU macro processor." HOMEPAGE="http://www.gnu.org/software/m4/" SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz" CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" PROVIDES="cmd:m4 = $portVersion compat >= 1.4" DEPEND="haiku >= r1-alpha3" SOURCE_DIR="$portVersionedName" BUILD { - prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName/.self - ./configure --prefix=$prefix \ - --datarootdir=$prefix/data \ - --sbindir=$prefix/bin \ - --includedir=$prefix/develop/headers \ - --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/packages/m4 \ - --infodir=$prefix/documentation/info \ - --mandir=$prefix/documentation/man \ + ./configure $configureDirArgs \ --disable-rpath --with-gnu-ld \ --enable-changeword make From e1a38db77277de47ee51864aa6987a36d1ab007f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 19 Jul 2011 19:18:49 +0000 Subject: [PATCH 014/587] Make use of haikuVersion variable --- sys-devel/m4/m4-1.4.16.bep | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index 7270b9850..f414ec058 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -6,7 +6,8 @@ CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" REVISION="2" STATUS_HAIKU="stable" PROVIDES="cmd:m4 = $portVersion compat >= 1.4" -DEPEND="haiku >= r1-alpha3" +DEPEND="haiku >= $haikuVersion" + SOURCE_DIR="$portVersionedName" BUILD { From 04d4cc11e7f943a50dd6a77ff01a2993244f8ab1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 19 Jul 2011 19:35:52 +0000 Subject: [PATCH 015/587] Add BUILD_DEPEND --- sys-devel/m4/m4-1.4.16.bep | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index f414ec058..c4e19126c 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -7,6 +7,9 @@ REVISION="2" STATUS_HAIKU="stable" PROVIDES="cmd:m4 = $portVersion compat >= 1.4" DEPEND="haiku >= $haikuVersion" +BUILD_DEPEND="haiku-devel >= $haikuVersion + cmd:gcc + cmd:ld" SOURCE_DIR="$portVersionedName" From ba2b45da1b0229093ac14a59e9fcb6eaa0b616b4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 20 Jul 2011 00:21:36 +0000 Subject: [PATCH 016/587] Build with multiple jobs. --- sys-devel/m4/m4-1.4.16.bep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index c4e19126c..abde52464 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -17,7 +17,7 @@ BUILD { ./configure $configureDirArgs \ --disable-rpath --with-gnu-ld \ --enable-changeword - make + make -j$jobs } INSTALL { From f40d0d07148761dccb52a2a9f32e48247870ce99 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 20 Jul 2011 00:26:01 +0000 Subject: [PATCH 017/587] Update for hpkg building * Add SUMMARY, BUILD_DEPEND,... * Use pre-set shell variables (prefix, portVersion, binDir,...). * Reenable make invocation. * Fix libperl.so symlink. --- dev-lang/perl/perl-5.10.1.bep | 38 +++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dev-lang/perl/perl-5.10.1.bep b/dev-lang/perl/perl-5.10.1.bep index 02cb4d7c7..60b2f7ea2 100644 --- a/dev-lang/perl/perl-5.10.1.bep +++ b/dev-lang/perl/perl-5.10.1.bep @@ -1,27 +1,31 @@ -DESCRIPTION="Larry Wall's Practical Extraction and Report Language" -HOMEPAGE="http://www.perl.org/" +SUMMARY="Larry Wall's Practical Extraction and Report Language" +DESCRIPTION="Larry Wall's Practical Extraction and Report Language." +HOMEPAGE="http://www.perl.org/" SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" -DEPEND="" +PROVIDES="cmd:perl = $portVersion compat >= 5" +DEPEND="haiku >= $haikuVersion" +BUILD_DEPEND="haiku-devel >= $haikuVersion + cmd:gcc + cmd:ld" CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" + +SOURCE_DIR="$portVersionedName" + BUILD { - version=5.10.1 - arch=BePC-Haiku - cd perl-$version - prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/perl-$version ./Configure \ -Dprefix=$prefix \ - -Dprivlib=$prefix/lib/perl5/core_perl/$version \ + -Dprivlib=$prefix/lib/perl5/core_perl/$portVersion \ -Dsiteprefix=$prefix/non-packaged \ - -Dsitelib=$prefix/non-packaged/lib/perl5/site_perl/$version \ + -Dsitelib=$prefix/non-packaged/lib/perl5/site_perl/$portVersion \ -Dvendorprefix=$prefix \ - -Dvendorlib=$prefix/lib/perl5/vendor_perl/$version \ + -Dvendorlib=$prefix/lib/perl5/vendor_perl/$portVersion \ -Dcf_email=zooey@hirschkaefer.de \ -Uusenm -Duseshrplib -Uusemymalloc \ -Dlibpth="$(finddir B_USER_LIB_DIRECTORY) $(finddir B_COMMON_LIB_DIRECTORY) $(finddir B_SYSTEM_LIB_DIRECTORY)" \ -Dusrinc="$(finddir B_SYSTEM_DEVELOP_DIRECTORY)/headers/posix" \ - -Dlocinc="$(finddir B_USER_CONFIG_DIRECTORY)/headers $(finddir B_COMMON_DEVELOP_DIRECTORY)/headers $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/headers" \ + -Dlocinc="$(finddir B_USER_CONFIG_DIRECTORY)/develop/headers $(finddir B_COMMON_DEVELOP_DIRECTORY)/headers $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/headers" \ -Dlibc="$(finddir B_SYSTEM_LIB_DIRECTORY)/libroot.so" \ -Dlibs=-lnetwork -Dcc=gcc -Dld=gcc \ -Ud_link -Ddont_use_nlink -Ud_syserrlst \ @@ -30,16 +34,16 @@ BUILD { # force-remove path from sed sed -i -e 's/LOC_SED\s*"\/boot\/common\/bin\/sed/LOC_SED "sed/' config.h -# make + make -j$jobs } INSTALL { - cd perl-5.10.1 + perlArch=BePC-Haiku make install - cd "${DESTDIR}/bin" + cd "$binDir" chmod a+x perl psed pstruct perlthanks - cd "${DESTDIR}/lib" - ln -sf perl5/5.10.1/BePC-haiku/CORE/libperl.so . + cd "$libDir" + ln -sf perl5/core_perl/5.10.1/$perlArch/CORE/libperl.so . } LICENSE="GNU GPL v1 Artistic (Perl)" From f3b3a2f772730a416399018bef9e0d6d9a0a9240 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 20 Jul 2011 00:52:11 +0000 Subject: [PATCH 018/587] Provide libperl, fix libperl symlink --- dev-lang/perl/perl-5.10.1.bep | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-lang/perl/perl-5.10.1.bep b/dev-lang/perl/perl-5.10.1.bep index 60b2f7ea2..be1d0f41d 100644 --- a/dev-lang/perl/perl-5.10.1.bep +++ b/dev-lang/perl/perl-5.10.1.bep @@ -4,7 +4,8 @@ HOMEPAGE="http://www.perl.org/" SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz" REVISION="2" STATUS_HAIKU="stable" -PROVIDES="cmd:perl = $portVersion compat >= 5" +PROVIDES="cmd:perl = $portVersion compat >= 5 + lib:libperl = $portVersion compat >= 5" DEPEND="haiku >= $haikuVersion" BUILD_DEPEND="haiku-devel >= $haikuVersion cmd:gcc @@ -38,7 +39,7 @@ BUILD { } INSTALL { - perlArch=BePC-Haiku + perlArch=BePC-haiku make install cd "$binDir" chmod a+x perl psed pstruct perlthanks From 48133706dc8b4848a1be304d811064cf1b3ab699 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 21 Jul 2011 19:33:26 +0000 Subject: [PATCH 019/587] Don't build with multiple jobs The build fails occasionally when building with multiple jobs. Haven't encountered the issue with a single job so far. --- dev-lang/perl/perl-5.10.1.bep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/perl/perl-5.10.1.bep b/dev-lang/perl/perl-5.10.1.bep index be1d0f41d..7b66ae50a 100644 --- a/dev-lang/perl/perl-5.10.1.bep +++ b/dev-lang/perl/perl-5.10.1.bep @@ -35,7 +35,7 @@ BUILD { # force-remove path from sed sed -i -e 's/LOC_SED\s*"\/boot\/common\/bin\/sed/LOC_SED "sed/' config.h - make -j$jobs + make } INSTALL { From 739c2f86f9fd7cbc9f644d40cbabd3364e8226e8 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 21 Jul 2011 19:36:57 +0000 Subject: [PATCH 020/587] Update for hpkg building --- sys-devel/autoconf/autoconf-2.68.bep | 42 +++++++++++++++++----------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/sys-devel/autoconf/autoconf-2.68.bep b/sys-devel/autoconf/autoconf-2.68.bep index 28e83df23..f179defd0 100644 --- a/sys-devel/autoconf/autoconf-2.68.bep +++ b/sys-devel/autoconf/autoconf-2.68.bep @@ -1,33 +1,43 @@ -DESCRIPTION="autoconf - Used to create autoconfiguration files" +SUMMARY="A GNU tool for automatically configuring source code" +DESCRIPTION="GNU Autoconf is a tool for configuring source code and makefiles. Using + autoconf, programmers can create portable and configurable packages, + because the person building the package is allowed to specify various + configuration options." HOMEPAGE="http://www.gnu.org/software/autoconf/" SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2" CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" -DEPEND="" + +PROVIDES="cmd:autoconf = $portVersion compat >= 2.68 + cmd:autoheader = $portVersion compat >= 2.68 + cmd:autom4te = $portVersion compat >= 2.68 + cmd:autoreconf = $portVersion compat >= 2.68 + cmd:autoscan = $portVersion compat >= 2.68 + cmd:autoupdate = $portVersion compat >= 2.68 + cmd:ifnames = $portVersion compat >= 2.68" +DEPEND="haiku >= $haikuVersion" +BUILD_DEPEND="haiku-devel >= $haikuVersion + cmd:perl >= 5 + cmd:m4 + cmd:sed + cmd:autoreconf >= 2.68 + cmd:automake >= 1.11" + +SOURCE_DIR="$portVersionedName" + BUILD { - cd autoconf-2.68 autoreconf - prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/autoconf-2.68 PERL="perl" M4="m4" SED="sed" \ - ./configure --prefix=$prefix \ - --datarootdir=$prefix/data \ - --sbindir=$prefix/bin \ - --includedir=$prefix/develop/headers \ - --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/packages/autoconf \ - --infodir=$prefix/documentation/info \ - --mandir=$prefix/documentation/man - make + ./configure $configureDirArgs + make -j$jobs } INSTALL { - cd autoconf-2.68 make install } TEST { - cd autoconf-2.68 make check } From 2e300a9a363fac6f0c7aa04d68313cb86bf82360 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 21 Jul 2011 20:55:00 +0000 Subject: [PATCH 021/587] Fix/improve DEPEND/BUILD_DEPEND * Remove incorrect "cmd:" prefix in *DEPEND. It's only for PROVIDES. * Move some stuff from BUILD_DEPEND to DEPEND and add more dependencies as gleaned from Oliver's previous work. * Add version requirements for some dependencies. --- dev-lang/perl/perl-5.10.1.bep | 4 ++-- sys-devel/autoconf/autoconf-2.68.bep | 16 ++++++++++------ sys-devel/m4/m4-1.4.16.bep | 5 +++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dev-lang/perl/perl-5.10.1.bep b/dev-lang/perl/perl-5.10.1.bep index 7b66ae50a..75667f0bf 100644 --- a/dev-lang/perl/perl-5.10.1.bep +++ b/dev-lang/perl/perl-5.10.1.bep @@ -8,8 +8,8 @@ PROVIDES="cmd:perl = $portVersion compat >= 5 lib:libperl = $portVersion compat >= 5" DEPEND="haiku >= $haikuVersion" BUILD_DEPEND="haiku-devel >= $haikuVersion - cmd:gcc - cmd:ld" + gcc + ld" CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/autoconf/autoconf-2.68.bep b/sys-devel/autoconf/autoconf-2.68.bep index f179defd0..f7272bb6a 100644 --- a/sys-devel/autoconf/autoconf-2.68.bep +++ b/sys-devel/autoconf/autoconf-2.68.bep @@ -16,13 +16,17 @@ PROVIDES="cmd:autoconf = $portVersion compat >= 2.68 cmd:autoscan = $portVersion compat >= 2.68 cmd:autoupdate = $portVersion compat >= 2.68 cmd:ifnames = $portVersion compat >= 2.68" -DEPEND="haiku >= $haikuVersion" +DEPEND="haiku >= $haikuVersion + awk + coreutils + diffutils + m4 >= 1.4 + perl >= 5 + sh" BUILD_DEPEND="haiku-devel >= $haikuVersion - cmd:perl >= 5 - cmd:m4 - cmd:sed - cmd:autoreconf >= 2.68 - cmd:automake >= 1.11" + autoreconf >= 2.68 + automake >= 1.11 + sed" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index abde52464..5f7751f5f 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -5,11 +5,12 @@ SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz" CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" REVISION="2" STATUS_HAIKU="stable" + PROVIDES="cmd:m4 = $portVersion compat >= 1.4" DEPEND="haiku >= $haikuVersion" BUILD_DEPEND="haiku-devel >= $haikuVersion - cmd:gcc - cmd:ld" + gcc + ld" SOURCE_DIR="$portVersionedName" From a129add7efbcbfe85b282e5bc0c549f4f0448f6e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 21 Jul 2011 21:17:56 +0000 Subject: [PATCH 022/587] Update for building hpkg --- sys-devel/automake/automake-1.11.1.bep | 42 +++++++++++++++----------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/sys-devel/automake/automake-1.11.1.bep b/sys-devel/automake/automake-1.11.1.bep index 1fa3fa6ea..7919f2f15 100644 --- a/sys-devel/automake/automake-1.11.1.bep +++ b/sys-devel/automake/automake-1.11.1.bep @@ -1,31 +1,39 @@ -DESCRIPTION="automake - Used to generate Makefile.in from Makefile.am" -HOMEPAGE="http://www.gnu.org/software/automake/" +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." +HOMEPAGE="http://www.gnu.org/software/automake/" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz" CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" -DEPEND="" + +PROVIDES="cmd:automake = $portVersion compat >= 1.11 + cmd:automake-1.11 = $portVersion compat >= 1.11 + cmd:aclocal = $portVersion compat >= 1.11 + cmd:aclocal-1.11 = $portVersion compat >= 1.11" +DEPEND="haiku >= $haikuVersion + awk + coreutils + diffutils + m4 >= 1.4 + perl >= 5 + sh" +BUILD_DEPEND="haiku-devel >= $haikuVersion" + +SOURCE_DIR="$portVersionedName" + BUILD { - cd automake-1.11.1 - prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/automake-1.11.1 - PERL="/bin/env perl" ./configure --prefix=$prefix \ - --datarootdir=$prefix/data \ - --sbindir=$prefix/bin \ - --includedir=$prefix/develop/headers \ - --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/packages/automake \ - --infodir=$prefix/documentation/info \ - --mandir=$prefix/documentation/man - make + PERL="/bin/env perl" ./configure $configureDirArgs + make -j$jobs } INSTALL { - cd automake-1.11.1 make install } TEST { - cd automake-1.11.1 make check } From 322ca78eb6cbaf2e00daffc628ff8a65f091e5f1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 21 Jul 2011 23:27:21 +0000 Subject: [PATCH 023/587] Update for hpkg building --- sys-devel/bison/bison-2.4.3.bep | 41 ++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/sys-devel/bison/bison-2.4.3.bep b/sys-devel/bison/bison-2.4.3.bep index 721e0ed4b..cffd599e4 100644 --- a/sys-devel/bison/bison-2.4.3.bep +++ b/sys-devel/bison/bison-2.4.3.bep @@ -1,35 +1,44 @@ -DESCRIPTION="bison - A yacc-compatible parser generator" +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." HOMEPAGE="http://www.gnu.org/software/bison/bison.html" SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz" CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73" REVISION="2" STATUS_HAIKU="stable" -DEPEND="" + +PROVIDES="cmd:bison = $portVersion compat >= 2.4 + cmd:yacc + lib:liby.a = $portVersion compat >= 2.4" +DEPEND="haiku >= $haikuVersion + sh" +BUILD_DEPEND="haiku-devel >= $haikuVersion + gcc + ld" + +SOURCE_DIR="$portVersionedName" + BUILD { - cd bison-2.4.3 - prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/bison-2.4.3 - # bison looks for m4 in an absolute path, but uses that only within # its own testsuite, so we let it be ... - ./configure --prefix=$prefix \ - --datarootdir=$prefix/data \ - --sbindir=$prefix/bin \ - --includedir=$prefix/develop/headers \ - --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/packages/bison \ - --infodir=$prefix/documentation/info \ - --mandir=$prefix/documentation/man \ + ./configure $configureDirArgs \ --disable-rpath --with-gnu-ld - make + make -j$jobs } INSTALL { - cd bison-2.4.3 make install } TEST { - cd bison-2.4.3 make check } From b184a15764dfdb766ea41a2b1decdd9888578714 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 21 Jul 2011 23:54:58 +0000 Subject: [PATCH 024/587] Update for hpkg build --- sys-devel/flex/flex-2.5.35.bep | 39 ++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/sys-devel/flex/flex-2.5.35.bep b/sys-devel/flex/flex-2.5.35.bep index 93de9b59d..a4b05b456 100644 --- a/sys-devel/flex/flex-2.5.35.bep +++ b/sys-devel/flex/flex-2.5.35.bep @@ -1,33 +1,40 @@ -DESCRIPTION="Flex is a tool for generating scanners." +SUMMARY="Flex is 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." HOMEPAGE="http://flex.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57" +REVISION="2" +STATUS_HAIKU="stable" + +PROVIDES="cmd:flex = $portVersion compat >= 2.5 + lib:libfl.a = $portVersion compat >= 2.5 + lib:libfl_pic.a = $portVersion compat >= 2.5" +DEPEND="haiku >= $haikuVersion" +BUILD_DEPEND="haiku-devel >= $haikuVersion + aclocal >= 1.11 + autoconf >= 2.68 + automake >= 1.11 + gcc + ld + libtoolize >= 2.4" + +SOURCE_DIR="$portVersionedName" + BUILD { - cd flex-2.5.35 rm aclocal.m4 libtoolize --force --copy --install aclocal -I m4 autoconf automake --add-missing --force-missing - prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/flex-2.5.35 - ./configure --prefix=$prefix \ - --datarootdir=$prefix/data \ - --sbindir=$prefix/bin \ - --includedir=$prefix/develop/headers \ - --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/packages/flex \ - --infodir=$prefix/documentation/info \ - --mandir=$prefix/documentation/man \ + ./configure $configureDirArgs \ --disable-rpath --with-gnu-ld - make + make -j$jobs } INSTALL { - cd flex-2.5.35 make install } + LICENSE="Flex" COPYRIGHT="2001-2007 The Flex Project; 1990, 1997 The Regents of the University of California" From 411501deebd0f81e59d5971e7e148492578b4c0e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 27 Sep 2011 01:16:19 +0000 Subject: [PATCH 025/587] Patch for libtool 2.4 * Disable shlibpath_overrides_runpath as that isn't what Haiku's runtime loader implements. * Update search paths. --- sys-devel/libtool/patches/libtool-2.4.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 sys-devel/libtool/patches/libtool-2.4.patch diff --git a/sys-devel/libtool/patches/libtool-2.4.patch b/sys-devel/libtool/patches/libtool-2.4.patch new file mode 100644 index 000000000..c0a99595a --- /dev/null +++ b/sys-devel/libtool/patches/libtool-2.4.patch @@ -0,0 +1,16 @@ +diff -ur libtool-2.4/libltdl/m4/libtool.m4 libtool-2.4/libltdl/m4/libtool.m4 +--- libtool-2.4/libltdl/m4/libtool.m4 2010-09-22 08:41:19.064749568 +0000 ++++ libtool-2.4/libltdl/m4/libtool.m4 2011-07-24 16:58:02.885260288 +0000 +@@ -2472,8 +2472,10 @@ + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH +- shlibpath_overrides_runpath=yes +- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' ++ shlibpath_overrides_runpath=no ++ # TODO: The /boot/common search path should also develop/lib! ++ sys_lib_search_path_spec='/boot/common/non-packaged/lib /boot/common/lib /boot/system/develop/lib' ++ sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/common/non-packaged/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + From 421086fdbeb89a5fb688293715eb89c3476dbf0b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 27 Sep 2011 01:20:34 +0000 Subject: [PATCH 026/587] Update for hpkg building --- sys-devel/libtool/libtool-2.4.bep | 53 +++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/sys-devel/libtool/libtool-2.4.bep b/sys-devel/libtool/libtool-2.4.bep index 366411b16..44d7eb737 100644 --- a/sys-devel/libtool/libtool-2.4.bep +++ b/sys-devel/libtool/libtool-2.4.bep @@ -1,33 +1,52 @@ -DESCRIPTION="libtool - a generic library support script" +SUMMARY="A generic library support script" +DESCRIPTION="GNU libtool is a set of shell scripts to automatically configure UNIX + architectures to build shared libraries in a generic fashion." HOMEPAGE="http://www.gnu.org/software/libtool" SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz" CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" -DEPEND="" + +PROVIDES="cmd:libtool = $portVersion compat >= 2.4 + cmd:libtool = $portVersion compat >= 2.4 + lib:libltdl.a = 7.3.0 compat >= 7 + lib:libltdl = 7.3.0 compat >= 7" +DEPEND="haiku >= $haikuVersion + aclocal >= 1.11.1 + automake >= 1.11.1" +BUILD_DEPEND="haiku-devel >= $haikuVersion + autoconf >= 2.68 + autoheader >= 2.68 + gcc + ld + nm + sed" + +SOURCE_DIR="$portVersionedName" + BUILD { - cd libtool-2.4 ./bootstrap - prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/libtool-2.4 - SED='sed' NM='nm' ./configure --prefix=$prefix \ - --datarootdir=$prefix/data \ - --sbindir=$prefix/bin \ - --includedir=$prefix/develop/headers \ - --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/packages/libtool \ - --infodir=$prefix/documentation/info \ - --mandir=$prefix/documentation/man \ - --with-gnu-ld - make + SED='sed' NM='nm' LD=ld ./configure $configureDirArgs --with-gnu-ld + make -j$jobs + # Desperate move to remove the absolute paths from libtool. For some reason + # only for the C++ compiler those are set (not for the C compiler). In + # openSuse libtool doesn't have those variables set either, but building + # according to their libroot.spec produces a libtool that has them set as + # well. My guess is that one has to build libtool without a C++ compiler + # installed to get that result. + sed -i -e 's@^predep_objects=".*"$@predep_objects=""'@ \ + -e 's@^postdep_objects=".*"$@postdep_objects=""'@ \ + -e 's@^postdeps=".*"$@postdeps=""'@ \ + -e 's@^compiler_lib_search_path=".*"$@compiler_lib_search_path=""'@ \ + -e 's@^compiler_lib_search_dirs=".*"$@compiler_lib_search_dirs=""'@ \ + libtool } INSTALL { - cd libtool-2.4 make install } TEST { - cd libtool-2.4 make check } From a219f1beed72461f835f853494eca3b325198413 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 26 Mar 2013 13:31:32 +0000 Subject: [PATCH 027/587] Update for hpkg building --- sys-devel/make/make-3.82.bep | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/sys-devel/make/make-3.82.bep b/sys-devel/make/make-3.82.bep index f749ec0f5..567d584f7 100644 --- a/sys-devel/make/make-3.82.bep +++ b/sys-devel/make/make-3.82.bep @@ -1,30 +1,33 @@ +SUMMARY="Standard tool to compile source trees" DESCRIPTION="Standard tool to compile source trees." HOMEPAGE="http://www.gnu.org/software/make/" SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2" CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f" -REVISION="1" +REVISION="2" STATUS_HAIKU="broken" # make-3.82 has problems/incompatibilities when doing 'make install DESTDIR' # on other packages (e.g. perl) -DEPEND="" + +PROVIDES="cmd:make = $portVersion compat >= 3.82" +DEPEND="haiku >= $haikuVersion" +BUILD_DEPEND="haiku-devel >= $haikuVersion + gcc + ld + libtool" + +SOURCE_DIR="$portVersionedName" + BUILD { - cd make-3.82 + echo configureDirArgs $configureDirArgs libtoolize --force --copy --install - prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/make-3.82 - ./configure --prefix=$prefix \ - --datadir=$prefix/data \ - --sbindir=$prefix/bin \ - --includedir=$prefix/develop/headers \ - --sysconfdir=$prefix/settings \ - --infodir=$prefix/documentation/info \ - --mandir=$prefix/documentation/man \ + ./configure $configureDirArgs \ --disable-rpath --with-gnu-ld ./build.sh } INSTALL { - cd make-3.82 ./make install } + LICENSE="GNU GPL v3" COPYRIGHT="1988-2010 Free Software Foundation, Inc." From ab5db8edc385b0c9b1f65cd4cfbc3265b35b06bc Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 26 Mar 2013 15:26:38 +0000 Subject: [PATCH 028/587] make-3.82.bep: Remove debug output --- sys-devel/make/make-3.82.bep | 1 - 1 file changed, 1 deletion(-) diff --git a/sys-devel/make/make-3.82.bep b/sys-devel/make/make-3.82.bep index 567d584f7..e3667b86f 100644 --- a/sys-devel/make/make-3.82.bep +++ b/sys-devel/make/make-3.82.bep @@ -18,7 +18,6 @@ BUILD_DEPEND="haiku-devel >= $haikuVersion SOURCE_DIR="$portVersionedName" BUILD { - echo configureDirArgs $configureDirArgs libtoolize --force --copy --install ./configure $configureDirArgs \ --disable-rpath --with-gnu-ld From a71b9b31f0008812f9530ecba7535578b21572a1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 26 Mar 2013 16:47:56 +0000 Subject: [PATCH 029/587] libtool-2.4.bep: Fix duplication in PROVIDES "libtool" was duplicated, "libtoolize" was missing. --- sys-devel/libtool/libtool-2.4.bep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/libtool/libtool-2.4.bep b/sys-devel/libtool/libtool-2.4.bep index 44d7eb737..bfac9b959 100644 --- a/sys-devel/libtool/libtool-2.4.bep +++ b/sys-devel/libtool/libtool-2.4.bep @@ -8,7 +8,7 @@ REVISION="2" STATUS_HAIKU="stable" PROVIDES="cmd:libtool = $portVersion compat >= 2.4 - cmd:libtool = $portVersion compat >= 2.4 + cmd:libtoolize = $portVersion compat >= 2.4 lib:libltdl.a = 7.3.0 compat >= 7 lib:libltdl = 7.3.0 compat >= 7" DEPEND="haiku >= $haikuVersion From 51ecc7d46f7b05842efb553704d23f03a41f646b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 26 Mar 2013 19:09:54 +0000 Subject: [PATCH 030/587] Update beps WRT *DEPENDS/*REQUIRES changes Also add/remove some dependencies that seemed missing/superfluous. --- dev-lang/perl/perl-5.10.1.bep | 8 +++++--- sys-devel/autoconf/autoconf-2.68.bep | 7 ++++--- sys-devel/automake/automake-1.11.1.bep | 5 +++-- sys-devel/bison/bison-2.4.3.bep | 7 ++++--- sys-devel/flex/flex-2.5.35.bep | 9 +++++---- sys-devel/libtool/libtool-2.4.bep | 9 +++++---- sys-devel/m4/m4-1.4.16.bep | 7 ++++--- sys-devel/make/make-3.82.bep | 8 ++++---- 8 files changed, 34 insertions(+), 26 deletions(-) diff --git a/dev-lang/perl/perl-5.10.1.bep b/dev-lang/perl/perl-5.10.1.bep index 75667f0bf..460d86b99 100644 --- a/dev-lang/perl/perl-5.10.1.bep +++ b/dev-lang/perl/perl-5.10.1.bep @@ -6,10 +6,12 @@ REVISION="2" STATUS_HAIKU="stable" PROVIDES="cmd:perl = $portVersion compat >= 5 lib:libperl = $portVersion compat >= 5" -DEPEND="haiku >= $haikuVersion" -BUILD_DEPEND="haiku-devel >= $haikuVersion +REQUIRES="haiku >= $haikuVersion" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion gcc - ld" + ld + make + sed" CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/autoconf/autoconf-2.68.bep b/sys-devel/autoconf/autoconf-2.68.bep index f7272bb6a..0e337854d 100644 --- a/sys-devel/autoconf/autoconf-2.68.bep +++ b/sys-devel/autoconf/autoconf-2.68.bep @@ -16,16 +16,17 @@ PROVIDES="cmd:autoconf = $portVersion compat >= 2.68 cmd:autoscan = $portVersion compat >= 2.68 cmd:autoupdate = $portVersion compat >= 2.68 cmd:ifnames = $portVersion compat >= 2.68" -DEPEND="haiku >= $haikuVersion +REQUIRES="haiku >= $haikuVersion awk coreutils diffutils m4 >= 1.4 + make perl >= 5 sh" -BUILD_DEPEND="haiku-devel >= $haikuVersion +BUILD_REQUIRES="automake >= 1.11" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion autoreconf >= 2.68 - automake >= 1.11 sed" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/automake/automake-1.11.1.bep b/sys-devel/automake/automake-1.11.1.bep index 7919f2f15..5c5743034 100644 --- a/sys-devel/automake/automake-1.11.1.bep +++ b/sys-devel/automake/automake-1.11.1.bep @@ -13,14 +13,15 @@ PROVIDES="cmd:automake = $portVersion compat >= 1.11 cmd:automake-1.11 = $portVersion compat >= 1.11 cmd:aclocal = $portVersion compat >= 1.11 cmd:aclocal-1.11 = $portVersion compat >= 1.11" -DEPEND="haiku >= $haikuVersion +REQUIRES="haiku >= $haikuVersion awk coreutils diffutils m4 >= 1.4 perl >= 5 sh" -BUILD_DEPEND="haiku-devel >= $haikuVersion" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + make" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/bison/bison-2.4.3.bep b/sys-devel/bison/bison-2.4.3.bep index cffd599e4..8859e3179 100644 --- a/sys-devel/bison/bison-2.4.3.bep +++ b/sys-devel/bison/bison-2.4.3.bep @@ -18,11 +18,12 @@ STATUS_HAIKU="stable" PROVIDES="cmd:bison = $portVersion compat >= 2.4 cmd:yacc lib:liby.a = $portVersion compat >= 2.4" -DEPEND="haiku >= $haikuVersion +REQUIRES="haiku >= $haikuVersion sh" -BUILD_DEPEND="haiku-devel >= $haikuVersion +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion gcc - ld" + ld + make" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/flex/flex-2.5.35.bep b/sys-devel/flex/flex-2.5.35.bep index a4b05b456..134c3cdd6 100644 --- a/sys-devel/flex/flex-2.5.35.bep +++ b/sys-devel/flex/flex-2.5.35.bep @@ -10,14 +10,15 @@ STATUS_HAIKU="stable" PROVIDES="cmd:flex = $portVersion compat >= 2.5 lib:libfl.a = $portVersion compat >= 2.5 lib:libfl_pic.a = $portVersion compat >= 2.5" -DEPEND="haiku >= $haikuVersion" -BUILD_DEPEND="haiku-devel >= $haikuVersion - aclocal >= 1.11 +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES="aclocal >= 1.11 autoconf >= 2.68 automake >= 1.11 + libtoolize >= 2.4" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion gcc ld - libtoolize >= 2.4" + make" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/libtool/libtool-2.4.bep b/sys-devel/libtool/libtool-2.4.bep index bfac9b959..f6f83ed35 100644 --- a/sys-devel/libtool/libtool-2.4.bep +++ b/sys-devel/libtool/libtool-2.4.bep @@ -11,14 +11,15 @@ PROVIDES="cmd:libtool = $portVersion compat >= 2.4 cmd:libtoolize = $portVersion compat >= 2.4 lib:libltdl.a = 7.3.0 compat >= 7 lib:libltdl = 7.3.0 compat >= 7" -DEPEND="haiku >= $haikuVersion +REQUIRES="haiku >= $haikuVersion aclocal >= 1.11.1 automake >= 1.11.1" -BUILD_DEPEND="haiku-devel >= $haikuVersion - autoconf >= 2.68 - autoheader >= 2.68 +BUILD_REQUIRES="autoconf >= 2.68 + autoheader >= 2.68" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion gcc ld + make nm sed" diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index 5f7751f5f..e0626c428 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -7,10 +7,11 @@ REVISION="2" STATUS_HAIKU="stable" PROVIDES="cmd:m4 = $portVersion compat >= 1.4" -DEPEND="haiku >= $haikuVersion" -BUILD_DEPEND="haiku-devel >= $haikuVersion +REQUIRES="haiku >= $haikuVersion" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion gcc - ld" + ld + make" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/make/make-3.82.bep b/sys-devel/make/make-3.82.bep index e3667b86f..6013137ca 100644 --- a/sys-devel/make/make-3.82.bep +++ b/sys-devel/make/make-3.82.bep @@ -9,11 +9,11 @@ STATUS_HAIKU="broken" # on other packages (e.g. perl) PROVIDES="cmd:make = $portVersion compat >= 3.82" -DEPEND="haiku >= $haikuVersion" -BUILD_DEPEND="haiku-devel >= $haikuVersion +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES="libtool" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion gcc - ld - libtool" + ld" SOURCE_DIR="$portVersionedName" From ba16eddd89061aec0d23494bef336edf328214a4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 26 Mar 2013 19:58:58 +0000 Subject: [PATCH 031/587] Add bep file for gcc 2.95.3 Includes binutils as usual (we might want to break that out eventually). --- sys-devel/gcc/gcc-2.95.3_110711.bep | 165 ++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) create mode 100644 sys-devel/gcc/gcc-2.95.3_110711.bep diff --git a/sys-devel/gcc/gcc-2.95.3_110711.bep b/sys-devel/gcc/gcc-2.95.3_110711.bep new file mode 100644 index 000000000..657678db5 --- /dev/null +++ b/sys-devel/gcc/gcc-2.95.3_110711.bep @@ -0,0 +1,165 @@ +SUMMARY="C/C++ compiler" +DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5." +HOMEPAGE="http://gcc.gnu.org" +# TODO: Also: http://www.gnu.org/software/binutils +SRC_URI="git+file:///Transfer/buildtools-pm/.git#ba94fdf309096bd9bbf432ad53efba62bc47f98e" +REVISION="2" +STATUS_HAIKU="stable" + +PROVIDES="cmd:cpp = $portVersion compat >= 2.95.3 + cmd:gcc = $portVersion compat >= 2.95.3 + cmd:g++ = $portVersion compat >= 2.95.3 + binutils = 2.17_110711 compat >= 2.17 + cmd:ar = 2.17_110711 compat >= 2.17 + cmd:as = 2.17_110711 compat >= 2.17 + cmd:c++filt = 2.17_110711 compat >= 2.17 + cmd:gcov = 1.5 compat >= 1.5 + cmd:gprof = 2.17_110711 compat >= 2.17 + cmd:ld = 2.17_110711 compat >= 2.17 + cmd:nm = 2.17_110711 compat >= 2.17 + cmd:objcopy = 2.17_110711 compat >= 2.17 + cmd:objdump = 2.17_110711 compat >= 2.17 + cmd:protoize = 2.17_110711 compat >= 2.17 + cmd:ranlib = 2.17_110711 compat >= 2.17 + cmd:readelf = 2.17_110711 compat >= 2.17 + cmd:size = 2.17_110711 compat >= 2.17 + cmd:strings = 2.17_110711 compat >= 2.17 + cmd:strip = 2.17_110711 compat >= 2.17 + cmd:unprotoize = 2.17_110711 compat >= 2.17" + +REQUIRES="haiku >= $haikuVersion" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + binutils + gcc + make + texinfo" + +SOURCE_DIR="$portVersionedName" + +BUILD { + gccDate=110711 + gccInstallDir="$prefix/develop/tools/gcc-2.95.3-${gccDate}" + objectsDir=$(pwd)/../${portVersionedName}-obj + binutilsObjectsDir=$objectsDir/binutils + gccObjectsDir=$objectsDir/gcc + buildtoolsDir=$(pwd)/legacy + + rm -rf $objectsDir + + # Touch some files generated by bison, so that bison won't run to update + # them. Fixes issues with newer bison versions. + # And while at it, touch gperf target, too (as gperf may not be installed). + (cd $buildtoolsDir/gcc/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + cp/parse.h c-gperf.h) + + # build binutils + mkdir -p $binutilsObjectsDir + cd $binutilsObjectsDir + CFLAGS="-O2" CXXFLAGS="-O2" "$buildtoolsDir/binutils/configure" \ + --prefix=$gccInstallDir \ + --disable-nls --enable-shared=yes + make + + # install binutils before building gcc + make install + + # build gcc + mkdir $gccObjectsDir + cd $gccObjectsDir + CFLAGS="-O2" CXXFLAGS="-O2" "$buildtoolsDir/gcc/configure" \ + --prefix=$gccInstallDir \ + --disable-nls --enable-shared=yes --enable-languages=c,c++ + make bootstrap || true + # The above will fail when compiling builtinbuf.cc, but we can ignore + # that since it's trying to build libstdc++.so, which haiku provides + # anyway. +} + +INSTALL { + # TODO: Avoid the duplication by defining the variables globally once we've + # moved the bep-format to shell. + gccDate=110711 + gccInstallDir="$prefix/develop/tools/gcc-2.95.3-${gccDate}" + objectsDir=$(pwd)/../${portVersionedName}-obj + binutilsObjectsDir=$objectsDir/binutils + gccObjectsDir=$objectsDir/gcc + buildtoolsDir=$(pwd)/legacy + + cd $binutilsObjectsDir + make install + + cd $gccObjectsDir + make install + + base=$gccInstallDir + + ### HTML documentation #################################### + + html_base=$base/html-docs + if [ ! -d "$html_base" ]; then + echo "Building HTML documentation..." + mkdir $html_base + cd $html_base + + makeinfo --html "$buildtoolsDir/gcc/gcc/cpp.texi" + makeinfo --html "$buildtoolsDir/gcc/gcc/gcc.texi" + makeinfo --html "$buildtoolsDir/binutils/libiberty/libiberty.texi" + makeinfo --force --html "$buildtoolsDir/gcc/libio/iostream.texi" \ + && true + # some errors + + ln -sf cpp/index.html $html_base/cpp.html + ln -sf gcc/index.html $html_base/gcc.html + ln -sf libiberty/index.html $html_base/libiberty.html + ln -sf iostream/index.html $html_base/iostream.html + fi + if [ -d "$base/share/doc" ]; then + echo "Adding binutils HTML documentation..." + + mv $base/share/doc/as.html $html_base/as + mv $base/share/doc/binutils.html $html_base/binutils + mv $base/share/doc/gprof.html $html_base/gprof + mv $base/share/doc/ld.html $html_base/ld + #mv $base/share/doc/configure.html $html_base/ + + ln -sf as/index.html $html_base/as.html + ln -sf binutils/index.html $html_base/binutils.html + ln -sf gprof/index.html $html_base/gprof.html + ln -sf ld/index.html $html_base/ld.html + fi + if [ ! -e "$html_base/as.html" ]; then + echo "binutils HTML documentation missing, see" \ + "INSTALL-gcc2-from-source-Haiku." + fi + + ### Cleanup ############################################### + + echo "Cleanup" + + cd $base/bin + for binary in ../i586-pc-haiku/bin/*; do + ln -sfn $binary . + done + + if [ -d $base/man -o -d $base/info -o -d $base/share ]; then + rm -rf $base/man + rm -rf $base/info + rm -rf $base/share + fi + + rm -f $base/lib/gcc-lib/i586-pc-haiku/2.95.3-haiku-$gccDate/include/math.h + + ### C++ includes ###################################### + + echo "Install C++ includes & library" + + rm -rf $base/include/g++ + ln -snf /boot/system/develop/headers/c++/2.95.3 $base/include/g++ + + ln -snf /boot/system/lib/libstdc++.r4.so $base/lib/ + ln -snf /boot/system/lib/libstdc++.so $base/lib/ +} + +LICENSE="GNU GPL v2 + GNU LGPL v2" +COPYRIGHT="1988-2000 Free Software Foundation, Inc." From c8af8bcf723c60c2d05385a6c8a9e432d3a36669 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 26 Mar 2013 19:59:57 +0000 Subject: [PATCH 032/587] texinfo-4.13a.bep: Update for hpkg building --- sys-apps/texinfo/texinfo-4.13a.bep | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/sys-apps/texinfo/texinfo-4.13a.bep b/sys-apps/texinfo/texinfo-4.13a.bep index df3ef2701..43438e1dd 100644 --- a/sys-apps/texinfo/texinfo-4.13a.bep +++ b/sys-apps/texinfo/texinfo-4.13a.bep @@ -1,20 +1,38 @@ +SUMMARY="Standard GNU documentation format tool" DESCRIPTION="Texinfo is the official documentation format of the GNU project." HOMEPAGE="http://www.gnu.org/software/texinfo/" SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz" CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" -DEPEND="" + +PROVIDES="cmd:info = $portVersion compat >= 4.13 + cmd:makeinfo = $portVersion compat >= 4.13 + cmd:install-info = $portVersion compat >= 4.13 + cmd:texi2dvi = $portVersion compat >= 4.13 + cmd:texi2pdf = $portVersion compat >= 4.13 + cmd:texindex = $portVersion compat >= 4.13 + cmd:infokey = $portVersion compat >= 4.13 + cmd:pdftexi2dvi = $portVersion compat >= 4.13" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + gcc + ld + libtoolize + make" + +SOURCE_DIR="texinfo-4.13" + BUILD { - cd texinfo-4.13 libtoolize --force --copy --install - ./configure --prefix=/boot/common + ./configure $configureDirArgs make } INSTALL { - cd texinfo-4.13 make install } + LICENSE="GNU GPL v3" COPYRIGHT="1992-2008 Free Software Foundation, Inc." From 54ff891612632672c11559a5963b2033a25fe3d3 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 26 Mar 2013 20:26:24 +0000 Subject: [PATCH 033/587] gcc-2.95.3_110711.bep: Fix the source URI --- sys-devel/gcc/gcc-2.95.3_110711.bep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/gcc/gcc-2.95.3_110711.bep b/sys-devel/gcc/gcc-2.95.3_110711.bep index 657678db5..74402967c 100644 --- a/sys-devel/gcc/gcc-2.95.3_110711.bep +++ b/sys-devel/gcc/gcc-2.95.3_110711.bep @@ -2,7 +2,7 @@ SUMMARY="C/C++ compiler" DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5." HOMEPAGE="http://gcc.gnu.org" # TODO: Also: http://www.gnu.org/software/binutils -SRC_URI="git+file:///Transfer/buildtools-pm/.git#ba94fdf309096bd9bbf432ad53efba62bc47f98e" +SRC_URI="git+git://github.com/weinhold/buildtools.git#ba94fdf309096bd9bbf432ad53efba62bc47f98e" REVISION="2" STATUS_HAIKU="stable" From 8f13d28af60d1365bdfea033bb9219edaa115a30 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 27 Mar 2013 23:31:02 +0000 Subject: [PATCH 034/587] Update the packages required for bootstrapping * Also declare a resolvable named like the package, even if similarly named cmd:* resolvable is declared. * Add cmd: namespace to resolvables in [BUILD_[PRE]]REQUIRES where appropriate. For some reason I thought that didn't work (resulting in an error building the package), but apparently I was mistaken. * A few smaller fixes in [BUILD_[PRE]]REQUIRES. --- dev-lang/perl/perl-5.10.1.bep | 11 ++++++----- sys-apps/texinfo/texinfo-4.13a.bep | 11 ++++++----- sys-devel/autoconf/autoconf-2.68.bep | 19 ++++++++++--------- sys-devel/automake/automake-1.11.1.bep | 13 +++++++------ sys-devel/bison/bison-2.4.3.bep | 12 ++++++------ sys-devel/flex/flex-2.5.35.bep | 15 ++++++++------- sys-devel/gcc/gcc-2.95.3_110711.bep | 11 ++++++----- sys-devel/libtool/libtool-2.4.bep | 21 +++++++++++---------- sys-devel/m4/m4-1.4.16.bep | 9 +++++---- sys-devel/make/make-3.82.bep | 9 +++++---- 10 files changed, 70 insertions(+), 61 deletions(-) diff --git a/dev-lang/perl/perl-5.10.1.bep b/dev-lang/perl/perl-5.10.1.bep index 460d86b99..4101df1ef 100644 --- a/dev-lang/perl/perl-5.10.1.bep +++ b/dev-lang/perl/perl-5.10.1.bep @@ -4,14 +4,15 @@ HOMEPAGE="http://www.perl.org/" SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz" REVISION="2" STATUS_HAIKU="stable" -PROVIDES="cmd:perl = $portVersion compat >= 5 +PROVIDES="perl = $portVersion compat >= 5 + cmd:perl = $portVersion compat >= 5 lib:libperl = $portVersion compat >= 5" REQUIRES="haiku >= $haikuVersion" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - gcc - ld - make - sed" + cmd:gcc + cmd:ld + cmd:make + cmd:sed" CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" SOURCE_DIR="$portVersionedName" diff --git a/sys-apps/texinfo/texinfo-4.13a.bep b/sys-apps/texinfo/texinfo-4.13a.bep index 43438e1dd..74e817a85 100644 --- a/sys-apps/texinfo/texinfo-4.13a.bep +++ b/sys-apps/texinfo/texinfo-4.13a.bep @@ -6,7 +6,8 @@ CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb" REVISION="2" STATUS_HAIKU="stable" -PROVIDES="cmd:info = $portVersion compat >= 4.13 +PROVIDES="texinfo = $portVersion compat >= 4.13 + cmd:info = $portVersion compat >= 4.13 cmd:makeinfo = $portVersion compat >= 4.13 cmd:install-info = $portVersion compat >= 4.13 cmd:texi2dvi = $portVersion compat >= 4.13 @@ -17,10 +18,10 @@ PROVIDES="cmd:info = $portVersion compat >= 4.13 REQUIRES="" BUILD_REQUIRES="" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - gcc - ld - libtoolize - make" + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make" SOURCE_DIR="texinfo-4.13" diff --git a/sys-devel/autoconf/autoconf-2.68.bep b/sys-devel/autoconf/autoconf-2.68.bep index 0e337854d..e38df7694 100644 --- a/sys-devel/autoconf/autoconf-2.68.bep +++ b/sys-devel/autoconf/autoconf-2.68.bep @@ -9,7 +9,8 @@ CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07" REVISION="2" STATUS_HAIKU="stable" -PROVIDES="cmd:autoconf = $portVersion compat >= 2.68 +PROVIDES="autoconf = $portVersion compat >= 2.68 + cmd:autoconf = $portVersion compat >= 2.68 cmd:autoheader = $portVersion compat >= 2.68 cmd:autom4te = $portVersion compat >= 2.68 cmd:autoreconf = $portVersion compat >= 2.68 @@ -17,17 +18,17 @@ PROVIDES="cmd:autoconf = $portVersion compat >= 2.68 cmd:autoupdate = $portVersion compat >= 2.68 cmd:ifnames = $portVersion compat >= 2.68" REQUIRES="haiku >= $haikuVersion - awk + cmd:awk coreutils diffutils - m4 >= 1.4 - make - perl >= 5 - sh" -BUILD_REQUIRES="automake >= 1.11" + cmd:m4 >= 1.4 + cmd:make + cmd:perl >= 5 + cmd:sh" +BUILD_REQUIRES="cmd:automake >= 1.11" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - autoreconf >= 2.68 - sed" + cmd:autoreconf >= 2.68 + cmd:sed" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/automake/automake-1.11.1.bep b/sys-devel/automake/automake-1.11.1.bep index 5c5743034..601e4dc80 100644 --- a/sys-devel/automake/automake-1.11.1.bep +++ b/sys-devel/automake/automake-1.11.1.bep @@ -9,19 +9,20 @@ CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74" REVISION="2" STATUS_HAIKU="stable" -PROVIDES="cmd:automake = $portVersion compat >= 1.11 +PROVIDES="automake = $portVersion compat >= 1.11 + cmd:automake = $portVersion compat >= 1.11 cmd:automake-1.11 = $portVersion compat >= 1.11 cmd:aclocal = $portVersion compat >= 1.11 cmd:aclocal-1.11 = $portVersion compat >= 1.11" REQUIRES="haiku >= $haikuVersion - awk + cmd:awk coreutils diffutils - m4 >= 1.4 - perl >= 5 - sh" + cmd:m4 >= 1.4 + cmd:perl >= 5 + cmd:sh" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - make" + cmd:make" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/bison/bison-2.4.3.bep b/sys-devel/bison/bison-2.4.3.bep index 8859e3179..2c99d2368 100644 --- a/sys-devel/bison/bison-2.4.3.bep +++ b/sys-devel/bison/bison-2.4.3.bep @@ -15,15 +15,15 @@ CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73" REVISION="2" STATUS_HAIKU="stable" -PROVIDES="cmd:bison = $portVersion compat >= 2.4 +PROVIDES="bison = $portVersion compat >= 2.4 + cmd:bison = $portVersion compat >= 2.4 cmd:yacc lib:liby.a = $portVersion compat >= 2.4" -REQUIRES="haiku >= $haikuVersion - sh" +REQUIRES="haiku >= $haikuVersion" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - gcc - ld - make" + cmd:gcc + cmd:ld + cmd:make" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/flex/flex-2.5.35.bep b/sys-devel/flex/flex-2.5.35.bep index 134c3cdd6..2b77fbc15 100644 --- a/sys-devel/flex/flex-2.5.35.bep +++ b/sys-devel/flex/flex-2.5.35.bep @@ -7,18 +7,19 @@ CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57" REVISION="2" STATUS_HAIKU="stable" -PROVIDES="cmd:flex = $portVersion compat >= 2.5 +PROVIDES="flex = $portVersion compat >= 2.5 + cmd:flex = $portVersion compat >= 2.5 lib:libfl.a = $portVersion compat >= 2.5 lib:libfl_pic.a = $portVersion compat >= 2.5" REQUIRES="haiku >= $haikuVersion" BUILD_REQUIRES="aclocal >= 1.11 - autoconf >= 2.68 - automake >= 1.11 - libtoolize >= 2.4" + cmd:autoconf >= 2.68 + cmd:automake >= 1.11 + cmd:libtoolize >= 2.4" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - gcc - ld - make" + cmd:gcc + cmd:ld + cmd:make" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/gcc/gcc-2.95.3_110711.bep b/sys-devel/gcc/gcc-2.95.3_110711.bep index 74402967c..1b2bf7bc0 100644 --- a/sys-devel/gcc/gcc-2.95.3_110711.bep +++ b/sys-devel/gcc/gcc-2.95.3_110711.bep @@ -6,7 +6,8 @@ SRC_URI="git+git://github.com/weinhold/buildtools.git#ba94fdf309096bd9bbf432ad53 REVISION="2" STATUS_HAIKU="stable" -PROVIDES="cmd:cpp = $portVersion compat >= 2.95.3 +PROVIDES="gcc = $portVersion compat >= 2.95.3 + cmd:cpp = $portVersion compat >= 2.95.3 cmd:gcc = $portVersion compat >= 2.95.3 cmd:g++ = $portVersion compat >= 2.95.3 binutils = 2.17_110711 compat >= 2.17 @@ -29,10 +30,10 @@ PROVIDES="cmd:cpp = $portVersion compat >= 2.95.3 REQUIRES="haiku >= $haikuVersion" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - binutils - gcc - make - texinfo" + cmd:binutils + cmd:gcc + cmd:make + cmd:texinfo" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/libtool/libtool-2.4.bep b/sys-devel/libtool/libtool-2.4.bep index f6f83ed35..0c21d9366 100644 --- a/sys-devel/libtool/libtool-2.4.bep +++ b/sys-devel/libtool/libtool-2.4.bep @@ -7,21 +7,22 @@ CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" REVISION="2" STATUS_HAIKU="stable" -PROVIDES="cmd:libtool = $portVersion compat >= 2.4 +PROVIDES="libtool = $portVersion compat >= 2.4 + cmd:libtool = $portVersion compat >= 2.4 cmd:libtoolize = $portVersion compat >= 2.4 lib:libltdl.a = 7.3.0 compat >= 7 lib:libltdl = 7.3.0 compat >= 7" REQUIRES="haiku >= $haikuVersion - aclocal >= 1.11.1 - automake >= 1.11.1" -BUILD_REQUIRES="autoconf >= 2.68 - autoheader >= 2.68" + cmd:aclocal >= 1.11.1 + cmd:automake >= 1.11.1" +BUILD_REQUIRES="cmd:autoconf >= 2.68 + cmd:autoheader >= 2.68" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - gcc - ld - make - nm - sed" + cmd:gcc + cmd:ld + cmd:make + cmd:nm + cmd:sed" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.bep index e0626c428..257c5db60 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.bep @@ -6,12 +6,13 @@ CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" REVISION="2" STATUS_HAIKU="stable" -PROVIDES="cmd:m4 = $portVersion compat >= 1.4" +PROVIDES="m4 = $portVersion compat >= 1.4 + cmd:m4 = $portVersion compat >= 1.4" REQUIRES="haiku >= $haikuVersion" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - gcc - ld - make" + cmd:gcc + cmd:ld + cmd:make" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/make/make-3.82.bep b/sys-devel/make/make-3.82.bep index 6013137ca..029333bbe 100644 --- a/sys-devel/make/make-3.82.bep +++ b/sys-devel/make/make-3.82.bep @@ -8,12 +8,13 @@ STATUS_HAIKU="broken" # make-3.82 has problems/incompatibilities when doing 'make install DESTDIR' # on other packages (e.g. perl) -PROVIDES="cmd:make = $portVersion compat >= 3.82" +PROVIDES="make = $portVersion compat >= 3.82 + cmd:make = $portVersion compat >= 3.82" REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="libtool" +BUILD_REQUIRES="cmd:libtoolize" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - gcc - ld" + cmd:gcc + cmd:ld" SOURCE_DIR="$portVersionedName" From d03da3cebf25a4e7b7e803e01790e5c0de2d47b3 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 28 Mar 2013 11:16:26 +0000 Subject: [PATCH 035/587] cvs-1.12.13.1.bep: Update for building hpkg Also replace the source URI, which didn't work for me. --- dev-vcs/cvs/cvs-1.12.13.1.bep | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/dev-vcs/cvs/cvs-1.12.13.1.bep b/dev-vcs/cvs/cvs-1.12.13.1.bep index 0f664f9e6..94cf44780 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.bep +++ b/dev-vcs/cvs/cvs-1.12.13.1.bep @@ -1,21 +1,34 @@ -DESCRIPTION="CVS is a version control system" +SUMMARY="Concurrent Versions System" +DESCRIPTION="CVS is a version control system." HOMEPAGE="http://www.nongnu.org/cvs/" -SRC_URI="http://ftp.nctu.edu.tw/GNU/non-gnu/cvs/source/nightly-snapshots/feature/cvs-1.12.13.1.tar.bz2" +SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2" CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" -DEPEND="" + +PROVIDES="cvs = $portVersion compat >= 1.12 + cmd:cvs = $portVersion compat >= 1.12" +REQUIRES="haiku-devel >= $haikuVersion + zlib >= 1.1.4" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make" + +SOURCE_DIR="$portVersionedName" + BUILD { - cd cvs-1.12.13.1 libtoolize --force --copy --install - ./configure --prefix=/boot/common --enable-rootcommit + ./configure $configureDirArgs --enable-rootcommit make } INSTALL { - cd cvs-1.12.13.1 make install } + LICENSE="GNU GPL v1 GNU LGPL v2" COPYRIGHT="1986-2005 Free Software Foundation, Inc." From 607c7b53a9889fbe04217e8003572408239725c5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 29 Mar 2013 00:40:46 +0000 Subject: [PATCH 036/587] apr-1.4.2: Update for hpkg building --- dev-libs/apr/apr-1.4.2.bep | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/dev-libs/apr/apr-1.4.2.bep b/dev-libs/apr/apr-1.4.2.bep index 4d2c5b7fd..477d094f7 100644 --- a/dev-libs/apr/apr-1.4.2.bep +++ b/dev-libs/apr/apr-1.4.2.bep @@ -1,23 +1,36 @@ -DESCRIPTION="apr - Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://www.apache.org/dist/apr/apr-1.4.2.tar.gz" +SUMMARY="Apache Portable Runtime Library" +DESCRIPTION="The Apache Portable Runtime Library." +HOMEPAGE="http://apr.apache.org/" +SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz" CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd" REVISION="2" STATUS_HAIKU="stable" -DEPEND="" + +PROVIDES="apr = $portVersion compat >= 1 + lib:libapr = $portVersion compat >= 1 + lib:libapr-1 = $portVersion compat >= 1" +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES="cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + +SOURCE_DIR="$portVersionedName" + BUILD { - cd apr-1.4.2 libtoolize --force --copy --install touch libtool.m4 # ./buildconf aclocal -I build autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` + ./configure $configureDirArgs make } INSTALL { - cd apr-1.4.2 make install } From 4f80c5f0c8473644e235cb8a3f733ceb501bcc1d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 29 Mar 2013 00:47:49 +0000 Subject: [PATCH 037/587] apr-util: Update from trunk and update for hpkg building Ignore the patch from trunk, though, since it doesn't seem useful. --- dev-libs/apr-util/apr-util-1.3.10.bep | 77 +++++++++++++++++---------- 1 file changed, 48 insertions(+), 29 deletions(-) diff --git a/dev-libs/apr-util/apr-util-1.3.10.bep b/dev-libs/apr-util/apr-util-1.3.10.bep index e799d7a37..810b4cb48 100644 --- a/dev-libs/apr-util/apr-util-1.3.10.bep +++ b/dev-libs/apr-util/apr-util-1.3.10.bep @@ -1,47 +1,66 @@ -DESCRIPTION="apr-util - Apache Portable Runtime Utility Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://www.reverse.net/pub/apache//apr/apr-util-1.3.10.tar.gz" +SUMMARY="Apache Portable Runtime Utility Library" +DESCRIPTION="Apache Portable Runtime Utility Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz" CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.3.9" + +PROVIDES="apr-util = $portVersion compat >= 1 + lib:libaprutil = $portVersion compat >= 1 + lib:libaprutil-1 = $portVersion compat >= 1" +REQUIRES="haiku >= $haikuVersion + apr >= 1.3.9 + expat >= 2.0" +BUILD_REQUIRES="cmd:aclocal + cmd:autoconf + cmd:autoheader + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + +SOURCE_DIR="$portVersionedName" + +# TODO: The hard-coded reference to the apr work directory isn't good at all. +# We should declare a build dependency on the APR sources instead. + BUILD { - cd apr-util-1.3.10 + aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName + aprInstallDir=$aprUtilPackageLinksDir/apr + + # We need the APR sources to build APR-Util. + haikuporter -b -y apr-1.4.2 + aprSourceDir=$(haikuporter -t)/dev-libs/apr/work/apr-1.4.2 + rm -rf aclocal.m4 mkdir -p m4 - haikuporter -b apr-1.4.2 - echo `AC_CONFIG_MACRO_DIR([m4])` >> configure.in - echo `AM_INIT_AUTOMAKE` >> configure.in - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 - libtoolize --force --copy --install - aclocal -I m4 - autoconf --force - APRDIR=`haikuporter -t` - buildconf --with-apr=${APRDIR}/dev-libs/apr/work/apr-1.4.2 + haikuporter -b -y apr-1.4.2 + libtoolize -fci + aclocal --install -I m4 + autoconf -f cd xml/expat mkdir -p m4 - echo `AM_INIT_AUTOMAKE` >> configure.in - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 - libtoolize --force --copy --install - aclocal -I m4 + echo 'AM_INIT_AUTOMAKE' >> configure.in + libtoolize -fci + aclocal --install -I m4 autoconf --force autoheader + touch libtool.m4 cd ../.. - ./configure --prefix=/boot/common --with-apr=/boot/common/bin/apr-1-config + sed -i 's/\/usr\/bin\/env/\/bin\/env/' $aprSourceDir/build/gen-build.py + buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.2 \ + --prefix=$prefix + ln -sf $(which libtool) ./libtool + ./configure $configureDirArgs \ + --with-apr=$aprInstallDir/bin/apr-1-config make } INSTALL { - cd apr-util-1.3.10 make install } + LICENSE="Apache v2" COPYRIGHT="2010 The Apache Software Foundation." From 52c7c8c30082b8c295c8b5dda8d02285dd1749e2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 29 Mar 2013 00:49:32 +0000 Subject: [PATCH 038/587] expat-2.0.1: Update for hpkg building --- dev-libs/expat/expat-2.0.1.bep | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/dev-libs/expat/expat-2.0.1.bep b/dev-libs/expat/expat-2.0.1.bep index 321be5839..a163d044c 100644 --- a/dev-libs/expat/expat-2.0.1.bep +++ b/dev-libs/expat/expat-2.0.1.bep @@ -1,26 +1,39 @@ -DESCRIPTION="XML parsing libraries" +SUMMARY="XML Parser Toolkit" +DESCRIPTION="XML Parser Toolkit" HOMEPAGE="http://expat.sourceforge.net/" SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c" +REVISION="2" +STATUS_HAIKU="stable" + +PROVIDES="expat = $portVersion compat >= 2.0 + lib:libexpat = $portVersion compat >= 1.5" +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES="cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + +SOURCE_DIR="$portVersionedName" + BUILD { - cd expat-2.0.1 rm -f conftools/libtool.m4 echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am libtoolize --force --copy --install aclocal -I conftools -I m4 autoconf - configure --prefix=/boot/common + configure $configureDirArgs make } INSTALL { - cd expat-2.0.1 - make install DESTDIR="${DESTDIR}" + make install } + LICENSE="MIT" COPYRIGHT="1998-2000 Thai Open Source Software Center Ltd and Clark Cooper 2001-2006 Expat maintainers." From 1505e97c1b89f5f8d67f688f68fd573cff3b902f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 29 Mar 2013 00:51:01 +0000 Subject: [PATCH 039/587] libxml2-2.7.8: Update for hpkg building --- dev-libs/libxml2/libxml2-2.7.8.bep | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/dev-libs/libxml2/libxml2-2.7.8.bep b/dev-libs/libxml2/libxml2-2.7.8.bep index 7257a7571..446f12344 100644 --- a/dev-libs/libxml2/libxml2-2.7.8.bep +++ b/dev-libs/libxml2/libxml2-2.7.8.bep @@ -1,27 +1,39 @@ -DESCRIPTION="libxml2 - Version 2 of the library to manipulate XML files" +SUMMARY="The XML C parser and toolkit of Gnome" +DESCRIPTION="The XML C parser and toolkit of Gnome." HOMEPAGE="http://www.xmlsoft.org/" SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz" CHECKSUM_MD5="8127a65e8c3b08856093099b52599c86" -REVISION="1" +REVISION="2" STATUS_HAIKU="broken" -DEPEND="" + +PROVIDES="libxml2 = $portVersion compat >= 2.7 + lib:libxml2 = $portVersion compat >= 2.7" +REQUIRES="haiku >= $haikuVersion + zlib" +BUILD_REQUIRES="cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:make" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + +SOURCE_DIR="$portVersionedName" + BUILD { - cd libxml2-2.7.8 libtoolize --force --copy --install aclocal autoconf automake - ./configure --prefix=/boot/common --enable-ipv6=no LDFLAGS="-lnetwork -L/boot/common/lib" + ./configure $configureDirArgs --enable-ipv6=no LDFLAGS="-lnetwork" make } INSTALL { - cd libxml2-2.7.8 make install } TEST { - cd libxml2-2.7.8 make tests } From 141d1c41ea6f95951db7a4ce31e13b8670688a82 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 29 Mar 2013 00:54:09 +0000 Subject: [PATCH 040/587] openssl-1.0.0d: Update from trunk and update for hpkg building --- dev-libs/openssl/openssl-1.0.0d.bep | 41 ++++++++++++++ dev-libs/openssl/patches/openssl-1.0.0d.patch | 54 +++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 dev-libs/openssl/openssl-1.0.0d.bep create mode 100644 dev-libs/openssl/patches/openssl-1.0.0d.patch diff --git a/dev-libs/openssl/openssl-1.0.0d.bep b/dev-libs/openssl/openssl-1.0.0d.bep new file mode 100644 index 000000000..469c670c3 --- /dev/null +++ b/dev-libs/openssl/openssl-1.0.0d.bep @@ -0,0 +1,41 @@ +SUMMARY="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)" +DESCRIPTION="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)" +HOMEPAGE="http://www.openssl.org/" +SRC_URI="http://www.openssl.org/source/openssl-1.0.0d.tar.gz" +CHECKSUM_MD5="40b6ea380cc8a5bf9734c2f8bf7e701e" +REVISION="2" +STATUS_HAIKU="stable" + +PROVIDES="openssl = $portVersion compat >= 1 + cmd:c_rehash = $portVersion compat >= 1 + cmd:openssl = $portVersion compat >= 1 + lib:libcrypto = $portVersion compat >= 1 + lib:libssl = $portVersion compat >= 1" +REQUIRES="haiku >= $haikuVersion + zlib >= 1.2.3" +BUILD_REQUIRES="cmd:gcc + cmd:ld + cmd:make + cmd:sed" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + +SOURCE_DIR="$portVersionedName" + +BUILD { + sed -i "s@MANDIR=\$(OPENSSLDIR)\/man@MANDIR=$manDir@g" Make* + ./config --prefix=$prefix zlib shared \ + --openssldir=$dataRootDir/ssl + make +} + +INSTALL { + make install +} + +TEST { + make test +} + +LICENSE="OpenSSL" +COPYRIGHT="1995-1998 Eric Young + 1998-2011 The OpenSSL Project." diff --git a/dev-libs/openssl/patches/openssl-1.0.0d.patch b/dev-libs/openssl/patches/openssl-1.0.0d.patch new file mode 100644 index 000000000..79404e3f4 --- /dev/null +++ b/dev-libs/openssl/patches/openssl-1.0.0d.patch @@ -0,0 +1,54 @@ +diff -urN openssl-1.0.0d/Configure openssl-1.0.0d-haiku/Configure +--- openssl-1.0.0d/Configure 2010-11-30 22:19:26.013631488 +0000 ++++ openssl-1.0.0d-haiku/Configure 2010-12-10 09:33:29.000000000 +0000 +@@ -582,6 +582,9 @@ + "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", + "uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", + ++##### Haiku ++"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ + ); + + my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A +diff -urN openssl-1.0.0d/Makefile.shared openssl-1.0.0d-haiku/Makefile.shared +--- openssl-1.0.0d/Makefile.shared 2010-08-21 11:36:49.004456448 +0000 ++++ openssl-1.0.0d-haiku/Makefile.shared 2010-12-10 09:33:29.000000000 +0000 +@@ -594,10 +594,10 @@ + symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos: + + # Compatibility targets +-link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu +-link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu +-link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu +-symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu ++link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu ++link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu ++link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu ++symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu + link_o.bsd-shared: link_o.bsd + link_a.bsd-shared: link_a.bsd + link_app.bsd-shared: link_app.bsd +diff -urN openssl-1.0.0d/config openssl-1.0.0d-haiku/config +--- openssl-1.0.0d/config 2010-03-09 17:08:39.013369344 +0000 ++++ openssl-1.0.0d-haiku/config 2010-12-10 09:33:29.000000000 +0000 +@@ -134,6 +134,10 @@ + echo "${MACHINE}-dg-dgux"; exit 0 + ;; + ++ Haiku:*:BePC) ++ echo "i586-pc-haiku"; exit 0 ++ ;; ++ + HI-UX:*) + echo "${MACHINE}-hi-hiux"; exit 0 + ;; +@@ -799,6 +803,8 @@ + options="$options no-asm" + fi + ;; ++ i586-*-haiku) OUT="haiku-x86" ;; ++ + # these are all covered by the catchall below + # *-dgux) OUT="dgux" ;; + mips-sony-newsos4) OUT="newsos4-gcc" ;; From 4a26d0a4c98098e1e31b06d1a9b3052f754ea449 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 29 Mar 2013 00:55:31 +0000 Subject: [PATCH 041/587] libiconv-1.13.1: Update from trunk and update for hpkg building --- dev-libs/libiconv/libiconv-1.13.1.bep | 69 +++++++++++++++------------ 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/dev-libs/libiconv/libiconv-1.13.1.bep b/dev-libs/libiconv/libiconv-1.13.1.bep index 0e93e1ed9..7eb525a76 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.bep +++ b/dev-libs/libiconv/libiconv-1.13.1.bep @@ -1,53 +1,60 @@ -DESCRIPTION="libiconv" +SUMMARY="GNU iconv implementation" +DESCRIPTION="GNU iconv implementation." HOMEPAGE="http://www.gnu.org/software/libiconv/" SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz" CHECKSUM_MD5="7ab33ebd26687c744a37264a330bbe9a" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" -DEPEND="" + +PROVIDES="iconv = $portVersion compat >= 1.13 + cmd:iconv = 2.5.0 compat >= 2 + lib:libiconv = 2.5.0 compat >= 2 + lib:libcharset = 1.0.0 compat >= 1" +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES="cmd:aclocal + cmd:autoconf + cmd:autoheader + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + +SOURCE_DIR="$portVersionedName" + BUILD { - cd libiconv-1.13.1 rm -rf aclocal.m4 - ln -sf /boot/common/bin/autoconf /boot/common/bin/autoconf-2.63 - ln -sf /boot/common/bin/autoheader /boot/common/bin/autoheader-2.63 - ln -sf /boot/common/bin/aclocal /boot/common/bin/aclocal-1.11 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" - cp -r /boot/common/share/libtool m4 - libtoolize --force --copy --install - aclocal -I m4 -I srcm4 + libtoolize -fci + aclocal --install -I m4 -I srcm4 autoconf autoheader cd libcharset - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 - echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" - libtoolize --force --copy --install - cp -r /boot/common/share/libtool m4 - libtoolize --force --copy --install - aclocal -I m4 + echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" + libtoolize -fci + aclocal --install -I m4 autoconf autoheader cd .. - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + ./configure $configureDirArgs \ + --localedir=$dataRootDir/locale \ --enable-relocatable \ --enable-shared \ - --enable-static + --enable-static \ + --disable-nls make } INSTALL { - cd libiconv-1.13.1 + ACLOCALDIR=$prefix/data/aclocal + mkdir -p ${ACLOCALDIR} + cp -f srcm4/iconv.m4 ${ACLOCALDIR}/iconv.m4 make install +} + +TEST{ make check } + +LICENSE="GNU GPL v3" +COPYRIGHT="2000-2009 Free Software Foundation, Inc." From 43728ff6f4c9fbf3128838d07e478d158f1e072f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 29 Mar 2013 00:58:02 +0000 Subject: [PATCH 042/587] neon-0.29.6: Update from trunk and update for hpkg building --- net-misc/neon/neon-0.29.6.bep | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 net-misc/neon/neon-0.29.6.bep diff --git a/net-misc/neon/neon-0.29.6.bep b/net-misc/neon/neon-0.29.6.bep new file mode 100644 index 000000000..53911385f --- /dev/null +++ b/net-misc/neon/neon-0.29.6.bep @@ -0,0 +1,47 @@ +SUMMARY="HTTP and WebDAV client library, with a C interface" +DESCRIPTION="neon is an HTTP and WebDAV client library, with a C interface." +HOMEPAGE="http://www.webdav.org/neon/" +SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz" +CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc" +REVISION="2" +STATUS_HAIKU="stable" + +PROVIDES="neon = $portVersion compat >= 0.29 + lib:libneon = 27.2.6 compat >= 27.2" +REQUIRES="haiku >= $haikuVersion + openssl >= 1.0.0 + libxml2 >= 2.7.8" +BUILD_REQUIRES="cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:make" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + +SOURCE_DIR="$portVersionedName" + +BUILD { + echo 'LT_INIT' >> configure.in + echo 'AC_CONFIG_MACRO_DIR([macros])' >> configure.in + ./autogen.sh + libtoolize --force --copy --install + aclocal + autoconf + ./autogen.sh + libtoolize --force --copy --install + aclocal -I macros + autoconf + ./configure $configureDirArgs \ + --with-ssl \ + --with-libxml2 \ + --enable-shared \ + --disable-nls + make +} + +INSTALL { + make install +} + +LICENSE="GNU LGPL v2" +COPYRIGHT="1999-2011 Joe Orton" From 95c157ef91d5826d25b8086baa2ee91995759f7b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 29 Mar 2013 00:59:21 +0000 Subject: [PATCH 043/587] sqlite-3.7.5: Update for hpkg building --- dev-db/sqlite/sqlite-3.7.5.bep | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/dev-db/sqlite/sqlite-3.7.5.bep b/dev-db/sqlite/sqlite-3.7.5.bep index 4754ad65b..6cc0b64c7 100644 --- a/dev-db/sqlite/sqlite-3.7.5.bep +++ b/dev-db/sqlite/sqlite-3.7.5.bep @@ -1,23 +1,39 @@ +SUMMARY="A 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." HOMEPAGE="http://www.sqlite.org/" SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="a9604a82613ade2e7f4c303f233e477f" +REVISION="2" +STATUS_HAIKU="stable" + +PROVIDES="sqlite = $portVersion compat >= 3.7 + cmd:sqlite3 = $portVersion compat >= 3.7 + lib:libsqlite = $portVersion compat >= 3.7 + lib:libsqlite3 = $portVersion compat >= 3.7" +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES="cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + +SOURCE_DIR="sqlite-autoconf-3070500" + BUILD { - cd sqlite-autoconf-3070500 libtoolize --force --copy --install aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure $configureDirArgs make } INSTALL { - cd sqlite-autoconf-3070500 make install } + LICENSE="SQLite" COPYRIGHT="Public Domain" From 888e133171ccdab75c27b35c8957271d53d08bc5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 29 Mar 2013 01:02:30 +0000 Subject: [PATCH 044/587] subversion-1.6.15: Update from trunk and update for hpkg building --- .../patches/subversion-1.6.15.patch | 74 +++++++++++++++++++ dev-vcs/subversion/subversion-1.6.15.bep | 68 +++++++++++++---- 2 files changed, 129 insertions(+), 13 deletions(-) create mode 100644 dev-vcs/subversion/patches/subversion-1.6.15.patch diff --git a/dev-vcs/subversion/patches/subversion-1.6.15.patch b/dev-vcs/subversion/patches/subversion-1.6.15.patch new file mode 100644 index 000000000..24e4f81db --- /dev/null +++ b/dev-vcs/subversion/patches/subversion-1.6.15.patch @@ -0,0 +1,74 @@ +diff -urN subversion-1.6.15/subversion/libsvn_subr/config_file.c subversion-1.6.15-haiku/subversion/libsvn_subr/config_file.c +--- subversion-1.6.15/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 ++++ subversion-1.6.15-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 +@@ -32,6 +32,11 @@ + + #include "svn_private_config.h" + ++#ifdef __HAIKU__ ++# include ++# include ++#endif ++ + /* Used to terminate lines in large multi-line string literals. */ + #define NL APR_EOL_STR + +@@ -326,7 +331,19 @@ + SVN_CONFIG__SUBDIRECTORY, fname, NULL); + } + +-#else /* ! WIN32 */ ++#elif defined(__HAIKU__) ++{ ++ char folder[B_PATH_NAME_LENGTH]; ++ ++ status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, ++ folder, sizeof(folder)); ++ if (error) ++ return SVN_NO_ERROR; ++ ++ *path_p = svn_path_join_many(pool, folder, ++ SVN_CONFIG__SYS_DIRECTORY, fname, NULL); ++} ++#else /* ! WIN32 && !__HAIKU__ */ + + *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); + +@@ -1115,8 +1132,21 @@ + *path = svn_path_join_many(pool, folder, + SVN_CONFIG__SUBDIRECTORY, fname, NULL); + } ++ ++#elif defined(__HAIKU__) ++{ ++ char folder[B_PATH_NAME_LENGTH]; ++ ++ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, ++ folder, sizeof(folder)); ++ if (error) ++ return SVN_NO_ERROR; ++ ++ *path = svn_path_join_many(pool, folder, ++ SVN_CONFIG__USR_DIRECTORY, fname, NULL); ++} ++#else /* ! WIN32 && !__HAIKU__ */ + +-#else /* ! WIN32 */ + { + const char *homedir = svn_user_get_homedir(pool); + if (! homedir) +diff -urN subversion-1.6.15/subversion/libsvn_subr/config_impl.h subversion-1.6.15-haiku/subversion/libsvn_subr/config_impl.h +--- subversion-1.6.15/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 ++++ subversion-1.6.15-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 +@@ -109,7 +109,10 @@ + or svn_config_get_user_config_path() instead. */ + #ifdef WIN32 + # define SVN_CONFIG__SUBDIRECTORY "Subversion" +-#else /* ! WIN32 */ ++#elif defined __HAIKU__ /* HAIKU */ ++# define SVN_CONFIG__SYS_DIRECTORY "subversion" ++# define SVN_CONFIG__USR_DIRECTORY "subversion" ++#else /* ! WIN32 && ! __HAIKU__ */ + # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" + # define SVN_CONFIG__USR_DIRECTORY ".subversion" + #endif /* WIN32 */ diff --git a/dev-vcs/subversion/subversion-1.6.15.bep b/dev-vcs/subversion/subversion-1.6.15.bep index cd8ab88ed..036a2146f 100644 --- a/dev-vcs/subversion/subversion-1.6.15.bep +++ b/dev-vcs/subversion/subversion-1.6.15.bep @@ -1,28 +1,70 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" +SUMMARY="Open source version control system" +DESCRIPTION="Subversion is an open source version control system." +HOMEPAGE="http://subversion.apache.org" SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.15.tar.bz2" CHECKSUM_MD5="113fca1d9e4aa389d7dc2b210010fa69" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" -DEPEND="" + +PROVIDES="subversion = $portVersion compat >= 1.6 + cmd:svn = $portVersion compat >= 1.6 + cmd:svnadmin = $portVersion compat >= 1.6 + cmd:svndumpfilter = $portVersion compat >= 1.6 + cmd:svnlook = $portVersion compat >= 1.6 + cmd:svnserve = $portVersion compat >= 1.6 + cmd:svnsync = $portVersion compat >= 1.6 + cmd:svnversion = $portVersion compat >= 1.6 + lib:libiconv = 2.5.0 compat >= 2 + lib:libcharset = 1.0.0 compat >= 1" +REQUIRES="haiku >= $haikuVersion + apr >= 1.3 + apr-util >= 1.3 + expat >= 2.0 + libiconv >= 1.13 + libxml2 >= 2.7 + neon >= 0.29 + sqlite >= 3.4 + zlib" +BUILD_REQUIRES="cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + +SOURCE_DIR="$portVersionedName" + BUILD { - cd subversion-1.6.15 libtoolize --force --copy --install aclocal -I build -I build/ac-macros autoconf - ./autogen.sh - ./configure --prefix=/boot/common \ - --with-apr=/boot/common/bin/apr-1-config \ - --with-apr-util=/boot/common/bin/apu-1-config \ - --with-neon=/boot/common \ - --with-editor=nano \ - --with-zlib=/boot/common + subversionPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName + ./configure $configureDirArgs \ + --with-apr=$subversionPackageLinksDir/apr/bin/apr-1-config \ + --with-apr-util=$subversionPackageLinksDir/apr-util/bin/apu-1-config \ + --with-neon=$subversionPackageLinksDir/neon \ + --with-zlib=$subversionPackageLinksDir/zlib \ + --with-editor=nano \ + --disable-nls make } INSTALL { - cd subversion-1.6.15 make install + if type -p swig > /dev/null;then + if type -p python > /dev/null;then + PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") + make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn + fi + #if type -p perl > /dev/null;then + # make install-swig-pl + #fi + #if type -p ruby > /dev/null;then + # make install-swig-rb + #fi + fi } + LICENSE="Apache-Subversion" COPYRIGHT="2010 The Apache Software Foundation" From 94cc6aaf85fa88dc7f3e484707bd492e4f8a4873 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 29 Mar 2013 14:04:07 +0000 Subject: [PATCH 045/587] Merge all changes from trunk --- app-admin/pwgen/pwgen-2.06.bep | 2 +- app-arch/arc/arc-5.21o.bep | 6 +- app-arch/cabextract/cabextract-1.2.bep | 2 +- app-arch/cabextract/cabextract-1.3.bep | 2 +- app-arch/cpio/cpio-2.10.bep | 12 +- app-arch/cpio/cpio-2.11.bep | 29 + app-arch/cpio/patches/cpio-2.10.patch | 5 +- app-arch/cpio/patches/cpio-2.11.patch | 32 + app-arch/fastjar/fastjar-0.98.bep | 2 +- app-arch/gzip/gzip-1.2.4a.bep | 2 +- app-arch/gzip/gzip-1.3.12.bep | 2 +- app-arch/gzip/gzip-1.4.bep | 21 + app-arch/gzip/patches/gzip-1.4.patch | 18 + app-arch/lha/lha-1.14i.bep | 2 +- app-arch/libarchive/libarchive-2.8.5.bep | 34 + app-arch/libarchive/libarchive-3.0.3.bep | 34 + app-arch/p7zip/p7zip-9.04.bep | 10 +- app-arch/p7zip/p7zip-9.13.bep | 9 +- app-arch/p7zip/p7zip-9.20.1.bep | 22 + app-arch/p7zip/patches/p7zip-9.20.1.patch | 53 + app-arch/sharutils/sharutils-4.10.bep | 9 +- app-arch/tar/patches/tar-1.26.patch | 108 + app-arch/tar/tar-1.22.bep | 4 +- app-arch/tar/tar-1.23.bep | 2 +- app-arch/tar/tar-1.25.bep | 15 +- app-arch/tar/tar-1.26.bep | 26 + app-arch/unrar/patches/unrar-4.2.4.patch | 263 + app-arch/unrar/unrar-4.2.4.bep | 19 + app-arch/unzip/unzip-6.0.bep | 28 + app-arch/xar/patches/xar-1.5.2.patch | 24 + app-arch/xar/xar-1.5.2.bep | 25 + app-arch/xz-utils/xz-utils-4.999.9.bep | 4 +- app-arch/xz-utils/xz-utils-5.0.1.bep | 34 + app-arch/xz-utils/xz-utils-5.0.4.bep | 34 + .../patches/zip-3.0.patch} | 0 app-arch/zip/zip-3.0.bep | 27 + app-benchmarks/bonnie++/bonnie++-1.03e.bep | 8 +- app-benchmarks/libmicro/libmicro-0.4.1.bep | 26 + .../libmicro/patches/libmicro-0.4.1.patch | 124 + .../piozone/patches/piozone-1.0.patch | 40 + app-benchmarks/piozone/piozone-1.0.bep | 20 + app-cdr/bchunk/bchunk-1.2.0.bep | 18 +- app-cdr/cdrdao/cdrdao-1.2.3.bep | 2 +- app-cdr/cdrtools/cdrtools-2.01.01a66.bep | 2 +- app-cdr/cdrtools/cdrtools-3.01a01.bep | 13 +- app-cdr/cdrtools/cdrtools-3.01a06.bep | 27 + app-cdr/cdrtools/cdrtools-3.01a07.bep | 27 + .../cdrtools/patches/cdrtools-3.01a01.patch | 23 + .../cdrtools/patches/cdrtools-3.01a06.patch | 23 + .../cdrtools/patches/cdrtools-3.01a07.patch | 139 + app-cdr/daa2iso/daa2iso-0.1.7e.bep | 20 + app-cdr/uif2iso/uif2iso-0.1.7c.bep | 19 + app-crypt/gnupg/gnupg-1.4.10.bep | 2 +- app-crypt/gnupg/gnupg-1.4.11.bep | 2 +- app-doc/doxygen/doxygen-1.6.3.bep | 3 +- app-doc/doxygen/doxygen-1.7.4.bep | 20 + app-doc/doxygen/patches/doxygen-1.7.4.patch | 158 + app-editors/joe/joe-3.8-hg.bep | 9 +- app-editors/nano/nano-2.2.3.bep | 2 +- app-editors/nano/nano-2.2.5.bep | 2 +- app-editors/nano/nano-2.2.6.bep | 9 +- app-editors/nano/nano-2.3.1.bep | 25 + app-editors/ne/ne-2.1.bep | 19 + app-editors/ne/patches/ne-2.1.patch | 39 + .../qemacs/patches/qemacs-0.3.2dev-cvs.patch | 1558 ++ app-editors/qemacs/patches/qemacs-0.3.3.patch | 1393 ++ app-editors/qemacs/qemacs-0.3.2dev-cvs.bep | 20 + app-editors/qemacs/qemacs-0.3.3.bep | 20 + app-editors/se/se-3.0.bep | 24 + app-editors/vim/patches/vim-7.3.patch | 1071 +- app-editors/vim/vim-7.2.bep | 2 +- app-editors/vim/vim-7.3.bep | 2 +- app-emulation/aranym/aranym-0.9.11-cvs.bep | 23 + app-emulation/libdsk/libdsk-1.3.3.bep | 28 + app-emulation/mednafen/mednafen-0.9.26.bep | 29 + .../mednafen/patches/mednafen-0.9.26.patch | 13 + app-emulation/oricutron/oricutron-0.9-svn.bep | 20 + app-emulation/pearpc/pearpc-0.5.0-cvs.bep | 22 + app-emulation/qemu/qemu-0.12.4.bep | 2 +- app-i18n/anthy/anthy-9100.bep | 2 +- app-misc/colordiff/colordiff-1.0.10.bep | 23 + .../colordiff/patches/colordiff-1.0.10.patch | 9 + app-misc/getopt/getopt-1.1.4.bep | 2 +- app-misc/strigi/patches/strigi-0.7.8.patch | 40 + app-office/abiword/abiword-2.8.6.bep | 29 + .../abiword/patches/abiword-2.8.6.patch | 84 + app-shells/fish/fish-1.23.1-git.bep | 29 + app-shells/fish/patches/fish-1.23.1-git.patch | 152 + app-shells/zsh/patches/zsh-5.0.0.patch | 55 + app-shells/zsh/zsh-4.3.10.bep | 2 +- app-shells/zsh/zsh-5.0.0.bep | 25 + app-text/antiword/antiword-0.37.bep | 12 +- app-text/antiword/patches/antiword-0.37.patch | 116 + app-text/aspell/aspell-0.60.6.bep | 2 +- app-text/convmv/convmv-1.15.bep | 29 + app-text/convmv/patches/convmv-1.15.patch | 19 + app-text/discount/discount-2.1.3.bep | 21 + app-text/ebook-tools/ebook-tools-0.2.1.bep | 23 + app-text/gocr/gocr-0.49.bep | 26 + app-text/gocr/patches/gocr-0.49.patch | 58 + app-text/gpp/gpp-2.4.bep | 24 + app-text/gpp/licenses/GPP | 11 + app-text/htmldoc/htmldoc-1.8.27.bep | 33 + app-text/htmldoc/patches/htmldoc-1.8.27.patch | 124 + app-text/hunspell/hunspell-1.3.2.bep | 33 + app-text/libpaper/libpaper-1.1.23.bep | 2 +- app-text/libpaper/libpaper-1.1.24.bep | 21 +- app-text/libwpd/libwpd-0.9.6.bep | 25 + app-text/libwpg/libwpg-0.2.1.bep | 23 + app-text/psiconv/psiconv-0.9.8.bep | 2 +- app-text/rman/rman-3.2.bep | 16 +- app-text/sablotron/sablotron-1.0.3.bep | 3 +- app-text/tesseract/tesseract-3.x-svn.bep | 29 + app-text/tree/patches/tree-1.6.0.patch | 28 + app-text/tree/tree-1.6.0.bep | 25 + dev-cpp/eigen/eigen-3.1.2.bep | 28 + dev-cpp/eigen/licenses/MPL v2 | 373 + dev-cpp/glog/glog-0.3.3.bep | 28 + dev-cpp/mm-common/mm-common-0.9.2.bep | 2 +- dev-cpp/mxml/mxml-2.6.bep | 2 +- dev-db/mysql/mysql-5.0.83.bep | 23 + dev-db/mysql/patches/mysql-5.0.83.patch | 101 + dev-db/postgresql/licenses/PostgreSQL | 23 + .../postgresql/patches/postgresql-9.0.4.patch | 19 + .../postgresql/patches/postgresql-9.2.3.patch | 19 + dev-db/postgresql/postgresql-9.0.4.bep | 27 + dev-db/postgresql/postgresql-9.2.3.bep | 27 + dev-db/redis/patches/redis-2.2.11.patch | 82 + dev-db/redis/patches/redis-2.9.0-git.patch | 105 + dev-db/redis/redis-2.2.11.bep | 20 + dev-db/redis/redis-2.9.0-git.bep | 20 + dev-db/sqlite/patches/sqlite-3.7.13.patch | 20 + dev-db/sqlite/sqlite-3.6.22.bep | 2 +- dev-db/sqlite/sqlite-3.6.23.bep | 2 +- dev-db/sqlite/sqlite-3.7.13.bep | 26 + dev-db/sqlite/sqlite-3.7.15.1.bep | 26 + dev-db/sqlite/sqlite-3.7.2.bep | 2 +- dev-db/sqlite/sqlite-3.7.3.bep | 2 +- dev-db/sqlite/sqlite-3.7.4.bep | 2 +- dev-db/sqlite/sqlite-3.7.6.2.bep | 26 + dev-db/sqlite/sqlite-3.7.7.1.bep | 26 + .../patches/u-boot-tools-2012.10.patch | 120 + .../u-boot-tools/u-boot-tools-2012.10.bep | 20 + dev-games/flatzebra/flatzebra-0.1.3.bep | 2 +- dev-games/libggz/libggz-0.99.5.bep | 24 + dev-games/libggz/patches/libggz-0.99.5.patch | 28 + dev-games/ode/ode-0.12.bep | 17 + dev-games/ode/patches/ode-0.12.patch | 24 + dev-games/physfs/physfs-2.0.1.bep | 16 +- dev-java/gnu-classpath/gnu-classpath-0.98.bep | 9 +- dev-java/jamvm/jamvm-1.5.4.bep | 2 +- dev-lang/camlp5/camlp5-6.06.bep | 24 + dev-lang/dmd-bin/dmd-bin-1.064.bep | 4 +- dev-lang/fpc/fpc-2.6.0.bep | 38 + dev-lang/lua/lua-5.1.4-3.bep | 21 + dev-lang/lua/lua-5.1.4.bep | 21 +- dev-lang/lua/lua-5.2.1.bep | 18 + dev-lang/lua/patches/lua-5.1.4-3.patch | 276 + dev-lang/lua/patches/lua-5.2.1.patch | 91 + dev-lang/nasm/nasm-2.08.01.bep | 2 +- dev-lang/ocaml/ocaml-4.00.0.bep | 23 + dev-lang/ocaml/patches/ocaml-4.00.0.patch | 59 + dev-lang/openjdk/openjdk-1.7.bep | 99 + dev-lang/openjdk/patches/openjdk-1.7.patch | 213 + dev-lang/orc/orc-0.4.16.bep | 24 + dev-lang/orc/patches/orc-0.4.16.patch | 11 + dev-lang/perl/patches/perl-5.10.0.patch | 22 + dev-lang/php/php-5.3.4.bep | 2 +- dev-lang/python/patches/python-2.6.7.patch | 568 + dev-lang/python/patches/python-2.6.8.patch | 568 + dev-lang/python/patches/python-3.2.patch | 187 + dev-lang/python/python-2.5.4.bep | 2 +- dev-lang/python/python-2.6.4.bep | 2 +- dev-lang/python/python-2.6.5.bep | 2 +- dev-lang/python/python-2.6.6.bep | 5 +- .../{python-3.2a3.bep => python-2.6.7.bep} | 16 +- .../{python-3.2a4.bep => python-2.6.8.bep} | 16 +- dev-lang/python/python-2.7a1.bep | 25 - .../{python-3.2b2.bep => python-3.2.bep} | 17 +- dev-lang/rebol/rebol-2.101.0.5.75.bep | 33 + dev-lang/ruby/ruby-1.9.1.bep | 7 +- dev-lang/swi-prolog/licenses/SWI-Prolog | 5 + .../swi-prolog/patches/swi-prolog-6.0.2.patch | 68 + .../swi-prolog/patches/swi-prolog-6.2.0.patch | 67 + dev-lang/swi-prolog/swi-prolog-6.0.2.bep | 29 + dev-lang/swi-prolog/swi-prolog-6.2.0.bep | 29 + dev-lang/swig/swig-1.3.40.bep | 2 +- dev-lang/swig/swig-2.0.2.bep | 23 + dev-lang/tcl/patches/tcl-8.5.9.patch | 49 + dev-lang/tcl/tcl-8.5.9.bep | 28 + dev-lang/tcl/tcl-8.6b1-1.build | 7 + dev-lang/tcl/tcl-8.6b1-1.install | 2 + dev-lang/tcl/tcl-8.6b1-1.patch | 99 + dev-lang/tcl/tcl-8.6b1-1.test | 2 + dev-lang/v8/patches/gyp-r1501.patch | 2460 +++ dev-lang/v8/patches/v8-r13067.patch | 1381 ++ dev-lang/v8/v8-r13067.bep | 46 + dev-lang/yasm/patches/yasm-0.7.1.patch | 12 - dev-lang/yasm/yasm-0.7.1.bep | 25 - dev-lang/yasm/yasm-0.8.0.bep | 27 - dev-lang/yasm/yasm-1.1.0.bep | 10 +- dev-lang/yasm/yasm-1.2.0.bep | 28 + dev-libs/apr-util/apr-util-1.3.11.bep | 49 + dev-libs/apr-util/apr-util-1.3.12.bep | 49 + dev-libs/apr-util/apr-util-1.3.9.bep | 2 +- dev-libs/apr-util/apr-util-1.4.1.bep | 49 + .../apr-util/patches/apr-util-1.3.10.patch | 27 + .../apr-util/patches/apr-util-1.3.11.patch | 27 + .../apr-util/patches/apr-util-1.3.12.patch | 27 + .../apr-util/patches/apr-util-1.4.1.patch | 27 + dev-libs/apr/apr-1.3.8.bep | 2 +- dev-libs/apr/apr-1.3.9.bep | 2 +- dev-libs/apr/apr-1.4.4.bep | 39 + dev-libs/apr/apr-1.4.5.bep | 39 + dev-libs/apr/apr-1.4.6.bep | 39 + dev-libs/apr/patches/apr-1.4.2.patch | 192 +- dev-libs/apr/patches/apr-1.4.4.patch | 39 + dev-libs/apr/patches/apr-1.4.5.patch | 50 + dev-libs/apr/patches/apr-1.4.6.patch | 50 + dev-libs/atk/atk-1.29.2.bep | 2 +- dev-libs/atk/atk-1.30.0.bep | 2 +- dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep | 34 + dev-libs/boehm-gc/boehm-gc-7.2d.bep | 33 + dev-libs/boehm-gc/licenses/BOEHM | 29 + .../patches/boehm-gc-7.2_alpha6.patch | 247 + dev-libs/boehm-gc/patches/boehm-gc-7.2d.patch | 248 + dev-libs/boost/boost-1.42.0.bep | 4 +- dev-libs/boost/boost-1.50.0.bep | 50 + dev-libs/boost/boost-1.53.0.bep | 50 + dev-libs/boost/licenses/Boost v1.0 | 23 + dev-libs/boost/patches/boost-1.50.0.patch | 337 + dev-libs/boost/patches/boost-1.53.0.patch | 337 + dev-libs/chmlib/chmlib-0.40.bep | 28 + dev-libs/cyassl/cyassl-2.0.2.bep | 36 + dev-libs/cyassl/cyassl-2.5.0.bep | 36 + dev-libs/fribidi/fribidi-0.19.2.bep | 22 +- dev-libs/glib/glib-2.22.2.bep | 2 +- dev-libs/glib/glib-2.24.1.bep | 11 +- dev-libs/glib/glib-2.24.2.bep | 22 +- dev-libs/glib/glib-2.26.1.bep | 9 +- dev-libs/gmp/gmp-4.3.1.bep | 2 +- dev-libs/gmp/gmp-4.3.2.bep | 2 +- dev-libs/gmp/gmp-5.0.5.bep | 30 + dev-libs/gmp/gmp-5.1.1.bep | 30 + dev-libs/icu/icu-4.4.1.bep | 2 +- dev-libs/icu/icu-4.8.1.bep | 20 + dev-libs/icu/patches/icu-4.8.1.patch | 591 + dev-libs/jansson/jansson-2.4.bep | 28 + dev-libs/json-c/json-c-0.9.bep | 2 +- dev-libs/libattica/libattica-0.4.1.bep | 20 + dev-libs/libcdio/libcdio-0.82.bep | 2 +- dev-libs/libcdio/libcdio-0.83.bep | 25 + dev-libs/libcdio/libcdio-0.90.bep | 26 + dev-libs/libcdio/patches/libcdio-0.83.patch | 20 + dev-libs/libcss/libcss-0.1.2.bep | 20 + dev-libs/libdwarf/libdwarf-20120410.bep | 28 + .../libdwarf/patches/libdwarf-20120410.patch | 67 + dev-libs/libedit/libedit-20090923.bep | 2 +- dev-libs/libedit/libedit-20100424.bep | 4 +- dev-libs/libedit/libedit-20110802-3.0.bep | 22 + dev-libs/libedit/libedit-20120601-3.0.bep | 22 + .../patches/libedit-20110802-3.0.patch | 66 + .../patches/libedit-20120601-3.0.patch | 66 + dev-libs/libelf/libelf-0.8.13.bep | 22 + dev-libs/libelf/patches/libelf-0.8.13.patch | 25 + dev-libs/libevent/libevent-1.4.11.bep | 2 +- dev-libs/libevent/libevent-1.4.13.bep | 2 +- dev-libs/libevent/libevent-1.4.14b.bep | 10 +- dev-libs/libevent/libevent-2.0.10.bep | 10 +- dev-libs/libffi/libffi-3.0.11.bep | 21 + dev-libs/libffi/libffi-3.0.9.bep | 2 +- dev-libs/libgcrypt/libgcrypt-1.4.5.bep | 2 +- dev-libs/libgcrypt/libgcrypt-1.5.0.bep | 24 + .../libgcrypt/patches/libgcrypt-1.5.0.patch | 10 + dev-libs/libgpg-error/libgpg-error-1.10.bep | 26 + dev-libs/libgpg-error/libgpg-error-1.7.bep | 2 +- .../patches/libgpg-error-1.10.patch | 11 + dev-libs/libiconv/libiconv-1.12.bep | 32 +- dev-libs/liboil/liboil-0.3.17.bep | 2 +- dev-libs/liboil/patches/liboil-0.3.17.patch | 8 + .../libparserutils/libparserutils-0.1.1.bep | 19 + dev-libs/libpcre/libpcre-8.00.bep | 2 +- dev-libs/libpcre/libpcre-8.02.bep | 10 +- dev-libs/libpcre/libpcre-8.12.bep | 13 +- dev-libs/libpcre/libpcre-8.21.bep | 38 + .../libpthread-stubs-0.3.2.bep | 2 +- .../libpthread-stubs/libpthread-stubs-0.3.bep | 2 +- dev-libs/libsigc++/libsigc++-1.2.7.bep | 2 +- dev-libs/libsigc++/libsigc++-2.2.7.bep | 2 +- .../libunistring/libunistring-0.9.1.1.bep | 2 +- .../libwapcaplet/libwapcaplet-0.1.1-HEAD.bep | 20 + dev-libs/libwapcaplet/libwapcaplet-0.1.1.bep | 19 + .../libxdg-basedir/libxdg-basedir-1.1.1.bep | 2 +- dev-libs/libxml2/libxml2-2.7.3.bep | 2 +- dev-libs/libxml2/libxml2-2.7.6.bep | 2 +- dev-libs/libxml2/libxml2-2.7.7.bep | 2 +- dev-libs/libxml2/libxml2-2.8.0.bep | 35 + dev-libs/libxml2/libxml2-2.9.0.bep | 36 + dev-libs/libxml2/patches/libxml2-2.9.0.patch | 33 + dev-libs/libxslt/libxslt-1.1.26.bep | 9 +- dev-libs/libxslt/libxslt-1.1.28.bep | 30 + dev-libs/libzip/libzip-0.10.1.bep | 22 + dev-libs/libzip/libzip-0.10.bep | 22 + dev-libs/lzo/lzo-2.06.bep | 25 + dev-libs/mpc/mpc-1.0.1.bep | 31 + dev-libs/mpfr/mpfr-3.1.1.bep | 31 + dev-libs/oniguruma/oniguruma-5.9.2.bep | 28 + .../oniguruma/patches/oniguruma-5.9.2.patch | 11 + dev-libs/openssl/openssl-0.9.8l.bep | 2 +- dev-libs/openssl/openssl-0.9.8m.bep | 2 +- dev-libs/openssl/openssl-1.0.0.bep | 2 +- dev-libs/openssl/openssl-1.0.0a.bep | 2 +- dev-libs/openssl/openssl-1.0.0c.bep | 2 +- dev-libs/openssl/openssl-1.0.0e.bep | 28 + dev-libs/openssl/openssl-1.0.0g.bep | 28 + dev-libs/openssl/openssl-1.0.0j.bep | 28 + dev-libs/openssl/patches/openssl-1.0.0e.patch | 54 + dev-libs/openssl/patches/openssl-1.0.0g.patch | 54 + dev-libs/openssl/patches/openssl-1.0.0j.patch | 60 + dev-libs/popt/popt-1.16.bep | 2 +- .../protobuf/patches/protobuf-2.4.1.patch | 30 + dev-libs/protobuf/protobuf-2.4.1.bep | 28 + dev-libs/raptor2/raptor2-2.0.8.bep | 30 + dev-libs/rasqal/patches/rasqal-0.9.29.patch | 11 + dev-libs/rasqal/rasqal-0.9.29.bep | 30 + dev-libs/redland/redland-1.0.15.bep | 29 + dev-libs/serd/patches/serd-0.18.0.patch | 25 + dev-libs/serd/serd-0.18.0.bep | 24 + dev-libs/tinyxml/tinyxml-2.6.2.bep | 27 + dev-libs/uriparser/uriparser-0.7.5.bep | 2 +- dev-libs/zziplib/zziplib-0.13.59.bep | 7 +- dev-lua/luarocks/luarocks-2.0.4.1.bep | 20 + dev-python/cnf/cnf-1.0-git.bep | 18 + dev-python/pylzma/pylzma-0.4.4.bep | 21 + dev-python/pyxml/licenses/PyXML | 341 + dev-python/pyxml/pyxml-0.8.4.bep | 18 + dev-python/rdflib/rdflib-3.2.0.bep | 18 + dev-python/setuptools/setuptools-0.6.bep | 7 +- dev-qt/qtcore/patches/qt-4.7.3.patch | 14261 ++++++++++++++++ dev-qt/qtcore/qtcore-4.7.3.bep | 24 + .../qtcore/qtcore-4.8.x-git.bep | 8 +- dev-qt/qtcore/qtcore-4.8.x.bep | 24 + dev-scheme/chicken/chicken-4.7.0.bep | 40 + .../abi-compliance-checker-1.98.3.bep | 34 + .../example-descriptors/README | 29 + .../example-descriptors/libjpeg-6.2.desc | 44 + .../example-descriptors/libjpeg-7.desc | 44 + .../example-descriptors/libjpeg-8.desc | 44 + .../example-descriptors/libpng-1.2.42.desc | 41 + .../example-descriptors/libpng-1.4.0.desc | 41 + .../example-descriptors/zlib-1.1.4.desc | 42 + .../example-descriptors/zlib-1.2.2.desc | 42 + .../example-descriptors/zlib-1.2.3.desc | 42 + dev-util/astyle/astyle-r339.bep | 22 + dev-util/astyle/astyle-r361.bep | 22 + dev-util/automoc/automoc-4-git.bep | 20 + dev-util/bakefile/bakefile-0.2.8.bep | 2 +- dev-util/bsdbuild/bsdbuild-2.9.bep | 39 + dev-util/bsdbuild/patches/bsdbuild-2.9.patch | 27 + dev-util/buildsystem/buildsystem-0.bep | 19 + dev-util/ccache/ccache-3.0.1.bep | 3 +- dev-util/ccache/ccache-3.1.4.bep | 22 + dev-util/ccache/ccache-3.1.7.bep | 22 + dev-util/cmake/cmake-2.8-git.bep | 33 + dev-util/cmake/cmake-2.8.10.2.bep | 27 + dev-util/cmake/patches/cmake-2.8-git.patch | 229 + dev-util/cmake/patches/cmake-2.8.10.2.patch | 460 + dev-util/cppunit/cppunit-1.12.1.bep | 21 + dev-util/cscope/cscope-15.7a.bep | 2 +- dev-util/ctags/ctags-5.8.bep | 6 +- dev-util/diffstat/diffstat-1.51.bep | 2 +- dev-util/fastdep/fastdep-0.16.bep | 2 +- dev-util/global/global-5.8.1.bep | 20 - dev-util/global/global-5.8.2.bep | 21 - dev-util/global/global-5.8.bep | 20 - dev-util/global/global-5.9.1.bep | 21 - dev-util/global/global-5.9.bep | 21 - dev-util/global/global-6.2.2.bep | 27 + dev-util/global/global-6.2.4.bep | 27 + dev-util/global/patches/global-5.8.1.patch | 14 - dev-util/global/patches/global-5.8.2.patch | 25 - dev-util/global/patches/global-5.8.patch | 14 - dev-util/global/patches/global-5.9.1.patch | 25 - dev-util/global/patches/global-5.9.patch | 25 - dev-util/global/patches/global-6.2.2.patch | 38 + dev-util/global/patches/global-6.2.4.patch | 38 + dev-util/gperf/gperf-3.0.4.bep | 9 +- dev-util/gtk-doc/gtk-doc-1.15.bep | 2 +- dev-util/idutils/idutils-20061208.bep | 2 +- dev-util/idutils/idutils-4.2.bep | 2 +- dev-util/intltool/intltool-0.40.6.bep | 7 +- dev-util/patchutils/patchutils-0.3.1.bep | 2 +- dev-util/patchutils/patchutils-0.3.2.bep | 20 + dev-util/pkgconfig/pkgconfig-0.23.bep | 17 +- dev-util/pkgconfig/pkgconfig-0.25.bep | 22 +- dev-util/premake/patches/premake-4.3.patch | 37 + dev-util/premake/premake-4.3.bep | 21 + dev-util/quilt/quilt-0.48.bep | 2 +- dev-util/scons/patches/scons-2.0.1.patch | 70 + dev-util/scons/patches/scons-2.2.0.patch | 70 + dev-util/scons/scons-2.0.1.bep | 28 + dev-util/scons/scons-2.2.0.bep | 28 + dev-vcs/bzr/bzr-2.2.0.bep | 19 +- dev-vcs/bzr/bzr-2.5.1.bep | 35 + dev-vcs/bzr/bzr-2.6b1.bep | 35 + dev-vcs/cvs/cvs-1.12.13.bep | 7 +- dev-vcs/cvs/patches/cvs-1.12.13.1.patch | 132 +- dev-vcs/fossil/fossil-1.22-fossil.bep | 23 + dev-vcs/fossil/fossil-1.22.bep | 26 + dev-vcs/fossil/patches/fossil-1.22.patch | 20 + dev-vcs/git/git-1.6.5.3.bep | 39 - dev-vcs/git/git-1.7.0.1.bep | 49 - dev-vcs/git/git-1.7.0.4.bep | 21 - dev-vcs/git/git-1.7.0.5.bep | 21 - dev-vcs/git/git-1.7.1.bep | 22 - dev-vcs/git/git-1.7.10.2.bep | 26 + dev-vcs/git/git-1.7.11.3.bep | 26 + dev-vcs/git/git-1.7.3.1.bep | 22 - dev-vcs/git/git-1.7.3.5.bep | 26 - dev-vcs/git/git-1.8.0.bep | 26 + dev-vcs/git/git-1.8.1.3.bep | 26 + dev-vcs/git/patches/git-1.5.5.diff | 54 - dev-vcs/git/patches/git-1.7.0.4.patch | 25 - dev-vcs/git/patches/git-1.7.0.5.patch | 25 - dev-vcs/git/patches/git-1.7.1.patch | 25 - dev-vcs/git/patches/git-1.7.10.2.patch | 47 + dev-vcs/git/patches/git-1.7.11.3.patch | 47 + dev-vcs/git/patches/git-1.8.0.patch | 47 + dev-vcs/git/patches/git-1.8.1.3.patch | 47 + dev-vcs/gitdoc/gitdoc-1.7.10.2.bep | 32 + dev-vcs/gitdoc/gitdoc-1.7.11.3.bep | 32 + dev-vcs/gitdoc/gitdoc-1.8.0.bep | 32 + dev-vcs/gitdoc/gitdoc-1.8.1.3.bep | 32 + dev-vcs/mercurial/mercurial-1.4.2.bep | 18 - dev-vcs/mercurial/mercurial-1.4.bep | 18 - dev-vcs/mercurial/mercurial-1.5.1.bep | 22 - dev-vcs/mercurial/mercurial-1.5.2.bep | 22 - dev-vcs/mercurial/mercurial-1.5.3.bep | 22 - dev-vcs/mercurial/mercurial-1.5.bep | 22 - dev-vcs/mercurial/mercurial-1.6.bep | 22 - dev-vcs/mercurial/mercurial-1.7.3.bep | 28 - dev-vcs/mercurial/mercurial-2.2.2.bep | 30 + dev-vcs/mercurial/mercurial-2.2.3.bep | 30 + dev-vcs/mercurial/mercurial-2.3.bep | 30 + dev-vcs/mercurial/mercurial-2.4.bep | 30 + .../patches/mercurial-1.0.2-haiku.diff | 24 - .../mercurial/patches/mercurial-1.5.1.patch | 12 - .../mercurial/patches/mercurial-1.5.2.patch | 12 - .../mercurial/patches/mercurial-1.5.3.patch | 12 - dev-vcs/mercurial/patches/mercurial-1.6.patch | 12 - .../mercurial/patches/mercurial-1.7.3.patch | 12 - .../mercurial/patches/mercurial-2.2.2.patch | 12 + .../mercurial/patches/mercurial-2.2.3.patch | 12 + dev-vcs/mercurial/patches/mercurial-2.3.patch | 12 + dev-vcs/mercurial/patches/mercurial-2.4.patch | 12 + .../patches/subversion-1.6.17.patch | 86 + .../patches/subversion-1.6.18.patch | 86 + dev-vcs/subversion/subversion-1.6.11.bep | 6 +- dev-vcs/subversion/subversion-1.6.12.bep | 6 +- dev-vcs/subversion/subversion-1.6.13.bep | 6 +- dev-vcs/subversion/subversion-1.6.17.bep | 56 + dev-vcs/subversion/subversion-1.6.18.bep | 56 + dev-vcs/subversion/subversion-1.6.6.bep | 2 +- dev-vcs/subversion/subversion-1.6.9.bep | 2 +- dev-vcs/subversion/subversion-1.7.0-rc2.bep | 56 + dev-vcs/subversion/subversion-1.7.xx-svn.bep | 6 +- dev-vcs/tig/tig-0.16.bep | 2 +- games-action/bzflag/bzflag-2.0.14.bep | 2 +- games-action/cylindrix/cylindrix-1.0.bep | 2 +- .../alienblaster/alienblaster-1.1.0.bep | 26 + .../supertux/patches/supertux-0.1.3.patch | 12 + games-arcade/supertux/supertux-0.1.3.bep | 22 + games-emulation/dosbox/dosbox-0.74-svn.bep | 25 + games-emulation/dosbox/dosbox-0.74-svn.patch | 20 + .../patches/visualboyadvance-1.7.2.patch | 11 + .../visualboyadvance-1.7.2.bep | 31 + games-misc/sdljoytest/sdljoytest-11102003.bep | 26 + games-puzzle/abrick/abrick-1.12.bep | 23 + .../wizznic/patches/wizznic-0.9.9.patch | 12 + games-puzzle/wizznic/wizznic-0.9.9.bep | 30 + games-rpg/freedroid/freedroid-1.0.2.bep | 24 + .../freedroid/patches/freedroid-1.0.2.patch | 16 + games-simulation/openttd/openttd-1.2.3.bep | 30 + gnome-base/gnome-common/gnome-common-2.28.bep | 2 +- gnome-extra/libgsf/libgsf-1.14.18.bep | 2 +- haiku-apps/W6/W6-1.7.bep | 26 + haiku-apps/W6/patches/w6-1.7.patch | 34 + haiku-apps/album/album-0.9.2.bep | 18 + haiku-apps/aplayer/aplayer-4.0.1.bep | 21 + haiku-apps/armyknife/armyknife-61.bep | 2 +- haiku-apps/armyknife/armyknife-62.bep | 18 + haiku-apps/armyknife/armyknife-63.bep | 18 + haiku-apps/armyknife/armyknife-999-git.bep | 19 + haiku-apps/artpaint/artpaint-339.bep | 2 +- haiku-apps/beae/beae-25.bep | 27 + haiku-apps/beam/beam-1.2alpha.bep | 26 + haiku-apps/beezer/beezer-1.bep | 26 + haiku-apps/beget/beget-1.2.3.bep | 24 + haiku-apps/behappy/behappy-16.bep | 19 + haiku-apps/behappy/patches/Makefile | 27 + ...epdf-1.1.1b2-532.bep => bepdf-1.1.1b4.bep} | 16 +- haiku-apps/beshare/beshare-4.bep | 18 + haiku-apps/bowser/bowser-1.1.1-cvs.bep | 17 + haiku-apps/burnitnow/burnitnow-2-svn.bep | 24 + haiku-apps/burnitnow/burnitnow-43.bep | 31 + haiku-apps/burnitnow/burnitnow-beta5-svn.bep | 31 + haiku-apps/burnitnow/burnitnow-beta6-git.bep | 33 + haiku-apps/burnitnow/burnitnow-beta6.bep | 33 + .../patches/burnitnow-beta5-svn.patch | 146 + .../caya-gpl-protocols-0.HEAD.bep | 29 + .../caya-gpl-protocols-19.bep | 28 + .../caya-gpl-protocols-24.bep | 29 + .../caya-gpl-protocols-35.bep | 29 + .../caya-gpl-protocols-36.bep | 29 + .../patches/caya-gpl-protocols-0.HEAD.patch | 214 + haiku-apps/caya/caya-0.HEAD.bep | 34 + haiku-apps/caya/caya-236.bep | 33 + haiku-apps/caya/caya-240.bep | 33 + haiku-apps/caya/caya-264.bep | 34 + haiku-apps/caya/caya-278.bep | 34 + haiku-apps/caya/caya-279.bep | 34 + haiku-apps/clockwerk/clockwerk-80.bep | 23 + .../documentviewer/documentviewer-0.3.2.bep | 23 + haiku-apps/friss/friss-0.7-svn.bep | 27 + haiku-apps/globe/globe-0.4.bep | 25 + haiku-apps/globe/patches/globe-0.4.patch | 92 + .../haikutwitter/haikutwitter-1.0-svn.bep | 18 + haiku-apps/haikutwitter/haikutwitter-1.0.bep | 18 + haiku-apps/hare/hare-beta1-git.bep | 28 + .../keymapswitcher/keymapswitcher-1.2.7.bep | 20 + haiku-apps/paladin/paladin-1.3-hg.bep | 28 +- haiku-apps/paladin/paladin-1.3.bep | 2 + haiku-apps/pe/pe-2.4.3-600.bep | 16 +- haiku-apps/pe/pe-2.4.3-hg.bep | 26 + haiku-apps/puri/puri-0.3.9.1.bep | 27 + haiku-apps/sawteeth/sawteeth-1.3.bep | 27 + .../thememanager/thememanager-0-svn.bep | 18 + haiku-apps/vision/VisionSettings | Bin 0 -> 4311 bytes haiku-apps/vision/vision-908.bep | 5 +- haiku-apps/yab/patches/yab-1.6.patch | 20 + haiku-apps/yab/yab-1.6.bep | 26 + .../libwalter/libwalter-97.bep | 0 .../arabeyes-fonts/arabeyes-fonts-1.1.bep | 26 + .../courier-prime/courier-prime-1.0.bep | 21 + .../licenses/SIL Open Font License v1.1 | 91 + media-fonts/farsi-fonts/farsi-fonts-0.4.bep | 19 + media-fonts/inconsolata/inconsolata-1.0.bep | 24 + media-fonts/kacst-fonts/kacst-fonts-5.0.bep | 25 + media-fonts/lateef-font/lateef-font-1.001.bep | 19 + .../licenses/SIL Open Font License v1.1 | 91 + media-fonts/nafees-nastaleeq/licenses/CRULP | 19 + .../nafees-nastaleeq-1.02.bep | 19 + media-fonts/nafees-riqa/licenses/CRULP | 19 + media-fonts/nafees-riqa/nafees-riqa-1.00.bep | 19 + .../licenses/SIL Open Font License v1.1 | 91 + media-fonts/nanumfont/nanumfont-2.0.bep | 19 + .../licenses/SIL Open Font License v1.1 | 91 + .../scheherazade-font-1.005.bep | 20 + .../licenses/SIL Open Font License v1.1 | 91 + media-fonts/ukijorgfonts/ukijorgfonts-1.0.bep | 21 + .../x-series-fonts/x-series-fonts-2.0.bep | 131 + media-gfx/flam3/flam3-3.0.bep | 2 +- media-gfx/fontforge/fontforge-201005010.bep | 2 +- media-gfx/graphviz/graphviz-2.24.bep | 17 +- media-gfx/graphviz/graphviz-2.26.3.bep | 15 +- .../graphviz/patches/graphviz-2.26.3.patch | 53 +- media-gfx/hqx/hqx-1.1.bep | 25 + .../imagemagick/imagemagick-6.6.1-10.bep | 4 +- media-gfx/pngcrush/pngcrush-1.7.6.bep | 2 +- media-libs/aalib/aalib-1.4rc4.bep | 29 + media-libs/agar/agar-1.4.1.bep | 26 + media-libs/allegro/allegro-4.4.1.1.bep | 5 +- media-libs/allegro/allegro-4.4.x-svn.bep | 25 + .../allegro/patches/allegro-4.4.x-svn.patch | 51 + media-libs/cal3d/cal3d-0.11.0.bep | 2 +- media-libs/devil/devil-1.7.8.bep | 2 +- media-libs/djvulibre/djvulibre-3.5.25.bep | 26 + .../djvulibre/patches/djvulibre-3.5.25.patch | 12 + media-libs/faac/faac-1.28.bep | 28 + media-libs/faac/licenses/FAAC | 70 + media-libs/faad2/faad2-2.7.bep | 10 +- media-libs/fitz/fitz-1.0.bep | 28 + media-libs/fitz/patches/fitz-1.0.patch | 36 + media-libs/flac/flac-1.2.1.bep | 20 +- media-libs/fontconfig/fontconfig-2.10.0.bep | 37 + media-libs/fontconfig/fontconfig-2.10.2.bep | 37 + media-libs/fontconfig/fontconfig-2.8.0.bep | 28 - .../patches/fontconfig-2.10.0.patch | 12 + media-libs/freealut/freealut-1.1.0.bep | 2 +- media-libs/freeimage/freeimage-3.15.3.bep | 24 + .../freeimage/patches/freeimage-3.15.3.patch | 16 + media-libs/freetype/freetype-2.3.11.bep | 2 +- media-libs/freetype/freetype-2.4.11.bep | 22 + media-libs/freetype/freetype-2.4.2.bep | 2 +- media-libs/freetype/freetype-2.4.4.bep | 2 +- media-libs/freetype/freetype-2.4.6.bep | 22 + ...-2.4.9-with-subpixel-rendering-enabled.bep | 22 + media-libs/freetype/freetype-2.4.9.bep | 22 + ....4.9-with-subpixel-rendering-enabled.patch | 12 + media-libs/ftgl/ftgl-2.1-svn.bep | 3 +- media-libs/ftgl/ftgl-2.1.3.bep | 15 +- media-libs/giflib/giflib-4.1.6.bep | 10 +- media-libs/guilib/guilib-1.2.1.bep | 17 +- media-libs/ilmbase/ilmbase-1.0.1.bep | 2 +- media-libs/ilmbase/ilmbase-1.0.2.bep | 2 +- media-libs/jasper/jasper-1.900.1.bep | 4 +- media-libs/jasper/licenses/JasPer v2 | 51 + media-libs/jbig2dec/jbig2dec-0.11.bep | 24 + media-libs/jgmod/jgmod-0.99.bep | 5 +- media-libs/jpeg/jpeg-7.bep | 2 +- media-libs/jpeg/jpeg-8b.bep | 2 +- media-libs/jpeg/jpeg-8c.bep | 6 +- media-libs/jpeg/jpeg-8d.bep | 27 + media-libs/jpeg/patches/jpeg-8d.patch | 24 + media-libs/ladspa-sdk/ladspa-sdk-1.13.bep | 16 + .../ladspa-sdk/patches/ladspa-sdk-1.13.patch | 50 + media-libs/lcms/lcms-1.18a.bep | 2 +- media-libs/lcms/lcms-1.19.bep | 2 +- media-libs/leptonica/leptonica-1.68.bep | 31 + media-libs/libao/libao-1.0.0.bep | 6 +- media-libs/libass/libass-0.10.1.bep | 24 + media-libs/libass/libass-0.9.11.bep | 24 + media-libs/libbluray/libbluray-0.2.2.bep | 25 + media-libs/libcddb/libcddb-1.3.2.bep | 2 +- media-libs/libcoverart/libcoverart-1.0.0.bep | 28 + media-libs/libdca/libdca-0.0.5.bep | 7 +- media-libs/libdiscid/libdiscid-0.3.0.bep | 27 + media-libs/libdvdcss/libdvdcss-1.2.10.bep | 2 +- media-libs/libdvdcss/libdvdcss-1.2.12.bep | 21 + .../libdvdcss/patches/libdvdcss-1.2.12.patch | 12 + media-libs/libdvdnav/libdvdnav-4.1.3.bep | 2 +- media-libs/libdvdnav/libdvdnav-4.2.0.bep | 25 + .../libdvdnav/patches/libdvdnav-4.2.0.patch | 20 + media-libs/libdvdread/libdvdread-4.1.3.bep | 2 +- media-libs/libdvdread/libdvdread-4.2.0.bep | 25 + media-libs/libdvdread/libdvdread-svn1168.bep | 2 +- media-libs/libdvdread/libdvdread-svn1226.bep | 23 + .../libdvdread/patches/libdvdread-4.2.0.patch | 22 + .../patches/libdvdread-svn1168.patch | 26 + .../patches/libdvdread-svn1226.patch | 26 + media-libs/liblo/liblo-0.26.bep | 27 + media-libs/liblo/patch/liblo-0.26.patch | 105 + .../{libmad-0.15.1.bep => libmad-0.15.1b.bep} | 1 + media-libs/libmikmod/libmikmod-3.1.11.bep | 12 +- media-libs/libmms/libmms-0.5.bep | 2 +- media-libs/libmng/libmng-1.0.10.bep | 2 +- media-libs/libmodplug/libmodplug-0.8.8.4.bep | 29 + media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.bep | 19 + media-libs/libnsbmp/libnsbmp-0.0.3.bep | 18 + media-libs/libnsgif/libnsgif-0.0.3.bep | 18 + media-libs/libogg/libogg-1.1.4.bep | 2 +- media-libs/libogg/libogg-1.2.0.bep | 7 +- media-libs/libogg/libogg-1.2.2.bep | 15 +- media-libs/libogg/libogg-1.3.0.bep | 22 + media-libs/libpng/libpng-1.2.29.bep | 2 +- media-libs/libpng/libpng-1.2.30.bep | 2 +- media-libs/libpng/libpng-1.2.40.bep | 2 +- media-libs/libpng/libpng-1.2.41.bep | 2 +- media-libs/libpng/libpng-1.2.43.bep | 2 +- media-libs/libpng/libpng-1.2.44.bep | 2 +- media-libs/libpng/libpng-1.2.46.bep | 23 + media-libs/libpng/libpng-1.4.1.bep | 2 +- media-libs/libpng/libpng-1.4.2.bep | 2 +- media-libs/libpng/libpng-1.4.3.bep | 2 +- media-libs/libpng/libpng-1.4.4.bep | 2 +- media-libs/libpng/libpng-1.5.0.bep | 3 +- media-libs/libpng/libpng-1.5.12.bep | 25 + media-libs/libpng/libpng-1.5.13.bep | 30 + media-libs/libpng/libpng-1.5.2.bep | 25 + media-libs/libpng/libpng-1.5.4.bep | 25 + media-libs/libpng/libpng-1.5.7.bep | 25 + .../libsamplerate/libsamplerate-0.1.8.bep | 21 + media-libs/libsdl/libsdl-1.2-hg.bep | 10 +- media-libs/libsdl/libsdl-1.2.14.bep | 7 +- media-libs/libsdl/libsdl-1.2.15.bep | 101 + media-libs/libsdl/libsdl-1.3-gsoc.bep | 33 + media-libs/libsdl/libsdl-1.3-hg.bep | 29 - media-libs/libsdl/libsdl-2.0-hg-cmake.bep | 28 + media-libs/libsdl/libsdl-2.0-hg.bep | 27 + media-libs/libsdl/patches/libsdl-1.2-hg.patch | 89 +- media-libs/libsdl/sdl-config | 77 + media-libs/libsndfile/libsndfile-1.0.21.bep | 15 +- media-libs/libsvgtiny/libsvgtiny-0-HEAD.bep | 22 + media-libs/libtheora/libtheora-1.1.1.bep | 9 +- media-libs/libvorbis/libvorbis-1.2.3.bep | 10 +- media-libs/libvorbis/libvorbis-1.3.1.bep | 9 +- media-libs/libvorbis/libvorbis-1.3.2.bep | 14 +- media-libs/libvpx/libvpx-0.9.2-git.bep | 2 +- media-libs/libvpx/libvpx-1.0.0.bep | 24 + media-libs/libvpx/patches/libvpx-1.0.0.patch | 66 + media-libs/libwebp/libwebp-0.1.2-git.bep | 21 + media-libs/libwebp/libwebp-0.1.3.bep | 22 + media-libs/lv2/lv2-1.2.0.bep | 29 + media-libs/mediainfo/mediainfo-0.7.61.bep | 24 + .../mediainfo/patches/mediainfo-0.7.61.patch | 91 + media-libs/musicbrainz/musicbrainz-5.0.1.bep | 27 + media-libs/openal/openal-1.13.bep | 23 + media-libs/openal/patches/openal-1.13.patch | 315 + media-libs/openjpeg/openjpeg-1.3.bep | 17 - media-libs/openjpeg/openjpeg-1.5.0.bep | 36 + .../openjpeg/patches/openjpeg-1.3.patch | 27 - media-libs/plib/plib-1.8.5.bep | 2 +- .../patches/schroedinger-1.0.11.patch | 13 + .../schroedinger/schroedinger-1.0.11.bep | 25 + media-libs/sdl-gfx/sdl-gfx-2.0.23.bep | 27 + media-libs/sdl-image/sdl-image-1.2-hg.bep | 35 + media-libs/sdl-image/sdl-image-1.2.10.bep | 10 +- media-libs/sdl-image/sdl-image-1.2.12.bep | 35 + media-libs/sdl-image/sdl-image-1.2.6.bep | 2 +- media-libs/sdl-image/sdl-image-1.2.8.bep | 9 +- media-libs/sdl-image/sdl-image-1.2.9.bep | 9 +- media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep | 32 + media-libs/sdl-mixer/sdl-mixer-1.2.10.bep | 9 +- media-libs/sdl-mixer/sdl-mixer-1.2.11.bep | 6 +- media-libs/sdl-mixer/sdl-mixer-1.2.12.bep | 34 + media-libs/sdl-mixer/sdl-mixer-1.2.9.bep | 8 +- .../sdl-net/patches/sdl-net-1.2.8.patch | 13 + media-libs/sdl-net/sdl-net-1.2-hg.bep | 27 + media-libs/sdl-net/sdl-net-1.2.7.bep | 5 +- media-libs/sdl-net/sdl-net-1.2.8.bep | 27 + media-libs/sdl-rtf/sdl-rtf-0.1.0.bep | 8 +- media-libs/sdl-sound/sdl-sound-1.0-hg.bep | 24 + media-libs/sdl-ttf/sdl-ttf-2.0-hg.bep | 30 + media-libs/sdl-ttf/sdl-ttf-2.0.10.bep | 7 +- media-libs/sdl-ttf/sdl-ttf-2.0.11.bep | 31 + media-libs/sdl-ttf/sdl-ttf-2.0.9.bep | 2 +- media-libs/smjpeg/smjpeg-0.2.1.bep | 8 +- media-libs/smpeg/smpeg-0.4.5.bep | 11 +- media-libs/speex/speex-1.2-git.bep | 9 +- media-libs/speex/speex-1.2rc1.bep | 12 +- media-libs/taglib/patches/taglib-1.7.1.patch | 96 + media-libs/taglib/patches/taglib-1.7.patch | 96 + media-libs/taglib/taglib-1.7.1.bep | 21 + media-libs/taglib/taglib-1.7.2.bep | 21 + media-libs/taglib/taglib-1.7.bep | 21 + media-libs/taglib/taglib-1.8.bep | 21 + media-libs/tiff/tiff-3.8.2.bep | 2 +- media-libs/tiff/tiff-3.9.1.bep | 2 +- media-libs/tiff/tiff-3.9.4.bep | 2 +- media-libs/tiff/tiff-3.9.6.bep | 22 + media-libs/tiff/tiff-4.0.2.bep | 22 + media-libs/vigra/vigra-1.8.0.bep | 21 + media-libs/waave/waave-1.01.bep | 26 + media-libs/x264/patches/x264-20120803.patch | 12 + media-libs/x264/x264-20120803.bep | 20 + media-sound/bladeenc/bladeenc-0.94.2.bep | 2 +- .../fluidsynth/fluidsynth-1.1-midi-buffer.bep | 24 + media-sound/fluidsynth/fluidsynth-1.1.3.bep | 22 + media-sound/fluidsynth/fluidsynth-1.1.6.bep | 23 + .../patches/fluidsynth-1.1-midi-buffer.patch | 38 + .../fluidsynth/patches/fluidsynth-1.1.3.patch | 34 + .../fluidsynth/patches/fluidsynth-1.1.6.patch | 35 + .../gogo-no-coda/gogo-no-coda-3.13.bep | 21 + .../patches/gogo-no-coda-3.13.patch | 117 + media-sound/jack2/jack2-1.9.8.bep | 23 + media-sound/lame/lame-3.98.4.bep | 2 +- media-sound/lame/lame-3.99.bep | 26 + media-sound/lame/lame-398-2.bep | 2 +- media-sound/lame/patches/lame-3.99.patch | 13 + .../milkytracker/milkytracker-0.90.85.bep | 29 + media-sound/mpg123/mpg123-1.12.1.bep | 2 +- media-sound/naspro/naspro-0.2.9-hg.bep | 2 +- media-sound/ocp/ocp-0.1.21-git.bep | 26 + media-sound/ocp/ocp-snapshot20110319.bep | 27 + media-sound/ocp/ocp-snapshot20110320.bep | 27 + .../ocp/patches/ocp-snapshot20110319.patch | 504 + .../schismtracker/schismtracker-20100713.bep | 2 +- media-sound/twolame/twolame-0.3.13.bep | 24 + .../vorbis-tools/vorbis-tools-1.2.0.bep | 2 +- .../vorbis-tools/vorbis-tools-1.4.0.bep | 5 +- media-video/ffmpeg/ffmpeg-0.10.2-vlc.bep | 27 + media-video/ffmpeg/ffmpeg-0.10.2.bep | 28 + media-video/ffmpeg/ffmpeg-0.10.bep | 27 + media-video/ffmpeg/ffmpeg-0.11.1.bep | 28 + media-video/ffmpeg/ffmpeg-0.5.bep | 2 +- media-video/ffmpeg/ffmpeg-0.6.bep | 2 +- media-video/ffmpeg/ffmpeg-23081.bep | 2 +- media-video/ffmpeg/ffmpeg-7407.bep | 2 +- .../ffmpeg/patches/ffmpeg-0.10-gcc2.patch | 268 + .../ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch | 268 + .../ffmpeg/patches/ffmpeg-0.11.1-gcc2.patch | 289 + media-video/handbrake/handbrake-0.9.5.bep | 4 +- media-video/vlc/patches/vlc-2.0.5.patch | 552 + media-video/vlc/vlc-0.8.6i.bep | 2 +- media-video/vlc/vlc-1.1.5-20101107.bep | 2 +- media-video/vlc/vlc-2.0.5.bep | 40 + net-ftp/tnftp/tnftp-20091122.bep | 2 +- net-irc/irssi/irssi-0.8.15.bep | 28 + .../patches/rhapsody-irc-0.28b.patch | 38 + net-irc/rhapsody-irc/rhapsody-irc-0.28b.bep | 21 + net-libs/enet/patches/enet-1.2.2.patch | 12 + net-libs/gnutls/gnutls-2.8.6.bep | 2 +- net-libs/hubbub/hubbub-0.1.2-HEAD.bep | 20 + net-libs/hubbub/hubbub-0.1.2.bep | 19 + net-libs/libdom/libdom-0.bep | 20 + net-libs/libs3/libs3-2.0.bep | 20 + net-libs/libs3/patches/libs3-2.0.patch | 36 + net-libs/libtorrent/libtorrent-0.12.5.bep | 2 +- net-libs/libyahoo2/libyahoo2-1.0.1.bep | 22 + .../libyahoo2/patches/libyahoo2-1.0.1.patch | 15 + net-misc/axel/axel-2.4.bep | 2 +- net-misc/curl/curl-7.18.2.bep | 2 +- net-misc/curl/curl-7.19.1.bep | 2 +- net-misc/curl/curl-7.19.2.bep | 2 +- net-misc/curl/curl-7.19.5.bep | 2 +- net-misc/curl/curl-7.19.7.bep | 2 +- net-misc/curl/curl-7.20.0.bep | 2 +- net-misc/curl/curl-7.20.1.bep | 2 +- net-misc/curl/curl-7.21.1.bep | 2 +- net-misc/curl/curl-7.21.2.bep | 2 +- net-misc/curl/curl-7.21.3.bep | 2 +- net-misc/curl/curl-7.21.6.bep | 29 + net-misc/curl/curl-7.21.7.bep | 30 + net-misc/curl/curl-7.22.0.bep | 30 + net-misc/curl/curl-7.24.0.bep | 30 + net-misc/curl/curl-7.25.0.bep | 30 + net-misc/curl/curl-7.26.0.bep | 30 + net-misc/curl/curl-7.28.1.bep | 30 + net-misc/curl/patches/curl-7.22.0.patch | 15 + net-misc/curl/patches/curl-7.25.0.patch | 12 + net-misc/curl/patches/curl-7.26.0.patch | 12 + net-misc/mediatomb/mediatomb-0.12.1.bep | 11 +- net-misc/minidlna/minidlna-1.0.21.bep | 28 + net-misc/neon/neon-0.29.1.bep | 2 +- net-misc/neon/neon-0.29.3.bep | 2 +- net-misc/neon/neon-0.29.4.bep | 2 +- net-misc/openssh/openssh-5.4p1.bep | 7 +- net-misc/openssh/openssh-5.5p1.bep | 7 +- net-misc/openssh/openssh-5.6p1.bep | 7 +- net-misc/openssh/openssh-5.7p1.bep | 7 +- net-misc/openssh/openssh-5.8p1.bep | 8 +- net-misc/openssh/openssh-5.8p2.bep | 52 + net-misc/openssh/openssh-5.9p1.bep | 52 + net-misc/openssh/openssh-6.0p1.bep | 51 + net-misc/openssh/openssh-6.1p1.bep | 52 + net-misc/openssh/openssh-6.2p1.bep | 53 + net-misc/openssh/patches/openssh-5.8p2.patch | 140 + net-misc/openssh/patches/openssh-5.9p1.patch | 140 + net-misc/openssh/patches/openssh-6.0p1.patch | 139 + net-misc/openssh/patches/openssh-6.1p1.patch | 140 + net-misc/openssh/patches/openssh-6.2p1.patch | 140 + net-misc/openssh/sshd_keymaker.sh | 2 +- net-misc/rsync/rsync-3.0.6.bep | 2 +- net-misc/rsync/rsync-3.0.7.bep | 15 +- net-misc/tor/patches/tor-0.2.2.35.patch | 78 + net-misc/tor/tor-0.2.2.35.bep | 29 + net-misc/tor/tor-0.2.3.25.bep | 34 + net-misc/wget/patches/wget-1.13.4.patch | 71 + net-misc/wget/wget-1.13.4.bep | 20 + net-misc/wput/wput-0.6.1.bep | 2 +- net-p2p/rtorrent/rtorrent-0.8.5.bep | 2 +- net-p2p/seeks/licenses/GNU AGPL v3 | 661 + net-p2p/seeks/seeks-0.x-git.bep | 23 + .../patches/transmission-2.73.patch | 69 + .../patches/transmission-2.75.patch | 69 + net-p2p/transmission/transmission-1.72.bep | 2 +- net-p2p/transmission/transmission-1.73.bep | 2 +- net-p2p/transmission/transmission-1.93.bep | 2 +- net-p2p/transmission/transmission-2.01.bep | 2 +- net-p2p/transmission/transmission-2.12.bep | 2 +- net-p2p/transmission/transmission-2.21.bep | 10 +- net-p2p/transmission/transmission-2.73.bep | 35 + net-p2p/transmission/transmission-2.75.bep | 35 + .../privoxy/patches/privoxy-3.0.19.patch | 72 + net-proxy/privoxy/privoxy-3.0.19.bep | 29 + .../b43-fwcutter/b43-fwcutter-012.bep | 10 +- .../patches/b43-fwcutter-012.patch | 14 + .../patches/wpa_supplicant-0.7.3.patch | 2156 +++ .../wpa_supplicant/wpa_supplicant-0.7.3.bep | 19 + packs/libpak/libpak-0.9.4-gcc2.bep | 138 + packs/libpak/libpak-0.9.4-gcc4.bep | 145 + packs/libpak/libpak-0.9.5-gcc2.bep | 141 + packs/libpak/libpak-0.9.6-gcc2.bep | 150 + packs/libpak/libpak-0.9.6-gcc4.bep | 157 + .../optionalpackages-0.6-gcc2.bep | 177 + .../optionalpackages-0.6-gcc4.bep | 177 + .../optionalpackages-0.7-gcc2.bep | 182 + .../optionalpackages-0.7-gcc4.bep | 176 + sci-libs/cln/cln-1.3.2.bep | 25 + sci-libs/cln/patches/cln-1.3.2.patch | 21 + sci-libs/fftw/fftw-3.2.2.bep | 2 +- sci-libs/gdal/gdal-1.7.2.bep | 2 +- sci-libs/gsl/gsl-1.13.bep | 2 +- sci-libs/gsl/gsl-1.14.bep | 8 +- sci-physics/bullet/bullet-2.78.bep | 21 + sci-physics/bullet/patches/bullet-2.78.patch | 45 + sys-apps/coreutils/coreutils-8.5.bep | 4 +- sys-apps/dbus/dbus-1.6.8.bep | 29 + sys-apps/dbus/patches/dbus-1.6.8.patch | 11 + sys-apps/diffutils/diffutils-2.9.bep | 2 +- sys-apps/diffutils/diffutils-3.2.bep | 28 + .../diffutils/patches/diffutils-3.2.patch | 58 + sys-apps/dmidecode/dmidecode-2.11.bep | 23 + sys-apps/dtc/dtc-1.3.0-git.bep | 27 + sys-apps/dtc/patches/dtc-1.3.0-git.patch | 66 + sys-apps/ed/ed-1.4.bep | 2 +- sys-apps/file/file-5.04.bep | 2 +- sys-apps/file/file-5.11.bep | 22 + sys-apps/file/patches/file-5.11.patch | 20 + sys-apps/gawk/gawk-3.1.8.bep | 6 +- sys-apps/gawk/gawk-4.0.1.bep | 23 + sys-apps/grep/grep-2.12.bep | 32 + sys-apps/grep/grep-2.14-bz2.bep | 27 + sys-apps/grep/grep-2.14.bep | 34 + sys-apps/grep/grep-2.5.4.bep | 8 +- sys-apps/grep/grep-2.6.1.bep | 26 + sys-apps/grep/grep-2.6.3.bep | 26 + sys-apps/grep/grep-2.7.bep | 14 +- sys-apps/grep/patches/grep-2.12.patch | 14 + sys-apps/grep/patches/grep-2.14-gcc2.patch | 162 + sys-apps/grep/patches/grep-2.6.1.patch | 20 + sys-apps/groff/groff-1.20.1.bep | 15 +- sys-apps/hgrep/hgrep | 10 + sys-apps/hgrep/hgrep-1.0.1.bep | 20 + sys-apps/hgrep/hgrep-1.0.1.zip | Bin 0 -> 848 bytes sys-apps/hgrep/hgrep-1.0.bep | 20 + sys-apps/hgrep/hgrep-1.0.zip | Bin 0 -> 370 bytes sys-apps/less/less-436.bep | 3 +- sys-apps/less/less-451.bep | 21 + sys-apps/less/patches/less-451.patch | 128 + sys-apps/lgrep/lgrep | 50 + sys-apps/lgrep/lgrep-1.0.bep | 20 + sys-apps/lgrep/lgrep-1.0.zip | Bin 0 -> 697 bytes sys-apps/man/man-1.6f.bep | 2 +- sys-apps/man/man-1.6g.bep | 21 + sys-apps/man/patches/man-1.6g.patch | 82 + sys-apps/xinetd/xinetd-2.3.14.bep | 6 +- sys-devel/autoconf/autoconf-2.65.bep | 2 +- sys-devel/autoconf/autoconf-2.66.bep | 2 +- sys-devel/autoconf/autoconf-2.67.bep | 2 +- sys-devel/autoconf/autoconf-2.67xz.bep | 2 +- sys-devel/autoconf/autoconf-2.69.bep | 30 + sys-devel/automake/automake-1.10.3.bep | 2 +- sys-devel/automake/automake-1.12.2.bep | 31 + sys-devel/automake/automake-1.12.5.bep | 31 + sys-devel/automake/automake-1.13.1.bep | 32 + sys-devel/automake/automake-1.13.bep | 31 + .../automake/patches/automake-1.10.1.diff | 17 - sys-devel/bc/bc-1.06.bep | 4 +- sys-devel/bison/bison-2.4.1.bep | 2 +- sys-devel/bison/bison-2.4.bep | 2 +- sys-devel/bison/bison-2.5.bep | 30 + sys-devel/bison/bison-2.6.2.bep | 30 + sys-devel/bison/patches/bison-2.5-c89.diff | 29 + sys-devel/bison/patches/bison-2.5.patch | 29 + sys-devel/bison/patches/bison-2.6.2.patch | 81 + sys-devel/clang/clang-3.0.bep | 26 + sys-devel/clang/clang-3.2.bep | 36 + sys-devel/clang/licenses/UIUC | 69 + sys-devel/distcc/distcc-3.1-1.build | 5 + sys-devel/distcc/distcc-3.1-1.install | 2 + sys-devel/distcc/distcc-3.1-1.patch | 100 + sys-devel/distcc/distcc-3.1-1.test | 2 + sys-devel/gettext/gettext-0.18.1.1-dev.bep | 46 +- sys-devel/gettext/gettext-0.18.1.1.bep | 4 +- .../patches/gettext-0.18.1.1-dev.patch | 11 + .../gettext/patches/gettext-0.18.1.1.patch | 32 +- sys-devel/jam/jam-2.5.bep | 16 +- sys-devel/libtool/libtool-2.2.10.bep | 2 +- sys-devel/libtool/libtool-2.2.6.bep | 2 +- sys-devel/libtool/libtool-2.2.6b.bep | 2 +- sys-devel/libtool/libtool-2.2.7b.bep | 2 +- sys-devel/libtool/libtool-2.2.8.bep | 2 +- sys-devel/libtool/libtool-2.2.x.bep | 2 +- sys-devel/libtool/libtool-2.4.2.bep | 29 + sys-devel/libtool/patches/libtool-2.4.2.patch | 12 + sys-devel/llvm/licenses/UIUC | 69 + sys-devel/llvm/llvm-3.0.bep | 21 + sys-devel/llvm/llvm-3.2.bep | 26 + sys-devel/patch/patch-2.7.1.bep | 20 + sys-fs/e2fsprogs/e2fsprogs-1.43-git.bep | 28 + sys-fs/e2fsprogs/e2fsprogs-1.43.bep | 28 + .../patches/e2fsprogs-1.43-git.patch | 476 + sys-fs/e2fsprogs/patches/e2fsprogs-1.43.patch | 25 + .../patches/e2fsprogs-1.43-git.patch | 1508 ++ sys-libs/glu/glu-9.0.bep | 23 + sys-libs/mesa/buildpackage.sh | 79 + sys-libs/mesa/mesa-7.8.2.bep | 25 + sys-libs/mesa/mesa-9.0.1.bep | 25 + sys-libs/mesa/mesa-9.0.2.bep | 28 + sys-libs/mesa/mesa-9.0.bep | 25 + sys-libs/mesa/mesa-9.1.0.bep | 28 + sys-libs/mesa/mesa-9.1.1.bep | 28 + sys-libs/mesa/patches/mesa-7.8.2.patch | 470 + sys-libs/mesa/patches/mesa-9.0.1.patch | 52 + sys-libs/mesa/patches/mesa-9.0.2.patch | 25 + sys-libs/mesa/patches/mesa-9.0.patch | 42 + sys-libs/ncurses/ncurses-5.6.bep | 2 +- sys-libs/ncurses/ncurses-5.7.bep | 2 +- sys-libs/ncurses/ncurses-5.8.bep | 23 + sys-libs/ncurses/ncurses-5.9.bep | 24 + sys-libs/readline/readline-5.2.bep | 2 +- sys-libs/readline/readline-6.0.bep | 10 +- sys-libs/readline/readline-6.1.bep | 16 +- sys-libs/readline/readline-6.2.bep | 27 + sys-libs/slang/slang-2.2.2.bep | 2 +- sys-libs/zlib/zlib-1.2.3.bep | 4 +- sys-libs/zlib/zlib-1.2.5.bep | 3 +- sys-libs/zlib/zlib-1.2.7.bep | 21 + sys-libs/zopfli/zopfli-999.bep | 24 + sys-process/htop/htop-1.0.2.bep | 19 + sys-process/htop/patches/htop-1.0.2.patch | 47 + www-client/links/links-2.3pre2.bep | 29 + .../patches/links-2.1pre33.beos.002.patch | 3157 ++++ www-client/links/patches/links-2.3pre2.patch | 3199 ++++ www-client/netsurf/netsurf-2.1.bep | 18 +- www-client/netsurf/netsurf-2.6.bep | 22 +- www-client/netsurf/netsurf-2.7-svn.bep | 10 +- www-client/netsurf/netsurf-2.7.bep | 59 + www-client/netsurf/netsurf-2.9.bep | 28 + www-client/netsurf/netsurf-2.HEAD.bep | 34 + www-client/netsurf/netsurf-9799.bep | 16 +- www-client/netsurf/patches/librosprite.patch | 311 - www-client/netsurf/patches/netsurf-2.7.patch | 18 + www-client/netsurf/patches/netsurf-2.9.patch | 77 + .../netsurf/patches/netsurf-2.HEAD.patch | 272 + www-client/w3m/licenses/W3M | 11 + www-client/w3m/patches/w3m-0.5.3.patch | 74 + www-client/w3m/w3m-0.5.3.bep | 30 + www-servers/apache/apache-2.2.17.bep | 2 +- www-servers/apache/apache-2.2.22.bep | 32 + www-servers/apache/apache-2.4.3.bep | 33 + .../apache/patches/apache-2.2.22.patch | 48 + www-servers/apache/patches/apache-2.4.3.patch | 172 + www-servers/cherokee/cherokee-1.2.101.bep | 32 + .../cherokee/patches/cherokee-1.2.101.patch | 21 + www-servers/haproxy/haproxy-1.4.22.bep | 22 + .../haproxy/patches/haproxy-1.4.22.patch | 47 + .../nginx/patches/nginx-1.3.0-svn.diff | 66 + x11-libs/cairo/cairo-1.10.0.bep | 2 +- x11-libs/cairo/cairo-1.8.10.bep | 2 +- x11-libs/libX11/libX11-1.3.3.bep | 2 +- x11-libs/libXau/libXau-1.0.5.bep | 2 +- x11-libs/libxcb/libxcb-1.6.bep | 2 +- x11-libs/pango/pango-1.28.1.bep | 2 +- x11-libs/pixman/pixman-0.17.2.bep | 2 +- x11-libs/pixman/pixman-0.18.2.bep | 2 +- x11-libs/pixman/pixman-0.18.4.bep | 2 +- x11-libs/pixman/pixman-0.19-master.bep | 2 +- x11-libs/pixman/pixman-0.19.4.bep | 2 +- x11-libs/pixman/pixman-0.20.0.bep | 2 +- x11-libs/xtrans/xtrans-1.2.5.bep | 3 +- .../shared-mime-info/shared-mime-info-1.0.bep | 23 + .../util-macros/util-macros-1.17.0-git.bep | 23 + x11-misc/util-macros/util-macros-1.7.0.bep | 2 +- x11-proto/inputproto/inputproto-2.0.bep | 2 +- x11-proto/kbproto/kbproto-1.0.4.bep | 2 +- x11-proto/xcb-proto/xcb-proto-1.6.bep | 2 +- x11-proto/xextproto/xextproto-7.1.1.bep | 2 +- .../xproto/patches/xproto-7.0.23-git.patch | 48 + x11-proto/xproto/xproto-7.0.16.bep | 2 +- x11-proto/xproto/xproto-7.0.23-git.bep | 27 + 1052 files changed, 65053 insertions(+), 2541 deletions(-) create mode 100644 app-arch/cpio/cpio-2.11.bep create mode 100644 app-arch/cpio/patches/cpio-2.11.patch create mode 100644 app-arch/gzip/gzip-1.4.bep create mode 100644 app-arch/gzip/patches/gzip-1.4.patch create mode 100644 app-arch/libarchive/libarchive-2.8.5.bep create mode 100644 app-arch/libarchive/libarchive-3.0.3.bep create mode 100644 app-arch/p7zip/p7zip-9.20.1.bep create mode 100644 app-arch/p7zip/patches/p7zip-9.20.1.patch create mode 100644 app-arch/tar/patches/tar-1.26.patch create mode 100644 app-arch/tar/tar-1.26.bep create mode 100644 app-arch/unrar/patches/unrar-4.2.4.patch create mode 100644 app-arch/unrar/unrar-4.2.4.bep create mode 100644 app-arch/unzip/unzip-6.0.bep create mode 100644 app-arch/xar/patches/xar-1.5.2.patch create mode 100644 app-arch/xar/xar-1.5.2.bep create mode 100644 app-arch/xz-utils/xz-utils-5.0.1.bep create mode 100644 app-arch/xz-utils/xz-utils-5.0.4.bep rename app-arch/{info-zip/zip30-haiku.patch => zip/patches/zip-3.0.patch} (100%) create mode 100644 app-arch/zip/zip-3.0.bep create mode 100644 app-benchmarks/libmicro/libmicro-0.4.1.bep create mode 100644 app-benchmarks/libmicro/patches/libmicro-0.4.1.patch create mode 100644 app-benchmarks/piozone/patches/piozone-1.0.patch create mode 100644 app-benchmarks/piozone/piozone-1.0.bep create mode 100644 app-cdr/cdrtools/cdrtools-3.01a06.bep create mode 100644 app-cdr/cdrtools/cdrtools-3.01a07.bep create mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01a01.patch create mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01a06.patch create mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01a07.patch create mode 100644 app-cdr/daa2iso/daa2iso-0.1.7e.bep create mode 100644 app-cdr/uif2iso/uif2iso-0.1.7c.bep create mode 100644 app-doc/doxygen/doxygen-1.7.4.bep create mode 100644 app-doc/doxygen/patches/doxygen-1.7.4.patch create mode 100644 app-editors/nano/nano-2.3.1.bep create mode 100644 app-editors/ne/ne-2.1.bep create mode 100644 app-editors/ne/patches/ne-2.1.patch create mode 100644 app-editors/qemacs/patches/qemacs-0.3.2dev-cvs.patch create mode 100644 app-editors/qemacs/patches/qemacs-0.3.3.patch create mode 100644 app-editors/qemacs/qemacs-0.3.2dev-cvs.bep create mode 100644 app-editors/qemacs/qemacs-0.3.3.bep create mode 100644 app-editors/se/se-3.0.bep create mode 100644 app-emulation/aranym/aranym-0.9.11-cvs.bep create mode 100644 app-emulation/libdsk/libdsk-1.3.3.bep create mode 100644 app-emulation/mednafen/mednafen-0.9.26.bep create mode 100644 app-emulation/mednafen/patches/mednafen-0.9.26.patch create mode 100644 app-emulation/oricutron/oricutron-0.9-svn.bep create mode 100644 app-emulation/pearpc/pearpc-0.5.0-cvs.bep create mode 100644 app-misc/colordiff/colordiff-1.0.10.bep create mode 100644 app-misc/colordiff/patches/colordiff-1.0.10.patch create mode 100644 app-misc/strigi/patches/strigi-0.7.8.patch create mode 100644 app-office/abiword/abiword-2.8.6.bep create mode 100644 app-office/abiword/patches/abiword-2.8.6.patch create mode 100644 app-shells/fish/fish-1.23.1-git.bep create mode 100644 app-shells/fish/patches/fish-1.23.1-git.patch create mode 100644 app-shells/zsh/patches/zsh-5.0.0.patch create mode 100644 app-shells/zsh/zsh-5.0.0.bep create mode 100644 app-text/antiword/patches/antiword-0.37.patch create mode 100644 app-text/convmv/convmv-1.15.bep create mode 100644 app-text/convmv/patches/convmv-1.15.patch create mode 100644 app-text/discount/discount-2.1.3.bep create mode 100644 app-text/ebook-tools/ebook-tools-0.2.1.bep create mode 100644 app-text/gocr/gocr-0.49.bep create mode 100644 app-text/gocr/patches/gocr-0.49.patch create mode 100644 app-text/gpp/gpp-2.4.bep create mode 100644 app-text/gpp/licenses/GPP create mode 100644 app-text/htmldoc/htmldoc-1.8.27.bep create mode 100644 app-text/htmldoc/patches/htmldoc-1.8.27.patch create mode 100644 app-text/hunspell/hunspell-1.3.2.bep create mode 100644 app-text/libwpd/libwpd-0.9.6.bep create mode 100644 app-text/libwpg/libwpg-0.2.1.bep create mode 100644 app-text/tesseract/tesseract-3.x-svn.bep create mode 100644 app-text/tree/patches/tree-1.6.0.patch create mode 100644 app-text/tree/tree-1.6.0.bep create mode 100644 dev-cpp/eigen/eigen-3.1.2.bep create mode 100644 dev-cpp/eigen/licenses/MPL v2 create mode 100644 dev-cpp/glog/glog-0.3.3.bep create mode 100644 dev-db/mysql/mysql-5.0.83.bep create mode 100644 dev-db/mysql/patches/mysql-5.0.83.patch create mode 100644 dev-db/postgresql/licenses/PostgreSQL create mode 100644 dev-db/postgresql/patches/postgresql-9.0.4.patch create mode 100644 dev-db/postgresql/patches/postgresql-9.2.3.patch create mode 100644 dev-db/postgresql/postgresql-9.0.4.bep create mode 100644 dev-db/postgresql/postgresql-9.2.3.bep create mode 100644 dev-db/redis/patches/redis-2.2.11.patch create mode 100644 dev-db/redis/patches/redis-2.9.0-git.patch create mode 100644 dev-db/redis/redis-2.2.11.bep create mode 100644 dev-db/redis/redis-2.9.0-git.bep create mode 100644 dev-db/sqlite/patches/sqlite-3.7.13.patch create mode 100644 dev-db/sqlite/sqlite-3.7.13.bep create mode 100644 dev-db/sqlite/sqlite-3.7.15.1.bep create mode 100644 dev-db/sqlite/sqlite-3.7.6.2.bep create mode 100644 dev-db/sqlite/sqlite-3.7.7.1.bep create mode 100644 dev-embedded/u-boot-tools/patches/u-boot-tools-2012.10.patch create mode 100644 dev-embedded/u-boot-tools/u-boot-tools-2012.10.bep create mode 100644 dev-games/libggz/libggz-0.99.5.bep create mode 100644 dev-games/libggz/patches/libggz-0.99.5.patch create mode 100644 dev-games/ode/ode-0.12.bep create mode 100644 dev-games/ode/patches/ode-0.12.patch create mode 100644 dev-lang/camlp5/camlp5-6.06.bep create mode 100644 dev-lang/fpc/fpc-2.6.0.bep create mode 100644 dev-lang/lua/lua-5.1.4-3.bep create mode 100644 dev-lang/lua/lua-5.2.1.bep create mode 100644 dev-lang/lua/patches/lua-5.1.4-3.patch create mode 100644 dev-lang/lua/patches/lua-5.2.1.patch create mode 100644 dev-lang/ocaml/ocaml-4.00.0.bep create mode 100644 dev-lang/ocaml/patches/ocaml-4.00.0.patch create mode 100644 dev-lang/openjdk/openjdk-1.7.bep create mode 100644 dev-lang/openjdk/patches/openjdk-1.7.patch create mode 100644 dev-lang/orc/orc-0.4.16.bep create mode 100644 dev-lang/orc/patches/orc-0.4.16.patch create mode 100644 dev-lang/python/patches/python-2.6.7.patch create mode 100644 dev-lang/python/patches/python-2.6.8.patch create mode 100644 dev-lang/python/patches/python-3.2.patch rename dev-lang/python/{python-3.2a3.bep => python-2.6.7.bep} (65%) rename dev-lang/python/{python-3.2a4.bep => python-2.6.8.bep} (65%) delete mode 100644 dev-lang/python/python-2.7a1.bep rename dev-lang/python/{python-3.2b2.bep => python-3.2.bep} (61%) create mode 100644 dev-lang/rebol/rebol-2.101.0.5.75.bep create mode 100644 dev-lang/swi-prolog/licenses/SWI-Prolog create mode 100644 dev-lang/swi-prolog/patches/swi-prolog-6.0.2.patch create mode 100644 dev-lang/swi-prolog/patches/swi-prolog-6.2.0.patch create mode 100644 dev-lang/swi-prolog/swi-prolog-6.0.2.bep create mode 100644 dev-lang/swi-prolog/swi-prolog-6.2.0.bep create mode 100644 dev-lang/swig/swig-2.0.2.bep create mode 100644 dev-lang/tcl/patches/tcl-8.5.9.patch create mode 100644 dev-lang/tcl/tcl-8.5.9.bep create mode 100644 dev-lang/tcl/tcl-8.6b1-1.build create mode 100644 dev-lang/tcl/tcl-8.6b1-1.install create mode 100644 dev-lang/tcl/tcl-8.6b1-1.patch create mode 100644 dev-lang/tcl/tcl-8.6b1-1.test create mode 100644 dev-lang/v8/patches/gyp-r1501.patch create mode 100644 dev-lang/v8/patches/v8-r13067.patch create mode 100644 dev-lang/v8/v8-r13067.bep delete mode 100644 dev-lang/yasm/patches/yasm-0.7.1.patch delete mode 100644 dev-lang/yasm/yasm-0.7.1.bep delete mode 100644 dev-lang/yasm/yasm-0.8.0.bep create mode 100644 dev-lang/yasm/yasm-1.2.0.bep create mode 100644 dev-libs/apr-util/apr-util-1.3.11.bep create mode 100644 dev-libs/apr-util/apr-util-1.3.12.bep create mode 100644 dev-libs/apr-util/apr-util-1.4.1.bep create mode 100644 dev-libs/apr-util/patches/apr-util-1.3.10.patch create mode 100644 dev-libs/apr-util/patches/apr-util-1.3.11.patch create mode 100644 dev-libs/apr-util/patches/apr-util-1.3.12.patch create mode 100644 dev-libs/apr-util/patches/apr-util-1.4.1.patch create mode 100644 dev-libs/apr/apr-1.4.4.bep create mode 100644 dev-libs/apr/apr-1.4.5.bep create mode 100644 dev-libs/apr/apr-1.4.6.bep create mode 100644 dev-libs/apr/patches/apr-1.4.4.patch create mode 100644 dev-libs/apr/patches/apr-1.4.5.patch create mode 100644 dev-libs/apr/patches/apr-1.4.6.patch create mode 100644 dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep create mode 100644 dev-libs/boehm-gc/boehm-gc-7.2d.bep create mode 100644 dev-libs/boehm-gc/licenses/BOEHM create mode 100644 dev-libs/boehm-gc/patches/boehm-gc-7.2_alpha6.patch create mode 100644 dev-libs/boehm-gc/patches/boehm-gc-7.2d.patch create mode 100644 dev-libs/boost/boost-1.50.0.bep create mode 100644 dev-libs/boost/boost-1.53.0.bep create mode 100644 dev-libs/boost/licenses/Boost v1.0 create mode 100644 dev-libs/boost/patches/boost-1.50.0.patch create mode 100644 dev-libs/boost/patches/boost-1.53.0.patch create mode 100644 dev-libs/chmlib/chmlib-0.40.bep create mode 100644 dev-libs/cyassl/cyassl-2.0.2.bep create mode 100644 dev-libs/cyassl/cyassl-2.5.0.bep create mode 100644 dev-libs/gmp/gmp-5.0.5.bep create mode 100644 dev-libs/gmp/gmp-5.1.1.bep create mode 100644 dev-libs/icu/icu-4.8.1.bep create mode 100644 dev-libs/icu/patches/icu-4.8.1.patch create mode 100644 dev-libs/jansson/jansson-2.4.bep create mode 100644 dev-libs/libattica/libattica-0.4.1.bep create mode 100644 dev-libs/libcdio/libcdio-0.83.bep create mode 100644 dev-libs/libcdio/libcdio-0.90.bep create mode 100644 dev-libs/libcdio/patches/libcdio-0.83.patch create mode 100644 dev-libs/libcss/libcss-0.1.2.bep create mode 100644 dev-libs/libdwarf/libdwarf-20120410.bep create mode 100644 dev-libs/libdwarf/patches/libdwarf-20120410.patch create mode 100644 dev-libs/libedit/libedit-20110802-3.0.bep create mode 100644 dev-libs/libedit/libedit-20120601-3.0.bep create mode 100644 dev-libs/libedit/patches/libedit-20110802-3.0.patch create mode 100644 dev-libs/libedit/patches/libedit-20120601-3.0.patch create mode 100644 dev-libs/libelf/libelf-0.8.13.bep create mode 100644 dev-libs/libelf/patches/libelf-0.8.13.patch create mode 100644 dev-libs/libffi/libffi-3.0.11.bep create mode 100644 dev-libs/libgcrypt/libgcrypt-1.5.0.bep create mode 100644 dev-libs/libgcrypt/patches/libgcrypt-1.5.0.patch create mode 100644 dev-libs/libgpg-error/libgpg-error-1.10.bep create mode 100644 dev-libs/libgpg-error/patches/libgpg-error-1.10.patch create mode 100644 dev-libs/liboil/patches/liboil-0.3.17.patch create mode 100644 dev-libs/libparserutils/libparserutils-0.1.1.bep create mode 100644 dev-libs/libpcre/libpcre-8.21.bep create mode 100644 dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.bep create mode 100644 dev-libs/libwapcaplet/libwapcaplet-0.1.1.bep create mode 100644 dev-libs/libxml2/libxml2-2.8.0.bep create mode 100644 dev-libs/libxml2/libxml2-2.9.0.bep create mode 100644 dev-libs/libxml2/patches/libxml2-2.9.0.patch create mode 100644 dev-libs/libxslt/libxslt-1.1.28.bep create mode 100644 dev-libs/libzip/libzip-0.10.1.bep create mode 100644 dev-libs/libzip/libzip-0.10.bep create mode 100644 dev-libs/lzo/lzo-2.06.bep create mode 100644 dev-libs/mpc/mpc-1.0.1.bep create mode 100644 dev-libs/mpfr/mpfr-3.1.1.bep create mode 100644 dev-libs/oniguruma/oniguruma-5.9.2.bep create mode 100644 dev-libs/oniguruma/patches/oniguruma-5.9.2.patch create mode 100644 dev-libs/openssl/openssl-1.0.0e.bep create mode 100644 dev-libs/openssl/openssl-1.0.0g.bep create mode 100644 dev-libs/openssl/openssl-1.0.0j.bep create mode 100644 dev-libs/openssl/patches/openssl-1.0.0e.patch create mode 100644 dev-libs/openssl/patches/openssl-1.0.0g.patch create mode 100644 dev-libs/openssl/patches/openssl-1.0.0j.patch create mode 100644 dev-libs/protobuf/patches/protobuf-2.4.1.patch create mode 100644 dev-libs/protobuf/protobuf-2.4.1.bep create mode 100644 dev-libs/raptor2/raptor2-2.0.8.bep create mode 100644 dev-libs/rasqal/patches/rasqal-0.9.29.patch create mode 100644 dev-libs/rasqal/rasqal-0.9.29.bep create mode 100644 dev-libs/redland/redland-1.0.15.bep create mode 100644 dev-libs/serd/patches/serd-0.18.0.patch create mode 100644 dev-libs/serd/serd-0.18.0.bep create mode 100644 dev-libs/tinyxml/tinyxml-2.6.2.bep create mode 100644 dev-lua/luarocks/luarocks-2.0.4.1.bep create mode 100644 dev-python/cnf/cnf-1.0-git.bep create mode 100644 dev-python/pylzma/pylzma-0.4.4.bep create mode 100644 dev-python/pyxml/licenses/PyXML create mode 100644 dev-python/pyxml/pyxml-0.8.4.bep create mode 100644 dev-python/rdflib/rdflib-3.2.0.bep create mode 100644 dev-qt/qtcore/patches/qt-4.7.3.patch create mode 100644 dev-qt/qtcore/qtcore-4.7.3.bep rename x11-libs/qt/qt-4.8.x-git.bep => dev-qt/qtcore/qtcore-4.8.x-git.bep (78%) create mode 100644 dev-qt/qtcore/qtcore-4.8.x.bep create mode 100644 dev-scheme/chicken/chicken-4.7.0.bep create mode 100644 dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.bep create mode 100644 dev-util/abi-compliance-checker/example-descriptors/README create mode 100644 dev-util/abi-compliance-checker/example-descriptors/libjpeg-6.2.desc create mode 100644 dev-util/abi-compliance-checker/example-descriptors/libjpeg-7.desc create mode 100644 dev-util/abi-compliance-checker/example-descriptors/libjpeg-8.desc create mode 100644 dev-util/abi-compliance-checker/example-descriptors/libpng-1.2.42.desc create mode 100644 dev-util/abi-compliance-checker/example-descriptors/libpng-1.4.0.desc create mode 100644 dev-util/abi-compliance-checker/example-descriptors/zlib-1.1.4.desc create mode 100644 dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.2.desc create mode 100644 dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.3.desc create mode 100644 dev-util/astyle/astyle-r339.bep create mode 100644 dev-util/astyle/astyle-r361.bep create mode 100644 dev-util/automoc/automoc-4-git.bep create mode 100644 dev-util/bsdbuild/bsdbuild-2.9.bep create mode 100644 dev-util/bsdbuild/patches/bsdbuild-2.9.patch create mode 100644 dev-util/buildsystem/buildsystem-0.bep create mode 100644 dev-util/ccache/ccache-3.1.4.bep create mode 100644 dev-util/ccache/ccache-3.1.7.bep create mode 100644 dev-util/cmake/cmake-2.8-git.bep create mode 100644 dev-util/cmake/cmake-2.8.10.2.bep create mode 100644 dev-util/cmake/patches/cmake-2.8-git.patch create mode 100644 dev-util/cmake/patches/cmake-2.8.10.2.patch create mode 100644 dev-util/cppunit/cppunit-1.12.1.bep delete mode 100644 dev-util/global/global-5.8.1.bep delete mode 100644 dev-util/global/global-5.8.2.bep delete mode 100644 dev-util/global/global-5.8.bep delete mode 100644 dev-util/global/global-5.9.1.bep delete mode 100644 dev-util/global/global-5.9.bep create mode 100644 dev-util/global/global-6.2.2.bep create mode 100644 dev-util/global/global-6.2.4.bep delete mode 100644 dev-util/global/patches/global-5.8.1.patch delete mode 100644 dev-util/global/patches/global-5.8.2.patch delete mode 100644 dev-util/global/patches/global-5.8.patch delete mode 100644 dev-util/global/patches/global-5.9.1.patch delete mode 100644 dev-util/global/patches/global-5.9.patch create mode 100644 dev-util/global/patches/global-6.2.2.patch create mode 100644 dev-util/global/patches/global-6.2.4.patch create mode 100644 dev-util/patchutils/patchutils-0.3.2.bep create mode 100644 dev-util/premake/patches/premake-4.3.patch create mode 100644 dev-util/premake/premake-4.3.bep create mode 100644 dev-util/scons/patches/scons-2.0.1.patch create mode 100644 dev-util/scons/patches/scons-2.2.0.patch create mode 100644 dev-util/scons/scons-2.0.1.bep create mode 100644 dev-util/scons/scons-2.2.0.bep create mode 100644 dev-vcs/bzr/bzr-2.5.1.bep create mode 100644 dev-vcs/bzr/bzr-2.6b1.bep create mode 100644 dev-vcs/fossil/fossil-1.22-fossil.bep create mode 100644 dev-vcs/fossil/fossil-1.22.bep create mode 100644 dev-vcs/fossil/patches/fossil-1.22.patch delete mode 100644 dev-vcs/git/git-1.6.5.3.bep delete mode 100644 dev-vcs/git/git-1.7.0.1.bep delete mode 100644 dev-vcs/git/git-1.7.0.4.bep delete mode 100644 dev-vcs/git/git-1.7.0.5.bep delete mode 100644 dev-vcs/git/git-1.7.1.bep create mode 100644 dev-vcs/git/git-1.7.10.2.bep create mode 100644 dev-vcs/git/git-1.7.11.3.bep delete mode 100644 dev-vcs/git/git-1.7.3.1.bep delete mode 100644 dev-vcs/git/git-1.7.3.5.bep create mode 100644 dev-vcs/git/git-1.8.0.bep create mode 100644 dev-vcs/git/git-1.8.1.3.bep delete mode 100644 dev-vcs/git/patches/git-1.5.5.diff delete mode 100644 dev-vcs/git/patches/git-1.7.0.4.patch delete mode 100644 dev-vcs/git/patches/git-1.7.0.5.patch delete mode 100644 dev-vcs/git/patches/git-1.7.1.patch create mode 100644 dev-vcs/git/patches/git-1.7.10.2.patch create mode 100644 dev-vcs/git/patches/git-1.7.11.3.patch create mode 100644 dev-vcs/git/patches/git-1.8.0.patch create mode 100644 dev-vcs/git/patches/git-1.8.1.3.patch create mode 100644 dev-vcs/gitdoc/gitdoc-1.7.10.2.bep create mode 100644 dev-vcs/gitdoc/gitdoc-1.7.11.3.bep create mode 100644 dev-vcs/gitdoc/gitdoc-1.8.0.bep create mode 100644 dev-vcs/gitdoc/gitdoc-1.8.1.3.bep delete mode 100644 dev-vcs/mercurial/mercurial-1.4.2.bep delete mode 100644 dev-vcs/mercurial/mercurial-1.4.bep delete mode 100644 dev-vcs/mercurial/mercurial-1.5.1.bep delete mode 100644 dev-vcs/mercurial/mercurial-1.5.2.bep delete mode 100644 dev-vcs/mercurial/mercurial-1.5.3.bep delete mode 100644 dev-vcs/mercurial/mercurial-1.5.bep delete mode 100644 dev-vcs/mercurial/mercurial-1.6.bep delete mode 100644 dev-vcs/mercurial/mercurial-1.7.3.bep create mode 100644 dev-vcs/mercurial/mercurial-2.2.2.bep create mode 100644 dev-vcs/mercurial/mercurial-2.2.3.bep create mode 100644 dev-vcs/mercurial/mercurial-2.3.bep create mode 100644 dev-vcs/mercurial/mercurial-2.4.bep delete mode 100644 dev-vcs/mercurial/patches/mercurial-1.0.2-haiku.diff delete mode 100644 dev-vcs/mercurial/patches/mercurial-1.5.1.patch delete mode 100644 dev-vcs/mercurial/patches/mercurial-1.5.2.patch delete mode 100644 dev-vcs/mercurial/patches/mercurial-1.5.3.patch delete mode 100644 dev-vcs/mercurial/patches/mercurial-1.6.patch delete mode 100644 dev-vcs/mercurial/patches/mercurial-1.7.3.patch create mode 100644 dev-vcs/mercurial/patches/mercurial-2.2.2.patch create mode 100644 dev-vcs/mercurial/patches/mercurial-2.2.3.patch create mode 100644 dev-vcs/mercurial/patches/mercurial-2.3.patch create mode 100644 dev-vcs/mercurial/patches/mercurial-2.4.patch create mode 100644 dev-vcs/subversion/patches/subversion-1.6.17.patch create mode 100644 dev-vcs/subversion/patches/subversion-1.6.18.patch create mode 100644 dev-vcs/subversion/subversion-1.6.17.bep create mode 100644 dev-vcs/subversion/subversion-1.6.18.bep create mode 100644 dev-vcs/subversion/subversion-1.7.0-rc2.bep create mode 100644 games-arcade/alienblaster/alienblaster-1.1.0.bep create mode 100644 games-arcade/supertux/patches/supertux-0.1.3.patch create mode 100644 games-arcade/supertux/supertux-0.1.3.bep create mode 100644 games-emulation/dosbox/dosbox-0.74-svn.bep create mode 100644 games-emulation/dosbox/dosbox-0.74-svn.patch create mode 100644 games-emulation/visualboyadvance/patches/visualboyadvance-1.7.2.patch create mode 100644 games-emulation/visualboyadvance/visualboyadvance-1.7.2.bep create mode 100644 games-misc/sdljoytest/sdljoytest-11102003.bep create mode 100644 games-puzzle/abrick/abrick-1.12.bep create mode 100644 games-puzzle/wizznic/patches/wizznic-0.9.9.patch create mode 100644 games-puzzle/wizznic/wizznic-0.9.9.bep create mode 100644 games-rpg/freedroid/freedroid-1.0.2.bep create mode 100644 games-rpg/freedroid/patches/freedroid-1.0.2.patch create mode 100644 games-simulation/openttd/openttd-1.2.3.bep create mode 100644 haiku-apps/W6/W6-1.7.bep create mode 100644 haiku-apps/W6/patches/w6-1.7.patch create mode 100644 haiku-apps/album/album-0.9.2.bep create mode 100644 haiku-apps/aplayer/aplayer-4.0.1.bep create mode 100644 haiku-apps/armyknife/armyknife-62.bep create mode 100644 haiku-apps/armyknife/armyknife-63.bep create mode 100644 haiku-apps/armyknife/armyknife-999-git.bep create mode 100644 haiku-apps/beae/beae-25.bep create mode 100644 haiku-apps/beam/beam-1.2alpha.bep create mode 100644 haiku-apps/beezer/beezer-1.bep create mode 100644 haiku-apps/beget/beget-1.2.3.bep create mode 100644 haiku-apps/behappy/behappy-16.bep create mode 100644 haiku-apps/behappy/patches/Makefile rename haiku-apps/bepdf/{bepdf-1.1.1b2-532.bep => bepdf-1.1.1b4.bep} (54%) create mode 100644 haiku-apps/beshare/beshare-4.bep create mode 100644 haiku-apps/bowser/bowser-1.1.1-cvs.bep create mode 100644 haiku-apps/burnitnow/burnitnow-2-svn.bep create mode 100644 haiku-apps/burnitnow/burnitnow-43.bep create mode 100644 haiku-apps/burnitnow/burnitnow-beta5-svn.bep create mode 100644 haiku-apps/burnitnow/burnitnow-beta6-git.bep create mode 100644 haiku-apps/burnitnow/burnitnow-beta6.bep create mode 100644 haiku-apps/burnitnow/patches/burnitnow-beta5-svn.patch create mode 100644 haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.bep create mode 100644 haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.bep create mode 100644 haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.bep create mode 100644 haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.bep create mode 100644 haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.bep create mode 100644 haiku-apps/caya-gpl-protocols/patches/caya-gpl-protocols-0.HEAD.patch create mode 100644 haiku-apps/caya/caya-0.HEAD.bep create mode 100644 haiku-apps/caya/caya-236.bep create mode 100644 haiku-apps/caya/caya-240.bep create mode 100644 haiku-apps/caya/caya-264.bep create mode 100644 haiku-apps/caya/caya-278.bep create mode 100644 haiku-apps/caya/caya-279.bep create mode 100644 haiku-apps/clockwerk/clockwerk-80.bep create mode 100644 haiku-apps/documentviewer/documentviewer-0.3.2.bep create mode 100644 haiku-apps/friss/friss-0.7-svn.bep create mode 100644 haiku-apps/globe/globe-0.4.bep create mode 100644 haiku-apps/globe/patches/globe-0.4.patch create mode 100644 haiku-apps/haikutwitter/haikutwitter-1.0-svn.bep create mode 100644 haiku-apps/haikutwitter/haikutwitter-1.0.bep create mode 100644 haiku-apps/hare/hare-beta1-git.bep create mode 100644 haiku-apps/keymapswitcher/keymapswitcher-1.2.7.bep create mode 100644 haiku-apps/pe/pe-2.4.3-hg.bep create mode 100644 haiku-apps/puri/puri-0.3.9.1.bep create mode 100644 haiku-apps/sawteeth/sawteeth-1.3.bep create mode 100644 haiku-apps/thememanager/thememanager-0-svn.bep create mode 100644 haiku-apps/vision/VisionSettings create mode 100644 haiku-apps/yab/patches/yab-1.6.patch create mode 100644 haiku-apps/yab/yab-1.6.bep rename {haiku-apps => haiku-libs}/libwalter/libwalter-97.bep (100%) create mode 100644 media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.bep create mode 100644 media-fonts/courier-prime/courier-prime-1.0.bep create mode 100644 media-fonts/courier-prime/licenses/SIL Open Font License v1.1 create mode 100644 media-fonts/farsi-fonts/farsi-fonts-0.4.bep create mode 100644 media-fonts/inconsolata/inconsolata-1.0.bep create mode 100644 media-fonts/kacst-fonts/kacst-fonts-5.0.bep create mode 100644 media-fonts/lateef-font/lateef-font-1.001.bep create mode 100644 media-fonts/lateef-font/licenses/SIL Open Font License v1.1 create mode 100644 media-fonts/nafees-nastaleeq/licenses/CRULP create mode 100644 media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.bep create mode 100644 media-fonts/nafees-riqa/licenses/CRULP create mode 100644 media-fonts/nafees-riqa/nafees-riqa-1.00.bep create mode 100644 media-fonts/nanumfont/licenses/SIL Open Font License v1.1 create mode 100644 media-fonts/nanumfont/nanumfont-2.0.bep create mode 100644 media-fonts/scheherazade-font/licenses/SIL Open Font License v1.1 create mode 100644 media-fonts/scheherazade-font/scheherazade-font-1.005.bep create mode 100644 media-fonts/ukijorgfonts/licenses/SIL Open Font License v1.1 create mode 100644 media-fonts/ukijorgfonts/ukijorgfonts-1.0.bep create mode 100644 media-fonts/x-series-fonts/x-series-fonts-2.0.bep create mode 100644 media-gfx/hqx/hqx-1.1.bep create mode 100644 media-libs/aalib/aalib-1.4rc4.bep create mode 100644 media-libs/agar/agar-1.4.1.bep create mode 100644 media-libs/allegro/allegro-4.4.x-svn.bep create mode 100644 media-libs/allegro/patches/allegro-4.4.x-svn.patch create mode 100644 media-libs/djvulibre/djvulibre-3.5.25.bep create mode 100644 media-libs/djvulibre/patches/djvulibre-3.5.25.patch create mode 100644 media-libs/faac/faac-1.28.bep create mode 100644 media-libs/faac/licenses/FAAC create mode 100644 media-libs/fitz/fitz-1.0.bep create mode 100644 media-libs/fitz/patches/fitz-1.0.patch create mode 100644 media-libs/fontconfig/fontconfig-2.10.0.bep create mode 100644 media-libs/fontconfig/fontconfig-2.10.2.bep delete mode 100644 media-libs/fontconfig/fontconfig-2.8.0.bep create mode 100644 media-libs/fontconfig/patches/fontconfig-2.10.0.patch create mode 100644 media-libs/freeimage/freeimage-3.15.3.bep create mode 100644 media-libs/freeimage/patches/freeimage-3.15.3.patch create mode 100644 media-libs/freetype/freetype-2.4.11.bep create mode 100644 media-libs/freetype/freetype-2.4.6.bep create mode 100644 media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.bep create mode 100644 media-libs/freetype/freetype-2.4.9.bep create mode 100644 media-libs/freetype/patches/freetype-2.4.9-with-subpixel-rendering-enabled.patch create mode 100644 media-libs/jasper/licenses/JasPer v2 create mode 100644 media-libs/jbig2dec/jbig2dec-0.11.bep create mode 100644 media-libs/jpeg/jpeg-8d.bep create mode 100644 media-libs/jpeg/patches/jpeg-8d.patch create mode 100644 media-libs/ladspa-sdk/ladspa-sdk-1.13.bep create mode 100644 media-libs/ladspa-sdk/patches/ladspa-sdk-1.13.patch create mode 100644 media-libs/leptonica/leptonica-1.68.bep create mode 100644 media-libs/libass/libass-0.10.1.bep create mode 100644 media-libs/libass/libass-0.9.11.bep create mode 100644 media-libs/libbluray/libbluray-0.2.2.bep create mode 100644 media-libs/libcoverart/libcoverart-1.0.0.bep create mode 100644 media-libs/libdiscid/libdiscid-0.3.0.bep create mode 100644 media-libs/libdvdcss/libdvdcss-1.2.12.bep create mode 100644 media-libs/libdvdcss/patches/libdvdcss-1.2.12.patch create mode 100644 media-libs/libdvdnav/libdvdnav-4.2.0.bep create mode 100644 media-libs/libdvdnav/patches/libdvdnav-4.2.0.patch create mode 100644 media-libs/libdvdread/libdvdread-4.2.0.bep create mode 100644 media-libs/libdvdread/libdvdread-svn1226.bep create mode 100644 media-libs/libdvdread/patches/libdvdread-4.2.0.patch create mode 100644 media-libs/libdvdread/patches/libdvdread-svn1168.patch create mode 100644 media-libs/libdvdread/patches/libdvdread-svn1226.patch create mode 100644 media-libs/liblo/liblo-0.26.bep create mode 100644 media-libs/liblo/patch/liblo-0.26.patch rename media-libs/libmad/{libmad-0.15.1.bep => libmad-0.15.1b.bep} (91%) create mode 100644 media-libs/libmodplug/libmodplug-0.8.8.4.bep create mode 100644 media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.bep create mode 100644 media-libs/libnsbmp/libnsbmp-0.0.3.bep create mode 100644 media-libs/libnsgif/libnsgif-0.0.3.bep create mode 100644 media-libs/libogg/libogg-1.3.0.bep create mode 100644 media-libs/libpng/libpng-1.2.46.bep create mode 100644 media-libs/libpng/libpng-1.5.12.bep create mode 100644 media-libs/libpng/libpng-1.5.13.bep create mode 100644 media-libs/libpng/libpng-1.5.2.bep create mode 100644 media-libs/libpng/libpng-1.5.4.bep create mode 100644 media-libs/libpng/libpng-1.5.7.bep create mode 100644 media-libs/libsamplerate/libsamplerate-0.1.8.bep create mode 100644 media-libs/libsdl/libsdl-1.2.15.bep create mode 100644 media-libs/libsdl/libsdl-1.3-gsoc.bep delete mode 100644 media-libs/libsdl/libsdl-1.3-hg.bep create mode 100644 media-libs/libsdl/libsdl-2.0-hg-cmake.bep create mode 100644 media-libs/libsdl/libsdl-2.0-hg.bep create mode 100644 media-libs/libsdl/sdl-config create mode 100644 media-libs/libsvgtiny/libsvgtiny-0-HEAD.bep create mode 100644 media-libs/libvpx/libvpx-1.0.0.bep create mode 100644 media-libs/libvpx/patches/libvpx-1.0.0.patch create mode 100644 media-libs/libwebp/libwebp-0.1.2-git.bep create mode 100644 media-libs/libwebp/libwebp-0.1.3.bep create mode 100644 media-libs/lv2/lv2-1.2.0.bep create mode 100644 media-libs/mediainfo/mediainfo-0.7.61.bep create mode 100644 media-libs/mediainfo/patches/mediainfo-0.7.61.patch create mode 100644 media-libs/musicbrainz/musicbrainz-5.0.1.bep create mode 100644 media-libs/openal/openal-1.13.bep create mode 100644 media-libs/openal/patches/openal-1.13.patch delete mode 100644 media-libs/openjpeg/openjpeg-1.3.bep create mode 100644 media-libs/openjpeg/openjpeg-1.5.0.bep delete mode 100644 media-libs/openjpeg/patches/openjpeg-1.3.patch create mode 100644 media-libs/schroedinger/patches/schroedinger-1.0.11.patch create mode 100644 media-libs/schroedinger/schroedinger-1.0.11.bep create mode 100644 media-libs/sdl-gfx/sdl-gfx-2.0.23.bep create mode 100644 media-libs/sdl-image/sdl-image-1.2-hg.bep create mode 100644 media-libs/sdl-image/sdl-image-1.2.12.bep create mode 100644 media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep create mode 100644 media-libs/sdl-mixer/sdl-mixer-1.2.12.bep create mode 100644 media-libs/sdl-net/patches/sdl-net-1.2.8.patch create mode 100644 media-libs/sdl-net/sdl-net-1.2-hg.bep create mode 100644 media-libs/sdl-net/sdl-net-1.2.8.bep create mode 100644 media-libs/sdl-sound/sdl-sound-1.0-hg.bep create mode 100644 media-libs/sdl-ttf/sdl-ttf-2.0-hg.bep create mode 100644 media-libs/sdl-ttf/sdl-ttf-2.0.11.bep create mode 100644 media-libs/taglib/patches/taglib-1.7.1.patch create mode 100644 media-libs/taglib/patches/taglib-1.7.patch create mode 100644 media-libs/taglib/taglib-1.7.1.bep create mode 100644 media-libs/taglib/taglib-1.7.2.bep create mode 100644 media-libs/taglib/taglib-1.7.bep create mode 100644 media-libs/taglib/taglib-1.8.bep create mode 100644 media-libs/tiff/tiff-3.9.6.bep create mode 100644 media-libs/tiff/tiff-4.0.2.bep create mode 100644 media-libs/vigra/vigra-1.8.0.bep create mode 100644 media-libs/waave/waave-1.01.bep create mode 100644 media-libs/x264/patches/x264-20120803.patch create mode 100644 media-libs/x264/x264-20120803.bep create mode 100644 media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep create mode 100644 media-sound/fluidsynth/fluidsynth-1.1.3.bep create mode 100644 media-sound/fluidsynth/fluidsynth-1.1.6.bep create mode 100644 media-sound/fluidsynth/patches/fluidsynth-1.1-midi-buffer.patch create mode 100644 media-sound/fluidsynth/patches/fluidsynth-1.1.3.patch create mode 100644 media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch create mode 100644 media-sound/gogo-no-coda/gogo-no-coda-3.13.bep create mode 100644 media-sound/gogo-no-coda/patches/gogo-no-coda-3.13.patch create mode 100644 media-sound/jack2/jack2-1.9.8.bep create mode 100644 media-sound/lame/lame-3.99.bep create mode 100644 media-sound/lame/patches/lame-3.99.patch create mode 100644 media-sound/milkytracker/milkytracker-0.90.85.bep create mode 100644 media-sound/ocp/ocp-0.1.21-git.bep create mode 100644 media-sound/ocp/ocp-snapshot20110319.bep create mode 100644 media-sound/ocp/ocp-snapshot20110320.bep create mode 100644 media-sound/ocp/patches/ocp-snapshot20110319.patch create mode 100644 media-sound/twolame/twolame-0.3.13.bep create mode 100644 media-video/ffmpeg/ffmpeg-0.10.2-vlc.bep create mode 100644 media-video/ffmpeg/ffmpeg-0.10.2.bep create mode 100644 media-video/ffmpeg/ffmpeg-0.10.bep create mode 100644 media-video/ffmpeg/ffmpeg-0.11.1.bep create mode 100644 media-video/ffmpeg/patches/ffmpeg-0.10-gcc2.patch create mode 100644 media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch create mode 100644 media-video/ffmpeg/patches/ffmpeg-0.11.1-gcc2.patch create mode 100644 media-video/vlc/patches/vlc-2.0.5.patch create mode 100644 media-video/vlc/vlc-2.0.5.bep create mode 100644 net-irc/irssi/irssi-0.8.15.bep create mode 100644 net-irc/rhapsody-irc/patches/rhapsody-irc-0.28b.patch create mode 100644 net-irc/rhapsody-irc/rhapsody-irc-0.28b.bep create mode 100644 net-libs/enet/patches/enet-1.2.2.patch create mode 100644 net-libs/hubbub/hubbub-0.1.2-HEAD.bep create mode 100644 net-libs/hubbub/hubbub-0.1.2.bep create mode 100644 net-libs/libdom/libdom-0.bep create mode 100644 net-libs/libs3/libs3-2.0.bep create mode 100644 net-libs/libs3/patches/libs3-2.0.patch create mode 100644 net-libs/libyahoo2/libyahoo2-1.0.1.bep create mode 100644 net-libs/libyahoo2/patches/libyahoo2-1.0.1.patch create mode 100644 net-misc/curl/curl-7.21.6.bep create mode 100644 net-misc/curl/curl-7.21.7.bep create mode 100644 net-misc/curl/curl-7.22.0.bep create mode 100644 net-misc/curl/curl-7.24.0.bep create mode 100644 net-misc/curl/curl-7.25.0.bep create mode 100644 net-misc/curl/curl-7.26.0.bep create mode 100644 net-misc/curl/curl-7.28.1.bep create mode 100644 net-misc/curl/patches/curl-7.22.0.patch create mode 100644 net-misc/curl/patches/curl-7.25.0.patch create mode 100644 net-misc/curl/patches/curl-7.26.0.patch create mode 100644 net-misc/minidlna/minidlna-1.0.21.bep create mode 100644 net-misc/openssh/openssh-5.8p2.bep create mode 100644 net-misc/openssh/openssh-5.9p1.bep create mode 100644 net-misc/openssh/openssh-6.0p1.bep create mode 100644 net-misc/openssh/openssh-6.1p1.bep create mode 100644 net-misc/openssh/openssh-6.2p1.bep create mode 100644 net-misc/openssh/patches/openssh-5.8p2.patch create mode 100644 net-misc/openssh/patches/openssh-5.9p1.patch create mode 100644 net-misc/openssh/patches/openssh-6.0p1.patch create mode 100644 net-misc/openssh/patches/openssh-6.1p1.patch create mode 100644 net-misc/openssh/patches/openssh-6.2p1.patch create mode 100644 net-misc/tor/patches/tor-0.2.2.35.patch create mode 100644 net-misc/tor/tor-0.2.2.35.bep create mode 100644 net-misc/tor/tor-0.2.3.25.bep create mode 100644 net-misc/wget/patches/wget-1.13.4.patch create mode 100644 net-misc/wget/wget-1.13.4.bep create mode 100644 net-p2p/seeks/licenses/GNU AGPL v3 create mode 100644 net-p2p/seeks/seeks-0.x-git.bep create mode 100644 net-p2p/transmission/patches/transmission-2.73.patch create mode 100644 net-p2p/transmission/patches/transmission-2.75.patch create mode 100644 net-p2p/transmission/transmission-2.73.bep create mode 100644 net-p2p/transmission/transmission-2.75.bep create mode 100644 net-proxy/privoxy/patches/privoxy-3.0.19.patch create mode 100644 net-proxy/privoxy/privoxy-3.0.19.bep create mode 100644 net-wireless/b43-fwcutter/patches/b43-fwcutter-012.patch create mode 100644 net-wireless/wpa_supplicant/patches/wpa_supplicant-0.7.3.patch create mode 100644 net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.bep create mode 100644 packs/libpak/libpak-0.9.4-gcc2.bep create mode 100644 packs/libpak/libpak-0.9.4-gcc4.bep create mode 100644 packs/libpak/libpak-0.9.5-gcc2.bep create mode 100644 packs/libpak/libpak-0.9.6-gcc2.bep create mode 100644 packs/libpak/libpak-0.9.6-gcc4.bep create mode 100644 packs/optionalpackages/optionalpackages-0.6-gcc2.bep create mode 100644 packs/optionalpackages/optionalpackages-0.6-gcc4.bep create mode 100644 packs/optionalpackages/optionalpackages-0.7-gcc2.bep create mode 100644 packs/optionalpackages/optionalpackages-0.7-gcc4.bep create mode 100644 sci-libs/cln/cln-1.3.2.bep create mode 100644 sci-libs/cln/patches/cln-1.3.2.patch create mode 100644 sci-physics/bullet/bullet-2.78.bep create mode 100644 sci-physics/bullet/patches/bullet-2.78.patch create mode 100644 sys-apps/dbus/dbus-1.6.8.bep create mode 100644 sys-apps/dbus/patches/dbus-1.6.8.patch create mode 100644 sys-apps/diffutils/diffutils-3.2.bep create mode 100644 sys-apps/diffutils/patches/diffutils-3.2.patch create mode 100644 sys-apps/dmidecode/dmidecode-2.11.bep create mode 100644 sys-apps/dtc/dtc-1.3.0-git.bep create mode 100644 sys-apps/dtc/patches/dtc-1.3.0-git.patch create mode 100644 sys-apps/file/file-5.11.bep create mode 100644 sys-apps/file/patches/file-5.11.patch create mode 100644 sys-apps/gawk/gawk-4.0.1.bep create mode 100644 sys-apps/grep/grep-2.12.bep create mode 100644 sys-apps/grep/grep-2.14-bz2.bep create mode 100644 sys-apps/grep/grep-2.14.bep create mode 100644 sys-apps/grep/grep-2.6.1.bep create mode 100644 sys-apps/grep/grep-2.6.3.bep create mode 100644 sys-apps/grep/patches/grep-2.12.patch create mode 100644 sys-apps/grep/patches/grep-2.14-gcc2.patch create mode 100644 sys-apps/grep/patches/grep-2.6.1.patch create mode 100755 sys-apps/hgrep/hgrep create mode 100644 sys-apps/hgrep/hgrep-1.0.1.bep create mode 100644 sys-apps/hgrep/hgrep-1.0.1.zip create mode 100644 sys-apps/hgrep/hgrep-1.0.bep create mode 100644 sys-apps/hgrep/hgrep-1.0.zip create mode 100644 sys-apps/less/less-451.bep create mode 100644 sys-apps/less/patches/less-451.patch create mode 100755 sys-apps/lgrep/lgrep create mode 100644 sys-apps/lgrep/lgrep-1.0.bep create mode 100644 sys-apps/lgrep/lgrep-1.0.zip create mode 100644 sys-apps/man/man-1.6g.bep create mode 100644 sys-apps/man/patches/man-1.6g.patch create mode 100644 sys-devel/autoconf/autoconf-2.69.bep create mode 100644 sys-devel/automake/automake-1.12.2.bep create mode 100644 sys-devel/automake/automake-1.12.5.bep create mode 100644 sys-devel/automake/automake-1.13.1.bep create mode 100644 sys-devel/automake/automake-1.13.bep delete mode 100644 sys-devel/automake/patches/automake-1.10.1.diff create mode 100644 sys-devel/bison/bison-2.5.bep create mode 100644 sys-devel/bison/bison-2.6.2.bep create mode 100644 sys-devel/bison/patches/bison-2.5-c89.diff create mode 100644 sys-devel/bison/patches/bison-2.5.patch create mode 100644 sys-devel/bison/patches/bison-2.6.2.patch create mode 100644 sys-devel/clang/clang-3.0.bep create mode 100644 sys-devel/clang/clang-3.2.bep create mode 100644 sys-devel/clang/licenses/UIUC create mode 100644 sys-devel/distcc/distcc-3.1-1.build create mode 100644 sys-devel/distcc/distcc-3.1-1.install create mode 100644 sys-devel/distcc/distcc-3.1-1.patch create mode 100644 sys-devel/distcc/distcc-3.1-1.test create mode 100644 sys-devel/gettext/patches/gettext-0.18.1.1-dev.patch create mode 100644 sys-devel/libtool/libtool-2.4.2.bep create mode 100644 sys-devel/libtool/patches/libtool-2.4.2.patch create mode 100644 sys-devel/llvm/licenses/UIUC create mode 100644 sys-devel/llvm/llvm-3.0.bep create mode 100644 sys-devel/llvm/llvm-3.2.bep create mode 100644 sys-devel/patch/patch-2.7.1.bep create mode 100644 sys-fs/e2fsprogs/e2fsprogs-1.43-git.bep create mode 100644 sys-fs/e2fsprogs/e2fsprogs-1.43.bep create mode 100644 sys-fs/e2fsprogs/patches/e2fsprogs-1.43-git.patch create mode 100644 sys-fs/e2fsprogs/patches/e2fsprogs-1.43.patch create mode 100644 sys-libs/e2fsprogs/patches/e2fsprogs-1.43-git.patch create mode 100644 sys-libs/glu/glu-9.0.bep create mode 100644 sys-libs/mesa/buildpackage.sh create mode 100644 sys-libs/mesa/mesa-7.8.2.bep create mode 100644 sys-libs/mesa/mesa-9.0.1.bep create mode 100644 sys-libs/mesa/mesa-9.0.2.bep create mode 100644 sys-libs/mesa/mesa-9.0.bep create mode 100644 sys-libs/mesa/mesa-9.1.0.bep create mode 100644 sys-libs/mesa/mesa-9.1.1.bep create mode 100644 sys-libs/mesa/patches/mesa-7.8.2.patch create mode 100644 sys-libs/mesa/patches/mesa-9.0.1.patch create mode 100644 sys-libs/mesa/patches/mesa-9.0.2.patch create mode 100644 sys-libs/mesa/patches/mesa-9.0.patch create mode 100644 sys-libs/ncurses/ncurses-5.8.bep create mode 100644 sys-libs/ncurses/ncurses-5.9.bep create mode 100644 sys-libs/readline/readline-6.2.bep create mode 100644 sys-libs/zlib/zlib-1.2.7.bep create mode 100644 sys-libs/zopfli/zopfli-999.bep create mode 100644 sys-process/htop/htop-1.0.2.bep create mode 100644 sys-process/htop/patches/htop-1.0.2.patch create mode 100644 www-client/links/links-2.3pre2.bep create mode 100644 www-client/links/patches/links-2.1pre33.beos.002.patch create mode 100644 www-client/links/patches/links-2.3pre2.patch create mode 100644 www-client/netsurf/netsurf-2.7.bep create mode 100644 www-client/netsurf/netsurf-2.9.bep create mode 100644 www-client/netsurf/netsurf-2.HEAD.bep delete mode 100644 www-client/netsurf/patches/librosprite.patch create mode 100644 www-client/netsurf/patches/netsurf-2.7.patch create mode 100644 www-client/netsurf/patches/netsurf-2.9.patch create mode 100644 www-client/netsurf/patches/netsurf-2.HEAD.patch create mode 100644 www-client/w3m/licenses/W3M create mode 100644 www-client/w3m/patches/w3m-0.5.3.patch create mode 100644 www-client/w3m/w3m-0.5.3.bep create mode 100644 www-servers/apache/apache-2.2.22.bep create mode 100644 www-servers/apache/apache-2.4.3.bep create mode 100644 www-servers/apache/patches/apache-2.2.22.patch create mode 100644 www-servers/apache/patches/apache-2.4.3.patch create mode 100644 www-servers/cherokee/cherokee-1.2.101.bep create mode 100644 www-servers/cherokee/patches/cherokee-1.2.101.patch create mode 100644 www-servers/haproxy/haproxy-1.4.22.bep create mode 100644 www-servers/haproxy/patches/haproxy-1.4.22.patch create mode 100644 www-servers/nginx/patches/nginx-1.3.0-svn.diff create mode 100644 x11-misc/shared-mime-info/shared-mime-info-1.0.bep create mode 100644 x11-misc/util-macros/util-macros-1.17.0-git.bep create mode 100644 x11-proto/xproto/patches/xproto-7.0.23-git.patch create mode 100644 x11-proto/xproto/xproto-7.0.23-git.bep diff --git a/app-admin/pwgen/pwgen-2.06.bep b/app-admin/pwgen/pwgen-2.06.bep index 05bb863ae..209ad42d1 100644 --- a/app-admin/pwgen/pwgen-2.06.bep +++ b/app-admin/pwgen/pwgen-2.06.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd pwgen-2.06 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-arch/arc/arc-5.21o.bep b/app-arch/arc/arc-5.21o.bep index 96d0cbf22..a27d79533 100644 --- a/app-arch/arc/arc-5.21o.bep +++ b/app-arch/arc/arc-5.21o.bep @@ -12,9 +12,9 @@ BUILD { INSTALL { cd arc-5.21o - install arc /boot/common/bin - install marc /boot/common/bin - install arc.1 /boot/common/man/man1 + install arc --prefix={$DESTDIR}`finddir B_COMMON_DIRECTORY` + install marc --prefix={$DESTDIR}`finddir B_COMMON_DIRECTORY` + install arc.1 {$DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1 } LICENSE="GNU GPL v2" diff --git a/app-arch/cabextract/cabextract-1.2.bep b/app-arch/cabextract/cabextract-1.2.bep index 12752d2f0..5e6df8e4c 100644 --- a/app-arch/cabextract/cabextract-1.2.bep +++ b/app-arch/cabextract/cabextract-1.2.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd cabextract-1.2 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-arch/cabextract/cabextract-1.3.bep b/app-arch/cabextract/cabextract-1.3.bep index 9264b066c..be5f7b460 100644 --- a/app-arch/cabextract/cabextract-1.3.bep +++ b/app-arch/cabextract/cabextract-1.3.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd cabextract-1.3 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-arch/cpio/cpio-2.10.bep b/app-arch/cpio/cpio-2.10.bep index 9899f3a06..f0971c4c3 100644 --- a/app-arch/cpio/cpio-2.10.bep +++ b/app-arch/cpio/cpio-2.10.bep @@ -7,7 +7,11 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd cpio-2.10 - ./configure --prefix=/boot/common + sed -i 's/restrict//g' gnu/string.in.h + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale make } @@ -15,5 +19,11 @@ INSTALL { cd cpio-2.10 make install } + +TEST { + cd cpio-2.10 + make check +} + LICENSE="GNU GPL v3" COPYRIGHT="1988-2009 Free Software Foundation, Inc." diff --git a/app-arch/cpio/cpio-2.11.bep b/app-arch/cpio/cpio-2.11.bep new file mode 100644 index 000000000..4b5e8d0bb --- /dev/null +++ b/app-arch/cpio/cpio-2.11.bep @@ -0,0 +1,29 @@ +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" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="" +BUILD { + cd cpio-2.11 +# sed -i 's/restrict//g' gnu/string.in.h + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale + make +} + +INSTALL { + cd cpio-2.11 + make install +} + +TEST { + cd cpio-2.11 + make check +} + +LICENSE="GNU GPL v3" +COPYRIGHT="1988-2010 Free Software Foundation, Inc." diff --git a/app-arch/cpio/patches/cpio-2.10.patch b/app-arch/cpio/patches/cpio-2.10.patch index 345fdb451..c81bad271 100644 --- a/app-arch/cpio/patches/cpio-2.10.patch +++ b/app-arch/cpio/patches/cpio-2.10.patch @@ -35,15 +35,16 @@ diff -urN cpio-2.10/gnu/hash.c cpio-2.10-haiku/gnu/hash.c char *dirpath; /* A copy we can scribble NULs on. */ struct stat stats; int retval = 0; -+ char *slash = dirpath; ++ char *slash; mode_t tmpmode; mode_t invert_permissions; int we_are_root = getuid () == 0; -@@ -68,7 +68,6 @@ +@@ -68,7 +69,7 @@ tmpmode = MODE_RWX & ~ newdir_umask; invert_permissions = we_are_root ? 0 : MODE_WXUSR & ~ tmpmode; - char *slash = dirpath; ++ slash = dirpath; while (*slash == '/') slash++; while ((slash = strchr (slash, '/'))) diff --git a/app-arch/cpio/patches/cpio-2.11.patch b/app-arch/cpio/patches/cpio-2.11.patch new file mode 100644 index 000000000..bc25253d3 --- /dev/null +++ b/app-arch/cpio/patches/cpio-2.11.patch @@ -0,0 +1,32 @@ +diff -urN cpio-2.11/configure.ac cpio-2.11-haiku/configure.ac +--- cpio-2.11/configure.ac 2010-03-10 04:59:16.008126464 -0800 ++++ cpio-2.11-haiku/configure.ac 2013-03-12 15:18:23.338165760 -0700 +@@ -47,6 +47,8 @@ + AC_HEADER_STDC + AC_HEADER_DIRENT + ++AC_SEARCH_LIBS(gethostbyname, [socket, network]) ++ + AC_CHECK_FUNCS([fchmod fchown]) + # This is needed for mingw build + AC_CHECK_FUNCS([setmode getpwuid getpwnam getgrgid getgrnam pipe fork getuid geteuid]) +diff -urN cpio-2.11/src/makepath.c cpio-2.11-haiku/src/makepath.c +--- cpio-2.11/src/makepath.c 2010-02-12 02:19:23.043778048 -0800 ++++ cpio-2.11-haiku/src/makepath.c 2013-03-12 15:18:30.096993280 -0700 +@@ -56,6 +56,7 @@ + char *dirpath; /* A copy we can scribble NULs on. */ + struct stat stats; + int retval = 0; ++ char *slash; + mode_t tmpmode; + mode_t invert_permissions; + int we_are_root = getuid () == 0; +@@ -68,7 +69,7 @@ + tmpmode = MODE_RWX & ~ newdir_umask; + invert_permissions = we_are_root ? 0 : MODE_WXUSR & ~ tmpmode; + +- char *slash = dirpath; ++ slash = dirpath; + while (*slash == '/') + slash++; + while ((slash = strchr (slash, '/'))) diff --git a/app-arch/fastjar/fastjar-0.98.bep b/app-arch/fastjar/fastjar-0.98.bep index 58d382d98..d1d6e50f3 100644 --- a/app-arch/fastjar/fastjar-0.98.bep +++ b/app-arch/fastjar/fastjar-0.98.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd fastjar-0.98 autoreconf -vfi - configure --prefix=/boot/common + configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-arch/gzip/gzip-1.2.4a.bep b/app-arch/gzip/gzip-1.2.4a.bep index 92592902e..df43f1de9 100644 --- a/app-arch/gzip/gzip-1.2.4a.bep +++ b/app-arch/gzip/gzip-1.2.4a.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="untested" DEPEND="" BUILD { cd gzip-1.2.4a - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-arch/gzip/gzip-1.3.12.bep b/app-arch/gzip/gzip-1.3.12.bep index 69f0b4c3f..b5a35d4ef 100644 --- a/app-arch/gzip/gzip-1.3.12.bep +++ b/app-arch/gzip/gzip-1.3.12.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="untested" DEPEND="" BUILD { cd gzip-1.3.12 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-arch/gzip/gzip-1.4.bep b/app-arch/gzip/gzip-1.4.bep new file mode 100644 index 000000000..555edcd22 --- /dev/null +++ b/app-arch/gzip/gzip-1.4.bep @@ -0,0 +1,21 @@ +DESCRIPTION="GNU zip" +HOMEPAGE="http://www.gzip.org/" +SRC_URI="ftp://ftp.gnu.org/gnu/gzip/gzip-1.4.tar.gz" +CHECKSUM_MD5="e381b8506210c794278f5527cba0e765" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="" +BUILD { + cd gzip-1.4 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd gzip-1.4 + make install +} +LICENSE="GNU GPL v3" +COPYRIGHT="1999, 2001-2002, 2006-2007, 2009-2010 Free Software Foundation, Inc. + 1992-1993 Jean-loup Gailly" + diff --git a/app-arch/gzip/patches/gzip-1.4.patch b/app-arch/gzip/patches/gzip-1.4.patch new file mode 100644 index 000000000..8b7051d87 --- /dev/null +++ b/app-arch/gzip/patches/gzip-1.4.patch @@ -0,0 +1,18 @@ +--- ./gzip-1.4/inflate.c 2010-01-20 14:15:12.017039360 +0100 ++++ ./gzip-1.4/inflate.c 2011-12-03 00:03:37.421003264 +0100 +@@ -588,6 +588,7 @@ + /* do the copy */ + do { + n -= (e = (e = WSIZE - ((d &= WSIZE-1) > w ? d : w)) > n ? n : e); ++ { + #if !defined(NOMEMCPY) && !defined(DEBUG) + unsigned int delta = w > d ? w - d : d - w; + if (delta >= e) +@@ -602,6 +603,7 @@ + slide[w++] = slide[d++]; + Tracevv((stderr, "%c", slide[w-1])); + } while (--e); ++ } + if (w == WSIZE) + { + flush_output(w); diff --git a/app-arch/lha/lha-1.14i.bep b/app-arch/lha/lha-1.14i.bep index 1a3e28307..1219ed066 100644 --- a/app-arch/lha/lha-1.14i.bep +++ b/app-arch/lha/lha-1.14i.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd lha-1.14i-ac20050924p1 autoreconf -vfi - ./configure --prefix=/boot/common/ + ./configure --prefix=`finddir B_COMMON_DIRECTORY`/ make } diff --git a/app-arch/libarchive/libarchive-2.8.5.bep b/app-arch/libarchive/libarchive-2.8.5.bep new file mode 100644 index 000000000..d44ecd1b8 --- /dev/null +++ b/app-arch/libarchive/libarchive-2.8.5.bep @@ -0,0 +1,34 @@ +DESCRIPTION="C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats." +HOMEPAGE="http://libarchive.github.com/" +SRC_URI="https://github.com/downloads/libarchive/libarchive/libarchive-2.8.5.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="58d1b202b4878e9da45cfe6d2a740881" +BUILD { + cd libarchive-2.8.5 + libtoolize --force --copy --install + aclocal -I build/autoconf + autoconf + automake + chmod 755 configure + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` + COMMON_DIR=`finddir B_COMMON_DIRECTORY` + ./configure --prefix=$COMMON_DIR \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd libarchive-2.8.5 + make install +} + +TEST { + cd libarchive-2.8.5 + make check +} + +LICENSE="BSD (2-clause)" +COPYRIGHT="2003-2009 Tim Kientzle" diff --git a/app-arch/libarchive/libarchive-3.0.3.bep b/app-arch/libarchive/libarchive-3.0.3.bep new file mode 100644 index 000000000..b5d4644a6 --- /dev/null +++ b/app-arch/libarchive/libarchive-3.0.3.bep @@ -0,0 +1,34 @@ +DESCRIPTION="C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats." +HOMEPAGE="http://libarchive.github.com/" +SRC_URI="https://github.com/downloads/libarchive/libarchive/libarchive-3.0.3.tar.gz" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="" +CHECKSUM_MD5="ca4090f0099432a9ac5a8b6618dc3892" +BUILD { + cd libarchive-3.0.3 + libtoolize --force --copy --install + aclocal -I build/autoconf + autoconf + automake + chmod 755 configure + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` + COMMON_DIR=`finddir B_COMMON_DIRECTORY` + ./configure --prefix=$COMMON_DIR \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd libarchive-3.0.3 + make install +} + +TEST { + cd libarchive-3.0.3 + make check +} + +LICENSE="BSD (2-clause)" +COPYRIGHT="2003-2009 Tim Kientzle" diff --git a/app-arch/p7zip/p7zip-9.04.bep b/app-arch/p7zip/p7zip-9.04.bep index 4a35a39af..26ae736bb 100644 --- a/app-arch/p7zip/p7zip-9.04.bep +++ b/app-arch/p7zip/p7zip-9.04.bep @@ -1,5 +1,5 @@ -DESCRIPTION="p7zip" -HOMEPAGE="http://p7zip.sourceforge.net" +DESCRIPTION="p7zip" +HOMEPAGE="http://p7zip.sourceforge.net" SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.04/p7zip_9.04_src_all.tar.bz2?use_mirror=cdnetworks-us-2" REVISION="1" STATUS_HAIKU="stable" @@ -13,7 +13,11 @@ BUILD { INSTALL { cd p7zip_9.04 - make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` DEST_SHARE_DOC=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/p7zip DEST_MAN=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + make install DEST_DIR=${DESTDIR} \ + DEST_HOME=`finddir B_COMMON_DIRECTORY` \ + DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \ + DEST_MAN=$COMMON_DOCS/man } LICENSE="GNU LGPL v2.1" COPYRIGHT="1999-2009 7-Zip Igor Pavlov." diff --git a/app-arch/p7zip/p7zip-9.13.bep b/app-arch/p7zip/p7zip-9.13.bep index a7e8ff335..a2b44e7f1 100644 --- a/app-arch/p7zip/p7zip-9.13.bep +++ b/app-arch/p7zip/p7zip-9.13.bep @@ -1,5 +1,5 @@ -DESCRIPTION="p7zip" -HOMEPAGE="http://p7zip.sourceforge.net" +DESCRIPTION="p7zip" +HOMEPAGE="http://p7zip.sourceforge.net" SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.13/p7zip_9.13_src_all.tar.bz2" REVISION="1" STATUS_HAIKU="stable" @@ -13,9 +13,10 @@ BUILD { INSTALL { cd p7zip_9.13 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \ - DEST_SHARE_DOC=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/p7zip \ - DEST_MAN=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \ + DEST_MAN=$COMMON_DOCS/man } LICENSE="GNU LGPL v2.1" COPYRIGHT="1999-2010 7-Zip Igor Pavlov." diff --git a/app-arch/p7zip/p7zip-9.20.1.bep b/app-arch/p7zip/p7zip-9.20.1.bep new file mode 100644 index 000000000..a011b20e1 --- /dev/null +++ b/app-arch/p7zip/p7zip-9.20.1.bep @@ -0,0 +1,22 @@ +DESCRIPTION="p7zip" +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89" +BUILD { + cd p7zip_9.20.1 + cp makefile.haiku makefile.machine + make +} + +INSTALL { + cd p7zip_9.20.1 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \ + DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \ + DEST_MAN=$COMMON_DOCS/man +} +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1999-2011 7-Zip Igor Pavlov." diff --git a/app-arch/p7zip/patches/p7zip-9.20.1.patch b/app-arch/p7zip/patches/p7zip-9.20.1.patch new file mode 100644 index 000000000..5608dfd7e --- /dev/null +++ b/app-arch/p7zip/patches/p7zip-9.20.1.patch @@ -0,0 +1,53 @@ +diff -urN p7zip_9.20.1/CPP/myWindows/config.h p7zip_9.20.1-haiku/CPP/myWindows/config.h +--- p7zip_9.20.1/CPP/myWindows/config.h 2011-01-21 22:24:42.022806528 -0800 ++++ p7zip_9.20.1-haiku/CPP/myWindows/config.h 2012-06-13 23:02:29.589824000 -0700 +@@ -24,7 +24,7 @@ + + #endif /* !ENV_MACOSX && !ENV_BEOS */ + +- #if !defined(ENV_BEOS) ++ #if !defined(ENV_BEOS) && !defined(ENV_HAIKU) + #define ENV_HAVE_GETPASS + + #if !defined(sun) +diff -urN p7zip_9.20.1/CPP/Windows/System.cpp p7zip_9.20.1-haiku/CPP/Windows/System.cpp +--- p7zip_9.20.1/CPP/Windows/System.cpp 2009-02-15 01:19:45.023330816 -0800 ++++ p7zip_9.20.1-haiku/CPP/Windows/System.cpp 2012-06-13 23:06:28.000786432 -0700 +@@ -15,7 +15,7 @@ + #include + #endif + +-#if defined(ENV_BEOS) ++#if defined(ENV_BEOS) || defined(ENV_HAIKU) + #include + #endif + +@@ -79,7 +79,7 @@ + if (nbcpu < 1) nbcpu = 1; + return nbcpu; + } +- #elif defined(ENV_BEOS) ++ #elif defined(ENV_BEOS) || defined(ENV_HAIKU) + UInt32 GetNumberOfProcessors() { + system_info info; + get_system_info(&info); +diff -urN p7zip_9.20.1/makefile.haiku p7zip_9.20.1-haiku/makefile.haiku +--- p7zip_9.20.1/makefile.haiku 1969-12-31 16:00:00.000000000 -0800 ++++ p7zip_9.20.1-haiku/makefile.haiku 2012-06-13 23:09:01.245628928 -0700 +@@ -0,0 +1,16 @@ ++OPTFLAGS=-O ++ ++ALLFLAGS=${OPTFLAGS} -s \ ++ -DENV_HAIKU \ ++ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ ++ -DNDEBUG -D_REENTRANT -DENV_UNIX \ ++ $(LOCAL_FLAGS) ++ ++CXX=g++ $(ALLFLAGS) ++CC=gcc $(ALLFLAGS) ++LINK_SHARED=-nostart ++ ++LOCAL_LIBS= ++LOCAL_LIBS_DLL=$(LOCAL_LIBS) ++ ++OBJ_CRC32=$(OBJ_CRC32_C) diff --git a/app-arch/sharutils/sharutils-4.10.bep b/app-arch/sharutils/sharutils-4.10.bep index 72367da5e..9c30b836d 100644 --- a/app-arch/sharutils/sharutils-4.10.bep +++ b/app-arch/sharutils/sharutils-4.10.bep @@ -1,5 +1,5 @@ -DESCRIPTION="sharutils" -HOMEPAGE="http://www.gnu.org/software/sharutils/" +DESCRIPTION="sharutils" +HOMEPAGE="http://www.gnu.org/software/sharutils/" SRC_URI="ftp://ftp.gnu.org/gnu/sharutils/sharutils-4.10.tar.gz" CHECKSUM_MD5="c8bbfa89810ce9f5399b38392549207c" REVISION="1" @@ -8,9 +8,10 @@ DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." BUILD { cd sharutils-4.10 - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$MANDIR \ + --infodir=$COMMON_DOCS/info \ + --mandir=$COMMON_DOCS/man \ --disable-nls make } diff --git a/app-arch/tar/patches/tar-1.26.patch b/app-arch/tar/patches/tar-1.26.patch new file mode 100644 index 000000000..6a5c15c80 --- /dev/null +++ b/app-arch/tar/patches/tar-1.26.patch @@ -0,0 +1,108 @@ +diff -aur tar-1.26/src/common.h tar/src/common.h +--- tar-1.26/src/common.h 2011-02-11 12:56:13.006553600 +0100 ++++ tar/src/common.h 2012-10-30 20:04:25.823132160 +0100 +@@ -186,6 +186,8 @@ + }; + GLOBAL enum old_files old_files_option; + ++GLOBAL bool simulate_hardlinks_option; ++ + /* Specified file name for incremental list. */ + GLOBAL const char *listed_incremental_option; + /* Incremental dump level */ +diff -aur tar-1.26/src/extract.c tar/src/extract.c +--- tar-1.26/src/extract.c 2010-11-27 11:33:22.008912896 +0100 ++++ tar/src/extract.c 2012-10-30 20:26:14.453246976 +0100 +@@ -31,6 +31,8 @@ + static mode_t newdir_umask; /* umask when creating new directories */ + static mode_t current_umask; /* current umask (which is set to 0 if -p) */ + ++static int extract_symlink (char *, int); ++ + #define ALL_MODE_BITS ((mode_t) ~ (mode_t) 0) + + #if ! HAVE_FCHMOD && ! defined fchmod +@@ -1113,6 +1115,38 @@ + char const *link_name; + int rc; + ++ if (simulate_hardlinks_option) ++ { ++ /* symlinks have to be normalized */ ++ const char* f = file_name; ++ const char* l = current_stat_info.link_name; ++ int sep_pos = 0; ++ int p_count = 0; ++ char *link_name = (char*) xmalloc(strlen(current_stat_info.link_name) * 2); ++ ++ for (; *f && *l; f++, l++) ++ { ++ if (*f != *l) ++ break; ++ if (*f == DIRECTORY_SEPARATOR) ++ sep_pos = f - file_name; ++ } ++ ++ for (p_count = 0; *f; f++) ++ if (*f == DIRECTORY_SEPARATOR) ++ p_count++; ++ ++ link_name[0] = '\0'; ++ while (p_count--) ++ strcat(link_name, "../"); ++ ++ strcat(link_name, ¤t_stat_info.link_name[sep_pos + 1]); ++ free(current_stat_info.link_name); ++ current_stat_info.link_name = link_name; ++ ++ return extract_symlink(file_name, typeflag); ++ } ++ + link_name = current_stat_info.link_name; + + if (! absolute_names_option && contains_dot_dot (link_name)) +@@ -1201,6 +1235,13 @@ + #else + static int warned_once; + ++ /* recursion is not welcomed here */ ++ if (simulate_hardlinks_option && typeflag == LINKTYPE) ++ { ++ link_error (current_stat_info.link_name, file_name); ++ return -1; ++ } ++ + if (!warned_once) + { + warned_once = 1; +diff -aur tar-1.26/src/tar.c tar/src/tar.c +--- tar-1.26/src/tar.c 2010-10-24 20:07:55.005767168 +0200 ++++ tar/src/tar.c 2012-10-30 20:21:51.518520832 +0100 +@@ -466,6 +466,8 @@ + {"overwrite-dir", OVERWRITE_DIR_OPTION, 0, 0, + N_("overwrite metadata of existing directories when extracting (default)"), + GRID+1 }, ++ {"replace-hardlinks", 'Q', 0, 0, ++ N_("replace hardlinks with corresponding symlink when extracting"), GRID+1 }, + #undef GRID + + #define GRID 40 +@@ -1815,6 +1817,10 @@ + set_archive_format (arg); + break; + ++ case 'Q': ++ simulate_hardlinks_option = true; ++ break; ++ + case INDEX_FILE_OPTION: + index_file_name = arg; + break; +@@ -2240,6 +2246,7 @@ + unquote_option = true; + tar_sparse_major = 1; + tar_sparse_minor = 0; ++ simulate_hardlinks_option = false; + + owner_option = -1; + group_option = -1; diff --git a/app-arch/tar/tar-1.22.bep b/app-arch/tar/tar-1.22.bep index 9f4d4a475..c27dcb404 100644 --- a/app-arch/tar/tar-1.22.bep +++ b/app-arch/tar/tar-1.22.bep @@ -7,7 +7,9 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd tar-1.22 - ./configure --prefix=/boot/common --sbindir=/boot/common/bin --libexecdir=/boot/common/bin + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` make } diff --git a/app-arch/tar/tar-1.23.bep b/app-arch/tar/tar-1.23.bep index e281aa46a..8b61cc573 100644 --- a/app-arch/tar/tar-1.23.bep +++ b/app-arch/tar/tar-1.23.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="broken" DEPEND="" BUILD { cd tar-1.23 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-arch/tar/tar-1.25.bep b/app-arch/tar/tar-1.25.bep index 93ce9ce62..28fecf0bf 100644 --- a/app-arch/tar/tar-1.25.bep +++ b/app-arch/tar/tar-1.25.bep @@ -1,5 +1,5 @@ -DESCRIPTION="tar saves and restores files from a tape or disk archive." -HOMEPAGE="http://www.gnu.org/software/tar/" +DESCRIPTION="tar saves and restores files from a tape or disk archive." +HOMEPAGE="http://www.gnu.org/software/tar/" SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.25.tar.bz2" CHECKSUM_MD5="6e497f861c77bbba2f7da4e10270995b" REVISION="1" @@ -15,12 +15,15 @@ BUILD { cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/fseek* gnu/ cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/iswblank* gnu/ cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/fcntl* gnu/ - ./configure --prefix=/boot/common \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + sed -i 's/@GNULIB_NONBLOCKING@/0/' gnu/fcntl* + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --infodir=$COMMON_DOCS/info \ --libexecdir=`finddir B_COMMON_LIB_DIRECTORY`/exec \ - --sbindir=`finddir B_COMMON_SERVERS_DIRECTORY` \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --disable-nls \ LDFLAGS="-lnetwork" \ - FORCE_UNSAFE_CONFIGURE=1 + FORCE_UNSAFE_CONFIGURE=1 make } diff --git a/app-arch/tar/tar-1.26.bep b/app-arch/tar/tar-1.26.bep new file mode 100644 index 000000000..ee941c03c --- /dev/null +++ b/app-arch/tar/tar-1.26.bep @@ -0,0 +1,26 @@ +DESCRIPTION="tar saves and restores files from a tape or disk archive." +HOMEPAGE="http://www.gnu.org/software/tar/" +SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2" +CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd tar-1.26 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --infodir=$COMMON_DOCS/info \ + --libexecdir=`finddir B_COMMON_LIB_DIRECTORY`/exec \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --disable-nls \ + LDFLAGS="-lnetwork" \ + FORCE_UNSAFE_CONFIGURE=1 + make +} + +INSTALL { + cd tar-1.26 + make install +} +LICENSE="GNU GPL v3" +COPYRIGHT="1990-2011 Free Software Foundation, Inc." diff --git a/app-arch/unrar/patches/unrar-4.2.4.patch b/app-arch/unrar/patches/unrar-4.2.4.patch new file mode 100644 index 000000000..bd12da35b --- /dev/null +++ b/app-arch/unrar/patches/unrar-4.2.4.patch @@ -0,0 +1,263 @@ +diff -aur unrar/arcread.cpp unrar.4.2.4.haiku/arcread.cpp +--- unrar/arcread.cpp 2012-06-09 15:21:04.066584576 +0200 ++++ unrar.4.2.4.haiku/arcread.cpp 2013-01-17 21:57:19.749207552 +0100 +@@ -666,7 +666,7 @@ + { + if (*s=='/' || *s=='\\') + *s=CPATHDIVIDER; +-#if defined(_APPLE) && !defined(UNICODE_SUPPORTED) ++#if (defined(_APPLE) || defined(_BEOS)) && !defined(UNICODE_SUPPORTED) + if ((byte)*s<32 || (byte)*s>127) + *s='_'; + #endif +diff -aur unrar/consio.cpp unrar.4.2.4.haiku/consio.cpp +--- unrar/consio.cpp 2012-06-09 15:21:04.000524288 +0200 ++++ unrar.4.2.4.haiku/consio.cpp 2013-01-21 22:23:37.662437888 +0100 +@@ -141,7 +141,7 @@ + SetConsoleMode(hConOut,ConOutMode); + #else + char StrA[MAXPASSWORD]; +-#if defined(_EMX) || defined(_BEOS) || defined(__sparc) || defined(sparc) || defined (__VMS) ++#if defined(_EMX) || defined(__sparc) || defined(sparc) || defined (__VMS) + fgets(StrA,ASIZE(StrA)-1,stdin); + #else + strncpyz(StrA,getpass(""),ASIZE(StrA)); +diff -aur unrar/extract.cpp unrar.4.2.4.haiku/extract.cpp +--- unrar/extract.cpp 2012-06-09 15:21:04.002097152 +0200 ++++ unrar.4.2.4.haiku/extract.cpp 2013-01-17 21:42:21.914620416 +0100 +@@ -311,7 +311,7 @@ + bool WideName=false; + #endif + +-#ifdef _APPLE ++#if defined(_APPLE) || defined(_BEOS) + if (WideName) + { + // Prepare UTF-8 name for OS X. Since we are sure that destination +diff -aur unrar/file.cpp unrar.4.2.4.haiku/file.cpp +--- unrar/file.cpp 2012-06-09 15:21:04.002621440 +0200 ++++ unrar.4.2.4.haiku/file.cpp 2013-01-21 22:12:02.543162368 +0100 +@@ -304,6 +304,8 @@ + hFile=stderr; + #endif + break; ++ default: ++ break; + } + #endif + while (1) +diff -aur unrar/find.cpp unrar.4.2.4.haiku/find.cpp +--- unrar/find.cpp 2012-06-09 15:21:04.003145728 +0200 ++++ unrar.4.2.4.haiku/find.cpp 2013-01-17 21:43:25.860618752 +0100 +@@ -104,7 +104,7 @@ + } + } + *fd->NameW=0; +-#ifdef _APPLE ++#if defined(_APPLE) || defined(_BEOS) + if (!LowAscii(fd->Name)) + UtfToWide(fd->Name,fd->NameW,sizeof(fd->NameW)); + #elif defined(UNICODE_SUPPORTED) +@@ -170,7 +170,7 @@ + strcpy(fd->Name,FindMask); + + *fd->NameW=0; +-#ifdef _APPLE ++#if defined(_APPLE) || defined(_BEOS) + if (!LowAscii(fd->Name)) + UtfToWide(fd->Name,fd->NameW,sizeof(fd->NameW)); + #elif defined(UNICODE_SUPPORTED) +diff -aur unrar/makefile.unix unrar.4.2.4.haiku/makefile.unix +--- unrar/makefile.unix 2012-05-15 07:31:03.004980736 +0200 ++++ unrar.4.2.4.haiku/makefile.unix 2013-01-21 22:17:15.800325632 +0100 +@@ -7,7 +7,11 @@ + LIBFLAGS=-fPIC + DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + STRIP=strip +-DESTDIR=/usr ++LDFLAGS=-lbsd ++RC=rc ++XRES=xres ++MIMESET=mimeset ++DESTDIR=$(shell finddir B_COMMON_DIRECTORY) + + # Linux using LCC + #CXX=lcc +@@ -114,12 +118,14 @@ + uninstall: uninstall-unrar + + clean: +- @rm -f *.o *.bak *~ ++ @rm -f *.o *.bak *~ *.rsrc + + unrar: clean $(OBJECTS) $(UNRAR_OBJ) + @rm -f unrar + $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) +- $(STRIP) unrar ++ $(RC) -o unrar.rsrc unrar.rdef ++ $(XRES) -o unrar unrar.rsrc ++ $(MIMESET) unrar + + sfx: WHAT=SFX_MODULE + sfx: clean $(OBJECTS) +@@ -144,3 +150,29 @@ + + uninstall-lib: + rm -f $(DESTDIR)/lib/libunrar.so ++ ++MACHINE=$(shell uname -m) ++ifeq ($(MACHINE), BePC) ++ MACHINE = x86-gcc$(word 1, $(subst -, , $(subst ., , $(shell $(CC) -dumpversion)))) ++endif ++ ++VERSION=4.2.4 ++DATE := `date +%F` ++PACKAGE_NAME := unrar-$(VERSION)-$(MACHINE)-$(DATE) ++COMMENT = .OptionalPackageDescription ++DESCRIPTION = dist/$(COMMENT) ++ ++haiku_package: unrar ++ -rm -rf dist/common ++ -mkdir -p dist/common/bin ++ -cp unrar dist/common/bin ++ -mkdir -p dist/common/data/licenses ++ -cp license.txt dist/common/data/licenses/UnRAR ++ echo "Package: UnRAR" > $(DESCRIPTION) ++ echo "Version: $(VERSION)-$(MACHINE)-$(DATE)" >> $(DESCRIPTION) ++ echo "Copyright: Alexander Roshal." >> $(DESCRIPTION) ++ echo "Description: Utility to list, test and expand RAR archives." >> $(DESCRIPTION) ++ echo "License: UnRAR" >> $(DESCRIPTION) ++ echo "URL: http://www.rarlab.com/" >> $(DESCRIPTION) ++ cd dist && zip -9 -r -z -y $(PACKAGE_NAME).zip common $(COMMENT) < $(COMMENT) ++ +diff -aur unrar/os.hpp unrar.4.2.4.haiku/os.hpp +--- unrar/os.hpp 2012-06-09 15:21:04.005767168 +0200 ++++ unrar.4.2.4.haiku/os.hpp 2013-01-21 22:25:04.170655744 +0100 +@@ -134,8 +134,9 @@ + #define NM 1024 + + #ifdef _BEOS +-#include +-#include ++#include ++#include ++#include + #endif + + #include +@@ -206,6 +207,16 @@ + #endif + #endif + ++#ifdef _BEOS ++#if LITTLE_ENDIAN ++ #undef BIG_ENDIAN ++#elif BIG_ENDIAN ++ #undef LITTLE_ENDIAN ++#else ++ #error "Byte order must be defined!" ++#endif ++#endif ++ + #if defined(__sparc) || defined(sparc) || defined(__hpux) + #ifndef BIG_ENDIAN + #define BIG_ENDIAN +diff -aur unrar/raros.hpp unrar.4.2.4.haiku/raros.hpp +--- unrar/raros.hpp 2012-06-09 15:21:04.006553600 +0200 ++++ unrar.4.2.4.haiku/raros.hpp 2013-01-16 19:50:06.066060288 +0100 +@@ -29,7 +29,7 @@ + #endif + #endif + +-#ifdef __BEOS__ ++#if defined(__BEOS__) || defined(__HAIKU__) + #define _UNIX + #define _BEOS + #endif +diff -aur unrar/rartypes.hpp unrar.4.2.4.haiku/rartypes.hpp +--- unrar/rartypes.hpp 2012-06-09 15:21:04.006815744 +0200 ++++ unrar.4.2.4.haiku/rartypes.hpp 2013-01-19 23:12:46.715653120 +0100 +@@ -7,6 +7,7 @@ + + #define PRESENT_INT32 // undefine if signed 32 bits is not available + ++#ifndef _BEOS + typedef unsigned int uint32; // 32 bits exactly + typedef signed int int32; // signed 32 bits exactly + +@@ -20,6 +21,7 @@ + typedef unsigned long long uint64; // unsigned 64 bits + typedef signed long long int64; // signed 64 bits + #endif ++#endif // #ifndef _BEOS + + + #if defined(_WIN_ALL) || defined(__GNUC__) || defined(__sgi) || defined(_AIX) || defined(__sun) || defined(__hpux) || defined(_OSF_SOURCE) +diff -aur unrar/rarvm.cpp unrar.4.2.4.haiku/rarvm.cpp +--- unrar/rarvm.cpp 2012-06-09 15:21:04.007077888 +0200 ++++ unrar.4.2.4.haiku/rarvm.cpp 2013-01-21 22:12:02.605814784 +0100 +@@ -792,6 +792,8 @@ + case VM_CMP: + Cmd->OpCode=Cmd->ByteMode ? VM_CMPB:VM_CMPD; + continue; ++ default: ++ break; + } + if ((VM_CmdFlags[Cmd->OpCode] & VMCF_CHFLAGS)==0) + continue; +@@ -835,6 +837,8 @@ + case VM_NEG: + Cmd->OpCode=Cmd->ByteMode ? VM_NEGB:VM_NEGD; + continue; ++ default: ++ break; + } + } + } +@@ -1102,6 +1106,8 @@ + SET_VALUE(false,&Mem[VM_GLOBALMEMADDR+0x20],DataSize); + } + break; ++ default: ++ break; + } + } + +diff -aur unrar/unicode.cpp unrar.4.2.4.haiku/unicode.cpp +--- unrar/unicode.cpp 2012-06-09 15:21:04.010747904 +0200 ++++ unrar.4.2.4.haiku/unicode.cpp 2013-01-17 21:41:15.856686592 +0100 +@@ -13,7 +13,7 @@ + if (WideCharToMultiByte(CP_ACP,0,Src,-1,Dest,(int)DestSize,NULL,NULL)==0) + RetCode=false; + +-#elif defined(_APPLE) ++#elif defined(_APPLE) || defined(_BEOS) + WideToUtf(Src,Dest,DestSize); + + #elif defined(MBFUNCTIONS) +@@ -73,7 +73,7 @@ + if (MultiByteToWideChar(CP_ACP,0,Src,-1,Dest,(int)DestSize)==0) + RetCode=false; + +-#elif defined(_APPLE) ++#elif defined(_APPLE) || defined(_BEOS) + UtfToWide(Src,Dest,DestSize); + + #elif defined(MBFUNCTIONS) +diff -aur unrar/unrar.rdef unrar.4.2.4.haiku/unrar.rdef +--- unrar/unrar.rdef 1970-01-01 01:00:00.000000000 +0100 ++++ unrar.4.2.4.haiku/unrar.rdef 2013-01-16 20:43:32.898629632 +0100 +@@ -0,0 +1,13 @@ ++ ++resource app_signature "application/x-vnd.Roshal-UnRAR"; ++resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP; ++ ++resource app_version { ++ major = 4, ++ middle = 2, ++ minor = 4, ++ variety = 0, ++ internal = 0, ++ short_info = "4.2.4", ++ long_info = "4.2.4 Alexander Roshal" ++}; diff --git a/app-arch/unrar/unrar-4.2.4.bep b/app-arch/unrar/unrar-4.2.4.bep new file mode 100644 index 000000000..1b697795b --- /dev/null +++ b/app-arch/unrar/unrar-4.2.4.bep @@ -0,0 +1,19 @@ +DESCRIPTION="unrar" +HOMEPAGE="http://www.rarlab.com/" +SRC_URI="http://www.rarlab.com/rar/unrarsrc-4.2.4.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="8ea9d1b4139474b282d76e627a2de3e4" +BUILD { + cd unrar + make -f makefile.unix DESTDIR=`finddir B_COMMON_DIRECTORY` +} + +INSTALL { + cd unrar + make -f makefile.unix DESTDIR=`finddir B_COMMON_DIRECTORY` install +} + +LICENSE="UnRAR" +COPYRIGHT="Alexander Roshal" diff --git a/app-arch/unzip/unzip-6.0.bep b/app-arch/unzip/unzip-6.0.bep new file mode 100644 index 000000000..868411e99 --- /dev/null +++ b/app-arch/unzip/unzip-6.0.bep @@ -0,0 +1,28 @@ +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" +STATUS_HAIKU="broken" +DEPEND="" +CHECKSUM_MD5="62b490407489521db863b523a7f86375" +BUILD { + cd unzip60 + make -f beos/Makefile \ + PREFIX=`finddir B_COMMON_DIRECTORY` \ + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + +} + +INSTALL { + cd unzip60 + make -f beos/Makefile install +} + +TEST { + cd unzip60 +# make test +# make check +} + +LICENSE="Info-ZIP" +#COPYRIGHT="" diff --git a/app-arch/xar/patches/xar-1.5.2.patch b/app-arch/xar/patches/xar-1.5.2.patch new file mode 100644 index 000000000..31d503ffb --- /dev/null +++ b/app-arch/xar/patches/xar-1.5.2.patch @@ -0,0 +1,24 @@ +diff -Naur xar-1.5.2/lib/darwinattr.c xar-1.5.2-haiku/lib/darwinattr.c +--- xar-1.5.2/lib/darwinattr.c 2007-12-29 18:49:57.035651584 +0000 ++++ xar-1.5.2-haiku/lib/darwinattr.c 2013-01-09 20:55:26.246415360 +0000 +@@ -40,7 +40,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include "xar.h" +diff -Naur xar-1.5.2/lib/stat.c xar-1.5.2-haiku/lib/stat.c +--- xar-1.5.2/lib/stat.c 2007-12-29 18:49:57.033554432 +0000 ++++ xar-1.5.2-haiku/lib/stat.c 2013-01-09 20:55:34.206307328 +0000 +@@ -53,7 +53,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/app-arch/xar/xar-1.5.2.bep b/app-arch/xar/xar-1.5.2.bep new file mode 100644 index 000000000..5eddcd68b --- /dev/null +++ b/app-arch/xar/xar-1.5.2.bep @@ -0,0 +1,25 @@ +DESCRIPTION="Easily extensible archiver" +HOMEPAGE="http://code.google.com/p/xar/" +SRC_URI="http://xar.googlecode.com/files/xar-1.5.2.tar.gz" +CHECKSUM_MD5="8eabb055d3387b8edc30ecfb08d2e80d" +REVISION="1" +STATUS_HAIKU="stable" +MESSAGE="This port builds only with gcc4. Use 'setgcc gcc4' before building." +DEPEND="" + +BUILD { + cd xar-1.5.2 + libtoolize --force --copy --install + aclocal + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd xar-1.5.2 + make install +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="2005 Rob Braun" diff --git a/app-arch/xz-utils/xz-utils-4.999.9.bep b/app-arch/xz-utils/xz-utils-4.999.9.bep index 40229ba4e..a692dc832 100644 --- a/app-arch/xz-utils/xz-utils-4.999.9.bep +++ b/app-arch/xz-utils/xz-utils-4.999.9.bep @@ -8,13 +8,13 @@ MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" BUILD { cd xz-4.999.9beta - cp -f /boot/common/bin/libtool . + cp -f `finddir B_COMMON_BIN_DIRECTORY`/libtool . libtoolize -c -f aclocal -I m4 autoconf autoheader automake -acf --foreign - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-arch/xz-utils/xz-utils-5.0.1.bep b/app-arch/xz-utils/xz-utils-5.0.1.bep new file mode 100644 index 000000000..cfec88a3c --- /dev/null +++ b/app-arch/xz-utils/xz-utils-5.0.1.bep @@ -0,0 +1,34 @@ +DESCRIPTION="XZ Utils is data compression software for working with LZMA compressed files." +HOMEPAGE="http://tukaani.org/xz/" +SRC_URI="http://tukaani.org/xz/xz-5.0.1.tar.bz2" +CHECKSUM_MD5="cb6c7a58cec4d663a395c54d186ca0c6" +REVISION="1" +STATUS_HAIKU="stable" +MESSAGE="This port only builds with gcc4." +DEPEND="" +BUILD { + cd xz-5.0.1 + touch po/t-cs.gmo + libtoolize --force --copy --install + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --docdir=$COMMON_DOCS/doc/xz \ + --mandir=$COMMON_DOCS/man \ + --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale + make +} + +INSTALL { + cd xz-5.0.1 + make install +} + +TEST { + cd xz-5.0.1 + make check +} + +LICENSE="GNU LGPL v2.1 + GNU GPL v2 + GNU GPL v3" +COPYRIGHT="2005-2011 Lasse Collin" diff --git a/app-arch/xz-utils/xz-utils-5.0.4.bep b/app-arch/xz-utils/xz-utils-5.0.4.bep new file mode 100644 index 000000000..efeaeaeb8 --- /dev/null +++ b/app-arch/xz-utils/xz-utils-5.0.4.bep @@ -0,0 +1,34 @@ +DESCRIPTION="XZ Utils is data compression software for working with LZMA compressed files." +HOMEPAGE="http://tukaani.org/xz/" +SRC_URI="http://tukaani.org/xz/xz-5.0.4.tar.bz2" +CHECKSUM_MD5="741cd3a5f64b23b7bac56ec5b2258715" +REVISION="1" +STATUS_HAIKU="stable" +MESSAGE="This port only builds with gcc4." +DEPEND="" +BUILD { + cd xz-5.0.4 + touch po/t-cs.gmo + libtoolize --force --copy --install + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --docdir=$COMMON_DOCS/doc/xz \ + --mandir=$COMMON_DOCS/man \ + --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale + make +} + +INSTALL { + cd xz-5.0.4 + make install +} + +TEST { + cd xz-5.0.4 + make check +} + +LICENSE="GNU LGPL v2.1 + GNU GPL v2 + GNU GPL v3" +COPYRIGHT="2005-2012 Lasse Collin" diff --git a/app-arch/info-zip/zip30-haiku.patch b/app-arch/zip/patches/zip-3.0.patch similarity index 100% rename from app-arch/info-zip/zip30-haiku.patch rename to app-arch/zip/patches/zip-3.0.patch diff --git a/app-arch/zip/zip-3.0.bep b/app-arch/zip/zip-3.0.bep new file mode 100644 index 000000000..132af02e8 --- /dev/null +++ b/app-arch/zip/zip-3.0.bep @@ -0,0 +1,27 @@ +DESCRIPTION="zip" +HOMEPAGE="http://www.info-zip.org/Zip.html" +SRC_URI="http://downloads.sourceforge.net/project/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="" +CHECKSUM_MD5="7b74551e63f8ee6aab6fbc86676c0d37" +BUILD { + cd zip30 + make -f beos/Makefile \ + PREFIX=`finddir B_COMMON_DIRECTORY` \ + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man +} + +INSTALL { + cd zip30 + make -f beos/Makefile install +} + +TEST { + cd zip30 +# make test +# make check +} + +#LICENSE="Info-Zip" +#COPYRIGHT="" diff --git a/app-benchmarks/bonnie++/bonnie++-1.03e.bep b/app-benchmarks/bonnie++/bonnie++-1.03e.bep index 1650d186d..bb6fb950f 100644 --- a/app-benchmarks/bonnie++/bonnie++-1.03e.bep +++ b/app-benchmarks/bonnie++/bonnie++-1.03e.bep @@ -7,10 +7,12 @@ DEPEND="" CHECKSUM_MD5="750aa5b5051263a99c6c195888c74968" BUILD { cd bonnie++-1.03e + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` + --mandir=$COMMON_DOCS/man \ + --bindir=$COMMON_BIN \ + --sbindir=$COMMON_BIN make } INSTALL { diff --git a/app-benchmarks/libmicro/libmicro-0.4.1.bep b/app-benchmarks/libmicro/libmicro-0.4.1.bep new file mode 100644 index 000000000..db2d7b796 --- /dev/null +++ b/app-benchmarks/libmicro/libmicro-0.4.1.bep @@ -0,0 +1,26 @@ +DESCRIPTION="libmicro - portable microbenchmarks" +HOMEPAGE="http://hub.opensolaris.org/bin/view/Project+libmicro" +SRC_URI="http://hub.opensolaris.org/bin/download/Project+libmicro/Source+Archives/libmicro-0.4.1.tar.gz" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="" +CHECKSUM_MD5="2b6e1ff22164e4ae0c21c11e6c28f7ed" +BUILD { + cd libMicro-0.4.1 + make +} + +INSTALL { + cd libMicro-0.4.1 + cd bin-BePC + ls +} + +TEST { + cd libMicro-0.4.1 +# make test +# make check +} + +LICENSE="CDDL v1" +#COPYRIGHT="" diff --git a/app-benchmarks/libmicro/patches/libmicro-0.4.1.patch b/app-benchmarks/libmicro/patches/libmicro-0.4.1.patch new file mode 100644 index 000000000..f2585f153 --- /dev/null +++ b/app-benchmarks/libmicro/patches/libmicro-0.4.1.patch @@ -0,0 +1,124 @@ +diff -urN libMicro-0.4.1/bench.sh libMicro-0.4.1-haiku/bench.sh +--- libMicro-0.4.1/bench.sh 2011-05-11 00:58:23.061079552 +0000 ++++ libMicro-0.4.1-haiku/bench.sh 2012-07-23 22:10:32.466616320 +0000 +@@ -56,7 +56,7 @@ + VDIR2=$VARROOT/1/2/3/4/5/6/7/8/9/0 + + +-OPTS="-E -C 200 -L -S -W" ++OPTS="-l -E -C 200 -L -S -W" + + dd if=/dev/zero of=$TFILE bs=1024k count=10 2>/dev/null + dd if=/dev/zero of=$VFILE bs=1024k count=10 2>/dev/null +@@ -65,7 +65,7 @@ + + touch $IFILE + +-ARCH=`arch -k` ++ARCH=`uname -m` + + # produce benchmark header for easier comparisons + +diff -urN libMicro-0.4.1/cascade_flock.c libMicro-0.4.1-haiku/cascade_flock.c +--- libMicro-0.4.1/cascade_flock.c 2011-05-11 00:58:23.063176704 +0000 ++++ libMicro-0.4.1-haiku/cascade_flock.c 2012-07-23 22:02:58.843579392 +0000 +@@ -50,7 +50,7 @@ + #include "libmicro.h" + + #ifndef LOCK_EX +-#include "/usr/ucbinclude/sys/file.h" ++#include "sys/file.h" + extern int flock(int fd, int operation); + #endif + +diff -urN libMicro-0.4.1/Makefile.benchmarks libMicro-0.4.1-haiku/Makefile.benchmarks +--- libMicro-0.4.1/Makefile.benchmarks 2011-05-11 00:58:23.066584576 +0000 ++++ libMicro-0.4.1-haiku/Makefile.benchmarks 2012-07-23 22:09:00.531365888 +0000 +@@ -50,7 +50,7 @@ + fcntl_ndelay \ + file_lock \ + fork \ +- getcontext \ ++# getcontext \ + getenv \ + gettimeofday \ + getpeername \ +diff -urN libMicro-0.4.1/Makefile.com libMicro-0.4.1-haiku/Makefile.com +--- libMicro-0.4.1/Makefile.com 2011-05-11 00:58:23.057147392 +0000 ++++ libMicro-0.4.1-haiku/Makefile.com 2012-07-23 22:08:55.440664064 +0000 +@@ -54,10 +54,10 @@ + + + $(EXTRA_CFILES:%.c=%.lint): +- $(LINT) ../$(@:%.lint=%.c) -I. -mu -lc libmicro.ln -lm ++ $(LINT) ../$(@:%.lint=%.c) -I. -mu -lc libmicro.ln + + %.lint: ../%.c libmicro.ln +- $(LINT) -mu $(CPPFLAGS) $< libmicro.ln -lpthread -lsocket -lnsl -lm ++ $(LINT) -mu $(CPPFLAGS) $< libmicro.ln -lnetwork + + %.o: ../%.c + $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ +@@ -107,13 +107,13 @@ + echo "char * compiler_version = \""`$(COMPILER_VERSION_CMD)`"\";" > tattle.h + echo "char * CC = \""$(CC)"\";" >> tattle.h + echo "char * extra_compiler_flags = \""$(extra_CFLAGS)"\";" >> tattle.h +- $(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a -lrt -lm ++ $(CC) -o tattle $(CFLAGS) -I. ../tattle.c libmicro.a + + $(ELIDED_BENCHMARKS): ../elided.c + $(CC) -o $(@) ../elided.c + + %: libmicro.a %.o +- $(CC) -o $(@) $(@).o $($(@)_EXTRA_DEPS) $(CFLAGS) libmicro.a $($(@)_EXTRA_LIBS) $(EXTRA_LIBS) -lpthread -lm ++ $(CC) -o $(@) $(@).o $($(@)_EXTRA_DEPS) $(CFLAGS) libmicro.a $($(@)_EXTRA_LIBS) $(EXTRA_LIBS) -lnetwork + + exec: exec_bin + +diff -urN libMicro-0.4.1/Makefile.Haiku libMicro-0.4.1-haiku/Makefile.Haiku +--- libMicro-0.4.1/Makefile.Haiku 1970-01-01 00:00:00.000000000 +0000 ++++ libMicro-0.4.1-haiku/Makefile.Haiku 2012-07-23 22:08:51.105381888 +0000 +@@ -0,0 +1,43 @@ ++# ++# CDDL HEADER START ++# ++# The contents of this file are subject to the terms ++# of the Common Development and Distribution License ++# (the "License"). You may not use this file except ++# in compliance with the License. ++# ++# You can obtain a copy of the license at ++# src/OPENSOLARIS.LICENSE ++# or http://www.opensolaris.org/os/licensing. ++# See the License for the specific language governing ++# permissions and limitations under the License. ++# ++# When distributing Covered Code, include this CDDL ++# HEADER in each file and include the License file at ++# usr/src/OPENSOLARIS.LICENSE. If applicable, ++# add the following below this CDDL HEADER, with the ++# fields enclosed by brackets "[]" replaced with your ++# own identifying information: Portions Copyright [yyyy] ++# [name of copyright owner] ++# ++# CDDL HEADER END ++# ++ ++# ++# Copyright 2005 Sun Microsystems, Inc. All rights reserved. ++# Use is subject to license terms. ++# ++ ++ ++CC= gcc ++ ++#CFLAGS= -O -DUSE_SEMOP ++CPPFLAGS= -DUSE_SEMOP -D_REENTRANT ++MATHLIB= ++ ++ELIDED_BENCHMARKS= \ ++ cachetocache \ ++ atomic ++ ++ ++include ../Makefile.com diff --git a/app-benchmarks/piozone/patches/piozone-1.0.patch b/app-benchmarks/piozone/patches/piozone-1.0.patch new file mode 100644 index 000000000..6ba612597 --- /dev/null +++ b/app-benchmarks/piozone/patches/piozone-1.0.patch @@ -0,0 +1,40 @@ +diff -urN piozone-1.0/piozone.c piozone-1.0-haiku/piozone.c +--- piozone-1.0/piozone.c 2002-01-28 08:14:54.022282240 +0000 ++++ piozone-1.0-haiku/piozone.c 2012-07-18 19:03:17.767295488 +0000 +@@ -12,7 +12,9 @@ + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + ++#include + #include ++#include + #include + #include + #include +@@ -73,7 +75,7 @@ + int count = 0; + int nr = 0; + +- llseek(fd, off, SEEK_SET); ++ lseek(fd, off, SEEK_SET); + signal(SIGALRM, sigalrm_handler); + stopf = 0; + printf("Testing... "); +@@ -121,7 +123,7 @@ + printf("Testing... "); + alarm(ts); + while (!stopf && +- llseek(fd, off+((rand()&area)*MiB), SEEK_SET) != -1 && ++ lseek(fd, off+((rand()&area)*MiB), SEEK_SET) != -1 && + (nr = read(fd, iobuf, len)) == len) + { + print_dial(); +@@ -159,7 +161,7 @@ + off = 0; + del = 64*GiB; + +- while (del > 8*KiB && llseek(fd, off+del, SEEK_SET) != -1) ++ while (del > 8*KiB && lseek(fd, off+del, SEEK_SET) != -1) + { + if (read(fd, buf, 8*KiB) < 0) + del >>= 1; diff --git a/app-benchmarks/piozone/piozone-1.0.bep b/app-benchmarks/piozone/piozone-1.0.bep new file mode 100644 index 000000000..c8069b088 --- /dev/null +++ b/app-benchmarks/piozone/piozone-1.0.bep @@ -0,0 +1,20 @@ +DESCRIPTION="Hard disk benchmarking program" +HOMEPAGE="http://www.lysator.se/~pen/piozone/" +SRC_URI="ftp://ftp.lysator.liu.se/pub/unix/piozone/piozone-1.0.tar.gz" +CHECKSUM_MD5="e48370a9aa80aed212b18e16c08b9056" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd piozone-1.0 + make +} + +INSTALL { + cd piozone-1.0 + mkdir -p $DESTDIR/`finddir B_COMMON_BIN_DIRECTORY` + cp -a piozone $DESTDIR/`finddir B_COMMON_BIN_DIRECTORY`/piozone +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2002 Peter Eriksson" diff --git a/app-cdr/bchunk/bchunk-1.2.0.bep b/app-cdr/bchunk/bchunk-1.2.0.bep index 703cfbe41..0e4d80adb 100644 --- a/app-cdr/bchunk/bchunk-1.2.0.bep +++ b/app-cdr/bchunk/bchunk-1.2.0.bep @@ -1,5 +1,5 @@ -DESCRIPTION="binchunker converts a CD image in .bin/.cue format to a set of .iso and .cdr tracks." -HOMEPAGE="http://he.fi/bchunk/" +DESCRIPTION="binchunker converts a CD image in .bin/.cue format to a set of .iso and .cdr tracks." +HOMEPAGE="http://he.fi/bchunk/" SRC_URI="http://he.fi/bchunk/bchunk-1.2.0.tar.gz" REVISION="1" STATUS_HAIKU="stable" @@ -12,12 +12,14 @@ BUILD { INSTALL { cd bchunk-1.2.0 - mkdir -p $(finddir B_COMMON_BIN_DIRECTORY) - mkdir -p $(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1 - mkdir -p ${DESTDIR}$(finddir B_COMMON_BIN_DIRECTORY) - mkdir -p ${DESTDIR}$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1 - install -m 755 -s bchunk ${DESTDIR}$(finddir B_COMMON_BIN_DIRECTORY) - install -m 644 bchunk.1 ${DESTDIR}$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` + mkdir -p $COMMON_BIN + mkdir -p $COMMON_DOCS/man/man1 + mkdir -p ${DESTDIR}$COMMON_BIN + mkdir -p ${DESTDIR}$COMMON_DOCS/man/man1 + install -m 755 -s bchunk ${DESTDIR}$COMMON_BIN + install -m 644 bchunk.1 ${DESTDIR}$COMMON_DOCS/man/man1 } LICENSE="GNU GPL v2" COPYRIGHT="1998-2004 Heikki Hannikainen" diff --git a/app-cdr/cdrdao/cdrdao-1.2.3.bep b/app-cdr/cdrdao/cdrdao-1.2.3.bep index e0bbae033..560f0daf2 100644 --- a/app-cdr/cdrdao/cdrdao-1.2.3.bep +++ b/app-cdr/cdrdao/cdrdao-1.2.3.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-cdr/cdrtools/cdrtools-2.01.01a66.bep b/app-cdr/cdrtools/cdrtools-2.01.01a66.bep index 4aca59234..ee394e382 100644 --- a/app-cdr/cdrtools/cdrtools-2.01.01a66.bep +++ b/app-cdr/cdrtools/cdrtools-2.01.01a66.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd cdrtools-2.01.01 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-cdr/cdrtools/cdrtools-3.01a01.bep b/app-cdr/cdrtools/cdrtools-3.01a01.bep index afef16612..146935807 100644 --- a/app-cdr/cdrtools/cdrtools-3.01a01.bep +++ b/app-cdr/cdrtools/cdrtools-3.01a01.bep @@ -7,10 +7,21 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd cdrtools-3.01 + sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc + sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype + sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/readme.mk + sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* + sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/R* + sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/R* + sed -i 's/share\/doc\//documentation\/doc\//g' libparanoia/R* + sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* + sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/r* + sed -i 's/sbin\/rscsi/ bin\/rscsi/g' pkgdefs/CSW/CSWcdrtools/prototype + sed -i 's/sbin/bin/' rscsi/Makefile make GMAKE_NOWARN=true } INSTALL { cd cdrtools-3.01 - make install + make GMAKE_NOWARN=true DEFMANBASE=documentation install } diff --git a/app-cdr/cdrtools/cdrtools-3.01a06.bep b/app-cdr/cdrtools/cdrtools-3.01a06.bep new file mode 100644 index 000000000..b4e4171fe --- /dev/null +++ b/app-cdr/cdrtools/cdrtools-3.01a06.bep @@ -0,0 +1,27 @@ +DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" +HOMEPAGE="http://cdrecord.berlios.de" +SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a06.tar.bz2" +CHECKSUM_MD5="00b6c2128023186e712cf27e629ed246" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd cdrtools-3.01 + sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc + sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype + sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/readme.mk + sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* + sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/R* + sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/R* + sed -i 's/share\/doc\//documentation\/doc\//g' libparanoia/R* + sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* + sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/r* + sed -i 's/sbin\/rscsi/ bin\/rscsi/g' pkgdefs/CSW/CSWcdrtools/prototype + sed -i 's/sbin/bin/' rscsi/Makefile + make GMAKE_NOWARN=true +} + +INSTALL { + cd cdrtools-3.01 + make GMAKE_NOWARN=true DEFMANBASE=documentation install +} diff --git a/app-cdr/cdrtools/cdrtools-3.01a07.bep b/app-cdr/cdrtools/cdrtools-3.01a07.bep new file mode 100644 index 000000000..819664d1f --- /dev/null +++ b/app-cdr/cdrtools/cdrtools-3.01a07.bep @@ -0,0 +1,27 @@ +DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" +HOMEPAGE="http://cdrecord.berlios.de" +SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a07.tar.bz2" +CHECKSUM_MD5="266bae8db7d1e5473555b48c306aa216" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd cdrtools-3.01 + sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc + sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype + sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/readme.mk + sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* + sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/R* + sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/R* + sed -i 's/share\/doc\//documentation\/doc\//g' libparanoia/R* + sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* + sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/r* + sed -i 's/sbin\/rscsi/ bin\/rscsi/g' pkgdefs/CSW/CSWcdrtools/prototype + sed -i 's/sbin/bin/' rscsi/Makefile + make GMAKE_NOWARN=true +} + +INSTALL { + cd cdrtools-3.01 + make GMAKE_NOWARN=true DEFMANBASE=documentation install +} diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01a01.patch b/app-cdr/cdrtools/patches/cdrtools-3.01a01.patch new file mode 100644 index 000000000..b7cdc050f --- /dev/null +++ b/app-cdr/cdrtools/patches/cdrtools-3.01a01.patch @@ -0,0 +1,23 @@ +diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +--- cdrtools-3.01/DEFAULTS/Defaults.haiku ++++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +@@ -29,16 +29,16 @@ + CWARNOPTS= + + DEFINCDIRS= $(SRCROOT)/include +-LDPATH= -L/opt/schily/lib ++LDPATH= -L$(shell finddir B_COMMON_LIB_DIRECTORY) + #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) +-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib ++RUNPATH= -R$(INS_BASE)/lib + + ########################################################################### + # + # Installation config stuff + # + ########################################################################### +-INS_BASE= /boot/opt/schily ++INS_BASE= $(shell finddir B_COMMON_DIRECTORY) + INS_KBASE= / + INS_RBASE= / + # diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01a06.patch b/app-cdr/cdrtools/patches/cdrtools-3.01a06.patch new file mode 100644 index 000000000..b7cdc050f --- /dev/null +++ b/app-cdr/cdrtools/patches/cdrtools-3.01a06.patch @@ -0,0 +1,23 @@ +diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +--- cdrtools-3.01/DEFAULTS/Defaults.haiku ++++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +@@ -29,16 +29,16 @@ + CWARNOPTS= + + DEFINCDIRS= $(SRCROOT)/include +-LDPATH= -L/opt/schily/lib ++LDPATH= -L$(shell finddir B_COMMON_LIB_DIRECTORY) + #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) +-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib ++RUNPATH= -R$(INS_BASE)/lib + + ########################################################################### + # + # Installation config stuff + # + ########################################################################### +-INS_BASE= /boot/opt/schily ++INS_BASE= $(shell finddir B_COMMON_DIRECTORY) + INS_KBASE= / + INS_RBASE= / + # diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01a07.patch b/app-cdr/cdrtools/patches/cdrtools-3.01a07.patch new file mode 100644 index 000000000..e11110e03 --- /dev/null +++ b/app-cdr/cdrtools/patches/cdrtools-3.01a07.patch @@ -0,0 +1,139 @@ +diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +--- cdrtools-3.01/DEFAULTS/Defaults.haiku ++++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +@@ -29,16 +29,16 @@ + CWARNOPTS= + + DEFINCDIRS= $(SRCROOT)/include +-LDPATH= -L/opt/schily/lib ++LDPATH= -L$(shell finddir B_COMMON_LIB_DIRECTORY) + #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) +-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib ++RUNPATH= -R$(INS_BASE)/lib + + ########################################################################### + # + # Installation config stuff + # + ########################################################################### +-INS_BASE= /boot/opt/schily ++INS_BASE= $(shell finddir B_COMMON_DIRECTORY) + INS_KBASE= / + INS_RBASE= / + # +diff -urN cdrtools-3.01/RULES/x86_64-haiku-cc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul +--- cdrtools-3.01/RULES/x86_64-haiku-cc.rul 1970-01-01 00:00:00.000000000 +0000 ++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul 2012-12-08 19:24:57.418643968 +0000 +@@ -0,0 +1,54 @@ ++#ident "@(#)bepc-haiku-cc.rul 1.3 09/02/05 " ++########################################################################### ++# Written 1996 by J. Schilling ++########################################################################### ++# ++# Platform dependent MACROS for Haiku, a BeOS like OS ++# ++########################################################################### ++# Copyright (c) J. Schilling ++########################################################################### ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License, Version 1.0 only ++# (the "License"). You may not use this file except in compliance ++# with the License. ++# ++# See the file CDDL.Schily.txt in this distribution for details. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file CDDL.Schily.txt from this distribution. ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/rules.prg ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul ++ ++# ++# XXX Old BeOS needs libroot.so to get [efg]cvt() ++# XXX New BeOS seems to have this in libc and in addition we include ++# XXX strtod.c for floating point conversion on OS without such code. ++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been ++# XXX removed and printing floating numbers will work with old/new BeOS ++# ++#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS ++OSDEFS += ++ ++KDEFINES= -DKERNEL -D_KERNEL ++ ++#CONFFLAGS= i586 ++ ++LIB_PREFIX= lib ++LIB_SUFFIX= .a ++SHL_SUFFIX= .so ++ ++#LIB_SOCKET= -lsocket -lbind ++LIB_SOCKET= -lnetwork ++LIB_MATH= ++LIB_KVM= ++ ++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) ++LDOPTS= $(LIBS_PATH) $(LDPATH) ++ ++LORDER= echo ++TSORT= cat ++ ++LN= /bin/ln -s +diff -urN cdrtools-3.01/RULES/x86_64-haiku-gcc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul +--- cdrtools-3.01/RULES/x86_64-haiku-gcc.rul 1970-01-01 00:00:00.000000000 +0000 ++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul 2012-12-08 19:24:57.421265408 +0000 +@@ -0,0 +1,54 @@ ++#ident "@(#)bepc-haiku-gcc.rul 1.3 09/02/05 " ++########################################################################### ++# Written 1996 by J. Schilling ++########################################################################### ++# ++# Platform dependent MACROS for Haiku, a BeOS like OS ++# ++########################################################################### ++# Copyright (c) J. Schilling ++########################################################################### ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License, Version 1.0 only ++# (the "License"). You may not use this file except in compliance ++# with the License. ++# ++# See the file CDDL.Schily.txt in this distribution for details. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file CDDL.Schily.txt from this distribution. ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/rules.prg ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul ++ ++# ++# XXX Old BeOS needs libroot.so to get [efg]cvt() ++# XXX New BeOS seems to have this in libc and in addition we include ++# XXX strtod.c for floating point conversion on OS without such code. ++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been ++# XXX removed and printing floating numbers will work with old/new BeOS ++# ++#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS ++OSDEFS += ++ ++KDEFINES= -DKERNEL -D_KERNEL ++ ++#CONFFLAGS= i586 ++ ++LIB_PREFIX= lib ++LIB_SUFFIX= .a ++SHL_SUFFIX= .so ++ ++#LIB_SOCKET= -lsocket -lbind ++LIB_SOCKET= -lnetwork ++LIB_MATH= ++LIB_KVM= ++ ++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) ++LDOPTS= $(LIBS_PATH) $(LDPATH) ++ ++LORDER= echo ++TSORT= cat ++ ++LN= /bin/ln -s diff --git a/app-cdr/daa2iso/daa2iso-0.1.7e.bep b/app-cdr/daa2iso/daa2iso-0.1.7e.bep new file mode 100644 index 000000000..c98e0db64 --- /dev/null +++ b/app-cdr/daa2iso/daa2iso-0.1.7e.bep @@ -0,0 +1,20 @@ +DESCRIPTION="DAA2ISO is an open source command-line/GUI tool for converting single and multipart DAA and GBI images to the original ISO format." +HOMEPAGE="http://aluigi.org/mytoolz.htm#daa2iso" +SRC_URI="http://aluigi.altervista.org/mytoolz/daa2iso.zip" +REVISION="1" +DEPEND="" +STATUS_HAIKU="stable" +CHECKSUM_MD5="6930ebcd8568e8ade0a175352d4a3481" + +BUILD { + cd src + make CFLAGS="-DNOLFS -O2 -s" +} + +INSTALL { + cd src + make install PREFIX=${DESTDIR}/$(finddir B_COMMON_DIRECTORY) +} + +LICENSE="GNU GPL v2" +COPYRIGHT="Luigi Auriemma" diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c.bep b/app-cdr/uif2iso/uif2iso-0.1.7c.bep new file mode 100644 index 000000000..c9bf0a10b --- /dev/null +++ b/app-cdr/uif2iso/uif2iso-0.1.7c.bep @@ -0,0 +1,19 @@ +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" +DEPEND="" +STATUS_HAIKU="stable" +CHECKSUM_MD5="2eb9797ec463c38253014d45591a7043" + +BUILD { + cd src + make CFLAGS="-DNOLFS -O2 -s" +} + +INSTALL { + cd src + make install prefix=$(finddir B_COMMON_DIRECTORY) DESTDIR="${DESTDIR}" +} +LICENSE="GNU GPL v2" +COPYRIGHT="2007-2009 Luigi Auriemma" diff --git a/app-crypt/gnupg/gnupg-1.4.10.bep b/app-crypt/gnupg/gnupg-1.4.10.bep index 237d25a54..8ec90e2c8 100644 --- a/app-crypt/gnupg/gnupg-1.4.10.bep +++ b/app-crypt/gnupg/gnupg-1.4.10.bep @@ -9,7 +9,7 @@ BUILD { cd gnupg-1.4.10 libtoolize --force --copy --install autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-crypt/gnupg/gnupg-1.4.11.bep b/app-crypt/gnupg/gnupg-1.4.11.bep index e87250548..9e6bf53b1 100644 --- a/app-crypt/gnupg/gnupg-1.4.11.bep +++ b/app-crypt/gnupg/gnupg-1.4.11.bep @@ -9,7 +9,7 @@ BUILD { cd gnupg-1.4.11 libtoolize --force --copy --install autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-doc/doxygen/doxygen-1.6.3.bep b/app-doc/doxygen/doxygen-1.6.3.bep index 7653b601f..946585e34 100644 --- a/app-doc/doxygen/doxygen-1.6.3.bep +++ b/app-doc/doxygen/doxygen-1.6.3.bep @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd doxygen-1.6.3 - ./configure --prefix /boot/common + sed -i 's/MAN1DIR = man\/man1/MAN1DIR = documentation\/man\/man1/' Makefile.in + ./configure --prefix `finddir B_COMMON_DIRECTORY` make } diff --git a/app-doc/doxygen/doxygen-1.7.4.bep b/app-doc/doxygen/doxygen-1.7.4.bep new file mode 100644 index 000000000..1f00fc066 --- /dev/null +++ b/app-doc/doxygen/doxygen-1.7.4.bep @@ -0,0 +1,20 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd doxygen-1.7.4 + sed -i 's/MAN1DIR = man\/man1/MAN1DIR = documentation\/man\/man1/' Makefile.in + ./configure --prefix `finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd doxygen-1.7.4 + make install +} +LICENSE="GNU GPL v2" +COPYRIGHT="1997-2011 Dimitri van Heesch" diff --git a/app-doc/doxygen/patches/doxygen-1.7.4.patch b/app-doc/doxygen/patches/doxygen-1.7.4.patch new file mode 100644 index 000000000..d51095cc2 --- /dev/null +++ b/app-doc/doxygen/patches/doxygen-1.7.4.patch @@ -0,0 +1,158 @@ +diff -up doxygen-1.7.4/Makefile.in.orig doxygen-1.7.4/Makefile.in +--- doxygen-1.7.4/Makefile.in.orig 2009-08-20 13:41:13.056098816 -0600 ++++ doxygen-1.7.4/Makefile.in 2011-05-14 12:14:04.776208384 -0600 +@@ -2,7 +2,7 @@ + # cd qtools ; $(MAKE) + # cd src ; $(MAKE) + +-DESTDIR = ++#DESTDIR = + + clean: FORCE + cd examples ; $(MAKE) clean +diff -up doxygen-1.7.4/PLATFORMS.orig doxygen-1.7.4/PLATFORMS +--- doxygen-1.7.4/PLATFORMS.orig 2007-11-24 09:12:35.056360960 -0700 ++++ doxygen-1.7.4/PLATFORMS 2011-05-14 12:14:04.777519104 -0600 +@@ -4,6 +4,7 @@ beos-g++ + dgux-g++ + freebsd-g++ + gnu-g++ ++haiku-g++ + hpux-acc + hpux-cc + hpux-g++ +diff -up doxygen-1.7.4/configure.orig doxygen-1.7.4/configure +--- doxygen-1.7.4/configure.orig 2011-03-28 07:12:47.055050240 -0600 ++++ doxygen-1.7.4/configure 2011-05-14 12:14:04.783548416 -0600 +@@ -180,6 +180,9 @@ if test -z "$f_platform"; then + f_insttool=/usr/bin/install + fi + ;; ++ Haiku:*) ++ f_platform=haiku-g++ ++ ;; + HP-UX:*) + f_platform=hpux-g++ + if test "$f_insttool" = NO; then +diff -up doxygen-1.7.4/qtools/qglobal.h.orig doxygen-1.7.4/qtools/qglobal.h +--- doxygen-1.7.4/qtools/qglobal.h.orig 2010-06-09 03:49:13.006553600 -0600 ++++ doxygen-1.7.4/qtools/qglobal.h 2011-05-14 12:14:04.784859136 -0600 +@@ -150,6 +150,8 @@ + #define _OS_CYGWIN_ + #elif defined(__BEOS__) + #define _OS_BEOS_ ++#elif defined(__HAIKU__) ++#define _OS_HAIKU_ + #elif defined(__MINT__) + #define _OS_MINT_ + #else +diff -up doxygen-1.7.4/qtools/qthread_unix.cpp.orig doxygen-1.7.4/qtools/qthread_unix.cpp +--- doxygen-1.7.4/qtools/qthread_unix.cpp.orig 2010-05-15 09:48:47.012058624 -0600 ++++ doxygen-1.7.4/qtools/qthread_unix.cpp 2011-05-14 12:14:04.785645568 -0600 +@@ -123,7 +123,7 @@ void QThread::start() + pthread_attr_t attr; + pthread_attr_init(&attr); + pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED); +- pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); ++ //pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); + if (d->stackSize>0) + { + #if defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0>0) +diff -up doxygen-1.7.4/src/doxygen.cpp.orig doxygen-1.7.4/src/doxygen.cpp +--- doxygen-1.7.4/src/doxygen.cpp.orig 2011-03-22 15:56:58.029360128 -0600 ++++ doxygen-1.7.4/src/doxygen.cpp 2011-05-14 12:14:04.802684928 -0600 +@@ -9465,7 +9465,7 @@ void readConfiguration(int argc, char ** + { + if (optind+4parse(df)) + { + err("error opening or reading configuration file %s!\n",argv[optind+4]); +diff -up doxygen-1.7.4/src/doxygen.pro.in.orig doxygen-1.7.4/src/doxygen.pro.in +--- doxygen-1.7.4/src/doxygen.pro.in.orig 2011-01-03 13:14:46.046661632 -0700 ++++ doxygen-1.7.4/src/doxygen.pro.in 2011-05-14 12:15:50.176947200 -0600 +@@ -18,7 +18,8 @@ TEMPLATE = app.t + CONFIG = console warn_on $extraopts + HEADERS = doxygen.h + SOURCES = main.cpp +-unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread ++unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 ++haiku-g++:LIBS += -L/boot/common/lib -liconv + win32:INCLUDEPATH += . + win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread + win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib +diff -up doxygen-1.7.4/tmake/lib/haiku-g++/app.t.orig doxygen-1.7.4/tmake/lib/haiku-g++/app.t +--- doxygen-1.7.4/tmake/lib/haiku-g++/app.t.orig 2011-05-14 12:14:04.823132160 -0600 ++++ doxygen-1.7.4/tmake/lib/haiku-g++/app.t 2011-05-14 12:14:04.818937856 -0600 +@@ -0,0 +1,2 @@ ++#! Use the common Unix template ++#$ IncludeTemplate("../unix/app.t"); +diff -up doxygen-1.7.4/tmake/lib/haiku-g++/lib.t.orig doxygen-1.7.4/tmake/lib/haiku-g++/lib.t +--- doxygen-1.7.4/tmake/lib/haiku-g++/lib.t.orig 2011-05-14 12:14:04.828375040 -0600 ++++ doxygen-1.7.4/tmake/lib/haiku-g++/lib.t 2011-05-14 12:14:04.827326464 -0600 +@@ -0,0 +1,2 @@ ++#! Use the common Unix template ++#$ IncludeTemplate("../unix/lib.t"); +diff -up doxygen-1.7.4/tmake/lib/haiku-g++/subdirs.t.orig doxygen-1.7.4/tmake/lib/haiku-g++/subdirs.t +--- doxygen-1.7.4/tmake/lib/haiku-g++/subdirs.t.orig 2011-05-14 12:14:04.830210048 -0600 ++++ doxygen-1.7.4/tmake/lib/haiku-g++/subdirs.t 2011-05-14 12:14:04.828899328 -0600 +@@ -0,0 +1,2 @@ ++#! Use the common Unix template ++#$ IncludeTemplate("../unix/subdirs.t"); +diff -up doxygen-1.7.4/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.7.4/tmake/lib/haiku-g++/tmake.conf +--- doxygen-1.7.4/tmake/lib/haiku-g++/tmake.conf.orig 2011-05-14 12:14:04.832045056 -0600 ++++ doxygen-1.7.4/tmake/lib/haiku-g++/tmake.conf 2011-05-14 12:14:04.830734336 -0600 +@@ -0,0 +1,51 @@ ++# ++# ++# ++# tmake configuration for haiku-g++ ++# ++ ++TEMPLATE = app ++CONFIG = qt warn_on release ++ ++TMAKE_CC = gcc ++TMAKE_CFLAGS = ++TMAKE_CFLAGS_WARN_ON = -Wall -W ++TMAKE_CFLAGS_WARN_OFF = ++TMAKE_CFLAGS_RELEASE = ++TMAKE_CFLAGS_DEBUG = -g ++TMAKE_CFLAGS_SHLIB = -fPIC ++TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses ++ ++TMAKE_CXX = g++ ++TMAKE_CXXFLAGS = $$TMAKE_CFLAGS ++TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON ++TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF ++TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE ++TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG ++TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB ++TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC ++ ++TMAKE_INCDIR = ++TMAKE_LIBDIR = ++TMAKE_INCDIR_QT = $(QTDIR)/include ++TMAKE_LIBDIR_QT = $(QTDIR)/lib ++ ++TMAKE_LINK = g++ ++TMAKE_LINK_SHLIB = g++ ++TMAKE_LFLAGS = -Wl,-rpath=/lib:$(QTDIR)/lib ++TMAKE_LFLAGS_RELEASE = ++TMAKE_LFLAGS_DEBUG = ++TMAKE_LFLAGS_SHLIB = -shared ++TMAKE_LFLAGS_SONAME = -Wl,-soname, ++ ++TMAKE_LIBS = ++TMAKE_LIBS_QT = -lqt ++TMAKE_LIBS_QT_MT = -lqt-mt ++ ++TMAKE_MOC = moc ++ ++TMAKE_AR = ar cqs ++TMAKE_RANLIB = ++ ++TMAKE_TAR = tar -cf ++TMAKE_GZIP = gzip -9f diff --git a/app-editors/joe/joe-3.8-hg.bep b/app-editors/joe/joe-3.8-hg.bep index f29c211f5..c187bada5 100644 --- a/app-editors/joe/joe-3.8-hg.bep +++ b/app-editors/joe/joe-3.8-hg.bep @@ -1,14 +1,19 @@ 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="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="66de1b073e869ba12abbfcde3885c577" BUILD { cd joe-3.8-hg autojoe - ./configure --prefix=/boot/common + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --docdir=$COMMON_DOCS/doc/joe \ + --mandir=$COMMON_DOCS/man + make } diff --git a/app-editors/nano/nano-2.2.3.bep b/app-editors/nano/nano-2.2.3.bep index 9727ffa90..77247c1bf 100644 --- a/app-editors/nano/nano-2.2.3.bep +++ b/app-editors/nano/nano-2.2.3.bep @@ -7,7 +7,7 @@ DEPEND="sys-libs/ncurses >= 5.6" CHECKSUM_MD5="91918a484f54f94fedaebe00dc393a50" BUILD { cd nano-2.2.3 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-editors/nano/nano-2.2.5.bep b/app-editors/nano/nano-2.2.5.bep index 70f2ba256..216e4fc4f 100644 --- a/app-editors/nano/nano-2.2.5.bep +++ b/app-editors/nano/nano-2.2.5.bep @@ -7,7 +7,7 @@ DEPEND="sys-libs/ncurses >= 5.6" CHECKSUM_MD5="77a10a49589f975ce98350a4527a2ebf" BUILD { cd nano-2.2.5 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-editors/nano/nano-2.2.6.bep b/app-editors/nano/nano-2.2.6.bep index fb9a9ff51..074d13d35 100644 --- a/app-editors/nano/nano-2.2.6.bep +++ b/app-editors/nano/nano-2.2.6.bep @@ -1,5 +1,5 @@ -DESCRIPTION="GNU GPL'd Pico clone with more functionality" -HOMEPAGE="http://www.nano-editor.org/" +DESCRIPTION="GNU GPL'd Pico clone with more functionality" +HOMEPAGE="http://www.nano-editor.org/" SRC_URI="http://www.nano-editor.org/dist/v2.2/nano-2.2.6.tar.gz" REVISION="1" STATUS_HAIKU="stable" @@ -8,10 +8,11 @@ DEPEND="sys-libs/ncurses >= 5.6 CHECKSUM_MD5="03233ae480689a008eb98feb1b599807" BUILD { cd nano-2.2.6 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DATA_DIRECTORY`/man + --infodir=$COMMON_DOCS/info \ + --mandir=$COMMON_DOCS/man make } diff --git a/app-editors/nano/nano-2.3.1.bep b/app-editors/nano/nano-2.3.1.bep new file mode 100644 index 000000000..572854138 --- /dev/null +++ b/app-editors/nano/nano-2.3.1.bep @@ -0,0 +1,25 @@ +DESCRIPTION="GNU GPL'd Pico clone with more functionality" +HOMEPAGE="http://www.nano-editor.org/" +SRC_URI="http://ftpmirror.gnu.org/nano/nano-2.3.1.tar.gz" +CHECKSUM_MD5="af09f8828744b0ea0808d6c19a2b4bfd" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="sys-libs/ncurses >= 5.6 + sys-apps/groff >= 1.20.1" +BUILD { + cd nano-2.3.1 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=$COMMON_DOCS/info \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd nano-2.3.1 + make install +} + +LICENSE="GNU GPL v3" +COPYRIGHT="1999-2011 Free Software Foundation, Inc. " diff --git a/app-editors/ne/ne-2.1.bep b/app-editors/ne/ne-2.1.bep new file mode 100644 index 000000000..474e9206a --- /dev/null +++ b/app-editors/ne/ne-2.1.bep @@ -0,0 +1,19 @@ +DESCRIPTION="ne, the nice editor" +HOMEPAGE="http://ne.dsi.unimi.it" +SRC_URI="http://ne.dsi.unimi.it/ne-2.1.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +CHECKSUM_MD5="9f76652f6349721cfe0e8dc2aec9c767" +BUILD { + cd ne-2.1 + make PREFIX=`finddir B_COMMON_DIRECTORY` NE_ANSI=1 haiku +} + +INSTALL { + cd ne-2.1 + make PREFIX=`finddir B_COMMON_DIRECTORY` haiku +} + +LICENSE="GNU GPL v2" +COPYRIGHT="1993-1998 Sebastiano Vigna + 1999-2010 Todd M. Lewis and Sebastiano Vigna" diff --git a/app-editors/ne/patches/ne-2.1.patch b/app-editors/ne/patches/ne-2.1.patch new file mode 100644 index 000000000..cb02e07a9 --- /dev/null +++ b/app-editors/ne/patches/ne-2.1.patch @@ -0,0 +1,39 @@ +diff -Naur ne-2.1/makefile ne-2.1-haiku/makefile +--- ne-2.1/makefile 2010-05-10 09:42:12.052953088 -0700 ++++ ne-2.1-haiku/makefile 2011-07-29 16:03:27.170131456 -0700 +@@ -42,6 +42,19 @@ + make install PREFIX=/usr CMDSUFFIX=.exe + tar zcvf ne-cygwin-$(VERSION).tar.gz /usr/share/ne /usr/bin/ne.exe /usr/share/doc/ne /usr/share/info/ne.info.gz /usr/share/man/man1/ne.1 + ++haiku: ++ (cd src; make NE_GLOBAL_DIR=$(shell finddir B_COMMON_DATA_DIRECTORY)/ne) ++ mkdir -p $(DESTDIR)$(shell finddir B_COMMON_BIN_DIRECTORY) ++ mkdir -p $(DESTDIR)$(shell finddir B_COMMON_DATA_DIRECTORY)/ne/syntax ++ mkdir -p $(DESTDIR)$(shell finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1 ++ mkdir -p $(DESTDIR)$(shell finddir B_COMMON_DATA_DIRECTORY)/doc/ne ++ mkdir -p $(DESTDIR)$(shell finddir B_COMMON_DATA_DIRECTORY)/info ++ cp -pf src/ne$(CMDSUFFIX) $(DESTDIR)$(shell finddir B_COMMON_BIN_DIRECTORY) ++ cp -p syntax/*.jsf $(DESTDIR)$(shell finddir B_COMMON_DATA_DIRECTORY)/ne/syntax ++ cp -p doc/ne.1 $(DESTDIR)$(shell finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1 ++ cp -pr doc/ne.pdf doc/html doc/ne.txt doc/default.* README COPYING NEWS CHANGES $(DESTDIR)$(shell finddir B_COMMON_DATA_DIRECTORY)/doc/ne ++ cp -p doc/ne.info.gz $(DESTDIR)$(shell finddir B_COMMON_DATA_DIRECTORY)/info ++ + install: + (cd src; make NE_GLOBAL_DIR=$(PREFIX)/share/ne) + mkdir -p $(DESTDIR)$(PREFIX)/bin +diff -Naur ne-2.1/src/makefile ne-2.1-haiku/src/makefile +--- ne-2.1/src/makefile 2010-04-28 06:47:06.005767168 +0000 ++++ ne-2.1-haiku/src/makefile 2011-04-26 12:54:53.738721792 +0000 +@@ -101,10 +101,10 @@ + $(if $(NE_TERMCAP), -DTERMCAP,) \ + $(if $(NE_ANSI), -DTERMCAP -DANSI,) + +-LIBS=$(if $(NE_TERMCAP)$(NE_ANSI),,-lcurses) ++LIBS=$(if $(NE_TERMCAP)$(NE_ANSI),,-lncurses) + + ne: $(OBJS) $(if $(NE_TERMCAP)$(NE_ANSI),$(TERMCAPOBJS),) +- $(CC) -lm $(OPTS) $(LDFLAGS) $^ $(LIBS) -o $(PROGRAM) ++ $(CC) $(OPTS) $(LDFLAGS) $^ $(LIBS) -o $(PROGRAM) + + clean: + rm -f *.o core diff --git a/app-editors/qemacs/patches/qemacs-0.3.2dev-cvs.patch b/app-editors/qemacs/patches/qemacs-0.3.2dev-cvs.patch new file mode 100644 index 000000000..c04011406 --- /dev/null +++ b/app-editors/qemacs/patches/qemacs-0.3.2dev-cvs.patch @@ -0,0 +1,1558 @@ +Index: Makefile +=================================================================== +RCS file: /sources/qemacs/qemacs/Makefile,v +retrieving revision 1.50 +diff -u -r1.50 Makefile +--- qemacs-0.3.2dev-cvs/Makefile 5 Jun 2008 07:14:12 -0000 1.50 ++++ qemacs-0.3.2dev-cvs/Makefile 14 Mar 2013 23:32:46 -0000 +@@ -63,7 +63,7 @@ + endif + + ifdef CONFIG_DLL +- LIBS+=-ldl ++ LIBS+=$(DLLIBS) + # export some qemacs symbols + LDFLAGS+=-Wl,-E + endif +@@ -72,6 +72,11 @@ + TARGETS+= qe-doc.html + endif + ++ifdef CONFIG_HAIKU ++ OBJS+= haiku.o ++ LIBS+= -lbe ++endif ++ + ifdef CONFIG_WIN32 + OBJS+= unix.o + TOBJS+= unix.o +@@ -84,7 +89,7 @@ + else + OBJS+= unix.o tty.o + TOBJS+= unix.o tty.o +- LIBS+= -lm ++ LIBS+= $(EXTRALIBS) + endif + + ifdef CONFIG_QSCRIPT +@@ -143,7 +148,7 @@ + OBJS+= video.o image.o + DEP_LIBS+= $(FFMPEG_LIBDIR)/libavcodec/libavcodec.a $(FFMPEG_LIBDIR)/libavformat/libavformat.a + LIBS+= -L$(FFMPEG_LIBDIR)/libavcodec -L$(FFMPEG_LIBDIR)/libavformat -lavformat -lavcodec -lz -lpthread +- DEFINES+= -I$(FFMPEG_SRCDIR)/libavcodec -I$(FFMPEG_SRCDIR)/libavformat ++ DEFINES+= -I$(FFMPEG_SRCDIR) -I$(FFMPEG_SRCDIR)/libavcodec -I$(FFMPEG_SRCDIR)/libavformat + TARGETS+= ffplay$(EXE) + endif + +@@ -226,6 +231,9 @@ + $(OBJS_DIR)/%.o: %.c qe.h qestyles.h config.h config.mak Makefile + $(CC) $(DEFINES) $(CFLAGS) -o $@ -c $< + ++$(OBJS_DIR)/haiku.o: haiku.cpp qe.h qestyles.h config.h config.mak Makefile ++ g++ $(DEFINES) $(CFLAGS) -Wno-multichar -o $@ -c $< ++ + # + # Test for bidir algorithm + # +@@ -391,7 +399,8 @@ + charsetjis.def charsetmore.c clang.c config.eg config.h \ + configure cptoqe.c cutils.c cutils.h dired.c display.c \ + display.h docbook.c extras.c fbffonts.c fbfrender.c \ +- fbfrender.h fbftoqe.c hex.c html.c html2png.c htmlsrc.c \ ++ fbfrender.h fbftoqe.c haiku.cpp hex.c html.c html2png.c \ ++ htmlsrc.c \ + image.c indic.c input.c jistoqe.c kmap.c kmaptoqe.c \ + latex-mode.c libfbf.c libfbf.h ligtoqe.c list.c makemode.c \ + mpeg.c perl.c qe-doc.html qe-doc.texi qe.1 qe.c qe.h qe.tcc \ +Index: cfb.c +=================================================================== +RCS file: /sources/qemacs/qemacs/cfb.c,v +retrieving revision 1.8 +diff -u -r1.8 cfb.c +--- qemacs-0.3.2dev-cvs/cfb.c 8 Apr 2008 06:55:44 -0000 1.8 ++++ qemacs-0.3.2dev-cvs/cfb.c 14 Mar 2013 23:32:46 -0000 +@@ -50,7 +50,7 @@ + static void cfb16_fill_rectangle(QEditScreen *s, + int x1, int y1, int w, int h, QEColor color) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + unsigned char *dest, *d; + int y, n; + unsigned int col; +@@ -101,7 +101,7 @@ + static void cfb32_fill_rectangle(QEditScreen *s, + int x1, int y1, int w, int h, QEColor color) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + unsigned char *dest, *d; + int y, n; + unsigned int col; +@@ -145,7 +145,7 @@ + int x1, int y1, int w, int h, QEColor color, + unsigned char *glyph, int glyph_wrap) + { +- CFBContext *cfb = s1->private; ++ CFBContext *cfb = s1->priv_data; + unsigned char *dest, *d, *s, *src; + int n; + unsigned int col; +@@ -189,7 +189,7 @@ + int x1, int y1, int w, int h, QEColor color, + unsigned char *glyph, int glyph_wrap) + { +- CFBContext *cfb = s1->private; ++ CFBContext *cfb = s1->priv_data; + unsigned char *dest, *d, *s, *src; + int n; + unsigned int col; +@@ -233,7 +233,7 @@ + int x_start, int y, const unsigned int *str, int len, + QEColor color) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + GlyphCache *g; + unsigned char *glyph_ptr; + int i, x1, y1, x2, y2, wrap, x; +@@ -309,7 +309,7 @@ + int cfb_init(QEditScreen *s, + void *base, int wrap, int depth, const char *font_path) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + + cfb->base = base; + cfb->wrap = wrap; +Index: configure +=================================================================== +RCS file: /sources/qemacs/qemacs/configure,v +retrieving revision 1.15 +diff -u -r1.15 configure +--- qemacs-0.3.2dev-cvs/configure 17 Apr 2008 15:06:44 -0000 1.15 ++++ qemacs-0.3.2dev-cvs/configure 14 Mar 2013 23:32:46 -0000 +@@ -45,9 +45,11 @@ + ptsname="yes" + gprof="no" + network="yes" ++haiku="no" + win32="no" + cygwin="no" + lshared="no" ++dllibs="-ldl" + extralibs="" + simpleidct="yes" + bigendian="no" +@@ -79,10 +81,10 @@ + # no need for libm, but the inet stuff + # Check for BONE + if (echo $BEINCLUDES|grep 'headers/be/bone' >/dev/null); then +- extralibs="-lbind -lsocket -lm" ++ extralibs="-lbind -lsocket" + else + echo "Not sure building for net_server will succeed... good luck." +- extralibs="-lsocket -lm" ++ extralibs="-lsocket" + fi + ;; + BSD/OS) +@@ -102,6 +104,19 @@ + CYGWIN*) + cygwin="yes" + ;; ++ Haiku) ++ prefix="`finddir B_COMMON_DIRECTORY`" ++ # no need for libm, but the network stuff ++ extralibs="-lnetwork" ++ # dlopen() is in libroot already ++ dllibs="" ++ # use Haiku GUI; avoid building for X11 even if there are headers around ++ haiku="yes" ++ html="yes" ++ png="yes" ++ x11="no" ++ xv="no" ++ ;; + *) + extralibs="-lm" + unlockio="yes" +@@ -256,8 +271,11 @@ + if test "$x11" = "no" ; then + xv="no" + xrender="no" +- png="no" ++fi ++ ++if test "$x11" = "no" -a "$haiku" = "no" ; then + ffmpeg="no" ++ png="no" + html="no" + fi + +@@ -439,6 +457,7 @@ + echo "BUILD_SHARED=yes" >> config.mak + echo "PIC=-fPIC" >> config.mak + fi ++echo "DLLIBS=$dllibs" >> config.mak + echo "EXTRALIBS=$extralibs" >> config.mak + echo -n "VERSION=" >>config.mak + echo -n `head $source_path/VERSION` >> config.mak +@@ -451,6 +470,11 @@ + echo "CONFIG_NETWORK=yes" >> config.mak + fi + ++if test "$haiku" = "yes" ; then ++ echo "#define CONFIG_HAIKU 1" >> $TMPH ++ echo "CONFIG_HAIKU=yes" >> config.mak ++fi ++ + if test "$win32" = "yes" ; then + echo "#define CONFIG_WIN32 1" >> $TMPH + echo "CONFIG_WIN32=yes" >> config.mak +Index: display.h +=================================================================== +RCS file: /sources/qemacs/qemacs/display.h,v +retrieving revision 1.11 +diff -u -r1.11 display.h +--- qemacs-0.3.2dev-cvs/display.h 11 Jan 2008 11:29:28 -0000 1.11 ++++ qemacs-0.3.2dev-cvs/display.h 14 Mar 2013 23:32:46 -0000 +@@ -53,7 +53,7 @@ + int refcount; + int ascent; + int descent; +- void *private; ++ void *priv_data; + int system_font; /* TRUE if system font */ + /* cache data */ + int style; +@@ -148,12 +148,12 @@ + QECharset *charset; /* the charset of the TTY, XXX: suppress that, + use a system in fonts instead */ + int media; /* media type (see CSS_MEDIA_xxx) */ +- int bitmap_format; /* supported bitmap format */ +- int video_format; /* supported video format */ ++ QEBitmapFormat bitmap_format; /* supported bitmap format */ ++ QEBitmapFormat video_format; /* supported video format */ + /* clip region handling */ + int clip_x1, clip_y1; + int clip_x2, clip_y2; +- void *private; ++ void *priv_data; + }; + + int qe_register_display(QEDisplay *dpy); +Index: fbfrender.c +=================================================================== +RCS file: /sources/qemacs/qemacs/fbfrender.c,v +retrieving revision 1.10 +diff -u -r1.10 fbfrender.c +--- qemacs-0.3.2dev-cvs/fbfrender.c 8 Jan 2008 16:37:54 -0000 1.10 ++++ qemacs-0.3.2dev-cvs/fbfrender.c 14 Mar 2013 23:32:46 -0000 +@@ -124,7 +124,7 @@ + + static GlyphCache *fbf_decode_glyph1(QEFont *font, int code) + { +- UniFontData *uf = font->private; ++ UniFontData *uf = font->priv_data; + int glyph_index, size, src_width, src_height; + GlyphCache *glyph_cache; + GlyphEntry *fbf_glyph_entry; +@@ -270,7 +270,7 @@ + } + } + } +- font->private = uf_found; ++ font->priv_data = uf_found; + font->ascent = uf_found->ascent; + font->descent = uf_found->descent; + return font; +Index: html2png.c +=================================================================== +RCS file: /sources/qemacs/qemacs/html2png.c,v +retrieving revision 1.12 +diff -u -r1.12 html2png.c +--- qemacs-0.3.2dev-cvs/html2png.c 11 Jan 2008 11:29:28 -0000 1.12 ++++ qemacs-0.3.2dev-cvs/html2png.c 14 Mar 2013 23:32:47 -0000 +@@ -135,7 +135,7 @@ + /* realloc ppm bitmap */ + static int ppm_resize(QEditScreen *s, int w, int h) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + + /* alloc bitmap */ + if (!qe_realloc(&cfb->base, w * h * sizeof(int))) { +@@ -160,7 +160,7 @@ + if (!cfb) + return -1; + +- s->private = cfb; ++ s->priv_data = cfb; + s->media = CSS_MEDIA_SCREEN; + + if (cfb_init(s, NULL, w * sizeof(int), 32, ".") < 0) +@@ -169,7 +169,7 @@ + if (ppm_resize(s, w, h) < 0) { + fail: + qe_free(&cfb->base); +- qe_free(&s->private); ++ qe_free(&s->priv_data); + return -1; + } + return 0; +@@ -177,15 +177,15 @@ + + static void ppm_close(QEditScreen *s) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + + qe_free(&cfb->base); +- qe_free(&s->private); ++ qe_free(&s->priv_data); + } + + static int ppm_save(QEditScreen *s, const char *filename) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + int w, h, x, y; + unsigned int r, g, b, v; + unsigned int *data; +@@ -219,7 +219,7 @@ + + static int png_save(QEditScreen *s, const char *filename) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + struct png_save_data { + FILE *f; + png_structp png_ptr; +Index: qe.h +=================================================================== +RCS file: /sources/qemacs/qemacs/qe.h,v +retrieving revision 1.96 +diff -u -r1.96 qe.h +--- qemacs-0.3.2dev-cvs/qe.h 4 May 2008 15:54:39 -0000 1.96 ++++ qemacs-0.3.2dev-cvs/qe.h 14 Mar 2013 23:32:48 -0000 +@@ -267,11 +267,11 @@ + int ustristart(const unsigned int *str, const char *val, const unsigned int **ptr); + static inline unsigned int *umemmove(unsigned int *dest, + unsigned int *src, int count) { +- return memmove(dest, src, count * sizeof(unsigned int)); ++ return (unsigned int *)memmove(dest, src, count * sizeof(unsigned int)); + } + static inline unsigned int *umemcpy(unsigned int *dest, + unsigned int *src, int count) { +- return memcpy(dest, src, count * sizeof(unsigned int)); ++ return (unsigned int *)memcpy(dest, src, count * sizeof(unsigned int)); + } + int umemcmp(const unsigned int *s1, const unsigned int *s2, int count); + +Index: tty.c +=================================================================== +RCS file: /sources/qemacs/qemacs/tty.c,v +retrieving revision 1.50 +diff -u -r1.50 tty.c +--- qemacs-0.3.2dev-cvs/tty.c 23 Apr 2008 15:30:33 -0000 1.50 ++++ qemacs-0.3.2dev-cvs/tty.c 14 Mar 2013 23:32:49 -0000 +@@ -118,7 +118,7 @@ + + tty_screen = s; + ts = &tty_state; +- s->private = ts; ++ s->priv_data = ts; + s->media = CSS_MEDIA_TTY; + + /* Derive some settings from the TERM environment variable */ +@@ -263,7 +263,7 @@ + static void tty_term_exit(void) + { + QEditScreen *s = tty_screen; +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + + tcsetattr(fileno(s->STDIN), TCSANOW, &ts->oldtty); + } +@@ -271,7 +271,7 @@ + static void tty_resize(__unused__ int sig) + { + QEditScreen *s = tty_screen; +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + struct winsize ws; + int i, count, size; + TTYChar tc; +@@ -318,7 +318,7 @@ + static void tty_term_cursor_at(QEditScreen *s, int x1, int y1, + __unused__ int w, __unused__ int h) + { +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + ts->cursor_x = x1; + ts->cursor_y = y1; + } +@@ -380,7 +380,7 @@ + { + QEditScreen *s = opaque; + QEmacsState *qs = &qe_state; +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + int ch; + QEEvent ev1, *ev = &ev1; + +@@ -425,6 +425,7 @@ + ts->input_param = 0; + } else if (ch == 'O') { + ts->input_state = IS_ESC2; ++ ts->input_param = 0; + } else { + ch = KEY_META(ch); + ts->input_state = IS_NORM; +@@ -826,7 +827,7 @@ + static void tty_term_fill_rectangle(QEditScreen *s, + int x1, int y1, int w, int h, QEColor color) + { +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + int x2 = x1 + w; + int y2 = y1 + h; + int x, y; +@@ -869,7 +870,7 @@ + + font->ascent = 0; + font->descent = 1; +- font->private = NULL; ++ font->priv_data = NULL; + return font; + } + +@@ -958,7 +959,7 @@ + int x, int y, const unsigned int *str, int len, + QEColor color) + { +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + TTYChar *ptr; + int fgcolor, w, n; + unsigned int cc; +@@ -1021,7 +1022,7 @@ + + static void tty_term_flush(QEditScreen *s) + { +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + TTYChar *ptr, *ptr1, *ptr2, *ptr3, *ptr4, cc, blankcc; + int y, shadow, ch, bgcolor, fgcolor, shifted; + +Index: win32.c +=================================================================== +RCS file: /sources/qemacs/qemacs/win32.c,v +retrieving revision 1.15 +diff -u -r1.15 win32.c +--- qemacs-0.3.2dev-cvs/win32.c 23 Apr 2008 15:29:35 -0000 1.15 ++++ qemacs-0.3.2dev-cvs/win32.c 14 Mar 2013 23:32:49 -0000 +@@ -139,7 +139,7 @@ + if (!_hPrev) + init_application(); + +- s->private = NULL; ++ s->priv_data = NULL; + s->media = CSS_MEDIA_SCREEN; + + win_ctx.font = CreateFont(-12, 0, 0, 0, 0 , 0, 0, 0, 0, 0, 0, 0, +@@ -452,7 +452,7 @@ + GetTextMetrics(win_ctx.hdc, &tm); + font->ascent = tm.tmAscent; + font->descent = tm.tmDescent; +- font->private = NULL; ++ font->priv_data = NULL; + return font; + } + +Index: x11.c +=================================================================== +RCS file: /sources/qemacs/qemacs/x11.c,v +retrieving revision 1.28 +diff -u -r1.28 x11.c +--- qemacs-0.3.2dev-cvs/x11.c 15 Apr 2008 23:24:04 -0000 1.28 ++++ qemacs-0.3.2dev-cvs/x11.c 14 Mar 2013 23:32:49 -0000 +@@ -194,7 +194,7 @@ + QEStyleDef default_style; + XGCValues gc_val; + +- s->private = NULL; ++ s->priv_data = NULL; + s->media = CSS_MEDIA_SCREEN; + + if (!display_str) +@@ -564,13 +564,13 @@ + } + font->ascent = renderFont->ascent; + font->descent = renderFont->descent; +- font->private = renderFont; ++ font->priv_data = renderFont; + return font; + } + + static void term_close_font(QEditScreen *s, QEFont *font) + { +- XftFont *renderFont = font->private; ++ XftFont *renderFont = font->priv_data; + + XftFontClose(display, renderFont); + /* Clear structure to force crash if font is still used after +@@ -582,7 +582,7 @@ + + static int term_glyph_width(QEditScreen *s, QEFont *font, unsigned int cc) + { +- XftFont *renderFont = font->private; ++ XftFont *renderFont = font->priv_data; + XGlyphInfo gi; + + XftTextExtents32(display, renderFont, &cc, 1, &gi); +@@ -593,7 +593,7 @@ + int x, int y, const unsigned int *str, int len, + QEColor color) + { +- XftFont *renderFont = font->private; ++ XftFont *renderFont = font->priv_data; + XftColor col; + int r, g, b, a; + +@@ -764,7 +764,7 @@ + + font->ascent = xfont->ascent; + font->descent = xfont->descent; +- font->private = xfont; ++ font->priv_data = xfont; + return font; + fail: + XFreeFontNames(list); +@@ -774,7 +774,7 @@ + + static void term_close_font(__unused__ QEditScreen *s, QEFont *font) + { +- XFontStruct *xfont = font->private; ++ XFontStruct *xfont = font->priv_data; + + XFreeFont(display, xfont); + /* Clear structure to force crash if font is still used after +@@ -788,7 +788,7 @@ + associated. */ + static XCharStruct *get_char_struct(QEFont *font, int cc) + { +- XFontStruct *xfont = font->private; ++ XFontStruct *xfont = font->priv_data; + int b1, b2; + XCharStruct *cs; + +@@ -856,7 +856,7 @@ + + /* really no glyph : use default char in current font */ + /* Should have half-width and full-width default char patterns */ +- xfont = font->private; ++ xfont = font->priv_data; + cs = get_char_struct(font, xfont->default_char); + *out_font = lock_font(s, font); + return cs; +@@ -928,13 +928,13 @@ + cs = handle_fallback(s, &font1, font, cc); + if (!cs) { + /* still no char: use default glyph */ +- xfont = font->private; ++ xfont = font->priv_data; + cc = xfont->default_char; + } + } + /* flush previous chars if font change needed */ + if (font1 != last_font && q > x11_str) { +- xfont = last_font->private; ++ xfont = last_font->priv_data; + l = q - x11_str; + XSetFont(display, gc, xfont->fid); + XDrawString16(display, dbuffer, gc, x_start, y, x11_str, l); +@@ -950,7 +950,7 @@ + } + if (q > x11_str) { + /* flush remaining chars (more common case) */ +- xfont = last_font->private; ++ xfont = last_font->priv_data; + l = q - x11_str; + XSetFont(display, gc, xfont->fid); + XDrawString16(display, dbuffer, gc, x_start, y, x11_str, l); +--- qemacs-0.3.2dev-cvs//dev/null 2013-03-14 16:10:28.351668000 +0100 ++++ qemacs-0.3.2dev-cvs/haiku.cpp 2013-03-14 20:51:17.995622912 +0100 +@@ -0,0 +1,883 @@ ++/* ++ * Haiku driver for QEmacs ++ * Copyright (c) 2013 François Revol. ++ * Copyright (c) 2002 Fabrice Bellard. ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++extern "C" { ++#include "qe.h" ++} ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++extern QEDisplay haiku_dpy; ++ ++static int force_tty = 0; ++ ++static int font_xsize; ++ ++class QEWindow; ++class QEView; ++ ++/* state of a single window */ ++typedef struct WindowState { ++ BWindow *w; ++ BView *v; ++ BFont font; ++ int events_rd; ++ int events_wr; ++} WindowState; ++ ++WindowState haiku_ctx; ++static thread_id bapp_thid; ++static int bapp_ref_count = 0; ++static int events_wr; ++ ++/* count of pending repaints */ ++static vint32 repaints = 0; ++//TODO:use double-buffering with a BBitmap ++ ++static void haiku_handle_event(void *opaque); ++ ++static status_t bmessage_input(QEWindow *win, QEView *view, BMessage *message) ++{ ++ if (!message) ++ return EINVAL; ++ /* push the message into the pipe */ ++ if (write(events_wr, &message, sizeof(BMessage *)) < 0) ++ return errno; ++ return B_OK; ++} ++ ++class QEWindow: public BWindow ++{ ++public: ++ QEWindow(BRect frame, const char *name, QEView *view) ++ :BWindow(frame, name, B_TITLED_WINDOW, 0) ++ ,fView(view) ++ {} ++ ++ virtual ~QEWindow() {} ++ ++//virtual void Show(); ++//virtual void Hide(); ++//virtual void Minimize(bool minimize); ++virtual bool QuitRequested(); ++virtual void DispatchMessage(BMessage *message, BHandler *handler); ++ ++private: ++ QEView *fView; ++}; ++ ++class QEView: public BView ++{ ++public: ++ QEView(BRect frame, const char *name); ++ virtual ~QEView(); ++ ++virtual void MouseDown(BPoint where); ++virtual void MouseUp(BPoint where); ++virtual void MouseMoved(BPoint where, uint32 code, const BMessage *a_message); ++virtual void KeyDown(const char *bytes, int32 numBytes); ++virtual void KeyUp(const char *bytes, int32 numBytes); ++virtual void Draw(BRect updateRect); ++virtual void FrameResized(float new_width, float new_height); ++#if 0 ++virtual void WindowActivated(bool state); ++virtual void MessageReceived(BMessage *message); ++#endif ++}; ++ ++ ++bool QEWindow::QuitRequested() ++{ ++ BMessage *message = new BMessage(B_QUIT_REQUESTED); ++ bmessage_input(this, NULL, message); ++ return false; ++} ++ ++void QEWindow::DispatchMessage(BMessage *message, BHandler *handler) ++{ ++ uint32 mods; ++ switch (message->what) { ++ case B_MOUSE_WHEEL_CHANGED: ++ { ++ BMessage *message = DetachCurrentMessage(); ++ bmessage_input(this, NULL, message); ++ } ++ break; ++ case B_KEY_DOWN: ++ if ((message->FindInt32("modifiers", (int32 *)&mods) == B_OK) && ++ (mods & B_COMMAND_KEY)) { ++ /* BWindow swallows KEY_DOWN when ALT is down... ++ * so this hack is needed. ++ */ ++ fView->KeyDown(NULL, 0); ++ return; ++ } ++ break; ++ case B_UNMAPPED_KEY_DOWN: ++ case B_UNMAPPED_KEY_UP: ++ case B_KEY_UP: ++ //message->PrintToStream(); ++ break; ++ } ++ BWindow::DispatchMessage(message, handler); ++} ++ ++QEView::QEView(BRect frame, const char *name) ++ :BView(frame, name, B_FOLLOW_ALL_SIDES, B_WILL_DRAW|B_FRAME_EVENTS) ++{ ++ SetViewColor(ui_color(B_DOCUMENT_BACKGROUND_COLOR)); ++ //SetViewColor(0, 255, 0); ++} ++ ++QEView::~QEView() ++{ ++} ++ ++void QEView::MouseDown(BPoint where) ++{ ++ BMessage *message = Window()->DetachCurrentMessage(); ++ bmessage_input(NULL, this, message); ++} ++ ++void QEView::MouseUp(BPoint where) ++{ ++ BMessage *message = Window()->DetachCurrentMessage(); ++ bmessage_input(NULL, this, message); ++} ++ ++void QEView::MouseMoved(BPoint where, uint32 code, const BMessage *a_message) ++{ ++ BMessage *message = Window()->DetachCurrentMessage(); ++ bmessage_input(NULL, this, message); ++} ++ ++void QEView::KeyDown(const char *bytes, int32 numBytes) ++{ ++ BMessage *message = Window()->DetachCurrentMessage(); ++ //message->PrintToStream(); ++ bmessage_input(NULL, this, message); ++} ++ ++void QEView::KeyUp(const char *bytes, int32 numBytes) ++{ ++ uint32 mods; ++ BMessage *message = Window()->DetachCurrentMessage(); ++ //message->PrintToStream(); ++ bmessage_input(NULL, this, message); ++} ++ ++void QEView::Draw(BRect updateRect) ++{ ++ BMessage *message; ++ message = new BMessage(_UPDATE_); ++ message->AddRect("update_rect", updateRect); ++ atomic_add(&repaints, 1); ++ bmessage_input(NULL, this, message); ++} ++ ++void QEView::FrameResized(float new_width, float new_height) ++{ ++ BMessage *message = Window()->DetachCurrentMessage(); ++ atomic_set(&repaints, 0); ++ bmessage_input(NULL, this, message); ++ BView::FrameResized(new_width, new_height); ++} ++ ++ ++static int haiku_probe(void) ++{ ++ if (force_tty) ++ return 0; ++ return 2; ++} ++ ++static int32 bapp_quit_thread(void *arg) ++{ ++ be_app->Lock(); ++ be_app->Quit(); ++ return 0; ++} ++ ++ ++static int32 bapp_thread(void *arg) ++{ ++ be_app->Lock(); ++ be_app->Run(); ++ return 0; ++} ++ ++ ++ ++static void init_application(void) ++{ ++ bapp_ref_count++; ++ if (be_app) ++ return; /* done already! */ ++ new BApplication("application/x-vnd.Bellard-QEmacs"); ++ //new XEmacsApp; ++ bapp_thid = spawn_thread(bapp_thread, "BApplication(QEmacs)", B_NORMAL_PRIORITY, (void *)find_thread(NULL)); ++ if (bapp_thid < B_OK) ++ return; /* #### handle errors */ ++ if (resume_thread(bapp_thid) < B_OK) ++ return; ++ // This way we ensure we don't create BWindows before be_app is created ++ // (creating it in the thread doesn't ensure this) ++ be_app->Unlock(); ++} ++ ++static void uninit_application(void) ++{ ++ status_t err; ++ if (--bapp_ref_count) ++ return; ++ be_app->Lock(); ++ be_app->Quit(); ++ //XXX:HACK ++ be_app->Unlock(); ++ //be_app_messenger.SendMessage(B_QUIT_REQUESTED); ++ wait_for_thread(bapp_thid, &err); ++ //FIXME:leak or crash ++ //delete be_app; ++ be_app = NULL; ++} ++ ++static int haiku_init(QEditScreen *s, int w, int h) ++{ ++ int xsize, ysize, font_ysize; ++ WindowState *ctx; ++ ++ if (!be_app) ++ init_application(); ++ ++ memcpy(&s->dpy, &haiku_dpy, sizeof(QEDisplay)); ++ ++ ctx = (WindowState *)malloc(sizeof(WindowState)); ++ if (ctx == NULL) ++ return -1; ++ s->priv_data = ctx; ++ s->media = CSS_MEDIA_SCREEN; ++ ++ s->bitmap_format = QEBITMAP_FORMAT_RGBA32; ++ /* BBitmap supports overlay, but not planar data */ ++ //s->video_format = QEBITMAP_FORMAT_RGBA32; ++ ++ int event_pipe[2]; ++ if (pipe(event_pipe) < 0) ++ return -1; ++ fcntl(event_pipe[0], F_SETFD, FD_CLOEXEC); ++ fcntl(event_pipe[1], F_SETFD, FD_CLOEXEC); ++ ++ ctx->events_rd = event_pipe[0]; ++ ctx->events_wr = events_wr = event_pipe[1]; ++ ++ set_read_handler(event_pipe[0], haiku_handle_event, s); ++ ++ ++ ctx->font = BFont(be_fixed_font); ++ ++ font_height height; ++ ctx->font.GetHeight(&height); ++ ++ font_xsize = (int)ctx->font.StringWidth("n"); ++ font_ysize = (int)(height.ascent + height.descent + height.leading + 1); ++ ++ if (w == 0) ++ w = 80; ++ if (h == 0) ++ h = 25; ++ xsize = w * font_xsize; ++ ysize = h * font_ysize; ++ ++ s->width = xsize; ++ s->height = ysize; ++ s->charset = &charset_utf8; ++ ++ s->clip_x1 = 0; ++ s->clip_y1 = 0; ++ s->clip_x2 = s->width; ++ s->clip_y2 = s->height; ++ ++ BRect frame(0, 0, s->width - 1, s->height - 1); ++ ++ QEView *v = new QEView(frame, "qemacs"); ++ ctx->v = v; ++ ++ frame.OffsetTo(200, 200); ++ ++ ctx->w = new QEWindow(frame, "qemacs", v); ++ ctx->w->AddChild(ctx->v); ++ ctx->v->MakeFocus(); ++ //ctx->v->SetViewColor(B_TRANSPARENT_COLOR); ++ ctx->v->SetDrawingMode(B_OP_OVER); ++ ++ ctx->w->Show(); ++ ++ return 0; ++} ++ ++static void haiku_close(QEditScreen *s) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ ctx->w->Lock(); ++ ctx->w->Quit(); ++ free(s->priv_data); ++} ++ ++static void haiku_flush(QEditScreen *s) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ //fprintf(stderr, "%s()\n", __FUNCTION__); ++ ++ ctx->v->LockLooper(); ++ ++ // doesn't really help ++ ctx->v->Sync(); ++ ++ ctx->v->UnlockLooper(); ++} ++ ++static int haiku_is_user_input_pending(QEditScreen *s) ++{ ++ /* XXX: do it */ ++ return 0; ++} ++ ++/* called when an BMessage is forwarded. dispatch events to qe_handle_event() */ ++static void haiku_handle_event(void *opaque) ++{ ++ QEditScreen *s = (QEditScreen *)opaque; ++ WindowState *ctx = (WindowState *)s->priv_data; ++ unsigned char buf[16]; ++ bigtime_t timestamp_ms; ++ BMessage *event; ++ //fprintf(stderr, "%s()\n", __FUNCTION__); ++/* ++ KeySym keysym; ++*/ ++ int shift, ctrl, meta, len, key = 0; ++ QEEvent ev1, *ev = &ev1; ++ ++ if (read(ctx->events_rd, &event, sizeof(BMessage *)) < sizeof(BMessage *)) ++ return; ++ //event->PrintToStream(); ++ ++ switch(event->what) { ++ case B_QUIT_REQUESTED: ++ ++ // cancel pending operation ++ ev->key_event.type = QE_KEY_EVENT; ++ ev->key_event.key = KEY_CTRL('g'); ++ qe_handle_event(ev); ++ ++ // simulate C-x C-c ++ ev->key_event.type = QE_KEY_EVENT; ++ ev->key_event.key = KEY_CTRL('x'); ++ qe_handle_event(ev); ++ ev->key_event.type = QE_KEY_EVENT; ++ ev->key_event.key = KEY_CTRL('c'); ++ qe_handle_event(ev); ++ break; ++ ++ case _UPDATE_: ++ // flush queued repaints ++ if (atomic_set(&repaints, 0)) { ++ ev->expose_event.type = QE_EXPOSE_EVENT; ++ qe_handle_event(ev); ++ } ++ break; ++ ++ case B_VIEW_RESIZED: ++ { ++ int32 width, height; ++ int columns, rows; ++ //event->PrintToStream(); ++/* ++ if (event->FindInt32("width", &width) < B_OK) ++ break; ++ if (event->FindInt32("height", &height) < B_OK) ++ break; ++*/ ++ ++ ctx->v->LockLooper(); ++ ++ width = ctx->v->Bounds().IntegerWidth() + 1; ++ height = ctx->v->Bounds().IntegerHeight() + 1; ++ ++ if (width != s->width || height != s->height) ++ ctx->v->Invalidate(ctx->v->Bounds()); ++ ++ s->width = width; ++ s->height = height; ++ ++ ctx->v->UnlockLooper(); ++ ++ //ev->expose_event.type = QE_EXPOSE_EVENT; ++ //qe_handle_event(ev); ++ } ++ break; ++ ++ case B_MOUSE_MOVED: ++ { ++ BPoint pt; ++ ++ ev->button_event.type = QE_MOTION_EVENT; ++ ev->button_event.x = (int)pt.x; ++ ev->button_event.y = (int)pt.y; ++ qe_handle_event(ev); ++ } ++ break; ++ ++ case B_MOUSE_DOWN: ++ case B_MOUSE_UP: ++ { ++ BPoint pt; ++ uint32 buttons; ++ ++ if (event->what == B_MOUSE_DOWN) ++ ev->button_event.type = QE_BUTTON_PRESS_EVENT; ++ else ++ ev->button_event.type = QE_BUTTON_RELEASE_EVENT; ++ ++ if (event->FindPoint("where", &pt) < B_OK) ++ pt = BPoint(0,0); ++ ev->button_event.x = (int)pt.x; ++ ev->button_event.y = (int)pt.y; ++ ++ if (event->FindInt32("buttons", (int32 *)&buttons) < B_OK) ++ buttons = (event->what == B_MOUSE_UP)?0:B_PRIMARY_MOUSE_BUTTON; ++ ++ ++ if (buttons & B_PRIMARY_MOUSE_BUTTON) ++ ev->button_event.button = QE_BUTTON_LEFT; ++ else if (buttons & B_SECONDARY_MOUSE_BUTTON) ++ ev->button_event.button = QE_BUTTON_MIDDLE; ++ else if (buttons & B_TERTIARY_MOUSE_BUTTON) ++ ev->button_event.button = QE_BUTTON_RIGHT; ++ ++ qe_handle_event(ev); ++ } ++ break; ++ ++ case B_MOUSE_WHEEL_CHANGED: ++ { ++ float delta; ++ ++ ev->button_event.type = QE_BUTTON_PRESS_EVENT; ++ ++ if (event->FindFloat("be:wheel_delta_y", &delta) < B_OK) ++ delta = 0.0; ++ ++ if (delta > 0) ++ ev->button_event.button = QE_WHEEL_DOWN; ++ else if (delta < 0) ++ ev->button_event.button = QE_WHEEL_UP; ++ else ++ break; ++ ++ qe_handle_event(ev); ++ } ++ break; ++ ++ case B_KEY_UP: ++ break; ++ ++ case B_KEY_DOWN: ++ { ++ unsigned int mods = 0; ++ uint32 state; ++ //event->PrintToStream(); ++ uint32 scancode; ++ uint32 raw_char; ++ const char *bytes; ++ char buff[6]; ++ int numbytes = 0; ++ int i; ++ ++ if (event->FindInt64("when", ×tamp_ms) < B_OK) ++ timestamp_ms = 0LL; ++ if (event->FindInt32("modifiers", (int32 *)&state) < B_OK) ++ state = modifiers(); ++ if (event->FindInt32("key", (int32 *)&scancode) < B_OK) ++ scancode = 0; ++ if (event->FindInt32("raw_char", (int32 *)&raw_char) < B_OK) ++ raw_char = 0; ++ ++ /* check for byte[] first, ++ because C-space gives bytes="" (and byte[0] = '\0') */ ++ for (i = 0; i < 5; i++) { ++ buff[i] = '\0'; ++ if (event->FindInt8("byte", i, (int8 *)&buff[i]) < B_OK) ++ break; ++ } ++ ++ if (i) { ++ bytes = buff; ++ numbytes = i; ++ } else if (event->FindString("bytes", &bytes) < B_OK) ++ bytes = ""; ++ ++ if (!numbytes) ++ numbytes = strlen(bytes); ++ ++ shift = (state & B_SHIFT_KEY); ++ ctrl = (state & B_CONTROL_KEY); ++ meta = (state & (B_LEFT_OPTION_KEY | B_COMMAND_KEY)); ++ ++ //fprintf(stderr, "%cshift %cctrl %cmeta numbytes %d \n", shift ? ' ' : '!', ctrl ? ' ' : '!', meta ? ' ' : '!', numbytes); ++ ++ char byte = 0; ++ if (numbytes == 1) { ++ byte = bytes[0]; ++ if (state & B_CONTROL_KEY) ++ byte = (char)raw_char; ++ switch (byte) { ++ case B_BACKSPACE: ++ key = KEY_BS; ++ if (meta) ++ key = KEY_META(KEY_BS); ++ break; ++ case B_TAB: ++ key = KEY_TAB; ++ break; ++ case B_ENTER: ++ key = KEY_RET; ++ break; ++ case B_ESCAPE: ++ key = KEY_ESC; ++ break; ++ case B_SPACE: ++ key = KEY_SPC; ++ break; ++ case B_DELETE: ++ key = KEY_DELETE; ++ break; ++ case B_INSERT: ++ key = KEY_INSERT; ++ break; ++ case B_HOME: ++ key = ctrl ? KEY_CTRL_HOME : KEY_HOME; ++ break; ++ case B_END: ++ key = ctrl ? KEY_CTRL_END : KEY_END; ++ break; ++ case B_PAGE_UP: ++ key = KEY_PAGEUP; ++ break; ++ case B_PAGE_DOWN: ++ key = KEY_PAGEDOWN; ++ break; ++ case B_LEFT_ARROW: ++ key = ctrl ? KEY_CTRL_LEFT : KEY_LEFT; ++ break; ++ case B_RIGHT_ARROW: ++ key = ctrl ? KEY_CTRL_RIGHT : KEY_RIGHT; ++ break; ++ case B_UP_ARROW: ++ key = KEY_UP; ++ break; ++ case B_DOWN_ARROW: ++ key = KEY_DOWN; ++ break; ++ case B_FUNCTION_KEY: ++ switch (scancode) { ++ case B_F1_KEY: ++ case B_F2_KEY: ++ case B_F3_KEY: ++ case B_F4_KEY: ++ case B_F5_KEY: ++ case B_F6_KEY: ++ case B_F7_KEY: ++ case B_F8_KEY: ++ case B_F9_KEY: ++ case B_F10_KEY: ++ case B_F11_KEY: ++ case B_F12_KEY: ++ key = KEY_F1 + scancode - B_F1_KEY; ++ break; ++ case B_PRINT_KEY: ++ case B_SCROLL_KEY: ++ case B_PAUSE_KEY: ++ default: ++ break; ++ } ++ break; ++ case 0: ++ break; ++ default: ++ if (byte >= ' ' && byte <= '~') ++ if (meta) ++ key = KEY_META(' ') + byte - ' '; ++ else if (ctrl) ++ key = KEY_CTRL(byte); ++ else ++ key = byte; ++ ++ } ++ } else { ++ const char *p = bytes; ++ key = utf8_decode(&p); ++ } ++ ++ got_key: ++ if (key) { ++ ev->key_event.type = QE_KEY_EVENT; ++ ev->key_event.key = key; ++ qe_handle_event(ev); ++ } ++ } ++ break; ++ } ++ ++ delete event; ++} ++ ++static void haiku_fill_rectangle(QEditScreen *s, ++ int x1, int y1, int w, int h, QEColor color) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ //fprintf(stderr, "%s()\n", __FUNCTION__); ++ drawing_mode oldMode; ++ ++ BRect r(x1, y1, x1 + w - 1, y1 + h - 1); ++ rgb_color c = {(color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff, ++ 0xff}; ++ ++ ctx->v->LockLooper(); ++ ++ oldMode = ctx->v->DrawingMode(); ++ ++ /* XXX: suppress XOR mode */ ++ if (color == QECOLOR_XOR) ++ ctx->v->SetDrawingMode(B_OP_INVERT); ++ else ++ ctx->v->SetHighColor(c); ++ ctx->v->FillRect(r); ++ ++ /* XXX: suppress XOR mode */ ++ if (color == QECOLOR_XOR) ++ ctx->v->SetDrawingMode(oldMode); ++ ++ ctx->v->UnlockLooper(); ++} ++ ++static QEFont *haiku_open_font(QEditScreen *s, int style, int size) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ //fprintf(stderr, "%s()\n", __FUNCTION__); ++ QEFont *font; ++ ++ font = (QEFont *)malloc(sizeof(QEFont)); ++ if (!font) ++ return NULL; ++ ++ // TODO: use style / size ++ BFont *f = new BFont(ctx->font); ++ ++ font_height height; ++ f->GetHeight(&height); ++ font->ascent = (int)height.ascent; ++ font->descent = (int)(height.descent + height.leading + 1); ++ font->priv_data = f; ++ return font; ++} ++ ++static void haiku_close_font(QEditScreen *s, QEFont *font) ++{ ++ BFont *f = (BFont *)font->priv_data; ++ delete f; ++ free(font); ++} ++ ++static void haiku_text_metrics(QEditScreen *s, QEFont *font, ++ QECharMetrics *metrics, ++ const unsigned int *str, int len) ++{ ++ //TODO: use BFont::GetEscapements() or StringWidth() ++ int i, x; ++ metrics->font_ascent = font->ascent; ++ metrics->font_descent = font->descent; ++ x = 0; ++ for(i=0;iwidth = x; ++} ++ ++static void haiku_draw_text(QEditScreen *s, QEFont *font, ++ int x1, int y, const unsigned int *str, int len, ++ QEColor color) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ BFont *f = (BFont *)(font->priv_data); ++ int i; ++ //fprintf(stderr, "%s()\n", __FUNCTION__); ++ ++ /* XXX: suppress XOR mode */ ++ if (color == QECOLOR_XOR) ++ color = QERGB(0xff, 0xff, 0xff); ++ ++ rgb_color c = {(color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff, ++ 0xff}; ++ ++ ctx->v->LockLooper(); ++ ++ ctx->v->SetHighColor(c); ++ ctx->v->SetLowColor(B_TRANSPARENT_COLOR); ++ ctx->v->SetFont(f); ++ ctx->v->MovePenTo(x1, y - 1); ++ ++ char buf[10]; ++ unsigned int cc; ++ ++ BString text; ++ for(i=0;iv->DrawString(buf); ++ } ++ ctx->v->DrawString(text.String()); ++ ++ ctx->v->UnlockLooper(); ++ ++ //TextOutW(haiku_ctx.hdc, x1, y - font->ascent, buf, len); ++} ++ ++static void haiku_set_clip(QEditScreen *s, ++ int x, int y, int w, int h) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ //fprintf(stderr, "%s(,%d, %d, %d, %d)\n", __FUNCTION__, x, y, w, h); ++ ++ BRegion clip(BRect(x, y, x + w - 1, y + h - 1)); ++ ++ ctx->v->LockLooper(); ++ ++ ctx->v->ConstrainClippingRegion(&clip); ++ ++ ctx->v->UnlockLooper(); ++} ++ ++static int haiku_bmp_alloc(QEditScreen *s, QEBitmap *b) ++{ ++ BBitmap *bitmap; ++ color_space space = B_RGBA32; ++ uint32 flags = 0; ++ ++ b->format = s->bitmap_format; ++ if (b->flags & QEBITMAP_FLAG_VIDEO) { ++ b->format = s->video_format; ++ } ++fprintf(stderr, "%s(, [w %d, h %d])\n", __FUNCTION__, b->width, b->height); ++ switch (b->format) { ++ case QEBITMAP_FORMAT_RGB565: ++ space = B_RGB16; ++ break; ++ case QEBITMAP_FORMAT_RGB555: ++ space = B_RGB15; ++ break; ++ case QEBITMAP_FORMAT_RGB24: ++ space = B_RGB24; ++ break; ++ case QEBITMAP_FORMAT_RGBA32: ++ space = B_RGBA32; ++ break; ++ case QEBITMAP_FORMAT_YUV420P: ++ // we don't support planar overlays ++ default: ++ return -1; ++ } ++ ++ BRect bounds(0, 0, b->width - 1, b->height - 1); ++ bitmap = new BBitmap(bounds, flags, space); ++ if (bitmap->InitCheck() != B_OK) { ++ delete bitmap; ++ return -1; ++ } ++ b->priv_data = bitmap; ++ ++ return 0; ++} ++ ++static void haiku_bmp_free(__unused__ QEditScreen *s, QEBitmap *b) ++{ ++ BBitmap *bitmap = (BBitmap *)b->priv_data; ++ delete bitmap; ++} ++ ++extern QEDisplay haiku_dpy = { ++ "haiku", ++ haiku_probe, ++ haiku_init, ++ haiku_close, ++ haiku_flush, ++ haiku_is_user_input_pending, ++ haiku_fill_rectangle, ++ haiku_open_font, ++ haiku_close_font, ++ haiku_text_metrics, ++ haiku_draw_text, ++ haiku_set_clip, ++ NULL, /* no selection handling */ ++ NULL, /* no selection handling */ ++ NULL, /* dpy_invalidate */ ++ NULL, /* dpy_cursor_at */ ++ haiku_bmp_alloc, /* dpy_bmp_alloc */ ++ haiku_bmp_free, /* dpy_bmp_free */ ++ NULL, /* dpy_bmp_draw */ ++ NULL, /* dpy_bmp_lock */ ++ NULL, /* dpy_bmp_unlock */ ++ NULL, /* dpy_full_screen */ ++ NULL, /* next */ ++}; ++ ++static CmdOptionDef cmd_options[] = { ++ { "no-windows", "nw", NULL, CMD_OPT_BOOL, "force tty terminal usage", ++ { int_ptr: &force_tty }}, ++ { NULL, NULL, NULL, 0, NULL, { NULL }} ++}; ++ ++static int haiku_init(void) ++{ ++ QEmacsState *qs = &qe_state; ++ ++ /* override default res path, to find config file at native location */ ++ BPath path; ++ BString old(":"); ++ old << qs->res_path; ++ qs->res_path[0] = '\0'; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) { ++ path.Append("qemacs"); ++ pstrcat(qs->res_path, sizeof(qs->res_path), path.Path()); ++ } ++ pstrcat(qs->res_path, sizeof(qs->res_path), old.String()); ++ ++ qe_register_cmd_line_options(cmd_options); ++ return qe_register_display(&haiku_dpy); ++} ++ ++qe_module_init(haiku_init); +--- qemacs-0.3.2dev-cvs//dev/null 2013-03-14 16:10:28.351668000 +0100 ++++ qemacs-0.3.2dev-cvs/contrib/haiku-pe2qe.sh 2013-03-14 19:17:29.552599552 +0100 +@@ -0,0 +1,85 @@ ++#!/bin/sh ++ ++pesettings=`finddir B_USER_SETTINGS_DIRECTORY`/pe/settings ++ ++fgmap=( ++"alt comment:" ++"alt error:" ++"alt keyword:" ++"alt number:" ++"alt operator:" ++"alt separator:" ++"altprocessor:" ++"attribute:" ++"char constant:html-entity" ++"comment:comment html-comment" ++"error:" ++"highlight:highlight" ++"invisibles:" ++"keyword:keyword preprocess" ++"low:window-border" ++"mark:status" ++"number:number" ++"operator:function" ++"preprocessor:" ++"selection:selection" ++"separator:" ++"string:string string-q html-string" ++"system identifier:type" ++"tag:tag" ++"tagstring:html-tag" ++"text:default mode-line minibuf" ++"user identifier:variable" ++) ++ ++bgmap=( ++"low:default" ++"selection:mode-line window-border region-hilite" ++) ++ ++map_pe_fg () { ++ for item in "${fgmap[@]}"; do ++ if [ "$1" = "${item%:*}" ]; then ++ echo "${item#*:}" ++ return ++ fi ++ done ++} ++ ++map_pe_bg () { ++ for item in "${bgmap[@]}"; do ++ if [ "$1" = "${item%:*}" ]; then ++ echo "${item#*:}" ++ return ++ fi ++ done ++} ++ ++out_style () { ++ echo "set_style(\"$1\", \"$2\", \"$3\")" ++} ++ ++echo "// map Pe settings to QEmacs" ++echo "// generated by $(basename "$0") on `date`" ++ ++while read line; do ++ token="${line%=*}" ++ value="${line#*=}" ++ case "$token" in ++ *color) ++ name="${token% color}" ++ qenames="$(map_pe_fg "$name")" ++ for qename in ${qenames}; do ++ #echo "color: $name -> $qename" >&2 ++ out_style "$qename" "color" "$value" ++ done ++ qenames="$(map_pe_bg "$name")" ++ for qename in ${qenames}; do ++ #echo "bgcolor: $name -> $qename" >&2 ++ out_style "$qename" "background-color" "$value" ++ done ++ ;; ++ *) ++ ;; ++ esac ++done < "$pesettings" diff --git a/app-editors/qemacs/patches/qemacs-0.3.3.patch b/app-editors/qemacs/patches/qemacs-0.3.3.patch new file mode 100644 index 000000000..c980856a5 --- /dev/null +++ b/app-editors/qemacs/patches/qemacs-0.3.3.patch @@ -0,0 +1,1393 @@ +diff -urN qemacs-0.3.3.org/cfb.c qemacs-0.3.3/cfb.c +--- qemacs-0.3.3.org/cfb.c 2013-02-03 13:14:08.057933824 +0100 ++++ qemacs-0.3.3/cfb.c 2013-03-08 00:25:33.013107200 +0100 +@@ -48,7 +48,7 @@ + static void cfb16_fill_rectangle(QEditScreen *s, + int x1, int y1, int w, int h, QEColor color) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + unsigned char *dest, *d; + int y, n; + unsigned int col; +@@ -99,7 +99,7 @@ + static void cfb32_fill_rectangle(QEditScreen *s, + int x1, int y1, int w, int h, QEColor color) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + unsigned char *dest, *d; + int y, n; + unsigned int col; +@@ -142,7 +142,7 @@ + int x1, int y1, int w, int h, QEColor color, + unsigned char *glyph, int glyph_wrap) + { +- CFBContext *cfb = s1->private; ++ CFBContext *cfb = s1->priv_data; + unsigned char *dest, *d, *s, *src; + int n; + unsigned int col; +@@ -186,7 +186,7 @@ + int x1, int y1, int w, int h, QEColor color, + unsigned char *glyph, int glyph_wrap) + { +- CFBContext *cfb = s1->private; ++ CFBContext *cfb = s1->priv_data; + unsigned char *dest, *d, *s, *src; + int n; + unsigned int col; +@@ -230,7 +230,7 @@ + int x_start, int y, const unsigned int *str, int len, + QEColor color) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + GlyphCache *g; + unsigned char *glyph_ptr; + int i, x1, y1, x2, y2, wrap, x; +@@ -305,7 +305,7 @@ + int cfb_init(QEditScreen *s, + void *base, int wrap, int depth, const char *font_path) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + + cfb->base = base; + cfb->wrap = wrap; +diff -urN qemacs-0.3.3.org/configure qemacs-0.3.3/configure +--- qemacs-0.3.3.org/configure 2013-02-03 13:14:08.001572864 +0100 ++++ qemacs-0.3.3/configure 2013-03-08 00:19:41.561250304 +0100 +@@ -41,8 +41,10 @@ + esac + gprof="no" + network="yes" ++haiku="no" + win32="no" + lshared="no" ++dllibs="-ldl" + extralibs="-lm" + simpleidct="yes" + bigendian="no" +@@ -78,6 +80,17 @@ + extralibs="-lpoll -lgnugetopt -lm" + make="gmake" + ;; ++Haiku) ++prefix="`finddir B_COMMON_DIRECTORY`" ++# no need for libm, but the network stuff ++extralibs="-lnetwork" ++# dlopen() is in libroot already ++dllibs="" ++# use Haiku GUI; avoid building for X11 even if there are headers around ++haiku="yes" ++x11="no" ++xv="no" ++;; + *) ;; + esac + +@@ -314,6 +327,7 @@ + echo "BUILD_SHARED=yes" >> config.mak + echo "PIC=-fPIC" >> config.mak + fi ++echo "DLLIBS=$dllibs" >> config.mak + echo "EXTRALIBS=$extralibs" >> config.mak + version=`head $source_path/VERSION` + echo "VERSION=$version" >>config.mak +@@ -324,6 +338,11 @@ + echo "CONFIG_NETWORK=yes" >> config.mak + fi + ++if test "$haiku" = "yes" ; then ++ echo "#define CONFIG_HAIKU 1" >> $TMPH ++ echo "CONFIG_HAIKU=yes" >> config.mak ++fi ++ + if test "$win32" = "yes" ; then + echo "#define CONFIG_WIN32 1" >> $TMPH + echo "CONFIG_WIN32=yes" >> config.mak +diff -urN qemacs-0.3.3.org/display.h qemacs-0.3.3/display.h +--- qemacs-0.3.3.org/display.h 2013-02-03 13:14:08.000524288 +0100 ++++ qemacs-0.3.3/display.h 2013-03-08 00:23:30.161218560 +0100 +@@ -32,7 +32,7 @@ + typedef struct QEFont { + int ascent; + int descent; +- void *private; ++ void *priv_data; + int system_font; /* TRUE if system font */ + /* cache data */ + int style; +@@ -127,7 +127,7 @@ + /* clip region handling */ + int clip_x1, clip_y1; + int clip_x2, clip_y2; +- void *private; ++ void *priv_data; + }; + + static inline void draw_text(QEditScreen *s, QEFont *font, +diff -urN qemacs-0.3.3.org/fbfrender.c qemacs-0.3.3/fbfrender.c +--- qemacs-0.3.3.org/fbfrender.c 2013-02-03 13:14:08.061079552 +0100 ++++ qemacs-0.3.3/fbfrender.c 2013-03-08 02:16:10.757334016 +0100 +@@ -124,7 +124,7 @@ + + GlyphCache *fbf_decode_glyph1(QEFont *font, int code) + { +- UniFontData *uf = font->private; ++ UniFontData *uf = font->priv_data; + int glyph_index, size, src_width, src_height; + GlyphCache *glyph_cache; + GlyphEntry *fbf_glyph_entry; +@@ -269,7 +269,7 @@ + } + } + } +- font->private = uf_found; ++ font->priv_data = uf_found; + font->ascent = uf_found->ascent; + font->descent = uf_found->descent; + return font; +diff -urN qemacs-0.3.3.org/haiku.cpp qemacs-0.3.3/haiku.cpp +--- qemacs-0.3.3.org/haiku.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ qemacs-0.3.3/haiku.cpp 2013-03-08 16:13:59.829947904 +0100 +@@ -0,0 +1,864 @@ ++/* ++ * Haiku driver for QEmacs ++ * Copyright (c) 2013 François Revol. ++ * Copyright (c) 2002 Fabrice Bellard. ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++extern "C" { ++//XXX:shouldn't be required anymore ++//#define private priv_data ++#include "qe.h" ++//#undef private ++} ++ ++#include ++#include ++#include ++#include ++#include ++ ++extern QEDisplay haiku_dpy; ++ ++static int force_tty = 0; ++ ++static int font_xsize; ++ ++class QEWindow; ++class QEView; ++ ++/* state of a single window */ ++typedef struct WindowState { ++ BWindow *w; ++ BView *v; ++ BFont font; ++ int events_rd; ++ int events_wr; ++} WindowState; ++ ++WindowState haiku_ctx; ++static thread_id bapp_thid; ++static int bapp_ref_count = 0; ++static int events_wr; ++ ++static void haiku_handle_event(void *opaque); ++ ++static status_t bmessage_input(QEWindow *win, QEView *view, BMessage *message) ++{ ++ if (!message) ++ return EINVAL; ++ /* push the message into the pipe */ ++ if (write(events_wr, &message, sizeof(BMessage *)) < 0) ++ return errno; ++ return B_OK; ++} ++ ++class QEWindow: public BWindow ++{ ++public: ++ QEWindow(BRect frame, const char *name, QEView *view) ++ :BWindow(frame, name, B_TITLED_WINDOW, 0) ++ ,fView(view) ++ {} ++ ++ virtual ~QEWindow() {} ++ ++//virtual void Show(); ++//virtual void Hide(); ++//virtual void Minimize(bool minimize); ++virtual bool QuitRequested(); ++virtual void DispatchMessage(BMessage *message, BHandler *handler); ++ ++private: ++ QEView *fView; ++}; ++ ++class QEView: public BView ++{ ++public: ++ QEView(BRect frame, const char *name); ++ virtual ~QEView(); ++ ++#if 0 ++virtual void MouseDown(BPoint where); ++virtual void MouseUp(BPoint where); ++virtual void MouseMoved(BPoint where, uint32 code, const BMessage *a_message); ++#endif ++virtual void KeyDown(const char *bytes, int32 numBytes); ++virtual void KeyUp(const char *bytes, int32 numBytes); ++virtual void Draw(BRect updateRect); ++#if 0 ++virtual void WindowActivated(bool state); ++virtual void FrameResized(float new_width, float new_height); ++virtual void MessageReceived(BMessage *message); ++#endif ++}; ++ ++ ++bool QEWindow::QuitRequested() ++{ ++ BMessage *message = new BMessage(B_QUIT_REQUESTED); ++ bmessage_input(this, NULL, message); ++ return false; ++} ++ ++void QEWindow::DispatchMessage(BMessage *message, BHandler *handler) ++{ ++ uint32 mods; ++ switch (message->what) { ++ case B_KEY_DOWN: ++ if ((message->FindInt32("modifiers", (int32 *)&mods) == B_OK) && ++ (mods & B_COMMAND_KEY)) { ++ /* BWindow swallows KEY_DOWN when ALT is down... ++ * so this hack is needed. ++ */ ++ fView->KeyDown(NULL, 0); ++ return; ++ } ++ break; ++ case B_UNMAPPED_KEY_DOWN: ++ case B_UNMAPPED_KEY_UP: ++ case B_KEY_UP: ++ //message->PrintToStream(); ++ break; ++ } ++ BWindow::DispatchMessage(message, handler); ++} ++ ++QEView::QEView(BRect frame, const char *name) ++ :BView(frame, name, B_FOLLOW_ALL_SIDES, B_WILL_DRAW|B_FRAME_EVENTS) ++{ ++ SetViewColor(0,255,0); ++} ++ ++QEView::~QEView() ++{ ++} ++ ++void QEView::KeyDown(const char *bytes, int32 numBytes) ++{ ++ BMessage *message = Window()->DetachCurrentMessage(); ++ //message->PrintToStream(); ++ bmessage_input(NULL, this, message); ++} ++ ++void QEView::KeyUp(const char *bytes, int32 numBytes) ++{ ++ uint32 mods; ++ BMessage *message = Window()->DetachCurrentMessage(); ++ //message->PrintToStream(); ++ bmessage_input(NULL, this, message); ++} ++ ++void QEView::Draw(BRect updateRect) ++{ ++ BMessage *message; ++ message = new BMessage(_UPDATE_); ++ message->AddRect("update_rect", updateRect); ++ bmessage_input(NULL, this, message); ++} ++ ++ ++ ++static int haiku_probe(void) ++{ ++ if (force_tty) ++ return 0; ++ return 1; ++} ++ ++static int32 bapp_quit_thread(void *arg) ++{ ++ be_app->Lock(); ++ be_app->Quit(); ++ return 0; ++} ++ ++ ++static int32 bapp_thread(void *arg) ++{ ++ be_app->Lock(); ++ be_app->Run(); ++ return 0; ++} ++ ++ ++ ++static void init_application(void) ++{ ++ bapp_ref_count++; ++ if (be_app) ++ return; /* done already! */ ++ new BApplication("application/x-vnd.Bellard-QEmacs"); ++ //new XEmacsApp; ++ bapp_thid = spawn_thread(bapp_thread, "BApplication(QEmacs)", B_NORMAL_PRIORITY, (void *)find_thread(NULL)); ++ if (bapp_thid < B_OK) ++ return; /* #### handle errors */ ++ if (resume_thread(bapp_thid) < B_OK) ++ return; ++ // This way we ensure we don't create BWindows before be_app is created ++ // (creating it in the thread doesn't ensure this) ++ be_app->Unlock(); ++} ++ ++static void uninit_application(void) ++{ ++ status_t err; ++ if (--bapp_ref_count) ++ return; ++ be_app->Lock(); ++ be_app->Quit(); ++ //XXX:HACK ++ be_app->Unlock(); ++ //be_app_messenger.SendMessage(B_QUIT_REQUESTED); ++ wait_for_thread(bapp_thid, &err); ++ //FIXME:leak or crash ++ //delete be_app; ++ be_app = NULL; ++} ++ ++static int haiku_init(QEditScreen *s, int w, int h) ++{ ++ int xsize, ysize, font_ysize; ++ WindowState *ctx; ++ ++ if (!be_app) ++ init_application(); ++ ++ memcpy(&s->dpy, &haiku_dpy, sizeof(QEDisplay)); ++ ++ ctx = (WindowState *)malloc(sizeof(WindowState)); ++ if (ctx == NULL) ++ return -1; ++ s->priv_data = ctx; ++ s->media = CSS_MEDIA_SCREEN; ++ ++ int event_pipe[2]; ++ if (pipe(event_pipe) < 0) ++ return -1; ++ fcntl(event_pipe[0], F_SETFD, FD_CLOEXEC); ++ fcntl(event_pipe[1], F_SETFD, FD_CLOEXEC); ++ ++ ctx->events_rd = event_pipe[0]; ++ ctx->events_wr = events_wr = event_pipe[1]; ++ ++ set_read_handler(event_pipe[0], haiku_handle_event, s); ++ ++ ++ ctx->font = BFont(be_fixed_font); ++ ++ font_height height; ++ ctx->font.GetHeight(&height); ++ ++ font_xsize = (int)ctx->font.StringWidth("n"); ++ font_ysize = (int)(height.ascent + height.descent + height.leading); ++ ++ if (w == 0) ++ w = 80; ++ if (h == 0) ++ h = 25; ++ xsize = w * font_xsize; ++ ysize = h * font_ysize; ++ ++ s->width = xsize; ++ s->height = ysize; ++ s->charset = &charset_utf8; ++ ++ s->clip_x1 = 0; ++ s->clip_y1 = 0; ++ s->clip_x2 = s->width; ++ s->clip_y2 = s->height; ++ ++ BRect frame(0, 0, s->width - 1, s->height - 1); ++ ++ QEView *v = new QEView(frame, "qemacs"); ++ ctx->v = v; ++ ++ frame.OffsetTo(200, 200); ++ ++ ctx->w = new QEWindow(frame, "qemacs", v); ++ ctx->w->AddChild(ctx->v); ++ ctx->v->MakeFocus(); ++ ctx->v->SetViewColor(B_TRANSPARENT_COLOR); ++ ctx->v->SetDrawingMode(B_OP_OVER); ++ ++ ctx->w->Show(); ++ ++ return 0; ++} ++ ++static void haiku_close(QEditScreen *s) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ ctx->w->Lock(); ++ ctx->w->Quit(); ++ free(s->priv_data); ++} ++ ++static void haiku_flush(QEditScreen *s) ++{ ++} ++ ++static int haiku_is_user_input_pending(QEditScreen *s) ++{ ++ /* XXX: do it */ ++ return 0; ++} ++ ++#if 0 ++static void push_event(QEEvent *ev) ++{ ++ QEEventQ *e; ++ ++ e = malloc(sizeof(QEEventQ)); ++ if (!e) ++ return; ++ e->ev = *ev; ++ e->next = NULL; ++ if (!last_event) ++ first_event = e; ++ else ++ last_event->next = e; ++ last_event = e; ++} ++ ++static void push_key(int key) ++{ ++ QEEvent ev; ++ ev.type = QE_KEY_EVENT; ++ ev.key_event.key = key; ++ push_event(&ev); ++} ++ ++static int ignore_wchar_msg = 0; ++ ++LRESULT CALLBACK qe_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) ++{ ++ // printf("msg=%d\n", msg); ++ switch (msg) { ++ case WM_CREATE: ++ /* NOTE: must store them here to avoid problems in main */ ++ haiku_ctx.w = hWnd; ++ return 0; ++ ++ /* key handling */ ++ case WM_CHAR: ++ if (!ignore_wchar_msg) { ++ push_key(wParam); ++ } else { ++ return DefWindowProc(hWnd, msg, wParam, lParam); ++ } ++ break; ++ case WM_SYSCHAR: ++ if (!ignore_wchar_msg) { ++ int key; ++ key = wParam; ++ if (key >= ' ' && key <= '~') { ++ key = KEY_META(' ') + key - ' '; ++ push_key(key); ++ break; ++ } ++ } ++ return DefWindowProc(hWnd, msg, wParam, lParam); ++ case WM_SYSKEYDOWN: ++ case WM_KEYDOWN: ++ { ++ unsigned int scan; ++ int ctrl, shift, alt, key; ++ ++ ctrl = (GetKeyState(VK_CONTROL) & 0x8000); ++ shift = (GetKeyState(VK_SHIFT) & 0x8000); ++ alt = (GetKeyState(VK_MENU) & 0x8000); ++ ++ ignore_wchar_msg = 0; ++ ++ scan = (unsigned int) ((lParam >> 16) & 0x1FF); ++ switch(scan) { ++ case 0x00E: ++ ignore_wchar_msg = 1; ++ push_key(KEY_BACKSPACE); ++ break; ++ case 0x039: /* space */ ++ ignore_wchar_msg = 1; ++ if (!ctrl) ++ push_key(KEY_SPC); ++ else ++ push_key(KEY_CTRL('@')); ++ break; ++ case 0x147: /* home */ ++ push_key(KEY_HOME); ++ break; ++ case 0x148: /* UP */ ++ push_key(KEY_UP); ++ break; ++ case 0x149: /* PGUP */ ++ push_key(KEY_PAGEUP); ++ break; ++ case 0x14B: /* LEFT */ ++ push_key(KEY_LEFT); ++ break; ++ case 0x14D: /* RIGHT */ ++ push_key(KEY_RIGHT); ++ break; ++ case 0x14F: /* END */ ++ push_key(KEY_END); ++ break; ++ case 0x150: /* DOWN */ ++ push_key(KEY_DOWN); ++ break; ++ case 0x151: /* PGDN */ ++ push_key(KEY_PAGEDOWN); ++ break; ++ case 0x153: /* DEL */ ++ push_key(KEY_DELETE); ++ break; ++ case 0x152: /* INSERT */ ++ push_key(KEY_INSERT); ++ break; ++ case 0x3b: /* F1 */ ++ case 0x3c: ++ case 0x3d: ++ case 0x3e: ++ case 0x3f: ++ case 0x40: ++ case 0x41: ++ case 0x42: ++ case 0x43: ++ case 0x44: ++ case 0x57: ++ case 0x58: /* F12 */ ++ key = scan - 0x3b; ++ if (key > 9) ++ key -= 0x12; ++ key += KEY_F1; ++ /* we leave Alt-F4 to close the window */ ++ if (alt && key == KEY_F4) ++ return DefWindowProc(hWnd, msg, wParam, lParam); ++ push_key(key); ++ break; ++ ++ default: ++ return DefWindowProc(hWnd, msg, wParam, lParam); ++ } ++ } ++ break; ++ ++ case WM_KEYUP: ++ ignore_wchar_msg = 0; ++ break; ++ ++ case WM_SYSKEYUP: ++ ignore_wchar_msg = 0; ++ return DefWindowProc(hWnd, msg, wParam, lParam); ++ ++ case WM_SIZE: ++ if (wParam != SIZE_MINIMIZED) { ++ QEmacsState *qs = &qe_state; ++ QEEvent ev; ++ ++ qs->screen->width = LOWORD(lParam); ++ qs->screen->height = HIWORD(lParam); ++ ev.expose_event.type = QE_EXPOSE_EVENT; ++ push_event(&ev); ++ } ++ break; ++ case WM_PAINT: ++ { ++ PAINTSTRUCT ps; ++ HDC saved_hdc; ++ BeginPaint(haiku_ctx.w, &ps); ++ saved_hdc = haiku_ctx.hdc; ++ haiku_ctx.hdc = ps.hdc; ++ SelectObject(haiku_ctx.hdc, haiku_ctx.font); ++ do_refresh(NULL); ++ ++ EndPaint(haiku_ctx.w, &ps); ++ haiku_ctx.hdc = saved_hdc; ++ } ++ break; ++ ++ case WM_SETFOCUS: ++ case WM_KILLFOCUS: ++ break; ++ ++ default: ++ return DefWindowProc(hWnd, msg, wParam, lParam); ++ } ++ return 0; ++} ++ ++static int get_unicode_key(QEditScreen *s, QEPollData *pd, QEEvent *ev) ++{ ++ MSG msg; ++ QEEventQ *e; ++ ++ for(;;) { ++ /* check if events queued */ ++ if (first_event != NULL) { ++ e = first_event; ++ *ev = e->ev; ++ first_event = e->next; ++ if (!first_event) ++ last_event = NULL; ++ free(e); ++ break; ++ } ++ ++ /* check if message queued */ ++ if (GetMessage(&msg, NULL, 0, 0)) { ++ TranslateMessage(&msg); ++ DispatchMessage(&msg); ++ } ++ } ++ return 1; ++} ++#endif ++ ++/* called when an BMessage is forwarded. dispatch events to qe_handle_event() */ ++static void haiku_handle_event(void *opaque) ++{ ++ QEditScreen *s = (QEditScreen *)opaque; ++ WindowState *ctx = (WindowState *)s->priv_data; ++ unsigned char buf[16]; ++ bigtime_t timestamp_ms; ++ BMessage *event; ++ //fprintf(stderr, "%s()\n", __FUNCTION__); ++/* ++ KeySym keysym; ++*/ ++ int shift, ctrl, meta, len, key = 0; ++ QEEvent ev1, *ev = &ev1; ++ ++ if (read(ctx->events_rd, &event, sizeof(BMessage *)) < sizeof(BMessage *)) ++ return; ++ //event->PrintToStream(); ++ ++ switch(event->what) { ++ case B_QUIT_REQUESTED: ++ ++ // cancel pending operation ++ ev->key_event.type = QE_KEY_EVENT; ++ ev->key_event.key = KEY_CTRL('g'); ++ qe_handle_event(ev); ++ ++ // simulate C-x C-c ++ ev->key_event.type = QE_KEY_EVENT; ++ ev->key_event.key = KEY_CTRL('x'); ++ qe_handle_event(ev); ++ ev->key_event.type = QE_KEY_EVENT; ++ ev->key_event.key = KEY_CTRL('c'); ++ qe_handle_event(ev); ++ break; ++ ++ case _UPDATE_: ++ // TODO: flush queued ++ ev->expose_event.type = QE_EXPOSE_EVENT; ++ qe_handle_event(ev); ++ break; ++ ++ case B_KEY_UP: ++ break; ++ ++ case B_KEY_DOWN: ++ { ++ unsigned int mods = 0; ++ uint32 state; ++ //event->PrintToStream(); ++ uint32 scancode; ++ uint32 raw_char; ++ const char *bytes; ++ char buff[6]; ++ int numbytes = 0; ++ int i; ++ ++ if (event->FindInt64("when", ×tamp_ms) < B_OK) ++ timestamp_ms = 0LL; ++ if (event->FindInt32("modifiers", (int32 *)&state) < B_OK) ++ state = modifiers(); ++ if (event->FindInt32("key", (int32 *)&scancode) < B_OK) ++ scancode = 0; ++ if (event->FindInt32("raw_char", (int32 *)&raw_char) < B_OK) ++ raw_char = 0; ++ ++ /* check for byte[] first, ++ because C-space gives bytes="" (and byte[0] = '\0') */ ++ for (i = 0; i < 5; i++) { ++ buff[i] = '\0'; ++ if (event->FindInt8("byte", i, (int8 *)&buff[i]) < B_OK) ++ break; ++ } ++ ++ if (i) { ++ bytes = buff; ++ numbytes = i; ++ } else if (event->FindString("bytes", &bytes) < B_OK) ++ bytes = ""; ++ ++ if (!numbytes) ++ numbytes = strlen(bytes); ++ ++ shift = (state & B_SHIFT_KEY); ++ ctrl = (state & B_CONTROL_KEY); ++ meta = (state & (B_LEFT_OPTION_KEY | B_COMMAND_KEY)); ++ ++ //fprintf(stderr, "%cshift %cctrl %cmeta numbytes %d \n", shift ? ' ' : '!', ctrl ? ' ' : '!', meta ? ' ' : '!', numbytes); ++ ++ char byte = 0; ++ if (numbytes == 1) { ++ byte = bytes[0]; ++ if (state & B_CONTROL_KEY) ++ byte = (char)raw_char; ++ switch (byte) { ++ case B_BACKSPACE: ++ key = KEY_BACKSPACE; ++ if (meta) ++ key = KEY_META(KEY_BACKSPACE); ++ break; ++ case B_TAB: ++ key = KEY_TAB; ++ break; ++ case B_ENTER: ++ key = KEY_RET; ++ break; ++ case B_ESCAPE: ++ key = KEY_ESC; ++ break; ++ case B_SPACE: ++ key = KEY_SPC; ++ break; ++ case B_DELETE: ++ key = KEY_DELETE; ++ break; ++ case B_INSERT: ++ key = KEY_INSERT; ++ break; ++ case B_HOME: ++ key = ctrl ? KEY_CTRL_HOME : KEY_HOME; ++ break; ++ case B_END: ++ key = ctrl ? KEY_CTRL_END : KEY_END; ++ break; ++ case B_PAGE_UP: ++ key = KEY_PAGEUP; ++ break; ++ case B_PAGE_DOWN: ++ key = KEY_PAGEDOWN; ++ break; ++ case B_LEFT_ARROW: ++ key = ctrl ? KEY_CTRL_LEFT : KEY_LEFT; ++ break; ++ case B_RIGHT_ARROW: ++ key = ctrl ? KEY_CTRL_RIGHT : KEY_RIGHT; ++ break; ++ case B_UP_ARROW: ++ key = KEY_UP; ++ break; ++ case B_DOWN_ARROW: ++ key = KEY_DOWN; ++ break; ++ case B_FUNCTION_KEY: ++ switch (scancode) { ++ case B_F1_KEY: ++ case B_F2_KEY: ++ case B_F3_KEY: ++ case B_F4_KEY: ++ case B_F5_KEY: ++ case B_F6_KEY: ++ case B_F7_KEY: ++ case B_F8_KEY: ++ case B_F9_KEY: ++ case B_F10_KEY: ++ case B_F11_KEY: ++ case B_F12_KEY: ++ key = KEY_F1 + scancode - B_F1_KEY; ++ break; ++ case B_PRINT_KEY: ++ case B_SCROLL_KEY: ++ case B_PAUSE_KEY: ++ default: ++ break; ++ } ++ break; ++ case 0: ++ break; ++ default: ++ if (byte >= ' ' && byte <= '~') ++ if (meta) ++ key = KEY_META(' ') + byte - ' '; ++ else if (ctrl) ++ key = KEY_CTRL(byte); ++ else ++ key = byte; ++ ++ } ++ } else { ++ const char *p = bytes; ++ key = utf8_decode(&p); ++ } ++ ++ got_key: ++ if (key) { ++ ev->key_event.type = QE_KEY_EVENT; ++ ev->key_event.key = key; ++ qe_handle_event(ev); ++ } ++ } ++ break; ++ } ++ ++ delete event; ++} ++ ++static void haiku_fill_rectangle(QEditScreen *s, ++ int x1, int y1, int w, int h, QEColor color) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ //fprintf(stderr, "%s()\n", __FUNCTION__); ++ ++ /* XXX: suppress XOR mode */ ++ if (color == QECOLOR_XOR) ++ color = QERGB(0xff, 0xff, 0xff); ++ ++ BRect r(x1, y1, x1 + w - 1, y1 + h - 1); ++ rgb_color c = {(color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff, ++ 0xff}; ++ ++ ctx->v->LockLooper(); ++ ++ ctx->v->SetHighColor(c); ++ ctx->v->FillRect(r); ++ ++ ctx->v->UnlockLooper(); ++} ++ ++static QEFont *haiku_open_font(QEditScreen *s, int style, int size) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ //fprintf(stderr, "%s()\n", __FUNCTION__); ++ QEFont *font; ++ ++ font = (QEFont *)malloc(sizeof(QEFont)); ++ if (!font) ++ return NULL; ++ ++ // TODO: use style / size ++ BFont *f = new BFont(ctx->font); ++ ++ font_height height; ++ f->GetHeight(&height); ++ font->ascent = (int)height.ascent; ++ font->descent = (int)(height.descent + height.leading); ++ font->priv_data = f; ++ return font; ++} ++ ++static void haiku_close_font(QEditScreen *s, QEFont *font) ++{ ++ BFont *f = (BFont *)font->priv_data; ++ delete f; ++ free(font); ++} ++ ++static void haiku_text_metrics(QEditScreen *s, QEFont *font, ++ QECharMetrics *metrics, ++ const unsigned int *str, int len) ++{ ++ //TODO: use BFont::GetEscapements() or StringWidth() ++ int i, x; ++ metrics->font_ascent = font->ascent; ++ metrics->font_descent = font->descent; ++ x = 0; ++ for(i=0;iwidth = x; ++} ++ ++static void haiku_draw_text(QEditScreen *s, QEFont *font, ++ int x1, int y, const unsigned int *str, int len, ++ QEColor color) ++{ ++ WindowState *ctx = (WindowState *)s->priv_data; ++ BFont *f = (BFont *)(font->priv_data); ++ int i; ++ //fprintf(stderr, "%s()\n", __FUNCTION__); ++ ++ /* XXX: suppress XOR mode */ ++ if (color == QECOLOR_XOR) ++ color = QERGB(0xff, 0xff, 0xff); ++ ++ rgb_color c = {(color >> 16) & 0xff, (color >> 8) & 0xff, color & 0xff, ++ 0xff}; ++ ++ ctx->v->LockLooper(); ++ ++ ctx->v->SetHighColor(c); ++ ctx->v->SetLowColor(B_TRANSPARENT_COLOR); ++ ctx->v->SetFont(f); ++ ctx->v->MovePenTo(x1, y - 1); ++ ++ char buf[10]; ++ unsigned int cc; ++ ++ BString text; ++ for(i=0;iv->DrawString(buf); ++ } ++ ctx->v->DrawString(text.String()); ++ ++ ctx->v->UnlockLooper(); ++ ++ //TextOutW(haiku_ctx.hdc, x1, y - font->ascent, buf, len); ++} ++ ++static void haiku_set_clip(QEditScreen *s, ++ int x, int y, int w, int h) ++{ ++ /* nothing to do */ ++} ++ ++extern QEDisplay haiku_dpy = { ++ "haiku", ++ haiku_probe, ++ haiku_init, ++ haiku_close, ++ NULL, ++ haiku_flush, ++ haiku_is_user_input_pending, ++ haiku_fill_rectangle, ++ haiku_open_font, ++ haiku_close_font, ++ haiku_text_metrics, ++ haiku_draw_text, ++ haiku_set_clip, ++ NULL, /* no selection handling */ ++ NULL, /* no selection handling */ ++}; ++ ++static CmdOptionDef cmd_options[] = { ++ { "nw", NULL, CMD_OPT_BOOL, "force tty terminal usage", ++ {int_ptr: &force_tty} }, ++ { NULL }, ++}; ++ ++int haiku_init(void) ++{ ++ qe_register_cmd_line_options(cmd_options); ++ return qe_register_display(&haiku_dpy); ++} ++ ++qe_module_init(haiku_init); +diff -urN qemacs-0.3.3.org/html2png.c qemacs-0.3.3/html2png.c +--- qemacs-0.3.3.org/html2png.c 2013-02-03 13:14:08.063700992 +0100 ++++ qemacs-0.3.3/html2png.c 2013-03-08 00:28:58.506462208 +0100 +@@ -101,7 +101,7 @@ + /* realloc ppm bitmap */ + int ppm_resize(QEditScreen *s, int w, int h) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + unsigned char *data; + + /* alloc bitmap */ +@@ -131,7 +131,7 @@ + if (!cfb) + return -1; + +- s->private = cfb; ++ s->priv_data = cfb; + s->media = CSS_MEDIA_SCREEN; + + if (cfb_init(s, NULL, w * sizeof(int), 32, ".") < 0) +@@ -147,7 +147,7 @@ + + static void ppm_close(QEditScreen *s) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + + free(cfb->base); + free(cfb); +@@ -155,7 +155,7 @@ + + int ppm_save(QEditScreen *s, const char *filename) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + int w, h, x, y; + unsigned int r, g, b, v; + unsigned int *data; +@@ -190,7 +190,7 @@ + + int png_save(QEditScreen *s, const char *filename) + { +- CFBContext *cfb = s->private; ++ CFBContext *cfb = s->priv_data; + png_struct * volatile png_ptr = NULL; + png_info * volatile info_ptr = NULL; + png_byte *row_ptr, *row_pointers[1], *row = NULL; +diff -urN qemacs-0.3.3.org/Makefile qemacs-0.3.3/Makefile +--- qemacs-0.3.3.org/Makefile 2013-02-03 13:14:08.000524288 +0100 ++++ qemacs-0.3.3/Makefile 2013-03-08 02:17:54.859570176 +0100 +@@ -45,11 +45,11 @@ + endif + + ifdef CONFIG_DLL +-LIBS+=-ldl ++LIBS+=$(DLLIBS) + # export some qemacs symbols + LDFLAGS+=-Wl,-E + endif +-LIBS+=-lm ++LIBS+=$(EXTRALIBS) + + TARGETS+=qe$(EXE) qe-doc.html + +@@ -64,6 +64,11 @@ + OBJS+= shell.o dired.o + endif + ++ifdef CONFIG_HAIKU ++OBJS+= haiku.o ++LIBS+= -lbe ++endif ++ + ifdef CONFIG_WIN32 + OBJS+= win32.o + LIBS+= -lgdi32 +@@ -155,15 +160,17 @@ + rm -f config.h config.mak + + install: qe qe.1 kmaps ligatures html2png +- install -m 755 qe $(prefix)/bin/qemacs +- ln -sf qemacs $(prefix)/bin/qe ++ mkdir -p $(DESTDIR)$(prefix)/bin ++ install -m 755 qe $(DESTDIR)$(prefix)/bin/qemacs ++ ln -sf qemacs $(DESTDIR)$(prefix)/bin/qe + ifdef CONFIG_FFMPEG +- ln -sf qemacs $(prefix)/bin/ffplay ++ ln -sf qemacs $(DESTDIR)$(prefix)/bin/ffplay + endif +- mkdir -p $(prefix)/share/qe +- install kmaps ligatures $(prefix)/share/qe +- install qe.1 $(prefix)/man/man1 +- install -m 755 -s html2png $(prefix)/bin ++ mkdir -p $(DESTDIR)$(prefix)/share/qe ++ install kmaps ligatures $(DESTDIR)$(prefix)/share/qe ++ mkdir -p $(DESTDIR)$(prefix)/man/man1 ++ install qe.1 $(DESTDIR)$(prefix)/man/man1 ++ install -m 755 -s html2png $(DESTDIR)$(prefix)/bin + + TAGS: force + etags *.[ch] +@@ -244,7 +251,7 @@ + Russian.kmap SGML.kmap TeX.kmap Troff.kmap VNtelex.kmap \ + Vietnamese.kmap XKB_iso8859-4.kmap + # Hangul.kmap Hangul2.kmap Hangul3.kmap Unicode2.kmap +-KMAPS_DIR=$(prefix)/share/yudit/data ++KMAPS_DIR=$(DESTDIR)$(prefix)/share/yudit/data + KMAPS:=$(addprefix $(KMAPS_DIR)/, $(KMAPS)) + + kmaptoqe: kmaptoqe.c +diff -urN qemacs-0.3.3.org/tty.c qemacs-0.3.3/tty.c +--- qemacs-0.3.3.org/tty.c 2013-02-03 13:14:08.002621440 +0100 ++++ qemacs-0.3.3/tty.c 2013-03-09 00:45:31.432275456 +0100 +@@ -150,7 +150,7 @@ + + tty_screen = s; + ts = &tty_state; +- s->private = ts; ++ s->priv_data = ts; + s->media = CSS_MEDIA_TTY; + + tcgetattr (0, &tty); +@@ -214,7 +214,7 @@ + static void term_exit(void) + { + QEditScreen *s = tty_screen; +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + + tcsetattr (0, TCSANOW, &ts->oldtty); + } +@@ -222,7 +222,7 @@ + static void tty_resize(int sig) + { + QEditScreen *s = tty_screen; +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + int size; + + if (sig == -1) { +@@ -254,7 +254,7 @@ + + static void term_cursor_at(QEditScreen *s, int x1, int y1, int w, int h) + { +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + ts->cursor_x = x1; + ts->cursor_y = y1; + } +@@ -277,7 +277,7 @@ + static void tty_read_handler(void *opaque) + { + QEditScreen *s = opaque; +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + int ch; + QEEvent ev1, *ev = &ev1; + +@@ -312,6 +312,7 @@ + ts->input_param = 0; + } else if (ch == 'O') { + ts->input_state = IS_ESC2; ++ ts->input_param = 0; + } else { + ch = KEY_META(ch); + ts->input_state = IS_NORM; +@@ -347,13 +348,26 @@ + break; + case IS_ESC2: + /* xterm fn */ +- ts->input_state = IS_NORM; +- if (ch >= 'P' && ch <= 'S') { +- ch = KEY_F1 + ch - 'P'; +- the_end: +- ev->key_event.type = QE_KEY_EVENT; +- ev->key_event.key = ch; +- qe_handle_event(ev); ++ if (!isdigit(ch)) { ++ ts->input_state = IS_NORM; ++ if (ts->input_param == 5 && ch >= 'A' && ch <= 'D') { ++ /* CTRL-arrows variant */ ++ ch += 'a' - 'A'; ++ ch = KEY_ESC1(ch); ++ goto the_end; ++ } else if (ch >= 'A' && ch <= 'D') { ++ /* arrows variant */ ++ ch = KEY_ESC1(ch); ++ goto the_end; ++ } else if (ch >= 'P' && ch <= 'S') { ++ ch = KEY_F1 + ch - 'P'; ++ the_end: ++ ev->key_event.type = QE_KEY_EVENT; ++ ev->key_event.key = ch; ++ qe_handle_event(ev); ++ } ++ } else { ++ ts->input_param = ts->input_param * 10 + ch - '0'; + } + break; + } +@@ -399,7 +413,7 @@ + static void term_fill_rectangle(QEditScreen *s, + int x1, int y1, int w, int h, QEColor color) + { +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + int x2 = x1 + w; + int y2 = y1 + h; + int x, y; +@@ -443,7 +457,7 @@ + return NULL; + font->ascent = 0; + font->descent = 1; +- font->private = NULL; ++ font->priv_data = NULL; + return font; + } + +@@ -493,7 +507,7 @@ + int x, int y, const unsigned int *str, int len, + QEColor color) + { +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + TTYChar *ptr; + int fgcolor, w, n; + unsigned int cc; +@@ -560,7 +574,7 @@ + + static void term_flush(QEditScreen *s) + { +- TTYState *ts = s->private; ++ TTYState *ts = s->priv_data; + TTYChar *ptr, *optr; + int x, y, bgcolor, fgcolor; + char buf[10]; +diff -urN qemacs-0.3.3.org/win32.c qemacs-0.3.3/win32.c +--- qemacs-0.3.3.org/win32.c 2013-02-03 13:14:08.000000000 +0100 ++++ qemacs-0.3.3/win32.c 2013-03-08 00:24:37.173277184 +0100 +@@ -139,7 +139,7 @@ + + memcpy(&s->dpy, &win32_dpy, sizeof(QEDisplay)); + +- s->private = NULL; ++ s->priv_data = NULL; + s->media = CSS_MEDIA_SCREEN; + + win_ctx.font = CreateFont(-12, 0, 0, 0, 0 , 0, 0, 0, 0, 0, 0, 0, +@@ -434,7 +434,7 @@ + GetTextMetrics(win_ctx.hdc, &tm); + font->ascent = tm.tmAscent; + font->descent = tm.tmDescent; +- font->private = NULL; ++ font->priv_data = NULL; + return font; + } + +diff -urN qemacs-0.3.3.org/x11.c qemacs-0.3.3/x11.c +--- qemacs-0.3.3.org/x11.c 2013-02-03 13:14:08.060817408 +0100 ++++ qemacs-0.3.3/x11.c 2013-03-08 00:24:24.825491456 +0100 +@@ -191,7 +191,7 @@ + + memcpy(&s->dpy, &x11_dpy, sizeof(QEDisplay)); + +- s->private = NULL; ++ s->priv_data = NULL; + s->media = CSS_MEDIA_SCREEN; + + display = XOpenDisplay(display_str); +@@ -552,13 +552,13 @@ + 0); + font->ascent = renderFont->ascent; + font->descent = renderFont->descent; +- font->private = renderFont; ++ font->priv_data = renderFont; + return font; + } + + static void term_close_font(QEditScreen *s, QEFont *font) + { +- XftFont *renderFont = font->private; ++ XftFont *renderFont = font->priv_data; + + XftFontClose(display, renderFont); + free(font); +@@ -566,7 +566,7 @@ + + static int term_glyph_width(QEditScreen *s, QEFont *font, unsigned int cc) + { +- XftFont *renderFont = font->private; ++ XftFont *renderFont = font->priv_data; + XGlyphInfo gi; + + XftTextExtents32 (display, renderFont, &cc, 1, &gi); +@@ -577,7 +577,7 @@ + int x, int y, const unsigned int *str, int len, + QEColor color) + { +- XftFont *renderFont = font->private; ++ XftFont *renderFont = font->priv_data; + XftColor col; + int r, g, b, a; + +@@ -749,7 +749,7 @@ + + font->ascent = xfont->ascent; + font->descent = xfont->descent; +- font->private = xfont; ++ font->priv_data = xfont; + return font; + fail: + XFreeFontNames(list); +@@ -759,7 +759,7 @@ + + static void term_close_font(QEditScreen *s, QEFont *font) + { +- XFontStruct *xfont = font->private; ++ XFontStruct *xfont = font->priv_data; + + XFreeFont(display, xfont); + free(font); +@@ -769,7 +769,7 @@ + associated. */ + static XCharStruct *get_char_struct(QEFont *font, int cc) + { +- XFontStruct *xfont = font->private; ++ XFontStruct *xfont = font->priv_data; + int b1, b2; + XCharStruct *cs; + +@@ -811,7 +811,7 @@ + static XCharStruct *handle_fallback(QEditScreen *s, QEFont **out_font, + QEFont *font, unsigned int cc) + { +- XFontStruct *xfont = font->private; ++ XFontStruct *xfont = font->priv_data; + XCharStruct *cs; + int fallback_count; + QEFont *font1; +@@ -833,7 +833,7 @@ + } + + /* really no glyph : use default char in current font */ +- xfont = font->private; ++ xfont = font->priv_data; + cs = get_char_struct(font, xfont->default_char); + *out_font = font; + return cs; +@@ -904,13 +904,13 @@ + cs = handle_fallback(s, &font1, font, cc); + if (!cs) { + /* still no char: use default glyph */ +- xfont = font->private; ++ xfont = font->priv_data; + cc = xfont->default_char; + } + } + /* flush previous chars if font change needed */ + if (font1 != last_font && q > x11_str) { +- xfont = last_font->private; ++ xfont = last_font->priv_data; + l = q - x11_str; + XSetFont(display, gc, xfont->fid); + XDrawString16(display, dbuffer, gc, +@@ -927,7 +927,7 @@ + } + if (q > x11_str) { + /* flush remaining chars (more common case) */ +- xfont = last_font->private; ++ xfont = last_font->priv_data; + l = q - x11_str; + XSetFont(display, gc, xfont->fid); + XDrawString16(display, dbuffer, gc, diff --git a/app-editors/qemacs/qemacs-0.3.2dev-cvs.bep b/app-editors/qemacs/qemacs-0.3.2dev-cvs.bep new file mode 100644 index 000000000..61a3b25fb --- /dev/null +++ b/app-editors/qemacs/qemacs-0.3.2dev-cvs.bep @@ -0,0 +1,20 @@ +DESCRIPTION="QEmacs (for Quick Emacs), a very small but powerful UNIX editor" +HOMEPAGE="http://bellard.org/qemacs/" +SRC_URI="cvs://:pserver:anonymous@cvs.savannah.nongnu.org:/sources/qemacs/qemacs" +#CHECKSUM_MD5="" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="app-text/texi2html >= 1.82" +BUILD { + cd qemacs-0.3.2dev-cvs + ./configure + make +} + +INSTALL { + cd qemacs-0.3.2dev-cvs + make install +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2000-2003 Fabrice Bellard" diff --git a/app-editors/qemacs/qemacs-0.3.3.bep b/app-editors/qemacs/qemacs-0.3.3.bep new file mode 100644 index 000000000..6f08ac38a --- /dev/null +++ b/app-editors/qemacs/qemacs-0.3.3.bep @@ -0,0 +1,20 @@ +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" +DEPEND="app-text/texi2html >= 1.82" +BUILD { + cd qemacs-0.3.3 + ./configure + make +} + +INSTALL { + cd qemacs-0.3.3 + make install +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2000-2003 Fabrice Bellard" diff --git a/app-editors/se/se-3.0.bep b/app-editors/se/se-3.0.bep new file mode 100644 index 000000000..fbb4eef2a --- /dev/null +++ b/app-editors/se/se-3.0.bep @@ -0,0 +1,24 @@ +DESCRIPTION="Screen oriented version of ed" +HOMEPAGE="http://se-editor.org/" +SRC_URI="http://se-editor.org/dist/se-3.0.tar.gz" +CHECKSUM_MD5="b080a5377b95d989e14ad01b0d25e33a" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="sys-libs/ncurses >= 5.6" + +BUILD { + cd se-3.0 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=$COMMON_DOCS/info \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd se-3.0 + make install +} + +LICENSE="Public Domain" diff --git a/app-editors/vim/patches/vim-7.3.patch b/app-editors/vim/patches/vim-7.3.patch index 97888c733..09e8c002c 100644 --- a/app-editors/vim/patches/vim-7.3.patch +++ b/app-editors/vim/patches/vim-7.3.patch @@ -12,50 +12,509 @@ diff -Naur vim73/Makefile vim73.haiku/Makefile +# - Go to "src" directory and use "make autoconf" to regenerate configure script. +# - Default "make [install]" will produce GUI version. +# - To prepare Haiku package use following command: -+# make haiku_package GCCVER_SUFFIX="-gcc2" ++# make haiku_package +# Both gui-less and full versions of vim will be packaged. VIMVER = vim-$(MAJOR).$(MINOR) VERSION = $(MAJOR)$(MINOR) -@@ -236,6 +245,7 @@ - COMMENT_OS2 = comment/$(VERSION)-bin-os2 - COMMENT_HTML = comment/$(VERSION)-html - COMMENT_FARSI = comment/$(VERSION)-farsi -+COMMENT_HAIKU = comment/$(VERSION)-haiku - - dist/$(COMMENT_RT): dist/comment - echo "Vim - Vi IMproved - v$(VDOT) runtime files for MS-DOS and MS-Windows" > dist/$(COMMENT_RT) -@@ -270,6 +280,9 @@ - dist/$(COMMENT_FARSI): dist/comment - echo "Vim - Vi IMproved - v$(VDOT) Farsi language files" > dist/$(COMMENT_FARSI) - -+dist/$(COMMENT_HAIKU): dist/comment -+ echo "Vim - Vi IMproved - v$(VDOT)$(GCCVER_SUFFIX) package for Haiku OS" > dist/$(COMMENT_HAIKU) -+ - unixall: dist prepare - -rm -f dist/$(VIMVER).tar.bz2 - -rm -rf dist/$(VIMRTDIR) -@@ -576,3 +589,20 @@ +@@ -576,3 +585,37 @@ farsi: dist dist/$(COMMENT_FARSI) -rm -f dist/farsi$(VERSION).zip zip -9 -rD -z dist/farsi$(VERSION).zip farsi < dist/$(COMMENT_FARSI) + -+haiku_package: dist dist/$(COMMENT_HAIKU) ++# Haiku package ++MACHINE=$(shell uname -m) ++ifeq ($(MACHINE), BePC) ++ MACHINE = x86-gcc$(word 1, $(subst -, , $(subst ., , $(shell $(CC) -dumpversion)))) ++endif ++DATE = `date +%F` ++PACKAGE_NAME := vim-$(VDOT)-$(MACHINE)-$(DATE) ++COMMENT = .OptionalPackageDescription ++DESCRIPTION = dist/boot/$(COMMENT) ++ ++haiku_package: dist + -rm -rf dist/boot/ -+ ./configure --prefix=/boot/common --with-features=big --with-compiledby="$(COMPILEDBY)" ++ ./configure --prefix=/boot/common \ ++ --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ ++ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ ++ --with-features=big --with-compiledby="$(COMPILEDBY)" --disable-nls + make clean; make install DESTDIR=`pwd`/dist -+ ./configure --prefix=/boot/common --with-features=big --disable-gui --with-compiledby="$(COMPILEDBY)" ++ ./configure --prefix=/boot/common \ ++ --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ ++ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ ++ --with-features=big --disable-gui --with-compiledby="$(COMPILEDBY)" --disable-nls + make clean; make install DESTDIR=`pwd`/dist + -mkdir -p dist/boot/common/data/licenses + -cp runtime/doc/uganda.txt dist/boot/common/data/licenses/vim -+ echo "Package: Vim" > dist/boot/.OptionalPackageDescription -+ echo "Version: $(VDOT)$(GCCVER_SUFFIX)" >> dist/boot/.OptionalPackageDescription -+ echo "Copyright: Bram Moolenaar et al." >> dist/boot/.OptionalPackageDescription -+ echo "Description: Vi IMproved. Highly configurable text editor." >> dist/boot/.OptionalPackageDescription -+ echo "License: vim" >> dist/boot/.OptionalPackageDescription -+ echo "URL: http://www.vim.org/" >> dist/boot/.OptionalPackageDescription -+ cd dist/boot && zip -9 -r -z -y ../vim-$(VDOT)$(GCCVER_SUFFIX)-`date +%F`.zip * .OptionalPackageDescription* < ../$(COMMENT_HAIKU) ++ ln -s -T vim dist/boot/common/bin/vi ++ echo "Package: Vim" > $(DESCRIPTION) ++ echo "Version: $(VDOT)-$(MACHINE)" >> $(DESCRIPTION) ++ echo "Copyright: Bram Moolenaar et al." >> $(DESCRIPTION) ++ echo "Description: Vi IMproved. Highly configurable text editor." >> $(DESCRIPTION) ++ echo "License: vim" >> $(DESCRIPTION) ++ echo "URL: http://www.vim.org/" >> $(DESCRIPTION) ++ cd dist/boot && zip -9 -r -z -y ../$(PACKAGE_NAME).zip * $(COMMENT) < $(COMMENT) + +diff -Naur vim73/runtime/doc/eval.txt vim73.haiku/runtime/doc/eval.txt +--- vim73/runtime/doc/eval.txt 2010-08-15 14:23:20.045088768 +0200 ++++ vim73.haiku/runtime/doc/eval.txt 2012-09-15 21:37:50.934019072 +0200 +@@ -6081,7 +6081,7 @@ + autocmd Compiled with autocommand support. |autocommand| + balloon_eval Compiled with |balloon-eval| support. + balloon_multiline GUI supports multiline balloons. +-beos BeOS version of Vim. ++beos BeOS/Haiku version of Vim. + browse Compiled with |:browse| support, and browse() will + work. + builtin_terms Compiled with some builtin terminals. +@@ -6133,6 +6133,7 @@ + gui_motif Compiled with Motif GUI. + gui_photon Compiled with Photon GUI. + gui_win32 Compiled with MS Windows Win32 GUI. ++gui_beos Compiled with BeOS/Haiku GUI. + gui_win32s idem, and Win32s system being used (Windows 3.1) + gui_running Vim is running in the GUI, or it will start soon. + hangul_input Compiled with Hangul input support. |hangul| +diff -Naur vim73/runtime/doc/gui.txt vim73.haiku/runtime/doc/gui.txt +--- vim73/runtime/doc/gui.txt 2010-08-15 14:23:20.046661632 +0200 ++++ vim73.haiku/runtime/doc/gui.txt 2012-09-16 21:58:25.748158976 +0200 +@@ -97,6 +97,7 @@ + OS/2 $HOME/.gvimrc or $VIM/.gvimrc + MS-DOS and Win32 $HOME/_gvimrc or $VIM/_gvimrc + Amiga s:.gvimrc or $VIM/.gvimrc ++ Haiku $HOME/config/settings/vim/gvimrc + + There are a number of options which only have meaning in the GUI version of + Vim. These are 'guicursor', 'guifont', 'guipty' and 'guioptions'. They are +diff -Naur vim73/runtime/doc/help.txt vim73.haiku/runtime/doc/help.txt +--- vim73/runtime/doc/help.txt 2010-08-15 14:23:20.047448064 +0200 ++++ vim73.haiku/runtime/doc/help.txt 2012-09-16 22:03:00.902823936 +0200 +@@ -155,6 +155,7 @@ + |gui_w16.txt| Windows 3.1 GUI + |gui_w32.txt| Win32 GUI + |gui_x11.txt| X11 GUI ++|gui_beos.txt| BeOS/Haiku GUI + + Interfaces ~ + |if_cscop.txt| using Cscope with Vim +@@ -181,7 +182,7 @@ + Remarks about specific systems ~ + |os_390.txt| OS/390 Unix + |os_amiga.txt| Amiga +-|os_beos.txt| BeOS and BeBox ++|os_beos.txt| BeOS/Haiku and BeBox + |os_dos.txt| MS-DOS and MS-Windows NT/95 common items + |os_mac.txt| Macintosh + |os_mint.txt| Atari MiNT +diff -Naur vim73/runtime/doc/options.txt vim73.haiku/runtime/doc/options.txt +--- vim73/runtime/doc/options.txt 2010-08-15 14:23:21.051642368 +0200 ++++ vim73.haiku/runtime/doc/options.txt 2012-05-28 12:06:04.016777216 +0200 +@@ -3528,7 +3528,8 @@ + 'guitablabel' can be used to change the text in the labels. + When 'e' is missing a non-GUI tab pages line may be used. + The GUI tabs are only supported on some systems, currently +- GTK, Motif, Mac OS/X and MS-Windows. ++ GTK, Motif, Mac OS/X, Haiku and MS-Windows. ++ + *'go-f'* + 'f' Foreground: Don't use fork() to detach the GUI from the shell + where it was started. Use this for programs that wait for the +@@ -5567,7 +5568,12 @@ + $VIM/vimfiles, + $VIMRUNTIME, + $VIM/vimfiles/after, +- sys$login:vimfiles/after") ++ sys$login:vimfiles/after" ++ Haiku: "$BE_USER_SETTINGS/vim, ++ $VIM/vimfiles, ++ $VIMRUNTIME, ++ $VIM/vimfiles/after, ++ $BE_USER_SETTINGS/vim/after") + global + {not in Vi} + This is a list of directories which will be searched for runtime +@@ -6920,6 +6926,7 @@ + in the GUI: "builtin_gui" + on Amiga: "amiga" + on BeOS: "beos-ansi" ++ on Haiku: "xterm" + on Mac: "mac-ansi" + on MiNT: "vt52" + on MS-DOS: "pcterm" +diff -Naur vim73/runtime/doc/os_haiku.txt vim73.haiku/runtime/doc/os_haiku.txt +--- vim73/runtime/doc/os_haiku.txt 1970-01-01 01:00:00.000000000 +0100 ++++ vim73.haiku/runtime/doc/os_haiku.txt 2012-09-17 20:45:04.675807232 +0200 +@@ -0,0 +1,323 @@ ++*os_haiku.txt* For Vim version 7.4. Last change: 2012 May 28 ++ ++ ++ VIM REFERENCE MANUAL by Bram Moolenaar ++ ++// TODO - bring to correspondence with Haiku circumstances! ++ ++ *Haiku* ++This is a port of Vim 7.4 to the Haiku A4 or later. ++ ++This file contains the particularities for the Haiku version of Vim. For ++matters not discussed in this file, Vim behaves very much like the Unix ++|os_unix.txt| version. ++ ++ 1. General |beos-general| ++ 2. Compiling Vim |beos-compiling| ++ 3. Timeout in the Terminal |beos-timeout| ++ 4. Unicode vs. Latin1 |beos-unicode| ++ 5. The BeOS GUI |beos-gui| ++ 6. The $VIM directory |beos-vimdir| ++ 6+. The $BE_USER_SETTINGS directory |haiku-user-settings-dir| ++ 7. Drag & Drop |beos-dragndrop| ++ 8. Single Launch vs. Multiple ++ Launch |beos-launch| ++ 9. Fonts |beos-fonts| ++10. The meta key modifier |beos-meta| ++11. Mouse key mappings |beos-mouse| ++12. Color names |beos-colors| ++13. Compiling with Perl |beos-perl| ++ ++ ++1. General *beos-general* ++ ++The default syntax highlighting mostly works with different foreground colors ++to highlight items. This works best if you set your Terminal window to a ++darkish background and light letters. Some middle-grey background (for ++instance (r,g,b)=(168,168,168)) with black letters also works nicely. If you ++use the default light background and dark letters, it may look better to ++simply reverse the notion of foreground and background color settings. To do ++this, add this to your .vimrc file (where may need to be replaced with ++the escape character): > ++ ++ :if &term == "beos-ansi" ++ : set t_AB=[3%dm ++ : set t_AF=[4%dm ++ :endif ++ ++ ++2. Compiling Vim *beos-compiling* ++ ++From the Advanced Access Preview Release (AAPR) on, Vim can be configured with ++the standard configure script. To get the compiler and its flags right, use ++the following command-line in the shell (you can cut and paste it in one go): ++ ++CC=$BE_C_COMPILER CFLAGS="$BE_DEFAULT_C_FLAGS -O7" \ ++ ./configure --prefix=/boot/home/config ++ ++$BE_C_COMPILER is usually "mwcc", $BE_DEFAULT_C_FLAGS is usually "-I- -I." ++ ++When configure has run, and you wish to enable GUI support, you must edit the ++config.mk file so that the lines with GUI_xxx refer to $(BEOSGUI_xxx) instead ++of $(NONE_xxx). ++Alternatively you can make this change in the Makefile; it will have a ++more permanent effect. Search for "NONE_". ++ ++After compilation you need to add the resources to the binary. Add the ++following few lines near the end (before the line with "exit $exit_value") of ++the link.sh script to do this automatically. ++ ++ rmattr BEOS:TYPE vim ++ copyres os_beos.rsrc vim ++ mimeset vim ++ ++Also, create a dummy file "strip": ++ ++ #!/bin/sh ++ mimeset $1 ++ exit 0 ++ ++You will need it when using "make install" to install Vim. ++ ++Now type "make" to compile Vim, then "make install" to install it. ++ ++If you want to install Vim by hand, you must copy Vim to $HOME/config/bin, and ++create a bunch of symlinks to it ({g,r,rg}{vim,ex,view}). Furthermore you must ++copy Vim's configuration files to $HOME/config/share/vim: ++vim-5.0s/{*.vim,doc,syntax}. For completeness, you should also copy the nroff ++manual pages to $HOME/config/man/man1. Don't forget ctags/ctags and xxd/xxd! ++ ++Obviously, you need the unlimited linker to actually link Vim. See ++http://www.metrowerks.com for purchasing the CodeWarrior compiler for BeOS. ++There are currently no other linkers that can do the job. ++ ++This won't be able to include the Perl or Python interfaces even if ++you have the appropriate files installed. |beos-perl| ++ ++ ++3. Timeout in the Terminal *beos-timeout* ++ ++Because some POSIX/UNIX features are still missing[1], there is no direct OS ++support for read-with-timeout in the Terminal. This would mean that you cannot ++use :mappings of more than one character, unless you also :set notimeout. ++|'timeout'| ++ ++To circumvent this problem, I added a workaround to provide the necessary ++input with timeout by using an extra thread which reads ahead one character. ++As a side effect, it also makes Vim recognize when the Terminal window ++resizes. ++ ++Function keys are not supported in the Terminal since they produce very ++indistinctive character sequences. ++ ++These problems do not exist in the GUI. ++ ++[1]: there is no select() on file descriptors; also the termios VMIN and VTIME ++settings do not seem to work properly. This has been the case since DR7 at ++least and still has not been fixed as of PR2. ++ ++ *beos-unicode* ++4. Unicode vs. Latin1 *beos-utf8* ++ ++BeOS uses Unicode and UTF-8 for text strings (16-bit characters encoded to ++8-bit characters). Vim assumes ISO-Latin1 or other 8-bit character codes. ++This does not produce the desired results for non-ASCII characters. Try the ++command :digraphs to see. If they look messed up, use :set isprint=@ to ++(slightly) improve the display of ISO-Latin1 characters 128-255. This works ++better in the GUI, depending on which font you use (below). ++ ++You may also use the /boot/bin/xtou command to convert UTF-8 files from (xtou ++-f iso1 filename) or to (xtou -t iso1 filename) ISO-Latin1 characters. ++ ++ ++5. The BeOS GUI *beos-gui* ++ ++The BeOS GUI is no longer included. It was not maintained for a while and ++most likely didn't work. If you want to work on this: get the Vim 6.x version ++and merge it back in. ++ ++ ++6. The $VIM directory *beos-vimdir* ++ ++$VIM is the symbolic name for the place where Vims support files are stored. ++The default value for $VIM is set at compile time and can be determined with > ++ ++ :version ++ ++The normal value is /boot/home/config/share/vim. If you don't like it you can ++set the VIM environment variable to override this, or set 'helpfile' in your ++.vimrc: > ++ ++ :if version >= 500 ++ : set helpfile=~/vim/vim54/doc/help.txt ++ : syntax on ++ :endif ++ ++ ++6a. The $USER_SETTINGS_DIR directory *haiku-user-settings-dir* ++ ++ ++7. Drag & Drop *beos-dragndrop* ++ ++You can drop files and directories on either the Vim icon (starts a new Vim ++session, unless you use the File Types application to set Vim to be "Single ++Launch") or on the Vim window (starts editing the files). Dropping a folder ++sets Vim's current working directory. |:cd| |:pwd| If you drop files or ++folders with either SHIFT key pressed, Vim changes directory to the folder ++that contains the first item dropped. When starting Vim, there is no need to ++press shift: Vim behaves as if you do. ++ ++Files dropped set the current argument list. |argument-list| ++ ++ ++8. Single Launch vs. Multiple Launch *beos-launch* ++ ++As distributed Vim's Application Flags (as seen in the FileTypes preference) ++are set to Multiple Launch. If you prefer, you can set them to Single Launch ++instead. Attempts to start a second copy of Vim will cause the first Vim to ++open the files instead. This works from the Tracker but also from the command ++line. In the latter case, non-file (option) arguments are not supported. ++ ++NB: Only the GUI version has a BApplication (and hence Application Flags). ++This section does not apply to the GUI-less version, should you compile one. ++ ++ ++9. Fonts *beos-fonts* ++ ++Set fonts with > ++ ++ :set guifont=Courier10_BT/Roman/10 ++ ++where the first part is the font family, the second part the style, and the ++third part the size. You can use underscores instead of spaces in family and ++style. ++ ++Best results are obtained with monospaced fonts (such as Courier). Vim ++attempts to use all fonts in B_FIXED_SPACING mode but apparently this does not ++work for proportional fonts (despite what the BeBook says). ++ ++Vim also tries to use the B_ISO8859_1 encoding, also known as ISO Latin 1. ++This also does not work for all fonts. It does work for Courier, but not for ++ProFontISOLatin1/Regular (strangely enough). You can verify this by giving the > ++ ++ :digraphs ++ ++command, which lists a bunch of characters with their ISO Latin 1 encoding. ++If, for instance, there are "box" characters among them, or the last character ++isn't a dotted-y, then for this font the encoding does not work. ++ ++If the font you specify is unavailable, you get the system fixed font. ++ ++Standard fixed-width system fonts are: ++ ++ ProFontISOLatin1/Regular ++ Courier10_BT/Roman ++ Courier10_BT/Italic ++ Courier10_BT/Bold ++ Courier10_BT/Bold_Italic ++ ++Standard proportional system fonts are: ++ ++ Swis721_BT/Roman ++ Swis721_BT/Italic ++ Swis721_BT/Bold ++ Swis721_BT/Bold_Italic ++ Dutch801_Rm_BT/Roman ++ Dutch801_Rm_BT/Italic ++ Dutch801_Rm_BT/Bold ++ Dutch801_Rm_BT/Bold_Italic ++ Baskerville/Roman ++ Baskerville/Italic ++ Baskerville/Bold ++ Baskerville/Bold_Italic ++ SymbolProp_BT/Regular ++ ++Try some of them, just for fun. ++ ++ ++10. The meta key modifier *beos-meta* ++ ++The META key modifier is obtained by the left or right OPTION keys. This is ++because the ALT (aka COMMAND) keys are not passed to applications. ++ ++ ++11. Mouse key mappings *beos-mouse* ++ ++Vim calls the various mouse buttons LeftMouse, MiddleMouse and RightMouse. If ++you use the default Mouse preference settings these names indeed correspond to ++reality. Vim uses this mapping: ++ ++ Button 1 -> LeftMouse, ++ Button 2 -> RightMouse, ++ Button 3 -> MiddleMouse. ++ ++If your mouse has fewer than 3 buttons you can provide your own mapping from ++mouse clicks with modifier(s) to other mouse buttons. See the file ++vim-5.x/macros/swapmous.vim for an example. |gui-mouse-mapping| ++ ++ ++12. Color names *beos-colors* ++ ++Vim has a number of color names built-in. Additional names are read from the ++file $VIMRUNTIME/rgb.txt, if present. This file is basically the color ++database from X. Names used from this file are cached for efficiency. ++ ++ ++13. Compiling with Perl *beos-perl* ++ ++Compiling with Perl support enabled is slightly tricky. The Metrowerks ++compiler has some strange ideas where to search for include files. Since ++several include files with Perl have the same names as some Vim header ++files, the wrong ones get included. To fix this, run the following Perl ++script while in the vim-5.0/src directory: > ++ ++ preproc.pl > perl.h ++ ++ #!/bin/env perl ++ # Simple #include expander, just good enough for the Perl header files. ++ ++ use strict; ++ use IO::File; ++ use Config; ++ ++ sub doinclude ++ { ++ my $filename = $_[0]; ++ my $fh = new IO::File($filename, "r"); ++ if (defined $fh) { ++ print "/* Start of $filename */\n"; ++ ++ while (<$fh>) { ++ if (/^#include "(.*)"/) { ++ doinclude($1); ++ print "/* Back in $filename */\n"; ++ } else { ++ print $_; ++ } ++ } ++ print "/* End of $filename */\n"; ++ ++ undef $fh; ++ } else { ++ print "/* Cannot open $filename */\n"; ++ print "#include \"$filename\"\n"; ++ } ++ } ++ ++ chdir $Config{installarchlib}."/CORE"; ++ doinclude "perl.h"; ++ ++It expands the "perl.h" header file, using only other Perl header files. ++ ++Now you can configure & make Vim with the --enable-perlinterp option. ++Be warned though that this adds about 616 kilobytes to the size of Vim! ++Without Perl, Vim with default features and GUI is about 575K, with Perl ++it is about 1191K. ++ ++-Olaf Seibert ++ ++[Note: these addresses no longer work:] ++ ++http://polder.ubc.kun.nl/~rhialto/be ++ ++ vim:tw=78:ts=8:ft=help:norl: +diff -Naur vim73/runtime/doc/starting.txt vim73.haiku/runtime/doc/starting.txt +--- vim73/runtime/doc/starting.txt 2010-08-15 14:23:22.056360960 +0200 ++++ vim73.haiku/runtime/doc/starting.txt 2012-09-16 22:03:00.965476352 +0200 +@@ -756,6 +756,7 @@ + OS/2 $HOME/.vimrc or $VIM/.vimrc (or _vimrc) + MS-DOS and Win32 $HOME/_vimrc or $VIM/_vimrc + Amiga s:.vimrc or $VIM/.vimrc ++ Haiku $HOME/config/settings/vim/vimrc + + If Vim was started with "-u filename", the file "filename" is used. + All following initializations until 4. are skipped. +@@ -791,6 +792,7 @@ + "$VIM/.vimrc" (for OS/2 and Amiga) (*) + "$HOME/_vimrc" (for MS-DOS and Win32) (*) + "$VIM/_vimrc" (for MS-DOS and Win32) (*) ++ "$HOME/.vimrc" (for BeOS/Haiku) (*) + Note: For Unix, OS/2 and Amiga, when ".vimrc" does not exist, + "_vimrc" is also tried, in case an MS-DOS compatible file + system is used. For MS-DOS and Win32 ".vimrc" is checked +@@ -880,6 +882,7 @@ + ~/.vimrc (Unix and OS/2) + s:.vimrc (Amiga) + $VIM\_vimrc (MS-DOS and Win32) ++ ~/.vimrc (BeOS/Haiku) + Note that creating a vimrc file will cause the 'compatible' option to be off + by default. See |compatible-default|. + +diff -Naur vim73/runtime/doc/vi_diff.txt vim73.haiku/runtime/doc/vi_diff.txt +--- vim73/runtime/doc/vi_diff.txt 2010-08-15 14:23:23.066322432 +0200 ++++ vim73.haiku/runtime/doc/vi_diff.txt 2012-05-13 20:55:51.593494016 +0200 +@@ -139,6 +139,7 @@ + - Atari MiNT + - VMS + - BeOS ++ - Haiku + - Macintosh + - Risc OS + - IBM OS/390 +@@ -163,7 +164,7 @@ + define your own menus. Better support for CTRL/SHIFT/ALT keys in + combination with special keys and mouse. Supported for various + platforms, such as X11 (with Motif and Athena interfaces), GTK, Win32 +- (Windows 95 and later), BeOS, Amiga and Macintosh. ++ (Windows 95 and later), Haiku, Amiga and Macintosh. + + Multiple windows and buffers. |windows.txt| + Vim can split the screen into several windows, each editing a diff -Naur vim73/runtime/gvimrc_example.vim vim73.haiku/runtime/gvimrc_example.vim --- vim73/runtime/gvimrc_example.vim 2010-05-15 11:03:31.008650752 +0000 +++ vim73.haiku/runtime/gvimrc_example.vim 2010-08-20 23:25:03.942407680 +0000 @@ -81,7 +540,7 @@ diff -Naur vim73/runtime/vimrc_example.vim vim73.haiku/runtime/vimrc_example.vim diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile --- vim73/src/Makefile 2010-08-15 12:56:15.017301504 +0000 +++ vim73.haiku/src/Makefile 2010-08-20 23:27:51.707264512 +0000 -@@ -1242,6 +1242,21 @@ +@@ -1242,6 +1242,23 @@ # too: #EXTRA_LIBS = /usr/openwin/lib/libXmu.sa -lm @@ -91,8 +550,10 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile +BEOSGUI_DEFS = -DFEAT_GUI_BEOS +BEOSGUI_IPATH = +BEOSGUI_LIBS_DIR = -+BEOSGUI_LIBS1 = -lbe -lroot -ltracker -lsupc++ -ltranslation -+#BEOSGUI_LIBS1 = -lbe -lroot -ltracker -ltranslation ++BEOSGUI_LIBS1 = -lbe -lroot -ltracker -ltranslation ++ifeq ($(strip $(word 1, $(subst -, , $(subst ., , $(shell $(CC) -dumpversion))))), 4) ++BEOSGUI_LIBS1 += -lsupc++ ++endif +BEOSGUI_LIBS2 = +BEOSGUI_INSTALL = install_normal install_beos_extra +BEOSGUI_TARGETS = installglinks_beos @@ -103,7 +564,7 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile # PHOTON GUI PHOTONGUI_SRC = gui.c gui_photon.c pty.c PHOTONGUI_OBJ = objects/gui.o objects/gui_photon.o objects/pty.o -@@ -2458,6 +2473,9 @@ +@@ -2458,6 +2475,9 @@ objects/gui_athena.o: gui_athena.c $(CCC) -o $@ gui_athena.c @@ -113,7 +574,7 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile objects/gui_beval.o: gui_beval.c $(CCC) -o $@ gui_beval.c -@@ -2585,6 +2603,9 @@ +@@ -2585,6 +2605,9 @@ objects/os_beos.o: os_beos.c $(CCC) -o $@ os_beos.c @@ -123,7 +584,7 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile objects/os_qnx.o: os_qnx.c $(CCC) -o $@ os_qnx.c -@@ -2738,6 +2759,56 @@ +@@ -2738,6 +2761,56 @@ ############################################################################### @@ -173,7 +634,7 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile + chmod $(BINMOD) $$i ; \ + addattr -f ~icon.attr -t \'VICN\' BEOS:ICON $$i ; \ + done -+ addattr -f ~icon.attr -t \'ICON\' BEOS:ICON $(DEST_BIN)/$(VIMNAME)tutor ++ addattr -f ~icon.attr -t \'VICN\' BEOS:ICON $(DEST_BIN)/$(VIMNAME)tutor + @rm ~icon.attr + +############################################################################### @@ -330,7 +791,15 @@ diff -Naur vim73/src/feature.h vim73.haiku/src/feature.h # define FEAT_TOOLBAR #endif -@@ -795,7 +804,7 @@ +@@ -784,6 +793,7 @@ + && (defined(FEAT_GUI_GTK) \ + || (defined(FEAT_GUI_MOTIF) && defined(HAVE_XM_NOTEBOOK_H)) \ + || defined(FEAT_GUI_MAC) \ ++ || defined(FEAT_GUI_BEOS) \ + || (defined(FEAT_GUI_MSWIN) && !defined(WIN16) \ + && (!defined(_MSC_VER) || _MSC_VER > 1020))) + # define FEAT_GUI_TABLINE +@@ -795,7 +805,7 @@ */ #if defined(FEAT_NORMAL) # define FEAT_BROWSE_CMD @@ -339,7 +808,7 @@ diff -Naur vim73/src/feature.h vim73.haiku/src/feature.h # define FEAT_BROWSE # endif #endif -@@ -810,6 +819,7 @@ +@@ -810,6 +820,7 @@ && defined(HAVE_X11_XPM_H)) \ || defined(FEAT_GUI_GTK) \ || defined(FEAT_GUI_PHOTON) \ @@ -347,7 +816,7 @@ diff -Naur vim73/src/feature.h vim73.haiku/src/feature.h || defined(FEAT_GUI_MSWIN) \ || defined(FEAT_GUI_MAC) # define FEAT_CON_DIALOG -@@ -827,7 +837,8 @@ +@@ -827,7 +838,8 @@ #if defined(FEAT_GUI_DIALOG) && \ (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA) \ || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) \ @@ -391,7 +860,30 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c gui_mch_set_toolbar_pos(0, text_area_y, gui.menu_width, gui.toolbar_height); # endif -@@ -1292,7 +1292,11 @@ +@@ -1178,6 +1178,13 @@ + } + #endif + ++# if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_BEOS)) ++ gui_mch_set_tabline_pos(0, text_area_y, ++ gui.menu_width, gui.tabline_height); ++ if (gui_has_tabline()) ++ text_area_y += gui.tabline_height; ++#endif ++ + text_area_width = gui.num_cols * gui.char_width + gui.border_offset * 2; + text_area_height = gui.num_rows * gui.char_height + gui.border_offset * 2; + +@@ -1249,7 +1256,7 @@ + # endif + # endif + # if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) \ +- || defined(FEAT_GUI_MOTIF)) ++ || defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_BEOS)) + if (gui_has_tabline()) + base_height += gui.tabline_height; + # endif +@@ -1292,7 +1299,11 @@ again: busy = TRUE; @@ -404,7 +896,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c out_flush(); gui.num_cols = (pixel_width - gui_get_base_width()) / gui.char_width; -@@ -1314,7 +1318,11 @@ +@@ -1314,7 +1325,11 @@ || gui.num_rows != Rows || gui.num_cols != Columns) shell_resized(); @@ -417,7 +909,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c gui_update_cursor(FALSE, TRUE); #if defined(FEAT_XIM) && !defined(FEAT_GUI_GTK) xim_set_status_area(); -@@ -4055,9 +4063,9 @@ +@@ -4055,9 +4070,9 @@ y += gui.menu_height; #endif @@ -429,7 +921,17 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c y += gui.toolbar_height; # else # ifdef FEAT_GUI_MSWIN -@@ -4811,7 +4819,8 @@ +@@ -4066,7 +4081,8 @@ + # endif + #endif + +-#if defined(FEAT_GUI_TABLINE) && defined(FEAT_GUI_MSWIN) ++ //XXX ++#if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_BEOS)) + if (gui_has_tabline()) + y += gui.tabline_height; + #endif +@@ -4811,7 +4827,8 @@ } #if ((defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32) \ @@ -472,6 +974,15 @@ diff -Naur vim73/src/gui.h vim73.haiku/src/gui.h #ifdef FEAT_GUI_MAC ControlHandle id; /* A handle to the scrollbar */ #endif +@@ -412,7 +419,7 @@ + + #if defined(FEAT_GUI_TABLINE) \ + && (defined(FEAT_GUI_W32) || defined(FEAT_GUI_MOTIF) \ +- || defined(FEAT_GUI_MAC)) ++ || defined(FEAT_GUI_MAC) || defined(FEAT_GUI_BEOS)) + int tabline_height; + #endif + @@ -421,7 +428,7 @@ #endif @@ -499,7 +1010,7 @@ diff -Naur vim73/src/gui.h vim73.haiku/src/gui.h diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc --- vim73/src/gui_beos.cc 1970-01-01 00:00:00.000000000 +0000 +++ vim73.haiku/src/gui_beos.cc 2010-08-20 23:43:35.727711744 +0000 -@@ -0,0 +1,4590 @@ +@@ -0,0 +1,4868 @@ +/* vi:set ts=8 sts=4 sw=4: + * + * VIM - Vi IMproved by Bram Moolenaar @@ -571,6 +1082,7 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + * This locking protocol consists of locking Vim's window. This is both + * convenient and necessary. + */ ++ +extern "C" { + +#include @@ -592,8 +1104,10 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc +#include +#include +#include ++#include +#include +#include ++#include +#include +#include +#include @@ -621,17 +1135,7 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc +#include + +#ifdef __HAIKU__ -+//#include -+ -+// TRICK! IconUtils.h is not a public API, anyway it is exportred by libbe -+namespace BIconUtils { -+ -+status_t GetVectorIcon(const uint8* buffer, size_t size, BBitmap* result); -+ -+status_t ConvertFromCMAP8(const uint8* data, uint32 width, uint32 height, -+ uint32 bytesPerRow, BBitmap* result); -+}; -+ ++#include +#endif + +class VimApp; @@ -639,6 +1143,7 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc +class VimTextAreaView; +class VimWindow; +class VimToolbar; ++class VimTabLine; + +extern key_map *keyMap; +extern char *keyMapChars; @@ -731,6 +1236,16 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + VimToolbar *toolBar; +#endif + ++#ifdef FEAT_GUI_TABLINE ++ public: ++ VimTabLine *TabLine() const { return tabLine; } ++ bool IsShowingTabLine() const { return showingTabLine; } ++ void SetShowingTabLine(bool showing) { showingTabLine = showing; } ++ float TablineHeight() const; ++ private: ++ VimTabLine *tabLine; ++ int showingTabLine; ++#endif +}; + +class VimTextAreaView: public BView @@ -839,14 +1354,31 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + +const float ToolbarMargin = 3.; +const float ButtonMargin = 3.; -+/* -+class VimToolbarButton : public BPictureButton -+{ + -+}; -+*/ +#endif /*FEAT_TOOLBAR*/ + ++#ifdef FEAT_GUI_TABLINE ++ ++class VimTabLine : public BTabView ++{ ++ public: ++ class VimTab : public BTab { ++ public: ++ VimTab() : BTab(new BView(BRect(), "-Empty-", 0, 0)) {} ++ ++ virtual void Select(BView* owner); ++ }; ++ ++ VimTabLine(BRect r) : BTabView(r, "vimTabLine", B_WIDTH_FROM_LABEL, ++ B_FOLLOW_LEFT | B_FOLLOW_TOP | B_FOLLOW_RIGHT, B_WILL_DRAW | B_FRAME_EVENTS) {} ++ ++ float TablineHeight() const; ++ virtual void MouseDown(BPoint point); ++}; ++ ++#endif //FEAT_GUI_TABLINE ++ ++ +/* + * For caching the fonts that are used; + * Vim seems rather sloppy in this regard. @@ -975,9 +1507,18 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + bool changedir; +}; + ++struct VimTablineMsg { ++ int index; ++}; ++ ++struct VimTablineMenuMsg { ++ int index; ++ int event; ++}; ++ +struct VimMsg { + enum VimMsgType { -+ Key, Resize, ScrollBar, Menu, Mouse, MouseMoved, Focus, Refs ++ Key, Resize, ScrollBar, Menu, Mouse, MouseMoved, Focus, Refs, Tabline, TablineMenu + }; + + union { @@ -989,6 +1530,8 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + struct VimMouseMovedMsg MouseMoved; + struct VimFocusMsg Focus; + struct VimRefsMsg Refs; ++ struct VimTablineMsg Tabline; ++ struct VimTablineMenuMsg TablineMenu; + } u; +}; + @@ -1428,6 +1971,10 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc +#ifdef FEAT_TOOLBAR + toolBar(NULL), +#endif ++#ifdef FEAT_GUI_TABLINE ++// showingTabLine(false), ++ tabLine(NULL), ++#endif + textArea(NULL) +{ + init(frame); @@ -1448,6 +1995,10 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + delete toolBar; +#endif + ++#ifdef FEAT_GUI_TABLINE ++ delete tabLine; ++#endif ++ + if (textArea) { + RemoveChild(textArea); + delete textArea; @@ -1469,6 +2020,12 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + AddChild(toolBar); +#endif + ++#ifdef FEAT_GUI_TABLINE ++ tabLine = new VimTabLine(BRect(0,0,0,0)); ++// tabLine->PrepareButtonBitmaps(); ++ AddChild(tabLine); ++#endif ++ + BRect remaining = frame; + textArea = new VimTextAreaView(remaining); + AddChild(textArea); @@ -1485,6 +2042,14 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc +} +#endif + ++#ifdef FEAT_GUI_TABLINE ++ float ++VimFormView::TablineHeight() const ++{ ++ return (tabLine && IsShowingTabLine()) ? tabLine->TablineHeight() : 0.; ++} ++#endif ++ + void +VimFormView::AllAttached() +{ @@ -1515,6 +2080,14 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + remaining.top += ToolbarHeight(); + gui.toolbar_height = ToolbarHeight(); +#endif ++ ++#ifdef FEAT_GUI_TABLINE ++ tabLine->MoveTo(remaining.left, remaining.top); ++ tabLine->ResizeTo(remaining.right + 1, TablineHeight()); ++ remaining.top += TablineHeight(); ++ gui.tabline_height = TablineHeight(); ++#endif ++ + textArea->ResizeTo(remaining.Width(), remaining.Height()); + textArea->MoveTo(remaining.left, remaining.top); + } @@ -2736,9 +3309,6 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + return; + } + -+ //app_info appInfo; -+ //status_t status = gui.vimApp->GetAppInfo(&appInfo); -+ + BPath path; + status_t status = find_directory(B_BEOS_SERVERS_DIRECTORY, &path); + if(status != B_OK) { @@ -2748,7 +3318,7 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + + path.Append("app_server"); + -+ BFile file(/*&appInfo.ref*/path.Path(), O_RDONLY); ++ BFile file(path.Path(), O_RDONLY); + if(file.InitCheck() != B_OK) { + fprintf(stderr, "App file assignment failed:%s\n", + strerror(file.InitCheck())); @@ -2785,7 +3355,6 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + // try vector icon first? + iconData = (const uint8*)resources.LoadResource(B_VECTOR_ICON_TYPE, name, &size); + if(iconData != NULL && BIconUtils::GetVectorIcon(iconData, size, fIconBitmap) == B_OK) { -+ delete iconData; + return; + } +#endif @@ -2806,8 +3375,6 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc +#else + fIconBitmap->SetBits(iconData, size, 0, B_CMAP8); +#endif -+ -+ delete iconData; +} + +#endif /* FEAT_GUI_DIALOG */ @@ -3054,6 +3621,104 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + +#endif /*FEAT_TOOLBAR*/ + ++#if defined(FEAT_GUI_TABLINE) ++ ++ float ++VimTabLine::TablineHeight() const ++{ ++// float size = NULL == normalButtonsBitmap ? 18. : normalButtonsBitmap->Bounds().Height(); ++// return size + ToolbarMargin * 2 + ButtonMargin * 2 + 1; ++ return TabHeight();// + ToolbarMargin; ++} ++ ++void ++VimTabLine::MouseDown(BPoint point) ++{ ++ if(!gui_mch_showing_tabline()) ++ return; ++ ++ BMessage *m = Window()->CurrentMessage(); ++ assert(m); ++ ++ int32 buttons = 0; ++ m->FindInt32("buttons", &buttons); ++ ++ int32 clicks = 0; ++ m->FindInt32("clicks", &clicks); ++ ++ int index = 0; // 0 means here - no tab found ++ for (int i = 0; i < CountTabs(); i++) { ++ if(TabFrame(i).Contains(point)) { ++ index = i + 1; // indexes are 1-based ++ break; ++ } ++ } ++ ++ int event = -1; ++ ++ if ((buttons & B_PRIMARY_MOUSE_BUTTON) && clicks > 1) { ++ // left button double click on - create new tab ++ event = TABLINE_MENU_NEW; ++ ++ } else if (buttons & B_TERTIARY_MOUSE_BUTTON) { ++ // middle button click - close the pointed tab ++ // or create new one in case empty space ++ event = index > 0 ? TABLINE_MENU_CLOSE : TABLINE_MENU_NEW; ++ ++ } else if (buttons & B_SECONDARY_MOUSE_BUTTON) { ++ // right button click - show context menu ++ BPopUpMenu* popUpMenu = new BPopUpMenu("tabLineContextMenu", false, false); ++ popUpMenu->AddItem(new BMenuItem(_("Close tabi R"), new BMessage(TABLINE_MENU_CLOSE))); ++ popUpMenu->AddItem(new BMenuItem(_("New tab T"), new BMessage(TABLINE_MENU_NEW))); ++ popUpMenu->AddItem(new BMenuItem(_("Open tab..."), new BMessage(TABLINE_MENU_OPEN))); ++ ++ ConvertToScreen(&point); ++ BMenuItem* item = popUpMenu->Go(point); ++ if (item != NULL) { ++ event = item->Command(); ++ } ++ ++ delete popUpMenu; ++ ++ } else { ++ // default processing ++ BTabView::MouseDown(point); ++ return; ++ } ++ ++ if (event < 0) ++ return; ++ ++ VimTablineMenuMsg tmm; ++ tmm.index = index; ++ tmm.event = event; ++ write_port(gui.vdcmp, VimMsg::TablineMenu, &tmm, sizeof(tmm)); ++} ++ ++void ++VimTabLine::VimTab::Select(BView* owner) ++{ ++ BTab::Select(owner); ++ ++ VimTabLine *tabLine = gui.vimForm->TabLine(); ++ if(tabLine != NULL) { ++ ++ int32 i = 0; ++ for (; i < tabLine->CountTabs(); i++) { ++ if(this == tabLine->TabAt(i)) ++ break; ++ } ++ ++ printf("%d:%d:%s\n", i, tabLine->CountTabs(), tabLine->TabAt(i)->Label()); ++ if(i < tabLine->CountTabs()) { ++ VimTablineMsg tm; ++ tm.index = i + 1; ++ write_port(gui.vdcmp, VimMsg::Tabline, &tm, sizeof(tm)); ++ } ++ } ++} ++ ++#endif // defined(FEAT_GUI_TABLINE) + +/* ---------------- ---------------- */ + @@ -3067,7 +3732,7 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc +gui_beos_process_event(bigtime_t timeout) +{ + struct VimMsg vm; -+ long what; ++ int32 what; + ssize_t size; + + size = read_port_etc(gui.vdcmp, &what, &vm, sizeof(vm), @@ -3167,6 +3832,12 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + case VimMsg::Refs: + ::RefsReceived(vm.u.Refs.message, vm.u.Refs.changedir); + break; ++ case VimMsg::Tabline: ++ send_tabline_event(vm.u.Tabline.index); ++ break; ++ case VimMsg::TablineMenu: ++ send_tabline_menu_event(vm.u.TablineMenu.index, vm.u.TablineMenu.event); ++ break; + default: + // unrecognised message, ignore it + break; @@ -3595,6 +4266,13 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + if (gui.vimWindow->Lock()) { + gui.vimTextArea->MoveTo(x, y); + gui.vimTextArea->ResizeTo(w - PEN_WIDTH, h - PEN_WIDTH); ++ ++/*#ifdef FEAT_GUI_TABLINE ++ if(gui.vimForm->TabLine() != NULL) { ++ gui.vimForm->TabLine()->ResizeTo(w, gui.vimForm->TablineHeight()); ++ } ++#endif //FEAT_GUI_TABLINE*/ ++ + gui.vimWindow->Unlock(); + } +} @@ -4566,6 +5244,14 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc +{ + vimmenu_T *parent = menu->parent; + ++ // popup menu - just create it unattached ++ if (menu_is_popup(menu->name) && parent == NULL) { ++ BPopUpMenu* popUpMenu = new BPopUpMenu((const char*)menu->name, false, false); ++ menu->submenu_id = popUpMenu; ++ menu->id = NULL; ++ return; ++ } ++ + if (!menu_is_menubar(menu->name) + || (parent != NULL && parent->submenu_id == NULL)) + return; @@ -4633,21 +5319,6 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + int mnemonic = 0; + vimmenu_T *parent = menu->parent; + -+// printf("parent:%s:%#010x\n", parent->name, parent->submenu_id); -+// if (parent->submenu_id == NULL) -+// return; -+ -+// printf("parent:%s\n", parent->name); -+ -+//#ifdef never -+ /* why not add separators ? -+ * richard -+ */ -+ /* Don't add menu separator */ -+// if (menu_is_separator(menu->name)) -+// return; -+//#endif -+ + /* TODO: use menu->actext */ + /* This is difficult, since on Be, an accelerator must be a single char + * and a lot of Vim ones are the standard VI commands. @@ -4665,9 +5336,9 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + } + } else +#endif -+ -+ if (parent->submenu_id != NULL) { -+ if ( menu_is_separator(menu->name)) { ++ ++ if (parent->submenu_id != NULL || menu_is_popup(parent->name)) { ++ if (menu_is_separator(menu->name)) { + BSeparatorItem *item = new BSeparatorItem(); + parent->submenu_id->AddItem(item); + menu->id = item; @@ -4780,6 +5451,26 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + /* Nothing to do in BeOS */ +} + ++ void ++gui_mch_show_popupmenu(vimmenu_T *menu) ++{ ++ if (!menu_is_popup(menu->name) || menu->submenu_id == NULL) ++ return; ++ ++ BPopUpMenu* popupMenu = dynamic_cast(menu->submenu_id); ++ if (popupMenu == NULL) ++ return; ++ ++ BPoint point; ++ if(gui.vimWindow->Lock()) { ++ uint32 buttons = 0; ++ gui.vimTextArea->GetMouse(&point, &buttons); ++ gui.vimTextArea->ConvertToScreen(&point); ++ gui.vimWindow->Unlock(); ++ } ++ popupMenu->Go(point, true); ++} ++ +#endif /* FEAT_MENU */ + +/* Mouse stuff */ @@ -5030,13 +5721,6 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + /* TODO */ +} + -+ void -+gui_mch_show_popupmenu(vimmenu_T *menu) -+{ -+ TRACE(); -+ /* TODO */ -+} -+ +#ifdef FEAT_MBYTE_IME + void +im_set_position(int row, int col) @@ -5089,7 +5773,113 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc + } + } +} -+//} /* extern "C" */ ++ ++#if defined(FEAT_GUI_TABLINE) || defined(PROTO) ++ ++/* ++ * Show or hide the tabline. ++ */ ++ void ++gui_mch_show_tabline(int showit) ++{ ++ VimTabLine *tabLine = gui.vimForm->TabLine(); ++ ++ if (tabLine == NULL) ++ return; ++ ++ if (!showit != !gui.vimForm->IsShowingTabLine()) { ++ gui.vimForm->SetShowingTabLine(showit != 0); ++ gui.tabline_height = gui.vimForm->TablineHeight(); ++ } ++} ++ ++ void ++gui_mch_set_tabline_pos(int x, int y, int w, int h) ++{ ++ VimTabLine *tabLine = gui.vimForm->TabLine(); ++ if(tabLine != NULL) { ++ if (gui.vimWindow->Lock()) { ++ tabLine->MoveTo(x, y); ++ tabLine->ResizeTo(w - 1, h - 1); ++ gui.vimWindow->Unlock(); ++ } ++ } ++} ++ ++/* ++ * Return TRUE when tabline is displayed. ++ */ ++ int ++gui_mch_showing_tabline() ++{ ++ VimTabLine *tabLine = gui.vimForm->TabLine(); ++ return tabLine != NULL && gui.vimForm->IsShowingTabLine(); ++} ++ ++/* ++ * Update the labels of the tabline. ++ */ ++ void ++gui_mch_update_tabline() ++{ ++ tabpage_T *tp; ++ int nr = 0; ++ int curtabidx = 0; ++ ++ VimTabLine *tabLine = gui.vimForm->TabLine(); ++ ++ if (tabLine == NULL) ++ return; ++ ++ gui.vimWindow->Lock(); ++ ++ /* Add a label for each tab page. They all contain the same text area. */ ++ for (tp = first_tabpage; tp != NULL; tp = tp->tp_next, ++nr) { ++ if (tp == curtab) ++ curtabidx = nr; ++ ++ BTab* tab = tabLine->TabAt(nr); ++ ++ if (tab == NULL) { ++ tab = new VimTabLine::VimTab(); ++ tabLine->AddTab(NULL, tab); ++ } ++ ++ get_tabline_label(tp, FALSE); ++ tab->SetLabel((const char*)NameBuff); ++ tabLine->Invalidate(); ++ } ++ ++ /* Remove any old labels. */ ++ while (nr < tabLine->CountTabs()) ++ tabLine->RemoveTab(nr); ++ ++ if(tabLine->Selection() != curtabidx) ++ tabLine->Select(curtabidx); ++ ++ gui.vimWindow->Unlock(); ++} ++ ++/* ++ * Set the current tab to "nr". First tab is 1. ++ */ ++ void ++gui_mch_set_curtab(int nr) ++{ ++ VimTabLine *tabLine = gui.vimForm->TabLine(); ++ if(tabLine == NULL) ++ return; ++ ++ gui.vimWindow->Lock(); ++ ++ if(tabLine->Selection() != nr -1) ++ tabLine->Select(nr -1); ++ ++ gui.vimWindow->Unlock(); ++} ++ ++#endif //FEAT_GUI_TABLINE ++ diff -Naur vim73/src/gui_beos.h vim73.haiku/src/gui_beos.h --- vim73/src/gui_beos.h 1970-01-01 00:00:00.000000000 +0000 +++ vim73.haiku/src/gui_beos.h 2010-08-20 22:25:02.562298880 +0000 @@ -5182,7 +5972,32 @@ diff -Naur vim73/src/misc1.c vim73.haiku/src/misc1.c diff -Naur vim73/src/normal.c vim73.haiku/src/normal.c --- vim73/src/normal.c 2010-07-31 13:25:19.021233664 +0000 +++ vim73.haiku/src/normal.c 2010-08-20 22:44:36.301203456 +0000 -@@ -5385,7 +5385,8 @@ +@@ -2599,6 +2599,7 @@ + * shift-left button -> right button + * alt-left button -> alt-right button + */ ++ + if (mouse_model_popup()) + { + if (which_button == MOUSE_RIGHT +@@ -2613,13 +2614,14 @@ + if (!is_click) + return FALSE; + #endif +-#if defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MSWIN) ++#if defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_BEOS) + if (is_click || is_drag) + return FALSE; + #endif + #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) \ + || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MSWIN) \ +- || defined(FEAT_GUI_MAC) || defined(FEAT_GUI_PHOTON) ++ || defined(FEAT_GUI_MAC) || defined(FEAT_GUI_PHOTON) \ ++ || defined(FEAT_GUI_BEOS) + if (gui.in_use) + { + jump_flags = 0; +@@ -5385,7 +5387,8 @@ { if (!checkclearop(cap->oap)) { @@ -5192,7 +6007,7 @@ diff -Naur vim73/src/normal.c vim73.haiku/src/normal.c /* * Right now, the BeBox doesn't seem to have an easy way to detect * window resizing, so we cheat and make the user detect it -@@ -5393,6 +5394,7 @@ +@@ -5393,6 +5396,7 @@ */ ui_get_shellsize(); #endif @@ -5323,19 +6138,27 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c diff -Naur vim73/src/os_beos.h vim73.haiku/src/os_beos.h --- vim73/src/os_beos.h 2010-05-15 11:04:11.065273856 +0000 +++ vim73.haiku/src/os_beos.h 2010-08-20 23:16:40.791937024 +0000 -@@ -20,6 +20,11 @@ +@@ -20,6 +20,18 @@ #undef BEOS_DR8 #define BEOS_PR_OR_BETTER -+#define USR_VIMRC_FILE "$BE_USER_SETTINGS/vim/vimrc" -+#define USR_GVIMRC_FILE "$BE_USER_SETTINGS/vim/gvimrc" +-/* select emulation */ ++#define USR_VIM_DIR "$BE_USER_SETTINGS/vim" + -+#define VIMINFO_FILE "$BE_USER_SETTINGS/vim/viminfo" ++#define USR_EXRC_FILE USR_VIM_DIR "/exrc" ++#define USR_VIMRC_FILE USR_VIM_DIR "/vimrc" ++#define USR_GVIMRC_FILE USR_VIM_DIR "/gvimrc" ++#define VIMINFO_FILE USR_VIM_DIR "/viminfo" + - /* select emulation */ ++#ifdef RUNTIME_GLOBAL ++# define DFLT_RUNTIMEPATH USR_VIM_DIR "/vimfiles," RUNTIME_GLOBAL \ ++ ",$VIMRUNTIME," RUNTIME_GLOBAL "/after," USR_VIM_DIR "/vimfiles/after" ++#else ++# define DFLT_RUNTIMEPATH USR_VIM_DIR "/vimfiles," "$VIM/vimfiles" \ ++ ",$VIMRUNTIME," "$VIM/vimfiles/after," USR_VIM_DIR "/vimfiles/after" ++#endif -#include /* for typedefs and #defines only */ -+//#include /* for typedefs and #defines only */ diff -Naur vim73/src/os_beos.rdef vim73.haiku/src/os_beos.rdef --- vim73/src/os_beos.rdef 1970-01-01 00:00:00.000000000 +0000 +++ vim73.haiku/src/os_beos.rdef 2010-05-02 14:29:42.040894464 +0000 @@ -5348,7 +6171,7 @@ diff -Naur vim73/src/os_beos.rdef vim73.haiku/src/os_beos.rdef + +resource app_version { + major = 7, -+ middle = 2, ++ middle = 3, + minor = 0, + + variety = B_APPV_FINAL, @@ -5597,10 +6420,31 @@ diff -Naur vim73/src/os_unix.c vim73.haiku/src/os_unix.c beos_cleanup_read_thread(); # endif +diff -Naur vim73/src/os_unix.h vim73.haiku/src/os_unix.h +--- vim73/src/os_unix.h 2010-05-23 14:16:14.034865152 +0200 ++++ vim73.haiku/src/os_unix.h 2011-02-21 23:18:13.038797312 +0100 +@@ -388,6 +388,8 @@ + + #define DFLT_ERRORFILE "errors.err" + ++#ifndef DFLT_RUNTIMEPATH ++ + #ifdef OS2 + # define DFLT_RUNTIMEPATH "$HOME/vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME/vimfiles/after" + #else +@@ -402,6 +404,8 @@ + # endif + #endif + ++#endif ++ + #ifdef OS2 + /* + * Try several directories to put the temp files. diff -Naur vim73/src/proto/gui_beos.pro vim73.haiku/src/proto/gui_beos.pro --- vim73/src/proto/gui_beos.pro 1970-01-01 00:00:00.000000000 +0000 +++ vim73.haiku/src/proto/gui_beos.pro 2010-08-20 23:42:00.825229312 +0000 -@@ -0,0 +1,84 @@ +@@ -0,0 +1,90 @@ +/* gui_beos.cc - hand crafted */ +void gui_mch_prepare __ARGS((int *argc, char **argv)); +int gui_mch_init __ARGS((void)); @@ -5685,6 +6529,12 @@ diff -Naur vim73/src/proto/gui_beos.pro vim73.haiku/src/proto/gui_beos.pro + +void gui_mch_show_toolbar __ARGS((int showit)); +void gui_mch_set_toolbar_pos __ARGS((int x, int y, int w, int h)); ++ ++void gui_mch_show_tabline __ARGS((int showit)); ++void gui_mch_set_tabline_pos __ARGS((int x, int y, int w, int h)); ++int gui_mch_showing_tabline __ARGS((void)); ++void gui_mch_update_tabline __ARGS((void)); ++void gui_mch_set_curtab __ARGS((int nr)); diff -Naur vim73/src/proto/os_beos.pro vim73.haiku/src/proto/os_beos.pro --- vim73/src/proto/os_beos.pro 1970-01-01 00:00:00.000000000 +0000 +++ vim73.haiku/src/proto/os_beos.pro 2009-05-16 16:18:36.066846720 +0000 @@ -5837,6 +6687,15 @@ diff -Naur vim73/src/ui.c vim73.haiku/src/ui.c /* * When the OS can't really suspend, call this function to start a shell. * This is never called in the GUI. +@@ -3000,7 +3000,7 @@ + + #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MAC) \ + || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MSWIN) \ +- || defined(FEAT_GUI_PHOTON) || defined(PROTO) ++ || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_BEOS) || defined(PROTO) + /* + * Translate window coordinates to buffer position without any side effects + */ diff -Naur vim73/src/version.c vim73.haiku/src/version.c --- vim73/src/version.c 2010-08-01 13:45:48.052953088 +0000 +++ vim73.haiku/src/version.c 2010-08-20 22:58:43.417333248 +0000 diff --git a/app-editors/vim/vim-7.2.bep b/app-editors/vim/vim-7.2.bep index 6820d80aa..7b6d90625 100644 --- a/app-editors/vim/vim-7.2.bep +++ b/app-editors/vim/vim-7.2.bep @@ -10,7 +10,7 @@ BUILD { cd src make autoconf cd ../ - ./configure --prefix=/boot/common --with-features=big + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-features=big make } diff --git a/app-editors/vim/vim-7.3.bep b/app-editors/vim/vim-7.3.bep index 659c6db35..52c00432d 100644 --- a/app-editors/vim/vim-7.3.bep +++ b/app-editors/vim/vim-7.3.bep @@ -10,7 +10,7 @@ BUILD { cd src make autoconf cd ../ - ./configure --prefix=/boot/common --with-features=big + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-features=big make } diff --git a/app-emulation/aranym/aranym-0.9.11-cvs.bep b/app-emulation/aranym/aranym-0.9.11-cvs.bep new file mode 100644 index 000000000..d5866162a --- /dev/null +++ b/app-emulation/aranym/aranym-0.9.11-cvs.bep @@ -0,0 +1,23 @@ +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="cvs://:pserver:anoncvs@cvs.aranym.org:/var/repos/aranym" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="dev-libs/libcdio >= 0.82 + media-libs/libsdl >= 1.2.10" +#CHECKSUM_MD5="" + +BUILD { + cd aranym + ./autogen.sh --help >/dev/null + ./configure --prefix=/boot/apps/ARAnyM + make +} + +INSTALL { + cd aranym + make install +} + +COPYRIGHT="2001-2010 ARAnyM developer team" +LICENSE="GNU GPL v2" diff --git a/app-emulation/libdsk/libdsk-1.3.3.bep b/app-emulation/libdsk/libdsk-1.3.3.bep new file mode 100644 index 000000000..b9217604b --- /dev/null +++ b/app-emulation/libdsk/libdsk-1.3.3.bep @@ -0,0 +1,28 @@ +DESCRIPTION="LibDSK is a library for manipulating disk image files" +HOMEPAGE="http://www.seasip.demon.co.uk/Unix/LibDsk/" +SRC_URI="http://www.seasip.info/Unix/LibDsk/libdsk-1.3.3.tar.gz" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="" +#CHECKSUM_MD5="" + +BUILD { + cd libdsk-1.3.3 + # Need to update the libtools in the package to build shared libraries + libtoolize + # We need a makefile to run make distclean... + ./configure --prefix=/boot/common + # Make sure autotools know about the updated libtools... + make distclean + # ... and run configure again + ./configure --prefix=/boot/common + make +} + +INSTALL { + cd libdsk-1.3.3 + make install +} + +COPYRIGHT="2010 John Elliott" +LICENSE="GNU GPL v2" diff --git a/app-emulation/mednafen/mednafen-0.9.26.bep b/app-emulation/mednafen/mednafen-0.9.26.bep new file mode 100644 index 000000000..a273028a5 --- /dev/null +++ b/app-emulation/mednafen/mednafen-0.9.26.bep @@ -0,0 +1,29 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" +MESSAGE="This port builds only with gcc4. Use 'setgcc gcc4' before building." +DEPEND="media-libs/libsdl >= 1.2.15, + dev-libs/libcdio >= 0.82, + media-libs/libsndfile >= 1.0.21" + +BUILD { + cd mednafen + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd mednafen + make install +} + +TEST { + cd mednafen + make check +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2012 Mednafen Team" diff --git a/app-emulation/mednafen/patches/mednafen-0.9.26.patch b/app-emulation/mednafen/patches/mednafen-0.9.26.patch new file mode 100644 index 000000000..64199c1fe --- /dev/null +++ b/app-emulation/mednafen/patches/mednafen-0.9.26.patch @@ -0,0 +1,13 @@ +diff -Naur mednafen/mednafen/tremor/misc.h mednafen-haiku/mednafen/tremor/misc.h +--- mednafen/mednafen/tremor/misc.h 2012-03-29 20:58:54.021757952 +0000 ++++ mednafen-haiku/mednafen/tremor/misc.h 2013-01-05 18:21:51.628883456 +0000 +@@ -15,6 +15,9 @@ + + ********************************************************************/ + ++//Haiku ++#include ++ + #ifndef _V_RANDOM_H_ + #define _V_RANDOM_H_ + #include "ivorbiscodec.h" diff --git a/app-emulation/oricutron/oricutron-0.9-svn.bep b/app-emulation/oricutron/oricutron-0.9-svn.bep new file mode 100644 index 000000000..702d1bf26 --- /dev/null +++ b/app-emulation/oricutron/oricutron-0.9-svn.bep @@ -0,0 +1,20 @@ +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" +STATUS_HAIKU="untested" +DEPEND="media-libs/libsdl >= 1.2.10" +#CHECKSUM_MD5="" + +BUILD { + cd trunk + make +} + +INSTALL { + cd trunk + make install +} + +COPYRIGHT="2009-2012 Peter Gordon" +LICENSE="GNU GPL v2" diff --git a/app-emulation/pearpc/pearpc-0.5.0-cvs.bep b/app-emulation/pearpc/pearpc-0.5.0-cvs.bep new file mode 100644 index 000000000..e8b8f682f --- /dev/null +++ b/app-emulation/pearpc/pearpc-0.5.0-cvs.bep @@ -0,0 +1,22 @@ +DESCRIPTION="PearPC PowerPC Architecture Emulator." +HOMEPAGE="http://pearpc.sourceforge.net/" +SRC_URI="cvs://:pserver:anonymous@pearpc.cvs.sourceforge.net:/cvsroot/pearpc/pearpc" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="" +#CHECKSUM_MD5="" + +BUILD { + cd pearpc-0.5.0-cvs + ./autogen.sh >/dev/null + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd pearpc-0.5.0-cvs + make install +} + +COPYRIGHT="2003-2011 Sebastian Biallas" +LICENSE="GNU GPL v2" diff --git a/app-emulation/qemu/qemu-0.12.4.bep b/app-emulation/qemu/qemu-0.12.4.bep index 65f565d02..e97a8f4f4 100644 --- a/app-emulation/qemu/qemu-0.12.4.bep +++ b/app-emulation/qemu/qemu-0.12.4.bep @@ -8,7 +8,7 @@ CHECKSUM_MD5="93e6b134dff89b2799f57b7d9e0e0fc5" BUILD { cd qemu-0.12.4 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-i18n/anthy/anthy-9100.bep b/app-i18n/anthy/anthy-9100.bep index c2e5977d2..58d79885e 100644 --- a/app-i18n/anthy/anthy-9100.bep +++ b/app-i18n/anthy/anthy-9100.bep @@ -10,7 +10,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-misc/colordiff/colordiff-1.0.10.bep b/app-misc/colordiff/colordiff-1.0.10.bep new file mode 100644 index 000000000..1f73f2885 --- /dev/null +++ b/app-misc/colordiff/colordiff-1.0.10.bep @@ -0,0 +1,23 @@ +DESCRIPTION="Colorizes output of diff" +HOMEPAGE="http://colordiff.sourceforge.net/" +SRC_URI="http://colordiff.sourceforge.net/colordiff-1.0.10.tar.gz" +CHECKSUM_MD5="e3e86e2837deb884e43eacdc96a67baa" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-lang/perl >= 5.10.1 + sys-apps/diffutils >= 2.8.1" +BUILD { + # Nothing to see here + cd colordiff-1.0.10 +} + +INSTALL { + cd colordiff-1.0.10 + make INSTALL_DIR="$(finddir B_COMMON_BIN_DIRECTORY)" \ + MAN_DIR="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1" \ + ETC_DIR="$(finddir B_USER_SETTINGS_DIRECTORY)" \ + install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2012 Dave Ewart" diff --git a/app-misc/colordiff/patches/colordiff-1.0.10.patch b/app-misc/colordiff/patches/colordiff-1.0.10.patch new file mode 100644 index 000000000..b99900f2b --- /dev/null +++ b/app-misc/colordiff/patches/colordiff-1.0.10.patch @@ -0,0 +1,9 @@ +diff -up colordiff-1.0.10/colordiff.pl.orig colordiff-1.0.10/colordiff.pl +--- colordiff-1.0.10/colordiff.pl.orig 2012-08-05 14:43:30.500432896 -0600 ++++ colordiff-1.0.10/colordiff.pl 2012-08-05 14:43:41.898367488 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/boot/common/bin/perl -w + + ######################################################################## + # # diff --git a/app-misc/getopt/getopt-1.1.4.bep b/app-misc/getopt/getopt-1.1.4.bep index 4690cfc05..2ae2b7510 100644 --- a/app-misc/getopt/getopt-1.1.4.bep +++ b/app-misc/getopt/getopt-1.1.4.bep @@ -12,7 +12,7 @@ BUILD { INSTALL { cd getopt-1.1.4 - make install prefix=/boot/common DESTDIR="${DESTDIR}" + make install prefix=`finddir B_COMMON_DIRECTORY` DESTDIR="${DESTDIR}" } LICENSE="GNU GPL v2" COPYRIGHT="1997-2005 Frodo Looijaard" diff --git a/app-misc/strigi/patches/strigi-0.7.8.patch b/app-misc/strigi/patches/strigi-0.7.8.patch new file mode 100644 index 000000000..8b6d07c7a --- /dev/null +++ b/app-misc/strigi/patches/strigi-0.7.8.patch @@ -0,0 +1,40 @@ +--- strigi-0.7.8-orig/strigidaemon/CMakeLists.txt 2013-01-25 17:49:35.005767168 +0000 ++++ strigi-0.7.8/strigidaemon/CMakeLists.txt 2013-02-13 00:55:35.019660800 +0000 +@@ -126,6 +126,6 @@ + DESTINATION ${LIB_DESTINATION}/cmake/LibSearchClient) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "") + add_executable(strigidaemon dummy.cpp) +-target_link_libraries(strigidaemon libstrigidaemon) ++target_link_libraries(strigidaemon libstrigidaemon network) + install(TARGETS strigidaemon + RUNTIME DESTINATION bin) + +--- strigi-0.7.8-orig/strigidaemon/bin/daemon/strigithread.cpp 2013-01-25 17:49:35.020971520 +0000 ++++ strigi-0.7.8/strigidaemon/bin/daemon/strigithread.cpp 2013-02-13 00:52:47.447741952 +0000 +@@ -30,7 +30,9 @@ + #include + #include + #include ++#ifndef __HAIKU__ + #include ++#endif + + // define two enums and a constant for use of ioprio + enum { +@@ -108,6 +110,7 @@ + StrigiThread* thread = static_cast(d); + + #ifndef __APPLE__ ++#ifndef __HAIKU__ + if (thread->getPriority() > 0) { + // renice the thread + int r = setpriority(PRIO_PROCESS, 0, thread->getPriority()); +@@ -139,7 +142,7 @@ + #endif + } + #endif +- ++#endif + // start the actual work + thread->run(0); + STRIGI_LOG_DEBUG(string("strigi.daemon.") + thread->name + ".threadstarter", "end of thread"); diff --git a/app-office/abiword/abiword-2.8.6.bep b/app-office/abiword/abiword-2.8.6.bep new file mode 100644 index 000000000..a973c4127 --- /dev/null +++ b/app-office/abiword/abiword-2.8.6.bep @@ -0,0 +1,29 @@ +DESCRIPTION="AbiWord" +HOMEPAGE="http://www.abisource.com" +SRC_URI="http://www.abisource.com/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="media-libs/jpeg >= 6b + media-libs/libpng >= 1.2" +CHECKSUM_MD5="f883b0a7f26229a9c66fd6a1a94381aa" +BUILD { + cd abiword-2.8.6 + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --with-haiku + make +} + +INSTALL { + cd abiword-2.8.6 + make install +} + +TEST { + cd abiword-2.8.6 +# make test +# make check +} + +#LICENSE="" +#COPYRIGHT="" diff --git a/app-office/abiword/patches/abiword-2.8.6.patch b/app-office/abiword/patches/abiword-2.8.6.patch new file mode 100644 index 000000000..10796bf2b --- /dev/null +++ b/app-office/abiword/patches/abiword-2.8.6.patch @@ -0,0 +1,84 @@ +diff -urN abiword-2.8.6/configure.in abiword-2.8.6-haiku/configure.in +--- abiword-2.8.6/configure.in 2010-06-13 13:52:21.002883584 +0000 ++++ abiword-2.8.6-haiku/configure.in 2011-04-14 13:24:55.000000000 +0000 +@@ -84,6 +84,9 @@ + ${gsf_req} + ${wv_req} + " ++haiku_pkgs=" ++ ${fribidi_req} ++" + + # optional deps + enchant_req='enchant >= 1.2.0' +@@ -119,6 +122,9 @@ + # win32 deps + win_pkgs="$enchant_req" + ++#haiku deps ++haiku_pkgs="" ++ + # + # System tests + # +@@ -144,6 +150,10 @@ + PLATFORM="win" + TOOLKIT="win" + ;; ++ *haiku*) ++ PLATFORM="haiku" ++ TOOLKIT="haiku" ++ ;; + *) + PLATFORM="unix" + TOOLKIT="gtk" +@@ -408,6 +418,16 @@ + fi + ]) + ++AC_ARG_WITH([haiku], ++ [AS_HELP_STRING([--with-haiku], [(Haiku only) add `finddir B_COMMON_DIRECTORY' prefix to CPP/LDFLAGS])], ++[ ++ if test "x$withval" != "xno"; then ++ CPPFLAGS="$CPPFLAGS -I`finddir B_COMMON_DIRECTORY`/include" ++ LDFLAGS="$LDFLAGS -L`finddir B_COMMON_DIRECTORY`/lib" ++ CC=$CXX ++ fi ++]) ++ + AC_ARG_WITH([fink], + [AS_HELP_STRING([--with-fink], [(Mac OSX only) add `/sw' prefix to CPP/LDFLAGS])], + [ +@@ -514,11 +534,14 @@ + deps_pkgs="$deps_pkgs $cocoa_pkgs" + SYSTEM_LIBS="-framework Cocoa" + AC_CHECK_PROG([CONVERT], [convert], convert, AC_MSG_ERROR(Cannot find ImageMagick convert)) ++elif test "$TOOLKIT" = "haiku"; then ++ deps_pkgs="$haiku_pkgs" ++ SYSTEM_LIBS="-lbe -lroot -lnetwork" + else + deps_pkgs="$deps_pkgs $gtk_pkgs" + fi + +-PKG_CHECK_MODULES(DEPS,[$deps_pkgs]) ++#PKG_CHECK_MODULES(DEPS,[$deps_pkgs]) + dnl specific gtk214 test. + if test "$TOOLKIT" = "gtk"; then + PKG_CHECK_MODULES(GTK214, gtk+-2.0 > 2.14, [abi_cv_gtk214=yes], +@@ -647,6 +670,7 @@ + AM_CONDITIONAL([TOOLKIT_COCOA], test "$TOOLKIT" == "cocoa") + AM_CONDITIONAL([TOOLKIT_GTK], test "$TOOLKIT" == "gtk") + AM_CONDITIONAL([TOOLKIT_WIN], test "$TOOLKIT" == "win") ++AM_CONDITIONAL([TOOLKIT_HAIKU], test "$TOOLKIT" == "haiku") + + if test "$enable_dynamic" == ""; then + enable_dynamic="no" +@@ -783,7 +807,7 @@ + eval $(echo "enable_$plugin")="auto" + done + else +- default_plugins="opendocument" ++ default_plugins="" + + if test "$abi_cv_disable_default_plugins" != "yes"; then + PLUGINS="$default_plugins" diff --git a/app-shells/fish/fish-1.23.1-git.bep b/app-shells/fish/fish-1.23.1-git.bep new file mode 100644 index 000000000..db9e1bea1 --- /dev/null +++ b/app-shells/fish/fish-1.23.1-git.bep @@ -0,0 +1,29 @@ +DESCRIPTION="The friendly interactive shell" +HOMEPAGE="http://ridiculousfish.com/shell/" +SRC_URI="git://git.gitorious.org/fish-shell/fish-shell.git" +#CHECKSUM_MD5="" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="app-doc/doxygen >= 1.7.4 + sys-libs/ncurses >= 5.9" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +BUILD { + cd fish-1.23.1-git + libtoolize --force --copy --install + autoconf + ./configure --without-xsel --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd fish-1.23.1-git + make install DESTDIR=${DESTDIR} +} + +TEST { + cd fish-1.23.1-git + make test +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2009 Axel Liljencrantz" diff --git a/app-shells/fish/patches/fish-1.23.1-git.patch b/app-shells/fish/patches/fish-1.23.1-git.patch new file mode 100644 index 000000000..4548969ba --- /dev/null +++ b/app-shells/fish/patches/fish-1.23.1-git.patch @@ -0,0 +1,152 @@ +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 diff --git a/app-shells/zsh/patches/zsh-5.0.0.patch b/app-shells/zsh/patches/zsh-5.0.0.patch new file mode 100644 index 000000000..2d984f9a0 --- /dev/null +++ b/app-shells/zsh/patches/zsh-5.0.0.patch @@ -0,0 +1,55 @@ +diff -aur zsh-5.0.0.org/configure.ac zsh-5.0.0/configure.ac +--- zsh-5.0.0.org/configure.ac 2012-06-21 20:36:03.034865152 +0200 ++++ zsh-5.0.0/configure.ac 2012-11-04 20:38:45.770703360 +0100 +@@ -796,8 +796,8 @@ + AC_CHECK_LIB(cap, cap_get_proc) + fi + +-AC_CHECK_LIB(socket, socket) +-AC_SEARCH_LIBS(gethostbyname2, bind) ++AC_SEARCH_LIBS(socket, socket network) ++AC_SEARCH_LIBS(gethostbyname2, bind network) + + case $LIBS in + *-lbind*) +diff -aur zsh-5.0.0.org/Functions/Newuser/zsh-newuser-install zsh-5.0.0/Functions/Newuser/zsh-newuser-install +--- zsh-5.0.0.org/Functions/Newuser/zsh-newuser-install 2010-08-12 21:09:05.037224448 +0200 ++++ zsh-5.0.0/Functions/Newuser/zsh-newuser-install 2012-11-04 20:37:13.598736896 +0100 +@@ -10,14 +10,17 @@ + # How the function will be referred to. + local myname=zsh-newuser-install + +-# Quick test not requiring any setting up. +-# Don't run if we're root. (These variables are provided by the shell.) +-if (( EUID == 0 || UID == 0 )); then +- if [[ $1 = -f ]]; then +- print -r "$myname: won't run as root. Read the manual." >&2 +- fi +- return 1 +-fi ++# Haiku OS specific: We want to perform newuser configuration for ++# zero UID too! ;-) So we have to disable it by patch. ++## ++## Quick test not requiring any setting up. ++## Don't run if we're root. (These variables are provided by the shell.) ++#if (( EUID == 0 || UID == 0 )); then ++# if [[ $1 = -f ]]; then ++# print -r "$myname: won't run as root. Read the manual." >&2 ++# fi ++# return 1 ++#fi + + # clear is missing in some Cygwin configurations (lacking ncurses) + if ! ( clear >/dev/null 2>/dev/null ); then +diff -aur zsh-5.0.0.org/Src/prototypes.h zsh-5.0.0/Src/prototypes.h +--- zsh-5.0.0.org/Src/prototypes.h 2011-05-03 20:38:21.027000832 +0200 ++++ zsh-5.0.0/Src/prototypes.h 2012-11-04 21:07:23.734789632 +0100 +@@ -40,7 +40,7 @@ + * TBD: we'd much prefer to get hold of the header where + * these are defined. + */ +-#ifdef _AIX ++#if defined(_AIX) || defined(__HAIKU__) + #define TC_CONST const + #else + #define TC_CONST diff --git a/app-shells/zsh/zsh-4.3.10.bep b/app-shells/zsh/zsh-4.3.10.bep index 4f3349e3a..dda63358d 100644 --- a/app-shells/zsh/zsh-4.3.10.bep +++ b/app-shells/zsh/zsh-4.3.10.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd zsh-4.3.10 autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-shells/zsh/zsh-5.0.0.bep b/app-shells/zsh/zsh-5.0.0.bep new file mode 100644 index 000000000..107a8d4ed --- /dev/null +++ b/app-shells/zsh/zsh-5.0.0.bep @@ -0,0 +1,25 @@ +DESCRIPTION="Zsh is a shell designed for interactive use, although it is also a powerful scripting language." +HOMEPAGE="http://www.zsh.org" +SRC_URI="http://sourceforge.net/projects/zsh/files/zsh/5.0.0/zsh-5.0.0.tar.bz2/download" +REVISION="1" +CHECKSUM_MD5="e8484468925cec8d9a84b8b04797e764" +STATUS_HAIKU="unstable" +DEPEND="" +BUILD { + cd zsh-5.0.0 + autoconf + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=$COMMON_DOCS/man \ + --infodir=$COMMON_DOCS/info \ + LIBS="-lgnu" + make +} + +INSTALL { + cd zsh-5.0.0 + make install +} +LICENSE="ZSH" +COPYRIGHT="(c) 1992-2009 Paul Falstad, Richard Coleman, Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wishnowsky, and others." diff --git a/app-text/antiword/antiword-0.37.bep b/app-text/antiword/antiword-0.37.bep index 0ad1c9bf8..1f1fe561e 100644 --- a/app-text/antiword/antiword-0.37.bep +++ b/app-text/antiword/antiword-0.37.bep @@ -1,5 +1,5 @@ -DESCRIPTION="antiword is a free MS Word reader." -HOMEPAGE="http://www.winfield.demon.nl" +DESCRIPTION="Converts MS Word files to text and ps" +HOMEPAGE="http://www.winfield.demon.nl/#Programmer" SRC_URI="http://www.winfield.demon.nl/linux/antiword-0.37.tar.gz" REVISION="1" STATUS_HAIKU="stable" @@ -7,15 +7,13 @@ DEPEND="" CHECKSUM_MD5="f868e2a269edcbc06bf77e89a55898d1" BUILD { cd antiword-0.37 - make + make --makefile Makefile.haiku } INSTALL { cd antiword-0.37 - make global_install DESTDIR=${DESTDIR} \ - GLOBAL_INSTALL_DIR=`finddir B_COMMON_BIN_DIRECTORY` \ - GLOBAL_RESOURCES_DIR=`finddir B_COMMON_DATA_DIRECTORY`/antiword - + make --makefile Makefile.haiku global_install } + LICENSE="GNU GPL v2" COPYRIGHT="1998-2005 A.J. van Os" diff --git a/app-text/antiword/patches/antiword-0.37.patch b/app-text/antiword/patches/antiword-0.37.patch new file mode 100644 index 000000000..02cf41c35 --- /dev/null +++ b/app-text/antiword/patches/antiword-0.37.patch @@ -0,0 +1,116 @@ +diff -Naur antiword-0.37/antiword.h antiword-0.37-haiku/antiword.h +--- antiword-0.37/antiword.h 2005-07-06 17:46:22.000000000 +0000 ++++ antiword-0.37-haiku/antiword.h 2012-12-27 19:30:23.169607168 +0000 +@@ -211,6 +211,10 @@ + #define GLOBAL_ANTIWORD_DIR "/boot/home/config/apps/antiword" + #define ANTIWORD_DIR "antiword" + #define FONTNAMES_FILE "fontnames" ++#elif defined(__haiku) ++#define GLOBAL_ANTIWORD_DIR "/boot/common/data/antiword" ++#define ANTIWORD_DIR "antiword" ++#define FONTNAMES_FILE "fontnames" + #elif defined(__CYGMING__) + #define GLOBAL_ANTIWORD_DIR "C:\\antiword" + #define ANTIWORD_DIR "antiword" +diff -Naur antiword-0.37/Makefile.haiku antiword-0.37-haiku/Makefile.haiku +--- antiword-0.37/Makefile.haiku 1970-01-01 00:00:00.000000000 +0000 ++++ antiword-0.37-haiku/Makefile.haiku 2012-12-27 19:14:41.153092096 +0000 +@@ -0,0 +1,97 @@ ++# ++# Makefile for antiword (Haiku version) ++# ++ ++CC = gcc ++LD = gcc ++ ++INSTALL = cp -f ++INSTALL_PROGRAM = $(INSTALL) ++INSTALL_DATA = $(INSTALL) ++ ++# must be equal to DEBUG or NDEBUG ++DB = DEBUG ++# Optimization: -O or debugging: -g ++OPT = -O2 ++ ++LDLIBS = ++ ++CFLAGS = -Wall -pedantic $(OPT) -D$(DB) -D__haiku ++LDFLAGS = ++ ++OBJS =\ ++ main_u.o asc85enc.o blocklist.o chartrans.o datalist.o depot.o\ ++ dib2eps.o doclist.o fail.o finddata.o findtext.o fmt_text.o fontlist.o\ ++ fonts.o fonts_u.o hdrftrlist.o imgexam.o imgtrans.o jpeg2eps.o\ ++ listlist.o misc.o notes.o options.o out2window.o output.o pdf.o\ ++ pictlist.o png2eps.o postscript.o prop0.o prop2.o prop6.o prop8.o\ ++ properties.o propmod.o rowlist.o sectlist.o stylelist.o stylesheet.o\ ++ summary.o tabstop.o text.o unix.o utf8.o word2text.o worddos.o\ ++ wordlib.o wordmac.o wordole.o wordwin.o xmalloc.o xml.o ++ ++PROGS =\ ++ antiword\ ++ kantiword ++ ++LOCAL_INSTALL_DIR = $(HOME)/bin ++LOCAL_RESOURCES_DIR = $(HOME)/.antiword ++ ++GLOBAL_INSTALL_DIR = /boot/common/bin ++GLOBAL_RESOURCES_DIR = /boot/common/data/antiword ++ ++all: $(PROGS) ++ ++install: all ++ mkdir -p $(LOCAL_INSTALL_DIR) ++ cp -pf $(PROGS) $(LOCAL_INSTALL_DIR) ++ mkdir -p $(LOCAL_RESOURCES_DIR) ++# cp -pf Resources/* $(LOCAL_RESOURCES_DIR) ++ ++# NOTE: you might have to be root to do this ++global_install: all ++# @[ `id -u` -eq 0 ] || (echo "You must be root to do this" && false) ++ mkdir -p $(DESTDIR)$(GLOBAL_INSTALL_DIR) ++ $(INSTALL_PROGRAM) $(PROGS) $(DESTDIR)$(GLOBAL_INSTALL_DIR) ++ cd $(DESTDIR)$(GLOBAL_INSTALL_DIR); chmod 755 $(PROGS) ++ mkdir -p $(DESTDIR)$(GLOBAL_RESOURCES_DIR) ++ chmod 755 $(DESTDIR)$(GLOBAL_RESOURCES_DIR) ++ $(INSTALL_DATA) Resources/*.txt $(DESTDIR)$(GLOBAL_RESOURCES_DIR) ++ $(INSTALL_DATA) Resources/fontnames $(DESTDIR)$(GLOBAL_RESOURCES_DIR) ++ cd $(DESTDIR)$(GLOBAL_RESOURCES_DIR); chmod 644 *.txt fontnames ++ ++# NOTE: you might have to be root to do this ++global_uninstall: ++# @[ `id -u` -eq 0 ] || (echo "You must be root to do this" && false) ++ cd $(DESTDIR)$(GLOBAL_INSTALL_DIR); rm -f $(PROGS) ++ -rmdir $(DESTDIR)$(GLOBAL_INSTALL_DIR) ++ cd $(DESTDIR)$(GLOBAL_RESOURCES_DIR); rm -f *.txt fontnames ++ -rmdir $(DESTDIR)$(GLOBAL_RESOURCES_DIR) ++ ++clean: ++ rm -f $(OBJS) ++ rm -f $(PROGS) ++ ++antiword: $(OBJS) ++ @rm -f $@ ++ $(LD) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@ ++ @chmod 750 $@ ++ ++kantiword: Unix-only/KDE3-only/kantiword.sh ++ @rm -f $@ ++ echo "#!/bin/bash" > $@ ++ cat $? >> $@ ++ @chmod 750 $@ ++ ++.c.o: ++ $(CC) $(CFLAGS) -c $< ++ ++main_u.o: version.h ++postscript.o: version.h ++pdf.o: version.h ++fonts_u.o: fontinfo.h ++ ++fontinfo.h: Unix-only/fontinfo.h ++ cp -rp $? $@ ++ ++Unix-only/fontinfo.h: Unix-only/fontinfo.pl ++ Unix-only/fontinfo.pl > Unix-only/fontinfo.h + diff --git a/app-text/aspell/aspell-0.60.6.bep b/app-text/aspell/aspell-0.60.6.bep index 741c8ee9e..04b35f516 100644 --- a/app-text/aspell/aspell-0.60.6.bep +++ b/app-text/aspell/aspell-0.60.6.bep @@ -11,7 +11,7 @@ BUILD { aclocal -I m4 autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-text/convmv/convmv-1.15.bep b/app-text/convmv/convmv-1.15.bep new file mode 100644 index 000000000..8846ecc96 --- /dev/null +++ b/app-text/convmv/convmv-1.15.bep @@ -0,0 +1,29 @@ +DESCRIPTION="converts filenames from one encoding to another" +HOMEPAGE="https://www.j3e.de/linux/convmv/" +SRC_URI="https://www.j3e.de/linux/convmv/convmv-1.15.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-lang/perl >= 5.8" +CHECKSUM_MD5="b1bb703c08c6355868d15890ff193f7d" +BUILD { + cd convmv-1.15 + sed -i "s#/usr/bin/perl#`finddir B_COMMON_BIN_DIRECTORY`/perl#" convmv + make \ + PREFIX=`finddir B_COMMON_DIRECTORY` \ + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man +} + +INSTALL { + cd convmv-1.15 + make install \ + PREFIX=`finddir B_COMMON_DIRECTORY` \ + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man +} + +TEST { + cd convmv-1.15 + make test +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2003-2011 Bjoern JACKE" diff --git a/app-text/convmv/patches/convmv-1.15.patch b/app-text/convmv/patches/convmv-1.15.patch new file mode 100644 index 000000000..a326e105d --- /dev/null +++ b/app-text/convmv/patches/convmv-1.15.patch @@ -0,0 +1,19 @@ +diff -ur convmv-1.15.org/Makefile convmv-1.15/Makefile +--- convmv-1.15.org/Makefile 2008-11-29 14:49:38.012845056 +0100 ++++ convmv-1.15/Makefile 2012-04-21 02:00:10.777519104 +0200 +@@ -6,6 +6,7 @@ + SED=sed + + all: manpage ++ sed -i "s#/usr/bin/perl#`which perl`#" convmv + + install: all + mkdir -p $(DESTDIR)$(MANDIR)/man1/ +@@ -22,6 +23,7 @@ + + test: + test -d suite || $(TAR) xf testsuite.tar ++ sed -i "s#/usr/bin/perl#`which perl`#" suite/parsable_tester.pl + cd suite ; ./dotests.sh + + dist: clean diff --git a/app-text/discount/discount-2.1.3.bep b/app-text/discount/discount-2.1.3.bep new file mode 100644 index 000000000..0dbba6cc7 --- /dev/null +++ b/app-text/discount/discount-2.1.3.bep @@ -0,0 +1,21 @@ +DESCRIPTION="An implementation of John Gruber's Markdown text to html language written in C" +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="a1a4eade44f8141e38f2be7f2ed56c98" +BUILD { + cd discount-2.1.3 + ./configure.sh --prefix=$(finddir B_COMMON_DIRECTORY) \ + --mandir=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man \ + --enable-all-features + make +} + +INSTALL { + cd discount-2.1.3 + make install.everything +} +LICENSE="BSD (4-clause)" +COPYRIGHT="2007-2012 David Loren Parsons" diff --git a/app-text/ebook-tools/ebook-tools-0.2.1.bep b/app-text/ebook-tools/ebook-tools-0.2.1.bep new file mode 100644 index 000000000..b991c058e --- /dev/null +++ b/app-text/ebook-tools/ebook-tools-0.2.1.bep @@ -0,0 +1,23 @@ +DESCRIPTION="Tools for accessing and converting various ebook file formats" +HOMEPAGE="http://sourceforge.net/projects/ebook-tools/" +SRC_URI="http://sourceforge.net/projects/ebook-tools/files/ebook-tools/0.2.1/ebook-tools-0.2.1.tar.gz" +CHECKSUM_MD5="cabbd2ef9148a61ca5f6e60ca63e6045" +REVISION="1" +STATUS_HAIKU="stable" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +DEPEND="libzip >= 0.10" + +BUILD { + cd ebook-tools-0.2.1 + sed -i 's/-Wmissing-format-attribute//' CMakeLists.txt + cmake . + make +} + +INSTALL { + cd ebook-tools-0.2.1 + make install +} + +LICENSE="MIT" +COPYRIGHT="2008 Ely Levy" diff --git a/app-text/gocr/gocr-0.49.bep b/app-text/gocr/gocr-0.49.bep new file mode 100644 index 000000000..cd25998ec --- /dev/null +++ b/app-text/gocr/gocr-0.49.bep @@ -0,0 +1,26 @@ +DESCRIPTION="An OCR (Octical Character Recognition) reader" +HOMEPAGE="http://jocr.sofrceforge.net" +SRC_URI="http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="4e527bc4bdd97c2be15fdd818857507f" + +BUILD { + cd gocr-0.49 + libtoolize --force --copy --install + aclocal + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --bindir=`finddir B_COMMON_BIN_DIRECTORY` + make +} + +INSTALL { + cd gocr-0.49 + make install DESTDIR=${DESTDIR} +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2000-2010 Joerg Schulenburg" diff --git a/app-text/gocr/patches/gocr-0.49.patch b/app-text/gocr/patches/gocr-0.49.patch new file mode 100644 index 000000000..d2be483be --- /dev/null +++ b/app-text/gocr/patches/gocr-0.49.patch @@ -0,0 +1,58 @@ +diff -urN gocr-0.49-orig/configure.in gocr-0.49/configure.in +--- gocr-0.49-orig/configure.in 2010-08-04 12:33:10.000000000 +0000 ++++ gocr-0.49/configure.in 2011-06-03 13:04:26.985137152 +0000 +@@ -41,8 +41,8 @@ + # netpbm-9 : libpnm + pnm.h (+ p[bgp]m.h) + # pnm_readpaminit (netpbm-10) + # pnm_readpnminit (netpbm-9,10) +-# ToDo: how to check that -lm is needed? +-LDFLAGS="-lm $LDFLAGS" ++AC_CHECK_LIBM ++LDFLAGS="$LIBM $LDFLAGS" + AC_SEARCH_LIBS(pnm_readpnminit,[netpbm pnm],[check_netpbm_h="pam.h pnm.h"], + [ echo " * * * try option --with-netpbm=PATH"]) + fi +diff -urN gocr-0.49-orig/src/barcode.c gocr-0.49/src/barcode.c +--- gocr-0.49-orig/src/barcode.c 2010-08-04 12:03:59.000000000 +0000 ++++ gocr-0.49/src/barcode.c 2011-06-03 13:05:00.909115392 +0000 +@@ -999,8 +999,10 @@ + /* j is the num of bars found above, some inner bars are not counted */ + /* ToDo: better iterative add next nearest bars from sorted list near bars? */ + { +- int row, col; ++ int row, col, nc, nr, dm_d; ++ int cpos=0; + char *dm_bitmap=NULL; ++ char *code=0; + + // store pattern without finder pattern into dm_bitmap + dm_bitmap=(char *)malloc(4*(bx1-regx)*(by1-regy)); +@@ -1016,6 +1018,7 @@ + + /* transport the info to the gocr-output (development) */ + if (JOB->cfg.verbose) { ++ + fprintf(stderr,"\n# "); + for (col=0;col<2*bx1;col++) + if (col<=8) fprintf(stderr," %1d",col); else +@@ -1048,7 +1051,6 @@ + } + } + +- char *code=0; int cpos=0; + box2->c=PICTURE; /* BARCODE */ + code=NULL; + code=(char *)malloc(6*4*bx1*by1/8+128); /* maxlen: &#%3d; = 6 */ +@@ -1070,9 +1072,10 @@ + /* ToDo: decode and print/store barcode bars=j */ + x = +0; // col += 2 + y = +4; // row -= 2 +- int nc=2*(bx1-regx), nr=2*(by1-regy), ++ nc=2*(bx1-regx); ++ nr=2*(by1-regy); + // dm_mode=0, // ECC200-mode: 0=ASCII+digitpair, 230=C40 +- dm_d=+1; // direction right/down ++ dm_d=+1; // direction right/down + for (j=0;j<(bx1-regx)*(by1-regy)/2;j++) { // each byte + int dm_byte=0; + const int *pp; /* pointer to (const int) */ diff --git a/app-text/gpp/gpp-2.4.bep b/app-text/gpp/gpp-2.4.bep new file mode 100644 index 000000000..24a5a82b8 --- /dev/null +++ b/app-text/gpp/gpp-2.4.bep @@ -0,0 +1,24 @@ +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" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="f04c2a23312ab3d0c462c7972d1c6aa6" +BUILD { + cd gpp-2.24 + libtoolize --force --copy --install + aclocal + automake --add-missing -Wnone + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd gpp-2.24 + make install +} + +LICENSE="GPP" +COPYRIGHT="Copyright 1996–2001 Denis Auroux. Copyright 2003, 2004 Tristan Miller." diff --git a/app-text/gpp/licenses/GPP b/app-text/gpp/licenses/GPP new file mode 100644 index 000000000..1d8adb05a --- /dev/null +++ b/app-text/gpp/licenses/GPP @@ -0,0 +1,11 @@ +AUTHOR + +GPP was written by Denis Auroux . Since version 2.12 it has been maintained by Tristan Miller . + +COPYRIGHT + +Copyright © 1996–2001 Denis Auroux. +Copyright © 2003, 2004 Tristan Miller. +Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the copyright notice and this permission notice are preserved, thus giving the recipient permission to redistribute in turn. + +Permission is granted to distribute modified versions of this document, or of portions of it, under the above conditions, provided also that they carry prominent notices stating who last changed them. \ No newline at end of file diff --git a/app-text/htmldoc/htmldoc-1.8.27.bep b/app-text/htmldoc/htmldoc-1.8.27.bep new file mode 100644 index 000000000..617dbd975 --- /dev/null +++ b/app-text/htmldoc/htmldoc-1.8.27.bep @@ -0,0 +1,33 @@ +DESCRIPTION="HTMLDOC converts HTML files and web pages into index HTML, Adobe Postscript or Adobe Portable Documenrt Format files (pdf)." +HOMEPAGE="http://www.htmldoc.org" +SRC_URI="http://ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="cb45c2823e282e3cd0cc05172e305072" +BUILD { + cd htmldoc-1.8.27 + autoconf + chmod 755 configure + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --docdir=$COMMON_DOCS \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd htmldoc-1.8.27 + make install +} + +TEST { + cd htmldoc-1.8.27 +# make test +# make check +} + +#LICENSE="" +#COPYRIGHT="" diff --git a/app-text/htmldoc/patches/htmldoc-1.8.27.patch b/app-text/htmldoc/patches/htmldoc-1.8.27.patch new file mode 100644 index 000000000..a0d81716c --- /dev/null +++ b/app-text/htmldoc/patches/htmldoc-1.8.27.patch @@ -0,0 +1,124 @@ +diff -urN htmldoc-1.8.27-orig/configure.in htmldoc-1.8.27/configure.in +--- htmldoc-1.8.27-orig/configure.in 2006-08-02 19:36:53.000000000 +0000 ++++ htmldoc-1.8.27/configure.in 2011-05-23 09:05:32.608174080 +0000 +@@ -109,7 +109,7 @@ + AC_SUBST(LDFLAGS) + + AC_CHECK_LIB(m,pow) +-AC_SEARCH_LIBS(socket, socket) ++AC_SEARCH_LIBS(socket, network socket) + AC_SEARCH_LIBS(gethostbyaddr, nsl) + AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO)) + AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO)) +@@ -316,8 +316,8 @@ + bindir="$exec_prefix/bin" + fi + +-AC_DEFINE_UNQUOTED(DOCUMENTATION, "$prefix/share/doc/htmldoc") +-AC_DEFINE_UNQUOTED(HTML_DATA, "$prefix/share/htmldoc") ++AC_DEFINE_UNQUOTED(DOCUMENTATION, "$prefix/data/doc/htmldoc") ++AC_DEFINE_UNQUOTED(HTML_DATA, "$prefix/data/htmldoc") + + dnl Update compiler options... + if test -n "$GXX"; then +diff -urN htmldoc-1.8.27-orig/data/Makefile htmldoc-1.8.27/data/Makefile +--- htmldoc-1.8.27-orig/data/Makefile 2004-05-10 01:14:53.000000000 +0000 ++++ htmldoc-1.8.27/data/Makefile 2011-05-23 09:03:53.007602176 +0000 +@@ -53,11 +53,11 @@ + # + + install: +- if [ ! -d $(datadir)/htmldoc/data ]; then\ +- $(MKDIR) $(datadir)/htmldoc/data;\ ++ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\ ++ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\ + fi +- $(CP) $(FILES) $(datadir)/htmldoc/data +- $(CHMOD) ugo+r $(datadir)/htmldoc/data/* ++ $(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data ++ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/* + + + # +diff -urN htmldoc-1.8.27-orig/doc/Makefile htmldoc-1.8.27/doc/Makefile +--- htmldoc-1.8.27-orig/doc/Makefile 2005-10-28 20:32:59.000000000 +0000 ++++ htmldoc-1.8.27/doc/Makefile 2011-05-23 09:03:57.148897792 +0000 +@@ -57,16 +57,16 @@ + # + + install: $(DOCUMENTS) +- if [ ! -d $(datadir)/doc/htmldoc ]; then\ +- $(MKDIR) $(datadir)/doc/htmldoc;\ ++ if [ ! -d $(DESTDIR)$(mandir)/doc/htmldoc ]; then\ ++ $(MKDIR) $(DESTDIR)$(mandir)/doc/htmldoc;\ + fi +- $(CP) $(DOCFILES) $(datadir)/doc/htmldoc +- $(CHMOD) ugo+r $(datadir)/doc/htmldoc/* +- if [ ! -d $(mandir)/man1 ]; then\ +- $(MKDIR) $(mandir)/man1;\ ++ $(CP) $(DOCFILES) $(DESTDIR)/$(mandir)/doc/htmldoc ++ $(CHMOD) ugo+r $(DESTDIR)/$(mandir)/doc/htmldoc/* ++ if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then\ ++ $(MKDIR) $(DESTDIR)/$(mandir)/man1;\ + fi +- $(CP) htmldoc.man $(mandir)/man1/htmldoc.1 +- $(CHMOD) ugo+r $(mandir)/man1/htmldoc.1 ++ $(CP) htmldoc.man $(DESTDIR)/$(mandir)/man1/htmldoc.1 ++ $(CHMOD) ugo+r $(DESTDIR)/$(mandir)/man1/htmldoc.1 + + + # +diff -urN htmldoc-1.8.27-orig/fonts/Makefile htmldoc-1.8.27/fonts/Makefile +--- htmldoc-1.8.27-orig/fonts/Makefile 2005-10-28 20:32:59.000000000 +0000 ++++ htmldoc-1.8.27/fonts/Makefile 2011-05-23 09:04:00.721682432 +0000 +@@ -75,14 +75,14 @@ + + install: + echo "Installing font files in $(datadir)/htmldoc/fonts..." +- if [ ! -d $(datadir)/htmldoc/fonts ]; then\ +- $(MKDIR) $(datadir)/htmldoc/fonts;\ ++ if [ ! -d $(DESTDIR)/$(datadir)/htmldoc/fonts ]; then\ ++ $(MKDIR) $(DESTDIR)/$(datadir)/htmldoc/fonts;\ + fi + for font in $(FONTS); do \ +- $(CP) $$font.afm $(datadir)/htmldoc/fonts; \ +- $(CP) $$font.pfa $(datadir)/htmldoc/fonts; \ ++ $(CP) $$font.afm $(DESTDIR)/$(datadir)/htmldoc/fonts; \ ++ $(CP) $$font.pfa $(DESTDIR)/$(datadir)/htmldoc/fonts; \ + done +- $(CHMOD) ugo+r $(datadir)/htmldoc/fonts/* ++ $(CHMOD) ugo+r $(DESTDIR)/$(datadir)/htmldoc/fonts/* + + + # +diff -urN htmldoc-1.8.27-orig/htmldoc/Makefile htmldoc-1.8.27/htmldoc/Makefile +--- htmldoc-1.8.27-orig/htmldoc/Makefile 2005-10-28 20:32:59.000000000 +0000 ++++ htmldoc-1.8.27/htmldoc/Makefile 2011-05-23 09:04:04.563609600 +0000 +@@ -50,11 +50,11 @@ + # + + install: all +- if [ ! -d $(bindir) ]; then\ +- $(MKDIR) $(bindir);\ ++ if [ ! -d $(DESTDIR)/$(bindir) ]; then\ ++ $(MKDIR) $(DESTDIR)/$(bindir);\ + fi +- cp htmldoc$(EXEEXT) $(bindir) +- chmod ugo+rx $(bindir)/htmldoc$(EXEEXT) ++ cp htmldoc$(EXEEXT) $(DESTDIR)/$(bindir) ++ chmod ugo+rx $(DESTDIR)/$(bindir)/htmldoc$(EXEEXT) + + + # +diff -urN htmldoc-1.8.27-orig/htmldoc/http.h htmldoc-1.8.27/htmldoc/http.h +--- htmldoc-1.8.27-orig/htmldoc/http.h 2006-04-03 15:41:08.000000000 +0000 ++++ htmldoc-1.8.27/htmldoc/http.h 2011-05-23 09:04:08.438304768 +0000 +@@ -102,6 +102,8 @@ + # define s6_addr32 _S6_un._S6_u32 + # elif defined(__FreeBSD__) || defined(__APPLE__) + # define s6_addr32 __u6_addr.__u6_addr32 ++# elif defined(__HAIKU__) ++# define s6_addr32 s6_addr + # elif defined(__osf__) + # define s6_addr32 s6_un.sa6_laddr + # elif defined(WIN32) diff --git a/app-text/hunspell/hunspell-1.3.2.bep b/app-text/hunspell/hunspell-1.3.2.bep new file mode 100644 index 000000000..39cc9e780 --- /dev/null +++ b/app-text/hunspell/hunspell-1.3.2.bep @@ -0,0 +1,33 @@ +DESCRIPTION="hunspell - spellchecker, forked from myspell" +HOMEPAGE="http://hunspell.sourceforge.net/" +SRC_URI="http://downloads.sourceforge.net/hunspell/hunspell-1.3.2.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="3121aaf3e13e5d88dfff13fb4a5f1ab8" +BUILD { + cd hunspell-1.3.2 + libtoolize --force --copy --install + aclocal -I m4 + autoconf + automake + touch po/t-hu.gmo + touch po/t-it.gmo + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale + make +} + +INSTALL { + cd hunspell-1.3.2 + make install +} + +LICENSE="GNU GPL v2 + GNU LGPL v2.1 + MPL v1.1" + +COPYRIGHT="2007-2011 Hunspell developers et al. + 2002-2008 László Németh (Hunspell) + 2001-2002 Kevin Hendricks (MySpell)" diff --git a/app-text/libpaper/libpaper-1.1.23.bep b/app-text/libpaper/libpaper-1.1.23.bep index e83f34acc..b26f9c558 100644 --- a/app-text/libpaper/libpaper-1.1.23.bep +++ b/app-text/libpaper/libpaper-1.1.23.bep @@ -11,7 +11,7 @@ BUILD { aclocal # automake autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-text/libpaper/libpaper-1.1.24.bep b/app-text/libpaper/libpaper-1.1.24.bep index fa65f83a9..fd1521d8f 100644 --- a/app-text/libpaper/libpaper-1.1.24.bep +++ b/app-text/libpaper/libpaper-1.1.24.bep @@ -1,5 +1,5 @@ -DESCRIPTION="Library for handling paper characteristics" -HOMEPAGE="http://packages.debian.org/unstable/source/libpaper" +DESCRIPTION="Library for handling paper characteristics" +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" REVISION="1" STATUS_HAIKU="stable" @@ -10,25 +10,22 @@ BUILD { mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac libtoolize --force --copy --install - aclocal -I m4 -# automake + aclocal --install -I m4 autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ - --mandir=$MANDIR \ - --sbindir=`finddir B_COMMON_DIRECTORY` + --mandir=$COMMON_DOCS/man \ + --sbindir=$COMMON_BIN make } INSTALL { cd libpaper-1.1.24 make install + } LICENSE="GNU GPL v2" COPYRIGHT="1996 Yves Arrouye diff --git a/app-text/libwpd/libwpd-0.9.6.bep b/app-text/libwpd/libwpd-0.9.6.bep new file mode 100644 index 000000000..bc7a7bfbb --- /dev/null +++ b/app-text/libwpd/libwpd-0.9.6.bep @@ -0,0 +1,25 @@ +DESCRIPTION="libwpd - a library for importing WordPerfect (tm) documents" +HOMEPAGE="libwpd.sourceforge.net" +SRC_URI="http://prdownloads.sourceforge.net/libwpd/libwpd-0.9.6.tar.gz?download" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building" +CHECKSUM_MD5="979fc276bcecb1f3220b529ffa68d52c" +REVISION="1" +DEPEND="glib >= 2.0.0 + libgsf >= 1.6.0" +BUILD { + cd libwpd-0.9.6 + libtoolize --force --copy --install + aclocal + autoconf + automake + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd libwpd-0.9.6 + make install +} +LICENSE="GNU GPL v2" +COPYRIGHT="2002 William Lachance + 2002 Marc Maurer" diff --git a/app-text/libwpg/libwpg-0.2.1.bep b/app-text/libwpg/libwpg-0.2.1.bep new file mode 100644 index 000000000..972a5f7c4 --- /dev/null +++ b/app-text/libwpg/libwpg-0.2.1.bep @@ -0,0 +1,23 @@ +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." +CHECKSUM_MD5="7f292980b5c458a58bf89ebba1ed07b6" +REVISION="1" +DEPEND="pkg-config >= 0.2 + libwpd >= 0.8" +BUILD { + cd libwpg-0.2.1 + libtoolize --force --copy --install + aclocal + autoconf + automake + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} +INSTALL { + cd libwpg-0.2.1 + make install +} +LICENSE="GNU GPL v2" +COPYRIGHT="2007 Ariya Hidayat" diff --git a/app-text/psiconv/psiconv-0.9.8.bep b/app-text/psiconv/psiconv-0.9.8.bep index f9f901144..349302576 100644 --- a/app-text/psiconv/psiconv-0.9.8.bep +++ b/app-text/psiconv/psiconv-0.9.8.bep @@ -10,7 +10,7 @@ BUILD { libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/app-text/rman/rman-3.2.bep b/app-text/rman/rman-3.2.bep index ed42b37d8..5111df686 100644 --- a/app-text/rman/rman-3.2.bep +++ b/app-text/rman/rman-3.2.bep @@ -1,5 +1,5 @@ -DESCRIPTION="PolyGlotMan man page translator AKA RosettaMan" -HOMEPAGE="http://www.sourceforge.net/project/polyglotman" +DESCRIPTION="PolyGlotMan man page translator AKA RosettaMan" +HOMEPAGE="http://www.sourceforge.net/project/polyglotman" SRC_URI="http://downloads.sourceforge.net/project/polyglotman/polyglotman/3.2/rman-3.2.tar.gz" REVISION="1" STATUS_HAIKU="stable" @@ -7,14 +7,18 @@ DEPEND="" CHECKSUM_MD5="6d1d67641c6d042595a96a62340d3cc6" BUILD { cd rman-3.2 - make BINDIR=`finddir B_COMMON_BIN_DIRECTORY` MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` + make BINDIR=$COMMON_BIN MANDIR=$COMMON_DOCS/man } INSTALL { cd rman-3.2 - mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` - mkdir -p ${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - make install BINDIR=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` MANDIR=${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` + mkdir -p ${DESTDIR}/$COMMON_BIN + mkdir -p ${DESTDIR}/$COMMON_DOCS/man + make install BINDIR=${DESTDIR}/$COMMON_BIN MANDIR=${DESTDIR}/$COMMON_DOCS/man } LICENSE="Artistic" COPYRIGHT="2003 Thomas A. Phelps" diff --git a/app-text/sablotron/sablotron-1.0.3.bep b/app-text/sablotron/sablotron-1.0.3.bep index 1eb592e97..bac92023e 100644 --- a/app-text/sablotron/sablotron-1.0.3.bep +++ b/app-text/sablotron/sablotron-1.0.3.bep @@ -15,7 +15,7 @@ BUILD { aclocal automake --add-missing -Wnone autoconf - ./configure --prefix=`finddir B_COMMON_BIN_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } @@ -23,5 +23,6 @@ INSTALL { cd Sablot-1.0.3 make install } + LICENSE="MPL v1.1" COPYRIGHT="2000-2002 Ginger Alliance Ltd. All Rights Reserved." diff --git a/app-text/tesseract/tesseract-3.x-svn.bep b/app-text/tesseract/tesseract-3.x-svn.bep new file mode 100644 index 000000000..3b0cade1c --- /dev/null +++ b/app-text/tesseract/tesseract-3.x-svn.bep @@ -0,0 +1,29 @@ +DESCRIPTION="An OCR Engine that was developed at HP Labs between 1985 and 1995... now at Google." +HOMEPAGE="http://code.google.com/p/tesseract-ocr" +SRC_URI="svn+http://tesseract-ocr.googlecode.com/svn/trunk" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="" +#CHECKSUM_MD5="cc812a261088ea0c3d2da735be35d09f" +BUILD { + cd tesseract-3.x-svn + ./runautoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd tesseract-3.x-svn + make install +} + +TEST { + cd tesseract-ocr-3.x +# make test +# make check +} + +LICENSE="Apache v2 + GNU GPL v1" +COPYRIGHT="1985-1995 HP labs + 2011 Google Inc." diff --git a/app-text/tree/patches/tree-1.6.0.patch b/app-text/tree/patches/tree-1.6.0.patch new file mode 100644 index 000000000..56aaefc17 --- /dev/null +++ b/app-text/tree/patches/tree-1.6.0.patch @@ -0,0 +1,28 @@ +diff -Naur tree-1.6.0/Makefile tree-1.6.0-haiku/Makefile +--- tree-1.6.0/Makefile 2011-06-24 16:25:27.060030976 +0200 ++++ tree-1.6.0-haiku/Makefile 2011-12-18 01:40:48.786169856 +0100 +@@ -31,8 +31,8 @@ + + # Linux defaults: + #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-CFLAGS=-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +-LDFLAGS=-s ++#CFLAGS=-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++#LDFLAGS=-s + + # Uncomment for FreeBSD: + #CFLAGS=-O2 -Wall -fomit-frame-pointer +@@ -58,6 +58,13 @@ + #LDFLAGS= + #OBJS+=strverscmp.o + ++# Uncomment for Haiku: ++prefix=$(shell finddir B_COMMON_DIRECTORY) ++MANDIR=$(shell finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1 ++CFLAGS=-O2 -Wall -fomit-frame-pointer ++LDFLAGS= ++OBJS+=strverscmp.o ++ + # Uncomment for HP/UX: + #CC=cc + #CFLAGS=-O2 -DAportable -Wall diff --git a/app-text/tree/tree-1.6.0.bep b/app-text/tree/tree-1.6.0.bep new file mode 100644 index 000000000..fc016e3c0 --- /dev/null +++ b/app-text/tree/tree-1.6.0.bep @@ -0,0 +1,25 @@ +DESCRIPTION="Lists directories recursively, and produces an indented listing of files." +HOMEPAGE="http://mama.indstate.edu/users/ice/tree/" +SRC_URI="http://mama.indstate.edu/users/ice/tree/src/tree-1.6.0.tgz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="04e967a3f4108d50cde3b4b0e89e970a" +BUILD { + cd tree-1.6.0 + make +} + +INSTALL { + cd tree-1.6.0 + make install \ + BINDIR=${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` \ + MANDIR=${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man +} + +TEST { + # none +} + +LICENSE="GNU GPL v2" +COPYRIGHT="1996-2011 Steve Baker" diff --git a/dev-cpp/eigen/eigen-3.1.2.bep b/dev-cpp/eigen/eigen-3.1.2.bep new file mode 100644 index 000000000..3f4bab9a0 --- /dev/null +++ b/dev-cpp/eigen/eigen-3.1.2.bep @@ -0,0 +1,28 @@ +DESCRIPTION="C++ template library for linear algebra: vectors, matrices, and related algorithms" +HOMEPAGE="http://bitbucket.org/eigen" +SRC_URI="http://bitbucket.org/eigen/eigen/get/3.1.2.tar.bz2" +CHECKSUM_MD5="e9c081360dde5e7dcb8eba3c8430fde2" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd eigen-eigen-5097c01bcdc4 + mkdir build + cd build + cmake .. + make +} + +INSTALL { + cd eigen-eigen-5097c01bcdc4/build + make install +} + +TEST { + cd eigen-eigen-5097c01bcdc4/build + make check +} + +LICENSE="MPL v2" +COPYRIGHT="2006-2011 Benoit Jacob + 2008-2012 Gael Guennebaud, et al." diff --git a/dev-cpp/eigen/licenses/MPL v2 b/dev-cpp/eigen/licenses/MPL v2 new file mode 100644 index 000000000..14e2f777f --- /dev/null +++ b/dev-cpp/eigen/licenses/MPL v2 @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/dev-cpp/glog/glog-0.3.3.bep b/dev-cpp/glog/glog-0.3.3.bep new file mode 100644 index 000000000..381e22ec0 --- /dev/null +++ b/dev-cpp/glog/glog-0.3.3.bep @@ -0,0 +1,28 @@ +DESCRIPTION="Google's C++ logging library" +HOMEPAGE="http://code.google.com/p/google-glog/" +SRC_URI="http://google-glog.googlecode.com/files/glog-0.3.3.tar.gz" +CHECKSUM_MD5="a6fd2c22f8996846e34c763422717c18" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." + +BUILD { + cd glog-0.3.3 + sed -i 's/docdir = $(prefix)\/share/docdir = \/boot\/common\/documentation/g' Makefile.am + libtoolize --force --copy --install + aclocal -I m4 + autoconf + DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --docdir=${DOCDIR} + make +} + +INSTALL { + cd glog-0.3.3 + make install +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="1999-2013 Google Inc." diff --git a/dev-cpp/mm-common/mm-common-0.9.2.bep b/dev-cpp/mm-common/mm-common-0.9.2.bep index 519b2c163..de0845cf9 100644 --- a/dev-cpp/mm-common/mm-common-0.9.2.bep +++ b/dev-cpp/mm-common/mm-common-0.9.2.bep @@ -8,7 +8,7 @@ CHECKSUM_MD5="87dedc889b8d642b616813f23ed8c9f9" BUILD { cd mm-common-0.9.2 autoreconf --force --install --verbose - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-cpp/mxml/mxml-2.6.bep b/dev-cpp/mxml/mxml-2.6.bep index 1ae13c577..eef7b918a 100644 --- a/dev-cpp/mxml/mxml-2.6.bep +++ b/dev-cpp/mxml/mxml-2.6.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd mxml-2.6 - ./configure --prefix=/boot/common --enable-shared + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared make } diff --git a/dev-db/mysql/mysql-5.0.83.bep b/dev-db/mysql/mysql-5.0.83.bep new file mode 100644 index 000000000..85a0b2dac --- /dev/null +++ b/dev-db/mysql/mysql-5.0.83.bep @@ -0,0 +1,23 @@ +DESCRIPTION="SQL database server." +HOMEPAGE="http://www.mysql.com" +SRC_URI="http://mirror.provenscaling.com/mysql/community/source/5.0/mysql-5.0.83.tar.gz" +CHECKSUM_MD5="051392064a1e32cca5c23a593908b10e" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="sys-libs/readline >= 5.2" + +BUILD { + cd mysql-5.0.83 + libtoolize --force --install --copy + aclocal + autoconf + ./configure --without-readline CFLAGS=-O2 --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd mysql-5.0.83 + make install +} +LICENSE="GNU GPL v2" +COPYRIGHT="2000, 2012, Oracle and/or its affiliates. All rights reserved." diff --git a/dev-db/mysql/patches/mysql-5.0.83.patch b/dev-db/mysql/patches/mysql-5.0.83.patch new file mode 100644 index 000000000..0978e69fe --- /dev/null +++ b/dev-db/mysql/patches/mysql-5.0.83.patch @@ -0,0 +1,101 @@ +diff -Naur mysql-5.0.83/configure.in mysql-5.0.83-haiku/configure.in +--- mysql-5.0.83/configure.in 2009-05-29 18:15:45.000000000 +0000 ++++ mysql-5.0.83-haiku/configure.in 2012-12-04 18:14:48.000000000 +0000 +@@ -884,7 +884,8 @@ + AC_CHECK_LIB(nsl, gethostbyname_r)) + AC_CHECK_FUNC(gethostbyname_r) + +-AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt)) ++AC_SEARCH_LIBS(socket, [socket network]) ++AC_SEARCH_LIBS(setsockopt,[socket network]) + AC_CHECK_FUNC(yp_get_default_domain, , + AC_CHECK_LIB(nsl, yp_get_default_domain)) + AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open)) +@@ -893,7 +894,7 @@ + # Check if crypt() exists in libc or libcrypt, sets LIBS if needed + AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt])) + # See if we need a library for address lookup. +-AC_SEARCH_LIBS(inet_aton, [socket nsl resolv]) ++AC_SEARCH_LIBS(inet_aton, [socket nsl resolv network]) + + # For the sched_yield() function on Solaris + AC_CHECK_FUNC(sched_yield, , AC_CHECK_LIB(posix4, sched_yield)) +@@ -1939,6 +1940,13 @@ + MYSQL_CHECK_TIME_T + + ++ ++AC_CHECK_MEMBERS([struct rusage.ru_maxrss, struct rusage.ru_idrss, struct rusage.ru_minflt, struct rusage.ru_majflt, ++struct rusage.ru_nswap, struct rusage.ru_inblock, struct rusage.ru_oublock, struct rusage.ru_msgsnd, struct rusage.ru_msgrcv, ++struct rusage.ru_nsignals, struct rusage.ru_nvcsw, struct rusage.ru_nivcsw ],[AC_DEFINE([ADDITIONAL_RUSAGE_MEMBERS],[1],[ ++Define 1 if structure have this members])],,) ++ ++ + # do we need #pragma interface/#pragma implementation ? + # yes if it's gcc 2.x, and not icc pretending to be gcc, and not cygwin + AC_MSG_CHECKING(the need for @%:@pragma interface/implementation) +diff -Naur mysql-5.0.83/dbug/dbug_analyze.c mysql-5.0.83-haiku/dbug/dbug_analyze.c +--- mysql-5.0.83/dbug/dbug_analyze.c 2009-05-29 18:15:46.000000000 +0000 ++++ mysql-5.0.83-haiku/dbug/dbug_analyze.c 2012-12-02 12:17:35.000000000 +0000 +@@ -100,13 +100,13 @@ + while(0) + + +-struct stack_t { ++struct my_stack_t { + unsigned int pos; /* which function? */ + unsigned long time; /* Time that this was entered */ + unsigned long children; /* Time spent in called funcs */ + }; + +-static struct stack_t fn_stack[STACKSIZ+1]; ++static struct my_stack_t fn_stack[STACKSIZ+1]; + + static unsigned int stacktop = 0; /* Lowest stack position is a dummy */ + +@@ -130,7 +130,7 @@ + register unsigned int name_pos; + register unsigned long time_entered; + { +- register struct stack_t *t; ++ register struct my_stack_t *t; + + DBUG_ENTER("push"); + if (++stacktop > STACKSIZ) { +@@ -157,7 +157,7 @@ + register unsigned long *time_entered; + register unsigned long *child_time; + { +- register struct stack_t *temp; ++ register struct my_stack_t *temp; + register unsigned int rtnval; + + DBUG_ENTER ("pop"); +@@ -313,7 +313,7 @@ + unsigned int oldpos; + unsigned long oldtime; + unsigned long oldchild; +- struct stack_t *t; ++ struct my_stack_t *t; + + DBUG_ENTER ("process"); + while (fgets (buf,BUFSIZ,inf) != NULL) { +diff -Naur mysql-5.0.83/mysys/my_init.c mysql-5.0.83-haiku/mysys/my_init.c +--- mysql-5.0.83/mysys/my_init.c 2009-05-29 18:18:19.000000000 +0000 ++++ mysql-5.0.83-haiku/mysys/my_init.c 2012-12-04 18:16:27.368050176 +0000 +@@ -162,6 +162,7 @@ + /* Purify assumes that rus is uninitialized after getrusage call */ + bzero((char*) &rus, sizeof(rus)); + #endif ++#ifdef ADDITIONAL_RUSAGE_MEMBERS + if (!getrusage(RUSAGE_SELF, &rus)) + fprintf(info_file,"\n\ + User time %.2f, System time %.2f\n\ +@@ -179,6 +180,7 @@ + rus.ru_msgsnd, rus.ru_msgrcv, rus.ru_nsignals, + rus.ru_nvcsw, rus.ru_nivcsw); + #endif ++#endif + #if ( defined(MSDOS) || defined(__NETWARE__) ) && !defined(__WIN__) + fprintf(info_file,"\nRun time: %.1f\n",(double) clock()/CLOCKS_PER_SEC); + #endif diff --git a/dev-db/postgresql/licenses/PostgreSQL b/dev-db/postgresql/licenses/PostgreSQL new file mode 100644 index 000000000..b773b4d9c --- /dev/null +++ b/dev-db/postgresql/licenses/PostgreSQL @@ -0,0 +1,23 @@ +PostgreSQL Database Management System +(formerly known as Postgres, then as Postgres95) + +Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group + +Portions Copyright (c) 1994, The Regents of the University of California + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement +is hereby granted, provided that the above copyright notice and this +paragraph and the following two paragraphs appear in all copies. + +IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR +DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING +LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS +DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS +ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO +PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. diff --git a/dev-db/postgresql/patches/postgresql-9.0.4.patch b/dev-db/postgresql/patches/postgresql-9.0.4.patch new file mode 100644 index 000000000..651ad6111 --- /dev/null +++ b/dev-db/postgresql/patches/postgresql-9.0.4.patch @@ -0,0 +1,19 @@ +diff -urN postgresql-9.0.4/configure.in postgresql-9.0.4-haiku/configure.in +--- postgresql-9.0.4/configure.in 2011-04-15 03:15:53.000000000 +0000 ++++ postgresql-9.0.4-haiku/configure.in 2011-07-15 16:30:31.934543360 +0000 +@@ -861,7 +861,7 @@ + AC_CHECK_LIB(m, main) + AC_SEARCH_LIBS(setproctitle, util) + AC_SEARCH_LIBS(dlopen, dl) +-AC_SEARCH_LIBS(socket, [socket wsock32]) ++AC_SEARCH_LIBS(socket, [socket wsock32 network]) + AC_SEARCH_LIBS(shl_load, dld) + # We only use libld in port/dynloader/aix.c + case $host_os in +diff -urN postgresql-9.0.4/src/template/haiku postgresql-9.0.4-haiku/src/template/haiku +--- postgresql-9.0.4/src/template/haiku 1970-01-01 00:00:00.000000000 +0000 ++++ postgresql-9.0.4-haiku/src/template/haiku 2011-07-15 16:26:54.707264512 +0000 +@@ -0,0 +1,3 @@ ++case $host_os in ++ haiku*) ;; ++esac diff --git a/dev-db/postgresql/patches/postgresql-9.2.3.patch b/dev-db/postgresql/patches/postgresql-9.2.3.patch new file mode 100644 index 000000000..6bffb5c94 --- /dev/null +++ b/dev-db/postgresql/patches/postgresql-9.2.3.patch @@ -0,0 +1,19 @@ +diff -urN postgresql-9.2.3/configure.in postgresql-9.2.3-haiku/configure.in +--- postgresql-9.2.3/configure.in ++++ postgresql-9.2.3-haiku/configure.in +@@ -861,7 +861,7 @@ + AC_CHECK_LIB(m, main) + AC_SEARCH_LIBS(setproctitle, util) + AC_SEARCH_LIBS(dlopen, dl) +-AC_SEARCH_LIBS(socket, [socket wsock32]) ++AC_SEARCH_LIBS(socket, [socket wsock32 network]) + AC_SEARCH_LIBS(shl_load, dld) + # We only use libld in port/dynloader/aix.c + case $host_os in +diff -urN postgresql-9.2.3/src/template/haiku postgresql-9.2.3-haiku/src/template/haiku +--- postgresql-9.2.3/src/template/haiku ++++ postgresql-9.2.3-haiku/src/template/haiku +@@ -0,0 +1,3 @@ ++case $host_os in ++ haiku*) ;; ++esac diff --git a/dev-db/postgresql/postgresql-9.0.4.bep b/dev-db/postgresql/postgresql-9.0.4.bep new file mode 100644 index 000000000..dc88cb0b8 --- /dev/null +++ b/dev-db/postgresql/postgresql-9.0.4.bep @@ -0,0 +1,27 @@ +DESCRIPTION="PostgreSQL is a powerful, open source object-relational database system." +HOMEPAGE="http://www.postgresql.org/" +SRC_URI="http://wwwmaster.postgresql.org/redir/198/f/source/v9.0.4/postgresql-9.0.4.tar.bz2" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="dev-libs/libedit >= 20100424" +CHECKSUM_MD5="80390514d568a7af5ab61db1cda27e29" +BUILD { + cd postgresql-9.0.4 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-template=haiku + make +} + +INSTALL { + cd postgresql-9.0.4 + make install +} + +TEST { + cd postgresql-9.0.4 +# make test +# make check +} + +LICENSE="PostgreSQL" +COPYRIGHT="1996-2010, PostgreSQL Global Development Group + 1994, The Regents of the University of California" diff --git a/dev-db/postgresql/postgresql-9.2.3.bep b/dev-db/postgresql/postgresql-9.2.3.bep new file mode 100644 index 000000000..6f12c132d --- /dev/null +++ b/dev-db/postgresql/postgresql-9.2.3.bep @@ -0,0 +1,27 @@ +DESCRIPTION="PostgreSQL is 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" +STATUS_HAIKU="broken" +DEPEND="dev-libs/libedit >= 20100424" +CHECKSUM_MD5="59f42a93695b0186ed5eb03c2653a7d4" +BUILD { + cd postgresql-9.2.3 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-template=haiku + make +} + +INSTALL { + cd postgresql-9.2.3 + make install +} + +TEST { + cd postgresql-9.2.3 +# make test +# make check +} + +LICENSE="PostgreSQL" +COPYRIGHT="1996-2012, PostgreSQL Global Development Group + 1994, The Regents of the University of California" diff --git a/dev-db/redis/patches/redis-2.2.11.patch b/dev-db/redis/patches/redis-2.2.11.patch new file mode 100644 index 000000000..e67eccbc9 --- /dev/null +++ b/dev-db/redis/patches/redis-2.2.11.patch @@ -0,0 +1,82 @@ +diff --git redis-2.2.11/deps/hiredis/Makefile redis-2.2.11/deps/hiredis/Makefile +index b186e75..345a15d 100644 +diff --git redis-2.2.11/deps/hiredis/Makefile redis-2.2.11/deps/hiredis/Makefile +index 2a84b9b..9d50572 100644 +--- redis-2.2.11/deps/hiredis/Makefile ++++ redis-2.2.11/deps/hiredis/Makefile +@@ -26,6 +26,15 @@ ifeq ($(uname_S),Darwin) + STLIBNAME?=libhiredis.a + STLIB_MAKE_CMD?=libtool -static -o ${STLIBNAME} - ${OBJ} + else ++ifeq ($(uname_S),Haiku) ++ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF) ++ CCLINK?=-lroot -lnetwork ++ LDFLAGS?=-L. -Wl,-rpath,. ++ DYLIBNAME?=libhiredis.so ++ DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,${DYLIBNAME} -o ${DYLIBNAME} ${OBJ} ++ STLIBNAME?=libhiredis.a ++ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} ++else + CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF) + CCLINK?=-lm -pthread + LDFLAGS?=-L. -Wl,-rpath,. +diff --git redis-2.2.11/src/Makefile redis-2.2.11/src/Makefile +index 292255c..51d2910 100644 +--- redis-2.2.11/src/Makefile ++++ redis-2.2.11/src/Makefile +@@ -15,7 +15,12 @@ endif + ifeq ($(uname_S),SunOS) + CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6 + CCLINK?=-ldl -lnsl -lsocket -lm -lpthread +- DEBUG?=-g -ggdb ++ DEBUG?=-g -ggdb ++else ++ifeq ($(uname_S),Haiku) ++ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF) ++ CCLINK?=-lroot -lnetwork ++ DEBUG?=-g -ggdb + else + CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF) + CCLINK?=-lm -pthread +-- + +diff --git redis-2.2.11/src/aof.c redis-2.2.11/src/aof.c +index e30c77f..2403e83 100644 +--- redis-2.2.11/src/aof.c ++++ redis-2.2.11/src/aof.c +@@ -23,7 +23,7 @@ void stopAppendOnly(void) { + int statloc; + + if (kill(server.bgsavechildpid,SIGKILL) != -1) +- wait3(&statloc,0,NULL); ++ waitpid(&statloc,0,NULL); + /* reset the buffer accumulating changes while the child saves */ + sdsfree(server.bgrewritebuf); + server.bgrewritebuf = sdsempty(); +diff --git redis-2.2.11/src/redis.c redis-2.2.11/src/redis.c +index 45be893..b7d1b0b 100644 +--- redis-2.2.11/src/redis.c ++++ redis-2.2.11/src/redis.c +@@ -589,7 +589,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) { + int statloc; + pid_t pid; + +- if ((pid = wait3(&statloc,WNOHANG,NULL)) != 0) { ++ if ((pid = waitpid(&statloc,WNOHANG,NULL)) != 0) { + if (pid == server.bgsavechildpid) { + backgroundSaveDoneHandler(statloc); + } else { +diff --git redis-2.2.11/src/sha1.c redis-2.2.11/src/sha1.c +index 2c50433..312c777 100644 +--- redis-2.2.11/src/sha1.c ++++ redis-2.2.11/src/sha1.c +@@ -27,6 +27,9 @@ A million repetitions of "a" + #if defined(__sun) + #include "solarisfixes.h" + #endif ++#ifdef __HAIKU__ ++#include ++#endif + #include "sha1.h" + + #ifndef BYTE_ORDER diff --git a/dev-db/redis/patches/redis-2.9.0-git.patch b/dev-db/redis/patches/redis-2.9.0-git.patch new file mode 100644 index 000000000..3d0bb4f81 --- /dev/null +++ b/dev-db/redis/patches/redis-2.9.0-git.patch @@ -0,0 +1,105 @@ +diff --git redis-2.9.0-git/deps/hiredis/Makefile redis-2.9.0-git/deps/hiredis/Makefile +index 2a84b9b..1225539 100644 +--- redis-2.9.0-git/deps/hiredis/Makefile ++++ redis-2.9.0-git/deps/hiredis/Makefile +@@ -26,6 +26,15 @@ ifeq ($(uname_S),Darwin) + STLIBNAME?=libhiredis.a + STLIB_MAKE_CMD?=libtool -static -o ${STLIBNAME} - ${OBJ} + else ++ifeq ($(uname_S),Haiku) ++ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF) ++ CCLINK?=-lroot -lnetwork ++ LDFLAGS?=-L. -Wl,-rpath,. ++ DYLIBNAME?=libhiredis.so ++ DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,${DYLIBNAME} -o ${DYLIBNAME} ${OBJ} ++ STLIBNAME?=libhiredis.a ++ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} ++else + CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF) + CCLINK?=-lm -pthread + LDFLAGS?=-L. -Wl,-rpath,. +@@ -35,6 +44,7 @@ else + STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} + endif + endif ++endif + + CCOPT= $(CFLAGS) $(CCLINK) + DEBUG?= -g -ggdb +diff --git redis-2.9.0-git/src/Makefile redis-2.9.0-git/src/Makefile +index 292255c..e6a6d87 100644 +--- redis-2.9.0-git/src/Makefile ++++ redis-2.9.0-git/src/Makefile +@@ -15,12 +15,18 @@ endif + ifeq ($(uname_S),SunOS) + CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6 + CCLINK?=-ldl -lnsl -lsocket -lm -lpthread +- DEBUG?=-g -ggdb ++ DEBUG?=-g -ggdb ++else ++ifeq ($(uname_S),Haiku) ++ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF) ++ CCLINK?=-lroot -lnetwork ++ DEBUG?=-g -ggdb + else + CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF) + CCLINK?=-lm -pthread + DEBUG?=-g -rdynamic -ggdb + endif ++endif + + ifeq ($(USE_TCMALLOC),yes) + ALLOD_DEPS= +diff --git redis-2.9.0-git/src/aof.c redis-2.9.0-git/src/aof.c +index dbd0468..7a5d21f 100644 +--- redis-2.9.0-git/src/aof.c ++++ redis-2.9.0-git/src/aof.c +@@ -25,7 +25,7 @@ void stopAppendOnly(void) { + int statloc; + + if (kill(server.bgrewritechildpid,SIGKILL) != -1) +- wait3(&statloc,0,NULL); ++ waitpid(&statloc,0,NULL); + /* reset the buffer accumulating changes while the child saves */ + sdsfree(server.bgrewritebuf); + server.bgrewritebuf = sdsempty(); +diff --git redis-2.9.0-git/src/redis.c redis-2.9.0-git/src/redis.c +index 1a1f84f..4ecc873 100644 +--- redis-2.9.0-git/src/redis.c ++++ redis-2.9.0-git/src/redis.c +@@ -646,7 +646,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) { + int statloc; + pid_t pid; + +- if ((pid = wait3(&statloc,WNOHANG,NULL)) != 0) { ++ if ((pid = waitpid(&statloc,WNOHANG,NULL)) != 0) { + int exitcode = WEXITSTATUS(statloc); + int bysignal = 0; + +diff --git redis-2.9.0-git/src/sha1.c redis-2.9.0-git/src/sha1.c +index 26a5565..e90812e 100644 +--- redis-2.9.0-git/src/sha1.c ++++ redis-2.9.0-git/src/sha1.c +@@ -27,6 +27,9 @@ A million repetitions of "a" + #if defined(__sun) + #include "solarisfixes.h" + #endif ++#ifdef __HAIKU__ ++#include ++#endif + #include "sha1.h" + #include "config.h" + +diff --git redis-2.9.0-git/src/util.c redis-2.9.0-git/src/util.c +index f5a23af..2a6d18d 100644 +--- redis-2.9.0-git/src/util.c ++++ redis-2.9.0-git/src/util.c +@@ -317,7 +317,7 @@ int d2string(char *buf, size_t len, double value) { + * integer printing function that is much faster. */ + double min = -4503599627370495; /* (2^52)-1 */ + double max = 4503599627370496; /* -(2^52) */ +- if (val > min && val < max && value == ((double)((long long)value))) ++ if (value > min && value < max && value == ((double)((long long)value))) + len = ll2string(buf,len,(long long)value); + else + #endif diff --git a/dev-db/redis/redis-2.2.11.bep b/dev-db/redis/redis-2.2.11.bep new file mode 100644 index 000000000..86f637606 --- /dev/null +++ b/dev-db/redis/redis-2.2.11.bep @@ -0,0 +1,20 @@ +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." +SRC_URI= "http://redis.googlecode.com/files/redis-2.2.11.tar.gz" +REVISION = "1" +DEPEND="" +CHECKSUM_MD5= "5501c90ca02ae7ea93c34f067b3e0619" +STATUS_HAIKU="broken" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +BUILD { + cd redis-2.2.11 + make PREFIX=`finddir B_COMMON_DIRECTORY` +} + +INSTALL { + cd redis-2.2.11 + make install PREFIX=`finddir B_COMMON_DIRECTORY` +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="2006-2010 Salvatore Sanfilippo" \ No newline at end of file diff --git a/dev-db/redis/redis-2.9.0-git.bep b/dev-db/redis/redis-2.9.0-git.bep new file mode 100644 index 000000000..c4b1ac78a --- /dev/null +++ b/dev-db/redis/redis-2.9.0-git.bep @@ -0,0 +1,20 @@ +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." +SRC_URI= "git://github.com/antirez/redis.git" +REVISION = "1" +DEPEND="" +STATUS_HAIKU="stable" +# CHECKSUM_MD5= "5501c90ca02ae7ea93c34f067b3e0619" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +BUILD { + cd redis-2.9.0-git + make PREFIX=`finddir B_COMMON_DIRECTORY` +} + +INSTALL { + cd redis-2.9.0-git + make install PREFIX=`finddir B_COMMON_DIRECTORY` +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="2006-2010 Salvatore Sanfilippo" \ No newline at end of file diff --git a/dev-db/sqlite/patches/sqlite-3.7.13.patch b/dev-db/sqlite/patches/sqlite-3.7.13.patch new file mode 100644 index 000000000..f10fed2f8 --- /dev/null +++ b/dev-db/sqlite/patches/sqlite-3.7.13.patch @@ -0,0 +1,20 @@ +diff -urN sqlite-autoconf-3071300/shell.c sqlite-autoconf-3071300-haiku/shell.c +--- sqlite-autoconf-3071300/shell.c 2012-06-11 02:33:44.060817408 -0700 ++++ sqlite-autoconf-3071300-haiku/shell.c 2012-06-15 22:51:13.171704320 -0700 +@@ -2694,7 +2694,6 @@ + */ + static char *find_home_dir(void){ + static char *home_dir = NULL; +- if( home_dir ) return home_dir; + + #if !defined(_WIN32) && !defined(WIN32) && !defined(__OS2__) && !defined(_WIN32_WCE) && !defined(__RTP__) && !defined(_WRS_KERNEL) + struct passwd *pwent; +@@ -2704,6 +2703,8 @@ + } + #endif + ++ if( home_dir ) return home_dir; ++ + #if defined(_WIN32_WCE) + /* Windows CE (arm-wince-mingw32ce-gcc) does not provide getenv() + */ diff --git a/dev-db/sqlite/sqlite-3.6.22.bep b/dev-db/sqlite/sqlite-3.6.22.bep index e752e3a8e..5095f9226 100644 --- a/dev-db/sqlite/sqlite-3.6.22.bep +++ b/dev-db/sqlite/sqlite-3.6.22.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-db/sqlite/sqlite-3.6.23.bep b/dev-db/sqlite/sqlite-3.6.23.bep index 7138b6f73..407412de8 100644 --- a/dev-db/sqlite/sqlite-3.6.23.bep +++ b/dev-db/sqlite/sqlite-3.6.23.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-db/sqlite/sqlite-3.7.13.bep b/dev-db/sqlite/sqlite-3.7.13.bep new file mode 100644 index 000000000..f7a717d95 --- /dev/null +++ b/dev-db/sqlite/sqlite-3.7.13.bep @@ -0,0 +1,26 @@ +DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." +HOMEPAGE="http://www.sqlite.org/" +SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="c97df403e8a3d5b67bb408fcd6aabd8e" +BUILD { + cd sqlite-autoconf-3071300 + libtoolize --force --copy --install + aclocal + autoconf + automake + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd sqlite-autoconf-3071300 + make install +} + +LICENSE="SQLite" +COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.15.1.bep b/dev-db/sqlite/sqlite-3.7.15.1.bep new file mode 100644 index 000000000..b8c740e4f --- /dev/null +++ b/dev-db/sqlite/sqlite-3.7.15.1.bep @@ -0,0 +1,26 @@ +DESCRIPTION="Software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." +HOMEPAGE="http://www.sqlite.org/" +SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071501.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="a67c25afa199a11f0a37aff7ed9d2c14" +BUILD { + cd sqlite-autoconf-3071501 + libtoolize --force --copy --install + aclocal + autoconf + automake + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd sqlite-autoconf-3071501 + make install +} + +LICENSE="SQLite" +COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.2.bep b/dev-db/sqlite/sqlite-3.7.2.bep index b86a25587..9741f2403 100644 --- a/dev-db/sqlite/sqlite-3.7.2.bep +++ b/dev-db/sqlite/sqlite-3.7.2.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-db/sqlite/sqlite-3.7.3.bep b/dev-db/sqlite/sqlite-3.7.3.bep index 43f867472..77252fc92 100644 --- a/dev-db/sqlite/sqlite-3.7.3.bep +++ b/dev-db/sqlite/sqlite-3.7.3.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-db/sqlite/sqlite-3.7.4.bep b/dev-db/sqlite/sqlite-3.7.4.bep index 0c0845152..81686d062 100644 --- a/dev-db/sqlite/sqlite-3.7.4.bep +++ b/dev-db/sqlite/sqlite-3.7.4.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-db/sqlite/sqlite-3.7.6.2.bep b/dev-db/sqlite/sqlite-3.7.6.2.bep new file mode 100644 index 000000000..55cf7dd3c --- /dev/null +++ b/dev-db/sqlite/sqlite-3.7.6.2.bep @@ -0,0 +1,26 @@ +DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." +HOMEPAGE="http://www.sqlite.org/" +SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070602.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="f16c08617968b4087b3d591fd575f59f" +BUILD { + cd sqlite-autoconf-3070602 + libtoolize --force --copy --install + aclocal + autoconf + automake + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd sqlite-autoconf-3070602 + make install +} + +LICENSE="SQLite" +COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.7.1.bep b/dev-db/sqlite/sqlite-3.7.7.1.bep new file mode 100644 index 000000000..a46b764d7 --- /dev/null +++ b/dev-db/sqlite/sqlite-3.7.7.1.bep @@ -0,0 +1,26 @@ +DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." +HOMEPAGE="http://www.sqlite.org/" +SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="554026fe7fac47b1cf61c18d5fe43419" +BUILD { + cd sqlite-autoconf-3070701 + libtoolize --force --copy --install + aclocal + autoconf + automake + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd sqlite-autoconf-3070701 + make install +} + +LICENSE="SQLite" +COPYRIGHT="Public Domain" diff --git a/dev-embedded/u-boot-tools/patches/u-boot-tools-2012.10.patch b/dev-embedded/u-boot-tools/patches/u-boot-tools-2012.10.patch new file mode 100644 index 000000000..fc0aff4d6 --- /dev/null +++ b/dev-embedded/u-boot-tools/patches/u-boot-tools-2012.10.patch @@ -0,0 +1,120 @@ +diff -ur u-boot-2012.10/common/image.c tmp/u-boot-2012.10/common/image.c +--- u-boot-2012.10/common/image.c 2012-11-08 10:52:02.774111232 +0100 ++++ tmp/u-boot-2012.10/common/image.c 2012-10-15 17:14:08.046399488 +0200 +@@ -71,7 +71,7 @@ + #include "mkimage.h" + #include + #include +-#include ++#include + #endif /* !USE_HOSTCC*/ + + static const table_entry_t uimage_arch[] = { +diff -ur u-boot-2012.10/tools/aisimage.c tmp/u-boot-2012.10/tools/aisimage.c +--- u-boot-2012.10/tools/aisimage.c 2012-11-08 10:48:20.923271168 +0100 ++++ tmp/u-boot-2012.10/tools/aisimage.c 2012-10-15 17:14:08.063176704 +0200 +@@ -26,7 +26,7 @@ + + #include "mkimage.h" + #include "aisimage.h" +-#include ++#include + + #define IS_FNC_EXEC(c) (cmd_table[c].AIS_cmd == AIS_CMD_FNLOAD) + #define WORD_ALIGN0 4 +diff -ur u-boot-2012.10/tools/default_image.c tmp/u-boot-2012.10/tools/default_image.c +--- u-boot-2012.10/tools/default_image.c 2012-11-08 10:48:39.345505792 +0100 ++++ tmp/u-boot-2012.10/tools/default_image.c 2012-10-15 17:14:08.066060288 +0200 +@@ -28,7 +28,7 @@ + */ + + #include "mkimage.h" +-#include ++#include + #include + + static image_header_t header; +diff -ur u-boot-2012.10/tools/fit_image.c tmp/u-boot-2012.10/tools/fit_image.c +--- u-boot-2012.10/tools/fit_image.c 2012-11-08 10:48:56.498860032 +0100 ++++ tmp/u-boot-2012.10/tools/fit_image.c 2012-10-15 17:14:08.000786432 +0200 +@@ -28,7 +28,7 @@ + */ + + #include "mkimage.h" +-#include ++#include + #include + + static image_header_t header; +diff -ur u-boot-2012.10/tools/imximage.c tmp/u-boot-2012.10/tools/imximage.c +--- u-boot-2012.10/tools/imximage.c 2012-11-08 10:52:34.872677376 +0100 ++++ tmp/u-boot-2012.10/tools/imximage.c 2012-10-15 17:14:08.003145728 +0200 +@@ -29,7 +29,7 @@ + #define _GNU_SOURCE + + #include "mkimage.h" +-#include ++#include + #include "imximage.h" + + /* +diff -ur u-boot-2012.10/tools/kwbimage.c tmp/u-boot-2012.10/tools/kwbimage.c +--- u-boot-2012.10/tools/kwbimage.c 2012-11-08 10:52:53.073662464 +0100 ++++ tmp/u-boot-2012.10/tools/kwbimage.c 2012-10-15 17:14:08.003407872 +0200 +@@ -26,7 +26,7 @@ + #define _GNU_SOURCE + + #include "mkimage.h" +-#include ++#include + #include "kwbimage.h" + + /* +diff -ur u-boot-2012.10/tools/mkimage.c tmp/u-boot-2012.10/tools/mkimage.c +--- u-boot-2012.10/tools/mkimage.c 2012-11-08 10:55:06.533463040 +0100 ++++ tmp/u-boot-2012.10/tools/mkimage.c 2012-10-15 17:14:08.005505024 +0200 +@@ -22,7 +22,7 @@ + */ + + #include "mkimage.h" +-#include ++#include + #include + + static void copy_file(int, const char *, int); +diff -ur u-boot-2012.10/tools/omapimage.c tmp/u-boot-2012.10/tools/omapimage.c +--- u-boot-2012.10/tools/omapimage.c 2012-11-08 10:55:39.680525824 +0100 ++++ tmp/u-boot-2012.10/tools/omapimage.c 2012-10-15 17:14:08.006291456 +0200 +@@ -34,7 +34,7 @@ + #define _GNU_SOURCE + + #include "mkimage.h" +-#include ++#include + #include "omapimage.h" + + /* Header size is CH header rounded up to 512 bytes plus GP header */ +diff -ur u-boot-2012.10/tools/pblimage.c tmp/u-boot-2012.10/tools/pblimage.c +--- u-boot-2012.10/tools/pblimage.c 2012-11-08 10:53:09.547356672 +0100 ++++ tmp/u-boot-2012.10/tools/pblimage.c 2012-10-15 17:14:08.008126464 +0200 +@@ -22,7 +22,7 @@ + #define _GNU_SOURCE + + #include "mkimage.h" +-#include ++#include + #include "pblimage.h" + + /* +diff -ur u-boot-2012.10/tools/ublimage.c tmp/u-boot-2012.10/tools/ublimage.c +--- u-boot-2012.10/tools/ublimage.c 2012-11-08 10:55:59.951844864 +0100 ++++ tmp/u-boot-2012.10/tools/ublimage.c 2012-10-15 17:14:08.009175040 +0200 +@@ -33,7 +33,7 @@ + #define _GNU_SOURCE + + #include "mkimage.h" +-#include ++#include + #include "ublimage.h" + + /* diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2012.10.bep b/dev-embedded/u-boot-tools/u-boot-tools-2012.10.bep new file mode 100644 index 000000000..5f038a90f --- /dev/null +++ b/dev-embedded/u-boot-tools/u-boot-tools-2012.10.bep @@ -0,0 +1,20 @@ +DESCRIPTION="utilities for working with Das U-Boot" +HOMEPAGE="http://www.denx.de/wiki/U-Boot/Documentation" +SRC_URI="http://ftp.denx.de/pub/u-boot/u-boot-2012.10.tar.bz2" +REVISION="1" +STATUS_HAIKU="stable" + +BUILD { + cd u-boot-2012.10 + mv include/image.h include/uimage.h + make tools +} + +INSTALL { + cd u-boot-2012.10 + cp -r /tools/mkimage /boot/common/bin/ + cp -r /tools/mkenvimage /boot/common/bin/ +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2003 - 2012 U-Boot" diff --git a/dev-games/flatzebra/flatzebra-0.1.3.bep b/dev-games/flatzebra/flatzebra-0.1.3.bep index 3a4f7fafb..d65b12935 100644 --- a/dev-games/flatzebra/flatzebra-0.1.3.bep +++ b/dev-games/flatzebra/flatzebra-0.1.3.bep @@ -13,7 +13,7 @@ BUILD { aclocal -I macros autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-games/libggz/libggz-0.99.5.bep b/dev-games/libggz/libggz-0.99.5.bep new file mode 100644 index 000000000..894a5bb2f --- /dev/null +++ b/dev-games/libggz/libggz-0.99.5.bep @@ -0,0 +1,24 @@ +DESCRIPTION="GGZ Library libggz" +HOMEPAGE="http://dev.ggzgamingzone.org/libraries/libggz/" +SRC_URI="http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/snapshots/ggz-base-libs-snapshot-0.99.5.tar.gz" +CHECKSUM_MD5="811d956fe082ee27c682c6d1c4d55142" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="dev-util/pkgconfig >= 0.23" + +BUILD { + cd ggz-base-libs-snapshot-0.99.5 + libtoolize -fci + aclocal -I m4 -I m4/ggz + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd ggz-base-libs-snapshot-0.99.5 + make install +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2003-2009 The GGZ Development Team" diff --git a/dev-games/libggz/patches/libggz-0.99.5.patch b/dev-games/libggz/patches/libggz-0.99.5.patch new file mode 100644 index 000000000..b3bd973cd --- /dev/null +++ b/dev-games/libggz/patches/libggz-0.99.5.patch @@ -0,0 +1,28 @@ +diff -Naur ggz-base-libs-snapshot-0.99.5/ggzcore/netxml.c ggz-base-libs-snapshot-0.99.5-haiku/ggzcore/netxml.c +--- ggz-base-libs-snapshot-0.99.5/ggzcore/netxml.c 2009-01-02 19:32:30.017825792 +0000 ++++ ggz-base-libs-snapshot-0.99.5/ggzcore/netxml.c 2011-06-08 19:17:54.251396096 +0000 +@@ -37,6 +37,11 @@ + #include + #include + ++#ifdef (__HAIKU__) ++#include ++#endif ++ ++ + #ifdef HAVE_WINSOCK2_H + # include + #endif + +--- ggz-base-libs-snapshot-0.99.5/m4/ggz/platform.m4 2012-12-22 15:35:37.236191744 +0000 ++++ ggz-base-libs-snapshot-0.99.5/m4/ggz/platform.m4 2012-12-22 15:26:06.672661504 +0000 +@@ -251,7 +251,9 @@ + # On some systems additional libraries may be needed. Simply include them + # if they're there. + AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"]) ++AC_CHECK_LIB(network, socket, [LIBS="$LIBS -lnetwork"]) + AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"]) ++AC_CHECK_LIB(network, gethostbyname, [LIBS="$LIBS -lnetwork"]) + ]) + + dnl ------------------------------------------------------------------------ diff --git a/dev-games/ode/ode-0.12.bep b/dev-games/ode/ode-0.12.bep new file mode 100644 index 000000000..b6209a625 --- /dev/null +++ b/dev-games/ode/ode-0.12.bep @@ -0,0 +1,17 @@ +DESCRIPTION="ODE is an open source, high performance 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" +REVISION="1" +COPYRIGHT="2001-2004 Russell L. Smith" +LICENSE="GNU LGPL v3 + BSD (3-clause)" +CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599" +BUILD { + cd ode-0.12 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} +INSTALL { + cd ode-0.12 + make install +} diff --git a/dev-games/ode/patches/ode-0.12.patch b/dev-games/ode/patches/ode-0.12.patch new file mode 100644 index 000000000..131dddd87 --- /dev/null +++ b/dev-games/ode/patches/ode-0.12.patch @@ -0,0 +1,24 @@ +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 +@@ -1081,7 +1081,7 @@ + ODE_API void dGeomRaySetClosestHit (dGeomID g, int closestHit); + ODE_API int dGeomRayGetClosestHit (dGeomID g); + +-#include "collision_trimesh.h" ++#include "ode/collision_trimesh.h" + + ODE_API dGeomID dCreateGeomTransform (dSpaceID space); + ODE_API void dGeomTransformSetGeom (dGeomID g, dGeomID obj); diff --git a/dev-games/physfs/physfs-2.0.1.bep b/dev-games/physfs/physfs-2.0.1.bep index 570b0cfb1..dfc030b5a 100644 --- a/dev-games/physfs/physfs-2.0.1.bep +++ b/dev-games/physfs/physfs-2.0.1.bep @@ -1,5 +1,5 @@ -DESCRIPTION="PhysicsFS is a library to provide abstract access to various archives" -HOMEPAGE="http://icculus.org/physfs" +DESCRIPTION="PhysicsFS is a library to provide abstract access to various archives" +HOMEPAGE="http://icculus.org/physfs" SRC_URI="hg+http://hg.icculus.org/icculus/physfs/#release-2.0.1" #SRC_URI="http://icculus.org/physfs/downloads/physfs-2.0.1.tar.gz" #CHECKSUM_MD5="df00465fcfa80e87f718961c6dd6b928" @@ -9,11 +9,7 @@ DEPEND="dev-util/cmake >= 2.8.0 dev-util/mercurial >= 1.4" BUILD { cd physfs-2.0.1 - if [ -n "$(setgcc | grep '2')" ]; then - cmake . -DLIBRARY_OUTPUT_PATH:=`finddir B_COMMON_LIB_DIRECTORY` - else - cmake . -DLIBRARY_OUTPUT_PATH:=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + cmake . -DLIBRARY_OUTPUT_PATH:=`finddir B_COMMON_LIB_DIRECTORY` make } @@ -24,10 +20,10 @@ INSTALL { if [ -e "${DESTDIR}" ]; then mkdir -p ${DESTDIR}/tmp-phy mv -v ${DESTDIR}/boot/common/lib ${DESTDIR}/tmp-phy - mkdir -p ${DESTDIR}/boot/common/lib/gcc4 - mv -v ${DESTDIR}/tmp-phy/lib/* ${DESTDIR}/boot/common/lib/gcc4 + mkdir -p ${DESTDIR}/boot/common/lib + mv -v ${DESTDIR}/tmp-phy/lib/* ${DESTDIR}/boot/common/lib else - mv -v /boot/common/lib/libphysfs.* /boot/common/lib/gcc4 + mv -v /boot/common/lib/libphysfs.* /boot/common/lib fi fi } diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98.bep b/dev-java/gnu-classpath/gnu-classpath-0.98.bep index 877bc4186..5c3ae52ea 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.98.bep +++ b/dev-java/gnu-classpath/gnu-classpath-0.98.bep @@ -1,5 +1,5 @@ -DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language" -HOMEPAGE="http://www.gnu.org/software/classpath" +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" @@ -10,9 +10,10 @@ BUILD { libtoolize --force --copy --install aclocal -I m4 autoconf + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --mandir=$COMMON_DOCS/man \ + --infodir=$COMMON_DOCS/info \ --disable-gtk-peer \ --disable-alsa \ --disable-plugin \ diff --git a/dev-java/jamvm/jamvm-1.5.4.bep b/dev-java/jamvm/jamvm-1.5.4.bep index a83ebcad6..056ddf8a3 100644 --- a/dev-java/jamvm/jamvm-1.5.4.bep +++ b/dev-java/jamvm/jamvm-1.5.4.bep @@ -1,6 +1,6 @@ DESCRIPTION="JamVM" HOMEPAGE="http://jamvm.sourceforge.net" -SRC_URI="http://sourceforge.net/projects/jamvm/files/jamvm/JamVM 1.5.4/jamvm-1.5.4.tar.gz" +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="" diff --git a/dev-lang/camlp5/camlp5-6.06.bep b/dev-lang/camlp5/camlp5-6.06.bep new file mode 100644 index 000000000..ec5a58d26 --- /dev/null +++ b/dev-lang/camlp5/camlp5-6.06.bep @@ -0,0 +1,24 @@ +DESCRIPTION="Preprocessor-pretty-printer of OCaml" +HOMEPAGE="http://pauillac.inria.fr/~ddr/camlp5/" +SRC_URI="http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.06.tgz" +CHECKSUM_MD5="8de69094d73d24768844a5017a2bd04b" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="ocaml" +BUILD { + cd camlp5-6.06 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --strict --prefix `finddir B_COMMON_DIRECTORY` \ + --mandir $COMMON_DOCS/man + make world.opt +} + +INSTALL { + cd camlp5-6.06 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + make install PREFIX=${DESTDIR}`finddir B_COMMON_DIRECTORY` \ + MANDIR=${DESTDIR}$COMMON_DOCS/man + +} +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2012 Institut National de Recherche en Informatique et en Automatique (INRIA)." diff --git a/dev-lang/dmd-bin/dmd-bin-1.064.bep b/dev-lang/dmd-bin/dmd-bin-1.064.bep index fb051c98d..f24e02ef8 100644 --- a/dev-lang/dmd-bin/dmd-bin-1.064.bep +++ b/dev-lang/dmd-bin/dmd-bin-1.064.bep @@ -13,8 +13,8 @@ BUILD { } INSTALL { - mkdir -p ${DESTDIR}/boot/common/bin - cp dmd/src/dmd/dmd ${DESTDIR}/boot/common/bin/dmd + mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` + cp dmd/src/dmd/dmd ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/dmd } LICENSE="Digital Mars" diff --git a/dev-lang/fpc/fpc-2.6.0.bep b/dev-lang/fpc/fpc-2.6.0.bep new file mode 100644 index 000000000..6ef4f70bc --- /dev/null +++ b/dev-lang/fpc/fpc-2.6.0.bep @@ -0,0 +1,38 @@ +DESCRIPTION="Free Pascal Compiler - 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 + ftp://gd.tuwien.ac.at/languages/pascal/fpc/dist/2.6.0/source/fpc-2.6.0.source.tar.gz + ftp://ftp.hu.freepascal.org/pub/fpc/dist/2.6.0/source/fpc-2.6.0.source.tar.gz + http://mirror.mirimar.net/freepascal/dist/2.6.0/source/fpc-2.6.0.source.tar.gz + ftp://freepascal.stack.nl/pub/fpc/dist/2.6.0/source/fpc-2.6.0.source.tar.gz + ftp://ftp.no.freepascal.org/pub/fpc/dist/2.6.0/source/fpc-2.6.0.source.tar.gz + ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.6.0/source/fpc-2.6.0.source.tar.gz" + +CHECKSUM_MD5="0edf0d6f52e1e3fd6ef6836431f4d13b" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="dev-lang/fpc" + +BUILD { + cd fpc-2.6.0 + make build +} + +INSTALL { + cd fpc-2.6.0 + make install INSTALL_PREFIX=${DESTDIR}`finddir B_USER_CONFIG_DIRECTORY` \ + FPCDIR=${DESTDIR}`finddir B_USER_LIB_DIRECTORY`/fpc/2.6.0 + # Make link to the ppc386 executable + ln -fs ${DESTDIR}`finddir B_USER_LIB_DIRECTORY`/fpc/2.6.0/ppc386 \ + ${DESTDIR}`finddir B_USER_CONFIG_DIRECTORY`/bin +} + +TEST { + cd fpc-2.6.0/tests + make full TEST_FPC=${DESTDIR}`finddir B_USER_CONFIG_DIRECTORY`/bin/fpc +} + +LICENSE="GNU LGPL v3 + GNU GPL v3" +COPYRIGHT="1993-2011 by Florian Klaempfl" diff --git a/dev-lang/lua/lua-5.1.4-3.bep b/dev-lang/lua/lua-5.1.4-3.bep new file mode 100644 index 000000000..525e47545 --- /dev/null +++ b/dev-lang/lua/lua-5.1.4-3.bep @@ -0,0 +1,21 @@ +DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language." +HOMEPAGE="http://www.lua.org" +SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz" +CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150" +REVISION="3" +STATUS_HAIKU="stable" +DEPEND="pkgconfig >= 0.25" +BUILD { + cd lua-5.1.4 + make haiku +} + +INSTALL { + cd lua-5.1.4 + make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \ + INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man" + mkdir -p ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig + cp etc/lua.pc ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig/lua.pc +} +LICENSE="MIT" +COPYRIGHT="1994-2009, Lua.org, PUC-Rio" diff --git a/dev-lang/lua/lua-5.1.4.bep b/dev-lang/lua/lua-5.1.4.bep index 30e3da7dd..525e47545 100644 --- a/dev-lang/lua/lua-5.1.4.bep +++ b/dev-lang/lua/lua-5.1.4.bep @@ -1,5 +1,5 @@ -DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language." -HOMEPAGE="http://www.lua.org" +DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language." +HOMEPAGE="http://www.lua.org" SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz" CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150" REVISION="3" @@ -12,19 +12,10 @@ BUILD { INSTALL { cd lua-5.1.4 - if [ -n "$(setgcc | grep '4')" ]; then - make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \ - INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man" \ - INSTALL_LIB="${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/gcc4" - mkdir -p ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig - cp etc/lua.pc ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig/lua.pc - else - make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \ - INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man" - mkdir -p ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig - cp etc/lua.pc ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig/lua.pc - fi - + make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \ + INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man" + mkdir -p ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig + cp etc/lua.pc ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig/lua.pc } LICENSE="MIT" COPYRIGHT="1994-2009, Lua.org, PUC-Rio" diff --git a/dev-lang/lua/lua-5.2.1.bep b/dev-lang/lua/lua-5.2.1.bep new file mode 100644 index 000000000..6e4dd9fcf --- /dev/null +++ b/dev-lang/lua/lua-5.2.1.bep @@ -0,0 +1,18 @@ +DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language." +HOMEPAGE="http://www.lua.org" +SRC_URI="http://www.lua.org/ftp/lua-5.2.1.tar.gz" +CHECKSUM_MD5="ae08f641b45d737d12d30291a5e5f6e3" +REVISION="3" +STATUS_HAIKU="stable" +BUILD { + cd lua-5.2.1 + make haiku +} + +INSTALL { + cd lua-5.2.1 + make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \ + INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man" +} +LICENSE="MIT" +COPYRIGHT="1994-2012, Lua.org, PUC-Rio" diff --git a/dev-lang/lua/patches/lua-5.1.4-3.patch b/dev-lang/lua/patches/lua-5.1.4-3.patch new file mode 100644 index 000000000..38b6ddd2a --- /dev/null +++ b/dev-lang/lua/patches/lua-5.1.4-3.patch @@ -0,0 +1,276 @@ +diff -urN lua-5.1.4/Makefile lua-5.1.4-haiku/Makefile +--- lua-5.1.4/Makefile 2008-08-12 00:40:48.066322432 +0000 ++++ lua-5.1.4-haiku/Makefile 2011-05-03 22:29:07.568328192 +0000 +@@ -13,11 +13,11 @@ + INSTALL_BIN= $(INSTALL_TOP)/bin + INSTALL_INC= $(INSTALL_TOP)/include + INSTALL_LIB= $(INSTALL_TOP)/lib +-INSTALL_MAN= $(INSTALL_TOP)/man/man1 ++INSTALL_MAN= `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1 + # + # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with + # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc). +-INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V ++INSTALL_LMOD= `finddir B_COMMON_DATA_DIRECTORY`/lua/$V + INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V + + # How to install. If your install program does not support "-p", then you +@@ -38,12 +38,12 @@ + # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= + + # Convenience platforms targets. +-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris ++PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris + + # What to install. + TO_BIN= lua luac + TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp +-TO_LIB= liblua.a ++TO_LIB= liblua.a liblua.so + TO_MAN= lua.1 luac.1 + + # Lua version and release. +diff -urN lua-5.1.4/src/Makefile lua-5.1.4-haiku/src/Makefile +--- lua-5.1.4/src/Makefile 2008-01-19 19:37:58.066584576 +0000 ++++ lua-5.1.4-haiku/src/Makefile 2011-05-03 22:08:17.191627264 +0000 +@@ -20,9 +20,10 @@ + + # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= + +-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris ++PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ + lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ + lundump.o lvm.o lzio.o +@@ -36,7 +37,7 @@ + LUAC_O= luac.o print.o + + ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + default: $(PLAT) +@@ -57,6 +58,9 @@ + $(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -o $@ -shared -fPIC $(MYLDFLAGS) $? $(LIBS) ++ + clean: + $(RM) $(ALL_T) $(ALL_O) + +@@ -95,6 +99,9 @@ + generic: + $(MAKE) all MYCFLAGS= + ++haiku: ++ $(MAKE) all MYCFLAGS=-DLUA_USE_HAIKU LIBS= ++ + linux: + $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" + +diff -urN lua-5.1.4/src/lcode.c lua-5.1.4-haiku/src/lcode.c +--- lua-5.1.4/src/lcode.c 2007-12-28 15:32:23.000262144 +0000 ++++ lua-5.1.4-haiku/src/lcode.c 2011-05-03 22:06:13.312999936 +0000 +@@ -1,5 +1,5 @@ + /* +-** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $ ++** $Id: lcode.c,v 2.25.1.5 2011/01/31 14:53:16 roberto Exp $ + ** Code generator for Lua + ** See Copyright Notice in lua.h + */ +@@ -544,10 +544,6 @@ + pc = NO_JUMP; /* always true; do nothing */ + break; + } +- case VFALSE: { +- pc = luaK_jump(fs); /* always jump */ +- break; +- } + case VJMP: { + invertjump(fs, e); + pc = e->u.s.info; +@@ -572,10 +568,6 @@ + pc = NO_JUMP; /* always false; do nothing */ + break; + } +- case VTRUE: { +- pc = luaK_jump(fs); /* always jump */ +- break; +- } + case VJMP: { + pc = e->u.s.info; + break; +diff -urN lua-5.1.4/src/ldblib.c lua-5.1.4-haiku/src/ldblib.c +--- lua-5.1.4/src/ldblib.c 2008-01-21 13:11:21.000262144 +0000 ++++ lua-5.1.4-haiku/src/ldblib.c 2011-05-03 22:06:13.322699264 +0000 +@@ -1,5 +1,5 @@ + /* +-** $Id: ldblib.c,v 1.104.1.3 2008/01/21 13:11:21 roberto Exp $ ++** $Id: ldblib.c,v 1.104.1.4 2009/08/04 18:50:18 roberto Exp $ + ** Interface from Lua to its debug API + ** See Copyright Notice in lua.h + */ +@@ -45,6 +45,7 @@ + + + static int db_getfenv (lua_State *L) { ++ luaL_checkany(L, 1); + lua_getfenv(L, 1); + return 1; + } +diff -urN lua-5.1.4/src/liolib.c lua-5.1.4-haiku/src/liolib.c +--- lua-5.1.4/src/liolib.c 2008-01-18 17:47:43.001572864 +0000 ++++ lua-5.1.4-haiku/src/liolib.c 2011-05-03 22:06:13.346292224 +0000 +@@ -1,5 +1,5 @@ + /* +-** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $ ++** $Id: liolib.c,v 2.73.1.4 2010/05/14 15:33:51 roberto Exp $ + ** Standard I/O (and system) library + ** See Copyright Notice in lua.h + */ +@@ -276,7 +276,10 @@ + lua_pushnumber(L, d); + return 1; + } +- else return 0; /* read fails */ ++ else { ++ lua_pushnil(L); /* "result" to be removed */ ++ return 0; /* read fails */ ++ } + } + + +diff -urN lua-5.1.4/src/llex.c lua-5.1.4-haiku/src/llex.c +--- lua-5.1.4/src/llex.c 2007-12-27 13:02:25.001835008 +0000 ++++ lua-5.1.4-haiku/src/llex.c 2011-05-03 22:06:13.368050176 +0000 +@@ -1,5 +1,5 @@ + /* +-** $Id: llex.c,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $ ++** $Id: llex.c,v 2.20.1.2 2009/11/23 14:58:22 roberto Exp $ + ** Lexical Analyzer + ** See Copyright Notice in lua.h + */ +@@ -118,8 +118,10 @@ + lua_State *L = ls->L; + TString *ts = luaS_newlstr(L, str, l); + TValue *o = luaH_setstr(L, ls->fs->h, ts); /* entry for `str' */ +- if (ttisnil(o)) ++ if (ttisnil(o)) { + setbvalue(o, 1); /* make sure `str' will not be collected */ ++ luaC_checkGC(L); ++ } + return ts; + } + +diff -urN lua-5.1.4/src/loadlib.c lua-5.1.4-haiku/src/loadlib.c +--- lua-5.1.4/src/loadlib.c 2008-08-06 13:29:28.002621440 +0000 ++++ lua-5.1.4-haiku/src/loadlib.c 2011-05-03 22:06:13.391380992 +0000 +@@ -1,5 +1,5 @@ + /* +-** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $ ++** $Id: loadlib.c,v 1.52.1.4 2009/09/09 13:17:16 roberto Exp $ + ** Dynamic library loader for Lua + ** See Copyright Notice in lua.h + ** +@@ -639,7 +639,7 @@ + lua_pushvalue(L, -1); + lua_replace(L, LUA_ENVIRONINDEX); + /* create `loaders' table */ +- lua_createtable(L, 0, sizeof(loaders)/sizeof(loaders[0]) - 1); ++ lua_createtable(L, sizeof(loaders)/sizeof(loaders[0]) - 1, 0); + /* fill it with pre-defined loaders */ + for (i=0; loaders[i] != NULL; i++) { + lua_pushcfunction(L, loaders[i]); +diff -urN lua-5.1.4/src/lstrlib.c lua-5.1.4-haiku/src/lstrlib.c +--- lua-5.1.4/src/lstrlib.c 2008-07-11 17:27:21.004194304 +0000 ++++ lua-5.1.4-haiku/src/lstrlib.c 2011-05-03 22:06:13.411303936 +0000 +@@ -1,5 +1,5 @@ + /* +-** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $ ++** $Id: lstrlib.c,v 1.132.1.5 2010/05/14 15:34:19 roberto Exp $ + ** Standard library for string operations and pattern-matching + ** See Copyright Notice in lua.h + */ +@@ -754,6 +754,7 @@ + + + static int str_format (lua_State *L) { ++ int top = lua_gettop(L); + int arg = 1; + size_t sfl; + const char *strfrmt = luaL_checklstring(L, arg, &sfl); +@@ -768,7 +769,8 @@ + else { /* format item */ + char form[MAX_FORMAT]; /* to store the format (`%...') */ + char buff[MAX_ITEM]; /* to store the formatted item */ +- arg++; ++ if (++arg > top) ++ luaL_argerror(L, arg, "no value"); + strfrmt = scanformat(L, strfrmt, form); + switch (*strfrmt++) { + case 'c': { +diff -urN lua-5.1.4/src/luaconf.h lua-5.1.4-haiku/src/luaconf.h +--- lua-5.1.4/src/luaconf.h 2008-02-11 16:25:08.004980736 +0000 ++++ lua-5.1.4-haiku/src/luaconf.h 2011-05-03 22:08:17.243793920 +0000 +@@ -33,6 +33,13 @@ + #define LUA_WIN + #endif + ++#if defined(LUA_USE_HAIKU) ++#define LUA_USE_MKSTEMP ++#define LUA_USE_ISATTY ++#define LUA_USE_POPEN ++#define LUA_USE_DLOPEN ++#endif ++ + #if defined(LUA_USE_LINUX) + #define LUA_USE_POSIX + #define LUA_USE_DLOPEN /* needs an extra library: -ldl */ +@@ -94,7 +101,11 @@ + ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" + + #else +-#define LUA_ROOT "/usr/local/" ++# if defined(LUA_USE_HAIKU) ++# define LUA_ROOT "/boot/common/" ++# else ++# define LUA_ROOT "/usr/local/" ++# endif + #define LUA_LDIR LUA_ROOT "share/lua/5.1/" + #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" + #define LUA_PATH_DEFAULT \ +diff -urN lua-5.1.4/src/lvm.c lua-5.1.4-haiku/src/lvm.c +--- lua-5.1.4/src/lvm.c 2007-12-28 15:32:23.005242880 +0000 ++++ lua-5.1.4-haiku/src/lvm.c 2011-05-03 22:06:13.432537600 +0000 +@@ -1,5 +1,5 @@ + /* +-** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $ ++** $Id: lvm.c,v 2.63.1.4 2009/07/01 21:10:33 roberto Exp $ + ** Lua virtual machine + ** See Copyright Notice in lua.h + */ +@@ -133,6 +133,7 @@ + + void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) { + int loop; ++ TValue temp; + for (loop = 0; loop < MAXTAGLOOP; loop++) { + const TValue *tm; + if (ttistable(t)) { /* `t' is a table? */ +@@ -152,7 +153,9 @@ + callTM(L, tm, t, key, val); + return; + } +- t = tm; /* else repeat with `tm' */ ++ /* else repeat with `tm' */ ++ setobj(L, &temp, tm); /* avoid pointing inside table (may rehash) */ ++ t = &temp; + } + luaG_runerror(L, "loop in settable"); + } diff --git a/dev-lang/lua/patches/lua-5.2.1.patch b/dev-lang/lua/patches/lua-5.2.1.patch new file mode 100644 index 000000000..ea654fad3 --- /dev/null +++ b/dev-lang/lua/patches/lua-5.2.1.patch @@ -0,0 +1,91 @@ +diff -ru lua-5.2.1/Makefile lua-5.2.1.patched/Makefile +--- lua-5.2.1/Makefile 2012-05-17 16:05:54.032768000 +0200 ++++ lua-5.2.1.patched/Makefile 2012-08-12 16:50:24.994574336 +0200 +@@ -36,12 +36,12 @@ + # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + + # Convenience platforms targets. +-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris ++PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris + + # What to install. + TO_BIN= lua luac + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp +-TO_LIB= liblua.a ++TO_LIB= liblua.a liblua.so + TO_MAN= lua.1 luac.1 + + # Lua version and release. +diff -ru lua-5.2.1/src/luaconf.h lua-5.2.1.patched/src/luaconf.h +--- lua-5.2.1/src/luaconf.h 2012-05-11 16:14:42.025690112 +0200 ++++ lua-5.2.1.patched/src/luaconf.h 2012-08-12 16:56:30.385875968 +0200 +@@ -40,6 +40,13 @@ + + + ++#if defined(LUA_USE_HAIKU) ++#define LUA_USE_MKSTEMP ++#define LUA_USE_ISATTY ++#define LUA_USE_POPEN ++#define LUA_USE_DLOPEN ++#endif ++ + #if defined(LUA_USE_LINUX) + #define LUA_USE_POSIX + #define LUA_USE_DLOPEN /* needs an extra library: -ldl */ +@@ -100,7 +107,11 @@ + #else /* }{ */ + + #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" ++#if defined(LUA_USE_HAIKU) ++#define LUA_ROOT "/boot/common/" ++#else + #define LUA_ROOT "/usr/local/" ++#endif + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR + #define LUA_PATH_DEFAULT \ +diff -ru lua-5.2.1/src/Makefile lua-5.2.1.patched/src/Makefile +--- lua-5.2.1/src/Makefile 2012-03-09 17:32:16.029884416 +0100 ++++ lua-5.2.1.patched/src/Makefile 2012-08-12 16:52:43.662437888 +0200 +@@ -26,9 +26,10 @@ + + # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + +-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris ++PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ + ltm.o lundump.o lvm.o lzio.o +@@ -43,7 +44,7 @@ + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -65,6 +66,9 @@ + $(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -o $@ -shared -fPIC $(LDFLAGS) $? $(LIBS) ++ + clean: + $(RM) $(ALL_T) $(ALL_O) + +@@ -102,6 +106,9 @@ + + generic: $(ALL) + ++haiku: ++ $(MAKE) all MUCFLAGS=-DLUA_USE_HAIKU LIBS= ++ + linux: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline -lncurses" + diff --git a/dev-lang/nasm/nasm-2.08.01.bep b/dev-lang/nasm/nasm-2.08.01.bep index c1e908a58..f1c59328d 100644 --- a/dev-lang/nasm/nasm-2.08.01.bep +++ b/dev-lang/nasm/nasm-2.08.01.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="untested" DEPEND="" BUILD { cd nasm-2.08.01 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-lang/ocaml/ocaml-4.00.0.bep b/dev-lang/ocaml/ocaml-4.00.0.bep new file mode 100644 index 000000000..5e462e5d4 --- /dev/null +++ b/dev-lang/ocaml/ocaml-4.00.0.bep @@ -0,0 +1,23 @@ +DESCRIPTION="Implementation of the Caml language" +HOMEPAGE="http://caml.inria.fr/index.en.html" +SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-4.00/ocaml-4.00.0.tar.gz" +CHECKSUM_MD5="fa11560a45793bd9fa45c1295a6f4a91" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="" +BUILD { + cd ocaml-4.00.0 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix `finddir B_COMMON_DIRECTORY` \ + --mandir $COMMON_DOCS/man + make world.opt +} + +INSTALL { + cd ocaml-4.00.0 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + make install PREFIX=${DESTDIR}`finddir B_COMMON_DIRECTORY` \ + MANDIR=${DESTDIR}$COMMON_DOCS/man +} +LICENSE="GNU LGPL v2" +COPYRIGHT="1996-2012 Institut National de Recherche en Informatique et en Automatique (INRIA)." diff --git a/dev-lang/ocaml/patches/ocaml-4.00.0.patch b/dev-lang/ocaml/patches/ocaml-4.00.0.patch new file mode 100644 index 000000000..f73910779 --- /dev/null +++ b/dev-lang/ocaml/patches/ocaml-4.00.0.patch @@ -0,0 +1,59 @@ +diff -ruN ocaml-4.00.0/configure ocaml-4.00.0/configure +--- ocaml-4.00.0/configure 2012-06-26 15:33:50.060555264 +0000 ++++ ocaml-4.00.0/configure 2012-09-25 21:21:50.419168256 +0000 +@@ -285,6 +285,10 @@ + bytecccompopts="-fno-defer-pop $gcc_warnings" + # No -lm library + mathlib="";; ++ *,*-*-haiku*) ++ bytecccompopts="-fno-defer-pop $gcc_warnings" ++ # No -lm library ++ mathlib="";; + gcc,alpha*-*-osf*) + bytecccompopts="-fno-defer-pop $gcc_warnings" + if cc="$bytecc" sh ./hasgot -mieee; then +@@ -614,6 +618,9 @@ + byteccrpath="-Wl,-rpath," + mksharedlibrpath="-Wl,-rpath," + shared_libraries_supported=true;; ++ *-*haiku*) ++ mksharedlib="$bytecc -shared" ++ shared_libraries_supported=true;; + esac + fi + +@@ -679,6 +686,7 @@ + arch=i386; system=solaris + fi;; + i[3456]86-*-beos*) arch=i386; system=beos;; ++ i[3456]86-*-haiku*) arch=i386; system=beos;; + i[3456]86-*-cygwin*) arch=i386; system=cygwin;; + i[3456]86-*-darwin*) if $arch64; then + arch=amd64; system=macosx +@@ -901,6 +909,11 @@ + cclibs="$cclibs -lnsl -lsocket" + echo "#define HAS_SOCKETS" >> s.h + has_sockets=yes ++elif sh ./hasgot -lnetwork socket socketpair bind listen accept connect; then ++ echo "You have BSD sockets (with libraries '-lnetwork')" ++ cclibs="$cclibs -lnetwork" ++ echo "#define HAS_SOCKETS" >> s.h ++ has_sockets=yes + fi + + if sh ./hasgot -i sys/socket.h -t socklen_t; then +diff -uN ocaml-4.00.0/otherlibs/unix/nice.c ocaml-4.00.0/otherlibs/unix/nice.c +--- ocaml-4.00.0/otherlibs/unix/nice.c 2012-09-25 21:31:10.443809792 +0000 ++++ ocaml-4.00.0/otherlibs/unix/nice.c 2012-09-25 21:31:51.582221824 +0000 +@@ -24,7 +24,11 @@ + { + int ret; + errno = 0; ++#ifdef __HAIKU__ ++ ret = 0; ++#else + ret = nice(Int_val(incr)); ++#endif + if (ret == -1 && errno != 0) uerror("nice", Nothing); + return Val_int(ret); + } diff --git a/dev-lang/openjdk/openjdk-1.7.bep b/dev-lang/openjdk/openjdk-1.7.bep new file mode 100644 index 000000000..da068202f --- /dev/null +++ b/dev-lang/openjdk/openjdk-1.7.bep @@ -0,0 +1,99 @@ +DESCRIPTION="openjdk" +HOMEPAGE="http://openjdk.java.net/" +SRC_URI="http://ports-space.haiku-files.org/dev-lang/j2sdk-july-r2.tar.xz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="app-arch/cpio >= 2.10 + media-libs/freetype >= 2.4.6" + +CHECKSUM_MD5="28b8630373769e1e897a75bf81f2e1eb" + +BUILD { + OPENJDK_DIR=`haikuporter -t`/dev-lang/openjdk/work + + # Get and build Apache Ant. + # Making a separate .bep file for it wasn't such a good idea. + + wget -nc http://archive.apache.org/dist/ant/source/apache-ant-1.8.4-src.tar.gz + tar xvfz apache-ant-1.8.4-src.tar.gz + export LIBRARY_PATH=${OPENJDK_DIR}/j2sdk-image/jre/lib/i386/:$LIBRARY_PATH + export JAVA_HOME=${OPENJDK_DIR}/j2sdk-image + export ANT_HOME=${OPENJDK_DIR}/ant + cd apache-ant-1.8.4 + sed -i 's/depends=\"jars,test-jar\"/depends=\"jars\"/' build.xml + sh build.sh install-lite + unset JAVA_HOME + cd .. + + # Clone latest JDK repositories. + + hg clone http://hg.openjdk.java.net/haiku/haiku jdk --debug + hg clone http://hg.openjdk.java.net/haiku/haiku/corba jdk/corba --debug + hg clone http://hg.openjdk.java.net/haiku/haiku/hotspot jdk/hotspot --debug + hg clone http://hg.openjdk.java.net/haiku/haiku/jaxp jdk/jaxp --debug + hg clone http://hg.openjdk.java.net/haiku/haiku/jaxws jdk/jaxws --debug + hg clone http://hg.openjdk.java.net/haiku/haiku/jdk jdk/jdk --debug + hg clone http://hg.openjdk.java.net/haiku/haiku/langtools jdk/langtools --debug + + export ALT_BOOTDIR=${OPENJDK_DIR}/j2sdk-image + export ALT_JDK_IMPORT_PATH=${OPENJDK_DIR}/j2sdk-image + export ANT=${OPENJDK_DIR}/ant + export ALT_OUTPUTDIR=${OPENJDK_DIR}/output + mkdir -p ${ALT_OUTPUTDIR} + export ALLOW_DOWNLOADS=true + + # Deploy certain headers, if they are missing. + + HEADERS_DIR=`finddir B_SYSTEM_HEADERS_DIRECTORY` + MEDIA_DIR=${HEADERS_DIR}/os/media + + if [ -e ${MEDIA_DIR}/SoundConsumer.h ] ; + then + echo SoundConsumer.h exists. + else + cp SoundConsumer.h ${MEDIA_DIR}/SoundConsumer.h + SOUND_CONSUMER_H=1 + echo SoundConsumer.h was not found. Deployed private file instead. + fi + + if [ -e ${MEDIA_DIR}/SoundUtils.h ] ; + then + echo SoundUtils.h exists. + else + cp SoundUtils.h ${MEDIA_DIR}/SoundUtils.h + declare SOUND_UTILS_H=1 + echo SoundUtils.h was not found. Deployed private file instead. + fi + + # Build. + + cd jdk + make NO_DOCS=true + + # Cleanup private files, if any were deployed. + # I don't really think it would harm anyone if we don't clean them up after compiling. + +# if [ ${SOUND_CONSUMER_H} == 1 ] ; +# then +# rm -f ${MEDIA_DIR}/SoundConsumer.h +# echo Removed private SoundConsumer.h +# fi +# +# if [ ${SOUND_UTILS_H} == 1 ] ; +# then +# rm -f ${MEDIA_DIR}/SoundUtils.h +# echo Removed private SoundUtils.h +# fi +} + +INSTALL { + export DESTDIR=`finddir B_COMMON_DIRECTORY` + cp -r -f -v output ${DESTDIR}/jdk +} + +TEST { + echo "OpenJDK tests are not yet ported to Haiku." +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005, 2006, Oracle and/or its affiliates" diff --git a/dev-lang/openjdk/patches/openjdk-1.7.patch b/dev-lang/openjdk/patches/openjdk-1.7.patch new file mode 100644 index 000000000..789216196 --- /dev/null +++ b/dev-lang/openjdk/patches/openjdk-1.7.patch @@ -0,0 +1,213 @@ +--- /dev/null 2012-12-19 09:59:04.122365000 +0200 ++++ SoundConsumer.h 2012-12-04 04:36:51.000000000 +0200 +@@ -0,0 +1,151 @@ ++/******************************************************************************* ++/ ++/ File: SoundConsumer.h ++/ ++/ Description: Record sound from some sound-producing Node. ++/ ++/ Copyright 1998, Be Incorporated, All Rights Reserved ++/ ++*******************************************************************************/ ++#ifndef SOUND_CONSUMER_H ++#define SOUND_CONSUMER_H ++ ++// To use this Consumer: ++// 1. Create Record and Notify hooks, or subclass SoundConsumer ++// if you'd rather use the inheritance hierarchy. ++// * The Record function should do whatever you want to do ++// when you receive a buffer. ++// * The Notify function should handle whatever events ++// you wish to handle (defined in SoundUtil.h). ++// 2: Create an instance of SoundConsumer, giving it the ++// appropriate hook functions. Or, create an instance of an ++// appropriate subclass if you've made one. ++// 3: Register your new Consumer with the MediaRoster. ++// 4: Connect your Consumer to some Producer. ++// 5: Start or Stop the Consumer if your hook functions ++// implement behavior for these kinds of events. ++// Seek the Consumer to set the offset of the timestamps that ++// your Record function will see. ++// 6: When you're done, disconnect the Consumer, then delete it. ++ ++#include ++#include "SoundUtils.h" ++ ++namespace BPrivate { ++ ++ ++class SoundConsumer : public BBufferConsumer { ++public: ++ SoundConsumer(const char* name, ++ SoundProcessFunc recordFunc = NULL, ++ SoundNotifyFunc notifyFunc = NULL, ++ void* cookie = NULL); ++ virtual ~SoundConsumer(); ++ ++ //This function is OK to call from any thread. ++ status_t SetHooks(SoundProcessFunc recordFunc = NULL, ++ SoundNotifyFunc notifyFunc = NULL, ++ void* cookie = NULL); ++ ++ // The MediaNode interface ++public: ++ virtual port_id ControlPort() const; ++ virtual BMediaAddOn* AddOn(int32* internalID) const; ++ // Who instantiated you -- or NULL for app class ++ ++ ++protected: ++ virtual void Start(bigtime_t performanceTime); ++ virtual void Stop(bigtime_t performanceTime, bool immediate); ++ virtual void Seek(bigtime_t mediaTime, ++ bigtime_t performanceTime); ++ virtual void SetRunMode(run_mode mode); ++ virtual void TimeWarp(bigtime_t atRealTime, ++ bigtime_t to_performanceTime); ++ virtual void Preroll(); ++ virtual void SetTimeSource(BTimeSource* timeSource); ++ virtual status_t HandleMessage(int32 message, const void* data, ++ size_t size); ++ ++ // The BufferConsumer interface ++ virtual status_t AcceptFormat(const media_destination& dest, ++ media_format* format); ++ virtual status_t GetNextInput(int32* cookie, ++ media_input* _input); ++ virtual void DisposeInputCookie(int32 cookie); ++ virtual void BufferReceived(BBuffer* buffer); ++ virtual void ProducerDataStatus( ++ const media_destination& forWhom, ++ int32 status, bigtime_t atMediaTime); ++ virtual status_t GetLatencyFor(const media_destination& forWhom, ++ bigtime_t* _latency, ++ media_node_id* _timesource); ++ virtual status_t Connected(const media_source& producer, ++ const media_destination& where, ++ const media_format& format, ++ media_input* _input); ++ virtual void Disconnected(const media_source& producer, ++ const media_destination& where); ++ virtual status_t FormatChanged(const media_source& producer, ++ const media_destination& consumer, ++ int32 fromChangeCount, ++ const media_format& format); ++ ++protected: ++ // Functions called when no hooks are installed. ++ // OK to override instead of installing hooks. ++ virtual void Record(bigtime_t time, const void* data, ++ size_t size, ++ const media_raw_audio_format& format); ++ virtual void Notify(int32 cause, ...); ++ ++private: ++ SoundProcessFunc m_recordHook; ++ SoundNotifyFunc m_notifyHook; ++ void* m_cookie; ++ media_input m_input; ++ thread_id m_thread; ++ port_id m_port; ++ ++ // The times we need to deal with ++ // My notation for times: tr = real time, ++ // tp = performance time, tm = media time. ++ bigtime_t m_trTimeout; ++ // how long to wait on the input port ++ bigtime_t m_tpSeekAt; ++ // when we Seek ++ bigtime_t m_tmSeekTo; ++ // target time for Seek ++ ++ // The transformation from media to peformance time. ++ // d = p - m, so m + d = p. ++ // Media time is generally governed by the Seek ++ // function. In our node, we simply use media time as ++ // the time that we report to the record hook function. ++ // If we were a producer node, we might use media time ++ // to track where we were in playing a certain piece ++ // of media. But we aren't. ++ bigtime_t m_delta; ++ ++ // State variables ++ bool m_seeking; ++ // a Seek is pending ++ ++ // Functions to calculate timing values. OK to override. ++ // ProcessingLatency is the time it takes to process a buffer; ++ // TotalLatency is returned to producer; Timeout is passed ++ // to call to read_port_etc() in service thread loop. ++ virtual bigtime_t Timeout(); ++ virtual bigtime_t ProcessingLatency(); ++ virtual bigtime_t TotalLatency(); ++ // The actual thread doing the work ++ static status_t ThreadEntry(void* cookie); ++ void ServiceThread(); ++ void DoHookChange(void* message); ++}; ++ ++ ++} ++ ++ ++#endif // SOUND_CONSUMER_H +--- /dev/null 2012-12-19 09:59:04.122365000 +0200 ++++ SoundUtils.h 2012-12-04 04:36:51.000000000 +0200 +@@ -0,0 +1,56 @@ ++/******************************************************************************* ++/ ++/ File: SoundUtils.h ++/ ++/ Description: Utility functions for handling audio data. ++/ ++/ Copyright 1998-1999, Be Incorporated, All Rights Reserved ++/ ++*******************************************************************************/ ++ ++#if ! defined( _SoundUtils_h ) ++#define _SoundUtils_h ++ ++#include ++ ++// Simple helper functions that come in handy when doing ++// buffer calculations. ++double us_to_s(bigtime_t usecs); ++bigtime_t s_to_us(double secs); ++ ++int bytes_per_frame(const media_raw_audio_format & format); ++int frames_per_buffer(const media_raw_audio_format & format); ++bigtime_t buffer_duration(const media_raw_audio_format & format); ++bigtime_t frames_duration(const media_raw_audio_format & format, ++ int64 num_frames); ++int64 frames_for_duration(const media_raw_audio_format & format, ++ bigtime_t duration); ++int buffers_for_duration(const media_raw_audio_format & format, ++ bigtime_t duration); ++ ++// This is a common hook function interface for ++// SoundConsumer and SoundProducer to use. ++typedef void (*SoundProcessFunc)(void * cookie, ++ bigtime_t timestamp, void * data, size_t datasize, ++ const media_raw_audio_format & format); ++typedef void (*SoundNotifyFunc)(void * cookie, ++ int32 code, ...); ++ ++// These are special codes that we use in the Notify ++// function hook. ++enum { ++ B_WILL_START = 1, // performance_time ++ B_WILL_STOP, // performance_time immediate ++ B_WILL_SEEK, // performance_time media_time ++ B_WILL_TIMEWARP, // real_time performance_time ++ B_CONNECTED, // name (char*) ++ B_DISCONNECTED, // ++ B_FORMAT_CHANGED, // media_raw_audio_format* ++ B_NODE_DIES, // node will die! ++ B_HOOKS_CHANGED, // ++ B_OP_TIMED_OUT, // timeout that expired -- Consumer only ++ B_PRODUCER_DATA_STATUS, // status performance_time -- Consumer only ++ B_LATE_NOTICE // how_much performance_time -- Producer only ++}; ++ ++#endif /* _SoundUtils_h */ diff --git a/dev-lang/orc/orc-0.4.16.bep b/dev-lang/orc/orc-0.4.16.bep new file mode 100644 index 000000000..d86af92c5 --- /dev/null +++ b/dev-lang/orc/orc-0.4.16.bep @@ -0,0 +1,24 @@ +DESCRIPTION="orc - The Oil Runtime Compiler" +HOMEPAGE="http://code.entropywave.com/orc/" +SRC_URI="http://code.entropywave.com/download/orc/orc-0.4.16.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="e482932e544c847761449b106ecbc483" +BUILD { + cd orc-0.4.16 + autoconf + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd orc-0.4.16 + make install +} + +LICENSE="BSD (2-clause)" +COPYRIGHT="2002 - 2009 David A. Schleef" \ No newline at end of file diff --git a/dev-lang/orc/patches/orc-0.4.16.patch b/dev-lang/orc/patches/orc-0.4.16.patch new file mode 100644 index 000000000..68a87ff5a --- /dev/null +++ b/dev-lang/orc/patches/orc-0.4.16.patch @@ -0,0 +1,11 @@ +--- orc-0.4.16/configure.ac 2011-10-03 03:34:22.054788096 +0000 ++++ orc-0.4.16-haiku/configure.ac 2012-04-08 21:58:47.729808896 +0000 +@@ -97,7 +97,7 @@ + mingw*|pw32*|cygwin*) + AC_DEFINE(HAVE_CODEMEM_VIRTUALALLOC, 1, [Use VirtualAlloc to allocate code for execution]) + ;; +- linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|dragonfly*|gnu*) ++ linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|dragonfly*|gnu*|haiku*) + AC_DEFINE(HAVE_CODEMEM_MMAP, 1, [Use mmap to allocate code for execution]) + ;; + *) diff --git a/dev-lang/perl/patches/perl-5.10.0.patch b/dev-lang/perl/patches/perl-5.10.0.patch index 17d91b08f..832efc29c 100644 --- a/dev-lang/perl/patches/perl-5.10.0.patch +++ b/dev-lang/perl/patches/perl-5.10.0.patch @@ -635,3 +635,25 @@ diff -urN perl-5.10.0.orig/t/io/fs.t perl-5.10.0/t/io/fs.t SKIP: { skip "atime not updated", 1; } +diff -urN perl-5.10.1/Configure perl-5.10.1-haiku/Configure +--- perl-5.10.1/Configure 2009-08-18 19:03:53.024117248 +0000 ++++ perl-5.10.1-haiku/Configure 2012-09-07 13:57:19.000000000 +0000 +@@ -5139,18 +5139,6 @@ + eval $checkccflag + ;; + esac +- +- # on x86_64 (at least) we require an extra library (libssp) in the +- # link command line. This library is not named, so I infer that it is +- # an implementation detail that may change. Hence the safest approach +- # is to add the flag to the flags passed to the compiler at link time, +- # as that way the compiler can do the right implementation dependant +- # thing. (NWC) +- case "$gccversion" in +- ?*) set stack-protector -fstack-protector +- eval $checkccflag +- ;; +- esac + ;; + esac + diff --git a/dev-lang/php/php-5.3.4.bep b/dev-lang/php/php-5.3.4.bep index 16a133e98..f2331a1d4 100644 --- a/dev-lang/php/php-5.3.4.bep +++ b/dev-lang/php/php-5.3.4.bep @@ -9,7 +9,7 @@ BUILD { cd php-5.3.4 cat $(aclocal --print-ac-dir)/libtool.m4 > build/libtool.m4 autoreconf - ./configure --prefix=/boot/common --enable-shared --enable-static + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared --enable-static make } diff --git a/dev-lang/python/patches/python-2.6.7.patch b/dev-lang/python/patches/python-2.6.7.patch new file mode 100644 index 000000000..2ae88818a --- /dev/null +++ b/dev-lang/python/patches/python-2.6.7.patch @@ -0,0 +1,568 @@ +diff -urN Python-2.6.7/Lib/plat-haiku1/IN.py Python-2.6.7-haiku/Lib/plat-haiku1/IN.py +--- Python-2.6.7/Lib/plat-haiku1/IN.py 1970-01-01 00:00:00.000000000 +0000 ++++ Python-2.6.7-haiku/Lib/plat-haiku1/IN.py 2010-08-30 04:52:27.223346688 +0000 +@@ -0,0 +1,327 @@ ++# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h ++ ++# Included from socket.h ++ ++# Included from BeBuild.h ++B_BEOS_VERSION_4 = 0x0400 ++B_BEOS_VERSION_4_5 = 0x0450 ++B_BEOS_VERSION_5 = 0x0500 ++B_BEOS_VERSION = B_BEOS_VERSION_5 ++B_BEOS_VERSION_MAUI = B_BEOS_VERSION_5 ++_PR2_COMPATIBLE_ = 1 ++_PR3_COMPATIBLE_ = 1 ++_R4_COMPATIBLE_ = 1 ++_R4_5_COMPATIBLE_ = 1 ++_PR2_COMPATIBLE_ = 0 ++_PR3_COMPATIBLE_ = 0 ++_R4_COMPATIBLE_ = 1 ++_R4_5_COMPATIBLE_ = 1 ++def _UNUSED(x): return x ++ ++ ++# Included from sys/types.h ++ ++# Included from time.h ++ ++# Included from be_setup.h ++def __std(ref): return ref ++ ++__be_os = 2 ++__dest_os = __be_os ++__MSL__ = 0x4011 ++__GLIBC__ = -2 ++__GLIBC_MINOR__ = 1 ++ ++# Included from null.h ++NULL = (0) ++NULL = 0L ++ ++# Included from size_t.h ++ ++# Included from stddef.h ++ ++# Included from wchar_t.h ++CLOCKS_PER_SEC = 1000 ++CLK_TCK = CLOCKS_PER_SEC ++MAX_TIMESTR = 70 ++ ++# Included from sys/time.h ++ ++# Included from ByteOrder.h ++ ++# Included from endian.h ++__LITTLE_ENDIAN = 1234 ++LITTLE_ENDIAN = __LITTLE_ENDIAN ++__BYTE_ORDER = __LITTLE_ENDIAN ++BYTE_ORDER = __BYTE_ORDER ++__BIG_ENDIAN = 0 ++BIG_ENDIAN = 0 ++__BIG_ENDIAN = 4321 ++BIG_ENDIAN = __BIG_ENDIAN ++__BYTE_ORDER = __BIG_ENDIAN ++BYTE_ORDER = __BYTE_ORDER ++__LITTLE_ENDIAN = 0 ++LITTLE_ENDIAN = 0 ++__PDP_ENDIAN = 3412 ++PDP_ENDIAN = __PDP_ENDIAN ++ ++# Included from SupportDefs.h ++ ++# Included from Errors.h ++ ++# Included from limits.h ++ ++# Included from float.h ++FLT_ROUNDS = 1 ++FLT_RADIX = 2 ++FLT_MANT_DIG = 24 ++FLT_DIG = 6 ++FLT_MIN_EXP = (-125) ++FLT_MIN_10_EXP = (-37) ++FLT_MAX_EXP = 128 ++FLT_MAX_10_EXP = 38 ++DBL_MANT_DIG = 53 ++DBL_DIG = 15 ++DBL_MIN_EXP = (-1021) ++DBL_MIN_10_EXP = (-308) ++DBL_MAX_EXP = 1024 ++DBL_MAX_10_EXP = 308 ++LDBL_MANT_DIG = DBL_MANT_DIG ++LDBL_DIG = DBL_DIG ++LDBL_MIN_EXP = DBL_MIN_EXP ++LDBL_MIN_10_EXP = DBL_MIN_10_EXP ++LDBL_MAX_EXP = DBL_MAX_EXP ++LDBL_MAX_10_EXP = DBL_MAX_10_EXP ++CHAR_BIT = (8) ++SCHAR_MIN = (-127-1) ++SCHAR_MAX = (127) ++CHAR_MIN = SCHAR_MIN ++CHAR_MAX = SCHAR_MAX ++MB_LEN_MAX = (1) ++SHRT_MIN = (-32767-1) ++SHRT_MAX = (32767) ++LONG_MIN = (-2147483647L-1) ++LONG_MAX = (2147483647L) ++INT_MIN = LONG_MIN ++INT_MAX = LONG_MAX ++ARG_MAX = (32768) ++ATEXIT_MAX = (32) ++CHILD_MAX = (1024) ++IOV_MAX = (256) ++FILESIZEBITS = (64) ++LINK_MAX = (1) ++LOGIN_NAME_MAX = (32) ++MAX_CANON = (255) ++MAX_INPUT = (255) ++NAME_MAX = (256) ++NGROUPS_MAX = (32) ++OPEN_MAX = (128) ++PATH_MAX = (1024) ++PIPE_MAX = (512) ++SSIZE_MAX = (2147483647L) ++TTY_NAME_MAX = (256) ++TZNAME_MAX = (32) ++SYMLINKS_MAX = (16) ++_POSIX_ARG_MAX = (32768) ++_POSIX_CHILD_MAX = (1024) ++_POSIX_LINK_MAX = (1) ++_POSIX_LOGIN_NAME_MAX = (9) ++_POSIX_MAX_CANON = (255) ++_POSIX_MAX_INPUT = (255) ++_POSIX_NAME_MAX = (255) ++_POSIX_NGROUPS_MAX = (0) ++_POSIX_OPEN_MAX = (128) ++_POSIX_PATH_MAX = (1024) ++_POSIX_PIPE_BUF = (512) ++_POSIX_SSIZE_MAX = (2147483647L) ++_POSIX_STREAM_MAX = (8) ++_POSIX_TTY_NAME_MAX = (256) ++_POSIX_TZNAME_MAX = (3) ++B_GENERAL_ERROR_BASE = LONG_MIN ++B_OS_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x1000 ++B_APP_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x2000 ++B_INTERFACE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x3000 ++B_MEDIA_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4000 ++B_TRANSLATION_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4800 ++B_MIDI_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x5000 ++B_STORAGE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x6000 ++B_POSIX_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x7000 ++B_MAIL_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x8000 ++B_PRINT_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x9000 ++B_DEVICE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0xa000 ++B_ERRORS_END = (B_GENERAL_ERROR_BASE + 0xffff) ++E2BIG = (B_POSIX_ERROR_BASE + 1) ++ECHILD = (B_POSIX_ERROR_BASE + 2) ++EDEADLK = (B_POSIX_ERROR_BASE + 3) ++EFBIG = (B_POSIX_ERROR_BASE + 4) ++EMLINK = (B_POSIX_ERROR_BASE + 5) ++ENFILE = (B_POSIX_ERROR_BASE + 6) ++ENODEV = (B_POSIX_ERROR_BASE + 7) ++ENOLCK = (B_POSIX_ERROR_BASE + 8) ++ENOSYS = (B_POSIX_ERROR_BASE + 9) ++ENOTTY = (B_POSIX_ERROR_BASE + 10) ++ENXIO = (B_POSIX_ERROR_BASE + 11) ++ESPIPE = (B_POSIX_ERROR_BASE + 12) ++ESRCH = (B_POSIX_ERROR_BASE + 13) ++EFPOS = (B_POSIX_ERROR_BASE + 14) ++ESIGPARM = (B_POSIX_ERROR_BASE + 15) ++EDOM = (B_POSIX_ERROR_BASE + 16) ++ERANGE = (B_POSIX_ERROR_BASE + 17) ++EPROTOTYPE = (B_POSIX_ERROR_BASE + 18) ++EPROTONOSUPPORT = (B_POSIX_ERROR_BASE + 19) ++EPFNOSUPPORT = (B_POSIX_ERROR_BASE + 20) ++EAFNOSUPPORT = (B_POSIX_ERROR_BASE + 21) ++EADDRINUSE = (B_POSIX_ERROR_BASE + 22) ++EADDRNOTAVAIL = (B_POSIX_ERROR_BASE + 23) ++ENETDOWN = (B_POSIX_ERROR_BASE + 24) ++ENETUNREACH = (B_POSIX_ERROR_BASE + 25) ++ENETRESET = (B_POSIX_ERROR_BASE + 26) ++ECONNABORTED = (B_POSIX_ERROR_BASE + 27) ++ECONNRESET = (B_POSIX_ERROR_BASE + 28) ++EISCONN = (B_POSIX_ERROR_BASE + 29) ++ENOTCONN = (B_POSIX_ERROR_BASE + 30) ++ESHUTDOWN = (B_POSIX_ERROR_BASE + 31) ++ECONNREFUSED = (B_POSIX_ERROR_BASE + 32) ++EHOSTUNREACH = (B_POSIX_ERROR_BASE + 33) ++ENOPROTOOPT = (B_POSIX_ERROR_BASE + 34) ++ENOBUFS = (B_POSIX_ERROR_BASE + 35) ++EINPROGRESS = (B_POSIX_ERROR_BASE + 36) ++EALREADY = (B_POSIX_ERROR_BASE + 37) ++EILSEQ = (B_POSIX_ERROR_BASE + 38) ++ENOMSG = (B_POSIX_ERROR_BASE + 39) ++ESTALE = (B_POSIX_ERROR_BASE + 40) ++EOVERFLOW = (B_POSIX_ERROR_BASE + 41) ++EMSGSIZE = (B_POSIX_ERROR_BASE + 42) ++EOPNOTSUPP = (B_POSIX_ERROR_BASE + 43) ++ENOTSOCK = (B_POSIX_ERROR_BASE + 44) ++false = 0 ++true = 1 ++NULL = (0) ++FALSE = 0 ++TRUE = 1 ++ ++# Included from TypeConstants.h ++B_HOST_IS_LENDIAN = 1 ++B_HOST_IS_BENDIAN = 0 ++def B_HOST_TO_LENDIAN_DOUBLE(arg): return (double)(arg) ++ ++def B_HOST_TO_LENDIAN_FLOAT(arg): return (float)(arg) ++ ++def B_HOST_TO_LENDIAN_INT64(arg): return (uint64)(arg) ++ ++def B_HOST_TO_LENDIAN_INT32(arg): return (uint32)(arg) ++ ++def B_HOST_TO_LENDIAN_INT16(arg): return (uint16)(arg) ++ ++def B_HOST_TO_BENDIAN_DOUBLE(arg): return __swap_double(arg) ++ ++def B_HOST_TO_BENDIAN_FLOAT(arg): return __swap_float(arg) ++ ++def B_HOST_TO_BENDIAN_INT64(arg): return __swap_int64(arg) ++ ++def B_HOST_TO_BENDIAN_INT32(arg): return __swap_int32(arg) ++ ++def B_HOST_TO_BENDIAN_INT16(arg): return __swap_int16(arg) ++ ++def B_LENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) ++ ++def B_LENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) ++ ++def B_LENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) ++ ++def B_LENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) ++ ++def B_LENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) ++ ++def B_BENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) ++ ++def B_BENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) ++ ++def B_BENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) ++ ++def B_BENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) ++ ++def B_BENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) ++ ++B_HOST_IS_LENDIAN = 0 ++B_HOST_IS_BENDIAN = 1 ++def B_HOST_TO_LENDIAN_DOUBLE(arg): return __swap_double(arg) ++ ++def B_HOST_TO_LENDIAN_FLOAT(arg): return __swap_float(arg) ++ ++def B_HOST_TO_LENDIAN_INT64(arg): return __swap_int64(arg) ++ ++def B_HOST_TO_LENDIAN_INT32(arg): return __swap_int32(arg) ++ ++def B_HOST_TO_LENDIAN_INT16(arg): return __swap_int16(arg) ++ ++def B_HOST_TO_BENDIAN_DOUBLE(arg): return (double)(arg) ++ ++def B_HOST_TO_BENDIAN_FLOAT(arg): return (float)(arg) ++ ++def B_HOST_TO_BENDIAN_INT64(arg): return (uint64)(arg) ++ ++def B_HOST_TO_BENDIAN_INT32(arg): return (uint32)(arg) ++ ++def B_HOST_TO_BENDIAN_INT16(arg): return (uint16)(arg) ++ ++def B_LENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) ++ ++def B_LENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) ++ ++def B_LENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) ++ ++def B_LENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) ++ ++def B_LENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) ++ ++def B_BENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) ++ ++def B_BENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) ++ ++def B_BENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) ++ ++def B_BENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) ++ ++def B_BENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) ++ ++def B_SWAP_DOUBLE(arg): return __swap_double(arg) ++ ++def B_SWAP_FLOAT(arg): return __swap_float(arg) ++ ++def B_SWAP_INT64(arg): return __swap_int64(arg) ++ ++def B_SWAP_INT32(arg): return __swap_int32(arg) ++ ++def B_SWAP_INT16(arg): return __swap_int16(arg) ++ ++def htonl(x): return B_HOST_TO_BENDIAN_INT32(x) ++ ++def ntohl(x): return B_BENDIAN_TO_HOST_INT32(x) ++ ++def htons(x): return B_HOST_TO_BENDIAN_INT16(x) ++ ++def ntohs(x): return B_BENDIAN_TO_HOST_INT16(x) ++ ++AF_INET = 1 ++INADDR_ANY = 0x00000000 ++INADDR_BROADCAST = 0xffffffff ++INADDR_LOOPBACK = 0x7f000001 ++SOL_SOCKET = 1 ++SO_DEBUG = 1 ++SO_REUSEADDR = 2 ++SO_NONBLOCK = 3 ++SO_REUSEPORT = 4 ++MSG_OOB = 0x1 ++SOCK_DGRAM = 1 ++SOCK_STREAM = 2 ++IPPROTO_UDP = 1 ++IPPROTO_TCP = 2 ++IPPROTO_ICMP = 3 ++B_UDP_MAX_SIZE = (65536 - 1024) ++FD_SETSIZE = 256 ++FDSETSIZE = FD_SETSIZE ++NFDBITS = 32 ++def _FDMSKNO(fd): return ((fd) / NFDBITS) ++ ++def _FDBITNO(fd): return ((fd) % NFDBITS) +diff -urN Python-2.6.7/Lib/plat-haiku1/regen Python-2.6.7-haiku/Lib/plat-haiku1/regen +--- Python-2.6.7/Lib/plat-haiku1/regen 1970-01-01 00:00:00.000000000 +0000 ++++ Python-2.6.7-haiku/Lib/plat-haiku1/regen 2010-08-30 04:52:27.237502464 +0000 +@@ -0,0 +1,7 @@ ++#! /bin/sh ++ ++H2PY=../../Tools/scripts/h2py.py ++HEADERS=/boot/develop/headers ++ ++set -v ++python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h +diff -urN Python-2.6.7/Modules/resource.c Python-2.6.7-haiku/Modules/resource.c +--- Python-2.6.7/Modules/resource.c 2010-05-09 15:15:40.053739520 +0000 ++++ Python-2.6.7-haiku/Modules/resource.c 2010-08-30 04:52:24.666370048 +0000 +@@ -86,6 +86,7 @@ + PyFloat_FromDouble(doubletime(ru.ru_utime))); + PyStructSequence_SET_ITEM(result, 1, + PyFloat_FromDouble(doubletime(ru.ru_stime))); ++#ifndef __HAIKU__ + PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss)); + PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss)); + PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss)); +@@ -100,7 +101,7 @@ + PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); + PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); + PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); +- ++#endif + if (PyErr_Occurred()) { + Py_DECREF(result); + return NULL; +diff -urN Python-2.6.7/Modules/socketmodule.c Python-2.6.7-haiku/Modules/socketmodule.c +--- Python-2.6.7/Modules/socketmodule.c 2010-05-23 15:22:08.054525952 +0000 ++++ Python-2.6.7-haiku/Modules/socketmodule.c 2010-08-30 04:53:35.429916160 +0000 +@@ -4661,7 +4661,9 @@ + #ifndef __BEOS__ + /* We have incomplete socket support. */ + PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW); +- PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); ++#ifndef __HAIKU__ ++ PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); ++#endif + #if defined(SOCK_RDM) + PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); + #endif +diff -urN Python-2.6.7/Modules/socketmodule.h Python-2.6.7-haiku/Modules/socketmodule.h +--- Python-2.6.7/Modules/socketmodule.h 2010-05-09 15:15:40.053739520 +0000 ++++ Python-2.6.7-haiku/Modules/socketmodule.h 2010-08-30 04:52:24.667942912 +0000 +@@ -47,6 +47,10 @@ + # undef AF_NETLINK + #endif + ++#if defined(__HAIKU__) ++#undef HAVE_BLUETOOTH_BLUETOOTH_H ++#endif ++ + #ifdef HAVE_BLUETOOTH_BLUETOOTH_H + #include + #include +diff -urN Python-2.6.7/Modules/spwdmodule.c Python-2.6.7-haiku/Modules/spwdmodule.c +--- Python-2.6.7/Modules/spwdmodule.c 2010-05-09 15:15:40.030408704 +0000 ++++ Python-2.6.7-haiku/Modules/spwdmodule.c 2010-08-30 04:52:24.709623808 +0000 +@@ -79,7 +79,9 @@ + + SETS(setIndex++, p->sp_namp); + SETS(setIndex++, p->sp_pwdp); ++#ifndef __HAIKU__ + SETI(setIndex++, p->sp_lstchg); ++#endif + SETI(setIndex++, p->sp_min); + SETI(setIndex++, p->sp_max); + SETI(setIndex++, p->sp_warn); +diff -urN Python-2.6.7/Modules/timemodule.c Python-2.6.7-haiku/Modules/timemodule.c +--- Python-2.6.7/Modules/timemodule.c 2010-05-09 15:15:40.015204352 +0000 ++++ Python-2.6.7-haiku/Modules/timemodule.c 2010-08-30 04:52:24.721944576 +0000 +@@ -972,11 +972,11 @@ + return -1; + } + Py_END_ALLOW_THREADS +-#elif defined(__BEOS__) ++#elif defined(__BEOS__) || defined(__HAIKU__) + /* This sleep *CAN BE* interrupted. */ + { + if( secs <= 0.0 ) { +- return; ++ return 0; + } + + Py_BEGIN_ALLOW_THREADS +diff -urN Python-2.6.7/Parser/asdl_c.py Python-2.6.7-haiku/Parser/asdl_c.py +--- Python-2.6.7/Parser/asdl_c.py 2009-12-13 00:59:01.059768832 +0000 ++++ Python-2.6.7-haiku/Parser/asdl_c.py 2010-08-30 04:52:27.169607168 +0000 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /bin/env python + """Generate C code from an ASDL description.""" + + # TO DO +diff -urN Python-2.6.7/Python/bltinmodule.c Python-2.6.7-haiku/Python/bltinmodule.c +--- Python-2.6.7/Python/bltinmodule.c 2010-05-09 15:15:40.065011712 +0000 ++++ Python-2.6.7-haiku/Python/bltinmodule.c 2010-08-30 04:52:27.186646528 +0000 +@@ -18,7 +18,7 @@ + */ + #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) + const char *Py_FileSystemDefaultEncoding = "mbcs"; +-#elif defined(__APPLE__) ++#elif defined(__APPLE__) || defined(__HAIKU__) + const char *Py_FileSystemDefaultEncoding = "utf-8"; + #else + const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ +diff -urN Python-2.6.7/Tools/scripts/h2py.py Python-2.6.7-haiku/Tools/scripts/h2py.py +--- Python-2.6.7/Tools/scripts/h2py.py 2004-08-09 17:27:55.066584576 +0000 ++++ Python-2.6.7-haiku/Tools/scripts/h2py.py 2010-08-30 04:52:27.188219392 +0000 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /bin/env python + + # Read #define's and translate to Python code. + # Handle #include statements. +@@ -50,7 +50,7 @@ + searchdirs=os.environ['INCLUDE'].split(';') + except KeyError: + try: +- if sys.platform.find("beos") == 0: ++ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: + searchdirs=os.environ['BEINCLUDES'].split(';') + elif sys.platform.startswith("atheos"): + searchdirs=os.environ['C_INCLUDE_PATH'].split(':') +diff -urN Python-2.6.7/configure.in Python-2.6.7-haiku/configure.in +--- Python-2.6.7/configure.in 2010-05-25 02:27:03.064225280 +0000 ++++ Python-2.6.7-haiku/configure.in 2010-08-30 04:52:27.207880192 +0000 +@@ -745,7 +745,7 @@ + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) ++ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} +@@ -823,7 +823,7 @@ + AC_SUBST(LN) + if test -z "$LN" ; then + case $ac_sys_system in +- BeOS*) LN="ln -s";; ++ BeOS*|Haiku*) LN="ln -s";; + CYGWIN*) LN="ln -s";; + atheos*) LN="ln -s";; + *) LN=ln;; +@@ -1829,7 +1829,7 @@ + fi + fi + ;; +- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; ++ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; + BSD/OS*/4*) LDSHARED="gcc -shared";; + FreeBSD*) + if [[ "`$CC -dM -E - + #include +diff -urN Python-2.6.8/Modules/spwdmodule.c Python-2.6.8-haiku/Modules/spwdmodule.c +--- Python-2.6.8/Modules/spwdmodule.c 2010-05-09 15:15:40.030408704 +0000 ++++ Python-2.6.8-haiku/Modules/spwdmodule.c 2010-08-30 04:52:24.709623808 +0000 +@@ -79,7 +79,9 @@ + + SETS(setIndex++, p->sp_namp); + SETS(setIndex++, p->sp_pwdp); ++#ifndef __HAIKU__ + SETI(setIndex++, p->sp_lstchg); ++#endif + SETI(setIndex++, p->sp_min); + SETI(setIndex++, p->sp_max); + SETI(setIndex++, p->sp_warn); +diff -urN Python-2.6.8/Modules/timemodule.c Python-2.6.8-haiku/Modules/timemodule.c +--- Python-2.6.8/Modules/timemodule.c 2010-05-09 15:15:40.015204352 +0000 ++++ Python-2.6.8-haiku/Modules/timemodule.c 2010-08-30 04:52:24.721944576 +0000 +@@ -972,11 +972,11 @@ + return -1; + } + Py_END_ALLOW_THREADS +-#elif defined(__BEOS__) ++#elif defined(__BEOS__) || defined(__HAIKU__) + /* This sleep *CAN BE* interrupted. */ + { + if( secs <= 0.0 ) { +- return; ++ return 0; + } + + Py_BEGIN_ALLOW_THREADS +diff -urN Python-2.6.8/Parser/asdl_c.py Python-2.6.8-haiku/Parser/asdl_c.py +--- Python-2.6.8/Parser/asdl_c.py 2009-12-13 00:59:01.059768832 +0000 ++++ Python-2.6.8-haiku/Parser/asdl_c.py 2010-08-30 04:52:27.169607168 +0000 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /bin/env python + """Generate C code from an ASDL description.""" + + # TO DO +diff -urN Python-2.6.8/Python/bltinmodule.c Python-2.6.8-haiku/Python/bltinmodule.c +--- Python-2.6.8/Python/bltinmodule.c 2010-05-09 15:15:40.065011712 +0000 ++++ Python-2.6.8-haiku/Python/bltinmodule.c 2010-08-30 04:52:27.186646528 +0000 +@@ -18,7 +18,7 @@ + */ + #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) + const char *Py_FileSystemDefaultEncoding = "mbcs"; +-#elif defined(__APPLE__) ++#elif defined(__APPLE__) || defined(__HAIKU__) + const char *Py_FileSystemDefaultEncoding = "utf-8"; + #else + const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ +diff -urN Python-2.6.8/Tools/scripts/h2py.py Python-2.6.8-haiku/Tools/scripts/h2py.py +--- Python-2.6.8/Tools/scripts/h2py.py 2004-08-09 17:27:55.066584576 +0000 ++++ Python-2.6.8-haiku/Tools/scripts/h2py.py 2010-08-30 04:52:27.188219392 +0000 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /bin/env python + + # Read #define's and translate to Python code. + # Handle #include statements. +@@ -50,7 +50,7 @@ + searchdirs=os.environ['INCLUDE'].split(';') + except KeyError: + try: +- if sys.platform.find("beos") == 0: ++ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: + searchdirs=os.environ['BEINCLUDES'].split(';') + elif sys.platform.startswith("atheos"): + searchdirs=os.environ['C_INCLUDE_PATH'].split(':') +diff -urN Python-2.6.8/configure.in Python-2.6.8-haiku/configure.in +--- Python-2.6.8/configure.in 2010-05-25 02:27:03.064225280 +0000 ++++ Python-2.6.8-haiku/configure.in 2010-08-30 04:52:27.207880192 +0000 +@@ -745,7 +745,7 @@ + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) ++ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} +@@ -823,7 +823,7 @@ + AC_SUBST(LN) + if test -z "$LN" ; then + case $ac_sys_system in +- BeOS*) LN="ln -s";; ++ BeOS*|Haiku*) LN="ln -s";; + CYGWIN*) LN="ln -s";; + atheos*) LN="ln -s";; + *) LN=ln;; +@@ -1829,7 +1829,7 @@ + fi + fi + ;; +- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; ++ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; + BSD/OS*/4*) LDSHARED="gcc -shared";; + FreeBSD*) + if [[ "`$CC -dM -E - + #include +diff -urN Python-3.2/Modules/spwdmodule.c Python-3.2-haiku/Modules/spwdmodule.c +--- Python-3.2/Modules/spwdmodule.c 2010-05-15 16:27:27.011534336 +0000 ++++ Python-3.2-haiku/Modules/spwdmodule.c 2010-11-22 11:11:57.802422784 +0000 +@@ -80,7 +80,9 @@ + + SETS(setIndex++, p->sp_namp); + SETS(setIndex++, p->sp_pwdp); ++#ifndef __HAIKU__ + SETI(setIndex++, p->sp_lstchg); ++#endif + SETI(setIndex++, p->sp_min); + SETI(setIndex++, p->sp_max); + SETI(setIndex++, p->sp_warn); +diff -urN Python-3.2/Python/bltinmodule.c Python-3.2-haiku/Python/bltinmodule.c +--- Python-3.2/Python/bltinmodule.c 2010-10-17 20:54:53.028049408 +0000 ++++ Python-3.2-haiku/Python/bltinmodule.c 2010-11-22 11:11:57.832831488 +0000 +@@ -22,7 +22,7 @@ + #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) + const char *Py_FileSystemDefaultEncoding = "mbcs"; + int Py_HasFileSystemDefaultEncoding = 1; +-#elif defined(__APPLE__) ++#elif defined(__APPLE__) || defined(__HAIKU__) + const char *Py_FileSystemDefaultEncoding = "utf-8"; + int Py_HasFileSystemDefaultEncoding = 1; + #elif defined(HAVE_LANGINFO_H) && defined(CODESET) +diff -urN Python-3.2/configure.in Python-3.2-haiku/configure.in +--- Python-3.2/configure.in 2010-11-01 01:44:30.004980736 +0000 ++++ Python-3.2-haiku/configure.in 2010-11-22 11:14:04.316407808 +0000 +@@ -292,6 +292,7 @@ + case $MACHDEP in + cygwin*) MACHDEP="cygwin";; + darwin*) MACHDEP="darwin";; ++ haiku*) MACHDEP="haiku";; + irix646) MACHDEP="irix6";; + '') MACHDEP="unknown";; + esac +@@ -738,7 +739,7 @@ + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) ++ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) + LDLIBRARY='libpython$(LDVERSION).so' + BLDLIBRARY='-L. -lpython$(LDVERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} +@@ -823,6 +824,7 @@ + if test -z "$LN" ; then + case $ac_sys_system in + CYGWIN*) LN="ln -s";; ++ Haiku*) LN="ln -s";; + *) LN=ln;; + esac + fi +@@ -1709,7 +1711,7 @@ + fi + fi + ;; +- Linux*|GNU*|QNX*) ++ Linux*|GNU*|QNX*|Haiku*) + LDSHARED='$(CC) -shared' + LDCXXSHARED='$(CXX) -shared';; + BSD/OS*/4*) +@@ -1778,7 +1780,7 @@ + then CCSHARED="-fPIC"; + else CCSHARED="+z"; + fi;; +- Linux*|GNU*) CCSHARED="-fPIC";; ++ Linux*|GNU*|Haiku*) CCSHARED="-fPIC";; + BSD/OS*/4*) CCSHARED="-fpic";; + FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; + OpenUNIX*|UnixWare*) +@@ -1809,7 +1811,7 @@ + LINKFORSHARED="-Wl,-E -Wl,+s";; + # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; + BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";; +- Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; ++ Linux*|GNU*|Haiku*) LINKFORSHARED="-Xlinker -export-dynamic";; + # -u libsys_s pulls in all symbols in libsys + Darwin/*) + LINKFORSHARED="$extra_undefs -framework CoreFoundation" +@@ -1920,6 +1922,8 @@ + AC_CHECK_LIB(nsl, t_open, [LIBS="-lnsl $LIBS"]) # SVR4 + AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets + ++AC_CHECK_LIB(network, socket, [LIBS="-lnetwork $LIBS"], [], $LIBS) # For Haiku ++ + AC_MSG_CHECKING(for --with-libs) + AC_ARG_WITH(libs, + AS_HELP_STRING([--with-libs='lib1 ...'], [link against additional libs]), +@@ -3192,7 +3196,7 @@ + # check for --with-libm=... + AC_SUBST(LIBM) + case $ac_sys_system in +-Darwin) ;; ++Darwin|Haiku*) ;; + *) LIBM=-lm + esac + AC_MSG_CHECKING(for --with-libm=STRING) +diff -urN Python-3.2/setup.py Python-3.2-haiku/setup.py +--- Python-3.2/setup.py 2010-10-31 17:11:02.000000000 +0000 ++++ Python-3.2-haiku/setup.py 2010-11-22 11:11:58.034603008 +0000 +@@ -429,6 +429,10 @@ + platform = self.get_platform() + srcdir = sysconfig.get_config_var('srcdir') + ++ if platform == 'haiku1': ++ inc_dirs += ['/boot/develop/headers/posix', '/boot/develop/headers/3rdparty', '/boot/common/include'] ++ lib_dirs += ['/boot/system/lib', '/boot/develop/lib/x86', '/boot/common/lib'] ++ + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) + if platform in ['osf1', 'unixware7', 'openunix8']: + lib_dirs += ['/usr/ccs/lib'] +@@ -450,9 +454,9 @@ + if item.startswith('-L'): + lib_dirs.append(item[2:]) + +- # Check for MacOS X, which doesn't need libm.a at all ++ # Check for MacOS X or Haiku, which don't need libm.a at all + math_libs = ['m'] +- if platform == 'darwin': ++ if platform == 'darwin' or platform == 'haiku': + math_libs = [] + + # XXX Omitted modules: gl, pure, dl, SGI-specific modules +@@ -1110,7 +1114,7 @@ + exts.append( Extension('resource', ['resource.c']) ) + + # Sun yellow pages. Some systems have the functions in libc. +- if (platform not in ['cygwin', 'qnx6'] and ++ if (platform not in ['cygwin', 'qnx6', 'haiku'] and + find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None): + if (self.compiler.find_library_file(lib_dirs, 'nsl')): + libs = ['nsl'] diff --git a/dev-lang/python/python-2.5.4.bep b/dev-lang/python/python-2.5.4.bep index a3a0e2e45..90c98e358 100644 --- a/dev-lang/python/python-2.5.4.bep +++ b/dev-lang/python/python-2.5.4.bep @@ -16,7 +16,7 @@ BUILD { libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=/boot/common --enable-shared LDFLAGS=-L/boot/common/lib CFLAGS=-I/boot/develop/headers/3rdparty + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared LDFLAGS=-L/boot/common/lib CFLAGS=-I/boot/develop/headers/3rdparty make } diff --git a/dev-lang/python/python-2.6.4.bep b/dev-lang/python/python-2.6.4.bep index bc81ee33e..b372618e3 100644 --- a/dev-lang/python/python-2.6.4.bep +++ b/dev-lang/python/python-2.6.4.bep @@ -13,7 +13,7 @@ BUILD { libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=/boot/common --enable-shared CFLAGS=-I/boot/develop/headers/3rdparty + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared CFLAGS=-I/boot/develop/headers/3rdparty make } diff --git a/dev-lang/python/python-2.6.5.bep b/dev-lang/python/python-2.6.5.bep index 903d0804f..b1b1afb6d 100644 --- a/dev-lang/python/python-2.6.5.bep +++ b/dev-lang/python/python-2.6.5.bep @@ -13,7 +13,7 @@ BUILD { libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=/boot/common --enable-shared LDFLAGS=-L/boot/common/lib CFLAGS=-I/boot/develop/headers/3rdparty + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared LDFLAGS=-L/boot/common/lib CFLAGS=-I/boot/develop/headers/3rdparty make } diff --git a/dev-lang/python/python-2.6.6.bep b/dev-lang/python/python-2.6.6.bep index 88f99fc38..172740f87 100644 --- a/dev-lang/python/python-2.6.6.bep +++ b/dev-lang/python/python-2.6.6.bep @@ -13,7 +13,10 @@ BUILD { libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=/boot/common --enable-shared LDFLAGS=-L/boot/common/lib CFLAGS=-I/boot/develop/headers/3rdparty + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-shared LDFLAGS=-L/boot/common/lib \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + CFLAGS=-I/boot/develop/headers/3rdparty make } diff --git a/dev-lang/python/python-3.2a3.bep b/dev-lang/python/python-2.6.7.bep similarity index 65% rename from dev-lang/python/python-3.2a3.bep rename to dev-lang/python/python-2.6.7.bep index 24d33231c..f4bca719a 100644 --- a/dev-lang/python/python-3.2a3.bep +++ b/dev-lang/python/python-2.6.7.bep @@ -1,12 +1,12 @@ DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/3.2/Python-3.2a3.tar.bz2" -CHECKSUM_MD5="2c7f690e6de62691a0427328a9654290" +SRC_URI="http://www.python.org/ftp/python/2.6.7/Python-2.6.7.tar.bz2" +CHECKSUM_MD5="d40ef58ed88438a870bbeb0ac5d4217b" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/readline >= 6.0" BUILD { - cd Python-3.2a3/Modules/_ctypes/libffi + cd Python-2.6.7/Modules/_ctypes/libffi libtoolize --force --copy --install cd ../../.. echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in @@ -14,19 +14,19 @@ BUILD { aclocal autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-shared \ - LDFLAGS=-L/boot/common/lib \ + --enable-shared LDFLAGS=-L/boot/common/lib \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ CFLAGS=-I/boot/develop/headers/3rdparty make } INSTALL { - cd Python-3.2a3 + cd Python-2.6.7 make install } TEST { - cd Python-3.2a3 + cd Python-2.6.7 cd Lib/test rm test_asynchat.py # this one stalls, so skip it for now rm test_multiprocessing.py # this one stalls, so skip it for now @@ -35,4 +35,4 @@ TEST { } LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" +COPYRIGHT="1990-2011, Python Software Foundation" diff --git a/dev-lang/python/python-3.2a4.bep b/dev-lang/python/python-2.6.8.bep similarity index 65% rename from dev-lang/python/python-3.2a4.bep rename to dev-lang/python/python-2.6.8.bep index 94cc20c39..8fe22dd32 100644 --- a/dev-lang/python/python-3.2a4.bep +++ b/dev-lang/python/python-2.6.8.bep @@ -1,12 +1,12 @@ DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/3.2/Python-3.2a4.tar.bz2" -CHECKSUM_MD5="1f94db4c5e56454e3eec26eafae43e6e" +SRC_URI="http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2" +CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/readline >= 6.0" BUILD { - cd Python-3.2a4/Modules/_ctypes/libffi + cd Python-2.6.8/Modules/_ctypes/libffi libtoolize --force --copy --install cd ../../.. echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in @@ -14,19 +14,19 @@ BUILD { aclocal autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-shared \ - LDFLAGS=-L/boot/common/lib \ + --enable-shared LDFLAGS=-L/boot/common/lib \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ CFLAGS=-I/boot/develop/headers/3rdparty make } INSTALL { - cd Python-3.2a4 + cd Python-2.6.8 make install } TEST { - cd Python-3.2a4 + cd Python-2.6.8 cd Lib/test rm test_asynchat.py # this one stalls, so skip it for now rm test_multiprocessing.py # this one stalls, so skip it for now @@ -35,4 +35,4 @@ TEST { } LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" +COPYRIGHT="1990-2012, Python Software Foundation" diff --git a/dev-lang/python/python-2.7a1.bep b/dev-lang/python/python-2.7a1.bep deleted file mode 100644 index 169df3a5d..000000000 --- a/dev-lang/python/python-2.7a1.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/2.7/Python-2.7a1.tgz" -CHECKSUM_MD5="1dead8228f03928b69c123ef32ab36c0" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd Python-2.7a1/Modules/_ctypes/libffi - libtoolize --force --copy --install - cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=/boot/common --enable-shared CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL { - cd Python-2.7a1 - make install -} -LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" diff --git a/dev-lang/python/python-3.2b2.bep b/dev-lang/python/python-3.2.bep similarity index 61% rename from dev-lang/python/python-3.2b2.bep rename to dev-lang/python/python-3.2.bep index f51a73a36..fe7bb3ef1 100644 --- a/dev-lang/python/python-3.2b2.bep +++ b/dev-lang/python/python-3.2.bep @@ -1,12 +1,12 @@ DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/3.2/Python-3.2b2.tar.bz2" -CHECKSUM_MD5="45ab5ff5edfb73ec277b1c763f3d5a42" +SRC_URI="http://www.python.org/ftp/python/3.2/Python-3.2.tar.bz2" +CHECKSUM_MD5="92e94b5b6652b96349d6362b8337811d" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/readline >= 6.0" BUILD { - cd Python-3.2b2/Modules/_ctypes/libffi + cd Python-3.2/Modules/_ctypes/libffi libtoolize --force --copy --install cd ../../.. echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in @@ -15,18 +15,19 @@ BUILD { autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --enable-shared \ - LDFLAGS=-L/boot/common/lib \ - CFLAGS=-I/boot/develop/headers/3rdparty + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY/man` \ + CFLAGS=-I`finddir B_COMMON_DIRECTORY`/include + ln -sf `pwd`/libpython3.2m.so.1.0 /boot/common/lib/libpython3.2m.so.1.0 make } INSTALL { - cd Python-3.2b2 + cd Python-3.2 make install } TEST { - cd Python-3.2b2 + cd Python-3.2 cd Lib/test rm test_asynchat.py # this one stalls, so skip it for now rm test_multiprocessing.py # this one stalls, so skip it for now @@ -35,4 +36,4 @@ TEST { } LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" +COPYRIGHT="1990-2011, Python Software Foundation" diff --git a/dev-lang/rebol/rebol-2.101.0.5.75.bep b/dev-lang/rebol/rebol-2.101.0.5.75.bep new file mode 100644 index 000000000..135c0d76a --- /dev/null +++ b/dev-lang/rebol/rebol-2.101.0.5.75.bep @@ -0,0 +1,33 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + cd r3-master/make + wget http://metaeducation.com/media/shared/haiku/r3-make.zip + unzip r3-make.zip + make make OS_ID=0.5.75 + make prep + make +} + +INSTALL { + cd r3-master/make + mkdir -p $DESTDIR`finddir B_COMMON_BIN_DIRECTORY` + install -m 0755 r3 $DESTDIR`finddir B_COMMON_BIN_DIRECTORY`/rebol +} + +TEST { + mkdir -p tests + cd tests + wget -N https://github.com/rebolsource/rebol-test/archive/master.zip + unzip -o master + ../r3-master/make/r3 rebol-test-master/run-safe.r +} + +LICENSE="Apache v2" +COPYRIGHT="2013 REBOL Technologies" diff --git a/dev-lang/ruby/ruby-1.9.1.bep b/dev-lang/ruby/ruby-1.9.1.bep index f702dd419..c8f874a77 100644 --- a/dev-lang/ruby/ruby-1.9.1.bep +++ b/dev-lang/ruby/ruby-1.9.1.bep @@ -4,11 +4,13 @@ SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-p243.tar.gz" CHECKSUM_MD5="515bfd965814e718c0943abf3dde5494" REVISION="2" STATUS_HAIKU="stable" -DEPEND="dev-lang/ruby >= 1.8.7" +DEPEND="dev-libs/libedit >= 20100424" BUILD { cd ruby-1.9.1-p243 autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY`/ruby make } @@ -16,6 +18,7 @@ INSTALL { cd ruby-1.9.1-p243 make install } + LICENSE="Ruby GNU GPL v2 GNU LGPL v2.1 diff --git a/dev-lang/swi-prolog/licenses/SWI-Prolog b/dev-lang/swi-prolog/licenses/SWI-Prolog new file mode 100644 index 000000000..1359a2de0 --- /dev/null +++ b/dev-lang/swi-prolog/licenses/SWI-Prolog @@ -0,0 +1,5 @@ +The SWI-Prolog Prolog libraries + +Lacking a satisfactory technical solution to handle article 6 of the LGPL, this license cannot be used for the Prolog source code that is part of the SWI-Prolog system (both libraries and kernel code). This situation is comparable to libgcc, the runtime library used with the GNU C-compiler. Therefore, we use the same proven license terms as this library. The libgcc license is the GPL, accompanied with a special exception. Below we rephrased this exception adjusted to our needs: + +As a special exception, if you link this library with other files, compiled with a Free Software compiler, to produce an executable, this library does not by itself cause the resulting executable to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the executable file might be covered by the GNU General Public License. diff --git a/dev-lang/swi-prolog/patches/swi-prolog-6.0.2.patch b/dev-lang/swi-prolog/patches/swi-prolog-6.0.2.patch new file mode 100644 index 000000000..9fe4959fd --- /dev/null +++ b/dev-lang/swi-prolog/patches/swi-prolog-6.0.2.patch @@ -0,0 +1,68 @@ +diff -Naur pl-6.0.2/src/configure.in pl-6.0.2-haiku/src/configure.in +--- pl-6.0.2/src/configure.in 2012-03-04 13:12:01.001835008 +0000 ++++ pl-6.0.2-haiku/src/configure.in 2012-08-20 21:39:21.649330688 +0100 +@@ -689,6 +689,10 @@ + AC_DEFINE(_THREAD_SAFE, 1, + [Required in FreeBSD for compiling thread-safe code]) + ;; ++ *haiku*) ++ pthread_ok=true ++ CFLAGS="$CFLAGS -lroot" ++ ;; + *-win32|*-win64) + pthread_ok=true + AC_CHECK_LIB(pthreadGC2, pthread_create) +diff -Naur pl-6.0.2/src/os/pl-files.c pl-6.0.2-haiku/src/os/pl-files.c +--- pl-6.0.2/src/os/pl-files.c 2012-03-04 13:12:01.011272192 +0000 ++++ pl-6.0.2-haiku/src/os/pl-files.c 2012-08-23 14:45:48.981204992 +0100 +@@ -239,7 +239,7 @@ + return TRUE; + } + +-#ifdef __unix__ /* doesn't work on most not Unix's */ ++#if defined(__unix__) || defined(__HAIKU__) /* doesn't work on most not Unix's */ + { statstruct buf1; + statstruct buf2; + char tmp[MAXPATHLEN]; +diff -Naur pl-6.0.2/src/os/pl-os.c pl-6.0.2-haiku/src/os/pl-os.c +--- pl-6.0.2/src/os/pl-os.c 2012-03-04 13:12:01.011796480 +0000 ++++ pl-6.0.2-haiku/src/os/pl-os.c 2012-08-23 16:02:11.794034176 +0100 +@@ -590,7 +590,7 @@ + } + + retry: +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + { static int MTOK_temp_counter = 0; + const char *sep = id[0] ? "_" : ""; + +@@ -732,7 +732,7 @@ + } + #endif /* O_HPFS */ + +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + char * + PrologPath(const char *p, char *buf, size_t len) + { strncpy(buf, p, len); +@@ -2436,7 +2436,7 @@ + return strcpy(buffer, file ? file : buf); + } + +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + static char * + okToExec(const char *s) + { statstruct stbuff; +diff -Naur pl-6.0.2/src/pl-term.c pl-6.0.2-haiku/src/pl-term.c +--- pl-6.0.2/src/pl-term.c 2012-03-04 13:12:01.023592960 +0000 ++++ pl-6.0.2-haiku/src/pl-term.c 2012-08-08 20:03:23.111673344 +0100 +@@ -296,7 +296,7 @@ + term_t r = A1; + term_t c = A2; + +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + int iorval; + + #ifdef TIOCGSIZE diff --git a/dev-lang/swi-prolog/patches/swi-prolog-6.2.0.patch b/dev-lang/swi-prolog/patches/swi-prolog-6.2.0.patch new file mode 100644 index 000000000..24003d3d5 --- /dev/null +++ b/dev-lang/swi-prolog/patches/swi-prolog-6.2.0.patch @@ -0,0 +1,67 @@ +diff -Naur pl-6.2.0/src/configure.in pl-6.2.0-haiku/src/configure.in +--- pl-6.2.0/src/configure.in 2012-08-21 13:12:53.016777216 +0100 ++++ pl-6.2.0-haiku/src/configure.in 2012-08-23 17:06:25.987758592 +0100 +@@ -728,6 +728,9 @@ + AC_DEFINE(_THREAD_SAFE, 1, + [Required in FreeBSD for compiling thread-safe code]) + ;; ++ *-haiku*) ++ pthread_ok=true ++ ;; + *-win32|*-win64) + pthread_ok=true + AC_CHECK_LIB(pthreadGC2, pthread_create) +diff -Naur pl-6.2.0/src/os/pl-files.c pl-6.2.0-haiku/src/os/pl-files.c +--- pl-6.2.0/src/os/pl-files.c 2012-08-21 13:12:53.026214400 +0100 ++++ pl-6.2.0-haiku/src/os/pl-files.c 2012-08-23 17:07:04.695992320 +0100 +@@ -302,7 +302,7 @@ + return TRUE; + } + +-#ifdef __unix__ /* doesn't work on most not Unix's */ ++#if defined(__unix__) || defined(__HAIKU__) /* doesn't work on most not Unix's */ + { statstruct buf1; + statstruct buf2; + char tmp[MAXPATHLEN]; +diff -Naur pl-6.2.0/src/os/pl-os.c pl-6.2.0-haiku/src/os/pl-os.c +--- pl-6.2.0/src/os/pl-os.c 2012-08-21 13:12:53.027000832 +0100 ++++ pl-6.2.0-haiku/src/os/pl-os.c 2012-08-23 17:09:14.962330624 +0100 +@@ -601,7 +601,7 @@ + } + + retry: +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + { static int MTOK_temp_counter = 0; + const char *sep = id[0] ? "_" : ""; + +@@ -743,7 +743,7 @@ + } + #endif /* O_HPFS */ + +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + char * + PrologPath(const char *p, char *buf, size_t len) + { strncpy(buf, p, len); +@@ -2507,7 +2507,7 @@ + return strcpy(buffer, file ? file : buf); + } + +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + static char * + okToExec(const char *s) + { statstruct stbuff; +diff -Naur pl-6.2.0/src/pl-term.c pl-6.2.0-haiku/src/pl-term.c +--- pl-6.2.0/src/pl-term.c 2012-08-21 13:12:53.038535168 +0100 ++++ pl-6.2.0-haiku/src/pl-term.c 2012-08-23 17:09:57.306708480 +0100 +@@ -296,7 +296,7 @@ + term_t r = A1; + term_t c = A2; + +-#ifdef __unix__ ++#if defined(__unix__) || defined(__HAIKU__) + int iorval; + + #ifdef TIOCGSIZE diff --git a/dev-lang/swi-prolog/swi-prolog-6.0.2.bep b/dev-lang/swi-prolog/swi-prolog-6.0.2.bep new file mode 100644 index 000000000..5e8b7c7e2 --- /dev/null +++ b/dev-lang/swi-prolog/swi-prolog-6.0.2.bep @@ -0,0 +1,29 @@ +DESCRIPTION="SWI Prolog. Stable and free standard Prolog implementation" +HOMEPAGE="http://www.swi-prolog.org/" +SRC_URI="http://www.swi-prolog.org/download/stable/src/pl-6.0.2.tar.gz" +CHECKSUM_MD5="dcde1c50713317d0f5093dd2dedc1bd0" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/gmp >= 5.0.5 + sys-libs/readline >= 6.2" +BUILD { + cd pl-6.0.2/src + libtoolize -fci + autoreconf + LDFLAGS=-L/boot/common/lib CFLAGS=-I/boot/common/include ./configure --prefix=$(finddir B_COMMON_DIRECTORY) + make +} + +INSTALL { + cd pl-6.0.2/src + make install +} + +TEST { + cd pl-6.0.2/src + make check +} + +LICENSE="GNU LGPL v2.1 + SWI-Prolog" +COPYRIGHT="1985-2010, University of Amsterdam, VU University Amsterdam" diff --git a/dev-lang/swi-prolog/swi-prolog-6.2.0.bep b/dev-lang/swi-prolog/swi-prolog-6.2.0.bep new file mode 100644 index 000000000..af37884a6 --- /dev/null +++ b/dev-lang/swi-prolog/swi-prolog-6.2.0.bep @@ -0,0 +1,29 @@ +DESCRIPTION="SWI Prolog. Stable and free standard Prolog implementation" +HOMEPAGE="http://www.swi-prolog.org/" +SRC_URI="http://www.swi-prolog.org/download/stable/src/pl-6.2.0.tar.gz" +CHECKSUM_MD5="969ed2e00b7afc1537fbf19d667333c5" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/gmp >= 5.0.5 + sys-libs/readline >= 6.2" +BUILD { + cd pl-6.2.0/src + libtoolize -fci + autoreconf + LDFLAGS=-L/boot/common/lib CFLAGS=-I/boot/common/include ./configure --prefix=$(finddir B_COMMON_DIRECTORY) + make +} + +INSTALL { + cd pl-6.2.0/src + make install +} + +TEST { + cd pl-6.2.0/src + make check +} + +LICENSE="GNU LGPL v2.1 + SWI-Prolog" +COPYRIGHT="1985-2012, University of Amsterdam, VU University Amsterdam" diff --git a/dev-lang/swig/swig-1.3.40.bep b/dev-lang/swig/swig-1.3.40.bep index 2c1200a25..2239e2fdb 100644 --- a/dev-lang/swig/swig-1.3.40.bep +++ b/dev-lang/swig/swig-1.3.40.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd swig-1.3.40 libtoolize -fci - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-lang/swig/swig-2.0.2.bep b/dev-lang/swig/swig-2.0.2.bep new file mode 100644 index 000000000..df8d4a24e --- /dev/null +++ b/dev-lang/swig/swig-2.0.2.bep @@ -0,0 +1,23 @@ +DESCRIPTION="Simplified Wrapper and Interface Generator" +HOMEPAGE="http://www.swig.org/" +SRC_URI="http://sourceforge.net/projects/swig/files/swig/swig-2.0.2/swig-2.0.2.tar.gz/download" +CHECKSUM_MD5="eaf619a4169886923e5f828349504a29" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd swig-2.0.2 + libtoolize -fci + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd swig-2.0.2 + make install +} +LICENSE="SWIG" +COPYRIGHT="1995-1998 University of Utah and the Regents of the University of California + 1998-2005 University of Chicago + 2005-2006 Arizona Board of Regents (University of Arizona) + 1995-2010 The SWIG Developers" diff --git a/dev-lang/tcl/patches/tcl-8.5.9.patch b/dev-lang/tcl/patches/tcl-8.5.9.patch new file mode 100644 index 000000000..39c18f3f0 --- /dev/null +++ b/dev-lang/tcl/patches/tcl-8.5.9.patch @@ -0,0 +1,49 @@ +diff -up tcl8.5.9/tests/env.test.orig tcl8.5.9/tests/env.test +--- tcl8.5.9/tests/env.test.orig 2011-05-14 16:24:47.871366656 -0600 ++++ tcl8.5.9/tests/env.test 2011-05-14 16:26:18.149946368 -0600 +@@ -80,7 +80,7 @@ set printenvScript [makeFile { + TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH PURE_PROG_NAME DISPLAY + SHLIB_PATH SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH + DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING +- __CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM ++ __CF_USER_TEXT_ENCODING SECURITYSESSIONID LANG WINDIR TERM LIBRARY_PATH + } { + lrem names $name + } +@@ -112,7 +112,7 @@ foreach name [array names env] { + TCL_LIBRARY PATH LD_LIBRARY_PATH LIBPATH DISPLAY SHLIB_PATH + SYSTEMDRIVE SYSTEMROOT DYLD_LIBRARY_PATH DYLD_FRAMEWORK_PATH + DYLD_NEW_LOCAL_SHARED_REGIONS DYLD_NO_FIX_PREBINDING +- SECURITYSESSIONID LANG WINDIR TERM ++ SECURITYSESSIONID LANG WINDIR TERM LIBRARY_PATH + }} { + unset env($name) + } +diff -up tcl8.5.9/unix/tcl.m4.orig tcl8.5.9/unix/tcl.m4 +--- tcl8.5.9/unix/tcl.m4.orig 2010-09-08 11:40:48.016515072 -0600 ++++ tcl8.5.9/unix/tcl.m4 2011-05-14 16:20:36.560201728 -0600 +@@ -669,9 +669,16 @@ AC_DEFUN([SC_ENABLE_THREADS], [ + # The space is needed + THREADS_LIBS=" -pthread" + else ++ AC_CHECK_LIB(root, pthread_mutex_init, ++ tcl_ok=yes, tcl_ok=no) ++ if test "$tcl_ok" = "yes"; then ++ # The space is needed ++ THREAD_LIBS=" " ++ else + TCL_THREADS=0 + AC_MSG_WARN([Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...]) + fi ++ fi + fi + fi + fi +@@ -1276,6 +1283,7 @@ dnl AC_CHECK_TOOL(AR, ar) + SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' + DL_OBJS="tclLoadDl.o" + DL_LIBS="-lroot" ++ LD_LIBRARY_PATH_VAR="LIBRARY_PATH" + AC_CHECK_LIB(network, inet_ntoa, [LIBS="$LIBS -lnetwork"]) + ;; + HP-UX-*.11.*) diff --git a/dev-lang/tcl/tcl-8.5.9.bep b/dev-lang/tcl/tcl-8.5.9.bep new file mode 100644 index 000000000..a95b225d0 --- /dev/null +++ b/dev-lang/tcl/tcl-8.5.9.bep @@ -0,0 +1,28 @@ +DESCRIPTION="Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language, suitable for a very wide range of uses." +HOMEPAGE="http://www.tcl.tk" +SRC_URI="http://sourceforge.net/projects/tcl/files/Tcl/8.5.9/tcl8.5.9-src.tar.gz/download" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="8512d8db3233041dd68a81476906012a" +BUILD { + cd tcl8.5.9/unix + autoconf -f + ./configure --prefix=$(finddir B_COMMON_DIRECTORY) \ + --enable-threads --enable-man-symlinks + make +} + +INSTALL { + cd tcl8.5.9/unix + make install + ln -s tclsh8.5 "$(finddir B_COMMON_BIN_DIRECTORY)/tclsh" +} + +TEST { + cd tcl8.5.9/unix + make test +} + +LICENSE="BSD (2-clause)" +#COPYRIGHT="" diff --git a/dev-lang/tcl/tcl-8.6b1-1.build b/dev-lang/tcl/tcl-8.6b1-1.build new file mode 100644 index 000000000..57269204a --- /dev/null +++ b/dev-lang/tcl/tcl-8.6b1-1.build @@ -0,0 +1,7 @@ +cd tcl8.6b1/pkgs/tdbc1.0b1 +autoconf +cd ../../unix +autoconf +mkdir build && cd build +../configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-man-symlinks +make diff --git a/dev-lang/tcl/tcl-8.6b1-1.install b/dev-lang/tcl/tcl-8.6b1-1.install new file mode 100644 index 000000000..fb692a7fd --- /dev/null +++ b/dev-lang/tcl/tcl-8.6b1-1.install @@ -0,0 +1,2 @@ +cd tcl8.6b1/unix/build +make install diff --git a/dev-lang/tcl/tcl-8.6b1-1.patch b/dev-lang/tcl/tcl-8.6b1-1.patch new file mode 100644 index 000000000..f25c6b5c6 --- /dev/null +++ b/dev-lang/tcl/tcl-8.6b1-1.patch @@ -0,0 +1,99 @@ +diff -Naur tcl8.6b1/generic/tclPosixStr.c tcl8.6b1-haiku/generic/tclPosixStr.c +--- tcl8.6b1/generic/tclPosixStr.c 2008-04-28 00:21:32.028049408 +0200 ++++ tcl8.6b1-haiku/generic/tclPosixStr.c 2011-06-11 21:57:53.249036800 +0200 +@@ -941,7 +941,9 @@ + case SIGALRM: return "SIGALRM"; + #endif + #ifdef SIGBUS +- case SIGBUS: return "SIGBUS"; ++# if !defined(SIGSEGV) || (SIGBUS != SIGSEGV) ++ case SIGBUS: return "SIGBUS"; ++# endif + #endif + #ifdef SIGCHLD + case SIGCHLD: return "SIGCHLD"; +@@ -1072,7 +1074,9 @@ + case SIGALRM: return "alarm clock"; + #endif + #ifdef SIGBUS +- case SIGBUS: return "bus error"; ++# if !defined(SIGSEGV) || (SIGBUS != SIGSEGV) ++ case SIGBUS: return "bus error"; ++# endif + #endif + #ifdef SIGCHLD + case SIGCHLD: return "child status changed"; +diff -Naur tcl8.6b1/pkgs/tdbc1.0b1/tclconfig/tcl.m4 tcl8.6b1-haiku/pkgs/tdbc1.0b1/tclconfig/tcl.m4 +--- tcl8.6b1/pkgs/tdbc1.0b1/tclconfig/tcl.m4 2008-12-22 18:45:06.004456448 +0100 ++++ tcl8.6b1-haiku/pkgs/tdbc1.0b1/tclconfig/tcl.m4 2011-06-11 21:58:19.403177472 +0200 +@@ -761,8 +761,15 @@ + # The space is needed + THREADS_LIBS=" -pthread" + else +- TCL_THREADS=0 +- AC_MSG_WARN([Do not know how to find pthread lib on your system - thread support disabled]) ++ # Haiku ++ AC_CHECK_LIB(root,pthread_mutex_init,tcl_ok=yes,tcl_ok=no) ++ if test "$tcl_ok" = "yes"; then ++ # The space is needed ++ THREADS_LIBS=" -lroot" ++ else ++ TCL_THREADS=0 ++ AC_MSG_WARN([Do not know how to find pthread lib on your system - thread support disabled]) ++ fi + fi + fi + fi +@@ -1459,6 +1466,15 @@ + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; ++ Haiku*) ++ SHLIB_CFLAGS="-fPIC" ++ SHLIB_LD='${CC} -nostart' ++ SHLIB_LD_LIBS='${LIBS}' ++ SHLIB_SUFFIX=".so" ++ DL_OBJS="tclLoadDl.o" ++ DL_LIBS="-lroot" ++ LIBS="$LIBS -lnetwork" ++ ;; + HP-UX-*.11.*) + # Use updated header definitions where possible + AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Do we want to use the XOPEN network library?]) +diff -Naur tcl8.6b1/unix/tcl.m4 tcl8.6b1-haiku/unix/tcl.m4 +--- tcl8.6b1/unix/tcl.m4 2008-12-22 18:45:06.034603008 +0100 ++++ tcl8.6b1-haiku/unix/tcl.m4 2011-06-11 22:04:12.228327424 +0200 +@@ -667,8 +667,15 @@ + # The space is needed + THREADS_LIBS=" -pthread" + else +- TCL_THREADS=0 +- AC_MSG_WARN([Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...]) ++ # Haiku ++ AC_CHECK_LIB(root,pthread_mutex_init,tcl_ok=yes,tcl_ok=no) ++ if test "$tcl_ok" = "yes"; then ++ # The space is needed ++ THREADS_LIBS=" -lroot" ++ else ++ TCL_THREADS=0 ++ AC_MSG_WARN([Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...]) ++ fi + fi + fi + fi +@@ -1252,6 +1259,15 @@ + CC_SEARCH_FLAGS="" + LD_SEARCH_FLAGS="" + ;; ++ Haiku*) ++ SHLIB_CFLAGS="-fPIC" ++ SHLIB_LD='${CC} -nostart' ++ SHLIB_LD_LIBS='${LIBS}' ++ SHLIB_SUFFIX=".so" ++ DL_OBJS="tclLoadDl.o" ++ DL_LIBS="-lroot" ++ LIBS="$LIBS -lnetwork" ++ ;; + HP-UX-*.11.*) + # Use updated header definitions where possible + AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [Do we want to use the XOPEN network library?]) diff --git a/dev-lang/tcl/tcl-8.6b1-1.test b/dev-lang/tcl/tcl-8.6b1-1.test new file mode 100644 index 000000000..65e892762 --- /dev/null +++ b/dev-lang/tcl/tcl-8.6b1-1.test @@ -0,0 +1,2 @@ +cd tcl8.6b1/unix/build +make test diff --git a/dev-lang/v8/patches/gyp-r1501.patch b/dev-lang/v8/patches/gyp-r1501.patch new file mode 100644 index 000000000..b078cdf7b --- /dev/null +++ b/dev-lang/v8/patches/gyp-r1501.patch @@ -0,0 +1,2460 @@ +diff -Naur gyp/buildbot/buildbot_run.py gyp-haiku/buildbot/buildbot_run.py +--- gyp/buildbot/buildbot_run.py 2012-12-24 00:54:08.000000000 +0000 ++++ gyp-haiku/buildbot/buildbot_run.py 2012-12-24 00:12:54.000000000 +0000 +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python ++ + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/gyp gyp-haiku/gyp +--- gyp/gyp 2012-12-24 00:54:08.000000000 +0000 ++++ gyp-haiku/gyp 2012-12-24 00:03:19.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/gyptest.py gyp-haiku/gyptest.py +--- gyp/gyptest.py 2012-12-24 00:54:08.000000000 +0000 ++++ gyp-haiku/gyptest.py 2012-12-24 00:06:12.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +@@ -217,6 +217,7 @@ + 'linux2': ['make', 'ninja'], + 'linux3': ['make', 'ninja'], + 'darwin': ['make', 'ninja', 'xcode'], ++ 'haiku1': ['make'], + }[sys.platform] + + for format in format_list: +diff -Naur gyp/pylib/gyp/__init__.py gyp-haiku/pylib/gyp/__init__.py +--- gyp/pylib/gyp/__init__.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/pylib/gyp/__init__.py 2012-12-24 00:12:06.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/pylib/gyp/common_test.py gyp-haiku/pylib/gyp/common_test.py +--- gyp/pylib/gyp/common_test.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/pylib/gyp/common_test.py 2012-12-24 00:12:12.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/pylib/gyp/common.py gyp-haiku/pylib/gyp/common.py +--- gyp/pylib/gyp/common.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/pylib/gyp/common.py 2012-12-24 00:03:19.000000000 +0000 +@@ -378,14 +378,16 @@ + return 'solaris' + if sys.platform.startswith('freebsd'): + return 'freebsd' ++ if sys.platform.startswith('haiku'): ++ return 'haiku' + + return 'linux' + + + def CopyTool(flavor, out_path): +- """Finds (mac|sun|win)_tool.gyp in the gyp directory and copies it ++ """Finds (mac|sun|win|haiku)_tool.gyp in the gyp directory and copies it + to |out_path|.""" +- prefix = { 'solaris': 'sun', 'mac': 'mac', 'win': 'win' }.get(flavor, None) ++ prefix = { 'solaris': 'sun', 'mac': 'mac', 'win': 'win', 'haiku': 'haiku' }.get(flavor, None) + if not prefix: + return + +diff -Naur gyp/pylib/gyp/easy_xml_test.py gyp-haiku/pylib/gyp/easy_xml_test.py +--- gyp/pylib/gyp/easy_xml_test.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/pylib/gyp/easy_xml_test.py 2012-12-24 00:12:18.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/pylib/gyp/generator/make.py gyp-haiku/pylib/gyp/generator/make.py +--- gyp/pylib/gyp/generator/make.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/pylib/gyp/generator/make.py 2012-12-24 00:03:19.000000000 +0000 +@@ -491,6 +491,13 @@ + cmd_sun_tool = ./gyp-sun-tool $(4) $< "$@" + """ + ++SHARED_HEADER_HAIKU_COMMANDS = """ ++# gyp-haiku-tool is written next to the root Makefile by gyp. ++# Use $(4) for the command, since $(2) and $(3) are used as flag by do_cmd ++# already. ++quiet_cmd_haiku_tool = HAIKUTOOL $(4) $< ++cmd_haiku_tool = ./gyp-haiku-tool $(4) $< "$@" ++""" + + def WriteRootHeaderSuffixRules(writer): + extensions = sorted(COMPILABLE_EXTENSIONS.keys(), key=str.lower) +@@ -2027,6 +2034,13 @@ + header_params.update({ + 'flock': 'lockf', + }) ++ elif flavor == 'haiku': ++ header_params.update({ ++ 'flock': './gyp-haiku-tool flock', ++ 'flock_index': 2, ++ 'extra_commands': SHARED_HEADER_HAIKU_COMMANDS, ++ }) ++ + + header_params.update(RunSystemTests(flavor)) + header_params.update({ +diff -Naur gyp/pylib/gyp/generator/msvs_test.py gyp-haiku/pylib/gyp/generator/msvs_test.py +--- gyp/pylib/gyp/generator/msvs_test.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/pylib/gyp/generator/msvs_test.py 2012-12-24 00:12:23.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/pylib/gyp/generator/ninja_test.py gyp-haiku/pylib/gyp/generator/ninja_test.py +--- gyp/pylib/gyp/generator/ninja_test.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/pylib/gyp/generator/ninja_test.py 2012-12-24 00:11:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/pylib/gyp/haiku_tool.py gyp-haiku/pylib/gyp/haiku_tool.py +--- gyp/pylib/gyp/haiku_tool.py 1970-01-01 00:00:00.000000000 +0000 ++++ gyp-haiku/pylib/gyp/haiku_tool.py 2012-12-24 00:03:19.000000000 +0000 +@@ -0,0 +1,49 @@ ++#!/boot/common/bin/python ++# Copyright (c) 2011 Google Inc. All rights reserved. ++# Use of this source code is governed by a BSD-style license that can be ++# found in the LICENSE file. ++ ++"""These functions are executed via gyp-haiku-tool when using the Makefile ++generator.""" ++ ++import fcntl ++import os ++import struct ++import subprocess ++import sys ++ ++ ++def main(args): ++ executor = HaikuTool() ++ executor.Dispatch(args) ++ ++ ++class HaikuTool(object): ++ """This class performs all the Haiku tooling steps. The methods can either be ++ executed directly, or dispatched from an argument list.""" ++ ++ def Dispatch(self, args): ++ """Dispatches a string command to a method.""" ++ if len(args) < 1: ++ raise Exception("Not enough arguments") ++ ++ method = "Exec%s" % self._CommandifyName(args[0]) ++ getattr(self, method)(*args[1:]) ++ ++ def _CommandifyName(self, name_string): ++ """Transforms a tool name like copy-info-plist to CopyInfoPlist""" ++ return name_string.title().replace('-', '') ++ ++ def ExecFlock(self, lockfile, *cmd_list): ++ """Emulates the most basic behavior of Linux's flock(1).""" ++ # Rely on exception handling to report errors. ++ fd = os.open(lockfile, os.O_RDONLY|os.O_NOCTTY|os.O_CREAT, 0o666) ++ fcntl.flock(fd, fcntl.LOCK_EX) ++ ret = subprocess.call(cmd_list) ++ # Haiki bug -- lock is not released on file close? ++ fcntl.flock(fd, fcntl.LOCK_UN) ++ return ret ++ ++ ++if __name__ == '__main__': ++ sys.exit(main(sys.argv[1:])) +diff -Naur gyp/pylib/gyp/mac_tool.py gyp-haiku/pylib/gyp/mac_tool.py +--- gyp/pylib/gyp/mac_tool.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/pylib/gyp/mac_tool.py 2012-12-24 00:12:33.000000000 +0000 +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python ++ + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/pylib/gyp/MSVSSettings_test.py gyp-haiku/pylib/gyp/MSVSSettings_test.py +--- gyp/pylib/gyp/MSVSSettings_test.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/pylib/gyp/MSVSSettings_test.py 2012-12-24 00:05:51.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/pylib/gyp/sun_tool.py gyp-haiku/pylib/gyp/sun_tool.py +--- gyp/pylib/gyp/sun_tool.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/pylib/gyp/sun_tool.py 2012-12-24 00:12:38.000000000 +0000 +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python ++ + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/pylib/gyp/system_test.py gyp-haiku/pylib/gyp/system_test.py +--- gyp/pylib/gyp/system_test.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/pylib/gyp/system_test.py 2012-12-24 00:13:00.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/pylib/gyp/win_tool.py gyp-haiku/pylib/gyp/win_tool.py +--- gyp/pylib/gyp/win_tool.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/pylib/gyp/win_tool.py 2012-12-24 00:12:01.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/setup.py gyp-haiku/setup.py +--- gyp/setup.py 2012-12-24 00:54:08.000000000 +0000 ++++ gyp-haiku/setup.py 2012-12-24 00:13:07.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions/gyptest-all.py gyp-haiku/test/actions/gyptest-all.py +--- gyp/test/actions/gyptest-all.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/actions/gyptest-all.py 2012-12-24 00:13:12.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions/gyptest-default.py gyp-haiku/test/actions/gyptest-default.py +--- gyp/test/actions/gyptest-default.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/actions/gyptest-default.py 2012-12-24 00:13:19.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions/gyptest-errors.py gyp-haiku/test/actions/gyptest-errors.py +--- gyp/test/actions/gyptest-errors.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/actions/gyptest-errors.py 2012-12-24 00:13:24.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions/src/confirm-dep-files.py gyp-haiku/test/actions/src/confirm-dep-files.py +--- gyp/test/actions/src/confirm-dep-files.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/actions/src/confirm-dep-files.py 2012-12-24 00:13:28.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions/src/subdir1/counter.py gyp-haiku/test/actions/src/subdir1/counter.py +--- gyp/test/actions/src/subdir1/counter.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/actions/src/subdir1/counter.py 2012-12-24 00:13:33.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2010 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions/src/subdir1/make-prog1.py gyp-haiku/test/actions/src/subdir1/make-prog1.py +--- gyp/test/actions/src/subdir1/make-prog1.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/actions/src/subdir1/make-prog1.py 2012-12-24 00:13:38.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions/src/subdir1/make-prog2.py gyp-haiku/test/actions/src/subdir1/make-prog2.py +--- gyp/test/actions/src/subdir1/make-prog2.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/actions/src/subdir1/make-prog2.py 2012-12-24 00:13:44.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions/src/subdir2/make-file.py gyp-haiku/test/actions/src/subdir2/make-file.py +--- gyp/test/actions/src/subdir2/make-file.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/actions/src/subdir2/make-file.py 2012-12-24 00:14:01.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions/src/subdir3/generate_main.py gyp-haiku/test/actions/src/subdir3/generate_main.py +--- gyp/test/actions/src/subdir3/generate_main.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/actions/src/subdir3/generate_main.py 2012-12-24 00:14:06.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions-bare/gyptest-bare.py gyp-haiku/test/actions-bare/gyptest-bare.py +--- gyp/test/actions-bare/gyptest-bare.py 2012-12-24 00:53:46.000000000 +0000 ++++ gyp-haiku/test/actions-bare/gyptest-bare.py 2012-12-24 00:14:10.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions-bare/src/bare.py gyp-haiku/test/actions-bare/src/bare.py +--- gyp/test/actions-bare/src/bare.py 2012-12-24 00:53:46.000000000 +0000 ++++ gyp-haiku/test/actions-bare/src/bare.py 2012-12-24 00:14:17.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions-multiple/gyptest-all.py gyp-haiku/test/actions-multiple/gyptest-all.py +--- gyp/test/actions-multiple/gyptest-all.py 2012-12-24 00:53:48.000000000 +0000 ++++ gyp-haiku/test/actions-multiple/gyptest-all.py 2012-12-24 00:14:22.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions-multiple/src/copy.py gyp-haiku/test/actions-multiple/src/copy.py +--- gyp/test/actions-multiple/src/copy.py 2012-12-24 00:53:48.000000000 +0000 ++++ gyp-haiku/test/actions-multiple/src/copy.py 2012-12-24 00:14:27.000000000 +0000 +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python ++ + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/test/actions-multiple/src/filter.py gyp-haiku/test/actions-multiple/src/filter.py +--- gyp/test/actions-multiple/src/filter.py 2012-12-24 00:53:48.000000000 +0000 ++++ gyp-haiku/test/actions-multiple/src/filter.py 2012-12-24 00:14:33.000000000 +0000 +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python ++ + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/test/actions-none/gyptest-none.py gyp-haiku/test/actions-none/gyptest-none.py +--- gyp/test/actions-none/gyptest-none.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/actions-none/gyptest-none.py 2012-12-24 00:14:38.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions-subdir/gyptest-action.py gyp-haiku/test/actions-subdir/gyptest-action.py +--- gyp/test/actions-subdir/gyptest-action.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/test/actions-subdir/gyptest-action.py 2012-12-24 00:14:44.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions-subdir/src/make-file.py gyp-haiku/test/actions-subdir/src/make-file.py +--- gyp/test/actions-subdir/src/make-file.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/test/actions-subdir/src/make-file.py 2012-12-24 00:14:50.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/actions-subdir/src/subdir/make-subdir-file.py gyp-haiku/test/actions-subdir/src/subdir/make-subdir-file.py +--- gyp/test/actions-subdir/src/subdir/make-subdir-file.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/test/actions-subdir/src/subdir/make-subdir-file.py 2012-12-24 00:15:06.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/additional-targets/gyptest-additional.py gyp-haiku/test/additional-targets/gyptest-additional.py +--- gyp/test/additional-targets/gyptest-additional.py 2012-12-24 00:53:58.000000000 +0000 ++++ gyp-haiku/test/additional-targets/gyptest-additional.py 2012-12-24 00:15:11.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/additional-targets/src/dir1/emit.py gyp-haiku/test/additional-targets/src/dir1/emit.py +--- gyp/test/additional-targets/src/dir1/emit.py 2012-12-24 00:53:58.000000000 +0000 ++++ gyp-haiku/test/additional-targets/src/dir1/emit.py 2012-12-24 00:15:16.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/assembly/gyptest-assembly.py gyp-haiku/test/assembly/gyptest-assembly.py +--- gyp/test/assembly/gyptest-assembly.py 2012-12-24 00:53:58.000000000 +0000 ++++ gyp-haiku/test/assembly/gyptest-assembly.py 2012-12-24 00:15:21.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/build-option/gyptest-build.py gyp-haiku/test/build-option/gyptest-build.py +--- gyp/test/build-option/gyptest-build.py 2012-12-24 00:53:55.000000000 +0000 ++++ gyp-haiku/test/build-option/gyptest-build.py 2012-12-24 00:15:25.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/builddir/gyptest-all.py gyp-haiku/test/builddir/gyptest-all.py +--- gyp/test/builddir/gyptest-all.py 2012-12-24 00:53:38.000000000 +0000 ++++ gyp-haiku/test/builddir/gyptest-all.py 2012-12-24 00:15:30.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/builddir/gyptest-default.py gyp-haiku/test/builddir/gyptest-default.py +--- gyp/test/builddir/gyptest-default.py 2012-12-24 00:53:38.000000000 +0000 ++++ gyp-haiku/test/builddir/gyptest-default.py 2012-12-24 00:15:36.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/cflags/gyptest-cflags.py gyp-haiku/test/cflags/gyptest-cflags.py +--- gyp/test/cflags/gyptest-cflags.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/cflags/gyptest-cflags.py 2012-12-24 00:15:40.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/compilable/gyptest-headers.py gyp-haiku/test/compilable/gyptest-headers.py +--- gyp/test/compilable/gyptest-headers.py 2012-12-24 00:54:03.000000000 +0000 ++++ gyp-haiku/test/compilable/gyptest-headers.py 2012-12-24 00:15:45.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/compiler-override/gyptest-compiler-env.py gyp-haiku/test/compiler-override/gyptest-compiler-env.py +--- gyp/test/compiler-override/gyptest-compiler-env.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/compiler-override/gyptest-compiler-env.py 2012-12-24 00:15:51.000000000 +0000 +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python ++ + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/test/compiler-override/gyptest-compiler-global-settings.py gyp-haiku/test/compiler-override/gyptest-compiler-global-settings.py +--- gyp/test/compiler-override/gyptest-compiler-global-settings.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/compiler-override/gyptest-compiler-global-settings.py 2012-12-24 00:16:13.000000000 +0000 +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python ++ + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/test/compiler-override/my_cc.py gyp-haiku/test/compiler-override/my_cc.py +--- gyp/test/compiler-override/my_cc.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/compiler-override/my_cc.py 2012-12-24 00:16:19.000000000 +0000 +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python ++ + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/test/compiler-override/my_cxx.py gyp-haiku/test/compiler-override/my_cxx.py +--- gyp/test/compiler-override/my_cxx.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/compiler-override/my_cxx.py 2012-12-24 00:16:25.000000000 +0000 +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python ++ + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/test/compiler-override/my_ld.py gyp-haiku/test/compiler-override/my_ld.py +--- gyp/test/compiler-override/my_ld.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/compiler-override/my_ld.py 2012-12-24 00:16:30.000000000 +0000 +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python ++ + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/test/configurations/basics/gyptest-configurations.py gyp-haiku/test/configurations/basics/gyptest-configurations.py +--- gyp/test/configurations/basics/gyptest-configurations.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/configurations/basics/gyptest-configurations.py 2012-12-24 00:16:36.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/configurations/inheritance/gyptest-inheritance.py gyp-haiku/test/configurations/inheritance/gyptest-inheritance.py +--- gyp/test/configurations/inheritance/gyptest-inheritance.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/configurations/inheritance/gyptest-inheritance.py 2012-12-24 00:16:45.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/configurations/invalid/gyptest-configurations.py gyp-haiku/test/configurations/invalid/gyptest-configurations.py +--- gyp/test/configurations/invalid/gyptest-configurations.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/configurations/invalid/gyptest-configurations.py 2012-12-24 00:16:50.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2010 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/configurations/target_platform/gyptest-target_platform.py gyp-haiku/test/configurations/target_platform/gyptest-target_platform.py +--- gyp/test/configurations/target_platform/gyptest-target_platform.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/configurations/target_platform/gyptest-target_platform.py 2012-12-24 00:16:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/configurations/x64/gyptest-x86.py gyp-haiku/test/configurations/x64/gyptest-x86.py +--- gyp/test/configurations/x64/gyptest-x86.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/configurations/x64/gyptest-x86.py 2012-12-24 00:17:00.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/copies/gyptest-all.py gyp-haiku/test/copies/gyptest-all.py +--- gyp/test/copies/gyptest-all.py 2012-12-24 00:53:58.000000000 +0000 ++++ gyp-haiku/test/copies/gyptest-all.py 2012-12-24 00:17:05.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/copies/gyptest-default.py gyp-haiku/test/copies/gyptest-default.py +--- gyp/test/copies/gyptest-default.py 2012-12-24 00:53:58.000000000 +0000 ++++ gyp-haiku/test/copies/gyptest-default.py 2012-12-24 00:17:27.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/copies/gyptest-slash.py gyp-haiku/test/copies/gyptest-slash.py +--- gyp/test/copies/gyptest-slash.py 2012-12-24 00:53:58.000000000 +0000 ++++ gyp-haiku/test/copies/gyptest-slash.py 2012-12-24 00:17:31.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/copies/gyptest-updir.py gyp-haiku/test/copies/gyptest-updir.py +--- gyp/test/copies/gyptest-updir.py 2012-12-24 00:53:58.000000000 +0000 ++++ gyp-haiku/test/copies/gyptest-updir.py 2012-12-24 00:17:36.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/custom-generator/gyptest-custom-generator.py gyp-haiku/test/custom-generator/gyptest-custom-generator.py +--- gyp/test/custom-generator/gyptest-custom-generator.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/custom-generator/gyptest-custom-generator.py 2012-12-24 00:17:46.000000000 +0000 +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python ++ + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/test/cxxflags/gyptest-cxxflags.py gyp-haiku/test/cxxflags/gyptest-cxxflags.py +--- gyp/test/cxxflags/gyptest-cxxflags.py 2012-12-24 00:53:47.000000000 +0000 ++++ gyp-haiku/test/cxxflags/gyptest-cxxflags.py 2012-12-24 00:17:51.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/defines/gyptest-define-override.py gyp-haiku/test/defines/gyptest-define-override.py +--- gyp/test/defines/gyptest-define-override.py 2012-12-24 00:54:07.000000000 +0000 ++++ gyp-haiku/test/defines/gyptest-define-override.py 2012-12-24 00:17:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/defines/gyptest-defines-env-regyp.py gyp-haiku/test/defines/gyptest-defines-env-regyp.py +--- gyp/test/defines/gyptest-defines-env-regyp.py 2012-12-24 00:54:07.000000000 +0000 ++++ gyp-haiku/test/defines/gyptest-defines-env-regyp.py 2012-12-24 00:18:02.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/defines/gyptest-defines-env.py gyp-haiku/test/defines/gyptest-defines-env.py +--- gyp/test/defines/gyptest-defines-env.py 2012-12-24 00:54:07.000000000 +0000 ++++ gyp-haiku/test/defines/gyptest-defines-env.py 2012-12-24 00:18:06.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/defines/gyptest-defines.py gyp-haiku/test/defines/gyptest-defines.py +--- gyp/test/defines/gyptest-defines.py 2012-12-24 00:54:07.000000000 +0000 ++++ gyp-haiku/test/defines/gyptest-defines.py 2012-12-24 00:18:11.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/defines-escaping/gyptest-defines-escaping.py gyp-haiku/test/defines-escaping/gyptest-defines-escaping.py +--- gyp/test/defines-escaping/gyptest-defines-escaping.py 2012-12-24 00:53:55.000000000 +0000 ++++ gyp-haiku/test/defines-escaping/gyptest-defines-escaping.py 2012-12-24 00:18:16.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2010 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/dependencies/gyptest-double-dependency.py gyp-haiku/test/dependencies/gyptest-double-dependency.py +--- gyp/test/dependencies/gyptest-double-dependency.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/dependencies/gyptest-double-dependency.py 2012-12-24 00:18:46.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/dependencies/gyptest-extra-targets.py gyp-haiku/test/dependencies/gyptest-extra-targets.py +--- gyp/test/dependencies/gyptest-extra-targets.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/dependencies/gyptest-extra-targets.py 2012-12-24 00:18:50.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/dependencies/gyptest-lib-only.py gyp-haiku/test/dependencies/gyptest-lib-only.py +--- gyp/test/dependencies/gyptest-lib-only.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/dependencies/gyptest-lib-only.py 2012-12-24 00:18:55.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/dependencies/gyptest-none-traversal.py gyp-haiku/test/dependencies/gyptest-none-traversal.py +--- gyp/test/dependencies/gyptest-none-traversal.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/dependencies/gyptest-none-traversal.py 2012-12-24 00:18:59.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/dependency-copy/gyptest-copy.py gyp-haiku/test/dependency-copy/gyptest-copy.py +--- gyp/test/dependency-copy/gyptest-copy.py 2012-12-24 00:53:36.000000000 +0000 ++++ gyp-haiku/test/dependency-copy/gyptest-copy.py 2012-12-24 00:19:03.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/errors/gyptest-errors.py gyp-haiku/test/errors/gyptest-errors.py +--- gyp/test/errors/gyptest-errors.py 2012-12-24 00:54:07.000000000 +0000 ++++ gyp-haiku/test/errors/gyptest-errors.py 2012-12-24 00:19:07.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/escaping/gyptest-colon.py gyp-haiku/test/escaping/gyptest-colon.py +--- gyp/test/escaping/gyptest-colon.py 2012-12-24 00:54:01.000000000 +0000 ++++ gyp-haiku/test/escaping/gyptest-colon.py 2012-12-24 00:19:11.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/exclusion/gyptest-exclusion.py gyp-haiku/test/exclusion/gyptest-exclusion.py +--- gyp/test/exclusion/gyptest-exclusion.py 2012-12-24 00:54:03.000000000 +0000 ++++ gyp-haiku/test/exclusion/gyptest-exclusion.py 2012-12-24 00:19:16.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2010 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/external-cross-compile/gyptest-cross.py gyp-haiku/test/external-cross-compile/gyptest-cross.py +--- gyp/test/external-cross-compile/gyptest-cross.py 2012-12-24 00:53:38.000000000 +0000 ++++ gyp-haiku/test/external-cross-compile/gyptest-cross.py 2012-12-24 00:19:22.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/generator-output/actions/subdir1/make-prog1.py gyp-haiku/test/generator-output/actions/subdir1/make-prog1.py +--- gyp/test/generator-output/actions/subdir1/make-prog1.py 2012-12-24 00:53:58.000000000 +0000 ++++ gyp-haiku/test/generator-output/actions/subdir1/make-prog1.py 2012-12-24 00:19:28.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/generator-output/actions/subdir1/make-prog2.py gyp-haiku/test/generator-output/actions/subdir1/make-prog2.py +--- gyp/test/generator-output/actions/subdir1/make-prog2.py 2012-12-24 00:53:58.000000000 +0000 ++++ gyp-haiku/test/generator-output/actions/subdir1/make-prog2.py 2012-12-24 00:19:39.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/generator-output/actions/subdir2/make-file.py gyp-haiku/test/generator-output/actions/subdir2/make-file.py +--- gyp/test/generator-output/actions/subdir2/make-file.py 2012-12-24 00:53:59.000000000 +0000 ++++ gyp-haiku/test/generator-output/actions/subdir2/make-file.py 2012-12-24 00:19:44.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/generator-output/gyptest-actions.py gyp-haiku/test/generator-output/gyptest-actions.py +--- gyp/test/generator-output/gyptest-actions.py 2012-12-24 00:54:00.000000000 +0000 ++++ gyp-haiku/test/generator-output/gyptest-actions.py 2012-12-24 00:19:50.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/generator-output/gyptest-copies.py gyp-haiku/test/generator-output/gyptest-copies.py +--- gyp/test/generator-output/gyptest-copies.py 2012-12-24 00:54:00.000000000 +0000 ++++ gyp-haiku/test/generator-output/gyptest-copies.py 2012-12-24 00:20:01.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/generator-output/gyptest-mac-bundle.py gyp-haiku/test/generator-output/gyptest-mac-bundle.py +--- gyp/test/generator-output/gyptest-mac-bundle.py 2012-12-24 00:54:00.000000000 +0000 ++++ gyp-haiku/test/generator-output/gyptest-mac-bundle.py 2012-12-24 00:20:06.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/generator-output/gyptest-relocate.py gyp-haiku/test/generator-output/gyptest-relocate.py +--- gyp/test/generator-output/gyptest-relocate.py 2012-12-24 00:54:00.000000000 +0000 ++++ gyp-haiku/test/generator-output/gyptest-relocate.py 2012-12-24 00:20:11.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/generator-output/gyptest-rules.py gyp-haiku/test/generator-output/gyptest-rules.py +--- gyp/test/generator-output/gyptest-rules.py 2012-12-24 00:54:00.000000000 +0000 ++++ gyp-haiku/test/generator-output/gyptest-rules.py 2012-12-24 00:20:16.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/generator-output/gyptest-subdir2-deep.py gyp-haiku/test/generator-output/gyptest-subdir2-deep.py +--- gyp/test/generator-output/gyptest-subdir2-deep.py 2012-12-24 00:54:00.000000000 +0000 ++++ gyp-haiku/test/generator-output/gyptest-subdir2-deep.py 2012-12-24 00:20:23.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/generator-output/gyptest-top-all.py gyp-haiku/test/generator-output/gyptest-top-all.py +--- gyp/test/generator-output/gyptest-top-all.py 2012-12-24 00:54:00.000000000 +0000 ++++ gyp-haiku/test/generator-output/gyptest-top-all.py 2012-12-24 00:20:34.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/generator-output/rules/copy-file.py gyp-haiku/test/generator-output/rules/copy-file.py +--- gyp/test/generator-output/rules/copy-file.py 2012-12-24 00:54:00.000000000 +0000 ++++ gyp-haiku/test/generator-output/rules/copy-file.py 2012-12-24 00:21:54.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/gyp-defines/echo.py gyp-haiku/test/gyp-defines/echo.py +--- gyp/test/gyp-defines/echo.py 2012-12-24 00:53:55.000000000 +0000 ++++ gyp-haiku/test/gyp-defines/echo.py 2012-12-24 00:22:02.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/gyp-defines/gyptest-multiple-values.py gyp-haiku/test/gyp-defines/gyptest-multiple-values.py +--- gyp/test/gyp-defines/gyptest-multiple-values.py 2012-12-24 00:53:55.000000000 +0000 ++++ gyp-haiku/test/gyp-defines/gyptest-multiple-values.py 2012-12-24 00:22:07.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/gyp-defines/gyptest-regyp.py gyp-haiku/test/gyp-defines/gyptest-regyp.py +--- gyp/test/gyp-defines/gyptest-regyp.py 2012-12-24 00:53:55.000000000 +0000 ++++ gyp-haiku/test/gyp-defines/gyptest-regyp.py 2012-12-24 00:22:12.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/hard_dependency/gyptest-exported-hard-dependency.py gyp-haiku/test/hard_dependency/gyptest-exported-hard-dependency.py +--- gyp/test/hard_dependency/gyptest-exported-hard-dependency.py 2012-12-24 00:53:57.000000000 +0000 ++++ gyp-haiku/test/hard_dependency/gyptest-exported-hard-dependency.py 2012-12-24 00:22:17.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/hard_dependency/gyptest-no-exported-hard-dependency.py gyp-haiku/test/hard_dependency/gyptest-no-exported-hard-dependency.py +--- gyp/test/hard_dependency/gyptest-no-exported-hard-dependency.py 2012-12-24 00:53:57.000000000 +0000 ++++ gyp-haiku/test/hard_dependency/gyptest-no-exported-hard-dependency.py 2012-12-24 00:22:31.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/hard_dependency/src/emit.py gyp-haiku/test/hard_dependency/src/emit.py +--- gyp/test/hard_dependency/src/emit.py 2012-12-24 00:53:57.000000000 +0000 ++++ gyp-haiku/test/hard_dependency/src/emit.py 2012-12-24 00:22:41.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/hello/gyptest-all.py gyp-haiku/test/hello/gyptest-all.py +--- gyp/test/hello/gyptest-all.py 2012-12-24 00:54:05.000000000 +0000 ++++ gyp-haiku/test/hello/gyptest-all.py 2012-12-24 00:22:47.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/hello/gyptest-default.py gyp-haiku/test/hello/gyptest-default.py +--- gyp/test/hello/gyptest-default.py 2012-12-24 00:54:05.000000000 +0000 ++++ gyp-haiku/test/hello/gyptest-default.py 2012-12-24 00:22:54.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/hello/gyptest-disable-regyp.py gyp-haiku/test/hello/gyptest-disable-regyp.py +--- gyp/test/hello/gyptest-disable-regyp.py 2012-12-24 00:54:05.000000000 +0000 ++++ gyp-haiku/test/hello/gyptest-disable-regyp.py 2012-12-24 00:23:01.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/hello/gyptest-regyp.py gyp-haiku/test/hello/gyptest-regyp.py +--- gyp/test/hello/gyptest-regyp.py 2012-12-24 00:54:05.000000000 +0000 ++++ gyp-haiku/test/hello/gyptest-regyp.py 2012-12-24 00:23:08.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/hello/gyptest-target.py gyp-haiku/test/hello/gyptest-target.py +--- gyp/test/hello/gyptest-target.py 2012-12-24 00:54:05.000000000 +0000 ++++ gyp-haiku/test/hello/gyptest-target.py 2012-12-24 00:23:12.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/home_dot_gyp/gyptest-home-includes-regyp.py gyp-haiku/test/home_dot_gyp/gyptest-home-includes-regyp.py +--- gyp/test/home_dot_gyp/gyptest-home-includes-regyp.py 2012-12-24 00:54:03.000000000 +0000 ++++ gyp-haiku/test/home_dot_gyp/gyptest-home-includes-regyp.py 2012-12-24 00:23:22.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/home_dot_gyp/gyptest-home-includes.py gyp-haiku/test/home_dot_gyp/gyptest-home-includes.py +--- gyp/test/home_dot_gyp/gyptest-home-includes.py 2012-12-24 00:54:03.000000000 +0000 ++++ gyp-haiku/test/home_dot_gyp/gyptest-home-includes.py 2012-12-24 00:23:26.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/include_dirs/gyptest-all.py gyp-haiku/test/include_dirs/gyptest-all.py +--- gyp/test/include_dirs/gyptest-all.py 2012-12-24 00:53:54.000000000 +0000 ++++ gyp-haiku/test/include_dirs/gyptest-all.py 2012-12-24 00:23:31.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/include_dirs/gyptest-default.py gyp-haiku/test/include_dirs/gyptest-default.py +--- gyp/test/include_dirs/gyptest-default.py 2012-12-24 00:53:54.000000000 +0000 ++++ gyp-haiku/test/include_dirs/gyptest-default.py 2012-12-24 00:23:36.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/intermediate_dir/gyptest-intermediate-dir.py gyp-haiku/test/intermediate_dir/gyptest-intermediate-dir.py +--- gyp/test/intermediate_dir/gyptest-intermediate-dir.py 2012-12-24 00:54:07.000000000 +0000 ++++ gyp-haiku/test/intermediate_dir/gyptest-intermediate-dir.py 2012-12-24 00:23:45.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/intermediate_dir/src/script.py gyp-haiku/test/intermediate_dir/src/script.py +--- gyp/test/intermediate_dir/src/script.py 2012-12-24 00:54:07.000000000 +0000 ++++ gyp-haiku/test/intermediate_dir/src/script.py 2012-12-24 00:23:54.000000000 +0000 +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python ++ + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/test/library/gyptest-shared-obj-install-path.py gyp-haiku/test/library/gyptest-shared-obj-install-path.py +--- gyp/test/library/gyptest-shared-obj-install-path.py 2012-12-24 00:54:02.000000000 +0000 ++++ gyp-haiku/test/library/gyptest-shared-obj-install-path.py 2012-12-24 00:24:04.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/library/gyptest-shared.py gyp-haiku/test/library/gyptest-shared.py +--- gyp/test/library/gyptest-shared.py 2012-12-24 00:54:02.000000000 +0000 ++++ gyp-haiku/test/library/gyptest-shared.py 2012-12-24 00:24:14.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/library/gyptest-static.py gyp-haiku/test/library/gyptest-static.py +--- gyp/test/library/gyptest-static.py 2012-12-24 00:54:02.000000000 +0000 ++++ gyp-haiku/test/library/gyptest-static.py 2012-12-24 00:24:19.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/link-objects/gyptest-all.py gyp-haiku/test/link-objects/gyptest-all.py +--- gyp/test/link-objects/gyptest-all.py 2012-12-24 00:53:58.000000000 +0000 ++++ gyp-haiku/test/link-objects/gyptest-all.py 2012-12-24 00:24:23.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-action-envvars.py gyp-haiku/test/mac/gyptest-action-envvars.py +--- gyp/test/mac/gyptest-action-envvars.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-action-envvars.py 2012-12-24 00:24:26.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-app.py gyp-haiku/test/mac/gyptest-app.py +--- gyp/test/mac/gyptest-app.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-app.py 2012-12-24 00:24:30.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-archs.py gyp-haiku/test/mac/gyptest-archs.py +--- gyp/test/mac/gyptest-archs.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-archs.py 2012-12-24 00:24:34.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-cflags.py gyp-haiku/test/mac/gyptest-cflags.py +--- gyp/test/mac/gyptest-cflags.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-cflags.py 2012-12-24 00:24:42.000000000 +0000 +@@ -1,5 +1,4 @@ +- +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-copies.py gyp-haiku/test/mac/gyptest-copies.py +--- gyp/test/mac/gyptest-copies.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-copies.py 2012-12-24 00:24:46.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-copy-dylib.py gyp-haiku/test/mac/gyptest-copy-dylib.py +--- gyp/test/mac/gyptest-copy-dylib.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-copy-dylib.py 2012-12-24 00:24:50.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-debuginfo.py gyp-haiku/test/mac/gyptest-debuginfo.py +--- gyp/test/mac/gyptest-debuginfo.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-debuginfo.py 2012-12-24 00:24:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-depend-on-bundle.py gyp-haiku/test/mac/gyptest-depend-on-bundle.py +--- gyp/test/mac/gyptest-depend-on-bundle.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-depend-on-bundle.py 2012-12-24 00:24:55.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-framework-dirs.py gyp-haiku/test/mac/gyptest-framework-dirs.py +--- gyp/test/mac/gyptest-framework-dirs.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-framework-dirs.py 2012-12-24 00:24:59.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-framework-headers.py gyp-haiku/test/mac/gyptest-framework-headers.py +--- gyp/test/mac/gyptest-framework-headers.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-framework-headers.py 2012-12-24 00:25:04.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-framework.py gyp-haiku/test/mac/gyptest-framework.py +--- gyp/test/mac/gyptest-framework.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-framework.py 2012-12-24 00:21:13.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-global-settings.py gyp-haiku/test/mac/gyptest-global-settings.py +--- gyp/test/mac/gyptest-global-settings.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-global-settings.py 2012-12-24 00:21:03.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-infoplist-process.py gyp-haiku/test/mac/gyptest-infoplist-process.py +--- gyp/test/mac/gyptest-infoplist-process.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-infoplist-process.py 2012-12-24 00:21:24.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-installname.py gyp-haiku/test/mac/gyptest-installname.py +--- gyp/test/mac/gyptest-installname.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-installname.py 2012-12-24 00:25:07.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-ldflags-passed-to-libtool.py gyp-haiku/test/mac/gyptest-ldflags-passed-to-libtool.py +--- gyp/test/mac/gyptest-ldflags-passed-to-libtool.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-ldflags-passed-to-libtool.py 2012-12-24 00:25:13.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-ldflags.py gyp-haiku/test/mac/gyptest-ldflags.py +--- gyp/test/mac/gyptest-ldflags.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-ldflags.py 2012-12-24 00:25:19.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-libraries.py gyp-haiku/test/mac/gyptest-libraries.py +--- gyp/test/mac/gyptest-libraries.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-libraries.py 2012-12-24 00:25:22.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-loadable-module.py gyp-haiku/test/mac/gyptest-loadable-module.py +--- gyp/test/mac/gyptest-loadable-module.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-loadable-module.py 2012-12-24 00:25:25.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-missing-cfbundlesignature.py gyp-haiku/test/mac/gyptest-missing-cfbundlesignature.py +--- gyp/test/mac/gyptest-missing-cfbundlesignature.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-missing-cfbundlesignature.py 2012-12-24 00:25:28.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-non-strs-flattened-to-env.py gyp-haiku/test/mac/gyptest-non-strs-flattened-to-env.py +--- gyp/test/mac/gyptest-non-strs-flattened-to-env.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-non-strs-flattened-to-env.py 2012-12-24 00:25:30.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-objc-gc.py gyp-haiku/test/mac/gyptest-objc-gc.py +--- gyp/test/mac/gyptest-objc-gc.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-objc-gc.py 2012-12-24 00:25:33.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-postbuild-copy-bundle.py gyp-haiku/test/mac/gyptest-postbuild-copy-bundle.py +--- gyp/test/mac/gyptest-postbuild-copy-bundle.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-postbuild-copy-bundle.py 2012-12-24 00:25:36.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-postbuild-defaults.py gyp-haiku/test/mac/gyptest-postbuild-defaults.py +--- gyp/test/mac/gyptest-postbuild-defaults.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-postbuild-defaults.py 2012-12-24 00:25:38.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-postbuild-fail.py gyp-haiku/test/mac/gyptest-postbuild-fail.py +--- gyp/test/mac/gyptest-postbuild-fail.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-postbuild-fail.py 2012-12-24 00:25:41.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-postbuild-multiple-configurations.py gyp-haiku/test/mac/gyptest-postbuild-multiple-configurations.py +--- gyp/test/mac/gyptest-postbuild-multiple-configurations.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-postbuild-multiple-configurations.py 2012-12-24 00:25:47.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-postbuild.py gyp-haiku/test/mac/gyptest-postbuild.py +--- gyp/test/mac/gyptest-postbuild.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-postbuild.py 2012-12-24 00:26:33.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-prefixheader.py gyp-haiku/test/mac/gyptest-prefixheader.py +--- gyp/test/mac/gyptest-prefixheader.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-prefixheader.py 2012-12-24 00:26:40.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-rebuild.py gyp-haiku/test/mac/gyptest-rebuild.py +--- gyp/test/mac/gyptest-rebuild.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-rebuild.py 2012-12-24 00:26:43.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-rpath.py gyp-haiku/test/mac/gyptest-rpath.py +--- gyp/test/mac/gyptest-rpath.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-rpath.py 2012-12-24 00:26:46.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-sdkroot.py gyp-haiku/test/mac/gyptest-sdkroot.py +--- gyp/test/mac/gyptest-sdkroot.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-sdkroot.py 2012-12-24 00:26:48.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-strip.py gyp-haiku/test/mac/gyptest-strip.py +--- gyp/test/mac/gyptest-strip.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-strip.py 2012-12-24 00:26:51.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-type-envvars.py gyp-haiku/test/mac/gyptest-type-envvars.py +--- gyp/test/mac/gyptest-type-envvars.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-type-envvars.py 2012-12-24 00:26:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-xcode-env-order.py gyp-haiku/test/mac/gyptest-xcode-env-order.py +--- gyp/test/mac/gyptest-xcode-env-order.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-xcode-env-order.py 2012-12-24 00:27:03.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/mac/gyptest-xcode-gcc.py gyp-haiku/test/mac/gyptest-xcode-gcc.py +--- gyp/test/mac/gyptest-xcode-gcc.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/mac/gyptest-xcode-gcc.py 2012-12-24 00:27:05.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/make/gyptest-dependencies.py gyp-haiku/test/make/gyptest-dependencies.py +--- gyp/test/make/gyptest-dependencies.py 2012-12-24 00:53:47.000000000 +0000 ++++ gyp-haiku/test/make/gyptest-dependencies.py 2012-12-24 00:27:14.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/make/gyptest-noload.py gyp-haiku/test/make/gyptest-noload.py +--- gyp/test/make/gyptest-noload.py 2012-12-24 00:53:47.000000000 +0000 ++++ gyp-haiku/test/make/gyptest-noload.py 2012-12-24 00:27:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2010 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/many-actions/gyptest-many-actions-unsorted.py gyp-haiku/test/many-actions/gyptest-many-actions-unsorted.py +--- gyp/test/many-actions/gyptest-many-actions-unsorted.py 2012-12-24 00:53:44.000000000 +0000 ++++ gyp-haiku/test/many-actions/gyptest-many-actions-unsorted.py 2012-12-24 00:27:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/many-actions/gyptest-many-actions.py gyp-haiku/test/many-actions/gyptest-many-actions.py +--- gyp/test/many-actions/gyptest-many-actions.py 2012-12-24 00:53:44.000000000 +0000 ++++ gyp-haiku/test/many-actions/gyptest-many-actions.py 2012-12-24 00:28:01.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/module/gyptest-default.py gyp-haiku/test/module/gyptest-default.py +--- gyp/test/module/gyptest-default.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/module/gyptest-default.py 2012-12-24 00:28:06.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/msvs/config_attrs/gyptest-config_attrs.py gyp-haiku/test/msvs/config_attrs/gyptest-config_attrs.py +--- gyp/test/msvs/config_attrs/gyptest-config_attrs.py 2012-12-24 00:53:48.000000000 +0000 ++++ gyp-haiku/test/msvs/config_attrs/gyptest-config_attrs.py 2012-12-24 00:28:09.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/msvs/express/gyptest-express.py gyp-haiku/test/msvs/express/gyptest-express.py +--- gyp/test/msvs/express/gyptest-express.py 2012-12-24 00:53:48.000000000 +0000 ++++ gyp-haiku/test/msvs/express/gyptest-express.py 2012-12-24 00:28:13.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/msvs/list_excluded/gyptest-all.py gyp-haiku/test/msvs/list_excluded/gyptest-all.py +--- gyp/test/msvs/list_excluded/gyptest-all.py 2012-12-24 00:53:48.000000000 +0000 ++++ gyp-haiku/test/msvs/list_excluded/gyptest-all.py 2012-12-24 00:28:17.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/msvs/missing_sources/gyptest-missing.py gyp-haiku/test/msvs/missing_sources/gyptest-missing.py +--- gyp/test/msvs/missing_sources/gyptest-missing.py 2012-12-24 00:53:48.000000000 +0000 ++++ gyp-haiku/test/msvs/missing_sources/gyptest-missing.py 2012-12-24 00:28:20.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +@@ -38,4 +38,4 @@ + test.must_contain_any_line(test.stderr(), + ["Missing input files:"]) + +-test.pass_test() +\ No newline at end of file ++test.pass_test() +diff -Naur gyp/test/msvs/props/gyptest-props.py gyp-haiku/test/msvs/props/gyptest-props.py +--- gyp/test/msvs/props/gyptest-props.py 2012-12-24 00:53:48.000000000 +0000 ++++ gyp-haiku/test/msvs/props/gyptest-props.py 2012-12-24 00:28:23.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/msvs/shared_output/gyptest-shared_output.py gyp-haiku/test/msvs/shared_output/gyptest-shared_output.py +--- gyp/test/msvs/shared_output/gyptest-shared_output.py 2012-12-24 00:53:48.000000000 +0000 ++++ gyp-haiku/test/msvs/shared_output/gyptest-shared_output.py 2012-12-24 00:28:27.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/msvs/uldi2010/gyptest-all.py gyp-haiku/test/msvs/uldi2010/gyptest-all.py +--- gyp/test/msvs/uldi2010/gyptest-all.py 2012-12-24 00:53:48.000000000 +0000 ++++ gyp-haiku/test/msvs/uldi2010/gyptest-all.py 2012-12-24 00:28:30.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/multiple-targets/gyptest-all.py gyp-haiku/test/multiple-targets/gyptest-all.py +--- gyp/test/multiple-targets/gyptest-all.py 2012-12-24 00:54:05.000000000 +0000 ++++ gyp-haiku/test/multiple-targets/gyptest-all.py 2012-12-24 00:28:33.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/multiple-targets/gyptest-default.py gyp-haiku/test/multiple-targets/gyptest-default.py +--- gyp/test/multiple-targets/gyptest-default.py 2012-12-24 00:54:05.000000000 +0000 ++++ gyp-haiku/test/multiple-targets/gyptest-default.py 2012-12-24 00:28:36.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/ninja/action_dependencies/gyptest-action-dependencies.py gyp-haiku/test/ninja/action_dependencies/gyptest-action-dependencies.py +--- gyp/test/ninja/action_dependencies/gyptest-action-dependencies.py 2012-12-24 00:53:54.000000000 +0000 ++++ gyp-haiku/test/ninja/action_dependencies/gyptest-action-dependencies.py 2012-12-24 00:28:39.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/ninja/action_dependencies/src/emit.py gyp-haiku/test/ninja/action_dependencies/src/emit.py +--- gyp/test/ninja/action_dependencies/src/emit.py 2012-12-24 00:53:54.000000000 +0000 ++++ gyp-haiku/test/ninja/action_dependencies/src/emit.py 2012-12-24 00:28:44.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/ninja/chained-dependency/gyptest-chained-dependency.py gyp-haiku/test/ninja/chained-dependency/gyptest-chained-dependency.py +--- gyp/test/ninja/chained-dependency/gyptest-chained-dependency.py 2012-12-24 00:53:54.000000000 +0000 ++++ gyp-haiku/test/ninja/chained-dependency/gyptest-chained-dependency.py 2012-12-24 00:28:47.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/ninja/normalize-paths-win/gyptest-normalize-paths.py gyp-haiku/test/ninja/normalize-paths-win/gyptest-normalize-paths.py +--- gyp/test/ninja/normalize-paths-win/gyptest-normalize-paths.py 2012-12-24 00:53:54.000000000 +0000 ++++ gyp-haiku/test/ninja/normalize-paths-win/gyptest-normalize-paths.py 2012-12-24 00:28:50.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/ninja/solibs_avoid_relinking/gyptest-solibs-avoid-relinking.py gyp-haiku/test/ninja/solibs_avoid_relinking/gyptest-solibs-avoid-relinking.py +--- gyp/test/ninja/solibs_avoid_relinking/gyptest-solibs-avoid-relinking.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/ninja/solibs_avoid_relinking/gyptest-solibs-avoid-relinking.py 2012-12-24 00:28:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/no-output/gyptest-no-output.py gyp-haiku/test/no-output/gyptest-no-output.py +--- gyp/test/no-output/gyptest-no-output.py 2012-12-24 00:53:47.000000000 +0000 ++++ gyp-haiku/test/no-output/gyptest-no-output.py 2012-12-24 00:28:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/product/gyptest-product.py gyp-haiku/test/product/gyptest-product.py +--- gyp/test/product/gyptest-product.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/product/gyptest-product.py 2012-12-24 00:29:01.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/relative/gyptest-default.py gyp-haiku/test/relative/gyptest-default.py +--- gyp/test/relative/gyptest-default.py 2012-12-24 00:54:03.000000000 +0000 ++++ gyp-haiku/test/relative/gyptest-default.py 2012-12-24 00:29:07.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/rename/gyptest-filecase.py gyp-haiku/test/rename/gyptest-filecase.py +--- gyp/test/rename/gyptest-filecase.py 2012-12-24 00:54:03.000000000 +0000 ++++ gyp-haiku/test/rename/gyptest-filecase.py 2012-12-24 00:29:12.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/restat/gyptest-restat.py gyp-haiku/test/restat/gyptest-restat.py +--- gyp/test/restat/gyptest-restat.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/restat/gyptest-restat.py 2012-12-24 00:29:28.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/restat/src/create_intermediate.py gyp-haiku/test/restat/src/create_intermediate.py +--- gyp/test/restat/src/create_intermediate.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/restat/src/create_intermediate.py 2012-12-24 00:29:32.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/restat/src/touch.py gyp-haiku/test/restat/src/touch.py +--- gyp/test/restat/src/touch.py 2012-12-24 00:53:43.000000000 +0000 ++++ gyp-haiku/test/restat/src/touch.py 2012-12-24 00:29:47.000000000 +0000 +@@ -1,5 +1,5 @@ +-#!/usr/bin/env python +-# ++#!/boot/common/bin/python ++ + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/test/rules/gyptest-all.py gyp-haiku/test/rules/gyptest-all.py +--- gyp/test/rules/gyptest-all.py 2012-12-24 00:53:49.000000000 +0000 ++++ gyp-haiku/test/rules/gyptest-all.py 2012-12-24 00:29:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/rules/gyptest-default.py gyp-haiku/test/rules/gyptest-default.py +--- gyp/test/rules/gyptest-default.py 2012-12-24 00:53:49.000000000 +0000 ++++ gyp-haiku/test/rules/gyptest-default.py 2012-12-24 00:29:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/rules/gyptest-input-root.py gyp-haiku/test/rules/gyptest-input-root.py +--- gyp/test/rules/gyptest-input-root.py 2012-12-24 00:53:49.000000000 +0000 ++++ gyp-haiku/test/rules/gyptest-input-root.py 2012-12-24 00:29:59.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/rules/gyptest-special-variables.py gyp-haiku/test/rules/gyptest-special-variables.py +--- gyp/test/rules/gyptest-special-variables.py 2012-12-24 00:53:49.000000000 +0000 ++++ gyp-haiku/test/rules/gyptest-special-variables.py 2012-12-24 00:30:03.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/rules/src/copy-file.py gyp-haiku/test/rules/src/copy-file.py +--- gyp/test/rules/src/copy-file.py 2012-12-24 00:53:49.000000000 +0000 ++++ gyp-haiku/test/rules/src/copy-file.py 2012-12-24 00:30:06.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/rules/src/rule.py gyp-haiku/test/rules/src/rule.py +--- gyp/test/rules/src/rule.py 2012-12-24 00:53:49.000000000 +0000 ++++ gyp-haiku/test/rules/src/rule.py 2012-12-24 00:30:15.000000000 +0000 +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python ++ + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/test/rules-dirname/gyptest-dirname.py gyp-haiku/test/rules-dirname/gyptest-dirname.py +--- gyp/test/rules-dirname/gyptest-dirname.py 2012-12-24 00:54:02.000000000 +0000 ++++ gyp-haiku/test/rules-dirname/gyptest-dirname.py 2012-12-24 00:30:20.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/rules-dirname/src/copy-file.py gyp-haiku/test/rules-dirname/src/copy-file.py +--- gyp/test/rules-dirname/src/copy-file.py 2012-12-24 00:54:02.000000000 +0000 ++++ gyp-haiku/test/rules-dirname/src/copy-file.py 2012-12-24 00:30:24.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/rules-dirname/src/subdir/printvars.py gyp-haiku/test/rules-dirname/src/subdir/printvars.py +--- gyp/test/rules-dirname/src/subdir/printvars.py 2012-12-24 00:54:02.000000000 +0000 ++++ gyp-haiku/test/rules-dirname/src/subdir/printvars.py 2012-12-24 00:30:27.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/rules-rebuild/gyptest-all.py gyp-haiku/test/rules-rebuild/gyptest-all.py +--- gyp/test/rules-rebuild/gyptest-all.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/rules-rebuild/gyptest-all.py 2012-12-24 00:30:29.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/rules-rebuild/gyptest-default.py gyp-haiku/test/rules-rebuild/gyptest-default.py +--- gyp/test/rules-rebuild/gyptest-default.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/rules-rebuild/gyptest-default.py 2012-12-24 00:30:33.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/rules-rebuild/src/make-sources.py gyp-haiku/test/rules-rebuild/src/make-sources.py +--- gyp/test/rules-rebuild/src/make-sources.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/rules-rebuild/src/make-sources.py 2012-12-24 00:30:38.000000000 +0000 +@@ -1,4 +1,5 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python ++ + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. +diff -Naur gyp/test/rules-variables/gyptest-rules-variables.py gyp-haiku/test/rules-variables/gyptest-rules-variables.py +--- gyp/test/rules-variables/gyptest-rules-variables.py 2012-12-24 00:54:02.000000000 +0000 ++++ gyp-haiku/test/rules-variables/gyptest-rules-variables.py 2012-12-24 00:30:42.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/same-gyp-name/gyptest-all.py gyp-haiku/test/same-gyp-name/gyptest-all.py +--- gyp/test/same-gyp-name/gyptest-all.py 2012-12-24 00:53:54.000000000 +0000 ++++ gyp-haiku/test/same-gyp-name/gyptest-all.py 2012-12-24 00:30:45.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/same-gyp-name/gyptest-default.py gyp-haiku/test/same-gyp-name/gyptest-default.py +--- gyp/test/same-gyp-name/gyptest-default.py 2012-12-24 00:53:54.000000000 +0000 ++++ gyp-haiku/test/same-gyp-name/gyptest-default.py 2012-12-24 00:30:48.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/same-rule-output-file-name/gyptest-all.py gyp-haiku/test/same-rule-output-file-name/gyptest-all.py +--- gyp/test/same-rule-output-file-name/gyptest-all.py 2012-12-24 00:53:47.000000000 +0000 ++++ gyp-haiku/test/same-rule-output-file-name/gyptest-all.py 2012-12-24 00:30:51.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/same-rule-output-file-name/src/touch.py gyp-haiku/test/same-rule-output-file-name/src/touch.py +--- gyp/test/same-rule-output-file-name/src/touch.py 2012-12-24 00:53:47.000000000 +0000 ++++ gyp-haiku/test/same-rule-output-file-name/src/touch.py 2012-12-24 00:30:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/same-source-file-name/gyptest-all.py gyp-haiku/test/same-source-file-name/gyptest-all.py +--- gyp/test/same-source-file-name/gyptest-all.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/same-source-file-name/gyptest-all.py 2012-12-24 00:31:45.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/same-source-file-name/gyptest-default.py gyp-haiku/test/same-source-file-name/gyptest-default.py +--- gyp/test/same-source-file-name/gyptest-default.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/same-source-file-name/gyptest-default.py 2012-12-24 00:31:49.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/same-target-name/gyptest-same-target-name.py gyp-haiku/test/same-target-name/gyptest-same-target-name.py +--- gyp/test/same-target-name/gyptest-same-target-name.py 2012-12-24 00:53:47.000000000 +0000 ++++ gyp-haiku/test/same-target-name/gyptest-same-target-name.py 2012-12-24 00:31:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2010 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/same-target-name-different-directory/gyptest-all.py gyp-haiku/test/same-target-name-different-directory/gyptest-all.py +--- gyp/test/same-target-name-different-directory/gyptest-all.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/same-target-name-different-directory/gyptest-all.py 2012-12-24 00:31:55.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/same-target-name-different-directory/src/touch.py gyp-haiku/test/same-target-name-different-directory/src/touch.py +--- gyp/test/same-target-name-different-directory/src/touch.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/same-target-name-different-directory/src/touch.py 2012-12-24 00:31:58.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/sanitize-rule-names/gyptest-sanitize-rule-names.py gyp-haiku/test/sanitize-rule-names/gyptest-sanitize-rule-names.py +--- gyp/test/sanitize-rule-names/gyptest-sanitize-rule-names.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/sanitize-rule-names/gyptest-sanitize-rule-names.py 2012-12-24 00:32:01.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/sanitize-rule-names/script.py gyp-haiku/test/sanitize-rule-names/script.py +--- gyp/test/sanitize-rule-names/script.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/sanitize-rule-names/script.py 2012-12-24 00:32:03.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/scons_tools/gyptest-tools.py gyp-haiku/test/scons_tools/gyptest-tools.py +--- gyp/test/scons_tools/gyptest-tools.py 2012-12-24 00:53:44.000000000 +0000 ++++ gyp-haiku/test/scons_tools/gyptest-tools.py 2012-12-24 00:32:06.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/sibling/gyptest-all.py gyp-haiku/test/sibling/gyptest-all.py +--- gyp/test/sibling/gyptest-all.py 2012-12-24 00:54:01.000000000 +0000 ++++ gyp-haiku/test/sibling/gyptest-all.py 2012-12-24 00:32:08.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/sibling/gyptest-relocate.py gyp-haiku/test/sibling/gyptest-relocate.py +--- gyp/test/sibling/gyptest-relocate.py 2012-12-24 00:54:01.000000000 +0000 ++++ gyp-haiku/test/sibling/gyptest-relocate.py 2012-12-24 00:32:11.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/small/gyptest-small.py gyp-haiku/test/small/gyptest-small.py +--- gyp/test/small/gyptest-small.py 2012-12-24 00:53:55.000000000 +0000 ++++ gyp-haiku/test/small/gyptest-small.py 2012-12-24 00:32:13.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/standalone/gyptest-standalone.py gyp-haiku/test/standalone/gyptest-standalone.py +--- gyp/test/standalone/gyptest-standalone.py 2012-12-24 00:54:04.000000000 +0000 ++++ gyp-haiku/test/standalone/gyptest-standalone.py 2012-12-24 00:32:15.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/subdirectory/gyptest-subdir-all.py gyp-haiku/test/subdirectory/gyptest-subdir-all.py +--- gyp/test/subdirectory/gyptest-subdir-all.py 2012-12-24 00:53:57.000000000 +0000 ++++ gyp-haiku/test/subdirectory/gyptest-subdir-all.py 2012-12-24 00:32:23.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/subdirectory/gyptest-subdir-default.py gyp-haiku/test/subdirectory/gyptest-subdir-default.py +--- gyp/test/subdirectory/gyptest-subdir-default.py 2012-12-24 00:53:57.000000000 +0000 ++++ gyp-haiku/test/subdirectory/gyptest-subdir-default.py 2012-12-24 00:32:26.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/subdirectory/gyptest-subdir2-deep.py gyp-haiku/test/subdirectory/gyptest-subdir2-deep.py +--- gyp/test/subdirectory/gyptest-subdir2-deep.py 2012-12-24 00:53:57.000000000 +0000 ++++ gyp-haiku/test/subdirectory/gyptest-subdir2-deep.py 2012-12-24 00:32:29.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/subdirectory/gyptest-SYMROOT-all.py gyp-haiku/test/subdirectory/gyptest-SYMROOT-all.py +--- gyp/test/subdirectory/gyptest-SYMROOT-all.py 2012-12-24 00:53:57.000000000 +0000 ++++ gyp-haiku/test/subdirectory/gyptest-SYMROOT-all.py 2012-12-24 00:32:18.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/subdirectory/gyptest-SYMROOT-default.py gyp-haiku/test/subdirectory/gyptest-SYMROOT-default.py +--- gyp/test/subdirectory/gyptest-SYMROOT-default.py 2012-12-24 00:53:57.000000000 +0000 ++++ gyp-haiku/test/subdirectory/gyptest-SYMROOT-default.py 2012-12-24 00:32:21.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/subdirectory/gyptest-top-all.py gyp-haiku/test/subdirectory/gyptest-top-all.py +--- gyp/test/subdirectory/gyptest-top-all.py 2012-12-24 00:53:57.000000000 +0000 ++++ gyp-haiku/test/subdirectory/gyptest-top-all.py 2012-12-24 00:32:32.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/subdirectory/gyptest-top-default.py gyp-haiku/test/subdirectory/gyptest-top-default.py +--- gyp/test/subdirectory/gyptest-top-default.py 2012-12-24 00:53:57.000000000 +0000 ++++ gyp-haiku/test/subdirectory/gyptest-top-default.py 2012-12-24 00:32:35.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/toolsets/gyptest-toolsets.py gyp-haiku/test/toolsets/gyptest-toolsets.py +--- gyp/test/toolsets/gyptest-toolsets.py 2012-12-24 00:54:07.000000000 +0000 ++++ gyp-haiku/test/toolsets/gyptest-toolsets.py 2012-12-24 00:32:38.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/toplevel-dir/gyptest-toplevel-dir.py gyp-haiku/test/toplevel-dir/gyptest-toplevel-dir.py +--- gyp/test/toplevel-dir/gyptest-toplevel-dir.py 2012-12-24 00:53:46.000000000 +0000 ++++ gyp-haiku/test/toplevel-dir/gyptest-toplevel-dir.py 2012-12-24 00:32:40.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/variables/commands/gyptest-commands-ignore-env.py gyp-haiku/test/variables/commands/gyptest-commands-ignore-env.py +--- gyp/test/variables/commands/gyptest-commands-ignore-env.py 2012-12-24 00:53:46.000000000 +0000 ++++ gyp-haiku/test/variables/commands/gyptest-commands-ignore-env.py 2012-12-24 00:32:43.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/variables/commands/gyptest-commands-repeated.py gyp-haiku/test/variables/commands/gyptest-commands-repeated.py +--- gyp/test/variables/commands/gyptest-commands-repeated.py 2012-12-24 00:53:46.000000000 +0000 ++++ gyp-haiku/test/variables/commands/gyptest-commands-repeated.py 2012-12-24 00:32:45.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/variables/commands/gyptest-commands.py gyp-haiku/test/variables/commands/gyptest-commands.py +--- gyp/test/variables/commands/gyptest-commands.py 2012-12-24 00:53:46.000000000 +0000 ++++ gyp-haiku/test/variables/commands/gyptest-commands.py 2012-12-24 00:32:48.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/variables/filelist/gyptest-filelist.py gyp-haiku/test/variables/filelist/gyptest-filelist.py +--- gyp/test/variables/filelist/gyptest-filelist.py 2012-12-24 00:53:47.000000000 +0000 ++++ gyp-haiku/test/variables/filelist/gyptest-filelist.py 2012-12-24 00:32:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/variables/latelate/gyptest-latelate.py gyp-haiku/test/variables/latelate/gyptest-latelate.py +--- gyp/test/variables/latelate/gyptest-latelate.py 2012-12-24 00:53:47.000000000 +0000 ++++ gyp-haiku/test/variables/latelate/gyptest-latelate.py 2012-12-24 00:34:21.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/variables/variable-in-path/gyptest-variable-in-path.py gyp-haiku/test/variables/variable-in-path/gyptest-variable-in-path.py +--- gyp/test/variables/variable-in-path/gyptest-variable-in-path.py 2012-12-24 00:53:46.000000000 +0000 ++++ gyp-haiku/test/variables/variable-in-path/gyptest-variable-in-path.py 2012-12-24 00:34:30.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/variants/gyptest-variants.py gyp-haiku/test/variants/gyptest-variants.py +--- gyp/test/variants/gyptest-variants.py 2012-12-24 00:53:37.000000000 +0000 ++++ gyp-haiku/test/variants/gyptest-variants.py 2012-12-24 00:34:35.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2009 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-asm-files.py gyp-haiku/test/win/gyptest-asm-files.py +--- gyp/test/win/gyptest-asm-files.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-asm-files.py 2012-12-24 00:34:38.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-cl-additional-include-dirs.py gyp-haiku/test/win/gyptest-cl-additional-include-dirs.py +--- gyp/test/win/gyptest-cl-additional-include-dirs.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-cl-additional-include-dirs.py 2012-12-24 00:34:41.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-cl-additional-options.py gyp-haiku/test/win/gyptest-cl-additional-options.py +--- gyp/test/win/gyptest-cl-additional-options.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-cl-additional-options.py 2012-12-24 00:34:44.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-cl-buffer-security-check.py gyp-haiku/test/win/gyptest-cl-buffer-security-check.py +--- gyp/test/win/gyptest-cl-buffer-security-check.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-cl-buffer-security-check.py 2012-12-24 00:34:46.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-cl-character-set.py gyp-haiku/test/win/gyptest-cl-character-set.py +--- gyp/test/win/gyptest-cl-character-set.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-cl-character-set.py 2012-12-24 00:34:49.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-cl-debug-format.py gyp-haiku/test/win/gyptest-cl-debug-format.py +--- gyp/test/win/gyptest-cl-debug-format.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-cl-debug-format.py 2012-12-24 00:34:51.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-cl-exception-handling.py gyp-haiku/test/win/gyptest-cl-exception-handling.py +--- gyp/test/win/gyptest-cl-exception-handling.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-cl-exception-handling.py 2012-12-24 00:34:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-cl-function-level-linking.py gyp-haiku/test/win/gyptest-cl-function-level-linking.py +--- gyp/test/win/gyptest-cl-function-level-linking.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-cl-function-level-linking.py 2012-12-24 00:34:56.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-cl-optimizations.py gyp-haiku/test/win/gyptest-cl-optimizations.py +--- gyp/test/win/gyptest-cl-optimizations.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-cl-optimizations.py 2012-12-24 00:34:59.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-cl-pdbname.py gyp-haiku/test/win/gyptest-cl-pdbname.py +--- gyp/test/win/gyptest-cl-pdbname.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-cl-pdbname.py 2012-12-24 00:35:01.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-cl-rtti.py gyp-haiku/test/win/gyptest-cl-rtti.py +--- gyp/test/win/gyptest-cl-rtti.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-cl-rtti.py 2012-12-24 00:35:03.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-cl-runtime-checks.py gyp-haiku/test/win/gyptest-cl-runtime-checks.py +--- gyp/test/win/gyptest-cl-runtime-checks.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-cl-runtime-checks.py 2012-12-24 00:35:06.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-cl-runtime-library.py gyp-haiku/test/win/gyptest-cl-runtime-library.py +--- gyp/test/win/gyptest-cl-runtime-library.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-cl-runtime-library.py 2012-12-24 00:35:08.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-cl-warning-as-error.py gyp-haiku/test/win/gyptest-cl-warning-as-error.py +--- gyp/test/win/gyptest-cl-warning-as-error.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-cl-warning-as-error.py 2012-12-24 00:35:10.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-cl-warning-level.py gyp-haiku/test/win/gyptest-cl-warning-level.py +--- gyp/test/win/gyptest-cl-warning-level.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-cl-warning-level.py 2012-12-24 00:35:13.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-command-quote.py gyp-haiku/test/win/gyptest-command-quote.py +--- gyp/test/win/gyptest-command-quote.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-command-quote.py 2012-12-24 00:35:15.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-additional-deps.py gyp-haiku/test/win/gyptest-link-additional-deps.py +--- gyp/test/win/gyptest-link-additional-deps.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-additional-deps.py 2012-12-24 00:35:19.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-additional-options.py gyp-haiku/test/win/gyptest-link-additional-options.py +--- gyp/test/win/gyptest-link-additional-options.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-additional-options.py 2012-12-24 00:35:21.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-aslr.py gyp-haiku/test/win/gyptest-link-aslr.py +--- gyp/test/win/gyptest-link-aslr.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-aslr.py 2012-12-24 00:35:23.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-debug-info.py gyp-haiku/test/win/gyptest-link-debug-info.py +--- gyp/test/win/gyptest-link-debug-info.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-debug-info.py 2012-12-24 00:35:26.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-default-libs.py gyp-haiku/test/win/gyptest-link-default-libs.py +--- gyp/test/win/gyptest-link-default-libs.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-default-libs.py 2012-12-24 00:35:30.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-deffile.py gyp-haiku/test/win/gyptest-link-deffile.py +--- gyp/test/win/gyptest-link-deffile.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-deffile.py 2012-12-24 00:35:32.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-delay-load-dlls.py gyp-haiku/test/win/gyptest-link-delay-load-dlls.py +--- gyp/test/win/gyptest-link-delay-load-dlls.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-delay-load-dlls.py 2012-12-24 00:35:34.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-entrypointsymbol.py gyp-haiku/test/win/gyptest-link-entrypointsymbol.py +--- gyp/test/win/gyptest-link-entrypointsymbol.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-entrypointsymbol.py 2012-12-24 00:35:37.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-fixed-base.py gyp-haiku/test/win/gyptest-link-fixed-base.py +--- gyp/test/win/gyptest-link-fixed-base.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-fixed-base.py 2012-12-24 00:35:39.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-generate-manifest.py gyp-haiku/test/win/gyptest-link-generate-manifest.py +--- gyp/test/win/gyptest-link-generate-manifest.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-generate-manifest.py 2012-12-24 00:35:42.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-incremental.py gyp-haiku/test/win/gyptest-link-incremental.py +--- gyp/test/win/gyptest-link-incremental.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-incremental.py 2012-12-24 00:35:46.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-library-adjust.py gyp-haiku/test/win/gyptest-link-library-adjust.py +--- gyp/test/win/gyptest-link-library-adjust.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-library-adjust.py 2012-12-24 00:35:49.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-library-directories.py gyp-haiku/test/win/gyptest-link-library-directories.py +--- gyp/test/win/gyptest-link-library-directories.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-library-directories.py 2012-12-24 00:35:52.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-nodefaultlib.py gyp-haiku/test/win/gyptest-link-nodefaultlib.py +--- gyp/test/win/gyptest-link-nodefaultlib.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-nodefaultlib.py 2012-12-24 00:35:55.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-nxcompat.py gyp-haiku/test/win/gyptest-link-nxcompat.py +--- gyp/test/win/gyptest-link-nxcompat.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-nxcompat.py 2012-12-24 00:35:58.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-opt-icf.py gyp-haiku/test/win/gyptest-link-opt-icf.py +--- gyp/test/win/gyptest-link-opt-icf.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-opt-icf.py 2012-12-24 00:36:01.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-opt-ref.py gyp-haiku/test/win/gyptest-link-opt-ref.py +--- gyp/test/win/gyptest-link-opt-ref.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-opt-ref.py 2012-12-24 00:36:03.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-outputfile.py gyp-haiku/test/win/gyptest-link-outputfile.py +--- gyp/test/win/gyptest-link-outputfile.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-outputfile.py 2012-12-24 00:36:14.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-restat-importlib.py gyp-haiku/test/win/gyptest-link-restat-importlib.py +--- gyp/test/win/gyptest-link-restat-importlib.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-restat-importlib.py 2012-12-24 00:36:17.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-subsystem.py gyp-haiku/test/win/gyptest-link-subsystem.py +--- gyp/test/win/gyptest-link-subsystem.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-subsystem.py 2012-12-24 00:36:20.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-link-uldi.py gyp-haiku/test/win/gyptest-link-uldi.py +--- gyp/test/win/gyptest-link-uldi.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-link-uldi.py 2012-12-24 00:36:23.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-long-command-line.py gyp-haiku/test/win/gyptest-long-command-line.py +--- gyp/test/win/gyptest-long-command-line.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-long-command-line.py 2012-12-24 00:37:44.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-macro-projectname.py gyp-haiku/test/win/gyptest-macro-projectname.py +--- gyp/test/win/gyptest-macro-projectname.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-macro-projectname.py 2012-12-24 00:37:48.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-macro-vcinstalldir.py gyp-haiku/test/win/gyptest-macro-vcinstalldir.py +--- gyp/test/win/gyptest-macro-vcinstalldir.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-macro-vcinstalldir.py 2012-12-24 00:37:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-macros-containing-gyp.py gyp-haiku/test/win/gyptest-macros-containing-gyp.py +--- gyp/test/win/gyptest-macros-containing-gyp.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-macros-containing-gyp.py 2012-12-24 00:37:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-macros-in-inputs-and-outputs.py gyp-haiku/test/win/gyptest-macros-in-inputs-and-outputs.py +--- gyp/test/win/gyptest-macros-in-inputs-and-outputs.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-macros-in-inputs-and-outputs.py 2012-12-24 00:38:00.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-midl-rules.py gyp-haiku/test/win/gyptest-midl-rules.py +--- gyp/test/win/gyptest-midl-rules.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-midl-rules.py 2012-12-24 00:38:03.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-quoting-commands.py gyp-haiku/test/win/gyptest-quoting-commands.py +--- gyp/test/win/gyptest-quoting-commands.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-quoting-commands.py 2012-12-24 00:38:06.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/gyptest-rc-build.py gyp-haiku/test/win/gyptest-rc-build.py +--- gyp/test/win/gyptest-rc-build.py 2012-12-24 00:53:53.000000000 +0000 ++++ gyp-haiku/test/win/gyptest-rc-build.py 2012-12-24 00:38:09.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/precompiled/gyptest-all.py gyp-haiku/test/win/precompiled/gyptest-all.py +--- gyp/test/win/precompiled/gyptest-all.py 2012-12-24 00:53:51.000000000 +0000 ++++ gyp-haiku/test/win/precompiled/gyptest-all.py 2012-12-24 00:38:11.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/test/win/vs-macros/as.py gyp-haiku/test/win/vs-macros/as.py +--- gyp/test/win/vs-macros/as.py 2012-12-24 00:53:52.000000000 +0000 ++++ gyp-haiku/test/win/vs-macros/as.py 2012-12-24 00:38:14.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/tools/graphviz.py gyp-haiku/tools/graphviz.py +--- gyp/tools/graphviz.py 2012-12-24 00:54:08.000000000 +0000 ++++ gyp-haiku/tools/graphviz.py 2012-12-24 00:38:17.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2011 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/tools/pretty_gyp.py gyp-haiku/tools/pretty_gyp.py +--- gyp/tools/pretty_gyp.py 2012-12-24 00:54:08.000000000 +0000 ++++ gyp-haiku/tools/pretty_gyp.py 2012-12-24 00:38:21.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/tools/pretty_sln.py gyp-haiku/tools/pretty_sln.py +--- gyp/tools/pretty_sln.py 2012-12-24 00:54:08.000000000 +0000 ++++ gyp-haiku/tools/pretty_sln.py 2012-12-24 00:38:24.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be +diff -Naur gyp/tools/pretty_vcproj.py gyp-haiku/tools/pretty_vcproj.py +--- gyp/tools/pretty_vcproj.py 2012-12-24 00:54:08.000000000 +0000 ++++ gyp-haiku/tools/pretty_vcproj.py 2012-12-24 00:38:26.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # Copyright (c) 2012 Google Inc. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be diff --git a/dev-lang/v8/patches/v8-r13067.patch b/dev-lang/v8/patches/v8-r13067.patch new file mode 100644 index 000000000..035b9ded4 --- /dev/null +++ b/dev-lang/v8/patches/v8-r13067.patch @@ -0,0 +1,1381 @@ +diff -Naur v8-r13067/build/common.gypi v8-r13067-haiku/build/common.gypi +--- v8-r13067/build/common.gypi 2012-12-24 04:17:35.255590400 +0000 ++++ v8-r13067-haiku/build/common.gypi 2012-12-24 04:10:09.000000000 +0000 +@@ -277,7 +277,7 @@ + }, + }], + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ +- or OS=="netbsd"', { ++ or OS=="netbsd" or OS=="haiku"', { + 'conditions': [ + [ 'v8_no_strict_aliasing==1', { + 'cflags': [ '-fno-strict-aliasing' ], +@@ -288,7 +288,7 @@ + 'defines': [ '__C99FEATURES__=1' ], # isinf() etc. + }], + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ +- or OS=="netbsd" or OS=="mac" or OS=="android") and \ ++ or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="haiku") and \ + (v8_target_arch=="arm" or v8_target_arch=="ia32" or \ + v8_target_arch=="mipsel")', { + # Check whether the host compiler and target compiler support the +@@ -360,7 +360,8 @@ + ['v8_enable_extra_checks==1', { + 'defines': ['ENABLE_EXTRA_CHECKS',], + }], +- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', { ++ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \ ++ or OS=="haiku"', { + 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', + '-Wnon-virtual-dtor', '-Woverloaded-virtual' ], + }], +@@ -389,7 +390,7 @@ + 'defines': ['ENABLE_EXTRA_CHECKS',], + }], + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \ +- or OS=="android"', { ++ or OS=="android" or OS=="haiku"', { + 'cflags!': [ + '-O2', + '-Os', +diff -Naur v8-r13067/build/standalone.gypi v8-r13067-haiku/build/standalone.gypi +--- v8-r13067/build/standalone.gypi 2012-12-24 04:17:35.258473984 +0000 ++++ v8-r13067-haiku/build/standalone.gypi 2012-12-24 04:10:09.000000000 +0000 +@@ -90,7 +90,7 @@ + }, + 'conditions': [ + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ +- or OS=="netbsd"', { ++ or OS=="netbsd" or OS=="haiku"', { + 'target_defaults': { + 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', + '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', +@@ -100,6 +100,10 @@ + [ 'OS=="linux"', { + 'cflags': [ '-ansi' ], + }], ++ [ 'OS=="haiku"', { ++ 'cflags!': [ '-pthread' ], ++ 'ldflags!': [ '-pthread' ], ++ }], + [ 'visibility=="hidden"', { + 'cflags': [ '-fvisibility=hidden' ], + }], +diff -Naur v8-r13067/src/atomicops.h v8-r13067-haiku/src/atomicops.h +--- v8-r13067/src/atomicops.h 2012-12-24 04:17:34.352583680 +0000 ++++ v8-r13067-haiku/src/atomicops.h 2012-12-24 04:10:09.000000000 +0000 +@@ -69,7 +69,7 @@ + + // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or + // Atomic64 routines below, depending on your architecture. +-#if defined(__OpenBSD__) && defined(__i386__) ++#if (defined(__OpenBSD__) || defined(__HAIKU__)) && defined(__i386__) + typedef Atomic32 AtomicWord; + #else + typedef intptr_t AtomicWord; +diff -Naur v8-r13067/src/d8.gyp v8-r13067-haiku/src/d8.gyp +--- v8-r13067/src/d8.gyp 2012-12-24 04:17:34.042467328 +0000 ++++ v8-r13067-haiku/src/d8.gyp 2012-12-24 04:10:09.000000000 +0000 +@@ -62,7 +62,8 @@ + 'sources': [ 'd8-readline.cc' ], + }], + ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \ +- or OS=="openbsd" or OS=="solaris" or OS=="android")', { ++ or OS=="openbsd" or OS=="solaris" or OS=="android" \ ++ or OS=="haiku")', { + 'sources': [ 'd8-posix.cc', ] + }], + [ 'OS=="win"', { +diff -Naur v8-r13067/src/globals.h v8-r13067-haiku/src/globals.h +--- v8-r13067/src/globals.h 2012-12-24 04:17:34.246153216 +0000 ++++ v8-r13067-haiku/src/globals.h 2012-12-24 04:10:09.000000000 +0000 +@@ -178,7 +178,12 @@ + #endif + #else // V8_HOST_ARCH_64_BIT + #define V8_INTPTR_C(x) (x) ++#if defined(__HAIKU__) ++// (u)intptr_t is long on Haiku ++#define V8_PTR_PREFIX "l" ++#else + #define V8_PTR_PREFIX "" ++#endif + #endif // V8_HOST_ARCH_64_BIT + + // The following macro works on both 32 and 64-bit platforms. +diff -Naur v8-r13067/src/ia32/deoptimizer-ia32.cc v8-r13067-haiku/src/ia32/deoptimizer-ia32.cc +--- v8-r13067/src/ia32/deoptimizer-ia32.cc 2012-12-24 04:17:29.666632192 +0000 ++++ v8-r13067-haiku/src/ia32/deoptimizer-ia32.cc 2012-12-24 04:10:09.000000000 +0000 +@@ -354,7 +354,7 @@ + PrintF("[on-stack replacement: begin 0x%08" V8PRIxPTR " ", + reinterpret_cast(function_)); + function_->PrintName(); +- PrintF(" => node=%u, frame=%d->%d, ebp:esp=0x%08x:0x%08x]\n", ++ PrintF(" => node=%u, frame=%d->%d, ebp:esp=0x%08" V8PRIxPTR ":0x%08" V8PRIxPTR "]\n", + ast_id, + input_frame_size, + output_frame_size, +@@ -468,7 +468,7 @@ + ok ? "finished" : "aborted", + reinterpret_cast(function_)); + function_->PrintName(); +- PrintF(" => pc=0x%0x]\n", output_[0]->GetPc()); ++ PrintF(" => pc=0x%0" V8PRIxPTR "]\n", output_[0]->GetPc()); + } + } + +@@ -514,7 +514,7 @@ + intptr_t callers_pc = output_[frame_index - 1]->GetPc(); + output_frame->SetFrameSlot(output_offset, callers_pc); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's pc\n", ++ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; caller's pc\n", + top_address + output_offset, output_offset, callers_pc); + } + +@@ -525,7 +525,7 @@ + intptr_t fp_value = top_address + output_offset; + output_frame->SetFp(fp_value); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's fp\n", ++ PrintF(" 0x%08" V8PRIxPTR ": [top + %d] <- 0x%08" V8PRIxPTR " ; caller's fp\n", + fp_value, output_offset, value); + } + +@@ -535,7 +535,7 @@ + Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR)); + output_frame->SetFrameSlot(output_offset, context); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; context (adaptor sentinel)\n", ++ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; context (adaptor sentinel)\n", + top_address + output_offset, output_offset, context); + } + +@@ -544,7 +544,7 @@ + value = reinterpret_cast(function); + output_frame->SetFrameSlot(output_offset, value); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; function\n", ++ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; function\n", + top_address + output_offset, output_offset, value); + } + +@@ -553,7 +553,7 @@ + value = reinterpret_cast(Smi::FromInt(height - 1)); + output_frame->SetFrameSlot(output_offset, value); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; argc (%d)\n", ++ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; argc (%d)\n", + top_address + output_offset, output_offset, value, height - 1); + } + +@@ -612,7 +612,7 @@ + intptr_t callers_pc = output_[frame_index - 1]->GetPc(); + output_frame->SetFrameSlot(output_offset, callers_pc); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's pc\n", ++ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; caller's pc\n", + top_address + output_offset, output_offset, callers_pc); + } + +@@ -623,7 +623,7 @@ + intptr_t fp_value = top_address + output_offset; + output_frame->SetFp(fp_value); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's fp\n", ++ PrintF(" 0x%08" V8PRIxPTR ": [top + %d] <- 0x%08" V8PRIxPTR " ; caller's fp\n", + fp_value, output_offset, value); + } + +@@ -632,7 +632,7 @@ + value = output_[frame_index - 1]->GetContext(); + output_frame->SetFrameSlot(output_offset, value); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; context\n", ++ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; context\n", + top_address + output_offset, output_offset, value); + } + +@@ -641,7 +641,7 @@ + value = reinterpret_cast(Smi::FromInt(StackFrame::CONSTRUCT)); + output_frame->SetFrameSlot(output_offset, value); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; function (construct sentinel)\n", ++ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; function (construct sentinel)\n", + top_address + output_offset, output_offset, value); + } + +@@ -650,7 +650,7 @@ + value = reinterpret_cast(construct_stub); + output_frame->SetFrameSlot(output_offset, value); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; code object\n", ++ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; code object\n", + top_address + output_offset, output_offset, value); + } + +@@ -659,7 +659,7 @@ + value = reinterpret_cast(Smi::FromInt(height - 1)); + output_frame->SetFrameSlot(output_offset, value); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; argc (%d)\n", ++ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; argc (%d)\n", + top_address + output_offset, output_offset, value, height - 1); + } + +@@ -669,7 +669,7 @@ + value = output_frame->GetFrameSlot(output_frame_size - kPointerSize); + output_frame->SetFrameSlot(output_offset, value); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; allocated receiver\n", ++ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; allocated receiver\n", + top_address + output_offset, output_offset, value); + } + +@@ -894,7 +894,7 @@ + } + output_frame->SetFrameSlot(output_offset, value); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's pc\n", ++ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; caller's pc\n", + top_address + output_offset, output_offset, value); + } + +@@ -917,7 +917,7 @@ + output_frame->SetFp(fp_value); + if (is_topmost) output_frame->SetRegister(ebp.code(), fp_value); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; caller's fp\n", ++ PrintF(" 0x%08" V8PRIxPTR ": [top + %d] <- 0x%08" V8PRIxPTR " ; caller's fp\n", + fp_value, output_offset, value); + } + ASSERT(!is_bottommost || !has_alignment_padding_ || +@@ -937,7 +937,7 @@ + output_frame->SetContext(value); + if (is_topmost) output_frame->SetRegister(esi.code(), value); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; context\n", ++ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; context\n", + top_address + output_offset, output_offset, value); + } + +@@ -950,7 +950,7 @@ + ASSERT(!is_bottommost || input_->GetFrameSlot(input_offset) == value); + output_frame->SetFrameSlot(output_offset, value); + if (FLAG_trace_deopt) { +- PrintF(" 0x%08x: [top + %d] <- 0x%08x ; function\n", ++ PrintF(" 0x%08x: [top + %d] <- 0x%08" V8PRIxPTR " ; function\n", + top_address + output_offset, output_offset, value); + } + +diff -Naur v8-r13067/src/platform-haiku.cc v8-r13067-haiku/src/platform-haiku.cc +--- v8-r13067/src/platform-haiku.cc 1970-01-01 00:00:00.000000000 +0000 ++++ v8-r13067-haiku/src/platform-haiku.cc 2012-12-24 04:10:09.000000000 +0000 +@@ -0,0 +1,898 @@ ++// Copyright 2012 the V8 project authors. All rights reserved. ++// 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 name of Google Inc. 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. ++ ++// Platform specific code for Haiku goes here. For the POSIX comaptible parts ++// the implementation is in platform-posix.cc. ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include // mmap & munmap ++#include // mmap & munmap ++#include // open ++#include // open ++#include // sysconf ++#include // index ++#include ++#include ++#include ++ ++#undef MAP_TYPE ++ ++#include "v8.h" ++ ++#include "platform-posix.h" ++#include "platform.h" ++#include "v8threads.h" ++#include "vm-state-inl.h" ++ ++ ++namespace v8 { ++namespace internal { ++ ++// pthread_t's are pointers to structs on Haiku ++static const pthread_t kNoThread = NULL; ++ ++ ++double ceiling(double x) { ++ return ceil(x); ++} ++ ++ ++static Mutex* limit_mutex = NULL; ++ ++ ++void OS::PostSetUp() { ++ POSIXPostSetUp(); ++} ++ ++ ++uint64_t OS::CpuFeaturesImpliedByPlatform() { ++ return 0; // Haiku runs on anything. ++} ++ ++ ++int OS::ActivationFrameAlignment() { ++ // With gcc 4.4 the tree vectorization optimizer can generate code ++ // that requires 16 byte alignment such as movdqa on x86. ++ return 16; ++} ++ ++ ++void OS::ReleaseStore(volatile AtomicWord* ptr, AtomicWord value) { ++#if (defined(V8_TARGET_ARCH_ARM) && defined(__arm__)) || \ ++ (defined(V8_TARGET_ARCH_MIPS) && defined(__mips__)) ++ // Only use on ARM or MIPS hardware. ++ MemoryBarrier(); ++#else ++ __asm__ __volatile__("" : : : "memory"); ++ // An x86 store acts as a release barrier. ++#endif ++ *ptr = value; ++} ++ ++ ++const char* OS::LocalTimezone(double time) { ++ if (isnan(time)) return ""; ++ time_t tv = static_cast(floor(time/msPerSecond)); ++ struct tm* t = localtime(&tv); ++ if (NULL == t) return ""; ++ return t->tm_zone; ++} ++ ++ ++double OS::LocalTimeOffset() { ++ time_t tv = time(NULL); ++ struct tm* t = localtime(&tv); ++ // tm_gmtoff includes any daylight savings offset, so subtract it. ++ return static_cast(t->tm_gmtoff * msPerSecond - ++ (t->tm_isdst > 0 ? 3600 * msPerSecond : 0)); ++} ++ ++ ++// We keep the lowest and highest addresses mapped as a quick way of ++// determining that pointers are outside the heap (used mostly in assertions ++// and verification). The estimate is conservative, i.e., not all addresses in ++// 'allocated' space are actually allocated to our heap. The range is ++// [lowest, highest), inclusive on the low and and exclusive on the high end. ++static void* lowest_ever_allocated = reinterpret_cast(-1); ++static void* highest_ever_allocated = reinterpret_cast(0); ++ ++ ++static void UpdateAllocatedSpaceLimits(void* address, int size) { ++ ASSERT(limit_mutex != NULL); ++ ScopedLock lock(limit_mutex); ++ ++ lowest_ever_allocated = Min(lowest_ever_allocated, address); ++ highest_ever_allocated = ++ Max(highest_ever_allocated, ++ reinterpret_cast(reinterpret_cast(address) + size)); ++} ++ ++ ++bool OS::IsOutsideAllocatedSpace(void* address) { ++ return address < lowest_ever_allocated || address >= highest_ever_allocated; ++} ++ ++ ++size_t OS::AllocateAlignment() { ++ return sysconf(_SC_PAGESIZE); ++} ++ ++ ++void* OS::Allocate(const size_t requested, ++ size_t* allocated, ++ bool is_executable) { ++ const size_t msize = RoundUp(requested, AllocateAlignment()); ++ int prot = PROT_READ | PROT_WRITE | (is_executable ? PROT_EXEC : 0); ++ void* addr = OS::GetRandomMmapAddr(); ++ void* mbase = mmap(addr, msize, prot, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); ++ if (mbase == MAP_FAILED) { ++ LOG(i::Isolate::Current(), ++ StringEvent("OS::Allocate", "mmap failed")); ++ return NULL; ++ } ++ *allocated = msize; ++ UpdateAllocatedSpaceLimits(mbase, msize); ++ return mbase; ++} ++ ++ ++void OS::Free(void* address, const size_t size) { ++ // TODO(1240712): munmap has a return value which is ignored here. ++ int result = munmap(address, size); ++ USE(result); ++ ASSERT(result == 0); ++} ++ ++ ++void OS::Sleep(int milliseconds) { ++ unsigned int ms = static_cast(milliseconds); ++ usleep(1000 * ms); ++} ++ ++ ++void OS::Abort() { ++ // Redirect to std abort to signal abnormal program termination. ++ if (FLAG_break_on_abort) { ++ DebugBreak(); ++ } ++ abort(); ++} ++ ++ ++void OS::DebugBreak() { ++// TODO(lrn): Introduce processor define for runtime system (!= V8_ARCH_x, ++// which is the architecture of generated code). ++#if (defined(__arm__) || defined(__thumb__)) ++# if defined(CAN_USE_ARMV5_INSTRUCTIONS) ++ asm("bkpt 0"); ++# endif ++#elif defined(__mips__) ++ asm("break"); ++#else ++ asm("int $3"); ++#endif ++} ++ ++ ++class PosixMemoryMappedFile : public OS::MemoryMappedFile { ++ public: ++ PosixMemoryMappedFile(FILE* file, void* memory, int size) ++ : file_(file), memory_(memory), size_(size) { } ++ virtual ~PosixMemoryMappedFile(); ++ virtual void* memory() { return memory_; } ++ virtual int size() { return size_; } ++ private: ++ FILE* file_; ++ void* memory_; ++ int size_; ++}; ++ ++ ++OS::MemoryMappedFile* OS::MemoryMappedFile::open(const char* name) { ++ FILE* file = fopen(name, "r+"); ++ if (file == NULL) return NULL; ++ ++ fseek(file, 0, SEEK_END); ++ int size = ftell(file); ++ ++ void* memory = ++ mmap(OS::GetRandomMmapAddr(), ++ size, ++ PROT_READ | PROT_WRITE, ++ MAP_SHARED, ++ fileno(file), ++ 0); ++ return new PosixMemoryMappedFile(file, memory, size); ++} ++ ++ ++OS::MemoryMappedFile* OS::MemoryMappedFile::create(const char* name, int size, ++ void* initial) { ++ FILE* file = fopen(name, "w+"); ++ if (file == NULL) return NULL; ++ int result = fwrite(initial, size, 1, file); ++ if (result < 1) { ++ fclose(file); ++ return NULL; ++ } ++ void* memory = ++ mmap(OS::GetRandomMmapAddr(), ++ size, ++ PROT_READ | PROT_WRITE, ++ MAP_SHARED, ++ fileno(file), ++ 0); ++ return new PosixMemoryMappedFile(file, memory, size); ++} ++ ++ ++PosixMemoryMappedFile::~PosixMemoryMappedFile() { ++ if (memory_) OS::Free(memory_, size_); ++ fclose(file_); ++} ++ ++ ++void OS::LogSharedLibraryAddresses() { ++ // TODO ++ // Loop through images (get_next_image_info()) and print data/text ++ // addresses. ++} ++ ++ ++void OS::SignalCodeMovingGC() { ++} ++ ++ ++int OS::StackWalk(Vector frames) { ++ // dladdr ++ return 0; ++} ++ ++// No MAP_NORESERVE on Haiku means we can't reserve without ++// committing or decommit at all. ++#define MAP_NORESERVE 0 ++ ++// Constants used for mmap. ++static const int kMmapFd = -1; ++static const int kMmapFdOffset = 0; ++ ++VirtualMemory::VirtualMemory() : address_(NULL), size_(0) { } ++ ++VirtualMemory::VirtualMemory(size_t size) { ++ address_ = ReserveRegion(size); ++ size_ = size; ++} ++ ++ ++VirtualMemory::VirtualMemory(size_t size, size_t alignment) ++ : address_(NULL), size_(0) { ++ ASSERT(IsAligned(alignment, static_cast(OS::AllocateAlignment()))); ++ size_t request_size = RoundUp(size + alignment, ++ static_cast(OS::AllocateAlignment())); ++ void* reservation = mmap(OS::GetRandomMmapAddr(), ++ request_size, ++ PROT_NONE, ++ MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, ++ kMmapFd, ++ kMmapFdOffset); ++ if (reservation == MAP_FAILED) return; ++ ++ Address base = static_cast
(reservation); ++ Address aligned_base = RoundUp(base, alignment); ++ ASSERT_LE(base, aligned_base); ++ ++ // Unmap extra memory reserved before and after the desired block. ++ if (aligned_base != base) { ++ size_t prefix_size = static_cast(aligned_base - base); ++ OS::Free(base, prefix_size); ++ request_size -= prefix_size; ++ } ++ ++ size_t aligned_size = RoundUp(size, OS::AllocateAlignment()); ++ ASSERT_LE(aligned_size, request_size); ++ ++ if (aligned_size != request_size) { ++ size_t suffix_size = request_size - aligned_size; ++ OS::Free(aligned_base + aligned_size, suffix_size); ++ request_size -= suffix_size; ++ } ++ ++ ASSERT(aligned_size == request_size); ++ ++ address_ = static_cast(aligned_base); ++ size_ = aligned_size; ++} ++ ++ ++VirtualMemory::~VirtualMemory() { ++ if (IsReserved()) { ++ bool result = ReleaseRegion(address(), size()); ++ ASSERT(result); ++ USE(result); ++ } ++} ++ ++ ++bool VirtualMemory::IsReserved() { ++ return address_ != NULL; ++} ++ ++ ++void VirtualMemory::Reset() { ++ address_ = NULL; ++ size_ = 0; ++} ++ ++ ++bool VirtualMemory::Commit(void* address, size_t size, bool is_executable) { ++ return CommitRegion(address, size, is_executable); ++} ++ ++ ++bool VirtualMemory::Uncommit(void* address, size_t size) { ++ return UncommitRegion(address, size); ++} ++ ++ ++bool VirtualMemory::Guard(void* address) { ++ OS::Guard(address, OS::CommitPageSize()); ++ return true; ++} ++ ++ ++void* VirtualMemory::ReserveRegion(size_t size) { ++ void* result = mmap(OS::GetRandomMmapAddr(), ++ size, ++ PROT_NONE, ++ MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, ++ kMmapFd, ++ kMmapFdOffset); ++ ++ if (result == MAP_FAILED) return NULL; ++ ++ return result; ++} ++ ++ ++bool VirtualMemory::CommitRegion(void* base, size_t size, bool is_executable) { ++ int prot = PROT_READ | PROT_WRITE | (is_executable ? PROT_EXEC : 0); ++ if (MAP_FAILED == mmap(base, ++ size, ++ prot, ++ MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, ++ kMmapFd, ++ kMmapFdOffset)) { ++ return false; ++ } ++ ++ UpdateAllocatedSpaceLimits(base, size); ++ return true; ++} ++ ++ ++bool VirtualMemory::UncommitRegion(void* base, size_t size) { ++ return mmap(base, ++ size, ++ PROT_NONE, ++ MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_FIXED, ++ kMmapFd, ++ kMmapFdOffset) != MAP_FAILED; ++} ++ ++ ++bool VirtualMemory::ReleaseRegion(void* base, size_t size) { ++ return munmap(base, size) == 0; ++} ++ ++ ++bool VirtualMemory::HasLazyCommits() { ++ return true; ++} ++ ++ ++class Thread::PlatformData : public Malloced { ++ public: ++ PlatformData() : thread_(kNoThread) {} ++ ++ pthread_t thread_; // Thread handle for pthread. ++}; ++ ++Thread::Thread(const Options& options) ++ : data_(new PlatformData()), ++ stack_size_(options.stack_size()) { ++ set_name(options.name()); ++} ++ ++ ++Thread::~Thread() { ++ delete data_; ++} ++ ++ ++static void* ThreadEntry(void* arg) { ++ Thread* thread = reinterpret_cast(arg); ++ thread->data()->thread_ = pthread_self(); ++ ASSERT(thread->data()->thread_ != kNoThread); ++ thread->Run(); ++ return NULL; ++} ++ ++ ++void Thread::set_name(const char* name) { ++ strncpy(name_, name, sizeof(name_)); ++ name_[sizeof(name_) - 1] = '\0'; ++} ++ ++ ++void Thread::Start() { ++ pthread_attr_t* attr_ptr = NULL; ++ pthread_attr_t attr; ++ if (stack_size_ > 0) { ++ pthread_attr_init(&attr); ++ pthread_attr_setstacksize(&attr, static_cast(stack_size_)); ++ attr_ptr = &attr; ++ } ++ int result = pthread_create(&data_->thread_, attr_ptr, ThreadEntry, this); ++ CHECK_EQ(0, result); ++ ASSERT(data_->thread_ != kNoThread); ++} ++ ++ ++void Thread::Join() { ++ pthread_join(data_->thread_, NULL); ++} ++ ++ ++Thread::LocalStorageKey Thread::CreateThreadLocalKey() { ++ pthread_key_t key; ++ int result = pthread_key_create(&key, NULL); ++ USE(result); ++ ASSERT(result == 0); ++ return static_cast(key); ++} ++ ++ ++void Thread::DeleteThreadLocalKey(LocalStorageKey key) { ++ pthread_key_t pthread_key = static_cast(key); ++ int result = pthread_key_delete(pthread_key); ++ USE(result); ++ ASSERT(result == 0); ++} ++ ++ ++void* Thread::GetThreadLocal(LocalStorageKey key) { ++ pthread_key_t pthread_key = static_cast(key); ++ return pthread_getspecific(pthread_key); ++} ++ ++ ++void Thread::SetThreadLocal(LocalStorageKey key, void* value) { ++ pthread_key_t pthread_key = static_cast(key); ++ pthread_setspecific(pthread_key, value); ++} ++ ++ ++void Thread::YieldCPU() { ++ sched_yield(); ++} ++ ++ ++class HaikuMutex : public Mutex { ++ public: ++ HaikuMutex() { ++ pthread_mutexattr_t attrs; ++ int result = pthread_mutexattr_init(&attrs); ++ ASSERT(result == 0); ++ result = pthread_mutexattr_settype(&attrs, PTHREAD_MUTEX_RECURSIVE); ++ ASSERT(result == 0); ++ result = pthread_mutex_init(&mutex_, &attrs); ++ ASSERT(result == 0); ++ USE(result); ++ } ++ ++ virtual ~HaikuMutex() { pthread_mutex_destroy(&mutex_); } ++ ++ virtual int Lock() { ++ int result = pthread_mutex_lock(&mutex_); ++ return result; ++ } ++ ++ virtual int Unlock() { ++ int result = pthread_mutex_unlock(&mutex_); ++ return result; ++ } ++ ++ virtual bool TryLock() { ++ int result = pthread_mutex_trylock(&mutex_); ++ // Return false if the lock is busy and locking failed. ++ if (result == EBUSY) { ++ return false; ++ } ++ ASSERT(result == 0); // Verify no other errors. ++ return true; ++ } ++ ++ private: ++ pthread_mutex_t mutex_; // Pthread mutex for POSIX platforms. ++}; ++ ++ ++Mutex* OS::CreateMutex() { ++ return new HaikuMutex(); ++} ++ ++ ++class HaikuSemaphore : public Semaphore { ++ public: ++ explicit HaikuSemaphore(int count) { sem_ = create_sem(count, ""); } ++ virtual ~HaikuSemaphore() { delete_sem(sem_); } ++ ++ virtual void Wait(); ++ virtual bool Wait(int timeout); ++ virtual void Signal() { release_sem(sem_); } ++ private: ++ sem_id sem_; ++}; ++ ++ ++void HaikuSemaphore::Wait() { ++ while (true) { ++ int result = acquire_sem(sem_); ++ if (result == B_NO_ERROR) return; // Successfully got semaphore. ++ CHECK(result == B_INTERRUPTED); // Signal caused spurious wakeup. ++ } ++} ++ ++ ++#ifndef TIMEVAL_TO_TIMESPEC ++#define TIMEVAL_TO_TIMESPEC(tv, ts) do { \ ++ (ts)->tv_sec = (tv)->tv_sec; \ ++ (ts)->tv_nsec = (tv)->tv_usec * 1000; \ ++} while (false) ++#endif ++ ++ ++bool HaikuSemaphore::Wait(int timeout) { ++ // Wait for semaphore signalled or timeout. ++ while (true) { ++ int result = acquire_sem_etc(sem_, 1, B_RELATIVE_TIMEOUT, timeout); ++ if (result == B_NO_ERROR) return true; // Successfully got semaphore. ++ if (result == B_TIMED_OUT || result == B_WOULD_BLOCK) return false; // Timeout. ++ CHECK(result == B_INTERRUPTED); // Signal caused spurious wakeup. ++ } ++} ++ ++ ++Semaphore* OS::CreateSemaphore(int count) { ++ return new HaikuSemaphore(count); ++} ++ ++ ++static pthread_t GetThreadID() { ++ return pthread_self(); ++} ++ ++ ++static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) { ++ USE(info); ++ if (signal != SIGPROF) return; ++ ++ Isolate* isolate = Isolate::UncheckedCurrent(); ++ if (isolate == NULL || !isolate->IsInitialized() || !isolate->IsInUse()) { ++ // We require a fully initialized and entered isolate. ++ return; ++ } ++ if (v8::Locker::IsActive() && ++ !isolate->thread_manager()->IsLockedByCurrentThread()) { ++ return; ++ } ++ ++ Sampler* sampler = isolate->logger()->sampler(); ++ if (sampler == NULL || !sampler->IsActive()) return; ++ ++ TickSample sample_obj; ++ TickSample* sample = CpuProfiler::StartTickSampleEvent(isolate); ++ if (sample == NULL) sample = &sample_obj; ++ ++ // Extracting the sample from the context is extremely machine dependent. ++ ucontext_t* ucontext = reinterpret_cast(context); ++ mcontext_t& mcontext = ucontext->uc_mcontext; ++ sample->state = isolate->current_vm_state(); ++#if V8_HOST_ARCH_IA32 ++ sample->pc = reinterpret_cast
(mcontext.eip); ++ sample->sp = reinterpret_cast
(mcontext.esp); ++ sample->fp = reinterpret_cast
(mcontext.ebp); ++#elif V8_HOST_ARCH_X64 ++ sample->pc = reinterpret_cast
(mcontext.rip); ++ sample->sp = reinterpret_cast
(mcontext.rsp); ++ sample->fp = reinterpret_cast
(mcontext.rbp); ++#elif V8_HOST_ARCH_ARM ++ sample->pc = reinterpret_cast
(mcontext.r15); ++ sample->sp = reinterpret_cast
(mcontext.r13); ++ sample->fp = reinterpret_cast
(mcontext.r11); ++#elif V8_HOST_ARCH_MIPS ++ #error TODO ++#endif // V8_HOST_ARCH_* ++ sampler->SampleStack(sample); ++ sampler->Tick(sample); ++ CpuProfiler::FinishTickSampleEvent(isolate); ++} ++ ++ ++class CpuProfilerSignalHandler { ++ public: ++ static void SetUp() { if (!mutex_) mutex_ = OS::CreateMutex(); } ++ static void TearDown() { delete mutex_; } ++ ++ static void InstallSignalHandler() { ++ struct sigaction sa; ++ ScopedLock lock(mutex_); ++ if (signal_handler_installed_counter_ > 0) { ++ signal_handler_installed_counter_++; ++ return; ++ } ++ sa.sa_sigaction = ProfilerSignalHandler; ++ sigemptyset(&sa.sa_mask); ++ sa.sa_flags = SA_RESTART | SA_SIGINFO; ++ if (sigaction(SIGPROF, &sa, &old_signal_handler_) == 0) { ++ signal_handler_installed_counter_++; ++ } ++ } ++ ++ static void RestoreSignalHandler() { ++ ScopedLock lock(mutex_); ++ if (signal_handler_installed_counter_ == 0) ++ return; ++ if (signal_handler_installed_counter_ == 1) { ++ sigaction(SIGPROF, &old_signal_handler_, 0); ++ } ++ signal_handler_installed_counter_--; ++ } ++ ++ static bool signal_handler_installed() { ++ return signal_handler_installed_counter_ > 0; ++ } ++ ++ private: ++ static int signal_handler_installed_counter_; ++ static struct sigaction old_signal_handler_; ++ static Mutex* mutex_; ++}; ++ ++ ++int CpuProfilerSignalHandler::signal_handler_installed_counter_ = 0; ++struct sigaction CpuProfilerSignalHandler::old_signal_handler_; ++Mutex* CpuProfilerSignalHandler::mutex_ = NULL; ++ ++ ++class Sampler::PlatformData : public Malloced { ++ public: ++ PlatformData() : vm_tid_(GetThreadID()) {} ++ ++ void SendProfilingSignal() { ++ if (!CpuProfilerSignalHandler::signal_handler_installed()) return; ++ pthread_kill(vm_tid_, SIGPROF); ++ } ++ ++ private: ++ const pthread_t vm_tid_; ++}; ++ ++ ++class SignalSender : public Thread { ++ public: ++ enum SleepInterval { ++ HALF_INTERVAL, ++ FULL_INTERVAL ++ }; ++ ++ static const int kSignalSenderStackSize = 64 * KB; ++ ++ explicit SignalSender(int interval) ++ : Thread(Thread::Options("SignalSender", kSignalSenderStackSize)), ++ interval_(interval) {} ++ ++ static void SetUp() { if (!mutex_) mutex_ = OS::CreateMutex(); } ++ static void TearDown() { delete mutex_; } ++ ++ static void AddActiveSampler(Sampler* sampler) { ++ ScopedLock lock(mutex_); ++ SamplerRegistry::AddActiveSampler(sampler); ++ if (instance_ == NULL) { ++ // Start a thread that will send SIGPROF signal to VM threads, ++ // when CPU profiling will be enabled. ++ instance_ = new SignalSender(sampler->interval()); ++ instance_->Start(); ++ } else { ++ ASSERT(instance_->interval_ == sampler->interval()); ++ } ++ } ++ ++ static void RemoveActiveSampler(Sampler* sampler) { ++ ScopedLock lock(mutex_); ++ SamplerRegistry::RemoveActiveSampler(sampler); ++ if (SamplerRegistry::GetState() == SamplerRegistry::HAS_NO_SAMPLERS) { ++ RuntimeProfiler::StopRuntimeProfilerThreadBeforeShutdown(instance_); ++ delete instance_; ++ instance_ = NULL; ++ } ++ } ++ ++ // Implement Thread::Run(). ++ virtual void Run() { ++ SamplerRegistry::State state; ++ while ((state = SamplerRegistry::GetState()) != ++ SamplerRegistry::HAS_NO_SAMPLERS) { ++ bool cpu_profiling_enabled = ++ (state == SamplerRegistry::HAS_CPU_PROFILING_SAMPLERS); ++ bool runtime_profiler_enabled = RuntimeProfiler::IsEnabled(); ++ // When CPU profiling is enabled both JavaScript and C++ code is ++ // profiled. We must not suspend. ++ if (!cpu_profiling_enabled) { ++ if (rate_limiter_.SuspendIfNecessary()) continue; ++ } ++ if (cpu_profiling_enabled && runtime_profiler_enabled) { ++ if (!SamplerRegistry::IterateActiveSamplers(&DoCpuProfile, NULL)) { ++ return; ++ } ++ Sleep(HALF_INTERVAL); ++ if (!SamplerRegistry::IterateActiveSamplers(&DoRuntimeProfile, NULL)) { ++ return; ++ } ++ Sleep(HALF_INTERVAL); ++ } else { ++ if (cpu_profiling_enabled) { ++ if (!SamplerRegistry::IterateActiveSamplers(&DoCpuProfile, NULL)) { ++ return; ++ } ++ } ++ if (runtime_profiler_enabled) { ++ if (!SamplerRegistry::IterateActiveSamplers(&DoRuntimeProfile, ++ NULL)) { ++ return; ++ } ++ } ++ Sleep(FULL_INTERVAL); ++ } ++ } ++ } ++ ++ static void DoCpuProfile(Sampler* sampler, void*) { ++ if (!sampler->IsProfiling()) return; ++ sampler->platform_data()->SendProfilingSignal(); ++ } ++ ++ static void DoRuntimeProfile(Sampler* sampler, void* ignored) { ++ if (!sampler->isolate()->IsInitialized()) return; ++ sampler->isolate()->runtime_profiler()->NotifyTick(); ++ } ++ ++ void Sleep(SleepInterval full_or_half) { ++ // Convert ms to us and subtract 100 us to compensate delays ++ // occuring during signal delivery. ++ useconds_t interval = interval_ * 1000 - 100; ++ if (full_or_half == HALF_INTERVAL) interval /= 2; ++ int result = usleep(interval); ++#ifdef DEBUG ++ if (result != 0 && errno != EINTR) { ++ fprintf(stderr, ++ "SignalSender usleep error; interval = %lu, errno = %d\n", ++ interval, ++ errno); ++ ASSERT(result == 0 || errno == EINTR); ++ } ++#endif ++ USE(result); ++ } ++ ++ const int interval_; ++ RuntimeProfilerRateLimiter rate_limiter_; ++ ++ // Protects the process wide state below. ++ static Mutex* mutex_; ++ static SignalSender* instance_; ++ ++ private: ++ DISALLOW_COPY_AND_ASSIGN(SignalSender); ++}; ++ ++ ++Mutex* SignalSender::mutex_ = NULL; ++SignalSender* SignalSender::instance_ = NULL; ++ ++ ++void OS::SetUp() { ++ // Seed the random number generator. We preserve microsecond resolution. ++ uint64_t seed = Ticks() ^ (getpid() << 16); ++ srandom(static_cast(seed)); ++ limit_mutex = CreateMutex(); ++ ++ SignalSender::SetUp(); ++ CpuProfilerSignalHandler::SetUp(); ++} ++ ++ ++void OS::TearDown() { ++ SignalSender::TearDown(); ++ CpuProfilerSignalHandler::TearDown(); ++ delete limit_mutex; ++} ++ ++ ++Sampler::Sampler(Isolate* isolate, int interval) ++ : isolate_(isolate), ++ interval_(interval), ++ profiling_(false), ++ active_(false), ++ has_processing_thread_(false), ++ samples_taken_(0) { ++ data_ = new PlatformData; ++} ++ ++ ++Sampler::~Sampler() { ++ ASSERT(!IsActive()); ++ delete data_; ++} ++ ++ ++void Sampler::DoSample() { ++ platform_data()->SendProfilingSignal(); ++} ++ ++ ++void Sampler::Start() { ++ ASSERT(!IsActive()); ++ SetActive(true); ++ SignalSender::AddActiveSampler(this); ++} ++ ++ ++void Sampler::Stop() { ++ ASSERT(IsActive()); ++ SignalSender::RemoveActiveSampler(this); ++ SetActive(false); ++} ++ ++ ++void Sampler::StartSampling() { ++ CpuProfilerSignalHandler::InstallSignalHandler(); ++} ++ ++ ++void Sampler::StopSampling() { ++ CpuProfilerSignalHandler::RestoreSignalHandler(); ++} ++ ++ ++} } // namespace v8::internal +diff -Naur v8-r13067/src/platform.h v8-r13067-haiku/src/platform.h +--- v8-r13067/src/platform.h 2012-12-24 04:17:34.145227776 +0000 ++++ v8-r13067-haiku/src/platform.h 2012-12-24 04:10:09.000000000 +0000 +@@ -96,6 +96,10 @@ + + #endif // WIN32 + ++#ifdef __HAIKU__ ++#define isless(x, y) __builtin_isless(x, y) ++#endif // __HAIKU__ ++ + #include "atomicops.h" + #include "lazy-instance.h" + #include "platform-tls.h" +@@ -107,7 +111,7 @@ + + // Use AtomicWord for a machine-sized pointer. It is assumed that + // reads and writes of naturally aligned values of this type are atomic. +-#if defined(__OpenBSD__) && defined(__i386__) ++#if (defined(__OpenBSD__) || defined(__HAIKU__)) && defined(__i386__) + typedef Atomic32 AtomicWord; + #else + typedef intptr_t AtomicWord; +diff -Naur v8-r13067/tools/android-run.py v8-r13067-haiku/tools/android-run.py +--- v8-r13067/tools/android-run.py 2012-12-24 04:17:38.883425280 +0000 ++++ v8-r13067-haiku/tools/android-run.py 2012-12-24 04:12:45.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + # + # Copyright 2012 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/disasm.py v8-r13067-haiku/tools/disasm.py +--- v8-r13067/tools/disasm.py 2012-12-24 04:17:38.872939520 +0000 ++++ v8-r13067-haiku/tools/disasm.py 2012-12-24 04:12:53.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + # + # Copyright 2011 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/gc-nvp-trace-processor.py v8-r13067-haiku/tools/gc-nvp-trace-processor.py +--- v8-r13067/tools/gc-nvp-trace-processor.py 2012-12-24 04:17:38.844103680 +0000 ++++ v8-r13067-haiku/tools/gc-nvp-trace-processor.py 2012-12-24 04:13:09.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + # + # Copyright 2010 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/gen-postmortem-metadata.py v8-r13067-haiku/tools/gen-postmortem-metadata.py +--- v8-r13067/tools/gen-postmortem-metadata.py 2012-12-24 04:17:38.834142208 +0000 ++++ v8-r13067-haiku/tools/gen-postmortem-metadata.py 2012-12-24 04:13:24.000000000 +0000 +@@ -1,5 +1,4 @@ +-#!/usr/bin/env python +- ++#!/boot/common/bin/python + # + # Copyright 2012 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/grokdump.py v8-r13067-haiku/tools/grokdump.py +--- v8-r13067/tools/grokdump.py 2012-12-24 04:17:38.750780416 +0000 ++++ v8-r13067-haiku/tools/grokdump.py 2012-12-24 04:13:35.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + # + # Copyright 2012 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/gyp/v8.gyp v8-r13067-haiku/tools/gyp/v8.gyp +--- v8-r13067/tools/gyp/v8.gyp 2012-12-24 04:17:38.516161536 +0000 ++++ v8-r13067-haiku/tools/gyp/v8.gyp 2012-12-24 04:10:09.000000000 +0000 +@@ -743,6 +743,17 @@ + 'libraries': [ '-lwinmm.lib', '-lws2_32.lib' ], + }, + }], ++ ['OS=="haiku"', { ++ 'link_settings': { ++ 'libraries': [ ++ '-lnetwork', ++ ]}, ++ 'sources': [ ++ '../../src/platform-haiku.cc', ++ '../../src/platform-posix.cc', ++ ], ++ } ++ ], + ['component=="shared_library"', { + 'defines': [ + 'BUILDING_V8_SHARED', +diff -Naur v8-r13067/tools/js2c.py v8-r13067-haiku/tools/js2c.py +--- v8-r13067/tools/js2c.py 2012-12-24 04:17:38.776470528 +0000 ++++ v8-r13067-haiku/tools/js2c.py 2012-12-24 04:13:42.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + # + # Copyright 2012 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/ll_prof.py v8-r13067-haiku/tools/ll_prof.py +--- v8-r13067/tools/ll_prof.py 2012-12-24 04:17:38.824442880 +0000 ++++ v8-r13067-haiku/tools/ll_prof.py 2012-12-24 04:15:04.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + # + # Copyright 2012 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/presubmit.py v8-r13067-haiku/tools/presubmit.py +--- v8-r13067/tools/presubmit.py 2012-12-24 04:17:38.800063488 +0000 ++++ v8-r13067-haiku/tools/presubmit.py 2012-12-24 04:15:09.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + # + # Copyright 2012 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/process-heap-prof.py v8-r13067-haiku/tools/process-heap-prof.py +--- v8-r13067/tools/process-heap-prof.py 2012-12-24 04:17:38.827588608 +0000 ++++ v8-r13067-haiku/tools/process-heap-prof.py 2012-12-24 04:15:13.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + # + # Copyright 2009 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/run-tests.py v8-r13067-haiku/tools/run-tests.py +--- v8-r13067/tools/run-tests.py 2012-12-24 04:17:38.779878400 +0000 ++++ v8-r13067-haiku/tools/run-tests.py 2012-12-24 04:15:19.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + # + # Copyright 2012 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/stats-viewer.py v8-r13067-haiku/tools/stats-viewer.py +--- v8-r13067/tools/stats-viewer.py 2012-12-24 04:17:38.831258624 +0000 ++++ v8-r13067-haiku/tools/stats-viewer.py 2012-12-24 04:15:24.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + # + # Copyright 2008 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/status-file-converter.py v8-r13067-haiku/tools/status-file-converter.py +--- v8-r13067/tools/status-file-converter.py 2012-12-24 04:17:38.783024128 +0000 ++++ v8-r13067-haiku/tools/status-file-converter.py 2012-12-24 04:15:29.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + # + # Copyright 2012 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/test-server.py v8-r13067-haiku/tools/test-server.py +--- v8-r13067/tools/test-server.py 2012-12-24 04:17:38.890503168 +0000 ++++ v8-r13067-haiku/tools/test-server.py 2012-12-24 04:15:37.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + # + # Copyright 2012 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/test-wrapper-gypbuild.py v8-r13067-haiku/tools/test-wrapper-gypbuild.py +--- v8-r13067/tools/test-wrapper-gypbuild.py 2012-12-24 04:17:38.796393472 +0000 ++++ v8-r13067-haiku/tools/test-wrapper-gypbuild.py 2012-12-24 04:15:43.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + # + # Copyright 2012 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/test.py v8-r13067-haiku/tools/test.py +--- v8-r13067/tools/test.py 2012-12-24 04:17:38.870318080 +0000 ++++ v8-r13067-haiku/tools/test.py 2012-12-24 04:15:49.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + # + # Copyright 2012 the V8 project authors. All rights reserved. + # Redistribution and use in source and binary forms, with or without +diff -Naur v8-r13067/tools/testrunner/server/daemon.py v8-r13067-haiku/tools/testrunner/server/daemon.py +--- v8-r13067/tools/testrunner/server/daemon.py 2012-12-24 04:17:37.866910208 +0000 ++++ v8-r13067-haiku/tools/testrunner/server/daemon.py 2012-12-24 04:15:57.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/boot/common/bin/python + + # This code has been written by Sander Marechal and published at: + # http://www.jejik.com/articles/2007/02/a_simple_unix_linux_daemon_in_python/ +diff -Naur v8-r13067/tools/utils.py v8-r13067-haiku/tools/utils.py +--- v8-r13067/tools/utils.py 2012-12-24 04:17:38.839647232 +0000 ++++ v8-r13067-haiku/tools/utils.py 2012-12-24 04:10:09.000000000 +0000 +@@ -63,6 +63,8 @@ + return 'solaris' + elif id == 'NetBSD': + return 'netbsd' ++ elif id == 'Haiku': ++ return 'haiku' + else: + return None + +@@ -83,6 +85,8 @@ + return 'ia32' + elif id == 'amd64': + return 'ia32' ++ elif id == 'BePC': ++ return 'ia32' + else: + return None + diff --git a/dev-lang/v8/v8-r13067.bep b/dev-lang/v8/v8-r13067.bep new file mode 100644 index 000000000..39ac947e2 --- /dev/null +++ b/dev-lang/v8/v8-r13067.bep @@ -0,0 +1,46 @@ +DESCRIPTION="V8 is Google's open source JavaScript engine." +HOMEPAGE="https://code.google.com/p/v8/" +SRC_URI="svn+http://v8.googlecode.com/svn/trunk/#13067" +REVISION="1" +STATUS_HAIKU="unstable" +DEPEND="" +#CHECKSUM_MD5="" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +BUILD { + gyp_patch_path=$(dirname ${PWD})/patches/gyp-r1501.patch + cd v8-r13067 + cd build + svn co http://gyp.googlecode.com/svn/trunk/@1501 gyp + cd gyp + patch -p1 -i $gyp_patch_path + cd ../.. + make library=shared ia32.debug +} + +TEST { + cd v8-r13067 + make ia32.debug.check +} + +INSTALL { + cd v8-r13067 + includedir=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY`/v8 + mkdir -p ${includedir} + cp -R ./include/* ${includedir} + libdir=${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY` + mkdir -p ${libdir} + cp -R ./out/ia32.debug/obj.target/tools/gyp/*.a ${libdir} + cp -R ./out/ia32.debug/obj.target/tools/gyp/*.so ${libdir} + bindir=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`/v8 + mkdir -p ${bindir} + cp ./out/ia32.debug/cctest ${bindir} + cp ./out/ia32.debug/d8 ${bindir} + cp ./out/ia32.debug/lineprocessor ${bindir} + cp ./out/ia32.debug/mksnapshot ${bindir} + cp ./out/ia32.debug/preparser ${bindir} + cp ./out/ia32.debug/process ${bindir} + cp ./out/ia32.debug/shell ${bindir} +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="2006-2012 The V8 Project Authors" diff --git a/dev-lang/yasm/patches/yasm-0.7.1.patch b/dev-lang/yasm/patches/yasm-0.7.1.patch deleted file mode 100644 index a108e7eb8..000000000 --- a/dev-lang/yasm/patches/yasm-0.7.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN yasm-0.7.1/util.h yasm-0.7.1-haiku/util.h ---- yasm-0.7.1/util.h 2008-05-15 01:35:11.000000000 +0000 -+++ yasm-0.7.1-haiku/util.h 2008-09-26 11:19:12.000000000 +0000 -@@ -116,7 +116,7 @@ - # define USE_OUR_OWN_STRCASECMP - #endif - --#if !defined(HAVE_TOASCII) || defined(lint) -+#if (!defined(HAVE_TOASCII) || defined(lint)) && !defined(__HAIKU__) - # define toascii(c) ((c) & 0x7F) - #endif - diff --git a/dev-lang/yasm/yasm-0.7.1.bep b/dev-lang/yasm/yasm-0.7.1.bep deleted file mode 100644 index 511f0eeb9..000000000 --- a/dev-lang/yasm/yasm-0.7.1.bep +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="Yasm assembler" -HOMEPAGE="http://www.tortall.net/projects/yasm/" -SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-0.7.1.tar.gz" -CHECKSUM_MD5="fce21d066f4d04e3ec7f9318e6446e2b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd yasm-0.7.1 - cp /boot/common/share/libtool/config/config.guess config/. - cp /boot/common/share/libtool/config/config.sub config/. - ./configure --prefix=/boot/common LDFLAGS=-L/boot/common/lib CPPFLAG=-I/boot/common/include - make -} - -INSTALL { - cd yasm-0.7.1 - make install -} -LICENSE="Artistic - BSD (2-clause) - BSD (3-clause) - GNU GPL v2 - GNU LGPL v2" -COPYRIGHT="2001-2009 Peter Johnson and other Yasm developers." diff --git a/dev-lang/yasm/yasm-0.8.0.bep b/dev-lang/yasm/yasm-0.8.0.bep deleted file mode 100644 index 7e395abba..000000000 --- a/dev-lang/yasm/yasm-0.8.0.bep +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="Yasm assembler" -HOMEPAGE="http://www.tortall.net/projects/yasm/" -SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-0.8.0.tar.gz" -CHECKSUM_MD5="84a72204c9b452a00b39b1b00495163f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd yasm-0.8.0 - cp /boot/common/share/libtool/config/config.guess config/. - cp /boot/common/share/libtool/config/config.sub config/. - ./configure --prefix=/boot/common \ - LDFLAGS=-L/boot/common/lib \ - CPPFLAG=-I/boot/common/include - make -} - -INSTALL { - cd yasm-0.8.0 - make install -} -LICENSE="Artistic - BSD (2-clause) - BSD (3-clause) - GNU GPL v2 - GNU LGPL v2" -COPYRIGHT="2001-2009 Peter Johnson and other Yasm developers." diff --git a/dev-lang/yasm/yasm-1.1.0.bep b/dev-lang/yasm/yasm-1.1.0.bep index fd399006c..d808cf8c5 100644 --- a/dev-lang/yasm/yasm-1.1.0.bep +++ b/dev-lang/yasm/yasm-1.1.0.bep @@ -1,5 +1,5 @@ -DESCRIPTION="Yasm assembler" -HOMEPAGE="http://www.tortall.net/projects/yasm/" +DESCRIPTION="Yasm assembler" +HOMEPAGE="http://www.tortall.net/projects/yasm/" SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz" CHECKSUM_MD5="8392e5f2235c2c2a981e1a633f2698cb" REVISION="1" @@ -8,7 +8,10 @@ DEPEND="" BUILD { cd yasm-1.1.0 libtoolize --force --copy --install - ./configure --prefix=/boot/common + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=$COMMON_DOCS/man \ + --disable-nls make } @@ -16,6 +19,7 @@ INSTALL { cd yasm-1.1.0 make install } + LICENSE="Artistic BSD (2-clause) BSD (3-clause) diff --git a/dev-lang/yasm/yasm-1.2.0.bep b/dev-lang/yasm/yasm-1.2.0.bep new file mode 100644 index 000000000..4e556013f --- /dev/null +++ b/dev-lang/yasm/yasm-1.2.0.bep @@ -0,0 +1,28 @@ +DESCRIPTION="Yasm assembler" +HOMEPAGE="http://www.tortall.net/projects/yasm/" +SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz" +CHECKSUM_MD5="4cfc0686cf5350dd1305c4d905eb55a6" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd yasm-1.2.0 + libtoolize --force --copy --install + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=$COMMON_DOCS/man \ + --disable-nls + make +} + +INSTALL { + cd yasm-1.2.0 + make install +} + +LICENSE="Artistic + BSD (2-clause) + BSD (3-clause) + GNU GPL v2 + GNU LGPL v2" +COPYRIGHT="2001-2011 Peter Johnson and other Yasm developers." diff --git a/dev-libs/apr-util/apr-util-1.3.11.bep b/dev-libs/apr-util/apr-util-1.3.11.bep new file mode 100644 index 000000000..0c3e85385 --- /dev/null +++ b/dev-libs/apr-util/apr-util-1.3.11.bep @@ -0,0 +1,49 @@ +DESCRIPTION="apr-util - Apache Portable Runtime Utility Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.11.tar.gz" +CHECKSUM_MD5="bfc16065a784785dd356dc4067fe2504" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/apr >= 1.3.9" +BUILD { + cd apr-util-1.3.11 + rm -rf aclocal.m4 + mkdir -p m4 + haikuporter -b apr-1.4.2 + libtoolize -fci + aclocal --install -I m4 + autoconf -f + cd xml/expat + mkdir -p m4 + echo `AM_INIT_AUTOMAKE` >> configure.in + libtoolize -fci + aclocal --install -I m4 + autoconf --force + autoheader + touch libtool.m4 + cd ../.. + sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.2/build/gen-build.py + buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.2 \ + --prefix=`finddir B_COMMON_DIRECTORY` + ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ + --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config + make +} + +INSTALL { + cd apr-util-1.3.11 + make install +} + +LICENSE="Apache v2" +COPYRIGHT="2010 The Apache Software Foundation." diff --git a/dev-libs/apr-util/apr-util-1.3.12.bep b/dev-libs/apr-util/apr-util-1.3.12.bep new file mode 100644 index 000000000..893bdaeff --- /dev/null +++ b/dev-libs/apr-util/apr-util-1.3.12.bep @@ -0,0 +1,49 @@ +DESCRIPTION="apr-util - Apache Portable Runtime Utility Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.12.tar.gz" +CHECKSUM_MD5="d1977289889592ef998e3f777f68efe4" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/apr >= 1.3.9" +BUILD { + cd apr-util-1.3.12 + rm -rf aclocal.m4 + mkdir -p m4 + haikuporter -b apr-1.4.5 + libtoolize -fci + aclocal --install -I m4 + autoconf -f + cd xml/expat + mkdir -p m4 + echo `AM_INIT_AUTOMAKE` >> configure.in + libtoolize -fci + aclocal --install -I m4 + autoconf --force + autoheader + touch libtool.m4 + cd ../.. + sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.5/build/gen-build.py + buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.5 \ + --prefix=`finddir B_COMMON_DIRECTORY` + ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ + --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config + make +} + +INSTALL { + cd apr-util-1.3.12 + make install +} + +LICENSE="Apache v2" +COPYRIGHT="2011 The Apache Software Foundation." diff --git a/dev-libs/apr-util/apr-util-1.3.9.bep b/dev-libs/apr-util/apr-util-1.3.9.bep index 2baa0d88e..a01e185fc 100644 --- a/dev-libs/apr-util/apr-util-1.3.9.bep +++ b/dev-libs/apr-util/apr-util-1.3.9.bep @@ -35,7 +35,7 @@ BUILD { autoconf --force autoheader cd ../.. - ./configure --prefix=/boot/common --with-apr=/boot/common/bin/apr-1-config + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config make } diff --git a/dev-libs/apr-util/apr-util-1.4.1.bep b/dev-libs/apr-util/apr-util-1.4.1.bep new file mode 100644 index 000000000..bd3695d4c --- /dev/null +++ b/dev-libs/apr-util/apr-util-1.4.1.bep @@ -0,0 +1,49 @@ +DESCRIPTION="apr-util - Apache Portable Runtime Utility Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz" +CHECKSUM_MD5="666a5d56098a9debf998510e304c8095" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/apr == 1.4.6" +BUILD { + cd apr-util-1.4.1 + rm -rf aclocal.m4 + mkdir -p m4 + haikuporter -b apr-1.4.6 + libtoolize -fci + aclocal --install -I m4 + autoconf -f + cd xml/expat + mkdir -p m4 + echo `AM_INIT_AUTOMAKE` >> configure.in + libtoolize -fci + aclocal --install -I m4 + autoconf --force + autoheader + touch libtool.m4 + cd ../.. + sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.6/build/gen-build.py + buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.6 \ + --prefix=`finddir B_COMMON_DIRECTORY` + ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ + --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config + make +} + +INSTALL { + cd apr-util-1.4.1 + make install +} + +LICENSE="Apache v2" +COPYRIGHT="2011 The Apache Software Foundation." diff --git a/dev-libs/apr-util/patches/apr-util-1.3.10.patch b/dev-libs/apr-util/patches/apr-util-1.3.10.patch new file mode 100644 index 000000000..638694741 --- /dev/null +++ b/dev-libs/apr-util/patches/apr-util-1.3.10.patch @@ -0,0 +1,27 @@ +diff -urN apr-util-1.3.10/config.layout apr-util-1.3.10-haiku/config.layout +--- apr-util-1.3.10/config.layout 2005-02-09 12:18:43.049283072 +0000 ++++ apr-util-1.3.10-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000 +@@ -60,6 +60,23 @@ + runtimedir: ${localstatedir}/run + + ++# Haiku Layout making use of finddir ++ ++ prefix: /boot/common ++ exec_prefix: /boot/common ++ bindir: /boot/common/bin ++ sbindir: /boot/common/servers ++ libdir: /boot/common/lib ++ libexecdir: /boot/common/servers ++ mandir: /boot/common/documentation/man ++ sysconfdir: /boot/common/settings ++ datadir: /boot/common/data ++ installbuilddir: /boot/develop/build ++ includedir: /boot/common/include ++ localstatedir: /boot/common/var ++ runtimedir: ${localstatedir}/log ++ ++ + # Mac OS X Server (Rhapsody) + + prefix: /Local/Library/WebServer diff --git a/dev-libs/apr-util/patches/apr-util-1.3.11.patch b/dev-libs/apr-util/patches/apr-util-1.3.11.patch new file mode 100644 index 000000000..26633b67c --- /dev/null +++ b/dev-libs/apr-util/patches/apr-util-1.3.11.patch @@ -0,0 +1,27 @@ +diff -urN apr-util-1.3.11/config.layout apr-util-1.3.11-haiku/config.layout +--- apr-util-1.3.11/config.layout 2005-02-09 12:18:43.049283072 +0000 ++++ apr-util-1.3.11-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000 +@@ -60,6 +60,23 @@ + runtimedir: ${localstatedir}/run + + ++# Haiku Layout making use of finddir ++ ++ prefix: /boot/common ++ exec_prefix: /boot/common ++ bindir: /boot/common/bin ++ sbindir: /boot/common/servers ++ libdir: /boot/common/lib ++ libexecdir: /boot/common/servers ++ mandir: /boot/common/documentation/man ++ sysconfdir: /boot/common/settings ++ datadir: /boot/common/data ++ installbuilddir: /boot/develop/build ++ includedir: /boot/common/include ++ localstatedir: /boot/common/var ++ runtimedir: ${localstatedir}/log ++ ++ + # Mac OS X Server (Rhapsody) + + prefix: /Local/Library/WebServer diff --git a/dev-libs/apr-util/patches/apr-util-1.3.12.patch b/dev-libs/apr-util/patches/apr-util-1.3.12.patch new file mode 100644 index 000000000..c9873f4b3 --- /dev/null +++ b/dev-libs/apr-util/patches/apr-util-1.3.12.patch @@ -0,0 +1,27 @@ +diff -urN apr-util-1.3.12/config.layout apr-util-1.3.12-haiku/config.layout +--- apr-util-1.3.12/config.layout 2005-02-09 12:18:43.049283072 +0000 ++++ apr-util-1.3.12-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000 +@@ -60,6 +60,23 @@ + runtimedir: ${localstatedir}/run + + ++# Haiku Layout making use of finddir ++ ++ prefix: /boot/common ++ exec_prefix: /boot/common ++ bindir: /boot/common/bin ++ sbindir: /boot/common/servers ++ libdir: /boot/common/lib ++ libexecdir: /boot/common/servers ++ mandir: /boot/common/documentation/man ++ sysconfdir: /boot/common/settings ++ datadir: /boot/common/data ++ installbuilddir: /boot/develop/build ++ includedir: /boot/common/include ++ localstatedir: /boot/common/var ++ runtimedir: ${localstatedir}/log ++ ++ + # Mac OS X Server (Rhapsody) + + prefix: /Local/Library/WebServer diff --git a/dev-libs/apr-util/patches/apr-util-1.4.1.patch b/dev-libs/apr-util/patches/apr-util-1.4.1.patch new file mode 100644 index 000000000..799676743 --- /dev/null +++ b/dev-libs/apr-util/patches/apr-util-1.4.1.patch @@ -0,0 +1,27 @@ +diff -urN apr-util-1.4.1/config.layout apr-util-1.4.1-haiku/config.layout +--- apr-util-1.4.1/config.layout 2005-02-09 12:18:43.049283072 +0000 ++++ apr-util-1.4.1-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000 +@@ -60,6 +60,23 @@ + runtimedir: ${localstatedir}/run + + ++# Haiku Layout making use of finddir ++ ++ prefix: /boot/common ++ exec_prefix: /boot/common ++ bindir: /boot/common/bin ++ sbindir: /boot/common/servers ++ libdir: /boot/common/lib ++ libexecdir: /boot/common/servers ++ mandir: /boot/common/documentation/man ++ sysconfdir: /boot/common/settings ++ datadir: /boot/common/data ++ installbuilddir: /boot/develop/build ++ includedir: /boot/common/include ++ localstatedir: /boot/common/var ++ runtimedir: ${localstatedir}/log ++ ++ + # Mac OS X Server (Rhapsody) + + prefix: /Local/Library/WebServer diff --git a/dev-libs/apr/apr-1.3.8.bep b/dev-libs/apr/apr-1.3.8.bep index 11ee9c1cf..4b7ee85d2 100644 --- a/dev-libs/apr/apr-1.3.8.bep +++ b/dev-libs/apr/apr-1.3.8.bep @@ -8,7 +8,7 @@ BUILD { cd apr-1.3.8 libtoolize --force --copy --install buildconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/apr/apr-1.3.9.bep b/dev-libs/apr/apr-1.3.9.bep index df48bb188..678bd894c 100644 --- a/dev-libs/apr/apr-1.3.9.bep +++ b/dev-libs/apr/apr-1.3.9.bep @@ -9,7 +9,7 @@ BUILD { cd apr-1.3.9 libtoolize --force --copy --install buildconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/apr/apr-1.4.4.bep b/dev-libs/apr/apr-1.4.4.bep new file mode 100644 index 000000000..d4724c91e --- /dev/null +++ b/dev-libs/apr/apr-1.4.4.bep @@ -0,0 +1,39 @@ +DESCRIPTION="apr - Apache Portable Runtime Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="http://www.apache.org/dist/apr/apr-1.4.4.tar.gz" +CHECKSUM_MD5="9d70b96d4d7f7449f9c3cc81a691c5bf" +REVISION="3" +STATUS_HAIKU="broken" +DEPEND="" +BUILD { + cd apr-1.4.4 + libtoolize -fci + touch libtool.m4 + aclocal -I build + autoconf + ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ + --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd apr-1.4.4 + make install +} + +TEST { + cd apr-1.4.4 + make test +} + +LICENSE="Apache v2" +COPYRIGHT="2010 The Apache Software Foundation." diff --git a/dev-libs/apr/apr-1.4.5.bep b/dev-libs/apr/apr-1.4.5.bep new file mode 100644 index 000000000..6a86547d5 --- /dev/null +++ b/dev-libs/apr/apr-1.4.5.bep @@ -0,0 +1,39 @@ +DESCRIPTION="apr - Apache Portable Runtime Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="http://www.apache.org/dist/apr/apr-1.4.5.tar.gz" +CHECKSUM_MD5="97262fe54dddaf583eaaee3497a426e1" +REVISION="4" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd apr-1.4.5 + libtoolize -fci + touch libtool.m4 + aclocal -I build + autoconf + ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ + --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd apr-1.4.5 + make install +} + +TEST { + cd apr-1.4.5 + make test +} + +LICENSE="Apache v2" +COPYRIGHT="2011 The Apache Software Foundation." diff --git a/dev-libs/apr/apr-1.4.6.bep b/dev-libs/apr/apr-1.4.6.bep new file mode 100644 index 000000000..5256885db --- /dev/null +++ b/dev-libs/apr/apr-1.4.6.bep @@ -0,0 +1,39 @@ +DESCRIPTION="apr - Apache Portable Runtime Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz" +CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb" +REVISION="4" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd apr-1.4.6 + libtoolize -fci + touch libtool.m4 + aclocal -I build + autoconf + ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ + --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd apr-1.4.6 + make install +} + +TEST { + cd apr-1.4.6 + make test +} + +LICENSE="Apache v2" +COPYRIGHT="2012 The Apache Software Foundation." diff --git a/dev-libs/apr/patches/apr-1.4.2.patch b/dev-libs/apr/patches/apr-1.4.2.patch index cf34a3e64..3a6fcb6ce 100644 --- a/dev-libs/apr/patches/apr-1.4.2.patch +++ b/dev-libs/apr/patches/apr-1.4.2.patch @@ -1,115 +1,33 @@ -diff -urN apr-1.4.2/build/apr_hints.m4 apr-1.4.2-haiku/build/apr_hints.m4 ---- apr-1.4.2/build/apr_hints.m4 2009-11-17 14:28:12.036700160 +0000 -+++ apr-1.4.2-haiku/build/apr_hints.m4 2010-10-13 02:38:51.257687552 +0000 -@@ -35,7 +35,7 @@ - dnl Generally, we force the setting of CC, and add flags - dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS. - dnl --AC_DEFUN(APR_PRELOAD, [ -+AC_DEFUN([APR_PRELOAD], [ - if test "x$apr_preload_done" != "xyes" ; then +diff -urN apr-1.4.2/config.layout apr-1.4.2-haiku/config.layout +--- apr-1.4.2/config.layout 2004-11-24 22:51:51.065798144 +0000 ++++ apr-1.4.2-haiku/config.layout 2011-03-24 11:36:30.742653952 +0000 +@@ -60,6 +60,23 @@ + runtimedir: ${localstatedir}/run + - apr_preload_done="yes" -@@ -457,6 +457,12 @@ - APR_SETIFNULL(have_proc_invoked, [1]) - APR_SETIFNULL(apr_cv_use_lfs64, [yes]) - ;; -+ *-haiku*) -+ APR_ADDTO(LIBS, [-lnetwork]) -+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE]) -+ APR_SETIFNULL(apr_posixsem_is_global, [yes]) -+ APR_SETIFNULL(apr_process_lock_is_global, [yes]) -+ ;; - esac - - fi -@@ -467,7 +473,7 @@ - dnl - dnl Allows us to provide a default choice of compiler which - dnl the user can override. --AC_DEFUN(APR_CC_HINTS, [ -+AC_DEFUN([APR_CC_HINTS], [ - case "$host" in - *-apple-aux3*) - APR_SETIFNULL(CC, [gcc]) -diff -urN apr-1.4.2/build/apr_network.m4 apr-1.4.2-haiku/build/apr_network.m4 ---- apr-1.4.2/build/apr_network.m4 2008-06-16 21:15:24.035913728 +0000 -+++ apr-1.4.2-haiku/build/apr_network.m4 2010-10-13 02:38:51.267911168 +0000 -@@ -21,7 +21,7 @@ - dnl - dnl check for type in_addr - dnl --AC_DEFUN(APR_TYPE_IN_ADDR,[ -+AC_DEFUN([APR_TYPE_IN_ADDR],[ - AC_CACHE_CHECK(for type in_addr, ac_cv_type_in_addr,[ - AC_TRY_COMPILE([ - #ifdef HAVE_SYS_TYPES_H -diff -urN apr-1.4.2/build/apr_threads.m4 apr-1.4.2-haiku/build/apr_threads.m4 ---- apr-1.4.2/build/apr_threads.m4 2006-08-03 10:46:47.037748736 +0000 -+++ apr-1.4.2-haiku/build/apr_threads.m4 2010-10-13 02:38:51.269221888 +0000 -@@ -26,7 +26,7 @@ - dnl pthreads is not available. - dnl Turn off warnings if we're using gcc. - dnl --AC_DEFUN(APR_CHECK_PTHREADS_H, [ -+AC_DEFUN([APR_CHECK_PTHREADS_H], [ - if test "$GCC" = "yes"; then - SAVE_FL="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -w" -@@ -41,7 +41,7 @@ - dnl - dnl APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS - dnl --AC_DEFUN(APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS, [ -+AC_DEFUN([APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS], [ - AC_CACHE_CHECK(whether pthread_getspecific takes two arguments, ac_cv_pthread_getspecific_two_args,[ - AC_TRY_COMPILE([ - #include -@@ -65,7 +65,7 @@ - dnl - dnl APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG - dnl --AC_DEFUN(APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG, [ -+AC_DEFUN([APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG], [ - AC_CACHE_CHECK(whether pthread_attr_getdetachstate takes one argument, ac_cv_pthread_attr_getdetachstate_one_arg,[ - AC_TRY_COMPILE([ - #include -@@ -91,7 +91,7 @@ - dnl Try running a program which uses pthreads, executing the - dnl actions-if-success commands on success. - dnl --AC_DEFUN(APR_PTHREADS_TRY_RUN, [ -+AC_DEFUN([APR_PTHREADS_TRY_RUN], [ - AC_TRY_RUN( [ - #include - #include -@@ -182,12 +182,12 @@ - dnl the checks for threading support so that they can restored if the - dnl result is not what the caller wanted. - dnl --AC_DEFUN(APR_PTHREADS_CHECK_SAVE, [ -+AC_DEFUN([APR_PTHREADS_CHECK_SAVE], [ - apr_pthsv_CFLAGS="$CFLAGS" - apr_pthsv_LIBS="$LIBS" - ])dnl - --AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [ -+AC_DEFUN([APR_PTHREADS_CHECK_RESTORE], [ - CFLAGS="$apr_pthsv_CFLAGS" - LIBS="$apr_pthsv_LIBS" - ])dnl -diff -urN apr-1.4.2/build/gen-build.py apr-1.4.2-haiku/build/gen-build.py ---- apr-1.4.2/build/gen-build.py 2007-02-28 12:44:52.034603008 +0000 -+++ apr-1.4.2-haiku/build/gen-build.py 2010-10-13 02:38:51.278659072 +0000 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/bin/env python - # - # USAGE: gen-build.py TYPE - # ++# Haiku Layout making use of finddir ++ ++ prefix: /boot/common ++ exec_prefix: /boot/common ++ bindir: /boot/common/bin ++ sbindir: /boot/common/servers ++ libdir: /boot/common/lib ++ libexecdir: /boot/common/servers ++ mandir: /boot/common/documentation/man ++ sysconfdir: /boot/common/settings ++ datadir: /boot/common/data ++ installbuilddir: /boot/develop/build ++ includedir: /boot/common/include ++ localstatedir: /boot/common/var ++ runtimedir: ${localstatedir}/log ++ ++ + # Mac OS X Server (Rhapsody) + + prefix: /Local/Library/WebServer diff -urN apr-1.4.2/configure.in apr-1.4.2-haiku/configure.in ---- apr-1.4.2/configure.in 2009-11-16 07:45:28.006291456 +0000 -+++ apr-1.4.2-haiku/configure.in 2010-10-13 02:36:44.000000000 +0000 +--- apr-1.4.2/configure.in 2009-11-16 07:45:28.064225280 +0000 ++++ apr-1.4.2-haiku/configure.in 2011-03-24 14:27:40.000000000 +0000 @@ -143,7 +143,7 @@ AC_PROG_CPP AC_PROG_AWK @@ -119,57 +37,3 @@ diff -urN apr-1.4.2/configure.in apr-1.4.2-haiku/configure.in AC_PROG_INSTALL AC_CHECK_PROG(RM, rm, rm) AC_CHECK_PROG(AS, as, as) -@@ -258,7 +258,7 @@ - dnl otherwise. - - case $host in -- *os390) -+ *os390|*haiku*) - if test "$ac_test_CFLAGS" != set; then - APR_REMOVEFROM(CFLAGS,-g) - fi -@@ -498,6 +498,13 @@ - OSDIR="unix" - eolstr="\\n" - ;; -+ *haiku*) -+ OSDIR="unix" -+ eolstr="\\n" -+ AC_CHECK_LIB(bsd, getpass) -+ AC_CHECK_LIB(network, socket) -+ LIBTOOL="libtool" -+ ;; - *) - OSDIR="unix" - eolstr="\\n" -@@ -1099,6 +1106,10 @@ - havemmapzero="0" - havemmapanon="0" - APR_BEGIN_DECISION([anonymous shared memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS_ANON, -+ [BeOS areas])]) - APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmgetanon="1" -@@ -1170,6 +1181,9 @@ - haveos2shm="0" - havewin32shm="0" - APR_BEGIN_DECISION([namebased memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:sys/mman.h func:mmap func:munmap, - [havemmaptmp="1" - APR_DECIDE(USE_SHMEM_MMAP_TMP, -@@ -1183,9 +1197,6 @@ - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmget="1" - APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])]) --APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:os2.h, - [haveos2shm="1" - APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])]) diff --git a/dev-libs/apr/patches/apr-1.4.4.patch b/dev-libs/apr/patches/apr-1.4.4.patch new file mode 100644 index 000000000..86f9e8c76 --- /dev/null +++ b/dev-libs/apr/patches/apr-1.4.4.patch @@ -0,0 +1,39 @@ +diff -urN apr-1.4.4/config.layout apr-1.4.4-haiku/config.layout +--- apr-1.4.4/config.layout 2004-11-24 22:51:51.065798144 +0000 ++++ apr-1.4.4-haiku/config.layout 2011-03-24 11:36:30.742653952 +0000 +@@ -60,6 +60,23 @@ + runtimedir: ${localstatedir}/run + + ++# Haiku Layout making use of finddir ++ ++ prefix: /boot/common ++ exec_prefix: /boot/common ++ bindir: /boot/common/bin ++ sbindir: /boot/common/servers ++ libdir: /boot/common/lib ++ libexecdir: /boot/common/servers ++ mandir: /boot/common/documentation/man ++ sysconfdir: /boot/common/settings ++ datadir: /boot/common/data ++ installbuilddir: /boot/develop/build ++ includedir: /boot/common/include ++ localstatedir: /boot/common/var ++ runtimedir: ${localstatedir}/log ++ ++ + # Mac OS X Server (Rhapsody) + + prefix: /Local/Library/WebServer +diff -urN apr-1.4.4/configure.in apr-1.4.4-haiku/configure.in +--- apr-1.4.4/configure.in 2009-11-16 07:45:28.064225280 +0000 ++++ apr-1.4.4-haiku/configure.in 2011-03-24 14:27:40.000000000 +0000 +@@ -143,7 +143,7 @@ + AC_PROG_CPP + AC_PROG_AWK + AC_PROG_LN_S +-AC_PROG_RANLIB ++AC_PROG_LIBTOOL + AC_PROG_INSTALL + AC_CHECK_PROG(RM, rm, rm) + AC_CHECK_PROG(AS, as, as) diff --git a/dev-libs/apr/patches/apr-1.4.5.patch b/dev-libs/apr/patches/apr-1.4.5.patch new file mode 100644 index 000000000..1b713b281 --- /dev/null +++ b/dev-libs/apr/patches/apr-1.4.5.patch @@ -0,0 +1,50 @@ +diff -urN apr-1.4.5/config.layout apr-1.4.5-haiku/config.layout +--- apr-1.4.5/config.layout 2004-11-24 22:51:51.056360960 +0000 ++++ apr-1.4.5-haiku/config.layout 2011-07-12 10:34:27.155189248 +0000 +@@ -60,6 +60,23 @@ + runtimedir: ${localstatedir}/run + + ++# Haiku Layout making use of finddir ++ ++ prefix: /boot/common ++ exec_prefix: /boot/common ++ bindir: /boot/common/bin ++ sbindir: /boot/common/servers ++ libdir: /boot/common/lib ++ libexecdir: /boot/common/servers ++ mandir: /boot/common/documentation/man ++ sysconfdir: /boot/common/settings ++ datadir: /boot/common/data ++ installbuilddir: /boot/develop/build ++ includedir: /boot/common/include ++ localstatedir: /boot/common/var ++ runtimedir: ${localstatedir}/log ++ ++ + # Mac OS X Server (Rhapsody) + + prefix: /Local/Library/WebServer +diff -urN apr-1.4.5/configure.in apr-1.4.5-haiku/configure.in +--- apr-1.4.5/configure.in 2011-04-11 12:58:38.043253760 -0700 ++++ apr-1.4.5-haiku/configure.in 2011-08-02 12:49:33.801112064 -0700 +@@ -204,7 +204,7 @@ + AC_PROG_CPP + AC_PROG_AWK + AC_PROG_LN_S +-AC_PROG_RANLIB ++AC_PROG_LIBTOOL + AC_PROG_INSTALL + AC_CHECK_PROG(RM, rm, rm) + AC_CHECK_PROG(AS, as, as) +@@ -673,9 +673,9 @@ + ac_cv_func_CreateFileMapping=yes + ;; + *) ++ AC_SEARCH_LIBS(socket, socket network) + AC_SEARCH_LIBS(gethostbyname, nsl) + AC_SEARCH_LIBS(gethostname, nsl) +- AC_SEARCH_LIBS(socket, socket) + AC_SEARCH_LIBS(crypt, crypt ufc) + AC_CHECK_LIB(truerand, main) + AC_SEARCH_LIBS(modf, m) diff --git a/dev-libs/apr/patches/apr-1.4.6.patch b/dev-libs/apr/patches/apr-1.4.6.patch new file mode 100644 index 000000000..9f1a88d96 --- /dev/null +++ b/dev-libs/apr/patches/apr-1.4.6.patch @@ -0,0 +1,50 @@ +diff -urN apr-1.4.6/config.layout apr-1.4.6-haiku/config.layout +--- apr-1.4.6/config.layout 2004-11-24 22:51:51.056360960 +0000 ++++ apr-1.4.6-haiku/config.layout 2011-07-12 10:34:27.155189248 +0000 +@@ -60,6 +60,23 @@ + runtimedir: ${localstatedir}/run + + ++# Haiku Layout making use of finddir ++ ++ prefix: /boot/common ++ exec_prefix: /boot/common ++ bindir: /boot/common/bin ++ sbindir: /boot/common/servers ++ libdir: /boot/common/lib ++ libexecdir: /boot/common/servers ++ mandir: /boot/common/documentation/man ++ sysconfdir: /boot/common/settings ++ datadir: /boot/common/data ++ installbuilddir: /boot/develop/build ++ includedir: /boot/common/include ++ localstatedir: /boot/common/var ++ runtimedir: ${localstatedir}/log ++ ++ + # Mac OS X Server (Rhapsody) + + prefix: /Local/Library/WebServer +diff -urN apr-1.4.6/configure.in apr-1.4.6-haiku/configure.in +--- apr-1.4.6/configure.in 2011-04-11 12:58:38.043253760 -0700 ++++ apr-1.4.6-haiku/configure.in 2011-08-02 12:49:33.801112064 -0700 +@@ -203,7 +203,7 @@ + AC_PROG_CPP + AC_PROG_AWK + AC_PROG_LN_S +-AC_PROG_RANLIB ++AC_PROG_LIBTOOL + AC_PROG_INSTALL + AC_CHECK_PROG(RM, rm, rm) + AC_CHECK_PROG(AS, as, as) +@@ -672,9 +672,9 @@ + ac_cv_func_CreateFileMapping=yes + ;; + *) ++ AC_SEARCH_LIBS(socket, socket network) + AC_SEARCH_LIBS(gethostbyname, nsl) + AC_SEARCH_LIBS(gethostname, nsl) +- AC_SEARCH_LIBS(socket, socket) + AC_SEARCH_LIBS(crypt, crypt ufc) + AC_CHECK_LIB(truerand, main) + AC_SEARCH_LIBS(modf, m) diff --git a/dev-libs/atk/atk-1.29.2.bep b/dev-libs/atk/atk-1.29.2.bep index 6c99a703b..5fbeadeb8 100644 --- a/dev-libs/atk/atk-1.29.2.bep +++ b/dev-libs/atk/atk-1.29.2.bep @@ -12,7 +12,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/atk/atk-1.30.0.bep b/dev-libs/atk/atk-1.30.0.bep index c9888bc58..bdaa27b25 100644 --- a/dev-libs/atk/atk-1.30.0.bep +++ b/dev-libs/atk/atk-1.30.0.bep @@ -13,7 +13,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep b/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep new file mode 100644 index 000000000..7f20ba736 --- /dev/null +++ b/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep @@ -0,0 +1,34 @@ +DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector" +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.2alpha6.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="319d0b18cc4eb735c8038ece9df055e4" + +BUILD { + cd gc-7.2alpha6 + libtoolize --force --copy --install + autoconf -f + ./configure --prefix=$(finddir B_COMMON_DIRECTORY) \ + --datadir=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY) \ + --enable-threads=posix --enable-thread-local-alloc --enable-parallel-mark + make +} + +INSTALL { + cd gc-7.2alpha6 + make install +} + +TEST { + cd gc-7.2alpha6 + make check +} + +LICENSE="BOEHM" +COPYRIGHT="1988, 1989 Hans-J. Boehm, Alan J. Demers + 1991-1996 by Xerox Corporation. All rights reserved. + 1996-1999 by Silicon Graphics. All rights reserved. + 1999-2004 Hewlett-Packard Development Company, L.P." + diff --git a/dev-libs/boehm-gc/boehm-gc-7.2d.bep b/dev-libs/boehm-gc/boehm-gc-7.2d.bep new file mode 100644 index 000000000..b8f67af6f --- /dev/null +++ b/dev-libs/boehm-gc/boehm-gc-7.2d.bep @@ -0,0 +1,33 @@ +DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector" +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" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="91340b28c61753a789eb6077675d87d2" + +BUILD { + cd gc-7.2 + libtoolize --force --copy --install + autoconf -f + ./configure --prefix=$(finddir B_COMMON_DIRECTORY) \ + --datadir=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY) \ + --enable-threads=posix --enable-thread-local-alloc --enable-parallel-mark + make +} + +INSTALL { + cd gc-7.2 + make install +} + +TEST { + cd gc-7.2 + make check +} + +LICENSE="BOEHM" +COPYRIGHT="1988, 1989 Hans-J. Boehm, Alan J. Demers + 1991-1996 by Xerox Corporation. All rights reserved. + 1996-1999 by Silicon Graphics. All rights reserved. + 1999-2011 Hewlett-Packard Development Company, L.P." diff --git a/dev-libs/boehm-gc/licenses/BOEHM b/dev-libs/boehm-gc/licenses/BOEHM new file mode 100644 index 000000000..1a17075d4 --- /dev/null +++ b/dev-libs/boehm-gc/licenses/BOEHM @@ -0,0 +1,29 @@ +Copyright (c) 1988, 1989 Hans-J. Boehm, Alan J. Demers +Copyright (c) 1991-1996 by Xerox Corporation. All rights reserved. +Copyright (c) 1996-1999 by Silicon Graphics. All rights reserved. +Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P. + +The file linux_threads.c is also +Copyright (c) 1998 by Fergus Henderson. All rights reserved. + +The files Makefile.am, and configure.in are +Copyright (c) 2001 by Red Hat Inc. All rights reserved. + +Several files supporting GNU-style builds are copyrighted by the Free +Software Foundation, and carry a different license from that given +below. + +THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED +OR IMPLIED. ANY USE IS AT YOUR OWN RISK. + +Permission is hereby granted to use or copy this program +for any purpose, provided the above notices are retained on all copies. +Permission to modify the code and to distribute modified code is granted, +provided the above notices are retained, and a notice that the code was +modified is included with the above copyright notice. + +A few of the files needed to use the GNU-style build procedure come with +slightly different licenses, though they are all similar in spirit. A few +are GPL'ed, but with an exception that should cover all uses in the +collector. (If you are concerned about such things, I recommend you look +at the notice in config.guess or ltmain.sh.) diff --git a/dev-libs/boehm-gc/patches/boehm-gc-7.2_alpha6.patch b/dev-libs/boehm-gc/patches/boehm-gc-7.2_alpha6.patch new file mode 100644 index 000000000..e5f093551 --- /dev/null +++ b/dev-libs/boehm-gc/patches/boehm-gc-7.2_alpha6.patch @@ -0,0 +1,247 @@ +diff -ru gc-7.2alpha6-orig/configure.ac gc-7.2alpha6/configure.ac +--- gc-7.2alpha6-orig/configure.ac 2011-06-14 12:34:55.000000000 +0000 ++++ gc-7.2alpha6/configure.ac 2012-03-16 00:46:16.500695040 +0000 +@@ -83,6 +83,7 @@ + AH_TEMPLATE([GC_DARWIN_THREADS], [Define to support Darwin pthreads.]) + AH_TEMPLATE([GC_FREEBSD_THREADS], [Define to support FreeBSD pthreads.]) + AH_TEMPLATE([GC_GNU_THREADS], [Define to support GNU pthreads.]) ++AH_TEMPLATE([GC_HAIKU_THREADS], [Define to support Haiku pthreads.]) + AH_TEMPLATE([GC_HPUX_THREADS], [Define to support HP/UX 11 pthreads.]) + AH_TEMPLATE([GC_IRIX_THREADS], [Define to support Irix pthreads.]) + AH_TEMPLATE([GC_LINUX_THREADS], [Define to support pthreads on Linux.]) +@@ -127,6 +128,10 @@ + AC_DEFINE(GC_AIX_THREADS) + AC_DEFINE(_REENTRANT) + ;; ++ *-*-haiku*) ++ AC_DEFINE(GC_HAIKU_THREADS) ++ AC_DEFINE(_REENTRANT) ++ ;; + *-*-hpux11*) + AC_MSG_WARN("Only HP/UX 11 POSIX threads are supported.") + AC_DEFINE(GC_HPUX_THREADS) +diff -ru gc-7.2alpha6-orig/dyn_load.c gc-7.2alpha6/dyn_load.c +--- gc-7.2alpha6-orig/dyn_load.c 2011-05-31 15:27:11.000000000 +0000 ++++ gc-7.2alpha6/dyn_load.c 2012-03-23 22:11:06.758906880 +0000 +@@ -63,7 +63,7 @@ + !(defined(FREEBSD) && defined(__ELF__)) && \ + !(defined(OPENBSD) && (defined(__ELF__) || defined(M68K))) && \ + !(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. +@@ -1419,6 +1419,22 @@ + + #endif /* DARWIN */ + ++#ifdef HAIKU ++#include ++ ++GC_INNER void GC_register_dynamic_libraries() ++{ ++ image_info info; ++ int32 cookie = 0; ++ while (get_next_image_info(0, &cookie, &info) == B_OK) ++ { ++ void *data = info.data; ++ GC_add_roots_inner(data, data + info.data_size, TRUE); ++ } ++} ++ ++#endif /* HAIKU */ ++ + #elif defined(PCR) + + # include "il/PCR_IL.h" +diff -ru gc-7.2alpha6-orig/include/gc_config_macros.h gc-7.2alpha6/include/gc_config_macros.h +--- gc-7.2alpha6-orig/include/gc_config_macros.h 2011-04-24 13:09:21.000000000 +0000 ++++ gc-7.2alpha6/include/gc_config_macros.h 2012-03-16 00:44:30.556793856 +0000 +@@ -65,7 +65,7 @@ + || defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) \ + || defined(GC_NETBSD_THREADS) || defined(GC_OPENBSD_THREADS) \ + || defined(GC_OSF1_THREADS) || defined(GC_SOLARIS_THREADS) \ +- || defined(GC_WIN32_THREADS) ++ || defined(GC_WIN32_THREADS) || defined(GC_HAIKU_THREADS) + # ifndef GC_THREADS + # define GC_THREADS + # endif +diff -ru gc-7.2alpha6-orig/include/private/config.h.in gc-7.2alpha6/include/private/config.h.in +--- gc-7.2alpha6-orig/include/private/config.h.in 2010-09-11 11:27:06.000000000 +0000 ++++ gc-7.2alpha6/include/private/config.h.in 2012-03-16 00:49:30.038273024 +0000 +@@ -45,6 +45,9 @@ + /* Define to support GNU pthreads. */ + #undef GC_GNU_THREADS + ++/* Define to support Haiku pthreads. */ ++#undef GC_HAIKU_THREADS ++ + /* Define if backtrace information is supported. */ + #undef GC_HAVE_BUILTIN_BACKTRACE + +Only in gc-7.2alpha6/include/private: config.h.in~ +diff -ru gc-7.2alpha6-orig/include/private/gcconfig.h gc-7.2alpha6/include/private/gcconfig.h +--- gc-7.2alpha6-orig/include/private/gcconfig.h 2011-05-31 15:27:12.000000000 +0000 ++++ gc-7.2alpha6/include/private/gcconfig.h 2012-03-23 22:28:55.210501632 +0000 +@@ -234,6 +234,11 @@ + # define BEOS + # define mach_type_known + # endif ++# if defined(__HAIKU__) && defined(_X86_) ++# define I386 ++# define HAIKU ++# define mach_type_known ++# endif + # if defined(OPENBSD) && defined(__amd64__) + # define X86_64 + # define mach_type_known +@@ -1110,6 +1115,15 @@ + 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)) ++# define DYNAMIC_LOADING ++# define MPROTECT_VDB ++# endif + # ifdef SOLARIS + # define OS_TYPE "SOLARIS" + extern int _etext[], _end[]; +@@ -2345,7 +2359,7 @@ + #if defined(SVR4) || defined(LINUX) || defined(IRIX5) || defined(HPUX) \ + || defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD) \ + || defined(DGUX) || defined(BSD) || defined(HURD) \ +- || defined(AIX) || defined(DARWIN) || defined(OSF1) ++ || defined(AIX) || defined(DARWIN) || defined(OSF1) || defined(HAIKU) + # define UNIX_LIKE /* Basic Unix-like system calls work. */ + #endif + +@@ -2423,7 +2437,8 @@ + + #if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \ + || defined(OPENBSD) || defined(ARM32) \ +- || defined(MIPS) || defined(AVR32))) \ ++ || defined(MIPS) || defined(AVR32) \ ++ || defined(HAIKU))) \ + || (defined(LINUX) && (defined(SPARC) || defined(M68K))) \ + || (defined(RTEMS) && defined(I386))) && !defined(NO_GETCONTEXT) + # define NO_GETCONTEXT +@@ -2721,6 +2736,9 @@ + # elif defined(SN_TARGET_PS3) + void *ps3_get_mem(size_t size); + # define GET_MEM(bytes) (struct hblk*)ps3_get_mem(bytes) ++# elif defined(HAIKU) ++ ptr_t GC_haiku_get_mem(GC_word bytes); ++# define GET_MEM(bytes) (struct hblk*)GC_haiku_get_mem(bytes) + # else + ptr_t GC_unix_get_mem(GC_word bytes); + # define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes) +diff -ru gc-7.2alpha6-orig/include/private/thread_local_alloc.h gc-7.2alpha6/include/private/thread_local_alloc.h +--- gc-7.2alpha6-orig/include/private/thread_local_alloc.h 2011-05-13 14:40:31.000000000 +0000 ++++ gc-7.2alpha6/include/private/thread_local_alloc.h 2012-03-16 00:55:25.252706816 +0000 +@@ -47,7 +47,7 @@ + # define USE_COMPILER_TLS + # elif defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) \ + || defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS) \ +- || defined(GC_NETBSD_THREADS) ++ || defined(GC_NETBSD_THREADS) || defined(GC_HAIKU_THREADS) + # define USE_PTHREAD_SPECIFIC + # elif defined(GC_HPUX_THREADS) + # ifdef __GNUC__ +diff -ru gc-7.2alpha6-orig/os_dep.c gc-7.2alpha6/os_dep.c +--- gc-7.2alpha6-orig/os_dep.c 2011-05-31 15:27:11.000000000 +0000 ++++ gc-7.2alpha6/os_dep.c 2012-03-23 22:32:31.656932864 +0000 +@@ -790,7 +790,7 @@ + } + #endif /* !MSWIN32 */ + +-#ifdef BEOS ++#if defined(BEOS) || defined(HAIKU) + # include + + GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb) +@@ -801,7 +801,7 @@ + return GC_SUCCESS; + } + # define HAVE_GET_STACK_BASE +-#endif /* BEOS */ ++#endif /* BEOS || HAIKU */ + + #ifdef OS2 + GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb) +@@ -1127,7 +1127,7 @@ + # define GET_MAIN_STACKBASE_SPECIAL + #elif !defined(BEOS) && !defined(AMIGA) && !defined(OS2) \ + && !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32) \ +- && !defined(GC_OPENBSD_THREADS) \ ++ && !defined(GC_OPENBSD_THREADS) && !defined(HAIKU) \ + && (!defined(GC_SOLARIS_THREADS) || defined(_STRICT_STDC)) + + # if defined(LINUX) && defined(USE_GET_STACKBASE_FOR_MAIN) +@@ -1977,7 +1977,7 @@ + # if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MSWIN32) \ + && !defined(MSWINCE) && !defined(MACOS) && !defined(DOS4GW) \ + && !defined(NONSTOP) && !defined(SN_TARGET_PS3) && !defined(RTEMS) \ +- && !defined(__CC_ARM) ++ && !defined(__CC_ARM) && !defined(HAIKU) + + # define SBRK_ARG_T ptrdiff_t + +@@ -2302,6 +2302,19 @@ + } + #endif + ++#ifdef HAIKU ++#include ++ ++ptr_t GC_haiku_get_mem(word bytes) ++{ ++ void* mem; ++ if (posix_memalign(&mem, GC_page_size, bytes) == 0) ++ return mem; ++ else ++ return NULL; ++} ++#endif ++ + #ifdef USE_MUNMAP + + /* For now, this only works on Win32/WinCE and some Unix-like */ +@@ -2903,7 +2916,9 @@ + # elif !defined(MSWIN32) && !defined(MSWINCE) + # include + # include +-# include ++# if !defined(HAIKU) ++# include ++# endif + + # define PROTECT(addr, len) \ + if (mprotect((caddr_t)(addr), (size_t)(len), \ +@@ -3062,6 +3077,8 @@ + /* Empirically c.trapno == 14, on IA32, but is that useful? */ + /* Should probably consider alignment issues on other */ + /* architectures. */ ++# elif defined(HAIKU) ++# define CODE_OK TRUE + # elif defined(HPUX) + # define CODE_OK (si -> si_code == SEGV_ACCERR \ + || si -> si_code == BUS_ADRERR \ +diff -ru gc-7.2alpha6-orig/pthread_support.c gc-7.2alpha6/pthread_support.c +--- gc-7.2alpha6-orig/pthread_support.c 2011-05-31 15:27:11.000000000 +0000 ++++ gc-7.2alpha6/pthread_support.c 2012-03-16 00:39:06.171442176 +0000 +@@ -938,7 +938,8 @@ + GC_nprocs = pthread_num_processors_np(); + # elif defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) \ + || defined(GC_SOLARIS_THREADS) || defined(GC_GNU_THREADS) \ +- || defined(PLATFORM_ANDROID) || defined(NACL) ++ || defined(PLATFORM_ANDROID) || defined(NACL) \ ++ || defined(GC_HAIKU_THREADS) + GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN); + if (GC_nprocs <= 0) GC_nprocs = 1; + # elif defined(GC_IRIX_THREADS) diff --git a/dev-libs/boehm-gc/patches/boehm-gc-7.2d.patch b/dev-libs/boehm-gc/patches/boehm-gc-7.2d.patch new file mode 100644 index 000000000..4d2b35488 --- /dev/null +++ b/dev-libs/boehm-gc/patches/boehm-gc-7.2d.patch @@ -0,0 +1,248 @@ +diff -urN gc-7.2/configure.ac gc-7.2-haiku/configure.ac +--- gc-7.2/configure.ac 2012-08-09 13:25:13.047185920 -0700 ++++ gc-7.2-haiku/configure.ac 2013-03-27 00:43:42.665321472 -0700 +@@ -89,6 +89,7 @@ + AH_TEMPLATE([GC_DARWIN_THREADS], [Define to support Darwin pthreads.]) + AH_TEMPLATE([GC_FREEBSD_THREADS], [Define to support FreeBSD pthreads.]) + AH_TEMPLATE([GC_GNU_THREADS], [Define to support GNU pthreads.]) ++AH_TEMPLATE([GC_HAIKU_THREADS], [Define to support Haiku pthreads.]) + AH_TEMPLATE([GC_HPUX_THREADS], [Define to support HP/UX 11 pthreads.]) + AH_TEMPLATE([GC_IRIX_THREADS], [Define to support Irix pthreads.]) + AH_TEMPLATE([GC_LINUX_THREADS], [Define to support pthreads on Linux.]) +@@ -140,6 +141,10 @@ + AC_DEFINE(GC_AIX_THREADS) + AC_DEFINE(_REENTRANT) + ;; ++ *-*-haiku*) ++ AC_DEFINE(GC_HAIKU_THREADS) ++ AC_DEFINE(_REENTRANT) ++ ;; + *-*-hpux11*) + AC_MSG_WARN("Only HP/UX 11 POSIX threads are supported.") + AC_DEFINE(GC_HPUX_THREADS) +diff -urN gc-7.2/dyn_load.c gc-7.2-haiku/dyn_load.c +--- gc-7.2/dyn_load.c 2012-08-09 13:25:13.034603008 -0700 ++++ gc-7.2-haiku/dyn_load.c 2013-03-27 00:43:42.670564352 -0700 +@@ -63,7 +63,7 @@ + !(defined(FREEBSD) && defined(__ELF__)) && \ + !(defined(OPENBSD) && (defined(__ELF__) || defined(M68K))) && \ + !(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. +@@ -1426,6 +1426,22 @@ + + #endif /* DARWIN */ + ++#ifdef HAIKU ++#include ++ ++GC_INNER void GC_register_dynamic_libraries() ++{ ++ image_info info; ++ int32 cookie = 0; ++ while (get_next_image_info(0, &cookie, &info) == B_OK) ++ { ++ void *data = info.data; ++ GC_add_roots_inner(data, data + info.data_size, TRUE); ++ } ++} ++ ++#endif /* HAIKU */ ++ + #elif defined(PCR) + + # include "il/PCR_IL.h" +diff -urN gc-7.2/include/gc_config_macros.h gc-7.2-haiku/include/gc_config_macros.h +--- gc-7.2/include/gc_config_macros.h 2012-08-09 13:25:13.028835840 -0700 ++++ gc-7.2-haiku/include/gc_config_macros.h 2013-03-27 00:51:21.900726784 -0700 +@@ -68,7 +68,8 @@ + || defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) \ + || defined(GC_NETBSD_THREADS) || defined(GC_OPENBSD_THREADS) \ + || defined(GC_OSF1_THREADS) || defined(GC_SOLARIS_THREADS) \ +- || defined(GC_WIN32_THREADS) || defined(GC_RTEMS_PTHREADS) ++ || defined(GC_WIN32_THREADS) || defined(GC_RTEMS_PTHREADS) \ ++ || defined(GC_HAIKU_THREADS) + # ifndef GC_THREADS + # define GC_THREADS + # endif +diff -urN gc-7.2/include/private/config.h.in gc-7.2-haiku/include/private/config.h.in +--- gc-7.2/include/private/config.h.in 2012-08-09 13:25:13.029884416 -0700 ++++ gc-7.2-haiku/include/private/config.h.in 2013-03-27 00:44:56.633602048 -0700 +@@ -48,6 +48,9 @@ + /* Define to support GNU pthreads. */ + #undef GC_GNU_THREADS + ++/* Define to support Haiku pthreads. */ ++#undef GC_HAIKU_THREADS ++ + /* Define if backtrace information is supported. */ + #undef GC_HAVE_BUILTIN_BACKTRACE + +diff -urN gc-7.2/include/private/gcconfig.h gc-7.2-haiku/include/private/gcconfig.h +--- gc-7.2/include/private/gcconfig.h 2012-08-09 13:25:13.030408704 -0700 ++++ gc-7.2-haiku/include/private/gcconfig.h 2013-03-27 00:45:52.350748672 -0700 +@@ -234,6 +234,11 @@ + # define BEOS + # define mach_type_known + # endif ++# if defined(__HAIKU__) && defined(_X86_) ++# define I386 ++# define HAIKU ++# define mach_type_known ++# endif + # if defined(OPENBSD) && defined(__amd64__) + # define X86_64 + # define mach_type_known +@@ -1115,6 +1120,15 @@ + 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)) ++# define DYNAMIC_LOADING ++# define MPROTECT_VDB ++# endif + # ifdef SOLARIS + # define OS_TYPE "SOLARIS" + extern int _etext[], _end[]; +@@ -2404,7 +2418,7 @@ + #if defined(SVR4) || defined(LINUX) || defined(IRIX5) || defined(HPUX) \ + || defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD) \ + || defined(DGUX) || defined(BSD) || defined(HURD) \ +- || defined(AIX) || defined(DARWIN) || defined(OSF1) ++ || defined(AIX) || defined(DARWIN) || defined(OSF1) || defined(HAIKU) + # define UNIX_LIKE /* Basic Unix-like system calls work. */ + #endif + +@@ -2482,7 +2496,8 @@ + + #if ((defined(UNIX_LIKE) && (defined(DARWIN) || defined(HURD) \ + || defined(OPENBSD) || defined(ARM32) \ +- || defined(MIPS) || defined(AVR32))) \ ++ || defined(MIPS) || defined(AVR32) \ ++ || defined(HAIKU))) \ + || (defined(LINUX) && (defined(SPARC) || defined(M68K))) \ + || (defined(RTEMS) && defined(I386))) && !defined(NO_GETCONTEXT) + # define NO_GETCONTEXT +@@ -2789,6 +2804,9 @@ + # elif defined(SN_TARGET_PS3) + void *ps3_get_mem(size_t size); + # define GET_MEM(bytes) (struct hblk*)ps3_get_mem(bytes) ++# elif defined(HAIKU) ++ ptr_t GC_haiku_get_mem(GC_word bytes); ++# define GET_MEM(bytes) (struct hblk*)GC_haiku_get_mem(bytes) + # else + ptr_t GC_unix_get_mem(GC_word bytes); + # define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes) +diff -urN gc-7.2/include/private/thread_local_alloc.h gc-7.2-haiku/include/private/thread_local_alloc.h +--- gc-7.2/include/private/thread_local_alloc.h 2012-08-09 13:25:13.029884416 -0700 ++++ gc-7.2-haiku/include/private/thread_local_alloc.h 2013-03-27 00:49:11.605290496 -0700 +@@ -47,7 +47,8 @@ + # define USE_COMPILER_TLS + # elif defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) \ + || defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS) \ +- || defined(GC_NETBSD_THREADS) || defined(GC_RTEMS_PTHREADS) ++ || defined(GC_NETBSD_THREADS) || defined(GC_RTEMS_PTHREADS) \ ++ || || defined(GC_HAIKU_THREADS) + # define USE_PTHREAD_SPECIFIC + # elif defined(GC_HPUX_THREADS) + # ifdef __GNUC__ +diff -urN gc-7.2/os_dep.c gc-7.2-haiku/os_dep.c +--- gc-7.2/os_dep.c 2012-08-09 13:25:13.034340864 -0700 ++++ gc-7.2-haiku/os_dep.c 2013-03-27 00:46:12.884998144 -0700 +@@ -790,7 +790,7 @@ + } + #endif /* !MSWIN32 */ + +-#ifdef BEOS ++#if defined(BEOS) || defined(HAIKU) + # include + + GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb) +@@ -801,7 +801,7 @@ + return GC_SUCCESS; + } + # define HAVE_GET_STACK_BASE +-#endif /* BEOS */ ++#endif /* BEOS || HAIKU */ + + #ifdef OS2 + GC_API int GC_CALL GC_get_stack_base(struct GC_stack_base *sb) +@@ -1138,7 +1138,7 @@ + # define GET_MAIN_STACKBASE_SPECIAL + #elif !defined(BEOS) && !defined(AMIGA) && !defined(OS2) \ + && !defined(MSWIN32) && !defined(MSWINCE) && !defined(CYGWIN32) \ +- && !defined(GC_OPENBSD_THREADS) \ ++ && !defined(GC_OPENBSD_THREADS) && !defined(HAIKU) \ + && (!defined(GC_SOLARIS_THREADS) || defined(_STRICT_STDC)) + + # if defined(LINUX) && defined(USE_GET_STACKBASE_FOR_MAIN) +@@ -2001,7 +2001,7 @@ + # if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MSWIN32) \ + && !defined(MSWINCE) && !defined(MACOS) && !defined(DOS4GW) \ + && !defined(NONSTOP) && !defined(SN_TARGET_PS3) && !defined(RTEMS) \ +- && !defined(__CC_ARM) ++ && !defined(__CC_ARM) && !defined(HAIKU) + + # define SBRK_ARG_T ptrdiff_t + +@@ -2326,6 +2326,19 @@ + } + #endif + ++#ifdef HAIKU ++#include ++ ++ptr_t GC_haiku_get_mem(word bytes) ++{ ++ void* mem; ++ if (posix_memalign(&mem, GC_page_size, bytes) == 0) ++ return mem; ++ else ++ return NULL; ++} ++#endif ++ + #ifdef USE_MUNMAP + + /* For now, this only works on Win32/WinCE and some Unix-like */ +@@ -2927,7 +2940,9 @@ + # elif !defined(MSWIN32) && !defined(MSWINCE) + # include + # include +-# include ++# if !defined(HAIKU) ++# include ++# endif + + # define PROTECT(addr, len) \ + if (mprotect((caddr_t)(addr), (size_t)(len), \ +@@ -3086,6 +3101,8 @@ + /* Empirically c.trapno == 14, on IA32, but is that useful? */ + /* Should probably consider alignment issues on other */ + /* architectures. */ ++# elif defined(HAIKU) ++# define CODE_OK TRUE + # elif defined(HPUX) + # define CODE_OK (si -> si_code == SEGV_ACCERR \ + || si -> si_code == BUS_ADRERR \ +diff -urN gc-7.2/pthread_support.c gc-7.2-haiku/pthread_support.c +--- gc-7.2/pthread_support.c 2012-08-09 13:25:13.048234496 -0700 ++++ gc-7.2-haiku/pthread_support.c 2013-03-27 00:46:12.896794624 -0700 +@@ -999,7 +999,8 @@ + GC_nprocs = pthread_num_processors_np(); + # elif defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) \ + || defined(GC_SOLARIS_THREADS) || defined(GC_GNU_THREADS) \ +- || defined(PLATFORM_ANDROID) || defined(NACL) ++ || defined(PLATFORM_ANDROID) || defined(NACL) \ ++ || defined(GC_HAIKU_THREADS) + GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN); + if (GC_nprocs <= 0) GC_nprocs = 1; + # elif defined(GC_IRIX_THREADS) diff --git a/dev-libs/boost/boost-1.42.0.bep b/dev-libs/boost/boost-1.42.0.bep index 48b89b176..9884d876b 100644 --- a/dev-libs/boost/boost-1.42.0.bep +++ b/dev-libs/boost/boost-1.42.0.bep @@ -8,8 +8,8 @@ MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" BUILD { cd boost_1_42_0 - ./bootstrap.sh --prefix=/boot/common - ./bjam --prefix=/boot/common \ + ./bootstrap.sh --prefix=`finddir B_COMMON_DIRECTORY` + ./bjam --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=/boot/common/lib \ --includedir=/boot/common/include \ variant=release \ diff --git a/dev-libs/boost/boost-1.50.0.bep b/dev-libs/boost/boost-1.50.0.bep new file mode 100644 index 000000000..d0eef3144 --- /dev/null +++ b/dev-libs/boost/boost-1.50.0.bep @@ -0,0 +1,50 @@ +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.bep b/dev-libs/boost/boost-1.53.0.bep new file mode 100644 index 000000000..65dfda630 --- /dev/null +++ b/dev-libs/boost/boost-1.53.0.bep @@ -0,0 +1,50 @@ +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/licenses/Boost v1.0 b/dev-libs/boost/licenses/Boost v1.0 new file mode 100644 index 000000000..36b7cd93c --- /dev/null +++ b/dev-libs/boost/licenses/Boost v1.0 @@ -0,0 +1,23 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/dev-libs/boost/patches/boost-1.50.0.patch b/dev-libs/boost/patches/boost-1.50.0.patch new file mode 100644 index 000000000..5a25a3870 --- /dev/null +++ b/dev-libs/boost/patches/boost-1.50.0.patch @@ -0,0 +1,337 @@ +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 new file mode 100644 index 000000000..7210abc07 --- /dev/null +++ b/dev-libs/boost/patches/boost-1.53.0.patch @@ -0,0 +1,337 @@ +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 ; + } + } diff --git a/dev-libs/chmlib/chmlib-0.40.bep b/dev-libs/chmlib/chmlib-0.40.bep new file mode 100644 index 000000000..b072d2c84 --- /dev/null +++ b/dev-libs/chmlib/chmlib-0.40.bep @@ -0,0 +1,28 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd chmlib-0.40 + rm aclocal.m4 + rm acinclude.m4 + libtoolize --force --copy --install + aclocal + sed -i 's/lpthread//g' configure.in Makefile.in src/Makefile.in + autoconf + automake + chmod 777 configure + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd chmlib-0.40 + make install +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2003 Jed Wing" diff --git a/dev-libs/cyassl/cyassl-2.0.2.bep b/dev-libs/cyassl/cyassl-2.0.2.bep new file mode 100644 index 000000000..9a45cb316 --- /dev/null +++ b/dev-libs/cyassl/cyassl-2.0.2.bep @@ -0,0 +1,36 @@ +DESCRIPTION="lightweight yet fully functional embedded SSL implementation" +HOMEPAGE="http://yassl.com" +SRC_URI="http://yassl.com/cyassl-2.0.2.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="app-text/dos2unix >= 1.0" +CHECKSUM_MD5="2f51752207132c161155508eeb517e38" +BUILD { + cd cyassl-2.0.2 + dos2unix * + dos2unix include/* + dos2unix ctaocrypt/include/* + dos2unix ctaocrypt/src/* + libtoolize --force --copy --install + aclocal -I m4 + autoconf + chmod 755 configure + automake + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared + make +} + +INSTALL { + cd cyassl-2.0.2 + make install +} + +TEST { + cd cyassl-2.0.2 + make check + cd testsuite + testsuite +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2006-2011 Sawtooth Consulting Ltd." diff --git a/dev-libs/cyassl/cyassl-2.5.0.bep b/dev-libs/cyassl/cyassl-2.5.0.bep new file mode 100644 index 000000000..cb0404bf6 --- /dev/null +++ b/dev-libs/cyassl/cyassl-2.5.0.bep @@ -0,0 +1,36 @@ +DESCRIPTION="lightweight yet fully functional embedded SSL implementation" +HOMEPAGE="http://yassl.com" +SRC_URI="http://yassl.com/cyassl-2.5.0.zip" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="app-text/dos2unix >= 1.0" +CHECKSUM_MD5="8965fb76f89af827ace53e423453b7cd" +BUILD { + cd cyassl-2.5.0 + dos2unix * + dos2unix include/* + dos2unix ctaocrypt/include/* + dos2unix ctaocrypt/src/* + libtoolize --force --copy --install + aclocal -I m4 + autoconf + chmod 755 configure + automake + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared + make +} + +INSTALL { + cd cyassl-2.5.0 + make install +} + +TEST { + cd cyassl-2.5.0 + make check + cd testsuite + testsuite +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2006-2013 Sawtooth Consulting Ltd." diff --git a/dev-libs/fribidi/fribidi-0.19.2.bep b/dev-libs/fribidi/fribidi-0.19.2.bep index faed53582..2b145c184 100644 --- a/dev-libs/fribidi/fribidi-0.19.2.bep +++ b/dev-libs/fribidi/fribidi-0.19.2.bep @@ -1,5 +1,5 @@ -DESCRIPTION="fribidi - A free implementation of the unicode bidirectional algorithm" -HOMEPAGE="http://fribidi.org/" +DESCRIPTION="fribidi - A free implementation of the unicode bidirectional algorithm" +HOMEPAGE="http://fribidi.org/" SRC_URI="http://fribidi.org/download/fribidi-0.19.2.tar.gz" CHECKSUM_MD5="626db17d2d99b43615ad9d12500f568a" REVISION="1" @@ -9,24 +9,15 @@ BUILD { cd fribidi-0.19.2 rm -rf aclocal.m4 mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 libtoolize --force --copy --install - aclocal -I m4 + aclocal --install -I m4 automake autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ - --mandir=$MANDIR + --mandir=$COMMON_DOCS make } @@ -34,6 +25,7 @@ INSTALL { cd fribidi-0.19.2 make install } + LICENSE="GNU LGPL v2.1" COPYRIGHT="2004 Sharif FarsiWeb, Inc 2001,2002 Behdad Esfahbod diff --git a/dev-libs/glib/glib-2.22.2.bep b/dev-libs/glib/glib-2.22.2.bep index d6139ceac..2f27e322c 100644 --- a/dev-libs/glib/glib-2.22.2.bep +++ b/dev-libs/glib/glib-2.22.2.bep @@ -18,7 +18,7 @@ BUILD { aclocal -I m4 # automake autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/glib/glib-2.24.1.bep b/dev-libs/glib/glib-2.24.1.bep index 4461b0032..91942f10f 100644 --- a/dev-libs/glib/glib-2.24.1.bep +++ b/dev-libs/glib/glib-2.24.1.bep @@ -2,7 +2,7 @@ DESCRIPTION="glib" HOMEPAGE="http://www.gtk.org/" SRC_URI="http://ftp.gnome.org/pub/gnome/sources/glib/2.24/glib-2.24.1.tar.gz" CHECKSUM_MD5="e61f2e9636f9d57067c4e3a690b9911a" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" BUILD { @@ -10,15 +10,10 @@ BUILD { rm -rf aclocal.m4 mkdir -p m4 cp ../../gtk-doc.m4 m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 libtoolize --force --copy --install - aclocal -I m4 + aclocal --install -I m4 autoconf - ./configure --prefix=/boot/common \ + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --with-threads=posix \ LDFLAGS=-lnetwork make diff --git a/dev-libs/glib/glib-2.24.2.bep b/dev-libs/glib/glib-2.24.2.bep index bb1901f4a..4be365b05 100644 --- a/dev-libs/glib/glib-2.24.2.bep +++ b/dev-libs/glib/glib-2.24.2.bep @@ -2,24 +2,28 @@ DESCRIPTION="glib" HOMEPAGE="http://www.gtk.org/" SRC_URI="http://ftp.gnome.org/pub/gnome/sources/glib/2.24/glib-2.24.2.tar.gz" CHECKSUM_MD5="071b8e246197d334e20ab67956aef936" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="dev-libs/pkgconfig >= 0.23 - sys-devel/gettext >= 0.17" + sys-devel/gettext >= 0.17 + dev-libs/libpcre >= 8.00" BUILD { cd glib-2.24.2 rm -rf aclocal.m4 mkdir -p m4 cp ../../gtk-doc.m4 m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 libtoolize --force --copy --install - aclocal -I m4 + aclocal --install -I m4 -I m4macros + autoheader + automake autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + DATADIR=`finddir B_COMMON_DATA_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=$DATADIR \ + --docdir=$COMMON_DOCS/doc/glib \ + --htmldir=$COMMON_DOCS/doc/gtk-doc/html \ + --mandir=$COMMON_DOCS/man make } diff --git a/dev-libs/glib/glib-2.26.1.bep b/dev-libs/glib/glib-2.26.1.bep index 948c958f5..a01e3eeec 100644 --- a/dev-libs/glib/glib-2.26.1.bep +++ b/dev-libs/glib/glib-2.26.1.bep @@ -11,15 +11,10 @@ BUILD { rm -rf aclocal.m4 mkdir -p m4 cp ../../gtk-doc.m4 m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 libtoolize --force --copy --install - aclocal -I m4 + aclocal --install -I m4 autoconf - ./configure --prefix=`finddir B_COMMON_BIN_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/gmp/gmp-4.3.1.bep b/dev-libs/gmp/gmp-4.3.1.bep index a82d3278d..a79acb26d 100644 --- a/dev-libs/gmp/gmp-4.3.1.bep +++ b/dev-libs/gmp/gmp-4.3.1.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake --add-missing - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/gmp/gmp-4.3.2.bep b/dev-libs/gmp/gmp-4.3.2.bep index f92d5f085..25053b62d 100644 --- a/dev-libs/gmp/gmp-4.3.2.bep +++ b/dev-libs/gmp/gmp-4.3.2.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake --add-missing - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/gmp/gmp-5.0.5.bep b/dev-libs/gmp/gmp-5.0.5.bep new file mode 100644 index 000000000..38f2da522 --- /dev/null +++ b/dev-libs/gmp/gmp-5.0.5.bep @@ -0,0 +1,30 @@ +DESCRIPTION="GMP - GNU Multiple Precision Arithmetic Library" +HOMEPAGE="http://gmplib.org/" +SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.0.5/gmp-5.0.5.tar.xz" +CHECKSUM_MD5="8aef50959acec2a1ad41d144ffe0f3b5" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd gmp-5.0.5 + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd gmp-5.0.5 + make install +} + +TEST { + cd gmp-5.0.5 + make check +} + +LICENSE="GNU GPL v3 + GNU LGPL v3" +COPYRIGHT="1991-2012 Free Software Foundation, Inc." diff --git a/dev-libs/gmp/gmp-5.1.1.bep b/dev-libs/gmp/gmp-5.1.1.bep new file mode 100644 index 000000000..a50602270 --- /dev/null +++ b/dev-libs/gmp/gmp-5.1.1.bep @@ -0,0 +1,30 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd gmp-5.1.1 + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd gmp-5.1.1 + make install +} + +TEST { + cd gmp-5.1.1 + make check +} + +LICENSE="GNU GPL v3 + GNU LGPL v3" +COPYRIGHT="1991-2013 Free Software Foundation, Inc." diff --git a/dev-libs/icu/icu-4.4.1.bep b/dev-libs/icu/icu-4.4.1.bep index ebeb67534..3a3bdc891 100644 --- a/dev-libs/icu/icu-4.4.1.bep +++ b/dev-libs/icu/icu-4.4.1.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd icu/source - CPPFLAGS="-D__STDC_ISO_10646__ -DU_CHARSET_IS_UTF8=1" ./configure --prefix=/boot/common + CPPFLAGS="-D__STDC_ISO_10646__ -DU_CHARSET_IS_UTF8=1" ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/icu/icu-4.8.1.bep b/dev-libs/icu/icu-4.8.1.bep new file mode 100644 index 000000000..423c57d5d --- /dev/null +++ b/dev-libs/icu/icu-4.8.1.bep @@ -0,0 +1,20 @@ +DESCRIPTION="icu" +HOMEPAGE="http://www.icu-project.org" +SRC_URI="http://download.icu-project.org/files/icu4c/4.8.1/icu4c-4_8_1-src.tgz" +CHECKSUM_MD5="af36f635271a239d76d038d6cf8da8df" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd icu/source + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-renaming --disable-samples --disable-extras + make +} + +INSTALL { + cd icu/source + make install +} + +LICENSE="ICU" +COPYRIGHT="1997-2011 IBM Corporation and others." diff --git a/dev-libs/icu/patches/icu-4.8.1.patch b/dev-libs/icu/patches/icu-4.8.1.patch new file mode 100644 index 000000000..0db0c4abe --- /dev/null +++ b/dev-libs/icu/patches/icu-4.8.1.patch @@ -0,0 +1,591 @@ +diff -ruN icu/source/common/messagepattern.cpp icu-haiku/source/common/messagepattern.cpp +--- icu/source/common/messagepattern.cpp 2011-07-19 23:16:28.046137344 +0200 ++++ icu-haiku/source/common/messagepattern.cpp 2011-08-19 15:48:48.211025920 +0200 +@@ -88,8 +88,12 @@ + int32_t length, + UErrorCode &errorCode); + UBool ensureCapacityForOneMore(int32_t oldLength, UErrorCode &errorCode); +- UBool memEquals(const MessagePatternList &other, int32_t length) const { +- return 0==uprv_memcmp(a.getAlias(), other.a.getAlias(), length*sizeof(T)); ++ UBool equals(const MessagePatternList &other, int32_t length) const { ++ for (int32_t i=0; i a; +@@ -309,7 +313,7 @@ + msg==other.msg && + // parts.equals(o.parts) + partsLength==other.partsLength && +- (partsLength==0 || partsList->memEquals(*other.partsList, partsLength)); ++ (partsLength==0 || partsList->equals(*other.partsList, partsLength)); + // No need to compare numericValues if msg and parts are the same. + } + +diff -ruN icu/source/common/normalizer2.cpp icu-haiku/source/common/normalizer2.cpp +--- icu/source/common/normalizer2.cpp 2011-07-19 23:16:24.008912896 +0200 ++++ icu-haiku/source/common/normalizer2.cpp 2011-08-19 15:46:55.276824064 +0200 +@@ -239,7 +239,7 @@ + ReorderingBuffer &buffer, UErrorCode &errorCode) const { + impl.decompose(src, limit, &buffer, errorCode); + } +- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. + virtual void + normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, + UnicodeString &safeMiddle, +@@ -250,7 +250,7 @@ + spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const { + return impl.decompose(src, limit, NULL, errorCode); + } +- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. + virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const { + return impl.isDecompYes(impl.getNorm16(c)) ? UNORM_YES : UNORM_NO; + } +@@ -270,7 +270,7 @@ + ReorderingBuffer &buffer, UErrorCode &errorCode) const { + impl.compose(src, limit, onlyContiguous, TRUE, buffer, errorCode); + } +- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. + virtual void + normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, + UnicodeString &safeMiddle, +@@ -313,7 +313,7 @@ + spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &) const { + return impl.composeQuickCheck(src, limit, onlyContiguous, NULL); + } +- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. + virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const { + return impl.getCompQuickCheck(impl.getNorm16(c)); + } +@@ -340,7 +340,7 @@ + ReorderingBuffer &buffer, UErrorCode &errorCode) const { + impl.makeFCD(src, limit, &buffer, errorCode); + } +- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. + virtual void + normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, + UnicodeString &safeMiddle, +@@ -351,7 +351,7 @@ + spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const { + return impl.makeFCD(src, limit, NULL, errorCode); + } +- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. + virtual UBool hasBoundaryBefore(UChar32 c) const { return impl.hasFCDBoundaryBefore(c); } + virtual UBool hasBoundaryAfter(UChar32 c) const { return impl.hasFCDBoundaryAfter(c); } + virtual UBool isInert(UChar32 c) const { return impl.isFCDInert(c); } +diff -ruN icu/source/common/unicode/bytestrie.h icu-haiku/source/common/unicode/bytestrie.h +--- icu/source/common/unicode/bytestrie.h 2011-07-19 23:16:16.052953088 +0200 ++++ icu-haiku/source/common/unicode/bytestrie.h 2011-08-19 15:46:55.331874304 +0200 +@@ -338,6 +338,9 @@ + // but the code looks more confusing that way.) + UVector32 *stack_; + }; ++#if (__GNUC__ == 2) ++ friend class Iterator; ++#endif + + private: + friend class BytesTrieBuilder; +diff -ruN icu/source/common/unicode/bytestriebuilder.h icu-haiku/source/common/unicode/bytestriebuilder.h +--- icu/source/common/unicode/bytestriebuilder.h 2011-07-19 23:16:16.053477376 +0200 ++++ icu-haiku/source/common/unicode/bytestriebuilder.h 2011-08-19 15:46:55.333185024 +0200 +@@ -141,6 +141,9 @@ + private: + const char *s; + }; ++#if (__GNUC__ == 2) ++ friend class BTLinearMatchNode; ++#endif + + virtual Node *createLinearMatchNode(int32_t i, int32_t byteIndex, int32_t length, + Node *nextNode) const; +diff -ruN icu/source/common/unicode/platform.h.in icu-haiku/source/common/unicode/platform.h.in +--- icu/source/common/unicode/platform.h.in 2011-07-19 23:16:18.055574528 +0200 ++++ icu-haiku/source/common/unicode/platform.h.in 2011-08-19 15:46:55.346554368 +0200 +@@ -299,7 +299,7 @@ + + #ifdef U_STATIC_IMPLEMENTATION + #define U_EXPORT +-#elif @U_USE_GCC_VISIBILITY_ATTRIBUTE@ ++#elif (@U_USE_GCC_VISIBILITY_ATTRIBUTE@) && (__GNUC__ > 2) + #define U_EXPORT __attribute__((visibility("default"))) + #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \ + || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) +diff -ruN icu/source/common/unicode/stringtriebuilder.h icu-haiku/source/common/unicode/stringtriebuilder.h +--- icu/source/common/unicode/stringtriebuilder.h 2011-07-19 23:16:18.056623104 +0200 ++++ icu-haiku/source/common/unicode/stringtriebuilder.h 2011-08-19 15:46:55.336068608 +0200 +@@ -245,6 +245,9 @@ + protected: + int32_t value; + }; ++#if (__GNUC__ == 2) ++ friend class FinalValueNode; ++#endif + + /** @internal */ + class ValueNode : public Node { +@@ -272,6 +275,9 @@ + protected: + Node *next; + }; ++#if (__GNUC__ == 2) ++ friend class IntermediateValueNode; ++#endif + + /** @internal */ + class LinearMatchNode : public ValueNode { +@@ -323,6 +329,9 @@ + int32_t values[kMaxBranchLinearSubNodeLength]; + UChar units[kMaxBranchLinearSubNodeLength]; + }; ++#if (__GNUC__ == 2) ++ friend class ListBranchNode; ++#endif + + /** @internal */ + class SplitBranchNode : public BranchNode { +@@ -339,6 +348,9 @@ + Node *lessThan; + Node *greaterOrEqual; + }; ++#if (__GNUC__ == 2) ++ friend class SplitBranchNode; ++#endif + + // Branch head node, for writing the actual node lead unit. + /** @internal */ +@@ -354,6 +366,9 @@ + int32_t length; + Node *next; // A branch sub-node. + }; ++#if (__GNUC__ == 2) ++ friend class BranchHeadNode; ++#endif + + /** @internal */ + virtual Node *createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t length, +diff -ruN icu/source/common/unicode/ucharstrie.h icu-haiku/source/common/unicode/ucharstrie.h +--- icu/source/common/unicode/ucharstrie.h 2011-07-19 23:16:18.058720256 +0200 ++++ icu-haiku/source/common/unicode/ucharstrie.h 2011-08-19 15:46:55.338165760 +0200 +@@ -368,6 +368,9 @@ + // but the code looks more confusing that way.) + UVector32 *stack_; + }; ++#if (__GNUC__ == 2) ++ friend class Iterator; ++#endif + + private: + friend class UCharsTrieBuilder; +diff -ruN icu/source/common/unicode/ucharstriebuilder.h icu-haiku/source/common/unicode/ucharstriebuilder.h +--- icu/source/common/unicode/ucharstriebuilder.h 2011-07-19 23:16:18.059244544 +0200 ++++ icu-haiku/source/common/unicode/ucharstriebuilder.h 2011-08-19 15:46:55.339738624 +0200 +@@ -145,6 +145,9 @@ + private: + const UChar *s; + }; ++#if (__GNUC__ == 2) ++ friend class UCTLinearMatchNode; ++#endif + + virtual Node *createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t length, + Node *nextNode) const; +diff -ruN icu/source/config/mh-haiku icu-haiku/source/config/mh-haiku +--- icu/source/config/mh-haiku 2011-07-19 23:16:46.026214400 +0200 ++++ icu-haiku/source/config/mh-haiku 2011-08-19 15:46:55.328990720 +0200 +@@ -17,6 +17,9 @@ + LIBCPPFLAGS = + THREADSCPPFLAGS = + ++# ++CPPFLAGS += -D__STDC_ISO_10646__ -DU_CHARSET_IS_UTF8=1 ++ + ## Compiler switch to embed a runtime search path + LD_RPATH= + LD_RPATH_PRE = -Wl,-rpath, +@@ -31,35 +34,35 @@ + + ## Compilation rules + %.$(STATIC_O): $(srcdir)/%.c +- $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< ++ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< + %.o: $(srcdir)/%.c +- $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< ++ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< + + %.$(STATIC_O): $(srcdir)/%.cpp +- $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< ++ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< + %.o: $(srcdir)/%.cpp +- $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< ++ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< + + + ## Dependency rules + %.d: $(srcdir)/%.c +- @echo "generating dependency information for $<" +- @$(SHELL) -ec '$(GEN_DEPS.c) $< \ +- | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ +- [ -s $@ ] || rm -f $@' ++ @echo "generating dependency information for $<" ++ @$(SHELL) -ec '$(GEN_DEPS.c) $< \ ++ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ ++ [ -s $@ ] || rm -f $@' + + %.d: $(srcdir)/%.cpp +- @echo "generating dependency information for $<" +- @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ +- | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ +- [ -s $@ ] || rm -f $@' ++ @echo "generating dependency information for $<" ++ @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ ++ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ ++ [ -s $@ ] || rm -f $@' + + ## Versioned libraries rules + + %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) +- $(RM) $@ && ln -s ${(preferenceSorting.elementAt(psIndex)); ++ UnicodeString item = *static_cast(preferenceSorting.elementAt(psIndex)); + // TODO: Since preferenceSorting was originally populated from the contents of a UnicodeSet, + // is it even possible for duplicates to show up in this check? + if (labelSet.contains(item)) { +@@ -240,7 +240,7 @@ + int32_t count = 0; + int32_t old = -1; + for (int32_t srcIndex=0; srcIndexsize(); srcIndex++) { +- const UnicodeString *str = static_cast(labels_->elementAt(srcIndex)); ++ const UnicodeString *str = static_cast(labels_->elementAt(srcIndex)); + ++count; + const int32_t bump = count * maxLabelCount_ / size; + if (bump == old) { +@@ -528,7 +528,7 @@ + const UnicodeString &AlphabeticIndex::getOverflowComparisonString(const UnicodeString &lowerLimit, UErrorCode &/*status*/) { + for (int32_t i=0; isize(); i++) { + const UnicodeString *s = +- static_cast(firstScriptCharacters_->elementAt(i)); ++ const_cast(static_cast(firstScriptCharacters_->elementAt(i))); + if (collator_->compare(*s, lowerLimit) > 0) { + return *s; + } +@@ -735,8 +735,10 @@ + sortCollateComparator(const void *context, const void *left, const void *right) { + const UHashTok *leftTok = static_cast(left); + const UHashTok *rightTok = static_cast(right); +- const UnicodeString *leftString = static_cast(leftTok->pointer); +- const UnicodeString *rightString = static_cast(rightTok->pointer); ++ const UnicodeString *leftString ++ = const_cast(static_cast(leftTok->pointer)); ++ const UnicodeString *rightString ++ = const_cast(static_cast(rightTok->pointer)); + const Collator *col = static_cast(context); + + if (leftString == rightString) { +@@ -760,8 +762,10 @@ + recordCompareFn(const void *context, const void *left, const void *right) { + const UHashTok *leftTok = static_cast(left); + const UHashTok *rightTok = static_cast(right); +- const AlphabeticIndex::Record *leftRec = static_cast(leftTok->pointer); +- const AlphabeticIndex::Record *rightRec = static_cast(rightTok->pointer); ++ const AlphabeticIndex::Record *leftRec ++ = const_cast(static_cast(leftTok->pointer)); ++ const AlphabeticIndex::Record *rightRec ++ = const_cast(static_cast(rightTok->pointer)); + const Collator *col = static_cast(context); + + Collator::EComparisonResult r = col->compare(leftRec->sortingName_, rightRec->sortingName_); +@@ -1087,8 +1091,8 @@ + PreferenceComparator(const void *context, const void *left, const void *right) { + const UHashTok *leftTok = static_cast(left); + const UHashTok *rightTok = static_cast(right); +- const UnicodeString *s1 = static_cast(leftTok->pointer); +- const UnicodeString *s2 = static_cast(rightTok->pointer); ++ const UnicodeString *s1 = const_cast(static_cast(leftTok->pointer)); ++ const UnicodeString *s2 = const_cast(static_cast(rightTok->pointer)); + UErrorCode &status = *(UErrorCode *)(context); // Cast off both static and const. + if (s1 == s2) { + return 0; +diff -ruN icu/source/i18n/currfmt.h icu-haiku/source/i18n/currfmt.h +--- icu/source/i18n/currfmt.h 2011-07-19 23:16:00.058720256 +0200 ++++ icu-haiku/source/i18n/currfmt.h 2011-08-19 15:46:55.293339136 +0200 +@@ -63,7 +63,9 @@ + virtual Format* clone() const; + + ++#if (__GNUC__ > 2) + using MeasureFormat::format; ++#endif + + /** + * Override Format API. +diff -ruN icu/source/i18n/digitlst.cpp icu-haiku/source/i18n/digitlst.cpp +--- icu/source/i18n/digitlst.cpp 2011-07-19 23:16:00.050593792 +0200 ++++ icu-haiku/source/i18n/digitlst.cpp 2011-08-19 15:46:55.295698432 +0200 +@@ -37,7 +37,9 @@ + #include + #include + #include ++#if (__GNUC__ > 2) + #include ++#endif + + // *************************************************************************** + // class DigitList +@@ -423,11 +425,15 @@ + nonConstThis->fDouble /= -1; + } + } else if (isInfinite()) { ++#if (__GNUC__ > 2) + if (std::numeric_limits::has_infinity) { + nonConstThis->fDouble = std::numeric_limits::infinity(); + } else { + nonConstThis->fDouble = std::numeric_limits::max(); + } ++#else ++ nonConstThis->fDouble = DBL_MAX; ++#endif + if (!isPositive()) { + nonConstThis->fDouble = -fDouble; + } +diff -ruN icu/source/i18n/reldtfmt.h icu-haiku/source/i18n/reldtfmt.h +--- icu/source/i18n/reldtfmt.h 2011-07-19 23:16:06.034078720 +0200 ++++ icu-haiku/source/i18n/reldtfmt.h 2011-08-19 15:46:55.297533440 +0200 +@@ -79,7 +79,9 @@ + virtual UBool operator==(const Format& other) const; + + ++#if (__GNUC__ > 2) + using DateFormat::format; ++#endif + + /** + * Format a date or time, which is the standard millis since 24:00 GMT, Jan +diff -ruN icu/source/i18n/unicode/alphaindex.h icu-haiku/source/i18n/unicode/alphaindex.h +--- icu/source/i18n/unicode/alphaindex.h 2011-07-19 23:15:52.042467328 +0200 ++++ icu-haiku/source/i18n/unicode/alphaindex.h 2011-08-19 15:46:55.344719360 +0200 +@@ -588,6 +588,9 @@ + Record(AlphabeticIndex *alphaIndex, const UnicodeString &name, const void *data); + ~Record(); + }; ++#if (__GNUC__ == 2) ++ friend struct Record; ++#endif + + /** + * Holds all user records before they are distributed into buckets. +diff -ruN icu/source/i18n/unicode/choicfmt.h icu-haiku/source/i18n/unicode/choicfmt.h +--- icu/source/i18n/unicode/choicfmt.h 2011-07-19 23:15:52.038797312 +0200 ++++ icu-haiku/source/i18n/unicode/choicfmt.h 2011-08-19 15:46:55.300154880 +0200 +@@ -352,7 +352,9 @@ + virtual const UnicodeString* getFormats(int32_t& count) const; + + ++#if (__GNUC__ > 2) + using NumberFormat::format; ++#endif + + /** + * Formats a double number using this object's choices. +diff -ruN icu/source/i18n/unicode/datefmt.h icu-haiku/source/i18n/unicode/datefmt.h +--- icu/source/i18n/unicode/datefmt.h 2011-07-19 23:15:52.035389440 +0200 ++++ icu-haiku/source/i18n/unicode/datefmt.h 2011-08-19 15:46:55.302514176 +0200 +@@ -212,7 +212,9 @@ + virtual UBool operator==(const Format&) const; + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Format an object to produce a string. This method handles Formattable +diff -ruN icu/source/i18n/unicode/decimfmt.h icu-haiku/source/i18n/unicode/decimfmt.h +--- icu/source/i18n/unicode/decimfmt.h 2011-07-19 23:15:54.040370176 +0200 ++++ icu-haiku/source/i18n/unicode/decimfmt.h 2011-08-19 15:46:55.305397760 +0200 +@@ -834,7 +834,16 @@ + virtual UBool operator==(const Format& other) const; + + ++#if (__GNUC__ > 2) + using NumberFormat::format; ++#else ++ virtual UnicodeString& format(const Formattable& obj, ++ UnicodeString& appendTo, ++ FieldPositionIterator* posIter, ++ UErrorCode& status) const { ++ return NumberFormat::format(obj, appendTo, posIter, status); ++ } ++#endif + + /** + * Format a double or long number using base-10 representation. +diff -ruN icu/source/i18n/unicode/dtitvfmt.h icu-haiku/source/i18n/unicode/dtitvfmt.h +--- icu/source/i18n/unicode/dtitvfmt.h 2011-07-19 23:15:54.042467328 +0200 ++++ icu-haiku/source/i18n/unicode/dtitvfmt.h 2011-08-19 15:46:55.307757056 +0200 +@@ -363,7 +363,9 @@ + UBool operator!=(const Format& other) const; + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Format an object to produce a string. This method handles Formattable +diff -ruN icu/source/i18n/unicode/msgfmt.h icu-haiku/source/i18n/unicode/msgfmt.h +--- icu/source/i18n/unicode/msgfmt.h 2011-07-19 23:15:54.041156608 +0200 ++++ icu-haiku/source/i18n/unicode/msgfmt.h 2011-08-19 15:46:55.310116352 +0200 +@@ -615,7 +615,9 @@ + virtual const Format** getFormats(int32_t& count) const; + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Formats the given array of arguments into a user-readable string. +diff -ruN icu/source/i18n/unicode/numfmt.h icu-haiku/source/i18n/unicode/numfmt.h +--- icu/source/i18n/unicode/numfmt.h 2011-07-19 23:15:54.039059456 +0200 ++++ icu-haiku/source/i18n/unicode/numfmt.h 2011-08-19 15:46:55.312213504 +0200 +@@ -212,8 +212,9 @@ + */ + virtual UBool operator==(const Format& other) const; + +- ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Format an object to produce a string. This method handles +diff -ruN icu/source/i18n/unicode/plurfmt.h icu-haiku/source/i18n/unicode/plurfmt.h +--- icu/source/i18n/unicode/plurfmt.h 2011-07-19 23:15:52.044040192 +0200 ++++ icu-haiku/source/i18n/unicode/plurfmt.h 2011-08-19 15:46:55.314310656 +0200 +@@ -281,7 +281,9 @@ + void applyPattern(const UnicodeString& pattern, UErrorCode& status); + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Formats a plural message for a given number. +diff -ruN icu/source/i18n/unicode/rbnf.h icu-haiku/source/i18n/unicode/rbnf.h +--- icu/source/i18n/unicode/rbnf.h 2011-07-19 23:15:54.034340864 +0200 ++++ icu-haiku/source/i18n/unicode/rbnf.h 2011-08-19 15:46:55.316932096 +0200 +@@ -722,7 +722,9 @@ + const Locale& locale = Locale::getDefault()); + + ++#if (__GNUC__ > 2) + using NumberFormat::format; ++#endif + + /** + * Formats the specified 32-bit number using the default ruleset. +diff -ruN icu/source/i18n/unicode/selfmt.h icu-haiku/source/i18n/unicode/selfmt.h +--- icu/source/i18n/unicode/selfmt.h 2011-07-19 23:15:52.042991616 +0200 ++++ icu-haiku/source/i18n/unicode/selfmt.h 2011-08-19 15:46:55.318767104 +0200 +@@ -219,7 +219,9 @@ + void applyPattern(const UnicodeString& pattern, UErrorCode& status); + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Selects the phrase for the given keyword +diff -ruN icu/source/i18n/unicode/smpdtfmt.h icu-haiku/source/i18n/unicode/smpdtfmt.h +--- icu/source/i18n/unicode/smpdtfmt.h 2011-07-19 23:15:52.035127296 +0200 ++++ icu-haiku/source/i18n/unicode/smpdtfmt.h 2011-08-19 15:46:55.321126400 +0200 +@@ -369,7 +369,9 @@ + virtual UBool operator==(const Format& other) const; + + ++#if (__GNUC__ > 2) + using DateFormat::format; ++#endif + + /** + * Format a date or time, which is the standard millis since 24:00 GMT, Jan +diff -ruN icu/source/i18n/unicode/tmutfmt.h icu-haiku/source/i18n/unicode/tmutfmt.h +--- icu/source/i18n/unicode/tmutfmt.h 2011-07-19 23:15:54.039583744 +0200 ++++ icu-haiku/source/i18n/unicode/tmutfmt.h 2011-08-19 15:46:55.322961408 +0200 +@@ -162,7 +162,16 @@ + void setNumberFormat(const NumberFormat& format, UErrorCode& status); + + ++#if (__GNUC__ > 2) + using MeasureFormat::format; ++#else ++ virtual UnicodeString& format(const Formattable& obj, ++ UnicodeString& appendTo, ++ FieldPositionIterator* posIter, ++ UErrorCode& status) const { ++ return MeasureFormat::format(obj, appendTo, posIter, status); ++ } ++#endif + + /** + * Format a TimeUnitAmount. +diff -ruN icu/source/tools/pkgdata/pkgdata.cpp icu-haiku/source/tools/pkgdata/pkgdata.cpp +--- icu/source/tools/pkgdata/pkgdata.cpp 2011-07-19 23:16:36.003670016 +0200 ++++ icu-haiku/source/tools/pkgdata/pkgdata.cpp 2011-08-19 15:46:55.326107136 +0200 +@@ -476,7 +476,7 @@ + + static int runCommand(const char* command, UBool specialHandling) { + char *cmd = NULL; +- char cmdBuffer[SMALL_BUFFER_MAX_SIZE]; ++ char cmdBuffer[64000]; + int32_t len = strlen(command); + + if (len == 0) { diff --git a/dev-libs/jansson/jansson-2.4.bep b/dev-libs/jansson/jansson-2.4.bep new file mode 100644 index 000000000..ad46db01e --- /dev/null +++ b/dev-libs/jansson/jansson-2.4.bep @@ -0,0 +1,28 @@ +DESCRIPTION="C library for encoding, decoding and manipulating JSON data" +HOMEPAGE="http://www.digip.org/jansson/" +SRC_URI="http://www.digip.org/jansson/releases/jansson-2.4.tar.gz" +CHECKSUM_MD5="c4629b89bf0432f3158c461e88fe0113" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd jansson-2.4 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd jansson-2.4 + make install +} + +TEST { + cd jansson-2.4/test + run-suites +} + +LICENSE="MIT" +COPYRIGHT="2009-2012 Petri Lehtinen + 2011-2012 Basile Starynkevitch + 2011-2012 Graeme Smecher" + diff --git a/dev-libs/json-c/json-c-0.9.bep b/dev-libs/json-c/json-c-0.9.bep index 38e0bc653..2672551fb 100644 --- a/dev-libs/json-c/json-c-0.9.bep +++ b/dev-libs/json-c/json-c-0.9.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/libattica/libattica-0.4.1.bep b/dev-libs/libattica/libattica-0.4.1.bep new file mode 100644 index 000000000..7652478be --- /dev/null +++ b/dev-libs/libattica/libattica-0.4.1.bep @@ -0,0 +1,20 @@ +DESCRIPTION="A library providing access to Open Collaboration Services" +HOMEPAGE="http://www.kde.org" +SRC_URI="ftp://ftp.kde.org/pub/kde/stable/attica/attica-0.4.1.tar.bz2" +CHECKSUM_MD5="b90983ec5d79e5ddcbc9146fa23cab72" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="" +BUILD { + cd attica-0.4.1 + cmake CMakeLists.txt + make +} + +INSTALL { + cd attica-0.4.1 + make install +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="The KDE Project" diff --git a/dev-libs/libcdio/libcdio-0.82.bep b/dev-libs/libcdio/libcdio-0.82.bep index 6a295ac81..1fb34ef75 100644 --- a/dev-libs/libcdio/libcdio-0.82.bep +++ b/dev-libs/libcdio/libcdio-0.82.bep @@ -3,7 +3,7 @@ HOMEPAGE="http://www.gnu.org/software/libcdio" SRC_URI="ftp://ftp.gnu.org/gnu/libcdio/libcdio-0.82.tar.gz" REVISION="1" STATUS_HAIKU="stable" -DEPEND="" +DEPEND="dev-libs/libiconv >= 1.12" CHECKSUM_MD5="1c29b18e01ab2b966162bc727bf3c360" BUILD { cd libcdio-0.82 diff --git a/dev-libs/libcdio/libcdio-0.83.bep b/dev-libs/libcdio/libcdio-0.83.bep new file mode 100644 index 000000000..9c49fbacf --- /dev/null +++ b/dev-libs/libcdio/libcdio-0.83.bep @@ -0,0 +1,25 @@ +DESCRIPTION="A library to encapsulate CD-ROM reading and control" +HOMEPAGE="http://www.gnu.org/software/libcdio" +SRC_URI="ftp://ftp.gnu.org/gnu/libcdio/libcdio-0.83.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libiconv >= 1.12" +CHECKSUM_MD5="b9e0f1bccb142e697cd834fe56b6e6fb" +BUILD { + cd libcdio-0.83 + libtoolize --force --copy --install + aclocal -I m4 + autoconf + automake + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd libcdio-0.83 + make install +} + +LICENSE="GNU GPL v3" +COPYRIGHT="2003-2011 Rocky Bernstein + 1996-1998 Gerd Knorr and Heiko Eißfeldt" diff --git a/dev-libs/libcdio/libcdio-0.90.bep b/dev-libs/libcdio/libcdio-0.90.bep new file mode 100644 index 000000000..ccb9b0931 --- /dev/null +++ b/dev-libs/libcdio/libcdio-0.90.bep @@ -0,0 +1,26 @@ +DESCRIPTION="A library to encapsulate CD-ROM reading and control" +HOMEPAGE="http://www.gnu.org/software/libcdio" +SRC_URI="ftp://ftp.gnu.org/gnu/libcdio/libcdio-0.90.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libiconv >= 1.12 + dev-util/pkgconfig" +CHECKSUM_MD5="1b245b023fb03a58d030fd2800db3247" +BUILD { + cd libcdio-0.90 + libtoolize --force --copy --install + aclocal -I m4 + autoconf + automake + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd libcdio-0.90 + make install +} + +LICENSE="GNU GPL v3" +COPYRIGHT="2003-2011 Rocky Bernstein + 1996-1998 Gerd Knorr and Heiko Eißfeldt" diff --git a/dev-libs/libcdio/patches/libcdio-0.83.patch b/dev-libs/libcdio/patches/libcdio-0.83.patch new file mode 100644 index 000000000..4f1ed285f --- /dev/null +++ b/dev-libs/libcdio/patches/libcdio-0.83.patch @@ -0,0 +1,20 @@ +diff -urN libcdio-0.83/configure.ac libcdio-0.83-haiku/configure.ac +--- libcdio-0.83/configure.ac 2009-10-27 11:26:32.055574528 +0000 ++++ libcdio-0.83-haiku/configure.ac 2010-10-05 11:54:28.000000000 +0000 +@@ -246,7 +246,7 @@ + dnl empty_array_size + AC_MSG_CHECKING([how to create empty arrays]) + +-empty_array_size="xxxx" ++empty_array_size="xxx" + AC_TRY_COMPILE([],[struct { int foo; int bar[]; } doo;], empty_array_size="") + + if test "x$empty_array_size" = "xxxx";then +@@ -572,6 +572,7 @@ + [AC_MSG_WARN([new enough libcddb not found. CDDB access disabled. Get libcddb from http://libcddb.sourceforge.net]) + HAVE_CDDB=no]) + AC_CHECK_LIB(socket, connect) ++ AC_CHECK_LIB(network, connect) + AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname)) + fi + diff --git a/dev-libs/libcss/libcss-0.1.2.bep b/dev-libs/libcss/libcss-0.1.2.bep new file mode 100644 index 000000000..8a6a7596a --- /dev/null +++ b/dev-libs/libcss/libcss-0.1.2.bep @@ -0,0 +1,20 @@ +DESCRIPTION="LibCSS is a CSS (Cascading Style Sheet) parser and selection engine" +HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" +SRC_URI="http://download.netsurf-browser.org/libs/releases/libcss-0.1.2-src.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libparserutils >= 0.1.1" + +BUILD { + cd libcss-0.1.2 + make +} + +INSTALL { + cd libcss-0.1.2 + make install +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/dev-libs/libdwarf/libdwarf-20120410.bep b/dev-libs/libdwarf/libdwarf-20120410.bep new file mode 100644 index 000000000..6ef959510 --- /dev/null +++ b/dev-libs/libdwarf/libdwarf-20120410.bep @@ -0,0 +1,28 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libelf >= 0.8.13" +BUILD { + cd dwarf-20120410/libdwarf + ./configure --enable-shared --prefix=$(finddir B_COMMON_DIRECTORY) + make + cd ../dwarfdump + LDFLAGS="-L../libdwarf -L/boot/common/lib" ./configure --prefix=$(finddir B_COMMON_DIRECTORY) + LIBRARY_PATH=$LIBRARY_PATH:../libdwarf/ make +} + +INSTALL { + cd dwarf-20120410/libdwarf + make install + cd ../dwarfdump + make install +} + +LICENSE="GNU GPL v2 + GNU LGPL v2.1" +COPYRIGHT="2000,2002,2004,2005 Silicon Graphics, Inc. All Rights Reserved. + 2007-2010 David Anderson. All Rights Reserved. + 2007-2010 Sun Microsystems, Inc. All rights reserved" diff --git a/dev-libs/libdwarf/patches/libdwarf-20120410.patch b/dev-libs/libdwarf/patches/libdwarf-20120410.patch new file mode 100644 index 000000000..4cadb6777 --- /dev/null +++ b/dev-libs/libdwarf/patches/libdwarf-20120410.patch @@ -0,0 +1,67 @@ +diff -urN dwarf-20120410/dwarfdump/dwarfdump.c dwarf-20120410-c89/dwarfdump/dwarfdump.c +--- dwarf-20120410/dwarfdump/dwarfdump.c 2012-04-10 18:48:29.043515904 +0000 ++++ dwarf-20120410-c89/dwarfdump/dwarfdump.c 2012-09-04 21:36:54.000000000 +0000 +@@ -1320,9 +1320,9 @@ + case 'S': + /* -S option: strings for 'any' and 'match' */ + { ++ const char *tempstr = 0; + boolean err = TRUE; + search_is_on = TRUE; +- const char *tempstr = 0; + /* -S text */ + if (strncmp(optarg,"match=",6) == 0) { + +diff -urN dwarf-20120410/dwarfdump/print_die.c dwarf-20120410-c89/dwarfdump/print_die.c +--- dwarf-20120410/dwarfdump/print_die.c 2012-04-10 18:48:29.038010880 +0000 ++++ dwarf-20120410-c89/dwarfdump/print_die.c 2012-09-04 21:39:20.000000000 +0000 +@@ -2257,8 +2257,8 @@ + /* Follow reference chain, looking for self references */ + res = dwarf_offdie_b(dbg,ref_off,is_info,&ref_die,&err); + if (res == DW_DLV_OK) { +- ++die_indent_level; + struct esb_s copy_base; ++ ++die_indent_level; + if (dump_visited_info) { + Dwarf_Off off; + dwarf_die_CU_offset(die, &off, &err); +diff -urN dwarf-20120410/libdwarf/gennames.c dwarf-20120410-c89/libdwarf/gennames.c +--- dwarf-20120410/libdwarf/gennames.c 2012-04-10 18:48:29.002359296 +0000 ++++ dwarf-20120410-c89/libdwarf/gennames.c 2012-09-04 21:20:40.000000000 +0000 +@@ -486,8 +486,8 @@ + + /* Process each line from 'dwarf.h' */ + while (!feof(f_dwarf_in)) { +- errno = 0; + char *fgbad = fgets(line_in,sizeof(line_in),f_dwarf_in); ++ errno = 0; + if(!fgbad) { + if(feof(f_dwarf_in)) { + break; +diff -urN dwarf-20120410/libdwarf/Makefile.in dwarf-20120410-c89/libdwarf/Makefile.in +--- dwarf-20120410/libdwarf/Makefile.in 2012-04-10 18:48:29.002359296 +0000 ++++ dwarf-20120410-c89/libdwarf/Makefile.in 2012-09-04 21:28:30.000000000 +0000 +@@ -46,8 +46,9 @@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-bindir = $(exec_prefix)/bin +-libdir = $(exec_prefix)/lib ++bindir = $(DESTDIR)$(prefix)/bin ++libdir = $(DESTDIR)$(prefix)/lib ++incdir = $(DESTDIR)$(prefix)/include/libdwarf + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -213,7 +214,10 @@ + rm -f dwarf_names_enum.h dwarf_names_new.h dwarf_names.c dwarf_names.h + + install: all +- echo "No install provided, see comments in the README" ++ install -m 0755 -d $(incdir) ++ install -m 0755 libdwarf.h $(incdir) ++ install -m 0755 dwarf.h $(incdir) ++ install -m 0755 libdwarf.so $(libdir) + + distclean: clean + rm -f config.status config.log config.cache config.h diff --git a/dev-libs/libedit/libedit-20090923.bep b/dev-libs/libedit/libedit-20090923.bep index 11bcf6282..ccc9f99fd 100644 --- a/dev-libs/libedit/libedit-20090923.bep +++ b/dev-libs/libedit/libedit-20090923.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd libedit-20090923-3.0 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/libedit/libedit-20100424.bep b/dev-libs/libedit/libedit-20100424.bep index d56cd0b0c..f48954ddd 100644 --- a/dev-libs/libedit/libedit-20100424.bep +++ b/dev-libs/libedit/libedit-20100424.bep @@ -10,7 +10,9 @@ COPYRIGHT="1992-2010 The NetBSD Foundation, Inc." BUILD { cd libedit-20100424-3.0 autoreconf --force --install - ./configure --prefix=/boot/common --disable-shared + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --disable-shared \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } diff --git a/dev-libs/libedit/libedit-20110802-3.0.bep b/dev-libs/libedit/libedit-20110802-3.0.bep new file mode 100644 index 000000000..441ef480a --- /dev/null +++ b/dev-libs/libedit/libedit-20110802-3.0.bep @@ -0,0 +1,22 @@ +DESCRIPTION="A BSD licensed replacement for the GNU readline library." +HOMEPAGE="http://www.thrysoee.dk/editline/" +SRC_URI="http://www.thrysoee.dk/editline/libedit-20110802-3.0.tar.gz" +CHECKSUM_MD5="0ea42e2c794da8ed32f6307b427f6590" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +LICENSE="BSD (3-clause)" +COPYRIGHT="1992-2011 The NetBSD Foundation, Inc." +BUILD { + cd libedit-20110802-3.0 + autoreconf --force --install + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --disable-shared \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd libedit-20110802-3.0 + make install +} diff --git a/dev-libs/libedit/libedit-20120601-3.0.bep b/dev-libs/libedit/libedit-20120601-3.0.bep new file mode 100644 index 000000000..27c02f8ce --- /dev/null +++ b/dev-libs/libedit/libedit-20120601-3.0.bep @@ -0,0 +1,22 @@ +DESCRIPTION="A BSD licensed replacement for the GNU readline library." +HOMEPAGE="http://www.thrysoee.dk/editline/" +SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz" +CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +LICENSE="BSD (3-clause)" +COPYRIGHT="1992-2012 The NetBSD Foundation, Inc." +BUILD { + cd libedit-20120601-3.0 + autoreconf --force --install + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --disable-shared \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd libedit-20120601-3.0 + make install +} diff --git a/dev-libs/libedit/patches/libedit-20110802-3.0.patch b/dev-libs/libedit/patches/libedit-20110802-3.0.patch new file mode 100644 index 000000000..9fb782c91 --- /dev/null +++ b/dev-libs/libedit/patches/libedit-20110802-3.0.patch @@ -0,0 +1,66 @@ +diff -urN libedit-20110802-3.0/configure.ac libedit-20110802-3.0-haiku/configure.ac +--- libedit-20110802-3.0/configure.ac 2011-08-02 01:09:05.036962304 -0700 ++++ libedit-20110802-3.0-haiku/configure.ac 2012-06-16 10:41:31.579338240 -0700 +@@ -64,7 +64,7 @@ + AC_HEADER_DIRENT + AC_HEADER_STDC + AC_HEADER_SYS_WAIT +-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h termcap.h]) ++AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdint.h stdlib.h string.h sys/errno.h errno.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h langinfo.h]) + + AC_CHECK_HEADER([termios.h], [], [AC_MSG_ERROR([termios.h is required!])],[]) + +diff -urN libedit-20110802-3.0/examples/fileman.c libedit-20110802-3.0-haiku/examples/fileman.c +--- libedit-20110802-3.0/examples/fileman.c 2010-04-22 12:13:17.046137344 -0700 ++++ libedit-20110802-3.0-haiku/examples/fileman.c 2012-06-16 10:41:31.721944576 -0700 +@@ -11,7 +11,11 @@ + #include + #include + #include ++#ifdef HAVE_SYS_ERRNO_H + #include ++#elif HAVE_ERRNO_H ++#include ++#endif + #include + #include + #include +diff -urN libedit-20110802-3.0/src/editline/readline.h libedit-20110802-3.0-haiku/src/editline/readline.h +--- libedit-20110802-3.0/src/editline/readline.h 2011-02-26 14:42:59.045088768 -0800 ++++ libedit-20110802-3.0-haiku/src/editline/readline.h 2012-06-16 10:41:32.068943872 -0700 +@@ -75,7 +75,7 @@ + + #ifndef CTRL + #include +-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) ++#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__) + #include + #endif + #ifndef CTRL +diff -urN libedit-20110802-3.0/src/el.c libedit-20110802-3.0-haiku/src/el.c +--- libedit-20110802-3.0/src/el.c 2011-08-02 00:02:46.039583744 -0700 ++++ libedit-20110802-3.0-haiku/src/el.c 2012-06-16 10:41:31.823394304 -0700 +@@ -55,7 +55,9 @@ + #include + #include + #include ++#ifdef HAVE_LANGINFO_H + #include ++#endif + #include "el.h" + + /* el_init(): +diff -urN libedit-20110802-3.0/src/vis.c libedit-20110802-3.0-haiku/src/vis.c +--- libedit-20110802-3.0/src/vis.c 2011-07-08 23:39:42.044564480 -0700 ++++ libedit-20110802-3.0-haiku/src/vis.c 2012-06-16 10:41:31.985137152 -0700 +@@ -68,6 +68,10 @@ + #include + #include + ++#ifdef HAVE_STDINT_H ++#include ++#endif ++ + #ifdef __weak_alias + __weak_alias(strvisx,_strvisx) + #endif diff --git a/dev-libs/libedit/patches/libedit-20120601-3.0.patch b/dev-libs/libedit/patches/libedit-20120601-3.0.patch new file mode 100644 index 000000000..6c2bae550 --- /dev/null +++ b/dev-libs/libedit/patches/libedit-20120601-3.0.patch @@ -0,0 +1,66 @@ +diff -urN libedit-20120601-3.0/configure.ac libedit-20120601-3.0-haiku/configure.ac +--- libedit-20120601-3.0/configure.ac 2012-06-01 12:04:56.000000000 -0700 ++++ libedit-20120601-3.0-haiku/configure.ac 2012-06-16 15:01:10.749207552 -0700 +@@ -65,7 +65,7 @@ + AC_HEADER_DIRENT + AC_HEADER_STDC + AC_HEADER_SYS_WAIT +-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h termcap.h]) ++AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdint.h stdlib.h string.h sys/errno.h errno.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h langinfo.h]) + + AC_CHECK_HEADER([termios.h], [], [AC_MSG_ERROR([termios.h is required!])],[]) + +diff -urN libedit-20120601-3.0/examples/fileman.c libedit-20120601-3.0-haiku/examples/fileman.c +--- libedit-20120601-3.0/examples/fileman.c 2010-04-22 12:13:17.000000000 -0700 ++++ libedit-20120601-3.0-haiku/examples/fileman.c 2012-06-16 15:01:10.911212544 -0700 +@@ -11,7 +11,11 @@ + #include + #include + #include ++#ifdef HAVE_SYS_ERRNO_H + #include ++#elif HAVE_ERRNO_H ++#include ++#endif + #include + #include + #include +diff -urN libedit-20120601-3.0/src/editline/readline.h libedit-20120601-3.0-haiku/src/editline/readline.h +--- libedit-20120601-3.0/src/editline/readline.h 2012-05-22 10:43:49.000000000 -0700 ++++ libedit-20120601-3.0-haiku/src/editline/readline.h 2012-06-16 15:01:10.947388416 -0700 +@@ -75,7 +75,7 @@ + + #ifndef CTRL + #include +-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) ++#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__) + #include + #endif + #ifndef CTRL +diff -urN libedit-20120601-3.0/src/el.c libedit-20120601-3.0-haiku/src/el.c +--- libedit-20120601-3.0/src/el.c 2012-03-11 15:00:23.000000000 -0700 ++++ libedit-20120601-3.0-haiku/src/el.c 2012-06-16 15:01:11.013893632 -0700 +@@ -55,7 +55,9 @@ + #include + #include + #include ++#ifdef HAVE_LANGINFO_H + #include ++#endif + #include "el.h" + + /* el_init(): +diff -urN libedit-20120601-3.0/src/vis.c libedit-20120601-3.0-haiku/src/vis.c +--- libedit-20120601-3.0/src/vis.c 2011-07-08 23:39:42.000000000 -0700 ++++ libedit-20120601-3.0-haiku/src/vis.c 2012-06-16 15:01:11.063176704 -0700 +@@ -68,6 +68,10 @@ + #include + #include + ++#ifdef HAVE_STDINT_H ++#include ++#endif ++ + #ifdef __weak_alias + __weak_alias(strvisx,_strvisx) + #endif diff --git a/dev-libs/libelf/libelf-0.8.13.bep b/dev-libs/libelf/libelf-0.8.13.bep new file mode 100644 index 000000000..d1a0c7ebb --- /dev/null +++ b/dev-libs/libelf/libelf-0.8.13.bep @@ -0,0 +1,22 @@ +DESCRIPTION="libelf - ELF object file access library" +HOMEPAGE="http://www.mr511.de/software/english.html" +SRC_URI="http://www.mr511.de/software/libelf-0.8.13.tar.gz" +CHECKSUM_MD5="4136d7b4c04df68b686570afa26988ac" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libelf-0.8.13 + libtoolize -fci + autoreconf + ./configure --enable-gnu-names --prefix=$(finddir B_COMMON_DIRECTORY) + make +} + +INSTALL { + cd libelf-0.8.13 + make install instroot=$DESTDIR + make install-compat instroot=$DESTDIR +} +LICENSE="GNU LGPL v2" +COPYRIGHT="1995-2008 Michael Riepe" diff --git a/dev-libs/libelf/patches/libelf-0.8.13.patch b/dev-libs/libelf/patches/libelf-0.8.13.patch new file mode 100644 index 000000000..3122add35 --- /dev/null +++ b/dev-libs/libelf/patches/libelf-0.8.13.patch @@ -0,0 +1,25 @@ +diff -Naur libelf-0.8.13/aclocal.m4 libelf-0.8.13-haiku/aclocal.m4 +--- libelf-0.8.13/aclocal.m4 2008-05-23 08:17:56.050593792 +0000 ++++ libelf-0.8.13-haiku/aclocal.m4 2012-08-21 14:55:07.622854144 +0000 +@@ -235,7 +235,7 @@ + AC_REQUIRE([AC_PROG_CC]) + AC_PATH_PROG(LD, ld, ld) + case "$host" in +- *-linux*|*-gnu*) ++ *-linux*|*-gnu*|*-haiku*) + if test "$GCC" = yes; then + mr_TARGET_ELF + if test "$mr_cv_target_elf" = yes; then +@@ -248,7 +248,11 @@ + SONAME_SFX='.so.$(MAJOR)' + LINK_SHLIB='$(CC) -shared -Wl,-soname,$(SONAME)' + INSTALL_SHLIB='$(INSTALL_PROGRAM)' +- DEPSHLIBS='-lc' ++ case "$host" in ++ *-linux*|*-gnu*) ++ DEPSHLIBS='-lc' ++ ;; ++ esac + else + AC_MSG_WARN([shared libraries not supported for $host]) + mr_enable_shared=no diff --git a/dev-libs/libevent/libevent-1.4.11.bep b/dev-libs/libevent/libevent-1.4.11.bep index f206689a4..6747e2dc5 100644 --- a/dev-libs/libevent/libevent-1.4.11.bep +++ b/dev-libs/libevent/libevent-1.4.11.bep @@ -9,7 +9,7 @@ DEPEND="" BUILD { cd libevent-1.4.11-stable autoreconf -vfi - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/libevent/libevent-1.4.13.bep b/dev-libs/libevent/libevent-1.4.13.bep index 9761eb13a..a7975f433 100644 --- a/dev-libs/libevent/libevent-1.4.13.bep +++ b/dev-libs/libevent/libevent-1.4.13.bep @@ -9,7 +9,7 @@ DEPEND="" BUILD { cd libevent-1.4.13-stable autoreconf -vfi - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/libevent/libevent-1.4.14b.bep b/dev-libs/libevent/libevent-1.4.14b.bep index 346703569..aff7ae9a7 100644 --- a/dev-libs/libevent/libevent-1.4.14b.bep +++ b/dev-libs/libevent/libevent-1.4.14b.bep @@ -9,15 +9,11 @@ DEPEND="" BUILD { cd libevent-1.4.14b-stable autoreconf -vfi - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ - --mandir=$MANDIR + --mandir=$COMMON_DOCS make } diff --git a/dev-libs/libevent/libevent-2.0.10.bep b/dev-libs/libevent/libevent-2.0.10.bep index 9bafcdb2a..87dc63adc 100644 --- a/dev-libs/libevent/libevent-2.0.10.bep +++ b/dev-libs/libevent/libevent-2.0.10.bep @@ -9,15 +9,11 @@ DEPEND="" BUILD { cd libevent-2.0.10-stable autoreconf -vfi - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ - --mandir=$MANDIR + --mandir=$COMMON_DOCS make } diff --git a/dev-libs/libffi/libffi-3.0.11.bep b/dev-libs/libffi/libffi-3.0.11.bep new file mode 100644 index 000000000..2b187d569 --- /dev/null +++ b/dev-libs/libffi/libffi-3.0.11.bep @@ -0,0 +1,21 @@ +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.11.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +CHECKSUM_MD5="f69b9693227d976835b4857b1ba7d0e3" +DEPEND="" +BUILD { + cd libffi-3.0.11 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + make +} + +INSTALL { + cd libffi-3.0.11 + make install +} + +COPYRIGHT="1996-2012 Anthony Green, Red Hat, Inc and others." +LICENSE="MIT" diff --git a/dev-libs/libffi/libffi-3.0.9.bep b/dev-libs/libffi/libffi-3.0.9.bep index 13f509a02..1dfcf228a 100644 --- a/dev-libs/libffi/libffi-3.0.9.bep +++ b/dev-libs/libffi/libffi-3.0.9.bep @@ -12,7 +12,7 @@ BUILD { aclocal automake autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/libgcrypt/libgcrypt-1.4.5.bep b/dev-libs/libgcrypt/libgcrypt-1.4.5.bep index 6aaa5dbe6..549933e7a 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.4.5.bep +++ b/dev-libs/libgcrypt/libgcrypt-1.4.5.bep @@ -8,7 +8,7 @@ BUILD { cd libgcrypt-1.4.5 libtoolize --force --copy --install autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0.bep b/dev-libs/libgcrypt/libgcrypt-1.5.0.bep new file mode 100644 index 000000000..f22ea0cbf --- /dev/null +++ b/dev-libs/libgcrypt/libgcrypt-1.5.0.bep @@ -0,0 +1,24 @@ +DESCRIPTION="libgcrypt" +HOMEPAGE="http://directory.fsf.org/project/libgcrypt/" +SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libgpg-error > 1.8" +CHECKSUM_MD5="693f9c64d50c908bc4d6e01da3ff76d8" +BUILD { + cd libgcrypt-1.5.0 + libtoolize --force --copy --install + autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --enable-shared --enable-static + make +} + +INSTALL { + cd libgcrypt-1.5.0 + make install +} +LICENSE="GNU LGPL v3" +COPYRIGHT="2000-2010 Free Software Foundation, Inc." diff --git a/dev-libs/libgcrypt/patches/libgcrypt-1.5.0.patch b/dev-libs/libgcrypt/patches/libgcrypt-1.5.0.patch new file mode 100644 index 000000000..27c4ea590 --- /dev/null +++ b/dev-libs/libgcrypt/patches/libgcrypt-1.5.0.patch @@ -0,0 +1,10 @@ +--- libgcrypt-1.5.0/configure.ac 2011-06-29 08:53:22.065011712 +0000 ++++ libgcrypt-1.5.0-haiku/configure.ac 2012-04-09 17:24:30.365690880 +0000 +@@ -619,6 +619,7 @@ + AC_SEARCH_LIBS(setsockopt, [socket], , + [AC_SEARCH_LIBS(setsockopt, [socket], , , [-lnsl])]) + AC_SEARCH_LIBS(setsockopt, [nsl]) ++AC_SEARCH_LIBS(socket, [network]) + + ################################## + #### Checks for header files. #### diff --git a/dev-libs/libgpg-error/libgpg-error-1.10.bep b/dev-libs/libgpg-error/libgpg-error-1.10.bep new file mode 100644 index 000000000..4b7149696 --- /dev/null +++ b/dev-libs/libgpg-error/libgpg-error-1.10.bep @@ -0,0 +1,26 @@ +DESCRIPTION="libgpg-error" +HOMEPAGE="http://www.gnupg.org/related_software/libraries.en.html#lib-libgpg-error" +SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.bz2" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="gettext = 0.18.1.1-dev" +CHECKSUM_MD5="736a03daa9dc5873047d4eb4a9c22a16" +BUILD { + cd libgpg-error-1.10 + cd po + touch t-cs.gmo t-de.gmo t-fr.gmo t-it.gmo t-nl.gmo \ + t-pl.gmo t-ro.gmo t-sv.gmo t-vi.gmo t-zh_CN.gmo + cd .. + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` + make +} + +INSTALL { + cd libgpg-error-1.10 + make install +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2003-2010 g10 Code GmbH" diff --git a/dev-libs/libgpg-error/libgpg-error-1.7.bep b/dev-libs/libgpg-error/libgpg-error-1.7.bep index 48ba5d391..d51596db0 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.7.bep +++ b/dev-libs/libgpg-error/libgpg-error-1.7.bep @@ -8,7 +8,7 @@ CHECKSUM_MD5="62c0d09d1e76c5b6da8fff92314c4665" BUILD { cd libgpg-error-1.7 autoreconf -vfi -Im4 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/libgpg-error/patches/libgpg-error-1.10.patch b/dev-libs/libgpg-error/patches/libgpg-error-1.10.patch new file mode 100644 index 000000000..09e99ba4a --- /dev/null +++ b/dev-libs/libgpg-error/patches/libgpg-error-1.10.patch @@ -0,0 +1,11 @@ +--- libgpg-error-1.10/src/mkerrcodes2.awk 2008-08-26 12:45:58.010747904 +0000 ++++ libgpg-error-1.10-haiku/src/mkerrcodes2.awk 2012-04-09 16:59:18.363855872 +0000 +@@ -81,7 +81,7 @@ + /^#/ { next; } + + header { +- if ($1 ~ /^[0123456789]+$/) ++ if ($1 ~ /^-?[0123456789]+$/) + { + print "static const int err_code_from_index[] = {"; + header = 0; diff --git a/dev-libs/libiconv/libiconv-1.12.bep b/dev-libs/libiconv/libiconv-1.12.bep index 0bee0e74a..7b40e7808 100644 --- a/dev-libs/libiconv/libiconv-1.12.bep +++ b/dev-libs/libiconv/libiconv-1.12.bep @@ -7,11 +7,41 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd libiconv-1.12 - ./configure --prefix=/boot/common + rm -rf aclocal.m4 + echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" + libtoolize -fci + aclocal --install -I m4 -I srcm4 + autoconf + autoheader + cd libcharset + echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" + libtoolize -fci + aclocal --install -I m4 + autoconf + autoheader + cd .. + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ + --docdir=$COMMON_DOCS/doc/iconv \ + --mandir=$COMMON_DOCS/man \ + --enable-relocatable \ + --enable-shared \ + --enable-static \ + --disable-nls make } INSTALL { cd libiconv-1.12 + ACLOCALDIR=${DESTDIR}/`aclocal --print-ac-dir` + mkdir -p ${ACLOCALDIR} + cp -f srcm4/iconv.m4 ${ACLOCALDIR}/iconv.m4 make install } + +TEST{ + cd libiconv-1.12 + make check +} diff --git a/dev-libs/liboil/liboil-0.3.17.bep b/dev-libs/liboil/liboil-0.3.17.bep index 65dd13295..a54643c8d 100644 --- a/dev-libs/liboil/liboil-0.3.17.bep +++ b/dev-libs/liboil/liboil-0.3.17.bep @@ -11,7 +11,7 @@ BUILD { aclocal -I m4 autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/liboil/patches/liboil-0.3.17.patch b/dev-libs/liboil/patches/liboil-0.3.17.patch new file mode 100644 index 000000000..e98a3d4bb --- /dev/null +++ b/dev-libs/liboil/patches/liboil-0.3.17.patch @@ -0,0 +1,8 @@ +--- liboil-0.3.17-orig/liboil/c/generate_clamp.pl 2007-11-16 02:53:47.006553600 +0000 ++++ liboil-0.3.17/liboil/c/generate_clamp.pl 2012-08-05 14:10:46.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl ++#!/boot/common/bin/perl + # + + diff --git a/dev-libs/libparserutils/libparserutils-0.1.1.bep b/dev-libs/libparserutils/libparserutils-0.1.1.bep new file mode 100644 index 000000000..28738cbe1 --- /dev/null +++ b/dev-libs/libparserutils/libparserutils-0.1.1.bep @@ -0,0 +1,19 @@ +DESCRIPTION="LibParserUtils is a library for building efficient parsers" +HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/" +SRC_URI="http://download.netsurf-browser.org/libs/releases/libparserutils-0.1.1-src.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" + +BUILD { + cd libparserutils-0.1.1 + make +} + +INSTALL { + cd libparserutils-0.1.1 + make install +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/dev-libs/libpcre/libpcre-8.00.bep b/dev-libs/libpcre/libpcre-8.00.bep index f6fa33ae4..802fb405a 100644 --- a/dev-libs/libpcre/libpcre-8.00.bep +++ b/dev-libs/libpcre/libpcre-8.00.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common --enable-utf8 --enable-unicode-properties --with-pic + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-utf8 --enable-unicode-properties --with-pic make make check } diff --git a/dev-libs/libpcre/libpcre-8.02.bep b/dev-libs/libpcre/libpcre-8.02.bep index 364d5096a..c5e5b701c 100644 --- a/dev-libs/libpcre/libpcre-8.02.bep +++ b/dev-libs/libpcre/libpcre-8.02.bep @@ -1,5 +1,5 @@ DESCRIPTION="libpcre - Perl Compatible Regular Expressions" -HOMEPAGE="http://www.xpcre.org/" +HOMEPAGE="http://www.xpcre.org/" SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.02.tar.bz2" CHECKSUM_MD5="27948c1b5f5c1eabc23cba1ebe4c316f" REVISION="1" @@ -7,16 +7,12 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd pcre-8.02 - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` libtoolize --force --copy aclocal autoconf automake - ./configure --prefix=/boot/common --enable-utf8 --enable-unicode-properties --with-pic --libdir=${LIBDIR} + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-utf8 --enable-unicode-properties --with-pic --libdir=${LIBDIR} make make check } diff --git a/dev-libs/libpcre/libpcre-8.12.bep b/dev-libs/libpcre/libpcre-8.12.bep index b074e1bc5..1d1b9188d 100644 --- a/dev-libs/libpcre/libpcre-8.12.bep +++ b/dev-libs/libpcre/libpcre-8.12.bep @@ -1,5 +1,5 @@ DESCRIPTION="libpcre - Perl Compatible Regular Expressions" -HOMEPAGE="http://www.xpcre.org/" +HOMEPAGE="http://www.xpcre.org/" SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.12.tar.bz2" CHECKSUM_MD5="f14a9fef3c92f3fc6c5ac92d7a2c7eb3" REVISION="1" @@ -7,22 +7,19 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd pcre-8.12 -# if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` -# else -# LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 -# fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` libtoolize --force --copy aclocal autoconf automake + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --enable-utf8 \ --enable-unicode-properties \ --with-pic \ --libdir=${LIBDIR} \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc + --mandir=$COMMON_DOCS/man \ + --docdir=$COMMON_DOCS/doc/pcre make } diff --git a/dev-libs/libpcre/libpcre-8.21.bep b/dev-libs/libpcre/libpcre-8.21.bep new file mode 100644 index 000000000..429772017 --- /dev/null +++ b/dev-libs/libpcre/libpcre-8.21.bep @@ -0,0 +1,38 @@ +DESCRIPTION="libpcre - Perl Compatible Regular Expressions" +HOMEPAGE="http://www.pcre.org/" +SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2" +CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd pcre-8.21 + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + libtoolize --force --copy --install + aclocal + autoconf + automake + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-utf8 \ + --enable-unicode-properties \ + --with-pic \ + --libdir=${LIBDIR} \ + --mandir=$COMMON_DOCS/man \ + --docdir=$COMMON_DOCS/doc/pcre + make +} + +INSTALL { + cd pcre-8.21 + make install +} + +TEST { + cd pcre-8.21 + make check +} + +LICENSE="PCRE" +COPYRIGHT="1997-2011 University of Cambridge + 2007-2011, Google Inc. All rights reserved." diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.bep b/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.bep index a1d057af0..7c8343203 100644 --- a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.bep +++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.bep @@ -9,7 +9,7 @@ BUILD { cd libpthread-stubs-0.3 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.bep b/dev-libs/libpthread-stubs/libpthread-stubs-0.3.bep index a1d057af0..7c8343203 100644 --- a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.bep +++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.3.bep @@ -9,7 +9,7 @@ BUILD { cd libpthread-stubs-0.3 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.bep b/dev-libs/libsigc++/libsigc++-1.2.7.bep index e0ffdce84..1decbb7ed 100644 --- a/dev-libs/libsigc++/libsigc++-1.2.7.bep +++ b/dev-libs/libsigc++/libsigc++-1.2.7.bep @@ -12,7 +12,7 @@ BUILD { autoconf automake ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make -i # There's name make file for tests and examples directories so just ignore (-i) # those errors and we really don't need either one diff --git a/dev-libs/libsigc++/libsigc++-2.2.7.bep b/dev-libs/libsigc++/libsigc++-2.2.7.bep index 1d1aea380..9a4accac8 100644 --- a/dev-libs/libsigc++/libsigc++-2.2.7.bep +++ b/dev-libs/libsigc++/libsigc++-2.2.7.bep @@ -10,7 +10,7 @@ BUILD { libtoolize --force --copy aclocal sh autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/libunistring/libunistring-0.9.1.1.bep b/dev-libs/libunistring/libunistring-0.9.1.1.bep index ab08efc41..0138a2f4e 100644 --- a/dev-libs/libunistring/libunistring-0.9.1.1.bep +++ b/dev-libs/libunistring/libunistring-0.9.1.1.bep @@ -9,7 +9,7 @@ BUILD { cd libunistring-0.9.1.1 libtoolize --copy --force --install ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.bep b/dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.bep new file mode 100644 index 000000000..8190c188a --- /dev/null +++ b/dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.bep @@ -0,0 +1,20 @@ +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" +STATUS_HAIKU="stable" +DEPEND="dev-util/buildsystem >= 0" + +BUILD { + cd libwapcaplet-0.1.1-HEAD + make PREFIX=/boot/common +} + +INSTALL { + cd libwapcaplet-0.1.1-HEAD + make install PREFIX=/boot/common +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.1.1.bep b/dev-libs/libwapcaplet/libwapcaplet-0.1.1.bep new file mode 100644 index 000000000..8d71ca25f --- /dev/null +++ b/dev-libs/libwapcaplet/libwapcaplet-0.1.1.bep @@ -0,0 +1,19 @@ +DESCRIPTION="LibWapcaplet is a string internment library" +HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/" +SRC_URI="http://download.netsurf-browser.org/libs/releases/libwapcaplet-0.1.1-src.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" + +BUILD { + cd libwapcaplet-0.1.1 + make +} + +INSTALL { + cd libwapcaplet-0.1.1 + make install +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.bep b/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.bep index 754d824a7..6e1d2a3c1 100644 --- a/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.bep +++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.bep @@ -7,7 +7,7 @@ DEPEND="" CHECKSUM_MD5="7c64a28b08c8fdf6c8a95b0d5f1497b0" BUILD { cd libxdg-basedir-1.1.1 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/libxml2/libxml2-2.7.3.bep b/dev-libs/libxml2/libxml2-2.7.3.bep index afb8f8f5a..5a7a0d4df 100644 --- a/dev-libs/libxml2/libxml2-2.7.3.bep +++ b/dev-libs/libxml2/libxml2-2.7.3.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common --enable-ipv6=no LDFLAGS=-lnetwork + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-ipv6=no LDFLAGS=-lnetwork make } diff --git a/dev-libs/libxml2/libxml2-2.7.6.bep b/dev-libs/libxml2/libxml2-2.7.6.bep index bb3ed9016..aeb674eb8 100644 --- a/dev-libs/libxml2/libxml2-2.7.6.bep +++ b/dev-libs/libxml2/libxml2-2.7.6.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common --enable-ipv6=no LDFLAGS="-lnetwork -L/boot/common/lib" + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-ipv6=no LDFLAGS="-lnetwork -L/boot/common/lib" make } diff --git a/dev-libs/libxml2/libxml2-2.7.7.bep b/dev-libs/libxml2/libxml2-2.7.7.bep index 61772d902..f5205acd0 100644 --- a/dev-libs/libxml2/libxml2-2.7.7.bep +++ b/dev-libs/libxml2/libxml2-2.7.7.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common --enable-ipv6=no LDFLAGS="-lnetwork -L/boot/common/lib" + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-ipv6=no LDFLAGS="-lnetwork -L/boot/common/lib" make } diff --git a/dev-libs/libxml2/libxml2-2.8.0.bep b/dev-libs/libxml2/libxml2-2.8.0.bep new file mode 100644 index 000000000..49230b94f --- /dev/null +++ b/dev-libs/libxml2/libxml2-2.8.0.bep @@ -0,0 +1,35 @@ +DESCRIPTION="libxml2 - Version 2 of the library to manipulate XML files" +HOMEPAGE="http://www.xmlsoft.org/" +SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz" +CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libxml2-2.8.0 + libtoolize --force --copy --install + aclocal + autoconf + sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* + automake + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=$COMMON_DOCS \ + --docdir=$COMMON_DOCS/doc \ + --mandir=$COMMON_DOCS/man + LDFLAGS="-lnetwork" + make +} + +INSTALL { + cd libxml2-2.8.0 + make install +} + +TEST { + cd libxml2-2.8.0 + make tests +} + +LICENSE="MIT" +COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." diff --git a/dev-libs/libxml2/libxml2-2.9.0.bep b/dev-libs/libxml2/libxml2-2.9.0.bep new file mode 100644 index 000000000..70bf22569 --- /dev/null +++ b/dev-libs/libxml2/libxml2-2.9.0.bep @@ -0,0 +1,36 @@ +DESCRIPTION="libxml2 - Version 2 of the library to manipulate XML files" +HOMEPAGE="http://www.xmlsoft.org/" +SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.9.0.tar.gz" +CHECKSUM_MD5="5b9bebf4f5d2200ae2c4efe8fa6103f7" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libxml2-2.9.0 + libtoolize --force --copy --install + aclocal + autoconf + sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* + automake + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=$COMMON_DOCS \ + --docdir=$COMMON_DOCS/doc \ + --mandir=$COMMON_DOCS/man \ + --with-threads=yes + LDFLAGS="-lnetwork" + make +} + +INSTALL { + cd libxml2-2.9.0 + make install +} + +TEST { + cd libxml2-2.9.0 + make tests +} + +LICENSE="MIT" +COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." diff --git a/dev-libs/libxml2/patches/libxml2-2.9.0.patch b/dev-libs/libxml2/patches/libxml2-2.9.0.patch new file mode 100644 index 000000000..b5ca0e802 --- /dev/null +++ b/dev-libs/libxml2/patches/libxml2-2.9.0.patch @@ -0,0 +1,33 @@ +--- libxml2-2.9.0-orig/threads.c 2012-09-11 03:52:46.000000000 +0000 ++++ libxml2-2.9.0/threads.c 2013-02-12 20:44:23.000000000 +0000 +@@ -146,6 +146,7 @@ + static pthread_key_t globalkey; + static pthread_t mainthread; + static pthread_once_t once_control = PTHREAD_ONCE_INIT; ++static pthread_once_t once_control_init = PTHREAD_ONCE_INIT; + static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER; + #elif defined HAVE_WIN32_THREADS + #if defined(HAVE_COMPILER_TLS) +@@ -915,7 +916,7 @@ + #ifdef HAVE_PTHREAD_H + if ((libxml_is_threaded) && (pthread_key_delete != NULL)) + pthread_key_delete(globalkey); +- once_control = PTHREAD_ONCE_INIT; ++ once_control = once_control_init; + #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL)) + if (globalkey != TLS_OUT_OF_INDEXES) { + xmlGlobalStateCleanupHelperParams *p; +--- libxml2-2.9.0-orig/configure.in 2012-09-11 03:52:46.053739520 +0000 ++++ libxml2-2.9.0/configure.in 2013-02-12 20:37:19.000000000 +0000 +@@ -988,6 +988,11 @@ + *beos*) WITH_THREADS="1" + THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_BEOS_THREADS" + ;; ++ *haiku*) WITH_THREADS="1" ++ THREAD_LIB="" ++ AC_DEFINE([HAVE_PTHREAD_H], [], [Define if is there]) ++ ;; ++ + *linux*) + if test "${GCC}" = "yes" ; then + GCC_VERSION=`${CC} --version | head -1 | awk '{print $3}'` diff --git a/dev-libs/libxslt/libxslt-1.1.26.bep b/dev-libs/libxslt/libxslt-1.1.26.bep index db8fc9fcb..2702fe367 100644 --- a/dev-libs/libxslt/libxslt-1.1.26.bep +++ b/dev-libs/libxslt/libxslt-1.1.26.bep @@ -10,8 +10,14 @@ BUILD { libtoolize --force --copy --install aclocal autoconf + sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/' Makefile* automake - ./configure --prefix=/boot/common + + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=$COMMON_DOCS \ + --docdir=$COMMON_DOCS/doc \ + --mandir=$COMMON_DOCS/man make } @@ -19,5 +25,6 @@ INSTALL { cd libxslt-1.1.26 make install } + LICENSE="MIT" COPYRIGHT="2001-2002 Daniel Veillard. All Rights Reserved." diff --git a/dev-libs/libxslt/libxslt-1.1.28.bep b/dev-libs/libxslt/libxslt-1.1.28.bep new file mode 100644 index 000000000..759cc47f0 --- /dev/null +++ b/dev-libs/libxslt/libxslt-1.1.28.bep @@ -0,0 +1,30 @@ +DESCRIPTION="XSLT C library developed for the GNOME project" +HOMEPAGE="http://www.xmlsoft.org/" +SRC_URI="ftp://xmlsoft.org/libxml2/libxslt-1.1.28.tar.gz" +CHECKSUM_MD5="9667bf6f9310b957254fdcf6596600b7" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libxslt-1.1.28 + libtoolize --force --copy --install + aclocal + autoconf + sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/' Makefile* + automake + + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=$COMMON_DOCS \ + --docdir=$COMMON_DOCS/doc \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd libxslt-1.1.28 + make install +} + +LICENSE="MIT" +COPYRIGHT="2001-2002 Daniel Veillard. All Rights Reserved." diff --git a/dev-libs/libzip/libzip-0.10.1.bep b/dev-libs/libzip/libzip-0.10.1.bep new file mode 100644 index 000000000..f7500da45 --- /dev/null +++ b/dev-libs/libzip/libzip-0.10.1.bep @@ -0,0 +1,22 @@ +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="" +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 +} + +INSTALL { + cd libzip-0.10.1 + make install +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="1999-2012 Dieter Baron and Thomas Klausner" diff --git a/dev-libs/libzip/libzip-0.10.bep b/dev-libs/libzip/libzip-0.10.bep new file mode 100644 index 000000000..aa1f380ae --- /dev/null +++ b/dev-libs/libzip/libzip-0.10.bep @@ -0,0 +1,22 @@ +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.tar.bz2" +CHECKSUM_MD5="663d79a9d299a61026d1860d52cdf6fc" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libzip-0.10 + 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 +} + +INSTALL { + cd libzip-0.10 + make install +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="1999-2008 Dieter Baron and Thomas Klausner" diff --git a/dev-libs/lzo/lzo-2.06.bep b/dev-libs/lzo/lzo-2.06.bep new file mode 100644 index 000000000..487c7facc --- /dev/null +++ b/dev-libs/lzo/lzo-2.06.bep @@ -0,0 +1,25 @@ +DESCRIPTION="An extremely fast compression and decompression library" +HOMEPAGE="http://www.oberhumer.com/opensource/lzo/" +SRC_URI="http://www.oberhumer.com/opensource/lzo/download/lzo-2.06.tar.gz" +CHECKSUM_MD5="95380bd4081f85ef08c5209f4107e9f8" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd lzo-2.06 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd lzo-2.06 + make install +} + +TEST { + cd lzo-2.06 + make check +} + +LICENSE="GNU GPL v2" +COPYRIGHT="1996-2011 Markus F.X.J Oberhumer" diff --git a/dev-libs/mpc/mpc-1.0.1.bep b/dev-libs/mpc/mpc-1.0.1.bep new file mode 100644 index 000000000..b4dd82b82 --- /dev/null +++ b/dev-libs/mpc/mpc-1.0.1.bep @@ -0,0 +1,31 @@ +DESCRIPTION="library for multiple-precision complex arithmetics with exact rounding" +HOMEPAGE="mpc.multiprecision.org" +SRC_URI="http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/gmp = 5.0.5" +CHECKSUM_SHA1="8c7e19ad0dd9b3b5cc652273403423d6cf0c5edf" +BUILD { + cd mpc-1.0.1 +# libtoolize --force --copy --install +# aclocal -I m4 +# automake --add-missing +# autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ + --with-gmp=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd mpc-1.0.1 + make install +} + +TEST { + cd mpc-1.0.1 + make check +} + +LICENSE="GNU LGPL v3" +#COPYRIGHT="" diff --git a/dev-libs/mpfr/mpfr-3.1.1.bep b/dev-libs/mpfr/mpfr-3.1.1.bep new file mode 100644 index 000000000..791db9071 --- /dev/null +++ b/dev-libs/mpfr/mpfr-3.1.1.bep @@ -0,0 +1,31 @@ +DESCRIPTION="library for multiple-precision floating-point computations with exact rounding" +HOMEPAGE="www.mpfr.org" +SRC_URI="http://www.mpfr.org/mpfr-current/mpfr-3.1.1.tar.xz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/gmp = 5.0.5" +CHECKSUM_MD5="91d51c41fcf2799e4ee7a7126fc95c17" +BUILD { + cd mpfr-3.1.1 +# libtoolize --force --copy --install +# aclocal -I m4 +# automake --add-missing +# autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ + --with-gmp=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd mpfr-3.1.1 + make install +} + +TEST { + cd mpfr-3.1.1 + make check +} + +LICENSE="GNU LGPL v3" +#COPYRIGHT="" diff --git a/dev-libs/oniguruma/oniguruma-5.9.2.bep b/dev-libs/oniguruma/oniguruma-5.9.2.bep new file mode 100644 index 000000000..d55211dcc --- /dev/null +++ b/dev-libs/oniguruma/oniguruma-5.9.2.bep @@ -0,0 +1,28 @@ +DESCRIPTION="a regular expression library for different character encodings" +HOMEPAGE="http://www.geocities.jp/kosako3/oniguruma/" +SRC_URI="http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.2.tar.gz" +CHECKSUM_MD5="0f4ad1b100a5f9a91623e04111707b84" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd onig-5.9.2 + libtoolize --force --copy --install + touch NEWS ChangeLog + autoreconf -i + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd onig-5.9.2 + make install +} + +TEST { + cd onig-5.9.2 + make check +} + +LICENSE="BSD (2-clause)" +COPYRIGHT="K.Kosako" diff --git a/dev-libs/oniguruma/patches/oniguruma-5.9.2.patch b/dev-libs/oniguruma/patches/oniguruma-5.9.2.patch new file mode 100644 index 000000000..95a95e23f --- /dev/null +++ b/dev-libs/oniguruma/patches/oniguruma-5.9.2.patch @@ -0,0 +1,11 @@ +diff -Naur onig-5.9.2/configure.in onig-5.9.2-haiku/configure.in +--- onig-5.9.2/configure.in 2010-01-05 22:48:47.002097152 +0900 ++++ onig-5.9.2-haiku/configure.in 2011-05-06 23:43:40.378535936 +0900 +@@ -38,6 +38,7 @@ + + dnl Checks for programs. + AC_PROG_CC ++AM_PROG_CC_C_O + AM_PROG_LIBTOOL + LTVERSION="2:0:0" + AC_SUBST(LTVERSION) diff --git a/dev-libs/openssl/openssl-0.9.8l.bep b/dev-libs/openssl/openssl-0.9.8l.bep index 57fc1b13a..1e9cdad01 100644 --- a/dev-libs/openssl/openssl-0.9.8l.bep +++ b/dev-libs/openssl/openssl-0.9.8l.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd openssl-0.9.8l - config --prefix=/boot/common zlib shared + config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared make } diff --git a/dev-libs/openssl/openssl-0.9.8m.bep b/dev-libs/openssl/openssl-0.9.8m.bep index b13a14a49..1048d6344 100644 --- a/dev-libs/openssl/openssl-0.9.8m.bep +++ b/dev-libs/openssl/openssl-0.9.8m.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="sys-libs/zlib >= 1.2.3" BUILD { cd openssl-0.9.8m - config --prefix=/boot/common zlib shared + config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared make } diff --git a/dev-libs/openssl/openssl-1.0.0.bep b/dev-libs/openssl/openssl-1.0.0.bep index d99268620..79c4511c3 100644 --- a/dev-libs/openssl/openssl-1.0.0.bep +++ b/dev-libs/openssl/openssl-1.0.0.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="sys-libs/zlib >= 1.2.3" BUILD { cd openssl-1.0.0 - config --prefix=/boot/common zlib shared + config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared make } diff --git a/dev-libs/openssl/openssl-1.0.0a.bep b/dev-libs/openssl/openssl-1.0.0a.bep index 831cba260..a0cd88932 100644 --- a/dev-libs/openssl/openssl-1.0.0a.bep +++ b/dev-libs/openssl/openssl-1.0.0a.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="sys-libs/zlib >= 1.2.3" BUILD { cd openssl-1.0.0a - config --prefix=/boot/common zlib shared + config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared make } diff --git a/dev-libs/openssl/openssl-1.0.0c.bep b/dev-libs/openssl/openssl-1.0.0c.bep index 62f55d87c..81b78579e 100644 --- a/dev-libs/openssl/openssl-1.0.0c.bep +++ b/dev-libs/openssl/openssl-1.0.0c.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="sys-libs/zlib >= 1.2.3" BUILD { cd openssl-1.0.0c - config --prefix=/boot/common zlib shared + config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared make } diff --git a/dev-libs/openssl/openssl-1.0.0e.bep b/dev-libs/openssl/openssl-1.0.0e.bep new file mode 100644 index 000000000..d84ffb104 --- /dev/null +++ b/dev-libs/openssl/openssl-1.0.0e.bep @@ -0,0 +1,28 @@ +DESCRIPTION="openssl" +HOMEPAGE="http://www.openssl.org/" +SRC_URI="http://www.openssl.org/source/openssl-1.0.0e.tar.gz" +CHECKSUM_MD5="7040b89c4c58c7a1016c0dfa6e821c86" +REVISION="2" +STATUS_HAIKU="stable" +DEPEND="sys-libs/zlib >= 1.2.3" +BUILD { + cd openssl-1.0.0e + sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make* + config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \ + --openssldir=`finddir B_COMMON_DATA_DIRECTORY`/ssl + make +} + +INSTALL { + cd openssl-1.0.0e + make install INSTALL_PREFIX="${DESTDIR}" +} + +TEST { + cd openssl-1.0.0e + make test +} + +LICENSE="OpenSSL" +COPYRIGHT="1995-1998 Eric Young + 1998-2011 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0g.bep b/dev-libs/openssl/openssl-1.0.0g.bep new file mode 100644 index 000000000..5797ec087 --- /dev/null +++ b/dev-libs/openssl/openssl-1.0.0g.bep @@ -0,0 +1,28 @@ +DESCRIPTION="openssl" +HOMEPAGE="http://www.openssl.org/" +SRC_URI="http://www.openssl.org/source/openssl-1.0.0g.tar.gz" +CHECKSUM_MD5="07ecbe4324f140d157478637d6beccf1" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="sys-libs/zlib >= 1.2.3" +BUILD { + cd openssl-1.0.0g + sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make* + config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \ + --openssldir=`finddir B_COMMON_DATA_DIRECTORY`/ssl + make +} + +INSTALL { + cd openssl-1.0.0g + make install INSTALL_PREFIX="${DESTDIR}" +} + +TEST { + cd openssl-1.0.0g + make test +} + +LICENSE="OpenSSL" +COPYRIGHT="1995-1998 Eric Young + 1998-2012 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0j.bep b/dev-libs/openssl/openssl-1.0.0j.bep new file mode 100644 index 000000000..a86acc668 --- /dev/null +++ b/dev-libs/openssl/openssl-1.0.0j.bep @@ -0,0 +1,28 @@ +DESCRIPTION="openssl" +HOMEPAGE="http://www.openssl.org/" +SRC_URI="http://www.openssl.org/source/openssl-1.0.0j.tar.gz" +CHECKSUM_MD5="cbe4ac0d8f598680f68a951e04b0996b" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="sys-libs/zlib >= 1.2.3" +BUILD { + cd openssl-1.0.0j + sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make* + config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \ + --openssldir=`finddir B_COMMON_DATA_DIRECTORY`/ssl + make +} + +INSTALL { + cd openssl-1.0.0j + make install INSTALL_PREFIX="${DESTDIR}" +} + +TEST { + cd openssl-1.0.0j + make test +} + +LICENSE="OpenSSL" +COPYRIGHT="1995-1998 Eric Young + 1998-2012 The OpenSSL Project." diff --git a/dev-libs/openssl/patches/openssl-1.0.0e.patch b/dev-libs/openssl/patches/openssl-1.0.0e.patch new file mode 100644 index 000000000..92bb62dc2 --- /dev/null +++ b/dev-libs/openssl/patches/openssl-1.0.0e.patch @@ -0,0 +1,54 @@ +diff -urN openssl-1.0.0e/Configure openssl-1.0.0e-haiku/Configure +--- openssl-1.0.0e/Configure 2010-11-30 22:19:26.013631488 +0000 ++++ openssl-1.0.0e-haiku/Configure 2010-12-10 09:33:29.000000000 +0000 +@@ -582,6 +582,9 @@ + "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", + "uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", + ++##### Haiku ++"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ + ); + + my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A +diff -urN openssl-1.0.0e/Makefile.shared openssl-1.0.0e-haiku/Makefile.shared +--- openssl-1.0.0e/Makefile.shared 2010-08-21 11:36:49.004456448 +0000 ++++ openssl-1.0.0e-haiku/Makefile.shared 2010-12-10 09:33:29.000000000 +0000 +@@ -594,10 +594,10 @@ + symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos: + + # Compatibility targets +-link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu +-link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu +-link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu +-symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu ++link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu ++link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu ++link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu ++symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu + link_o.bsd-shared: link_o.bsd + link_a.bsd-shared: link_a.bsd + link_app.bsd-shared: link_app.bsd +diff -urN openssl-1.0.0e/config openssl-1.0.0e-haiku/config +--- openssl-1.0.0e/config 2010-03-09 17:08:39.013369344 +0000 ++++ openssl-1.0.0e-haiku/config 2010-12-10 09:33:29.000000000 +0000 +@@ -134,6 +134,10 @@ + echo "${MACHINE}-dg-dgux"; exit 0 + ;; + ++ Haiku:*:BePC) ++ echo "i586-pc-haiku"; exit 0 ++ ;; ++ + HI-UX:*) + echo "${MACHINE}-hi-hiux"; exit 0 + ;; +@@ -799,6 +803,8 @@ + options="$options no-asm" + fi + ;; ++ i586-*-haiku) OUT="haiku-x86" ;; ++ + # these are all covered by the catchall below + # *-dgux) OUT="dgux" ;; + mips-sony-newsos4) OUT="newsos4-gcc" ;; diff --git a/dev-libs/openssl/patches/openssl-1.0.0g.patch b/dev-libs/openssl/patches/openssl-1.0.0g.patch new file mode 100644 index 000000000..a66237b5c --- /dev/null +++ b/dev-libs/openssl/patches/openssl-1.0.0g.patch @@ -0,0 +1,54 @@ +diff -urN openssl-1.0.0g/Configure openssl-1.0.0g-haiku/Configure +--- openssl-1.0.0g/Configure 2010-11-30 22:19:26.013631488 +0000 ++++ openssl-1.0.0g-haiku/Configure 2010-12-10 09:33:29.000000000 +0000 +@@ -582,6 +582,9 @@ + "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", + "uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", + ++##### Haiku ++"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ + ); + + my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A +diff -urN openssl-1.0.0g/Makefile.shared openssl-1.0.0g-haiku/Makefile.shared +--- openssl-1.0.0g/Makefile.shared 2010-08-21 11:36:49.004456448 +0000 ++++ openssl-1.0.0g-haiku/Makefile.shared 2010-12-10 09:33:29.000000000 +0000 +@@ -594,10 +594,10 @@ + symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos: + + # Compatibility targets +-link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu +-link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu +-link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu +-symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu ++link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu ++link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu ++link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu ++symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu + link_o.bsd-shared: link_o.bsd + link_a.bsd-shared: link_a.bsd + link_app.bsd-shared: link_app.bsd +diff -urN openssl-1.0.0g/config openssl-1.0.0g-haiku/config +--- openssl-1.0.0g/config 2010-03-09 17:08:39.013369344 +0000 ++++ openssl-1.0.0g-haiku/config 2010-12-10 09:33:29.000000000 +0000 +@@ -134,6 +134,10 @@ + echo "${MACHINE}-dg-dgux"; exit 0 + ;; + ++ Haiku:*:BePC) ++ echo "i586-pc-haiku"; exit 0 ++ ;; ++ + HI-UX:*) + echo "${MACHINE}-hi-hiux"; exit 0 + ;; +@@ -799,6 +803,8 @@ + options="$options no-asm" + fi + ;; ++ i586-*-haiku) OUT="haiku-x86" ;; ++ + # these are all covered by the catchall below + # *-dgux) OUT="dgux" ;; + mips-sony-newsos4) OUT="newsos4-gcc" ;; diff --git a/dev-libs/openssl/patches/openssl-1.0.0j.patch b/dev-libs/openssl/patches/openssl-1.0.0j.patch new file mode 100644 index 000000000..7caa8475d --- /dev/null +++ b/dev-libs/openssl/patches/openssl-1.0.0j.patch @@ -0,0 +1,60 @@ +diff -urN openssl-1.0.0j.orig/Configure openssl-1.0.0j/Configure +--- openssl-1.0.0j.orig/Configure 2012-12-18 13:32:35.000000000 +0000 ++++ openssl-1.0.0j/Configure 2012-12-18 13:41:28.000000000 +0000 +@@ -582,6 +582,10 @@ + "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", + "uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", + ++##### Haiku ++"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"haiku-x86_64", "gcc:-m64 -DL_ENDIAN -O2 -Wall -DMD32_REG_T=int::-D_REENTRANT::-lnetwork:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:haiku-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", ++ + ); + + my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A +diff -urN openssl-1.0.0j.orig/Makefile.shared openssl-1.0.0j/Makefile.shared +--- openssl-1.0.0j.orig/Makefile.shared 2012-12-18 13:32:35.000000000 +0000 ++++ openssl-1.0.0j/Makefile.shared 2012-12-18 13:33:02.000000000 +0000 +@@ -594,10 +594,10 @@ + symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos: + + # Compatibility targets +-link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu +-link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu +-link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu +-symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu ++link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu ++link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu ++link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu ++symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu + link_o.bsd-shared: link_o.bsd + link_a.bsd-shared: link_a.bsd + link_app.bsd-shared: link_app.bsd +diff -urN openssl-1.0.0j.orig/config openssl-1.0.0j/config +--- openssl-1.0.0j.orig/config 2012-12-18 13:32:35.000000000 +0000 ++++ openssl-1.0.0j/config 2012-12-18 13:36:39.000000000 +0000 +@@ -134,6 +134,14 @@ + echo "${MACHINE}-dg-dgux"; exit 0 + ;; + ++ Haiku:*:BePC) ++ echo "i586-pc-haiku"; exit 0 ++ ;; ++ ++ Haiku:*:*) ++ echo "${MACHINE}-unknown-haiku"; exit 0 ++ ;; ++ + HI-UX:*) + echo "${MACHINE}-hi-hiux"; exit 0 + ;; +@@ -799,6 +807,9 @@ + options="$options no-asm" + fi + ;; ++ i586-*-haiku) OUT="haiku-x86" ;; ++ x86_64-*-haiku) OUT="haiku-x86_64" ;; ++ + # these are all covered by the catchall below + # *-dgux) OUT="dgux" ;; + mips-sony-newsos4) OUT="newsos4-gcc" ;; diff --git a/dev-libs/popt/popt-1.16.bep b/dev-libs/popt/popt-1.16.bep index 8847c296d..1ff0dc764 100644 --- a/dev-libs/popt/popt-1.16.bep +++ b/dev-libs/popt/popt-1.16.bep @@ -12,7 +12,7 @@ BUILD { aclocal -I m4 autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-libs/protobuf/patches/protobuf-2.4.1.patch b/dev-libs/protobuf/patches/protobuf-2.4.1.patch new file mode 100644 index 000000000..3a972a8d1 --- /dev/null +++ b/dev-libs/protobuf/patches/protobuf-2.4.1.patch @@ -0,0 +1,30 @@ +diff -urN protobuf-2.4.1/gtest/include/gtest/internal/gtest-port.h protobuf-2.4.1-haiku/gtest/include/gtest/internal/gtest-port.h +--- protobuf-2.4.1/gtest/include/gtest/internal/gtest-port.h 2011-04-30 17:22:13.002359296 +0000 ++++ protobuf-2.4.1-haiku/gtest/include/gtest/internal/gtest-port.h 2012-12-31 00:03:23.593756160 +0000 +@@ -198,6 +198,8 @@ + #define GTEST_OS_MAC 1 + #elif defined __linux__ + #define GTEST_OS_LINUX 1 ++#elif defined __HAIKU__ ++#define GTEST_OS_HAIKU 1 + #elif defined __MVS__ + #define GTEST_OS_ZOS 1 + #elif defined(__sun) && defined(__SVR4) +@@ -205,7 +207,7 @@ + #endif // __CYGWIN__ + + #if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_SYMBIAN || \ +- GTEST_OS_SOLARIS ++ GTEST_OS_SOLARIS || GTEST_OS_HAIKU + + // On some platforms, needs someone to define size_t, and + // won't compile otherwise. We can #include it here as we already +@@ -236,7 +238,7 @@ + #define GTEST_USES_SIMPLE_RE 1 + + #endif // GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC || +- // GTEST_OS_SYMBIAN || GTEST_OS_SOLARIS ++ // GTEST_OS_SYMBIAN || GTEST_OS_SOLARIS || GTEST_OS_HAIKU + + // Defines GTEST_HAS_EXCEPTIONS to 1 if exceptions are enabled, or 0 + // otherwise. \ No newline at end of file diff --git a/dev-libs/protobuf/protobuf-2.4.1.bep b/dev-libs/protobuf/protobuf-2.4.1.bep new file mode 100644 index 000000000..c71c5f1cf --- /dev/null +++ b/dev-libs/protobuf/protobuf-2.4.1.bep @@ -0,0 +1,28 @@ +DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" +HOMEPAGE="http://code.google.com/p/protobuf/" +SRC_URI="http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.bz2" +CHECKSUM_MD5="ed436802019c9e1f40cc750eaf78f318" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + cd protobuf-2.4.1 + libtoolize --force --copy --install + ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd protobuf-2.4.1 + make install +} + +TEST { + cd protobuf-2.4.1 + make check +} + +LICENSE="Apache v2" +COPYRIGHT="2008 Google" diff --git a/dev-libs/raptor2/raptor2-2.0.8.bep b/dev-libs/raptor2/raptor2-2.0.8.bep new file mode 100644 index 000000000..72941880d --- /dev/null +++ b/dev-libs/raptor2/raptor2-2.0.8.bep @@ -0,0 +1,30 @@ +DESCRIPTION="RDF Syntax Library" +HOMEPAGE="http://librdf.org/" +SRC_URI="http://download.librdf.org/source/raptor2-2.0.8.tar.gz" +CHECKSUM_MD5="ac60858b875aab8fa7917f21a1237aa9" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="dev-util/gtk-doc>=1.3" +BUILD { + cd raptor2-2.0.8 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ + --datadir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\ + /doc/raptor2 + make +} + +INSTALL { + cd raptor2-2.0.8 + make install +} + +TEST { + cd raptor2-2.0.8 + make check +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2000-2012 David Beckett + 2000-2005 University of Bristol" diff --git a/dev-libs/rasqal/patches/rasqal-0.9.29.patch b/dev-libs/rasqal/patches/rasqal-0.9.29.patch new file mode 100644 index 000000000..1c6cd9bb9 --- /dev/null +++ b/dev-libs/rasqal/patches/rasqal-0.9.29.patch @@ -0,0 +1,11 @@ +diff -Naur rasqal-0.9.29/src/rasqal_expr_numerics.c rasqal-0.9.29-haiku/src/rasqal_expr_numerics.c +--- rasqal-0.9.29/src/rasqal_expr_numerics.c 2012-05-14 02:37:45.000000000 +0000 ++++ rasqal-0.9.29-haiku/src/rasqal_expr_numerics.c 2012-12-11 15:24:37.000000000 +0000 +@@ -36,6 +36,7 @@ + #include + #endif + #include ++#include + + #include "rasqal.h" + #include "rasqal_internal.h" diff --git a/dev-libs/rasqal/rasqal-0.9.29.bep b/dev-libs/rasqal/rasqal-0.9.29.bep new file mode 100644 index 000000000..f8d4a3d38 --- /dev/null +++ b/dev-libs/rasqal/rasqal-0.9.29.bep @@ -0,0 +1,30 @@ +DESCRIPTION="RDF Query Library" +HOMEPAGE="http://librdf.org/" +SRC_URI="http://download.librdf.org/source/rasqal-0.9.29.tar.gz" +CHECKSUM_MD5="49e4b75a0c67465edf55dd20606715fa" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="dev-libs/raptor2>=2.0.8" +BUILD { + cd rasqal-0.9.29 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ + --datadir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\ + /doc/rasqal + make +} + +INSTALL { + cd rasqal-0.9.29 + make install +} + +TEST { + cd rasqal-0.9.29 + make check +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2000-2012 David Beckett + 2000-2005 University of Bristol" diff --git a/dev-libs/redland/redland-1.0.15.bep b/dev-libs/redland/redland-1.0.15.bep new file mode 100644 index 000000000..8aa04a56b --- /dev/null +++ b/dev-libs/redland/redland-1.0.15.bep @@ -0,0 +1,29 @@ +DESCRIPTION="librdf RDF API Library" +HOMEPAGE="http://librdf.org/" +SRC_URI="http://download.librdf.org/source/redland-1.0.15.tar.gz" +CHECKSUM_MD5="b0deb87f3c7d3237a3d587c1e0f2f266" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="rasqal>=0.9.29" +BUILD { + cd redland-1.0.15 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ + --datadir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\ + /doc/redland + make +} + +INSTALL { + cd redland-1.0.15 + make install +} + +TEST { + cd redland-1.0.15 + make check +} +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2000-2011 Dave Beckett + 2000-2005 University of Bristol" diff --git a/dev-libs/serd/patches/serd-0.18.0.patch b/dev-libs/serd/patches/serd-0.18.0.patch new file mode 100644 index 000000000..aa4714252 --- /dev/null +++ b/dev-libs/serd/patches/serd-0.18.0.patch @@ -0,0 +1,25 @@ +--- serd-0.18.0/wscript 2012-08-23 04:13:45.002359296 +0000 ++++ serd-0.18.0-haiku/wscript 2012-12-12 15:55:31.292290560 +0000 +@@ -3,6 +3,7 @@ + import os + import shutil + import subprocess ++import sys + + from waflib.extras import autowaf as autowaf + import waflib.Logs as Logs, waflib.Options as Options +@@ -131,7 +132,12 @@ + {'SERD_MAJOR_VERSION' : SERD_MAJOR_VERSION}) + + libflags = ['-fvisibility=hidden'] +- libs = ['m'] ++ ++ ++ if sys.platform.startswith('haiku'): ++ libs = [] ++ else: ++ libs = ['m'] + defines = [] + if bld.env.MSVC_COMPILER: + libflags = [] + diff --git a/dev-libs/serd/serd-0.18.0.bep b/dev-libs/serd/serd-0.18.0.bep new file mode 100644 index 000000000..7ae46de27 --- /dev/null +++ b/dev-libs/serd/serd-0.18.0.bep @@ -0,0 +1,24 @@ +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" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="96dbade2c81d6df8100a9ef605ce35f8" + +BUILD { + cd serd-0.18.0 + sed -i "s_#!/usr/bin/env python_#!/boot/common/bin/python_g" waf + sed -i "s_#!/usr/bin/env python_#!/boot/common/bin/python_g" wscript + ./waf configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + ./waf +} + +INSTALL { + cd serd-0.18.0 + ./waf install +} + +COPYRIGHT="2011-2012 David Robillard" +LICENSE="MIT" diff --git a/dev-libs/tinyxml/tinyxml-2.6.2.bep b/dev-libs/tinyxml/tinyxml-2.6.2.bep new file mode 100644 index 000000000..76ea6f7f2 --- /dev/null +++ b/dev-libs/tinyxml/tinyxml-2.6.2.bep @@ -0,0 +1,27 @@ +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" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="" + +BUILD { + cd tinyxml + rm xmltest.cpp + wget http://libtinyxml.googlecode.com/svn/trunk/CMakeLists.txt + cmake ./ + make +} + +INSTALL { + cd tinyxml + make install + mkdir -p ${DESTDIR}`finddir B_COMMON_DEVELOP_DIRECTORY`/tinyxml + cp ./*.cpp ${DESTDIR}`finddir B_COMMON_DEVELOP_DIRECTORY`/tinyxml + mkdir -p ${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/tinyxml + cp ./docs/* ${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/tinyxml +} + +LICENSE="Zlib" +COPYRIGHT="2001-2010 Lee Thomason" diff --git a/dev-libs/uriparser/uriparser-0.7.5.bep b/dev-libs/uriparser/uriparser-0.7.5.bep index aa5ff4692..c808642ab 100644 --- a/dev-libs/uriparser/uriparser-0.7.5.bep +++ b/dev-libs/uriparser/uriparser-0.7.5.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common -disable-test --disable-doc + ./configure --prefix=`finddir B_COMMON_DIRECTORY` -disable-test --disable-doc make } diff --git a/dev-libs/zziplib/zziplib-0.13.59.bep b/dev-libs/zziplib/zziplib-0.13.59.bep index 1b896a8eb..7812f068d 100644 --- a/dev-libs/zziplib/zziplib-0.13.59.bep +++ b/dev-libs/zziplib/zziplib-0.13.59.bep @@ -4,11 +4,16 @@ SRC_URI="http://sourceforge.net/projects/zziplib/files/zziplib13/0.13.59/zziplib REVISION="1" STATUS_HAIKU="stable" DEPEND="" +CHECKSUM_MD5="14b5a6fc229afe9916d48358479568d3" BUILD { cd zziplib-0.13.59 + sed -i 's/\--export-dynamic/\-export-dynamic/' configure.ac libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } diff --git a/dev-lua/luarocks/luarocks-2.0.4.1.bep b/dev-lua/luarocks/luarocks-2.0.4.1.bep new file mode 100644 index 000000000..35715858a --- /dev/null +++ b/dev-lua/luarocks/luarocks-2.0.4.1.bep @@ -0,0 +1,20 @@ +DESCRIPTION="LuaRocks is a deployment and management system for Lua modules." +HOMEPAGE="http://luarocks.org" +SRC_URI="http://luarocks.org/releases/luarocks-2.0.4.1.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-lang/lua >= 5.1" +CHECKSUM_MD5="2c7caccce3cdf236e6f9aca7bec9bdea" +BUILD { + cd luarocks-2.0.4.1 + configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd luarocks-2.0.4.1 + make install DESTDIR=${DESTDIR} +} + +LICENSE="MIT" +COPYRIGHT="2007-2010 Kepler Project" diff --git a/dev-python/cnf/cnf-1.0-git.bep b/dev-python/cnf/cnf-1.0-git.bep new file mode 100644 index 000000000..85971864e --- /dev/null +++ b/dev-python/cnf/cnf-1.0-git.bep @@ -0,0 +1,18 @@ +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" +STATUS_HAIKU="stable" +DEPEND="dev-lang/python >= 2.6.4" + +BUILD { + echo "No build step" +} + +INSTALL { + cd cnf-1.0-git + python install_cnf.py +} +LICENSE="GNU GPL v3" +COPYRIGHT="2011 Jack Laxson" + diff --git a/dev-python/pylzma/pylzma-0.4.4.bep b/dev-python/pylzma/pylzma-0.4.4.bep new file mode 100644 index 000000000..72da8b4ea --- /dev/null +++ b/dev-python/pylzma/pylzma-0.4.4.bep @@ -0,0 +1,21 @@ +DESCRIPTION="Python bindings for the LZMA library by Igor Pavlov." +HOMEPAGE="http://www.joachim-bauch.de/projects/pylzma/" +SRC_URI="http://pypi.python.org/packages/source/p/pylzma/pylzma-0.4.4.tar.gz" +STATUS_HAIKU="untested" +DEPEND="dev-lang/python >= 2.6.4 + dev-python/setuptools >= 0.6" +REVISION="1" +CHECKSUM_MD5="a2be89cb2288174ebb18bec68fa559fb" + +BUILD { + cd pylzma-0.4.4 + python setup.py build +} + +INSTALL { + cd pylzma-0.4.4 + python setup.py install +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2004-2010 Joachim Bauch" diff --git a/dev-python/pyxml/licenses/PyXML b/dev-python/pyxml/licenses/PyXML new file mode 100644 index 000000000..9d0a1af49 --- /dev/null +++ b/dev-python/pyxml/licenses/PyXML @@ -0,0 +1,341 @@ +This file collects the licences for the various pieces of software +included in this package, sorted by the package name in alphabetical +order. Minor items (typically single-file contributions) appear at the end. + +4DOM: + +Copyright (c) 2000 Fourthought Inc, USA + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of FourThought LLC not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +FOURTHOUGHT LLC DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, +IN NO EVENT SHALL FOURTHOUGHT BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF +USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE +USE OR PERFORMANCE OF THIS SOFTWARE. + + +PyExpat, SAX libraries: +-------------------------------------------------------------------- +BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 +----------------------------------------------------- + +1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an +office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the +Individual or Organization ("Licensee") accessing and otherwise using +this software in source or binary form and its associated +documentation ("the Software"). + +2. Subject to the terms and conditions of this BeOpen Python License +Agreement, BeOpen hereby grants Licensee a non-exclusive, +royalty-free, world-wide license to reproduce, analyze, test, perform +and/or display publicly, prepare derivative works, distribute, and +otherwise use the Software alone or in any derivative version, +provided, however, that the BeOpen Python License is retained in the +Software, alone or in any derivative version prepared by Licensee. + +3. BeOpen is making the Software available to Licensee on an "AS IS" +basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE +SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS +AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY +DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +5. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +6. This License Agreement shall be governed by and interpreted in all +respects by the law of the State of California, excluding conflict of +law provisions. Nothing in this License Agreement shall be deemed to +create any relationship of agency, partnership, or joint venture +between BeOpen and Licensee. This License Agreement does not grant +permission to use BeOpen trademarks or trade names in a trademark +sense to endorse or promote products or services of Licensee, or any +third party. As an exception, the "BeOpen Python" logos available at +http://www.pythonlabs.com/logos.html may be used according to the +permissions granted on that web page. + +7. By copying, installing or otherwise using the software, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +CNRI OPEN SOURCE LICENSE AGREEMENT +---------------------------------- + +Python 1.6 CNRI OPEN SOURCE LICENSE AGREEMENT + +IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY. BY CLICKING +ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING, INSTALLING OR +OTHERWISE USING PYTHON 1.6 SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO +THE TERMS AND CONDITIONS OF THIS LICENSE AGREEMENT. + +1. This LICENSE AGREEMENT is between the Corporation for National +Research Initiatives, having an office at 1895 Preston White Drive, +Reston, VA 20191 ("CNRI"), and the Individual or Organization +("Licensee") accessing and otherwise using Python 1.6 software in +source or binary form and its associated documentation, as released at +the www.python.org Internet site on September 5, 2000 ("Python 1.6"). + +2. Subject to the terms and conditions of this License Agreement, CNRI +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python 1.6 +alone or in any derivative version, provided, however, that CNRI's +License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) +1995-2000 Corporation for National Research Initiatives; All Rights +Reserved" are retained in Python 1.6 alone or in any derivative +version prepared by + +Licensee. Alternately, in lieu of CNRI's License Agreement, Licensee +may substitute the following text (omitting the quotes): "Python 1.6 +is made available subject to the terms and conditions in CNRI's +License Agreement. This Agreement together with Python 1.6 may be +located on the Internet using the following unique, persistent +identifier (known as a handle): 1895.22/1012. This Agreement may also +be obtained from a proxy server on the Internet using the following +URL: http://hdl.handle.net/1895.22/1012". + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python 1.6 or any part thereof, and wants to make the +derivative work available to others as provided herein, then Licensee +hereby agrees to include in any such work a brief summary of the +changes made to Python 1.6. + +4. CNRI is making Python 1.6 available to Licensee on an "AS IS" +basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6 WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +1.6 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A +RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6, OR +ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. This License Agreement shall be governed by and interpreted in all +respects by the law of the State of Virginia, excluding conflict of +law provisions. Nothing in this License Agreement shall be deemed to +create any relationship of agency, partnership, or joint venture +between CNRI and Licensee. This License Agreement does not grant +permission to use CNRI trademarks or trade name in a trademark sense +to endorse or promote products or services of Licensee, or any third +party. + +8. By clicking on the "ACCEPT" button where indicated, or by copying, +installing or otherwise using Python 1.6, Licensee agrees to be bound +by the terms and conditions of this License Agreement. + +ACCEPT + + +CWI PERMISSIONS STATEMENT AND DISCLAIMER +---------------------------------------- + +Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, +The Netherlands. All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Stichting Mathematisch +Centrum or CWI not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. + +STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +-------------------------------------------------------------------- + +qp_xml: +-------------------------------------------------------------------- +Written by Greg Stein. Public Domain. +No Copyright, no Rights Reserved, and no Warranties. +-------------------------------------------------------------------- + +sgmlop.c: +-------------------------------------------------------------------- +Copyright (c) 1998 by Secret Labs AB. + +Permission to use, copy, modify, and distribute this software and +its associated documentation for any purpose and without fee is +hereby granted. This software is provided as is. +-------------------------------------------------------------------- + +xmlproc: + +xmlproc is free and you can do as you like with it. If you change it, +please let the author, Lars Marius Garshol, know about it. + +-------------------------------------------------------------------- + +setupext/install_data.py: + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-------------------------------------------------------------------- + +schema/trex.py + +Copyright (c) 2001, James Tauber +All rights reserved. + +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. +* The name "James Tauber" may not 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 +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. + +test/domapi/ (and test/test_pyxmldom.py) + +-------------------------------------------------------------------- + +Zope Public License (ZPL) Version 1.0 +------------------------------------- + +Copyright (c) Digital Creations. All rights reserved. + +This license has been certified as Open Source(tm). + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions in 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. Digital Creations requests that attribution be given to Zope + in any manner possible. Zope includes a "Powered by Zope" + button that is installed by default. While it is not a license + violation to remove this button, it is requested that the + attribution remain. A significant investment has been put + into Zope, and this effort will continue if the Zope community + continues to grow. This is one way to assure that growth. + +4. All advertising materials and documentation mentioning + features derived from or use of this software must display + the following acknowledgement: + + "This product includes software developed by Digital Creations + for use in the Z Object Publishing Environment + (http://www.zope.org/)." + + In the event that the product being advertised includes an + intact Zope distribution (with copyright and license included) + then this clause is waived. + +5. Names associated with Zope or Digital Creations must not be used to + endorse or promote products derived from this software without + prior written permission from Digital Creations. + +6. Modified redistributions of any form whatsoever must retain + the following acknowledgment: + + "This product includes software developed by Digital Creations + for use in the Z Object Publishing Environment + (http://www.zope.org/)." + + Intact (re-)distributions of any official Zope release do not + require an external acknowledgement. + + 7. Modifications are encouraged but must be packaged separately as + patches to official Zope releases. Distributions that do not + clearly separate the patches from the original work must be clearly + labeled as unofficial distributions. Modifications which do not + carry the name Zope may be packaged in any form, as long as they + conform to all of the clauses above. + + + Disclaimer + + THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY + EXPRESSED 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 DIGITAL CREATIONS OR ITS + 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. + + + This software consists of contributions made by Digital Creations and + many individuals on behalf of Digital Creations. Specific + attributions are listed in the accompanying credits file. + +-------------------------------------------------------------------- + +Others: +xml/dom/ext/c14n.py is distributed under the terms of the Python 2.0 +copyright, or later. diff --git a/dev-python/pyxml/pyxml-0.8.4.bep b/dev-python/pyxml/pyxml-0.8.4.bep new file mode 100644 index 000000000..b833fc30f --- /dev/null +++ b/dev-python/pyxml/pyxml-0.8.4.bep @@ -0,0 +1,18 @@ +DESCRIPTION="Python XML package" +HOMEPAGE="http://pyxml.sourceforge.net/topics/index.html" +SRC_URI="http://sourceforge.net/projects/pyxml/files/latest/download?source=files" +CHECKSUM_MD5="1f7655050cebbb664db976405fdba209" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="dev-lang/python >= 2.6.4" +BUILD { + cd PyXML-0.8.4 + python setup.py build +} + +INSTALL { + cd PyXML-0.8.4 + python setup.py install --root=${DESTDIR} +} +LICENSE="PyXML" +COPYRIGHT="2000 Fourthought Inc, USA" diff --git a/dev-python/rdflib/rdflib-3.2.0.bep b/dev-python/rdflib/rdflib-3.2.0.bep new file mode 100644 index 000000000..60cadd742 --- /dev/null +++ b/dev-python/rdflib/rdflib-3.2.0.bep @@ -0,0 +1,18 @@ +DESCRIPTION="Python library for working with RDF" +HOMEPAGE="https://github.com/RDFLib/rdflib" +SRC_URI="http://rdflib.googlecode.com/files/rdflib-3.2.0.tar.gz" +CHECKSUM_MD5="ab3d3a5f71ebb6fe4fd33539f5d5768e" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="dev-lang/python >= 2.6.4" +BUILD { + cd rdflib-3.2.0 + python setup.py build +} + +INSTALL { + cd rdflib-3.2.0 + python setup.py install --root=${DESTDIR} +} +LICENSE="Public Domain" +COPYRIGHT="2002-2009, Daniel Krech" diff --git a/dev-python/setuptools/setuptools-0.6.bep b/dev-python/setuptools/setuptools-0.6.bep index e3d1d594e..6c6708db4 100644 --- a/dev-python/setuptools/setuptools-0.6.bep +++ b/dev-python/setuptools/setuptools-0.6.bep @@ -13,8 +13,11 @@ BUILD { INSTALL { cd setuptools-0.6c11 - python setup.py install --root=${DESTDIR} - + if [ -n "${DESTDIR}" ];then + python setup.py install --root=${DESTDIR} + else + python setup.py install + fi } LICENSE="Python" diff --git a/dev-qt/qtcore/patches/qt-4.7.3.patch b/dev-qt/qtcore/patches/qt-4.7.3.patch new file mode 100644 index 000000000..74615b5ac --- /dev/null +++ b/dev-qt/qtcore/patches/qt-4.7.3.patch @@ -0,0 +1,14261 @@ +diff -rupN qt-everywhere-opensource-src-4.7.3/configure qt-everywhere-opensource-src-4.7.3_haiku/configure +--- qt-everywhere-opensource-src-4.7.3/configure 2011-03-30 05:16:21.000262144 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/configure 2011-06-13 22:33:04.768868352 +0000 +@@ -187,6 +187,11 @@ fi + PLATFORM_X11=no + PLATFORM_MAC=no + PLATFORM_QWS=no ++PLATFORM_HAIKU=no ++ ++if [ $UNAME_SYSTEM = "Haiku" ]; then ++ PLATFORM_HAIKU=yes ++fi + + if [ -f "$relpath"/src/gui/kernel/qapplication_mac.mm ] && [ -d /System/Library/Frameworks/Carbon.framework ]; then + # Qt/Mac +@@ -2742,6 +2747,9 @@ if [ -z "$PLATFORM" ]; then + QNX:*) + PLATFORM=unsupported/qnx-g++ + ;; ++ Haiku:*) ++ PLATFORM=haiku-g++ ++ ;; + *) + if [ "$OPT_HELP" != "yes" ]; then + echo +@@ -3005,6 +3013,9 @@ if [ -z "${CFG_HOST_ARCH}" ]; then + ;; + esac + ;; ++ Haiku:*:*) ++ CFG_HOST_ARCH=i386 ++ ;; + *:*:*) + if [ "$OPT_VERBOSE" = "yes" ]; then + echo " Trying '$UNAME_MACHINE'..." +@@ -3172,7 +3183,7 @@ QMAKE_CONF_COMPILER=`getQMakeConf "$XQMA + TEST_COMPILER="$CXX" + + [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER +-if [ "$XPLATFORM" != "symbian-sbsv2" ]; then ++if [ "$XPLATFORM" != "symbian-sbsv2" ] && [ "$PLATFORM_HAIKU" = "no" ]; then + #for Symbian we don't need this checking + if [ -z "$TEST_COMPILER" ]; then + echo "ERROR: Cannot set the compiler for the configuration tests" +@@ -3342,6 +3353,8 @@ if [ -z "$QT_INSTALL_PREFIX" ]; then + elif [ -d "$EPOCROOT" ] && echo $XPLATFORM | grep symbian > /dev/null; then + QT_INSTALL_PREFIX="$EPOCROOT/epoc32/" + QT_INSTALL_LIBS="$EPOCROOT/epoc32/release/armv5/lib/" ++ elif [ "$PLATFORM_HAIKU" = "yes" ]; then ++ QT_INSTALL_PREFIX="/boot/common" + else + QT_INSTALL_PREFIX="/usr/local/Trolltech/Qt-${QT_VERSION}" # the default install prefix is /usr/local/Trolltech/Qt-$QT_VERSION + fi +@@ -3367,6 +3380,8 @@ else + if [ "$CFG_PREFIX_INSTALL" = "no" ]; then + if [ "$PLATFORM_MAC" = "yes" ]; then + QT_INSTALL_DOCS="/Developer/Documentation/Qt" ++ elif [ "$PLATFORM_HAIKU" = "yes" ]; then ++ QT_INSTALL_DOCS="/boot/common/documentation/doc/Qt" + fi + fi + [ -z "$QT_INSTALL_DOCS" ] && QT_INSTALL_DOCS="$QT_INSTALL_PREFIX/doc" #fallback +@@ -3395,6 +3410,12 @@ else + if [ "$CFG_FRAMEWORK" = "yes" ]; then + QT_INSTALL_LIBS="/Libraries/Frameworks" + fi ++ elif [ "$PLATFORM_HAIKU" = "yes" ]; then ++ if [ -f /boot/system/lib/libsupc++.so ] ; then ++ QT_INSTALL_LIBS="/boot/common/lib" ++ else ++ QT_INSTALL_LIBS="/boot/common/lib/gcc4" ++ fi + fi + fi + [ -z "$QT_INSTALL_LIBS" ] && QT_INSTALL_LIBS="$QT_INSTALL_PREFIX/lib" #fallback +@@ -3418,6 +3439,8 @@ else + if [ "$CFG_PREFIX_INSTALL" = "no" ]; then + if [ "$PLATFORM_MAC" = "yes" ]; then + QT_INSTALL_PLUGINS="/Developer/Applications/Qt/plugins" ++ elif [ "$PLATFORM_HAIKU" = "yes" ]; then ++ QT_INSTALL_PLUGINS="/boot/common/add-ons/Qt/plugins" + fi + fi + [ -z "$QT_INSTALL_PLUGINS" ] && QT_INSTALL_PLUGINS="$QT_INSTALL_PREFIX/plugins" #fallback +@@ -3429,6 +3452,8 @@ else + if [ "$CFG_PREFIX_INSTALL" = "no" ]; then + if [ "$PLATFORM_MAC" = "yes" ]; then + QT_INSTALL_IMPORTS="/Developer/Applications/Qt/imports" ++ elif [ "$PLATFORM_HAIKU" = "yes" ]; then ++ QT_INSTALL_IMPORTS="/boot/common/add-ons/Qt/imports" + fi + fi + [ -z "$QT_INSTALL_IMPORTS" ] && QT_INSTALL_IMPORTS="$QT_INSTALL_PREFIX/imports" #fallback +@@ -3437,13 +3462,21 @@ else + + #data + if [ -z "$QT_INSTALL_DATA" ]; then #default +- QT_INSTALL_DATA="$QT_INSTALL_PREFIX" ++ if [ "$PLATFORM_HAIKU" = "yes" ] && [ "$CFG_PREFIX_INSTALL" = "no" ]; then ++ QT_INSTALL_DATA="/boot/common/data/Qt" ++ else ++ QT_INSTALL_DATA="$QT_INSTALL_PREFIX" ++ fi + fi + QT_INSTALL_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DATA"` + + #translations + if [ -z "$QT_INSTALL_TRANSLATIONS" ]; then #default +- QT_INSTALL_TRANSLATIONS="$QT_INSTALL_PREFIX/translations" ++ if [ "$PLATFORM_HAIKU" = "yes" ] && [ "$CFG_PREFIX_INSTALL" = "no" ]; then ++ QT_INSTALL_TRANSLATIONS="/boot/common/data/Qt/translations" ++ else ++ QT_INSTALL_TRANSLATIONS="$QT_INSTALL_PREFIX/translations" ++ fi + fi + QT_INSTALL_TRANSLATIONS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_TRANSLATIONS"` + +@@ -3451,6 +3484,8 @@ else + if [ -z "$QT_INSTALL_SETTINGS" ]; then #default + if [ "$PLATFORM_MAC" = "yes" ]; then + QT_INSTALL_SETTINGS=/Library/Preferences/Qt ++ elif [ "$PLATFORM_HAIKU" = "yes" ] && [ "$CFG_PREFIX_INSTALL" = "no" ]; then ++ QT_INSTALL_SETTINGS="/boot/common/settings/Qt" + else + QT_INSTALL_SETTINGS=/etc/xdg + fi +@@ -3462,6 +3497,8 @@ else + if [ "$CFG_PREFIX_INSTALL" = "no" ]; then + if [ "$PLATFORM_MAC" = "yes" ]; then + QT_INSTALL_EXAMPLES="/Developer/Examples/Qt" ++ elif [ "$PLATFORM_HAIKU" = "yes" ]; then ++ QT_INSTALL_EXAMPLES="/boot/apps/Qt/Examples" + fi + fi + [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES="$QT_INSTALL_PREFIX/examples" #fallback +@@ -3473,6 +3510,8 @@ else + if [ "$CFG_PREFIX_INSTALL" = "no" ]; then + if [ "$PLATFORM_MAC" = "yes" ]; then + QT_INSTALL_DEMOS="/Developer/Examples/Qt/Demos" ++ elif [ "$PLATFORM_HAIKU" = "yes" ]; then ++ QT_INSTALL_DEMOS="/boot/apps/Qt/Demos" + fi + fi + [ -z "$QT_INSTALL_DEMOS" ] && QT_INSTALL_DEMOS="$QT_INSTALL_PREFIX/demos" +@@ -4238,6 +4277,8 @@ elif echo "$XPLATFORM" | grep "symbian" + Platform="Qt for Symbian" + elif [ "$XPLATFORM_MINGW" = "yes" ]; then + Platform="Qt for Windows" ++elif [ "$PLATFORM_HAIKU" = "yes" ]; then ++ Platform="Qt for Haiku" + elif [ '!' -z "`getQMakeConf \"$XQMAKESPEC\" | grep QMAKE_LIBS_X11 | awk '{print $3;}'`" ]; then + PLATFORM_X11=yes + Platform="Qt for Linux/X11" +@@ -5415,7 +5456,7 @@ if [ "$PLATFORM_MAC" = "yes" -a ! -z "$Q + fi + + # X11/QWS +-if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then ++if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_HAIKU" = "yes" ]; then + + # auto-detect Glib support + if [ "$CFG_GLIB" != "no" ]; then +diff -rupN qt-everywhere-opensource-src-4.7.3/include/Qt/qhaikustyle.h qt-everywhere-opensource-src-4.7.3_haiku/include/Qt/qhaikustyle.h +--- qt-everywhere-opensource-src-4.7.3/include/Qt/qhaikustyle.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/Qt/qhaikustyle.h 2011-06-02 22:56:26.000000000 +0000 +@@ -0,0 +1,9 @@ ++#ifndef QT_NO_QT_INCLUDE_WARN ++ #if defined(__GNUC__) ++ #warning "Inclusion of header files from include/Qt is deprecated." ++ #elif defined(_MSC_VER) ++ #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.") ++ #endif ++#endif ++ ++#include "../QtGui/qhaikustyle.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/include/Qt/qsystemtrayicon_haiku.h qt-everywhere-opensource-src-4.7.3_haiku/include/Qt/qsystemtrayicon_haiku.h +--- qt-everywhere-opensource-src-4.7.3/include/Qt/qsystemtrayicon_haiku.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/Qt/qsystemtrayicon_haiku.h 2011-06-02 22:56:26.000000000 +0000 +@@ -0,0 +1,9 @@ ++#ifndef QT_NO_QT_INCLUDE_WARN ++ #if defined(__GNUC__) ++ #warning "Inclusion of header files from include/Qt is deprecated." ++ #elif defined(_MSC_VER) ++ #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.") ++ #endif ++#endif ++ ++#include "../QtGui/qsystemtrayicon_haiku.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/include/Qt/qwidget_haiku.h qt-everywhere-opensource-src-4.7.3_haiku/include/Qt/qwidget_haiku.h +--- qt-everywhere-opensource-src-4.7.3/include/Qt/qwidget_haiku.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/Qt/qwidget_haiku.h 2011-06-02 22:56:25.000000000 +0000 +@@ -0,0 +1,9 @@ ++#ifndef QT_NO_QT_INCLUDE_WARN ++ #if defined(__GNUC__) ++ #warning "Inclusion of header files from include/Qt is deprecated." ++ #elif defined(_MSC_VER) ++ #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.") ++ #endif ++#endif ++ ++#include "../QtGui/qwidget_haiku.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/include/Qt/qwindowdefs_haiku.h qt-everywhere-opensource-src-4.7.3_haiku/include/Qt/qwindowdefs_haiku.h +--- qt-everywhere-opensource-src-4.7.3/include/Qt/qwindowdefs_haiku.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/Qt/qwindowdefs_haiku.h 2011-06-02 22:56:25.000000000 +0000 +@@ -0,0 +1,9 @@ ++#ifndef QT_NO_QT_INCLUDE_WARN ++ #if defined(__GNUC__) ++ #warning "Inclusion of header files from include/Qt is deprecated." ++ #elif defined(_MSC_VER) ++ #pragma message("WARNING: Inclusion of header files from include/Qt is deprecated.") ++ #endif ++#endif ++ ++#include "../QtGui/qwindowdefs_haiku.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/include/QtGui/QHaikuStyle qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/QHaikuStyle +--- qt-everywhere-opensource-src-4.7.3/include/QtGui/QHaikuStyle 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/QHaikuStyle 2010-04-15 16:14:35.000000000 +0000 +@@ -0,0 +1 @@ ++#include "qhaikustyle.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/include/QtGui/QtHaikuView qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/QtHaikuView +--- qt-everywhere-opensource-src-4.7.3/include/QtGui/QtHaikuView 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/QtHaikuView 2010-11-09 02:20:07.000000000 +0000 +@@ -0,0 +1 @@ ++#include "qwidget_haiku.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/include/QtGui/QtHaikuWindow qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/QtHaikuWindow +--- qt-everywhere-opensource-src-4.7.3/include/QtGui/QtHaikuWindow 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/QtHaikuWindow 2010-11-09 02:20:07.000000000 +0000 +@@ -0,0 +1 @@ ++#include "qwidget_haiku.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/include/QtGui/headers.pri qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/headers.pri +--- qt-everywhere-opensource-src-4.7.3/include/QtGui/headers.pri 2011-03-30 05:16:20.013893632 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/headers.pri 2011-06-14 04:04:50.707264512 +0000 +@@ -1,3 +1,3 @@ +-SYNCQT.HEADER_FILES = ../gui/dialogs/qabstractpagesetupdialog.h ../gui/dialogs/qabstractprintdialog.h ../gui/dialogs/qcolordialog.h ../gui/dialogs/qdialog.h ../gui/dialogs/qerrormessage.h ../gui/dialogs/qfiledialog.h ../gui/dialogs/qfilesystemmodel.h ../gui/dialogs/qfontdialog.h ../gui/dialogs/qinputdialog.h ../gui/dialogs/qmessagebox.h ../gui/dialogs/qpagesetupdialog.h ../gui/dialogs/qprintdialog.h ../gui/dialogs/qprintpreviewdialog.h ../gui/dialogs/qprogressdialog.h ../gui/dialogs/qwizard.h ../gui/embedded/qcopchannel_qws.h ../gui/embedded/qdecoration_qws.h ../gui/embedded/qdecorationdefault_qws.h ../gui/embedded/qdecorationfactory_qws.h ../gui/embedded/qdecorationplugin_qws.h ../gui/embedded/qdecorationstyled_qws.h ../gui/embedded/qdecorationwindows_qws.h ../gui/embedded/qdirectpainter_qws.h ../gui/embedded/qkbd_qws.h ../gui/embedded/qkbddriverfactory_qws.h ../gui/embedded/qkbddriverplugin_qws.h ../gui/embedded/qkbdlinuxinput_qws.h ../gui/embedded/qkbdqnx_qws.h ../gui/embedded/qkbdtty_qws.h ../gui/embedded/qkbdum_qws.h ../gui/embedded/qkbdvfb_qws.h ../gui/embedded/qmouse_qws.h ../gui/embedded/qmousedriverfactory_qws.h ../gui/embedded/qmousedriverplugin_qws.h ../gui/embedded/qmouselinuxinput_qws.h ../gui/embedded/qmouselinuxtp_qws.h ../gui/embedded/qmousepc_qws.h ../gui/embedded/qmouseqnx_qws.h ../gui/embedded/qmousetslib_qws.h ../gui/embedded/qmousevfb_qws.h ../gui/embedded/qscreen_qws.h ../gui/embedded/qscreendriverfactory_qws.h ../gui/embedded/qscreendriverplugin_qws.h ../gui/embedded/qscreenlinuxfb_qws.h ../gui/embedded/qscreenproxy_qws.h ../gui/embedded/qscreenqnx_qws.h ../gui/embedded/qscreentransformed_qws.h ../gui/embedded/qscreenvfb_qws.h ../gui/embedded/qsoundqss_qws.h ../gui/embedded/qtransportauth_qws.h ../gui/embedded/qtransportauthdefs_qws.h ../gui/embedded/qvfbhdr.h ../gui/embedded/qwindowsystem_qws.h ../gui/embedded/qwscursor_qws.h ../gui/embedded/qwsdisplay_qws.h ../gui/embedded/qwsembedwidget.h ../gui/embedded/qwsevent_qws.h ../gui/embedded/qwsmanager_qws.h ../gui/embedded/qwsproperty_qws.h ../gui/embedded/qwsprotocolitem_qws.h ../gui/embedded/qwssocket_qws.h ../gui/embedded/qwsutils_qws.h ../gui/graphicsview/qgraphicsanchorlayout.h ../gui/graphicsview/qgraphicsgridlayout.h ../gui/graphicsview/qgraphicsitem.h ../gui/graphicsview/qgraphicsitemanimation.h ../gui/graphicsview/qgraphicslayout.h ../gui/graphicsview/qgraphicslayoutitem.h ../gui/graphicsview/qgraphicslinearlayout.h ../gui/graphicsview/qgraphicsproxywidget.h ../gui/graphicsview/qgraphicsscene.h ../gui/graphicsview/qgraphicssceneevent.h ../gui/graphicsview/qgraphicstransform.h ../gui/graphicsview/qgraphicsview.h ../gui/graphicsview/qgraphicswidget.h ../gui/kernel/qaction.h ../gui/kernel/qactiongroup.h ../gui/kernel/qapplication.h ../gui/kernel/qboxlayout.h ../gui/kernel/qclipboard.h ../gui/kernel/qcursor.h ../gui/kernel/qdesktopwidget.h ../gui/kernel/qdrag.h ../gui/kernel/qevent.h ../gui/kernel/qformlayout.h ../gui/kernel/qgesture.h ../gui/kernel/qgesturerecognizer.h ../gui/kernel/qgridlayout.h ../gui/kernel/qguifunctions_wince.h ../gui/kernel/qkeysequence.h ../gui/kernel/qlayout.h ../gui/kernel/qlayoutitem.h ../gui/kernel/qmacdefines_mac.h ../gui/kernel/qmime.h ../gui/kernel/qpalette.h ../gui/kernel/qsessionmanager.h ../gui/kernel/qshortcut.h ../gui/kernel/qsizepolicy.h ../gui/kernel/qsound.h ../gui/kernel/qstackedlayout.h ../gui/kernel/qtooltip.h ../gui/kernel/qwhatsthis.h ../gui/kernel/qwidget.h ../gui/kernel/qwidgetaction.h ../gui/kernel/qwindowdefs.h ../gui/kernel/qwindowdefs_win.h ../gui/kernel/qx11embed_x11.h ../gui/kernel/qx11info_x11.h ../gui/effects/qgraphicseffect.h ../gui/s60framework/qs60mainapplication.h ../gui/s60framework/qs60mainappui.h ../gui/s60framework/qs60maindocument.h ../gui/math3d/qgenericmatrix.h ../gui/math3d/qmatrix4x4.h ../gui/math3d/qquaternion.h ../gui/math3d/qvector2d.h ../gui/math3d/qvector3d.h ../gui/math3d/qvector4d.h ../gui/image/qbitmap.h ../gui/image/qicon.h ../gui/image/qiconengine.h ../gui/image/qiconengineplugin.h ../gui/image/qimage.h ../gui/image/qimageiohandler.h ../gui/image/qimagereader.h ../gui/image/qimagewriter.h ../gui/image/qmovie.h ../gui/image/qpicture.h ../gui/image/qpictureformatplugin.h ../gui/image/qpixmap.h ../gui/image/qpixmapcache.h ../gui/symbian/qsymbianevent.h ../gui/text/qabstractfontengine_qws.h ../gui/text/qabstracttextdocumentlayout.h ../gui/text/qfont.h ../gui/text/qfontdatabase.h ../gui/text/qfontinfo.h ../gui/text/qfontmetrics.h ../gui/text/qstatictext.h ../gui/text/qsyntaxhighlighter.h ../gui/text/qtextcursor.h ../gui/text/qtextdocument.h ../gui/text/qtextdocumentfragment.h ../gui/text/qtextdocumentwriter.h ../gui/text/qtextformat.h ../gui/text/qtextlayout.h ../gui/text/qtextlist.h ../gui/text/qtextobject.h ../gui/text/qtextoption.h ../gui/text/qtexttable.h ../gui/itemviews/qabstractitemdelegate.h ../gui/itemviews/qabstractitemview.h ../gui/itemviews/qabstractproxymodel.h ../gui/itemviews/qcolumnview.h ../gui/itemviews/qdatawidgetmapper.h ../gui/itemviews/qdirmodel.h ../gui/itemviews/qfileiconprovider.h ../gui/itemviews/qheaderview.h ../gui/itemviews/qitemdelegate.h ../gui/itemviews/qitemeditorfactory.h ../gui/itemviews/qitemselectionmodel.h ../gui/itemviews/qlistview.h ../gui/itemviews/qlistwidget.h ../gui/itemviews/qproxymodel.h ../gui/itemviews/qsortfilterproxymodel.h ../gui/itemviews/qstandarditemmodel.h ../gui/itemviews/qstringlistmodel.h ../gui/itemviews/qstyleditemdelegate.h ../gui/itemviews/qtableview.h ../gui/itemviews/qtablewidget.h ../gui/itemviews/qtreeview.h ../gui/itemviews/qtreewidget.h ../gui/itemviews/qtreewidgetitemiterator.h ../gui/widgets/qabstractbutton.h ../gui/widgets/qabstractscrollarea.h ../gui/widgets/qabstractslider.h ../gui/widgets/qabstractspinbox.h ../gui/widgets/qbuttongroup.h ../gui/widgets/qcalendarwidget.h ../gui/widgets/qcheckbox.h ../gui/widgets/qcombobox.h ../gui/widgets/qcommandlinkbutton.h ../gui/widgets/qdatetimeedit.h ../gui/widgets/qdial.h ../gui/widgets/qdialogbuttonbox.h ../gui/widgets/qdockwidget.h ../gui/widgets/qfocusframe.h ../gui/widgets/qfontcombobox.h ../gui/widgets/qframe.h ../gui/widgets/qgroupbox.h ../gui/widgets/qlabel.h ../gui/widgets/qlcdnumber.h ../gui/widgets/qlineedit.h ../gui/widgets/qmaccocoaviewcontainer_mac.h ../gui/widgets/qmacnativewidget_mac.h ../gui/widgets/qmainwindow.h ../gui/widgets/qmdiarea.h ../gui/widgets/qmdisubwindow.h ../gui/widgets/qmenu.h ../gui/widgets/qmenubar.h ../gui/widgets/qmenudata.h ../gui/widgets/qplaintextedit.h ../gui/widgets/qprintpreviewwidget.h ../gui/widgets/qprogressbar.h ../gui/widgets/qpushbutton.h ../gui/widgets/qradiobutton.h ../gui/widgets/qrubberband.h ../gui/widgets/qscrollarea.h ../gui/widgets/qscrollbar.h ../gui/widgets/qsizegrip.h ../gui/widgets/qslider.h ../gui/widgets/qspinbox.h ../gui/widgets/qsplashscreen.h ../gui/widgets/qsplitter.h ../gui/widgets/qstackedwidget.h ../gui/widgets/qstatusbar.h ../gui/widgets/qtabbar.h ../gui/widgets/qtabwidget.h ../gui/widgets/qtextbrowser.h ../gui/widgets/qtextedit.h ../gui/widgets/qtoolbar.h ../gui/widgets/qtoolbox.h ../gui/widgets/qtoolbutton.h ../gui/widgets/qvalidator.h ../gui/widgets/qworkspace.h ../gui/statemachine/qkeyeventtransition.h ../gui/statemachine/qmouseeventtransition.h ../gui/util/qcompleter.h ../gui/util/qdesktopservices.h ../gui/util/qsystemtrayicon.h ../gui/util/qundogroup.h ../gui/util/qundostack.h ../gui/util/qundoview.h ../gui/accessible/qaccessible.h ../gui/accessible/qaccessible2.h ../gui/accessible/qaccessiblebridge.h ../gui/accessible/qaccessibleobject.h ../gui/accessible/qaccessibleplugin.h ../gui/accessible/qaccessiblewidget.h ../gui/styles/qcdestyle.h ../gui/styles/qcleanlooksstyle.h ../gui/styles/qcommonstyle.h ../gui/styles/qgtkstyle.h ../gui/styles/qmacstyle_mac.h ../gui/styles/qmotifstyle.h ../gui/styles/qplastiquestyle.h ../gui/styles/qproxystyle.h ../gui/styles/qs60style.h ../gui/styles/qstyle.h ../gui/styles/qstylefactory.h ../gui/styles/qstyleoption.h ../gui/styles/qstyleplugin.h ../gui/styles/qwindowscestyle.h ../gui/styles/qwindowsmobilestyle.h ../gui/styles/qwindowsstyle.h ../gui/styles/qwindowsvistastyle.h ../gui/styles/qwindowsxpstyle.h ../gui/inputmethod/qinputcontext.h ../gui/inputmethod/qinputcontextfactory.h ../gui/inputmethod/qinputcontextplugin.h ../gui/painting/qbrush.h ../gui/painting/qcolor.h ../gui/painting/qcolormap.h ../gui/painting/qdrawutil.h ../gui/painting/qmatrix.h ../gui/painting/qpaintdevice.h ../gui/painting/qpaintengine.h ../gui/painting/qpainter.h ../gui/painting/qpainterpath.h ../gui/painting/qpen.h ../gui/painting/qpolygon.h ../gui/painting/qprintengine.h ../gui/painting/qprinter.h ../gui/painting/qprinterinfo.h ../gui/painting/qregion.h ../gui/painting/qrgb.h ../gui/painting/qstylepainter.h ../gui/painting/qtransform.h ../gui/painting/qwmatrix.h ../../include/QtGui/QtGui +-SYNCQT.HEADER_CLASSES = ../../include/QtGui/QAbstractPageSetupDialog ../../include/QtGui/QAbstractPrintDialog ../../include/QtGui/QColorDialog ../../include/QtGui/QDialog ../../include/QtGui/QErrorMessage ../../include/QtGui/QFileDialog ../../include/QtGui/QFileSystemModel ../../include/QtGui/QFontDialog ../../include/QtGui/QInputDialog ../../include/QtGui/QMessageBox ../../include/QtGui/QPageSetupDialog ../../include/QtGui/QUnixPrintWidget ../../include/QtGui/QPrintDialog ../../include/QtGui/QPrintPreviewDialog ../../include/QtGui/QProgressDialog ../../include/QtGui/QWizard ../../include/QtGui/QWizardPage ../../include/QtGui/QCopChannel ../../include/QtGui/QDecorationAction ../../include/QtGui/QDecoration ../../include/QtGui/QDecorationDefault ../../include/QtGui/QDecorationFactory ../../include/QtGui/QDecorationFactoryInterface ../../include/QtGui/QDecorationPlugin ../../include/QtGui/QDecorationStyled ../../include/QtGui/QDecorationWindows ../../include/QtGui/QDirectPainter ../../include/QtGui/QWSKeyboardHandler ../../include/QtGui/QKbdDriverFactory ../../include/QtGui/QWSKeyboardHandlerFactoryInterface ../../include/QtGui/QKbdDriverPlugin ../../include/QtGui/QWSLinuxInputKeyboardHandler ../../include/QtGui/QWSQnxKeyboardHandler ../../include/QtGui/QWSTtyKeyboardHandler ../../include/QtGui/QWSUmKeyboardHandler ../../include/QtGui/QVFbKeyboardHandler ../../include/QtGui/QWSPointerCalibrationData ../../include/QtGui/QWSMouseHandler ../../include/QtGui/QWSCalibratedMouseHandler ../../include/QtGui/QMouseDriverFactory ../../include/QtGui/QWSMouseHandlerFactoryInterface ../../include/QtGui/QMouseDriverPlugin ../../include/QtGui/QWSLinuxInputMouseHandler ../../include/QtGui/QWSLinuxTPMouseHandler ../../include/QtGui/QWSPcMouseHandler ../../include/QtGui/QQnxMouseHandler ../../include/QtGui/QWSTslibMouseHandler ../../include/QtGui/QVFbMouseHandler ../../include/QtGui/QScreenCursor ../../include/QtGui/QPoolEntry ../../include/QtGui/QScreen ../../include/QtGui/QScreenDriverFactory ../../include/QtGui/QScreenDriverFactoryInterface ../../include/QtGui/QScreenDriverPlugin ../../include/QtGui/QLinuxFb_Shared ../../include/QtGui/QLinuxFbScreen ../../include/QtGui/QProxyScreenCursor ../../include/QtGui/QProxyScreen ../../include/QtGui/QQnxScreen ../../include/QtGui/QTransformedScreen ../../include/QtGui/QVFbScreen ../../include/QtGui/QWSSoundServer ../../include/QtGui/QWSSoundClient ../../include/QtGui/QWSSoundServerSocket ../../include/QtGui/QTransportAuth ../../include/QtGui/QAuthDevice ../../include/QtGui/QVFbHeader ../../include/QtGui/QVFbKeyData ../../include/QtGui/QWSInternalWindowInfo ../../include/QtGui/QWSScreenSaver ../../include/QtGui/QWSWindow ../../include/QtGui/QWSServer ../../include/QtGui/QWSInputMethod ../../include/QtGui/QWSCursorMap ../../include/QtGui/QWSClient ../../include/QtGui/QWSCursor ../../include/QtGui/QWSWindowInfo ../../include/QtGui/QWSDisplay ../../include/QtGui/QWSEmbedWidget ../../include/QtGui/QWSEvent ../../include/QtGui/QWSManager ../../include/QtGui/QWSPropertyManager ../../include/QtGui/QWSProtocolItem ../../include/QtGui/QWSSocket ../../include/QtGui/QWSServerSocket ../../include/QtGui/QGraphicsAnchor ../../include/QtGui/QGraphicsAnchorLayout ../../include/QtGui/QGraphicsGridLayout ../../include/QtGui/QGraphicsItem ../../include/QtGui/QGraphicsObject ../../include/QtGui/QAbstractGraphicsShapeItem ../../include/QtGui/QGraphicsPathItem ../../include/QtGui/QGraphicsRectItem ../../include/QtGui/QGraphicsEllipseItem ../../include/QtGui/QGraphicsPolygonItem ../../include/QtGui/QGraphicsLineItem ../../include/QtGui/QGraphicsPixmapItem ../../include/QtGui/QGraphicsTextItem ../../include/QtGui/QGraphicsSimpleTextItem ../../include/QtGui/QGraphicsItemGroup ../../include/QtGui/QGraphicsItemAnimation ../../include/QtGui/QGraphicsLayout ../../include/QtGui/QGraphicsLayoutItem ../../include/QtGui/QGraphicsLinearLayout ../../include/QtGui/QGraphicsProxyWidget ../../include/QtGui/QGraphicsScene ../../include/QtGui/QGraphicsSceneEvent ../../include/QtGui/QGraphicsSceneMouseEvent ../../include/QtGui/QGraphicsSceneWheelEvent ../../include/QtGui/QGraphicsSceneContextMenuEvent ../../include/QtGui/QGraphicsSceneHoverEvent ../../include/QtGui/QGraphicsSceneHelpEvent ../../include/QtGui/QGraphicsSceneDragDropEvent ../../include/QtGui/QGraphicsSceneResizeEvent ../../include/QtGui/QGraphicsSceneMoveEvent ../../include/QtGui/QGraphicsTransform ../../include/QtGui/QGraphicsScale ../../include/QtGui/QGraphicsRotation ../../include/QtGui/QGraphicsView ../../include/QtGui/QGraphicsWidget ../../include/QtGui/QAction ../../include/QtGui/QActionGroup ../../include/QtGui/QApplication ../../include/QtGui/QBoxLayout ../../include/QtGui/QHBoxLayout ../../include/QtGui/QVBoxLayout ../../include/QtGui/QClipboard ../../include/QtGui/QCursor ../../include/QtGui/QCursorShape ../../include/QtGui/QDesktopWidget ../../include/QtGui/QDrag ../../include/QtGui/QtEvents ../../include/QtGui/QInputEvent ../../include/QtGui/QMouseEvent ../../include/QtGui/QHoverEvent ../../include/QtGui/QWheelEvent ../../include/QtGui/QTabletEvent ../../include/QtGui/QKeyEvent ../../include/QtGui/QFocusEvent ../../include/QtGui/QPaintEvent ../../include/QtGui/QUpdateLaterEvent ../../include/QtGui/QMoveEvent ../../include/QtGui/QResizeEvent ../../include/QtGui/QCloseEvent ../../include/QtGui/QIconDragEvent ../../include/QtGui/QShowEvent ../../include/QtGui/QHideEvent ../../include/QtGui/QContextMenuEvent ../../include/QtGui/QInputMethodEvent ../../include/QtGui/QDropEvent ../../include/QtGui/QDragMoveEvent ../../include/QtGui/QDragEnterEvent ../../include/QtGui/QDragResponseEvent ../../include/QtGui/QDragLeaveEvent ../../include/QtGui/QHelpEvent ../../include/QtGui/QStatusTipEvent ../../include/QtGui/QWhatsThisClickedEvent ../../include/QtGui/QActionEvent ../../include/QtGui/QFileOpenEvent ../../include/QtGui/QToolBarChangeEvent ../../include/QtGui/QShortcutEvent ../../include/QtGui/QClipboardEvent ../../include/QtGui/QWindowStateChangeEvent ../../include/QtGui/QMenubarUpdatedEvent ../../include/QtGui/QTouchEvent ../../include/QtGui/QGestureEvent ../../include/QtGui/QFormLayout ../../include/QtGui/QGesture ../../include/QtGui/QPanGesture ../../include/QtGui/QPinchGesture ../../include/QtGui/QSwipeGesture ../../include/QtGui/QTapGesture ../../include/QtGui/QTapAndHoldGesture ../../include/QtGui/QGestureRecognizer ../../include/QtGui/QGridLayout ../../include/QtGui/QKeySequence ../../include/QtGui/QLayoutIterator ../../include/QtGui/QLayout ../../include/QtGui/QLayoutItem ../../include/QtGui/QSpacerItem ../../include/QtGui/QWidgetItem ../../include/QtGui/QWidgetItemV2 ../../include/QtGui/QMimeSource ../../include/QtGui/QWindowsMime ../../include/QtGui/QMacMime ../../include/QtGui/QMacPasteboardMime ../../include/QtGui/QPalette ../../include/QtGui/QColorGroup ../../include/QtGui/QSessionManager ../../include/QtGui/QShortcut ../../include/QtGui/QSizePolicy ../../include/QtGui/QSound ../../include/QtGui/QStackedLayout ../../include/QtGui/QToolTip ../../include/QtGui/QWhatsThis ../../include/QtGui/QWidgetData ../../include/QtGui/QWidget ../../include/QtGui/QWidgetAction ../../include/QtGui/QWidgetList ../../include/QtGui/QWidgetMapper ../../include/QtGui/QWidgetSet ../../include/QtGui/QX11EmbedWidget ../../include/QtGui/QX11EmbedContainer ../../include/QtGui/QX11Info ../../include/QtGui/QGraphicsEffect ../../include/QtGui/QGraphicsColorizeEffect ../../include/QtGui/QGraphicsBlurEffect ../../include/QtGui/QGraphicsDropShadowEffect ../../include/QtGui/QGraphicsOpacityEffect ../../include/QtGui/QS60MainApplicationBase ../../include/QtGui/QS60MainApplication ../../include/QtGui/QS60MainAppUiBase ../../include/QtGui/QS60StubAknAppUiBase ../../include/QtGui/QS60StubMEikStatusPaneObserver ../../include/QtGui/QS60StubMAknTouchPaneObserver ../../include/QtGui/QS60StubAknAppUi ../../include/QtGui/QS60MainAppUi ../../include/QtGui/QS60MainDocumentBase ../../include/QtGui/QS60MainDocument ../../include/QtGui/QGenericMatrix ../../include/QtGui/QMatrix2x2 ../../include/QtGui/QMatrix2x3 ../../include/QtGui/QMatrix2x4 ../../include/QtGui/QMatrix3x2 ../../include/QtGui/QMatrix3x3 ../../include/QtGui/QMatrix3x4 ../../include/QtGui/QMatrix4x2 ../../include/QtGui/QMatrix4x3 ../../include/QtGui/QMatrix4x4 ../../include/QtGui/QQuaternion ../../include/QtGui/QVector2D ../../include/QtGui/QVector3D ../../include/QtGui/QVector4D ../../include/QtGui/QBitmap ../../include/QtGui/QIcon ../../include/QtGui/QIconSet ../../include/QtGui/QIconEngine ../../include/QtGui/QIconEngineV2 ../../include/QtGui/QIconEngineFactoryInterface ../../include/QtGui/QIconEnginePlugin ../../include/QtGui/QIconEngineFactoryInterfaceV2 ../../include/QtGui/QIconEnginePluginV2 ../../include/QtGui/QImageTextKeyLang ../../include/QtGui/QImage ../../include/QtGui/QImageIOHandler ../../include/QtGui/QImageIOHandlerFactoryInterface ../../include/QtGui/QImageIOPlugin ../../include/QtGui/QImageReader ../../include/QtGui/QImageWriter ../../include/QtGui/QMovie ../../include/QtGui/QPicture ../../include/QtGui/QPictureIO ../../include/QtGui/QPictureFormatInterface ../../include/QtGui/QPictureFormatPlugin ../../include/QtGui/QPixmap ../../include/QtGui/QPixmapCache ../../include/QtGui/QSymbianEvent ../../include/QtGui/QFontEngineInfo ../../include/QtGui/QFontEngineFactoryInterface ../../include/QtGui/QFontEnginePlugin ../../include/QtGui/QAbstractFontEngine ../../include/QtGui/QAbstractTextDocumentLayout ../../include/QtGui/QTextObjectInterface ../../include/QtGui/QFont ../../include/QtGui/QFontDatabase ../../include/QtGui/QFontInfo ../../include/QtGui/QFontMetrics ../../include/QtGui/QFontMetricsF ../../include/QtGui/QStaticText ../../include/QtGui/QSyntaxHighlighter ../../include/QtGui/QTextCursor ../../include/QtGui/QAbstractUndoItem ../../include/QtGui/QTextDocument ../../include/QtGui/QTextDocumentFragment ../../include/QtGui/QTextDocumentWriter ../../include/QtGui/QTextLength ../../include/QtGui/QTextFormat ../../include/QtGui/QTextCharFormat ../../include/QtGui/QTextBlockFormat ../../include/QtGui/QTextListFormat ../../include/QtGui/QTextImageFormat ../../include/QtGui/QTextFrameFormat ../../include/QtGui/QTextTableFormat ../../include/QtGui/QTextTableCellFormat ../../include/QtGui/QTextInlineObject ../../include/QtGui/QTextLayout ../../include/QtGui/QTextLine ../../include/QtGui/QTextList ../../include/QtGui/QTextObject ../../include/QtGui/QTextBlockGroup ../../include/QtGui/QTextFrameLayoutData ../../include/QtGui/QTextFrame ../../include/QtGui/QTextBlockUserData ../../include/QtGui/QTextBlock ../../include/QtGui/QTextFragment ../../include/QtGui/QTextOption ../../include/QtGui/QTextTableCell ../../include/QtGui/QTextTable ../../include/QtGui/QAbstractItemDelegate ../../include/QtGui/QAbstractItemView ../../include/QtGui/QAbstractProxyModel ../../include/QtGui/QColumnView ../../include/QtGui/QDataWidgetMapper ../../include/QtGui/QDirModel ../../include/QtGui/QFileIconProvider ../../include/QtGui/QHeaderView ../../include/QtGui/QItemDelegate ../../include/QtGui/QItemEditorCreatorBase ../../include/QtGui/QItemEditorCreator ../../include/QtGui/QStandardItemEditorCreator ../../include/QtGui/QItemEditorFactory ../../include/QtGui/QItemSelectionRange ../../include/QtGui/QItemSelectionModel ../../include/QtGui/QItemSelection ../../include/QtGui/QListView ../../include/QtGui/QListWidgetItem ../../include/QtGui/QListWidget ../../include/QtGui/QProxyModel ../../include/QtGui/QSortFilterProxyModel ../../include/QtGui/QStandardItem ../../include/QtGui/QStandardItemModel ../../include/QtGui/QStringListModel ../../include/QtGui/QStyledItemDelegate ../../include/QtGui/QTableView ../../include/QtGui/QTableWidgetSelectionRange ../../include/QtGui/QTableWidgetItem ../../include/QtGui/QTableWidget ../../include/QtGui/QTreeView ../../include/QtGui/QTreeWidgetItem ../../include/QtGui/QTreeWidget ../../include/QtGui/QTreeWidgetItemIterator ../../include/QtGui/QAbstractButton ../../include/QtGui/QAbstractScrollArea ../../include/QtGui/QAbstractSlider ../../include/QtGui/QAbstractSpinBox ../../include/QtGui/QButtonGroup ../../include/QtGui/QCalendarWidget ../../include/QtGui/QCheckBox ../../include/QtGui/QComboBox ../../include/QtGui/QCommandLinkButton ../../include/QtGui/QDateTimeEdit ../../include/QtGui/QTimeEdit ../../include/QtGui/QDateEdit ../../include/QtGui/QDial ../../include/QtGui/QDialogButtonBox ../../include/QtGui/QDockWidget ../../include/QtGui/QFocusFrame ../../include/QtGui/QFontComboBox ../../include/QtGui/QFrame ../../include/QtGui/QGroupBox ../../include/QtGui/QLabel ../../include/QtGui/QLCDNumber ../../include/QtGui/QLineEdit ../../include/QtGui/QMacCocoaViewContainer ../../include/QtGui/QMacNativeWidget ../../include/QtGui/QMainWindow ../../include/QtGui/QMdiArea ../../include/QtGui/QMdiSubWindow ../../include/QtGui/QMenu ../../include/QtGui/QMenuBar ../../include/QtGui/QMenuItem ../../include/QtGui/QPlainTextEdit ../../include/QtGui/QPlainTextDocumentLayout ../../include/QtGui/QPrintPreviewWidget ../../include/QtGui/QProgressBar ../../include/QtGui/QPushButton ../../include/QtGui/QRadioButton ../../include/QtGui/QRubberBand ../../include/QtGui/QScrollArea ../../include/QtGui/QScrollBar ../../include/QtGui/QSizeGrip ../../include/QtGui/QSlider ../../include/QtGui/QSpinBox ../../include/QtGui/QDoubleSpinBox ../../include/QtGui/QSplashScreen ../../include/QtGui/QSplitter ../../include/QtGui/QSplitterHandle ../../include/QtGui/QStackedWidget ../../include/QtGui/QStatusBar ../../include/QtGui/QTabBar ../../include/QtGui/QTabWidget ../../include/QtGui/QTextBrowser ../../include/QtGui/QTextEdit ../../include/QtGui/QToolBar ../../include/QtGui/QToolBox ../../include/QtGui/QToolButton ../../include/QtGui/QValidator ../../include/QtGui/QIntValidator ../../include/QtGui/QDoubleValidator ../../include/QtGui/QRegExpValidator ../../include/QtGui/QWorkspace ../../include/QtGui/QKeyEventTransition ../../include/QtGui/QMouseEventTransition ../../include/QtGui/QCompleter ../../include/QtGui/QDesktopServices ../../include/QtGui/QSystemTrayIcon ../../include/QtGui/QUndoGroup ../../include/QtGui/QUndoCommand ../../include/QtGui/QUndoStack ../../include/QtGui/QUndoView ../../include/QtGui/QAccessible ../../include/QtGui/QAccessibleInterface ../../include/QtGui/QAccessibleInterfaceEx ../../include/QtGui/QAccessibleEvent ../../include/QtGui/QAccessible2Interface ../../include/QtGui/QAccessibleTextInterface ../../include/QtGui/QAccessibleEditableTextInterface ../../include/QtGui/QAccessibleSimpleEditableTextInterface ../../include/QtGui/QAccessibleValueInterface ../../include/QtGui/QAccessibleTableInterface ../../include/QtGui/QAccessibleActionInterface ../../include/QtGui/QAccessibleImageInterface ../../include/QtGui/QAccessibleBridge ../../include/QtGui/QAccessibleBridgeFactoryInterface ../../include/QtGui/QAccessibleBridgePlugin ../../include/QtGui/QAccessibleObject ../../include/QtGui/QAccessibleObjectEx ../../include/QtGui/QAccessibleApplication ../../include/QtGui/QAccessibleFactoryInterface ../../include/QtGui/QAccessiblePlugin ../../include/QtGui/QAccessibleWidget ../../include/QtGui/QAccessibleWidgetEx ../../include/QtGui/QCDEStyle ../../include/QtGui/QCleanlooksStyle ../../include/QtGui/QCommonStyle ../../include/QtGui/QGtkStyle ../../include/QtGui/QMacStyle ../../include/QtGui/QMotifStyle ../../include/QtGui/QPlastiqueStyle ../../include/QtGui/QProxyStyle ../../include/QtGui/QS60Style ../../include/QtGui/QStyle ../../include/QtGui/QStyleFactory ../../include/QtGui/QStyleOption ../../include/QtGui/QStyleOptionFocusRect ../../include/QtGui/QStyleOptionFrame ../../include/QtGui/QStyleOptionFrameV2 ../../include/QtGui/QStyleOptionFrameV3 ../../include/QtGui/QStyleOptionTabWidgetFrame ../../include/QtGui/QStyleOptionTabWidgetFrameV2 ../../include/QtGui/QStyleOptionTabBarBase ../../include/QtGui/QStyleOptionTabBarBaseV2 ../../include/QtGui/QStyleOptionHeader ../../include/QtGui/QStyleOptionButton ../../include/QtGui/QStyleOptionTab ../../include/QtGui/QStyleOptionTabV2 ../../include/QtGui/QStyleOptionTabV3 ../../include/QtGui/QStyleOptionToolBar ../../include/QtGui/QStyleOptionProgressBar ../../include/QtGui/QStyleOptionProgressBarV2 ../../include/QtGui/QStyleOptionMenuItem ../../include/QtGui/QStyleOptionQ3ListViewItem ../../include/QtGui/QStyleOptionQ3DockWindow ../../include/QtGui/QStyleOptionDockWidget ../../include/QtGui/QStyleOptionDockWidgetV2 ../../include/QtGui/QStyleOptionViewItem ../../include/QtGui/QStyleOptionViewItemV2 ../../include/QtGui/QStyleOptionViewItemV3 ../../include/QtGui/QStyleOptionViewItemV4 ../../include/QtGui/QStyleOptionToolBox ../../include/QtGui/QStyleOptionToolBoxV2 ../../include/QtGui/QStyleOptionRubberBand ../../include/QtGui/QStyleOptionComplex ../../include/QtGui/QStyleOptionSlider ../../include/QtGui/QStyleOptionSpinBox ../../include/QtGui/QStyleOptionQ3ListView ../../include/QtGui/QStyleOptionToolButton ../../include/QtGui/QStyleOptionComboBox ../../include/QtGui/QStyleOptionTitleBar ../../include/QtGui/QStyleOptionGroupBox ../../include/QtGui/QStyleOptionSizeGrip ../../include/QtGui/QStyleOptionGraphicsItem ../../include/QtGui/QStyleHintReturn ../../include/QtGui/QStyleHintReturnMask ../../include/QtGui/QStyleHintReturnVariant ../../include/QtGui/QStyleFactoryInterface ../../include/QtGui/QStylePlugin ../../include/QtGui/QWindowsCEStyle ../../include/QtGui/QWindowsMobileStyle ../../include/QtGui/QWindowsStyle ../../include/QtGui/QWindowsVistaStyle ../../include/QtGui/QWindowsXPStyle ../../include/QtGui/QInputContext ../../include/QtGui/QInputContextFactory ../../include/QtGui/QInputContextFactoryInterface ../../include/QtGui/QInputContextPlugin ../../include/QtGui/QBrush ../../include/QtGui/QBrushData ../../include/QtGui/QGradientStop ../../include/QtGui/QGradientStops ../../include/QtGui/QGradient ../../include/QtGui/QLinearGradient ../../include/QtGui/QRadialGradient ../../include/QtGui/QConicalGradient ../../include/QtGui/QColor ../../include/QtGui/QColormap ../../include/QtGui/QTileRules ../../include/QtGui/QMatrix ../../include/QtGui/QPaintDevice ../../include/QtGui/QTextItem ../../include/QtGui/QPaintEngine ../../include/QtGui/QPaintEngineState ../../include/QtGui/QPainter ../../include/QtGui/QPainterPath ../../include/QtGui/QPainterPathPrivate ../../include/QtGui/QPainterPathStroker ../../include/QtGui/QPen ../../include/QtGui/QPolygon ../../include/QtGui/QPolygonF ../../include/QtGui/QPrintEngine ../../include/QtGui/QPrinter ../../include/QtGui/QPrinterInfo ../../include/QtGui/QRegion ../../include/QtGui/QRgb ../../include/QtGui/QStylePainter ../../include/QtGui/QTransform ../../include/QtGui/QWMatrix +-SYNCQT.PRIVATE_HEADER_FILES = ../gui/dialogs/qabstractpagesetupdialog_p.h ../gui/dialogs/qabstractprintdialog_p.h ../gui/dialogs/qcolordialog_p.h ../gui/dialogs/qdialog_p.h ../gui/dialogs/qfiledialog_p.h ../gui/dialogs/qfiledialog_win_p.h ../gui/dialogs/qfileinfogatherer_p.h ../gui/dialogs/qfilesystemmodel_p.h ../gui/dialogs/qfontdialog_p.h ../gui/dialogs/qfscompleter_p.h ../gui/dialogs/qpagesetupdialog_unix_p.h ../gui/dialogs/qsidebar_p.h ../gui/dialogs/qwizard_win_p.h ../gui/embedded/qkbd_defaultmap_qws_p.h ../gui/embedded/qkbd_qws_p.h ../gui/embedded/qlock_p.h ../gui/embedded/qscreenmulti_qws_p.h ../gui/embedded/qtransportauth_qws_p.h ../gui/embedded/qunixsocket_p.h ../gui/embedded/qunixsocketserver_p.h ../gui/embedded/qwindowsystem_p.h ../gui/embedded/qwscommand_qws_p.h ../gui/embedded/qwsdisplay_qws_p.h ../gui/embedded/qwslock_p.h ../gui/embedded/qwsmanager_p.h ../gui/embedded/qwssharedmemory_p.h ../gui/embedded/qwssignalhandler_p.h ../gui/graphicsview/qgraph_p.h ../gui/graphicsview/qgraphicsanchorlayout_p.h ../gui/graphicsview/qgraphicsitem_p.h ../gui/graphicsview/qgraphicslayout_p.h ../gui/graphicsview/qgraphicslayoutitem_p.h ../gui/graphicsview/qgraphicsproxywidget_p.h ../gui/graphicsview/qgraphicsscene_bsp_p.h ../gui/graphicsview/qgraphicsscene_p.h ../gui/graphicsview/qgraphicsscenebsptreeindex_p.h ../gui/graphicsview/qgraphicssceneindex_p.h ../gui/graphicsview/qgraphicsscenelinearindex_p.h ../gui/graphicsview/qgraphicstransform_p.h ../gui/graphicsview/qgraphicsview_p.h ../gui/graphicsview/qgraphicswidget_p.h ../gui/graphicsview/qgridlayoutengine_p.h ../gui/graphicsview/qsimplex_p.h ../gui/kernel/qaction_p.h ../gui/kernel/qapplication_p.h ../gui/kernel/qclipboard_p.h ../gui/kernel/qcocoaapplication_mac_p.h ../gui/kernel/qcocoaapplicationdelegate_mac_p.h ../gui/kernel/qcocoamenuloader_mac_p.h ../gui/kernel/qcocoapanel_mac_p.h ../gui/kernel/qcocoasharedwindowmethods_mac_p.h ../gui/kernel/qcocoaview_mac_p.h ../gui/kernel/qcocoawindow_mac_p.h ../gui/kernel/qcocoawindowcustomthemeframe_mac_p.h ../gui/kernel/qcocoawindowdelegate_mac_p.h ../gui/kernel/qcursor_p.h ../gui/kernel/qdesktopwidget_mac_p.h ../gui/kernel/qdnd_p.h ../gui/kernel/qevent_p.h ../gui/kernel/qeventdispatcher_glib_qws_p.h ../gui/kernel/qeventdispatcher_mac_p.h ../gui/kernel/qeventdispatcher_qws_p.h ../gui/kernel/qeventdispatcher_s60_p.h ../gui/kernel/qeventdispatcher_x11_p.h ../gui/kernel/qgesture_p.h ../gui/kernel/qgesturemanager_p.h ../gui/kernel/qguieventdispatcher_glib_p.h ../gui/kernel/qguiplatformplugin_p.h ../gui/kernel/qkde_p.h ../gui/kernel/qkeymapper_p.h ../gui/kernel/qkeysequence_p.h ../gui/kernel/qlayout_p.h ../gui/kernel/qlayoutengine_p.h ../gui/kernel/qmacgesturerecognizer_mac_p.h ../gui/kernel/qmultitouch_mac_p.h ../gui/kernel/qnsframeview_mac_p.h ../gui/kernel/qnsthemeframe_mac_p.h ../gui/kernel/qnstitledframe_mac_p.h ../gui/kernel/qshortcutmap_p.h ../gui/kernel/qsoftkeymanager_common_p.h ../gui/kernel/qsoftkeymanager_p.h ../gui/kernel/qsoftkeymanager_s60_p.h ../gui/kernel/qsound_p.h ../gui/kernel/qstandardgestures_p.h ../gui/kernel/qt_cocoa_helpers_mac_p.h ../gui/kernel/qt_gui_pch.h ../gui/kernel/qt_mac_p.h ../gui/kernel/qt_s60_p.h ../gui/kernel/qt_x11_p.h ../gui/kernel/qwidget_p.h ../gui/kernel/qwidgetaction_p.h ../gui/kernel/qwinnativepangesturerecognizer_win_p.h ../gui/effects/qgraphicseffect_p.h ../gui/s60framework/qs60mainapplication_p.h ../gui/image/qbmphandler_p.h ../gui/image/qgifhandler_p.h ../gui/image/qicon_p.h ../gui/image/qiconloader_p.h ../gui/image/qimage_p.h ../gui/image/qimagepixmapcleanuphooks_p.h ../gui/image/qjpeghandler_p.h ../gui/image/qmnghandler_p.h ../gui/image/qnativeimage_p.h ../gui/image/qpaintengine_pic_p.h ../gui/image/qpicture_p.h ../gui/image/qpixmap_mac_p.h ../gui/image/qpixmap_raster_p.h ../gui/image/qpixmap_s60_p.h ../gui/image/qpixmap_x11_p.h ../gui/image/qpixmapcache_p.h ../gui/image/qpixmapdata_p.h ../gui/image/qpixmapdatafactory_p.h ../gui/image/qpixmapfilter_p.h ../gui/image/qpnghandler_p.h ../gui/image/qppmhandler_p.h ../gui/image/qtiffhandler_p.h ../gui/image/qxbmhandler_p.h ../gui/image/qxpmhandler_p.h ../gui/text/qabstractfontengine_p.h ../gui/text/qabstracttextdocumentlayout_p.h ../gui/text/qcssparser_p.h ../gui/text/qfont_p.h ../gui/text/qfontengine_ft_p.h ../gui/text/qfontengine_p.h ../gui/text/qfontengine_qpf_p.h ../gui/text/qfontengine_s60_p.h ../gui/text/qfontengine_win_p.h ../gui/text/qfontengine_x11_p.h ../gui/text/qfontengineglyphcache_p.h ../gui/text/qfontsubset_p.h ../gui/text/qfragmentmap_p.h ../gui/text/qstatictext_p.h ../gui/text/qtextcontrol_p.h ../gui/text/qtextcontrol_p_p.h ../gui/text/qtextcursor_p.h ../gui/text/qtextdocument_p.h ../gui/text/qtextdocumentfragment_p.h ../gui/text/qtextdocumentlayout_p.h ../gui/text/qtextengine_p.h ../gui/text/qtextformat_p.h ../gui/text/qtexthtmlparser_p.h ../gui/text/qtextimagehandler_p.h ../gui/text/qtextobject_p.h ../gui/text/qtextodfwriter_p.h ../gui/text/qtexttable_p.h ../gui/text/qzipreader_p.h ../gui/text/qzipwriter_p.h ../gui/itemviews/qabstractitemview_p.h ../gui/itemviews/qabstractproxymodel_p.h ../gui/itemviews/qbsptree_p.h ../gui/itemviews/qcolumnview_p.h ../gui/itemviews/qcolumnviewgrip_p.h ../gui/itemviews/qheaderview_p.h ../gui/itemviews/qitemeditorfactory_p.h ../gui/itemviews/qitemselectionmodel_p.h ../gui/itemviews/qlistview_p.h ../gui/itemviews/qlistwidget_p.h ../gui/itemviews/qproxymodel_p.h ../gui/itemviews/qstandarditemmodel_p.h ../gui/itemviews/qtableview_p.h ../gui/itemviews/qtablewidget_p.h ../gui/itemviews/qtreeview_p.h ../gui/itemviews/qtreewidget_p.h ../gui/itemviews/qtreewidgetitemiterator_p.h ../gui/itemviews/qwidgetitemdata_p.h ../gui/widgets/qabstractbutton_p.h ../gui/widgets/qabstractscrollarea_p.h ../gui/widgets/qabstractslider_p.h ../gui/widgets/qabstractspinbox_p.h ../gui/widgets/qcalendartextnavigator_p.h ../gui/widgets/qcocoamenu_mac_p.h ../gui/widgets/qcocoatoolbardelegate_mac_p.h ../gui/widgets/qcombobox_p.h ../gui/widgets/qdatetimeedit_p.h ../gui/widgets/qdockarealayout_p.h ../gui/widgets/qdockwidget_p.h ../gui/widgets/qeffects_p.h ../gui/widgets/qframe_p.h ../gui/widgets/qlabel_p.h ../gui/widgets/qlinecontrol_p.h ../gui/widgets/qlineedit_p.h ../gui/widgets/qmainwindowlayout_p.h ../gui/widgets/qmdiarea_p.h ../gui/widgets/qmdisubwindow_p.h ../gui/widgets/qmenu_p.h ../gui/widgets/qmenu_wince_resource_p.h ../gui/widgets/qmenubar_p.h ../gui/widgets/qplaintextedit_p.h ../gui/widgets/qpushbutton_p.h ../gui/widgets/qscrollarea_p.h ../gui/widgets/qsplitter_p.h ../gui/widgets/qtabbar_p.h ../gui/widgets/qtextedit_p.h ../gui/widgets/qtoolbar_p.h ../gui/widgets/qtoolbararealayout_p.h ../gui/widgets/qtoolbarextension_p.h ../gui/widgets/qtoolbarlayout_p.h ../gui/widgets/qtoolbarseparator_p.h ../gui/widgets/qwidgetanimator_p.h ../gui/widgets/qwidgetresizehandler_p.h ../gui/statemachine/qbasickeyeventtransition_p.h ../gui/statemachine/qbasicmouseeventtransition_p.h ../gui/util/qcompleter_p.h ../gui/util/qsystemtrayicon_p.h ../gui/util/qundostack_p.h ../gui/accessible/qaccessible_mac_p.h ../gui/styles/qcleanlooksstyle_p.h ../gui/styles/qcommonstyle_p.h ../gui/styles/qcommonstylepixmaps_p.h ../gui/styles/qgtkpainter_p.h ../gui/styles/qgtkstyle_p.h ../gui/styles/qmacstyle_mac_p.h ../gui/styles/qmacstylepixmaps_mac_p.h ../gui/styles/qmotifstyle_p.h ../gui/styles/qproxystyle_p.h ../gui/styles/qs60style_p.h ../gui/styles/qstyle_p.h ../gui/styles/qstylehelper_p.h ../gui/styles/qstylesheetstyle_p.h ../gui/styles/qwindowscestyle_p.h ../gui/styles/qwindowsmobilestyle_p.h ../gui/styles/qwindowsstyle_p.h ../gui/styles/qwindowsvistastyle_p.h ../gui/styles/qwindowsxpstyle_p.h ../gui/egl/qegl_p.h ../gui/egl/qeglcontext_p.h ../gui/egl/qeglproperties_p.h ../gui/inputmethod/qcoefepinputcontext_p.h ../gui/inputmethod/qinputcontext_p.h ../gui/inputmethod/qmacinputcontext_p.h ../gui/inputmethod/qwininputcontext_p.h ../gui/inputmethod/qwsinputcontext_p.h ../gui/inputmethod/qximinputcontext_p.h ../gui/painting/qbackingstore_p.h ../gui/painting/qbezier_p.h ../gui/painting/qblendfunctions_p.h ../gui/painting/qcolor_p.h ../gui/painting/qcssutil_p.h ../gui/painting/qcups_p.h ../gui/painting/qdatabuffer_p.h ../gui/painting/qdrawhelper_arm_simd_p.h ../gui/painting/qdrawhelper_mmx_p.h ../gui/painting/qdrawhelper_neon_p.h ../gui/painting/qdrawhelper_p.h ../gui/painting/qdrawhelper_sse_p.h ../gui/painting/qdrawhelper_x86_p.h ../gui/painting/qdrawingprimitive_sse2_p.h ../gui/painting/qemulationpaintengine_p.h ../gui/painting/qfixed_p.h ../gui/painting/qgraphicssystem_mac_p.h ../gui/painting/qgraphicssystem_p.h ../gui/painting/qgraphicssystem_qws_p.h ../gui/painting/qgraphicssystem_raster_p.h ../gui/painting/qgraphicssystem_runtime_p.h ../gui/painting/qgraphicssystemfactory_p.h ../gui/painting/qgraphicssystemplugin_p.h ../gui/painting/qgrayraster_p.h ../gui/painting/qimagescale_p.h ../gui/painting/qmath_p.h ../gui/painting/qmemrotate_p.h ../gui/painting/qoutlinemapper_p.h ../gui/painting/qpaintbuffer_p.h ../gui/painting/qpaintengine_alpha_p.h ../gui/painting/qpaintengine_mac_p.h ../gui/painting/qpaintengine_p.h ../gui/painting/qpaintengine_preview_p.h ../gui/painting/qpaintengine_raster_p.h ../gui/painting/qpaintengine_s60_p.h ../gui/painting/qpaintengine_x11_p.h ../gui/painting/qpaintengineex_p.h ../gui/painting/qpainter_p.h ../gui/painting/qpainterpath_p.h ../gui/painting/qpathclipper_p.h ../gui/painting/qpdf_p.h ../gui/painting/qpen_p.h ../gui/painting/qpolygonclipper_p.h ../gui/painting/qprintengine_mac_p.h ../gui/painting/qprintengine_pdf_p.h ../gui/painting/qprintengine_ps_p.h ../gui/painting/qprintengine_qws_p.h ../gui/painting/qprintengine_win_p.h ../gui/painting/qprinter_p.h ../gui/painting/qprinterinfo_unix_p.h ../gui/painting/qrasterdefs_p.h ../gui/painting/qrasterizer_p.h ../gui/painting/qstroker_p.h ../gui/painting/qtessellator_p.h ../gui/painting/qtextureglyphcache_p.h ../gui/painting/qvectorpath_p.h ../gui/painting/qwindowsurface_mac_p.h ../gui/painting/qwindowsurface_p.h ../gui/painting/qwindowsurface_qws_p.h ../gui/painting/qwindowsurface_raster_p.h ../gui/painting/qwindowsurface_s60_p.h ../gui/painting/qwindowsurface_x11_p.h ++SYNCQT.HEADER_FILES = ../gui/dialogs/qabstractpagesetupdialog.h ../gui/dialogs/qabstractprintdialog.h ../gui/dialogs/qcolordialog.h ../gui/dialogs/qdialog.h ../gui/dialogs/qerrormessage.h ../gui/dialogs/qfiledialog.h ../gui/dialogs/qfilesystemmodel.h ../gui/dialogs/qfontdialog.h ../gui/dialogs/qinputdialog.h ../gui/dialogs/qmessagebox.h ../gui/dialogs/qpagesetupdialog.h ../gui/dialogs/qprintdialog.h ../gui/dialogs/qprintpreviewdialog.h ../gui/dialogs/qprogressdialog.h ../gui/dialogs/qwizard.h ../gui/embedded/qcopchannel_qws.h ../gui/embedded/qdecoration_qws.h ../gui/embedded/qdecorationdefault_qws.h ../gui/embedded/qdecorationfactory_qws.h ../gui/embedded/qdecorationplugin_qws.h ../gui/embedded/qdecorationstyled_qws.h ../gui/embedded/qdecorationwindows_qws.h ../gui/embedded/qdirectpainter_qws.h ../gui/embedded/qkbd_qws.h ../gui/embedded/qkbddriverfactory_qws.h ../gui/embedded/qkbddriverplugin_qws.h ../gui/embedded/qkbdlinuxinput_qws.h ../gui/embedded/qkbdqnx_qws.h ../gui/embedded/qkbdtty_qws.h ../gui/embedded/qkbdum_qws.h ../gui/embedded/qkbdvfb_qws.h ../gui/embedded/qmouse_qws.h ../gui/embedded/qmousedriverfactory_qws.h ../gui/embedded/qmousedriverplugin_qws.h ../gui/embedded/qmouselinuxinput_qws.h ../gui/embedded/qmouselinuxtp_qws.h ../gui/embedded/qmousepc_qws.h ../gui/embedded/qmouseqnx_qws.h ../gui/embedded/qmousetslib_qws.h ../gui/embedded/qmousevfb_qws.h ../gui/embedded/qscreen_qws.h ../gui/embedded/qscreendriverfactory_qws.h ../gui/embedded/qscreendriverplugin_qws.h ../gui/embedded/qscreenlinuxfb_qws.h ../gui/embedded/qscreenproxy_qws.h ../gui/embedded/qscreenqnx_qws.h ../gui/embedded/qscreentransformed_qws.h ../gui/embedded/qscreenvfb_qws.h ../gui/embedded/qsoundqss_qws.h ../gui/embedded/qtransportauth_qws.h ../gui/embedded/qtransportauthdefs_qws.h ../gui/embedded/qvfbhdr.h ../gui/embedded/qwindowsystem_qws.h ../gui/embedded/qwscursor_qws.h ../gui/embedded/qwsdisplay_qws.h ../gui/embedded/qwsembedwidget.h ../gui/embedded/qwsevent_qws.h ../gui/embedded/qwsmanager_qws.h ../gui/embedded/qwsproperty_qws.h ../gui/embedded/qwsprotocolitem_qws.h ../gui/embedded/qwssocket_qws.h ../gui/embedded/qwsutils_qws.h ../gui/graphicsview/qgraphicsanchorlayout.h ../gui/graphicsview/qgraphicsgridlayout.h ../gui/graphicsview/qgraphicsitem.h ../gui/graphicsview/qgraphicsitemanimation.h ../gui/graphicsview/qgraphicslayout.h ../gui/graphicsview/qgraphicslayoutitem.h ../gui/graphicsview/qgraphicslinearlayout.h ../gui/graphicsview/qgraphicsproxywidget.h ../gui/graphicsview/qgraphicsscene.h ../gui/graphicsview/qgraphicssceneevent.h ../gui/graphicsview/qgraphicstransform.h ../gui/graphicsview/qgraphicsview.h ../gui/graphicsview/qgraphicswidget.h ../gui/kernel/qaction.h ../gui/kernel/qactiongroup.h ../gui/kernel/qapplication.h ../gui/kernel/qboxlayout.h ../gui/kernel/qclipboard.h ../gui/kernel/qcursor.h ../gui/kernel/qdesktopwidget.h ../gui/kernel/qdrag.h ../gui/kernel/qevent.h ../gui/kernel/qformlayout.h ../gui/kernel/qgesture.h ../gui/kernel/qgesturerecognizer.h ../gui/kernel/qgridlayout.h ../gui/kernel/qguifunctions_wince.h ../gui/kernel/qkeysequence.h ../gui/kernel/qlayout.h ../gui/kernel/qlayoutitem.h ../gui/kernel/qmacdefines_mac.h ../gui/kernel/qmime.h ../gui/kernel/qpalette.h ../gui/kernel/qsessionmanager.h ../gui/kernel/qshortcut.h ../gui/kernel/qsizepolicy.h ../gui/kernel/qsound.h ../gui/kernel/qstackedlayout.h ../gui/kernel/qtooltip.h ../gui/kernel/qwhatsthis.h ../gui/kernel/qwidget.h ../gui/kernel/qwidgetaction.h ../gui/kernel/qwindowdefs.h ../gui/kernel/qwindowdefs_win.h ../gui/kernel/qx11embed_x11.h ../gui/kernel/qx11info_x11.h ../gui/effects/qgraphicseffect.h ../gui/s60framework/qs60mainapplication.h ../gui/s60framework/qs60mainappui.h ../gui/s60framework/qs60maindocument.h ../gui/math3d/qgenericmatrix.h ../gui/math3d/qmatrix4x4.h ../gui/math3d/qquaternion.h ../gui/math3d/qvector2d.h ../gui/math3d/qvector3d.h ../gui/math3d/qvector4d.h ../gui/image/qbitmap.h ../gui/image/qicon.h ../gui/image/qiconengine.h ../gui/image/qiconengineplugin.h ../gui/image/qimage.h ../gui/image/qimageiohandler.h ../gui/image/qimagereader.h ../gui/image/qimagewriter.h ../gui/image/qmovie.h ../gui/image/qpicture.h ../gui/image/qpictureformatplugin.h ../gui/image/qpixmap.h ../gui/image/qpixmapcache.h ../gui/symbian/qsymbianevent.h ../gui/text/qabstractfontengine_qws.h ../gui/text/qabstracttextdocumentlayout.h ../gui/text/qfont.h ../gui/text/qfontdatabase.h ../gui/text/qfontinfo.h ../gui/text/qfontmetrics.h ../gui/text/qstatictext.h ../gui/text/qsyntaxhighlighter.h ../gui/text/qtextcursor.h ../gui/text/qtextdocument.h ../gui/text/qtextdocumentfragment.h ../gui/text/qtextdocumentwriter.h ../gui/text/qtextformat.h ../gui/text/qtextlayout.h ../gui/text/qtextlist.h ../gui/text/qtextobject.h ../gui/text/qtextoption.h ../gui/text/qtexttable.h ../gui/itemviews/qabstractitemdelegate.h ../gui/itemviews/qabstractitemview.h ../gui/itemviews/qabstractproxymodel.h ../gui/itemviews/qcolumnview.h ../gui/itemviews/qdatawidgetmapper.h ../gui/itemviews/qdirmodel.h ../gui/itemviews/qfileiconprovider.h ../gui/itemviews/qheaderview.h ../gui/itemviews/qitemdelegate.h ../gui/itemviews/qitemeditorfactory.h ../gui/itemviews/qitemselectionmodel.h ../gui/itemviews/qlistview.h ../gui/itemviews/qlistwidget.h ../gui/itemviews/qproxymodel.h ../gui/itemviews/qsortfilterproxymodel.h ../gui/itemviews/qstandarditemmodel.h ../gui/itemviews/qstringlistmodel.h ../gui/itemviews/qstyleditemdelegate.h ../gui/itemviews/qtableview.h ../gui/itemviews/qtablewidget.h ../gui/itemviews/qtreeview.h ../gui/itemviews/qtreewidget.h ../gui/itemviews/qtreewidgetitemiterator.h ../gui/widgets/qabstractbutton.h ../gui/widgets/qabstractscrollarea.h ../gui/widgets/qabstractslider.h ../gui/widgets/qabstractspinbox.h ../gui/widgets/qbuttongroup.h ../gui/widgets/qcalendarwidget.h ../gui/widgets/qcheckbox.h ../gui/widgets/qcombobox.h ../gui/widgets/qcommandlinkbutton.h ../gui/widgets/qdatetimeedit.h ../gui/widgets/qdial.h ../gui/widgets/qdialogbuttonbox.h ../gui/widgets/qdockwidget.h ../gui/widgets/qfocusframe.h ../gui/widgets/qfontcombobox.h ../gui/widgets/qframe.h ../gui/widgets/qgroupbox.h ../gui/widgets/qlabel.h ../gui/widgets/qlcdnumber.h ../gui/widgets/qlineedit.h ../gui/widgets/qmaccocoaviewcontainer_mac.h ../gui/widgets/qmacnativewidget_mac.h ../gui/widgets/qmainwindow.h ../gui/widgets/qmdiarea.h ../gui/widgets/qmdisubwindow.h ../gui/widgets/qmenu.h ../gui/widgets/qmenubar.h ../gui/widgets/qmenudata.h ../gui/widgets/qplaintextedit.h ../gui/widgets/qprintpreviewwidget.h ../gui/widgets/qprogressbar.h ../gui/widgets/qpushbutton.h ../gui/widgets/qradiobutton.h ../gui/widgets/qrubberband.h ../gui/widgets/qscrollarea.h ../gui/widgets/qscrollbar.h ../gui/widgets/qsizegrip.h ../gui/widgets/qslider.h ../gui/widgets/qspinbox.h ../gui/widgets/qsplashscreen.h ../gui/widgets/qsplitter.h ../gui/widgets/qstackedwidget.h ../gui/widgets/qstatusbar.h ../gui/widgets/qtabbar.h ../gui/widgets/qtabwidget.h ../gui/widgets/qtextbrowser.h ../gui/widgets/qtextedit.h ../gui/widgets/qtoolbar.h ../gui/widgets/qtoolbox.h ../gui/widgets/qtoolbutton.h ../gui/widgets/qvalidator.h ../gui/widgets/qworkspace.h ../gui/statemachine/qkeyeventtransition.h ../gui/statemachine/qmouseeventtransition.h ../gui/util/qcompleter.h ../gui/util/qdesktopservices.h ../gui/util/qsystemtrayicon.h ../gui/util/qundogroup.h ../gui/util/qundostack.h ../gui/util/qundoview.h ../gui/accessible/qaccessible.h ../gui/accessible/qaccessible2.h ../gui/accessible/qaccessiblebridge.h ../gui/accessible/qaccessibleobject.h ../gui/accessible/qaccessibleplugin.h ../gui/accessible/qaccessiblewidget.h ../gui/styles/qcdestyle.h ../gui/styles/qcleanlooksstyle.h ../gui/styles/qcommonstyle.h ../gui/styles/qgtkstyle.h ../gui/styles/qmacstyle_mac.h ../gui/styles/qmotifstyle.h ../gui/styles/qplastiquestyle.h ../gui/styles/qproxystyle.h ../gui/styles/qs60style.h ../gui/styles/qstyle.h ../gui/styles/qstylefactory.h ../gui/styles/qstyleoption.h ../gui/styles/qstyleplugin.h ../gui/styles/qwindowscestyle.h ../gui/styles/qwindowsmobilestyle.h ../gui/styles/qwindowsstyle.h ../gui/styles/qwindowsvistastyle.h ../gui/styles/qwindowsxpstyle.h ../gui/inputmethod/qinputcontext.h ../gui/inputmethod/qinputcontextfactory.h ../gui/inputmethod/qinputcontextplugin.h ../gui/painting/qbrush.h ../gui/painting/qcolor.h ../gui/painting/qcolormap.h ../gui/painting/qdrawutil.h ../gui/painting/qmatrix.h ../gui/painting/qpaintdevice.h ../gui/painting/qpaintengine.h ../gui/painting/qpainter.h ../gui/painting/qpainterpath.h ../gui/painting/qpen.h ../gui/painting/qpolygon.h ../gui/painting/qprintengine.h ../gui/painting/qprinter.h ../gui/painting/qprinterinfo.h ../gui/painting/qregion.h ../gui/painting/qrgb.h ../gui/painting/qstylepainter.h ../gui/painting/qtransform.h ../gui/painting/qwmatrix.h ../../include/QtGui/QtGui ../gui/kernel/qwindowdefs_haiku.h ../gui/kernel/qwidget_haiku.h ../gui/util/qsystemtrayicon_haiku.h ++SYNCQT.HEADER_CLASSES = ../../include/QtGui/QAbstractPageSetupDialog ../../include/QtGui/QAbstractPrintDialog ../../include/QtGui/QColorDialog ../../include/QtGui/QDialog ../../include/QtGui/QErrorMessage ../../include/QtGui/QFileDialog ../../include/QtGui/QFileSystemModel ../../include/QtGui/QFontDialog ../../include/QtGui/QInputDialog ../../include/QtGui/QMessageBox ../../include/QtGui/QPageSetupDialog ../../include/QtGui/QUnixPrintWidget ../../include/QtGui/QPrintDialog ../../include/QtGui/QPrintPreviewDialog ../../include/QtGui/QProgressDialog ../../include/QtGui/QWizard ../../include/QtGui/QWizardPage ../../include/QtGui/QCopChannel ../../include/QtGui/QDecorationAction ../../include/QtGui/QDecoration ../../include/QtGui/QDecorationDefault ../../include/QtGui/QDecorationFactory ../../include/QtGui/QDecorationFactoryInterface ../../include/QtGui/QDecorationPlugin ../../include/QtGui/QDecorationStyled ../../include/QtGui/QDecorationWindows ../../include/QtGui/QDirectPainter ../../include/QtGui/QWSKeyboardHandler ../../include/QtGui/QKbdDriverFactory ../../include/QtGui/QWSKeyboardHandlerFactoryInterface ../../include/QtGui/QKbdDriverPlugin ../../include/QtGui/QWSLinuxInputKeyboardHandler ../../include/QtGui/QWSQnxKeyboardHandler ../../include/QtGui/QWSTtyKeyboardHandler ../../include/QtGui/QWSUmKeyboardHandler ../../include/QtGui/QVFbKeyboardHandler ../../include/QtGui/QWSPointerCalibrationData ../../include/QtGui/QWSMouseHandler ../../include/QtGui/QWSCalibratedMouseHandler ../../include/QtGui/QMouseDriverFactory ../../include/QtGui/QWSMouseHandlerFactoryInterface ../../include/QtGui/QMouseDriverPlugin ../../include/QtGui/QWSLinuxInputMouseHandler ../../include/QtGui/QWSLinuxTPMouseHandler ../../include/QtGui/QWSPcMouseHandler ../../include/QtGui/QQnxMouseHandler ../../include/QtGui/QWSTslibMouseHandler ../../include/QtGui/QVFbMouseHandler ../../include/QtGui/QScreenCursor ../../include/QtGui/QPoolEntry ../../include/QtGui/QScreen ../../include/QtGui/QScreenDriverFactory ../../include/QtGui/QScreenDriverFactoryInterface ../../include/QtGui/QScreenDriverPlugin ../../include/QtGui/QLinuxFb_Shared ../../include/QtGui/QLinuxFbScreen ../../include/QtGui/QProxyScreenCursor ../../include/QtGui/QProxyScreen ../../include/QtGui/QQnxScreen ../../include/QtGui/QTransformedScreen ../../include/QtGui/QVFbScreen ../../include/QtGui/QWSSoundServer ../../include/QtGui/QWSSoundClient ../../include/QtGui/QWSSoundServerSocket ../../include/QtGui/QTransportAuth ../../include/QtGui/QAuthDevice ../../include/QtGui/QVFbHeader ../../include/QtGui/QVFbKeyData ../../include/QtGui/QWSInternalWindowInfo ../../include/QtGui/QWSScreenSaver ../../include/QtGui/QWSWindow ../../include/QtGui/QWSServer ../../include/QtGui/QWSInputMethod ../../include/QtGui/QWSCursorMap ../../include/QtGui/QWSClient ../../include/QtGui/QWSCursor ../../include/QtGui/QWSWindowInfo ../../include/QtGui/QWSDisplay ../../include/QtGui/QWSEmbedWidget ../../include/QtGui/QWSEvent ../../include/QtGui/QWSManager ../../include/QtGui/QWSPropertyManager ../../include/QtGui/QWSProtocolItem ../../include/QtGui/QWSSocket ../../include/QtGui/QWSServerSocket ../../include/QtGui/QGraphicsAnchor ../../include/QtGui/QGraphicsAnchorLayout ../../include/QtGui/QGraphicsGridLayout ../../include/QtGui/QGraphicsItem ../../include/QtGui/QGraphicsObject ../../include/QtGui/QAbstractGraphicsShapeItem ../../include/QtGui/QGraphicsPathItem ../../include/QtGui/QGraphicsRectItem ../../include/QtGui/QGraphicsEllipseItem ../../include/QtGui/QGraphicsPolygonItem ../../include/QtGui/QGraphicsLineItem ../../include/QtGui/QGraphicsPixmapItem ../../include/QtGui/QGraphicsTextItem ../../include/QtGui/QGraphicsSimpleTextItem ../../include/QtGui/QGraphicsItemGroup ../../include/QtGui/QGraphicsItemAnimation ../../include/QtGui/QGraphicsLayout ../../include/QtGui/QGraphicsLayoutItem ../../include/QtGui/QGraphicsLinearLayout ../../include/QtGui/QGraphicsProxyWidget ../../include/QtGui/QGraphicsScene ../../include/QtGui/QGraphicsSceneEvent ../../include/QtGui/QGraphicsSceneMouseEvent ../../include/QtGui/QGraphicsSceneWheelEvent ../../include/QtGui/QGraphicsSceneContextMenuEvent ../../include/QtGui/QGraphicsSceneHoverEvent ../../include/QtGui/QGraphicsSceneHelpEvent ../../include/QtGui/QGraphicsSceneDragDropEvent ../../include/QtGui/QGraphicsSceneResizeEvent ../../include/QtGui/QGraphicsSceneMoveEvent ../../include/QtGui/QGraphicsTransform ../../include/QtGui/QGraphicsScale ../../include/QtGui/QGraphicsRotation ../../include/QtGui/QGraphicsView ../../include/QtGui/QGraphicsWidget ../../include/QtGui/QAction ../../include/QtGui/QActionGroup ../../include/QtGui/QApplication ../../include/QtGui/QBoxLayout ../../include/QtGui/QHBoxLayout ../../include/QtGui/QVBoxLayout ../../include/QtGui/QClipboard ../../include/QtGui/QCursor ../../include/QtGui/QCursorShape ../../include/QtGui/QDesktopWidget ../../include/QtGui/QDrag ../../include/QtGui/QtEvents ../../include/QtGui/QInputEvent ../../include/QtGui/QMouseEvent ../../include/QtGui/QHoverEvent ../../include/QtGui/QWheelEvent ../../include/QtGui/QTabletEvent ../../include/QtGui/QKeyEvent ../../include/QtGui/QFocusEvent ../../include/QtGui/QPaintEvent ../../include/QtGui/QUpdateLaterEvent ../../include/QtGui/QMoveEvent ../../include/QtGui/QResizeEvent ../../include/QtGui/QCloseEvent ../../include/QtGui/QIconDragEvent ../../include/QtGui/QShowEvent ../../include/QtGui/QHideEvent ../../include/QtGui/QContextMenuEvent ../../include/QtGui/QInputMethodEvent ../../include/QtGui/QDropEvent ../../include/QtGui/QDragMoveEvent ../../include/QtGui/QDragEnterEvent ../../include/QtGui/QDragResponseEvent ../../include/QtGui/QDragLeaveEvent ../../include/QtGui/QHelpEvent ../../include/QtGui/QStatusTipEvent ../../include/QtGui/QWhatsThisClickedEvent ../../include/QtGui/QActionEvent ../../include/QtGui/QFileOpenEvent ../../include/QtGui/QToolBarChangeEvent ../../include/QtGui/QShortcutEvent ../../include/QtGui/QClipboardEvent ../../include/QtGui/QWindowStateChangeEvent ../../include/QtGui/QMenubarUpdatedEvent ../../include/QtGui/QTouchEvent ../../include/QtGui/QGestureEvent ../../include/QtGui/QFormLayout ../../include/QtGui/QGesture ../../include/QtGui/QPanGesture ../../include/QtGui/QPinchGesture ../../include/QtGui/QSwipeGesture ../../include/QtGui/QTapGesture ../../include/QtGui/QTapAndHoldGesture ../../include/QtGui/QGestureRecognizer ../../include/QtGui/QGridLayout ../../include/QtGui/QKeySequence ../../include/QtGui/QLayoutIterator ../../include/QtGui/QLayout ../../include/QtGui/QLayoutItem ../../include/QtGui/QSpacerItem ../../include/QtGui/QWidgetItem ../../include/QtGui/QWidgetItemV2 ../../include/QtGui/QMimeSource ../../include/QtGui/QWindowsMime ../../include/QtGui/QMacMime ../../include/QtGui/QMacPasteboardMime ../../include/QtGui/QPalette ../../include/QtGui/QColorGroup ../../include/QtGui/QSessionManager ../../include/QtGui/QShortcut ../../include/QtGui/QSizePolicy ../../include/QtGui/QSound ../../include/QtGui/QStackedLayout ../../include/QtGui/QToolTip ../../include/QtGui/QWhatsThis ../../include/QtGui/QWidgetData ../../include/QtGui/QWidget ../../include/QtGui/QWidgetAction ../../include/QtGui/QWidgetList ../../include/QtGui/QWidgetMapper ../../include/QtGui/QWidgetSet ../../include/QtGui/QX11EmbedWidget ../../include/QtGui/QX11EmbedContainer ../../include/QtGui/QX11Info ../../include/QtGui/QGraphicsEffect ../../include/QtGui/QGraphicsColorizeEffect ../../include/QtGui/QGraphicsBlurEffect ../../include/QtGui/QGraphicsDropShadowEffect ../../include/QtGui/QGraphicsOpacityEffect ../../include/QtGui/QS60MainApplicationBase ../../include/QtGui/QS60MainApplication ../../include/QtGui/QS60MainAppUiBase ../../include/QtGui/QS60StubAknAppUiBase ../../include/QtGui/QS60StubMEikStatusPaneObserver ../../include/QtGui/QS60StubMAknTouchPaneObserver ../../include/QtGui/QS60StubAknAppUi ../../include/QtGui/QS60MainAppUi ../../include/QtGui/QS60MainDocumentBase ../../include/QtGui/QS60MainDocument ../../include/QtGui/QGenericMatrix ../../include/QtGui/QMatrix2x2 ../../include/QtGui/QMatrix2x3 ../../include/QtGui/QMatrix2x4 ../../include/QtGui/QMatrix3x2 ../../include/QtGui/QMatrix3x3 ../../include/QtGui/QMatrix3x4 ../../include/QtGui/QMatrix4x2 ../../include/QtGui/QMatrix4x3 ../../include/QtGui/QMatrix4x4 ../../include/QtGui/QQuaternion ../../include/QtGui/QVector2D ../../include/QtGui/QVector3D ../../include/QtGui/QVector4D ../../include/QtGui/QBitmap ../../include/QtGui/QIcon ../../include/QtGui/QIconSet ../../include/QtGui/QIconEngine ../../include/QtGui/QIconEngineV2 ../../include/QtGui/QIconEngineFactoryInterface ../../include/QtGui/QIconEnginePlugin ../../include/QtGui/QIconEngineFactoryInterfaceV2 ../../include/QtGui/QIconEnginePluginV2 ../../include/QtGui/QImageTextKeyLang ../../include/QtGui/QImage ../../include/QtGui/QImageIOHandler ../../include/QtGui/QImageIOHandlerFactoryInterface ../../include/QtGui/QImageIOPlugin ../../include/QtGui/QImageReader ../../include/QtGui/QImageWriter ../../include/QtGui/QMovie ../../include/QtGui/QPicture ../../include/QtGui/QPictureIO ../../include/QtGui/QPictureFormatInterface ../../include/QtGui/QPictureFormatPlugin ../../include/QtGui/QPixmap ../../include/QtGui/QPixmapCache ../../include/QtGui/QSymbianEvent ../../include/QtGui/QFontEngineInfo ../../include/QtGui/QFontEngineFactoryInterface ../../include/QtGui/QFontEnginePlugin ../../include/QtGui/QAbstractFontEngine ../../include/QtGui/QAbstractTextDocumentLayout ../../include/QtGui/QTextObjectInterface ../../include/QtGui/QFont ../../include/QtGui/QFontDatabase ../../include/QtGui/QFontInfo ../../include/QtGui/QFontMetrics ../../include/QtGui/QFontMetricsF ../../include/QtGui/QStaticText ../../include/QtGui/QSyntaxHighlighter ../../include/QtGui/QTextCursor ../../include/QtGui/QAbstractUndoItem ../../include/QtGui/QTextDocument ../../include/QtGui/QTextDocumentFragment ../../include/QtGui/QTextDocumentWriter ../../include/QtGui/QTextLength ../../include/QtGui/QTextFormat ../../include/QtGui/QTextCharFormat ../../include/QtGui/QTextBlockFormat ../../include/QtGui/QTextListFormat ../../include/QtGui/QTextImageFormat ../../include/QtGui/QTextFrameFormat ../../include/QtGui/QTextTableFormat ../../include/QtGui/QTextTableCellFormat ../../include/QtGui/QTextInlineObject ../../include/QtGui/QTextLayout ../../include/QtGui/QTextLine ../../include/QtGui/QTextList ../../include/QtGui/QTextObject ../../include/QtGui/QTextBlockGroup ../../include/QtGui/QTextFrameLayoutData ../../include/QtGui/QTextFrame ../../include/QtGui/QTextBlockUserData ../../include/QtGui/QTextBlock ../../include/QtGui/QTextFragment ../../include/QtGui/QTextOption ../../include/QtGui/QTextTableCell ../../include/QtGui/QTextTable ../../include/QtGui/QAbstractItemDelegate ../../include/QtGui/QAbstractItemView ../../include/QtGui/QAbstractProxyModel ../../include/QtGui/QColumnView ../../include/QtGui/QDataWidgetMapper ../../include/QtGui/QDirModel ../../include/QtGui/QFileIconProvider ../../include/QtGui/QHeaderView ../../include/QtGui/QItemDelegate ../../include/QtGui/QItemEditorCreatorBase ../../include/QtGui/QItemEditorCreator ../../include/QtGui/QStandardItemEditorCreator ../../include/QtGui/QItemEditorFactory ../../include/QtGui/QItemSelectionRange ../../include/QtGui/QItemSelectionModel ../../include/QtGui/QItemSelection ../../include/QtGui/QListView ../../include/QtGui/QListWidgetItem ../../include/QtGui/QListWidget ../../include/QtGui/QProxyModel ../../include/QtGui/QSortFilterProxyModel ../../include/QtGui/QStandardItem ../../include/QtGui/QStandardItemModel ../../include/QtGui/QStringListModel ../../include/QtGui/QStyledItemDelegate ../../include/QtGui/QTableView ../../include/QtGui/QTableWidgetSelectionRange ../../include/QtGui/QTableWidgetItem ../../include/QtGui/QTableWidget ../../include/QtGui/QTreeView ../../include/QtGui/QTreeWidgetItem ../../include/QtGui/QTreeWidget ../../include/QtGui/QTreeWidgetItemIterator ../../include/QtGui/QAbstractButton ../../include/QtGui/QAbstractScrollArea ../../include/QtGui/QAbstractSlider ../../include/QtGui/QAbstractSpinBox ../../include/QtGui/QButtonGroup ../../include/QtGui/QCalendarWidget ../../include/QtGui/QCheckBox ../../include/QtGui/QComboBox ../../include/QtGui/QCommandLinkButton ../../include/QtGui/QDateTimeEdit ../../include/QtGui/QTimeEdit ../../include/QtGui/QDateEdit ../../include/QtGui/QDial ../../include/QtGui/QDialogButtonBox ../../include/QtGui/QDockWidget ../../include/QtGui/QFocusFrame ../../include/QtGui/QFontComboBox ../../include/QtGui/QFrame ../../include/QtGui/QGroupBox ../../include/QtGui/QLabel ../../include/QtGui/QLCDNumber ../../include/QtGui/QLineEdit ../../include/QtGui/QMacCocoaViewContainer ../../include/QtGui/QMacNativeWidget ../../include/QtGui/QMainWindow ../../include/QtGui/QMdiArea ../../include/QtGui/QMdiSubWindow ../../include/QtGui/QMenu ../../include/QtGui/QMenuBar ../../include/QtGui/QMenuItem ../../include/QtGui/QPlainTextEdit ../../include/QtGui/QPlainTextDocumentLayout ../../include/QtGui/QPrintPreviewWidget ../../include/QtGui/QProgressBar ../../include/QtGui/QPushButton ../../include/QtGui/QRadioButton ../../include/QtGui/QRubberBand ../../include/QtGui/QScrollArea ../../include/QtGui/QScrollBar ../../include/QtGui/QSizeGrip ../../include/QtGui/QSlider ../../include/QtGui/QSpinBox ../../include/QtGui/QDoubleSpinBox ../../include/QtGui/QSplashScreen ../../include/QtGui/QSplitter ../../include/QtGui/QSplitterHandle ../../include/QtGui/QStackedWidget ../../include/QtGui/QStatusBar ../../include/QtGui/QTabBar ../../include/QtGui/QTabWidget ../../include/QtGui/QTextBrowser ../../include/QtGui/QTextEdit ../../include/QtGui/QToolBar ../../include/QtGui/QToolBox ../../include/QtGui/QToolButton ../../include/QtGui/QValidator ../../include/QtGui/QIntValidator ../../include/QtGui/QDoubleValidator ../../include/QtGui/QRegExpValidator ../../include/QtGui/QWorkspace ../../include/QtGui/QKeyEventTransition ../../include/QtGui/QMouseEventTransition ../../include/QtGui/QCompleter ../../include/QtGui/QDesktopServices ../../include/QtGui/QSystemTrayIcon ../../include/QtGui/QUndoGroup ../../include/QtGui/QUndoCommand ../../include/QtGui/QUndoStack ../../include/QtGui/QUndoView ../../include/QtGui/QAccessible ../../include/QtGui/QAccessibleInterface ../../include/QtGui/QAccessibleInterfaceEx ../../include/QtGui/QAccessibleEvent ../../include/QtGui/QAccessible2Interface ../../include/QtGui/QAccessibleTextInterface ../../include/QtGui/QAccessibleEditableTextInterface ../../include/QtGui/QAccessibleSimpleEditableTextInterface ../../include/QtGui/QAccessibleValueInterface ../../include/QtGui/QAccessibleTableInterface ../../include/QtGui/QAccessibleActionInterface ../../include/QtGui/QAccessibleImageInterface ../../include/QtGui/QAccessibleBridge ../../include/QtGui/QAccessibleBridgeFactoryInterface ../../include/QtGui/QAccessibleBridgePlugin ../../include/QtGui/QAccessibleObject ../../include/QtGui/QAccessibleObjectEx ../../include/QtGui/QAccessibleApplication ../../include/QtGui/QAccessibleFactoryInterface ../../include/QtGui/QAccessiblePlugin ../../include/QtGui/QAccessibleWidget ../../include/QtGui/QAccessibleWidgetEx ../../include/QtGui/QCDEStyle ../../include/QtGui/QCleanlooksStyle ../../include/QtGui/QCommonStyle ../../include/QtGui/QGtkStyle ../../include/QtGui/QMacStyle ../../include/QtGui/QMotifStyle ../../include/QtGui/QPlastiqueStyle ../../include/QtGui/QProxyStyle ../../include/QtGui/QS60Style ../../include/QtGui/QStyle ../../include/QtGui/QStyleFactory ../../include/QtGui/QStyleOption ../../include/QtGui/QStyleOptionFocusRect ../../include/QtGui/QStyleOptionFrame ../../include/QtGui/QStyleOptionFrameV2 ../../include/QtGui/QStyleOptionFrameV3 ../../include/QtGui/QStyleOptionTabWidgetFrame ../../include/QtGui/QStyleOptionTabWidgetFrameV2 ../../include/QtGui/QStyleOptionTabBarBase ../../include/QtGui/QStyleOptionTabBarBaseV2 ../../include/QtGui/QStyleOptionHeader ../../include/QtGui/QStyleOptionButton ../../include/QtGui/QStyleOptionTab ../../include/QtGui/QStyleOptionTabV2 ../../include/QtGui/QStyleOptionTabV3 ../../include/QtGui/QStyleOptionToolBar ../../include/QtGui/QStyleOptionProgressBar ../../include/QtGui/QStyleOptionProgressBarV2 ../../include/QtGui/QStyleOptionMenuItem ../../include/QtGui/QStyleOptionQ3ListViewItem ../../include/QtGui/QStyleOptionQ3DockWindow ../../include/QtGui/QStyleOptionDockWidget ../../include/QtGui/QStyleOptionDockWidgetV2 ../../include/QtGui/QStyleOptionViewItem ../../include/QtGui/QStyleOptionViewItemV2 ../../include/QtGui/QStyleOptionViewItemV3 ../../include/QtGui/QStyleOptionViewItemV4 ../../include/QtGui/QStyleOptionToolBox ../../include/QtGui/QStyleOptionToolBoxV2 ../../include/QtGui/QStyleOptionRubberBand ../../include/QtGui/QStyleOptionComplex ../../include/QtGui/QStyleOptionSlider ../../include/QtGui/QStyleOptionSpinBox ../../include/QtGui/QStyleOptionQ3ListView ../../include/QtGui/QStyleOptionToolButton ../../include/QtGui/QStyleOptionComboBox ../../include/QtGui/QStyleOptionTitleBar ../../include/QtGui/QStyleOptionGroupBox ../../include/QtGui/QStyleOptionSizeGrip ../../include/QtGui/QStyleOptionGraphicsItem ../../include/QtGui/QStyleHintReturn ../../include/QtGui/QStyleHintReturnMask ../../include/QtGui/QStyleHintReturnVariant ../../include/QtGui/QStyleFactoryInterface ../../include/QtGui/QStylePlugin ../../include/QtGui/QWindowsCEStyle ../../include/QtGui/QWindowsMobileStyle ../../include/QtGui/QWindowsStyle ../../include/QtGui/QWindowsVistaStyle ../../include/QtGui/QWindowsXPStyle ../../include/QtGui/QInputContext ../../include/QtGui/QInputContextFactory ../../include/QtGui/QInputContextFactoryInterface ../../include/QtGui/QInputContextPlugin ../../include/QtGui/QBrush ../../include/QtGui/QBrushData ../../include/QtGui/QGradientStop ../../include/QtGui/QGradientStops ../../include/QtGui/QGradient ../../include/QtGui/QLinearGradient ../../include/QtGui/QRadialGradient ../../include/QtGui/QConicalGradient ../../include/QtGui/QColor ../../include/QtGui/QColormap ../../include/QtGui/QTileRules ../../include/QtGui/QMatrix ../../include/QtGui/QPaintDevice ../../include/QtGui/QTextItem ../../include/QtGui/QPaintEngine ../../include/QtGui/QPaintEngineState ../../include/QtGui/QPainter ../../include/QtGui/QPainterPath ../../include/QtGui/QPainterPathPrivate ../../include/QtGui/QPainterPathStroker ../../include/QtGui/QPen ../../include/QtGui/QPolygon ../../include/QtGui/QPolygonF ../../include/QtGui/QPrintEngine ../../include/QtGui/QPrinter ../../include/QtGui/QPrinterInfo ../../include/QtGui/QRegion ../../include/QtGui/QRgb ../../include/QtGui/QStylePainter ../../include/QtGui/QTransform ../../include/QtGui/QWMatrix ../../include/QtGui/QHaikuStyle ../../include/QtGui/QtHaikuView ../../include/QtGui/QtHaikuWindow ++SYNCQT.PRIVATE_HEADER_FILES = ../gui/dialogs/qabstractpagesetupdialog_p.h ../gui/dialogs/qabstractprintdialog_p.h ../gui/dialogs/qcolordialog_p.h ../gui/dialogs/qdialog_p.h ../gui/dialogs/qfiledialog_p.h ../gui/dialogs/qfiledialog_win_p.h ../gui/dialogs/qfileinfogatherer_p.h ../gui/dialogs/qfilesystemmodel_p.h ../gui/dialogs/qfontdialog_p.h ../gui/dialogs/qfscompleter_p.h ../gui/dialogs/qpagesetupdialog_unix_p.h ../gui/dialogs/qsidebar_p.h ../gui/dialogs/qwizard_win_p.h ../gui/embedded/qkbd_defaultmap_qws_p.h ../gui/embedded/qkbd_qws_p.h ../gui/embedded/qlock_p.h ../gui/embedded/qscreenmulti_qws_p.h ../gui/embedded/qtransportauth_qws_p.h ../gui/embedded/qunixsocket_p.h ../gui/embedded/qunixsocketserver_p.h ../gui/embedded/qwindowsystem_p.h ../gui/embedded/qwscommand_qws_p.h ../gui/embedded/qwsdisplay_qws_p.h ../gui/embedded/qwslock_p.h ../gui/embedded/qwsmanager_p.h ../gui/embedded/qwssharedmemory_p.h ../gui/embedded/qwssignalhandler_p.h ../gui/graphicsview/qgraph_p.h ../gui/graphicsview/qgraphicsanchorlayout_p.h ../gui/graphicsview/qgraphicsitem_p.h ../gui/graphicsview/qgraphicslayout_p.h ../gui/graphicsview/qgraphicslayoutitem_p.h ../gui/graphicsview/qgraphicsproxywidget_p.h ../gui/graphicsview/qgraphicsscene_bsp_p.h ../gui/graphicsview/qgraphicsscene_p.h ../gui/graphicsview/qgraphicsscenebsptreeindex_p.h ../gui/graphicsview/qgraphicssceneindex_p.h ../gui/graphicsview/qgraphicsscenelinearindex_p.h ../gui/graphicsview/qgraphicstransform_p.h ../gui/graphicsview/qgraphicsview_p.h ../gui/graphicsview/qgraphicswidget_p.h ../gui/graphicsview/qgridlayoutengine_p.h ../gui/graphicsview/qsimplex_p.h ../gui/kernel/qaction_p.h ../gui/kernel/qapplication_p.h ../gui/kernel/qclipboard_p.h ../gui/kernel/qcocoaapplication_mac_p.h ../gui/kernel/qcocoaapplicationdelegate_mac_p.h ../gui/kernel/qcocoamenuloader_mac_p.h ../gui/kernel/qcocoapanel_mac_p.h ../gui/kernel/qcocoasharedwindowmethods_mac_p.h ../gui/kernel/qcocoaview_mac_p.h ../gui/kernel/qcocoawindow_mac_p.h ../gui/kernel/qcocoawindowcustomthemeframe_mac_p.h ../gui/kernel/qcocoawindowdelegate_mac_p.h ../gui/kernel/qcursor_p.h ../gui/kernel/qdesktopwidget_mac_p.h ../gui/kernel/qdnd_p.h ../gui/kernel/qevent_p.h ../gui/kernel/qeventdispatcher_glib_qws_p.h ../gui/kernel/qeventdispatcher_mac_p.h ../gui/kernel/qeventdispatcher_qws_p.h ../gui/kernel/qeventdispatcher_s60_p.h ../gui/kernel/qeventdispatcher_x11_p.h ../gui/kernel/qgesture_p.h ../gui/kernel/qgesturemanager_p.h ../gui/kernel/qguieventdispatcher_glib_p.h ../gui/kernel/qguiplatformplugin_p.h ../gui/kernel/qkde_p.h ../gui/kernel/qkeymapper_p.h ../gui/kernel/qkeysequence_p.h ../gui/kernel/qlayout_p.h ../gui/kernel/qlayoutengine_p.h ../gui/kernel/qmacgesturerecognizer_mac_p.h ../gui/kernel/qmultitouch_mac_p.h ../gui/kernel/qnsframeview_mac_p.h ../gui/kernel/qnsthemeframe_mac_p.h ../gui/kernel/qnstitledframe_mac_p.h ../gui/kernel/qshortcutmap_p.h ../gui/kernel/qsoftkeymanager_common_p.h ../gui/kernel/qsoftkeymanager_p.h ../gui/kernel/qsoftkeymanager_s60_p.h ../gui/kernel/qsound_p.h ../gui/kernel/qstandardgestures_p.h ../gui/kernel/qt_cocoa_helpers_mac_p.h ../gui/kernel/qt_gui_pch.h ../gui/kernel/qt_mac_p.h ../gui/kernel/qt_s60_p.h ../gui/kernel/qt_x11_p.h ../gui/kernel/qwidget_p.h ../gui/kernel/qwidgetaction_p.h ../gui/kernel/qwinnativepangesturerecognizer_win_p.h ../gui/effects/qgraphicseffect_p.h ../gui/s60framework/qs60mainapplication_p.h ../gui/image/qbmphandler_p.h ../gui/image/qgifhandler_p.h ../gui/image/qicon_p.h ../gui/image/qiconloader_p.h ../gui/image/qimage_p.h ../gui/image/qimagepixmapcleanuphooks_p.h ../gui/image/qjpeghandler_p.h ../gui/image/qmnghandler_p.h ../gui/image/qnativeimage_p.h ../gui/image/qpaintengine_pic_p.h ../gui/image/qpicture_p.h ../gui/image/qpixmap_mac_p.h ../gui/image/qpixmap_raster_p.h ../gui/image/qpixmap_s60_p.h ../gui/image/qpixmap_x11_p.h ../gui/image/qpixmapcache_p.h ../gui/image/qpixmapdata_p.h ../gui/image/qpixmapdatafactory_p.h ../gui/image/qpixmapfilter_p.h ../gui/image/qpnghandler_p.h ../gui/image/qppmhandler_p.h ../gui/image/qtiffhandler_p.h ../gui/image/qxbmhandler_p.h ../gui/image/qxpmhandler_p.h ../gui/text/qabstractfontengine_p.h ../gui/text/qabstracttextdocumentlayout_p.h ../gui/text/qcssparser_p.h ../gui/text/qfont_p.h ../gui/text/qfontengine_ft_p.h ../gui/text/qfontengine_p.h ../gui/text/qfontengine_qpf_p.h ../gui/text/qfontengine_s60_p.h ../gui/text/qfontengine_win_p.h ../gui/text/qfontengine_x11_p.h ../gui/text/qfontengineglyphcache_p.h ../gui/text/qfontsubset_p.h ../gui/text/qfragmentmap_p.h ../gui/text/qstatictext_p.h ../gui/text/qtextcontrol_p.h ../gui/text/qtextcontrol_p_p.h ../gui/text/qtextcursor_p.h ../gui/text/qtextdocument_p.h ../gui/text/qtextdocumentfragment_p.h ../gui/text/qtextdocumentlayout_p.h ../gui/text/qtextengine_p.h ../gui/text/qtextformat_p.h ../gui/text/qtexthtmlparser_p.h ../gui/text/qtextimagehandler_p.h ../gui/text/qtextobject_p.h ../gui/text/qtextodfwriter_p.h ../gui/text/qtexttable_p.h ../gui/text/qzipreader_p.h ../gui/text/qzipwriter_p.h ../gui/itemviews/qabstractitemview_p.h ../gui/itemviews/qabstractproxymodel_p.h ../gui/itemviews/qbsptree_p.h ../gui/itemviews/qcolumnview_p.h ../gui/itemviews/qcolumnviewgrip_p.h ../gui/itemviews/qheaderview_p.h ../gui/itemviews/qitemeditorfactory_p.h ../gui/itemviews/qitemselectionmodel_p.h ../gui/itemviews/qlistview_p.h ../gui/itemviews/qlistwidget_p.h ../gui/itemviews/qproxymodel_p.h ../gui/itemviews/qstandarditemmodel_p.h ../gui/itemviews/qtableview_p.h ../gui/itemviews/qtablewidget_p.h ../gui/itemviews/qtreeview_p.h ../gui/itemviews/qtreewidget_p.h ../gui/itemviews/qtreewidgetitemiterator_p.h ../gui/itemviews/qwidgetitemdata_p.h ../gui/widgets/qabstractbutton_p.h ../gui/widgets/qabstractscrollarea_p.h ../gui/widgets/qabstractslider_p.h ../gui/widgets/qabstractspinbox_p.h ../gui/widgets/qcalendartextnavigator_p.h ../gui/widgets/qcocoamenu_mac_p.h ../gui/widgets/qcocoatoolbardelegate_mac_p.h ../gui/widgets/qcombobox_p.h ../gui/widgets/qdatetimeedit_p.h ../gui/widgets/qdockarealayout_p.h ../gui/widgets/qdockwidget_p.h ../gui/widgets/qeffects_p.h ../gui/widgets/qframe_p.h ../gui/widgets/qlabel_p.h ../gui/widgets/qlinecontrol_p.h ../gui/widgets/qlineedit_p.h ../gui/widgets/qmainwindowlayout_p.h ../gui/widgets/qmdiarea_p.h ../gui/widgets/qmdisubwindow_p.h ../gui/widgets/qmenu_p.h ../gui/widgets/qmenu_wince_resource_p.h ../gui/widgets/qmenubar_p.h ../gui/widgets/qplaintextedit_p.h ../gui/widgets/qpushbutton_p.h ../gui/widgets/qscrollarea_p.h ../gui/widgets/qsplitter_p.h ../gui/widgets/qtabbar_p.h ../gui/widgets/qtextedit_p.h ../gui/widgets/qtoolbar_p.h ../gui/widgets/qtoolbararealayout_p.h ../gui/widgets/qtoolbarextension_p.h ../gui/widgets/qtoolbarlayout_p.h ../gui/widgets/qtoolbarseparator_p.h ../gui/widgets/qwidgetanimator_p.h ../gui/widgets/qwidgetresizehandler_p.h ../gui/statemachine/qbasickeyeventtransition_p.h ../gui/statemachine/qbasicmouseeventtransition_p.h ../gui/util/qcompleter_p.h ../gui/util/qsystemtrayicon_p.h ../gui/util/qundostack_p.h ../gui/accessible/qaccessible_mac_p.h ../gui/styles/qcleanlooksstyle_p.h ../gui/styles/qcommonstyle_p.h ../gui/styles/qcommonstylepixmaps_p.h ../gui/styles/qgtkpainter_p.h ../gui/styles/qgtkstyle_p.h ../gui/styles/qmacstyle_mac_p.h ../gui/styles/qmacstylepixmaps_mac_p.h ../gui/styles/qmotifstyle_p.h ../gui/styles/qproxystyle_p.h ../gui/styles/qs60style_p.h ../gui/styles/qstyle_p.h ../gui/styles/qstylehelper_p.h ../gui/styles/qstylesheetstyle_p.h ../gui/styles/qwindowscestyle_p.h ../gui/styles/qwindowsmobilestyle_p.h ../gui/styles/qwindowsstyle_p.h ../gui/styles/qwindowsvistastyle_p.h ../gui/styles/qwindowsxpstyle_p.h ../gui/egl/qegl_p.h ../gui/egl/qeglcontext_p.h ../gui/egl/qeglproperties_p.h ../gui/inputmethod/qcoefepinputcontext_p.h ../gui/inputmethod/qinputcontext_p.h ../gui/inputmethod/qmacinputcontext_p.h ../gui/inputmethod/qwininputcontext_p.h ../gui/inputmethod/qwsinputcontext_p.h ../gui/inputmethod/qximinputcontext_p.h ../gui/painting/qbackingstore_p.h ../gui/painting/qbezier_p.h ../gui/painting/qblendfunctions_p.h ../gui/painting/qcolor_p.h ../gui/painting/qcssutil_p.h ../gui/painting/qcups_p.h ../gui/painting/qdatabuffer_p.h ../gui/painting/qdrawhelper_arm_simd_p.h ../gui/painting/qdrawhelper_mmx_p.h ../gui/painting/qdrawhelper_neon_p.h ../gui/painting/qdrawhelper_p.h ../gui/painting/qdrawhelper_sse_p.h ../gui/painting/qdrawhelper_x86_p.h ../gui/painting/qdrawingprimitive_sse2_p.h ../gui/painting/qemulationpaintengine_p.h ../gui/painting/qfixed_p.h ../gui/painting/qgraphicssystem_mac_p.h ../gui/painting/qgraphicssystem_p.h ../gui/painting/qgraphicssystem_qws_p.h ../gui/painting/qgraphicssystem_raster_p.h ../gui/painting/qgraphicssystem_runtime_p.h ../gui/painting/qgraphicssystemfactory_p.h ../gui/painting/qgraphicssystemplugin_p.h ../gui/painting/qgrayraster_p.h ../gui/painting/qimagescale_p.h ../gui/painting/qmath_p.h ../gui/painting/qmemrotate_p.h ../gui/painting/qoutlinemapper_p.h ../gui/painting/qpaintbuffer_p.h ../gui/painting/qpaintengine_alpha_p.h ../gui/painting/qpaintengine_mac_p.h ../gui/painting/qpaintengine_p.h ../gui/painting/qpaintengine_preview_p.h ../gui/painting/qpaintengine_raster_p.h ../gui/painting/qpaintengine_s60_p.h ../gui/painting/qpaintengine_x11_p.h ../gui/painting/qpaintengineex_p.h ../gui/painting/qpainter_p.h ../gui/painting/qpainterpath_p.h ../gui/painting/qpathclipper_p.h ../gui/painting/qpdf_p.h ../gui/painting/qpen_p.h ../gui/painting/qpolygonclipper_p.h ../gui/painting/qprintengine_mac_p.h ../gui/painting/qprintengine_pdf_p.h ../gui/painting/qprintengine_ps_p.h ../gui/painting/qprintengine_qws_p.h ../gui/painting/qprintengine_win_p.h ../gui/painting/qprinter_p.h ../gui/painting/qprinterinfo_unix_p.h ../gui/painting/qrasterdefs_p.h ../gui/painting/qrasterizer_p.h ../gui/painting/qstroker_p.h ../gui/painting/qtessellator_p.h ../gui/painting/qtextureglyphcache_p.h ../gui/painting/qvectorpath_p.h ../gui/painting/qwindowsurface_mac_p.h ../gui/painting/qwindowsurface_p.h ../gui/painting/qwindowsurface_qws_p.h ../gui/painting/qwindowsurface_raster_p.h ../gui/painting/qwindowsurface_s60_p.h ../gui/painting/qwindowsurface_x11_p.h ../gui/image/qpixmap_haiku_p.h ../gui/styles/qhaikustyle_p.h ../gui/kernel/qeventdispatcher_haiku_p.h +diff -rupN qt-everywhere-opensource-src-4.7.3/include/QtGui/private/qeventdispatcher_haiku_p.h qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/private/qeventdispatcher_haiku_p.h +--- qt-everywhere-opensource-src-4.7.3/include/QtGui/private/qeventdispatcher_haiku_p.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/private/qeventdispatcher_haiku_p.h 2011-06-14 03:50:02.157024256 +0000 +@@ -0,0 +1 @@ ++#include "../../../src/gui/kernel/qeventdispatcher_haiku_p.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/include/QtGui/private/qhaikustyle_p.h qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/private/qhaikustyle_p.h +--- qt-everywhere-opensource-src-4.7.3/include/QtGui/private/qhaikustyle_p.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/private/qhaikustyle_p.h 2011-06-14 03:49:44.729284608 +0000 +@@ -0,0 +1 @@ ++#include "../../../src/gui/styles/qhaikustyle_p.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/include/QtGui/private/qpixmap_haiku_p.h qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/private/qpixmap_haiku_p.h +--- qt-everywhere-opensource-src-4.7.3/include/QtGui/private/qpixmap_haiku_p.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/private/qpixmap_haiku_p.h 2011-06-13 22:06:43.089653248 +0000 +@@ -0,0 +1 @@ ++#include "../../../src/gui/image/qpixmap_haiku_p.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/include/QtGui/qhaikustyle.h qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/qhaikustyle.h +--- qt-everywhere-opensource-src-4.7.3/include/QtGui/qhaikustyle.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/qhaikustyle.h 2010-04-15 16:14:35.000000000 +0000 +@@ -0,0 +1 @@ ++#include "../../src/gui/styles/qhaikustyle.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/include/QtGui/qsystemtrayicon_haiku.h qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/qsystemtrayicon_haiku.h +--- qt-everywhere-opensource-src-4.7.3/include/QtGui/qsystemtrayicon_haiku.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/qsystemtrayicon_haiku.h 2010-07-02 03:02:00.000000000 +0000 +@@ -0,0 +1 @@ ++#include "../../src/gui/util/qsystemtrayicon_haiku.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/include/QtGui/qwidget_haiku.h qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/qwidget_haiku.h +--- qt-everywhere-opensource-src-4.7.3/include/QtGui/qwidget_haiku.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/qwidget_haiku.h 2010-11-09 02:20:07.000000000 +0000 +@@ -0,0 +1 @@ ++#include "../../src/gui/kernel/qwidget_haiku.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/include/QtGui/qwindowdefs_haiku.h qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/qwindowdefs_haiku.h +--- qt-everywhere-opensource-src-4.7.3/include/QtGui/qwindowdefs_haiku.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/include/QtGui/qwindowdefs_haiku.h 2011-06-13 22:06:43.090963968 +0000 +@@ -0,0 +1 @@ ++#include "../../src/gui/kernel/qwindowdefs_haiku.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/makehaikupkg.sh qt-everywhere-opensource-src-4.7.3_haiku/makehaikupkg.sh +--- qt-everywhere-opensource-src-4.7.3/makehaikupkg.sh 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/makehaikupkg.sh 2011-06-13 22:42:41.748945408 +0000 +@@ -0,0 +1,1853 @@ ++#!/bin/sh ++ ++QTROOT=../qtbuild ++QTROOT=`readlink -f $QTROOT` ++ ++###################################################################### ++echo "Install Qt into sandbox :$QTROOT" ++###################################################################### ++echo " Prepare" ++mkdir -p $QTROOT ++rm -rf $QTROOT/boot ++echo " Install Qt" ++INSTALL_ROOT=$QTROOT make install ++echo " Install documentation" ++INSTALL_ROOT=$QTROOT make install_qchdocs ++ ++###################################################################### ++echo "Remove debug info" ++###################################################################### ++echo " Delete *.debug files" ++find "$QTROOT/boot/common/" -name "*.debug" -delete ++echo " Strip debug info from *.so files" ++find "$QTROOT/boot/common/" -name "*.so*" -exec strip -s {} \; ++echo " Strip debug info from binary files" ++find "$QTROOT/boot/common/bin/" -name "*" -exec strip -s {} \; ++ ++###################################################################### ++echo "Make qsystray utility" ++###################################################################### ++echo " Make" ++cd ./src/3rdparty/haiku-tools/qsystray ++make ++echo " Install" ++cp -f ./qsystray $QTROOT/boot/common/bin ++cp -f ./qsystray_gcc2 $QTROOT/boot/common/bin ++mimeset -f $QTROOT/boot/common/bin/qsystray ++mimeset -f $QTROOT/boot/common/bin/qsystray_gcc2 ++ ++###################################################################### ++echo "Remove useless files" ++###################################################################### ++echo " HTML docs" ++rm -rf $QTROOT/boot/common/documentation/doc/Qt/html ++echo " Images" ++rm -rf $QTROOT/boot/common/documentation/doc/Qt/src ++ ++###################################################################### ++echo "Check for hybrid build" ++###################################################################### ++if [ -f /boot/system/lib/libsupc++.so ] ; then ++ echo "gcc4 build - install libs into /common/lib folder" ++else ++ echo "gcc2 build - install libs into /common/lib/gcc4 folder" ++ echo "Move pkgconfig files from lib/gcc4 to parent folder" ++ mkdir $QTROOT/boot/common/lib/pkgconfig ++ mv $QTROOT/boot/common/lib/gcc4/pkgconfig $QTROOT/boot/common/lib ++fi ++ ++###################################################################### ++echo "Add Resources for binaries" ++###################################################################### ++ ++###################################################################### ++echo " Qt Assistant" ++###################################################################### ++echo 'resource app_signature "application/x-vnd.assistant"; ++resource app_flags B_SINGLE_LAUNCH; ++resource app_version { ++ major = 4, ++ middle = 7, ++ minor = 0, ++ variety = 0, ++ internal = 0, ++ short_info = "Qt Assistant", ++ long_info = "Qt Assistant" ++}; ++resource vector_icon { ++ $"6E6369660A030062250380C34205FF04003303663333020106023DDD49000000" ++ $"0000003DDD4949EEA449EEA400B00000FF993300020106043DA9380000000000" ++ $"003DA93849EEA449EEA400FFFFFF2FFF93936CFF0000FFCF000004FF7F04FF66" ++ $"04614C1E060AEFE707B93AB30DB93AB30DB8EB20B852B302B89DB2FCB852B302" ++ $"B852B302B639B327B650B325B464B34D20B6E320B4CE20B6E3CF6BB50DD154C9" ++ $"ABCDDDC9ABCDDDCB16CD9ECC35CA23CC35CBF2CC35CA23B6290606EF0BCC35CA" ++ $"23CC35CA23CC35CBF2C9ABCDDDCB16CD9EC9ABCDDDB50DD154B50DB6C2B50DB6" ++ $"C2B50DB457B93AB30DB6FBB2AEB93AB30DCC35B62906149AF9FFFF99C5DBB9A3" ++ $"C785B9D1BCBDC965BCDFBEB4C785BE9EC785C551C785C551C785C5E6C7B7C671" ++ $"C796C646C7D4C699C840C6ACC803C6ACC846C6ACC853C6ACC84CC6ACC8B1C6A6" ++ $"C987C656C918C689C987C656C987C805C987C805C8C9C859C758C89AC80FC88B" ++ $"C73DC89CC70BC89DC723C89DC665C89DC58FC80CC5E6C86DC52AC79BC4F8C5ED" ++ $"C4F8C6E5C4F8C5EDBE80C412BE75BC7EC52ABC930A04C965BEB4C785BE9EC785" ++ $"BEA8C886BEB40205C7E9C69BC826C68CC802C6A7C840C6AC55C6ACC846C6ACC8" ++ $"53C6ACC84CC6ACC8B1C6A6C987C656C918C689C987C656C8A9C656C8A9C656C8" ++ $"65C675060D9FF1FE03C58FC80CC5E6C86DC52AC79BC4F8C5EDC4F8C6E5C4F8C5" ++ $"EDBE80C412BE75BC7EC333C333BCEFC333BCEFC353BD68C37FBE79C36CBDEBC3" ++ $"7FBE79C419BE80C419C5EDC419C5EDC419C6E5C4B1C80CC44CC79BC507C86DC6" ++ $"2CC89DC586C89DC62CC89DC70BC89DC70BC89DC665C89D0A04C5DBB9A3C4FCB9" ++ $"A3C450BC83C52ABC93000BC02DC624C02DC624C084C544C0AFC0FEC0AFC38DC0" ++ $"AFBEB2C02EBC40C085BD1EBFD8BB60BEA9BAD9BF57BAE8BE9CBAD8BE82BAD7BE" ++ $"8FBAD7BDE1BAD7BD0FBBF1BD66BB35BCB2BCBEBC83C0ECBC83BE68BC83C35ABD" ++ $"0DC617BCB1C514BD65C70EBE92C789BDE7C789BE9AC789BEA9C788BEA1C788BF" ++ $"55C77DC02DC624BFD6C706C02DC6240211C2C7C6AFC35DC54DC22EC817C008C9" ++ $"6FC146C902C028CA13C099CABCC0595BC0CBCAE9C17FCB00C118CB00C19DCB00" ++ $"C1DFCAFAC1BDCAFEC1DFCAFAC1DFCCE0C1DFCCE0C1DFCCE0C103CCFDC103CCFD" ++ $"C0C2CD05C049CD09C084CD09BF88CD09BE76CC7CBEECCCDBBDDBCBFFBD1EC9A9" ++ $"BD68CB0EBBCCC961BA0EC721BAC4C88AB955C5B2B8F6C0DDB8F6C39AB8F6BDE8" ++ $"BA75BA58B977BBBABB4BB92EBDEEB89BBC76B89BBE2BB89BBEA9B8A6BE69B89F" ++ $"C064B8D9C275BB14C1A4B9AAC342BC75C3A7C10BC3A7BE71C3A7C36D0203C17F" ++ $"CB00C162CB00C19DCB00C1DFCAFAC1BDCAFEC1DFCAFAC12CCAFAC12CCAFAC145" ++ $"CAFE020DBF44BC40BEFCBB85BF9BBD1EBFC5C0FEBFC5BEB2BFC5C38DBF43C624" ++ $"BF9AC544BEFDC6D9BE20C774BE9CC749BE44C782BE92C789BE6AC789BE9AC789" ++ $"BEA9C788BEA1C788BF55C77DC02DC624BFD6C706C084C544C0AFC0FEC0AFC38D" ++ $"C0AFBEB2C02EBC40C085BD1EBFD8BB60BEA9BAD9BF57BAE8BE9CBAD8BE82BAD7" ++ $"BE8FBAD7BE5ABAD7BE10BAE9BE34BADDBE10BAE9BE10BAE9BE10BAE9BE95BB12" ++ $"0222BEEDCCC5BEEECCC6BEE9CCC4BEE1CCC0BEE5CCC2BEE1CCBFBEE0CCBFBEE0" ++ $"CCBFBEDCCCBDBED4CCB9BED8CCBBBED4CCB9BED2CCB8BED3CCB8BECFCCB6BEC8" ++ $"CCB3BECBCCB4BEC7CCB2BEC5CCB1BEC6CCB1BEC2CCAFBEBCCCACBEBFCCADBEBA" ++ $"CCABBEB8CCA9BEB9CCAABEB5CCA8BEB0CCA4BEB2CCA6BEAECCA3BEAACCA1BEAC" ++ $"CCA2BEA8CCA0BEA4CC9DBEA6CC9EBEA2CC9BBE9ECC99BEA0CC9ABE9CCC97BE98" ++ $"CC95BE9ACC96BE96CC93BE91CC90BE93CC92BE90CC8FBE8DCC8D3DCC8EBE8ACC" ++ $"8BBE84CC87BE87CC89BE83CC86BE81CC85BE82CC85BE7ECC82BE76CC7CBE7ACC" ++ $"7FBDDBCBFFBD1EC9A9BD68CB0EBBCCC961BA0EC721BAC4C88AB955C5B2B8F6C0" ++ $"DDB8F6C39AB8F6BDE8BA75BA58B977BBBABB4BB92EBDEEB89BBC76B89BBDF0B8" ++ $"9BBD03B89BBD03B89BBB8CB89BB98BBA58BA61B92EB88DBBBAB80CC0DDB80CBD" ++ $"E8B80CC39AB924C721B86AC5B2B9DAC88ABC34C9A9BAE2C961BC7ECB0EBD8CCC" ++ $"7CBCF0CBFFBE02CCDBBF5FCD09BE9ECD09BF63CD09BF6ACD09BF67CD09BF6ACD" ++ $"09C037CD09C037CD09BFB9CD07BEEECCC6BF4BCCF1BEEECCC60204B3A5BFF7B3" ++ $"A5B92CB3A5C6C2BFF7CC48B92CCC48C6C2CC48CC48BFF7CC48C6C2CC48B92CBF" ++ $"F7B3A5C6C2B3A5B92CB3A50204BB6DBFF7BB6DC277BB6DBD76BFF7BB6DBD76BB" ++ $"6DC277BB6DC481BFF7C481BD76C481C277BFF7C481C277C481BD76C481020420" ++ $"BF8820B89F20C671BF88CC11B89FCC11C671CC11CC11BF88CC11C671CC11B89F" ++ $"BF8820C67120B89F200204BB36BF88BB36C1EABB36BD26BF88BB36BD26BB36C1" ++ $"EABB36C3DBBF88C3DBBD26C3DBC1EABF88C3DBC1EAC3DBBD26C3DB0204B337BF" ++ $"88B337B8BDB337C653BF88CBDAB8BDCBDAC653CBDACBDABF88CBDAC653CBDAB8" ++ $"BDBF88B337C653B337B8BDB3370204BAFEBF88BAFEC209BAFEBD08BF88BAFEBD" ++ $"08BAFEC209BAFEC412BF88C412BD08C412C209BF88C412C209C412BD08C41202" ++ $"04BF88B3DDC5FAB3DDB916B3DDB3DDBF88B3DDB916B3DDC5FABF88CB34B916CB" ++ $"34C5FACB34CB34BF88CB34C5FACB34B9160204BF88C4B8C264C4B8BCACC4B8BA" ++ $"58BF88BA58C264BA58BCACBF88BA58BCACBA58C264BA58C4B8BF88C4B8BCACC4" ++ $"B8C2640206BF88B63DB9D4B63DC53CB63DCA4FC04AC9EBBAAFCA53C00ACA56BF" ++ $"88CA56BFC9CA56B993BF88B4BAC57DB4BAB993B4BAB4BABF88B4BAB993B4BABF" ++ $"C9B4C2C04AB4BDC00AB525BAAF0206BF88C718BC32C718C2DEC718C595C10BC5" ++ $"95C462C595C0CAC589C04AC591C089C529C345BF88C595C29DC595BC74C595B9" ++ $"88C04AB9E7C345B980C089B97BC10BB97BC0CAB97BC4620206BF88CB34BD68CB" ++ $"34C1A8CB34C55EC9A3C3A6CAA1C55EC9A3C220C405C220C405C15CC477BF88C4" ++ $"B8C07AC4B8BE97C4B8BCF1C405BDB4C477BCF1C405B9B3C9A3B9B3C9A3BB6ACA" ++ $"A10206BF88B3DDC1A8B3DDBD68B3DDB9B3B56DBB6AB46FB9B3B56DBCF1BB0BBC" ++ $"F1BB0BBDB4BA9ABF88BA58BE97BA58C07ABA58C220BB0BC15CBA9AC220BB0BC5" ++ $"5EB56DC55EB56DC3A6B46F0206C4B8BF88C4B8BE97C4B8C07AC405C220C477C1" ++ $"5CC405C220C9A3C55EC9A3C55ECAA1C3A6CB34BF88CB34C1A8CB34BD68C9A3B9" ++ $"B3CAA1BB6AC9A3B9B3C405BCF1C405BCF1C477BDB40206BA58BF88BA58C07ABA" ++ $"58BE97BB0BBCF1BA9ABDB4BB0BBCF1B56DB9B3B56DB9B3B46FBB6AB3DDBF88B3" ++ $"DDBD68B3DDC1A8B56DC55EB46FC3A6B56DC55EBB0BC220BB0BC220BA9AC15C02" ++ $"06BF88B90DC264B90DBCACB90DBA58BE3CBA58BB60BA58BE75BA63BEE2BA5CBE" ++ $"ACBAB5BC54BF88BA58BCE4BA58C22CBA58C4ADBEE2C45BBC54C4B4BEACC4B8BE" ++ $"3CC4B8BE75C4B8BB600206BF88C9E8C5C2C9E8B94EC9E8B3E2BEE2B438C507B3" ++ $"DFBF19B3DDBF88B3DDBF50B3DDC5FABF88CB34B916CB34C5FACB34CB34BF88CB" ++ $"34C5FACB34BF50CB2FBEE2CB32BF19CAD9C5070206BF88CB34B93ECB34C5D2CB" ++ $"34CB31BFFECAF2C639CB30BFE9CB2F40CB30BFD4CAD9C5E4BF88CAC5C5C2CAC5" ++ $"B94ECAC5B3E240B438C5E4B3E0BFD4B3E0BFFEB3E1BFE9B41EC6390206BA58BF" ++ $"1ABA58BC3DBA58BF2ABA5ABF49BA59BF39BA7BBC8ABF88BA58BCC1BA58C24FBA" ++ $"58C4B6BF49C495BC8AC4B7BF39C4B8BF1AC4B8BF2AC4B8BC3DBF88B9EAC264B9" ++ $"EABCACB9EA150A000100023F6E570000000000003F0079920DF9AFA7960A0101" ++ $"01023F6E570000000000003F0079920DF9AFA7960A020102023F6E5700000000" ++ $"00003F0079920DF9AFA7960A000103023F6E570000000000003F0079920DF9AF" ++ $"A7960A000104023F6E570000000000003F0079920DF9AFA7960A00020506023F" ++ $"6E570000000000003F0079920DF9AFA7960A02020708023F6E57000000000000" ++ $"3F0079920DF9AFA7960A000109023F6E570000000000003F0079920DF9AFA796" ++ $"0A00020A0B023D6A390000000000003D3C934A3EB74A17E90A03020C0D023DD6" ++ $"F90000000000003DF73F4A20004A10000A04020E0F023DD6F90000000000003D" ++ $"F73F4A20004A10000A05021011023DD6F90000000000003DF73F4A20004A1000" ++ $"0A06021213023DD6F90000000000003DF73F4A20004A10000A070114023DD6F9" ++ $"0000000000003DF73F4A20004A10000A080115023DD6F90000000000003DF73F" ++ $"4A20004A10000A020116023DD6F90000000000003DF73F4A20004A10000A0201" ++ $"17023DD6F90000000000003DF73F4A20004A10000A020118023DD6F900000000" ++ $"00003DF73F4A20004A10000A020119023DD6F90000000000003DF73F4A20004A" ++ $"10000A09021A1B023DD6F90000000000003DF73F4A20004A10000A09021C1D02" ++ $"3DD6F90000000000003DF73F4A20004A1000" ++};' >/tmp/assistent.rdef ++rc /tmp/assistent.rdef ++xres -o "$QTROOT/boot/common/bin/assistant" /tmp/assistent.rsrc ++mimeset -f "$QTROOT/boot/common/bin/assistant" ++ ++ ++###################################################################### ++echo " Qt Designer" ++###################################################################### ++echo 'resource app_signature "application/x-vnd.designer"; ++ ++resource app_flags B_SINGLE_LAUNCH; ++ ++resource app_version { ++ major = 4, ++ middle = 7, ++ minor = 0, ++ variety = 0, ++ internal = 0, ++ short_info = "Qt Designer", ++ long_info = "Qt Designer" ++}; ++ ++resource vector_icon { ++ $"6E63696613030062250380C34205FF04003303663333020106023DDD49000000" ++ $"0000003DDD4949EEA449EEA400B00000FF993300020106043DA9380000000000" ++ $"003DA93849EEA449EEA400FFFFFF2FFF93936CFF0000FFCF000004FF7F04FF66" ++ $"04614C050002001602BC612BBC6F8A3C6F8ABC612B4B0EBF4768A700E4FFFE02" ++ $"0016023C68F73C78F1BC78F13C68F74652864B378800E4FFFE04002302000603" ++ $"38BB01B81D04381D0438BB014A2F8B4A6CC900EFF0CE7FFFFFFFFFEFF0CE03E0" ++ $"C35D03C8AF5303F7E46E02000603343E6CB2D79432D794343E6C486F84489C71" ++ $"000000007F616061FF0000002B060AEFE707B93AB30DB93AB30DB8EB20B852B3" ++ $"02B89DB2FCB852B302B852B302B639B327B650B325B464B34D20B6E320B4CE20" ++ $"B6E3CF6BB50DD154C9ABCDDDC9ABCDDDCB16CD9ECC35CA23CC35CBF2CC35CA23" ++ $"B6290606EF0BCC35CA23CC35CA23CC35CBF2C9ABCDDDCB16CD9EC9ABCDDDB50D" ++ $"D154B50DB6C2B50DB6C2B50DB457B93AB30DB6FBB2AEB93AB30DCC35B6290614" ++ $"9AF9FFFF99C5DBB9A3C785B9D1BCBDC965BCDFBEB4C785BE9EC785C551C785C5" ++ $"51C785C5E6C7B7C671C796C646C7D4C699C840C6ACC803C6ACC846C6ACC853C6" ++ $"ACC84CC6ACC8B1C6A6C987C656C918C689C987C656C987C805C987C805C8C9C8" ++ $"59C758C89AC80FC88BC73DC89CC70BC89DC723C89DC665C89DC58FC80CC5E6C8" ++ $"6DC52AC79BC4F8C5EDC4F8C6E5C4F8C5EDBE80C412BE75BC7EC52ABC930A04C9" ++ $"65BEB4C785BE9EC785BEA8C886BEB40205C7E9C69BC826C68CC802C6A7C840C6" ++ $"AC55C6ACC846C6ACC853C6ACC84CC6ACC8B1C6A6C987C656C918C689C987C656" ++ $"C8A9C656C8A9C656C865C675060D9FF1FE03C58FC80CC5E6C86DC52AC79BC4F8" ++ $"C5EDC4F8C6E5C4F8C5EDBE80C412BE75BC7EC333C333BCEFC333BCEFC353BD68" ++ $"C37FBE79C36CBDEBC37FBE79C419BE80C419C5EDC419C5EDC419C6E5C4B1C80C" ++ $"C44CC79BC507C86DC62CC89DC586C89DC62CC89DC70BC89DC70BC89DC665C89D" ++ $"0A04C5DBB9A3C4FCB9A3C450BC83C52ABC93000BC02DC624C02DC624C084C544" ++ $"C0AFC0FEC0AFC38DC0AFBEB2C02EBC40C085BD1EBFD8BB60BEA9BAD9BF57BAE8" ++ $"BE9CBAD8BE82BAD7BE8FBAD7BDE1BAD7BD0FBBF1BD66BB35BCB2BCBEBC83C0EC" ++ $"BC83BE68BC83C35ABD0DC617BCB1C514BD65C70EBE92C789BDE7C789BE9AC789" ++ $"BEA9C788BEA1C788BF55C77DC02DC624BFD6C706C02DC6240211C2C7C6AFC35D" ++ $"C54DC22EC817C008C96FC146C902C028CA13C099CABCC0595BC0CBCAE9C17FCB" ++ $"00C118CB00C19DCB00C1DFCAFAC1BDCAFEC1DFCAFAC1DFCCE0C1DFCCE0C1DFCC" ++ $"E0C103CCFDC103CCFDC0C2CD05C049CD09C084CD09BF88CD09BE76CC7CBEECCC" ++ $"DBBDDBCBFFBD1EC9A9BD68CB0EBBCCC961BA0EC721BAC4C88AB955C5B2B8F6C0" ++ $"DDB8F6C39AB8F6BDE8BA75BA58B977BBBABB4BB92EBDEEB89BBC76B89BBE2BB8" ++ $"9BBEA9B8A6BE69B89FC064B8D9C275BB14C1A4B9AAC342BC75C3A7C10BC3A7BE" ++ $"71C3A7C36D0203C17FCB00C162CB00C19DCB00C1DFCAFAC1BDCAFEC1DFCAFAC1" ++ $"2CCAFAC12CCAFAC145CAFE020DBF44BC40BEFCBB85BF9BBD1EBFC5C0FEBFC5BE" ++ $"B2BFC5C38DBF43C624BF9AC544BEFDC6D9BE20C774BE9CC749BE44C782BE92C7" ++ $"89BE6AC789BE9AC789BEA9C788BEA1C788BF55C77DC02DC624BFD6C706C084C5" ++ $"44C0AFC0FEC0AFC38DC0AFBEB2C02EBC40C085BD1EBFD8BB60BEA9BAD9BF57BA" ++ $"E8BE9CBAD8BE82BAD7BE8FBAD7BE5ABAD7BE10BAE9BE34BADDBE10BAE9BE10BA" ++ $"E9BE10BAE9BE95BB120222BEEDCCC5BEEECCC6BEE9CCC4BEE1CCC0BEE5CCC2BE" ++ $"E1CCBFBEE0CCBFBEE0CCBFBEDCCCBDBED4CCB9BED8CCBBBED4CCB9BED2CCB8BE" ++ $"D3CCB8BECFCCB6BEC8CCB3BECBCCB4BEC7CCB2BEC5CCB1BEC6CCB1BEC2CCAFBE" ++ $"BCCCACBEBFCCADBEBACCABBEB8CCA9BEB9CCAABEB5CCA8BEB0CCA4BEB2CCA6BE" ++ $"AECCA3BEAACCA1BEACCCA2BEA8CCA0BEA4CC9DBEA6CC9EBEA2CC9BBE9ECC99BE" ++ $"A0CC9ABE9CCC97BE98CC95BE9ACC96BE96CC93BE91CC90BE93CC92BE90CC8FBE" ++ $"8DCC8D3DCC8EBE8ACC8BBE84CC87BE87CC89BE83CC86BE81CC85BE82CC85BE7E" ++ $"CC82BE76CC7CBE7ACC7FBDDBCBFFBD1EC9A9BD68CB0EBBCCC961BA0EC721BAC4" ++ $"C88AB955C5B2B8F6C0DDB8F6C39AB8F6BDE8BA75BA58B977BBBABB4BB92EBDEE" ++ $"B89BBC76B89BBDF0B89BBD03B89BBD03B89BBB8CB89BB98BBA58BA61B92EB88D" ++ $"BBBAB80CC0DDB80CBDE8B80CC39AB924C721B86AC5B2B9DAC88ABC34C9A9BAE2" ++ $"C961BC7ECB0EBD8CCC7CBCF0CBFFBE02CCDBBF5FCD09BE9ECD09BF63CD09BF6A" ++ $"CD09BF67CD09BF6ACD09C037CD09C037CD09BFB9CD07BEEECCC6BF4BCCF1BEEE" ++ $"CCC60204B3A5BFF7B3A5B92CB3A5C6C2BFF7CC48B92CCC48C6C2CC48CC48BFF7" ++ $"CC48C6C2CC48B92CBFF7B3A5C6C2B3A5B92CB3A50204BB6DBFF7BB6DC277BB6D" ++ $"BD76BFF7BB6DBD76BB6DC277BB6DC481BFF7C481BD76C481C277BFF7C481C277" ++ $"C481BD76C481020420BF8820B89F20C671BF88CC11B89FCC11C671CC11CC11BF" ++ $"88CC11C671CC11B89FBF8820C67120B89F200204BB36BF88BB36C1EABB36BD26" ++ $"BF88BB36BD26BB36C1EABB36C3DBBF88C3DBBD26C3DBC1EABF88C3DBC1EAC3DB" ++ $"BD26C3DB0204B337BF88B337B8BDB337C653BF88CBDAB8BDCBDAC653CBDACBDA" ++ $"BF88CBDAC653CBDAB8BDBF88B337C653B337B8BDB3370204BAFEBF88BAFEC209" ++ $"BAFEBD08BF88BAFEBD08BAFEC209BAFEC412BF88C412BD08C412C209BF88C412" ++ $"C209C412BD08C4120204BF88B3DDC5FAB3DDB916B3DDB3DDBF88B3DDB916B3DD" ++ $"C5FABF88CB34B916CB34C5FACB34CB34BF88CB34C5FACB34B9160204BF88C4B8" ++ $"C264C4B8BCACC4B8BA58BF88BA58C264BA58BCACBF88BA58BCACBA58C264BA58" ++ $"C4B8BF88C4B8BCACC4B8C2640206BF88B63DB9D4B63DC53CB63DCA4FC04AC9EB" ++ $"BAAFCA53C00ACA56BF88CA56BFC9CA56B993BF88B4BAC57DB4BAB993B4BAB4BA" ++ $"BF88B4BAB993B4BABFC9B4C2C04AB4BDC00AB525BAAF0206BF88C718BC32C718" ++ $"C2DEC718C595C10BC595C462C595C0CAC589C04AC591C089C529C345BF88C595" ++ $"C29DC595BC74C595B988C04AB9E7C345B980C089B97BC10BB97BC0CAB97BC462" ++ $"0206BF88CB34BD68CB34C1A8CB34C55EC9A3C3A6CAA1C55EC9A3C220C405C220" ++ $"C405C15CC477BF88C4B8C07AC4B8BE97C4B8BCF1C405BDB4C477BCF1C405B9B3" ++ $"C9A3B9B3C9A3BB6ACAA10206BF88B3DDC1A8B3DDBD68B3DDB9B3B56DBB6AB46F" ++ $"B9B3B56DBCF1BB0BBCF1BB0BBDB4BA9ABF88BA58BE97BA58C07ABA58C220BB0B" ++ $"C15CBA9AC220BB0BC55EB56DC55EB56DC3A6B46F0206C4B8BF88C4B8BE97C4B8" ++ $"C07AC405C220C477C15CC405C220C9A3C55EC9A3C55ECAA1C3A6CB34BF88CB34" ++ $"C1A8CB34BD68C9A3B9B3CAA1BB6AC9A3B9B3C405BCF1C405BCF1C477BDB40206" ++ $"BA58BF88BA58C07ABA58BE97BB0BBCF1BA9ABDB4BB0BBCF1B56DB9B3B56DB9B3" ++ $"B46FBB6AB3DDBF88B3DDBD68B3DDC1A8B56DC55EB46FC3A6B56DC55EBB0BC220" ++ $"BB0BC220BA9AC15C0206BF88B90DC264B90DBCACB90DBA58BE3CBA58BB60BA58" ++ $"BE75BA63BEE2BA5CBEACBAB5BC54BF88BA58BCE4BA58C22CBA58C4ADBEE2C45B" ++ $"BC54C4B4BEACC4B8BE3CC4B8BE75C4B8BB600206BF88C9E8C5C2C9E8B94EC9E8" ++ $"B3E2BEE2B438C507B3DFBF19B3DDBF88B3DDBF50B3DDC5FABF88CB34B916CB34" ++ $"C5FACB34CB34BF88CB34C5FACB34BF50CB2FBEE2CB32BF19CAD9C5070206BF88" ++ $"CB34B93ECB34C5D2CB34CB31BFFECAF2C639CB30BFE9CB2F40CB30BFD4CAD9C5" ++ $"E4BF88CAC5C5C2CAC5B94ECAC5B3E240B438C5E4B3E0BFD4B3E0BFFEB3E1BFE9" ++ $"B41EC6390206BA58BF1ABA58BC3DBA58BF2ABA5ABF49BA59BF39BA7BBC8ABF88" ++ $"BA58BCC1BA58C24FBA58C4B6BF49C495BC8AC4B7BF39C4B8BF1AC4B8BF2AC4B8" ++ $"BC3DBF88B9EAC264B9EABCACB9EA020AB691B41FB691B41FB5C1B41FB524B58C" ++ $"B524B4BBB524B58CB524C93CB524C93CB524C9F3B677CA8FB5A6CA8FB677CA8F" ++ $"C851CA8FC851CA8FC908CA8FC9A4C93CC9A4C9F3C9A4C93CC9A4B89CC9A4B89C" ++ $"C9A4B7FFC922B72EC970B77CC922B72EC6C9B4D6C6C9B4D6C661B46DC50DB41F" ++ $"C5AAB41FC50DB41F020AB691B41FB691B41FB5C1B41FB524B58CB524B4BBB524" ++ $"B58CB524C93CB524C93CB524C9F3B677CA8FB5A6CA8FB677CA8FC851CA8FC851" ++ $"CA8FC908CA8FC9A4C93CC9A4C9F3C9A4C93CC9A4B89CC9A4B89CC9A4B7FFC922" ++ $"B72EC970B77CC922B72EC6C9B4D6C6C9B4D6C661B46DC50DB41FC5AAB41FC50D" ++ $"B41F020AC4F3B50AC55CB50AC4F3B50AB691B50AB691B50AB629B50AB60FB58C" ++ $"B60FB53EB60FB58CB60FC93CB60FC93CB60FC98AB691C9A4B629C9A4B691C9A4" ++ $"C86BC9A4C86BC9A4C89FC9A4C8D3C93CC8D3C970C8D3C93CC8D3B89CC8D3B89C" ++ $"C8D3B833C885B7CBC8B9B7E5C885B7CBC62DB572C62DB572C5DEB5240206B6E0" ++ $"B5DBB6E0B5DBB6E02BB6E0C8D3B6E0C74CB867C8D3C7E8C8D3C661C8D3C7E8C7" ++ $"4CC7E8B867C7E8B91EC780B819C55CB5DBC5AAB643C4BFB5DBB6FAB5DBB882B5" ++ $"DBB6FAB5DB0A04B904C3BAC5AAC3BAC5AAC661B904C6610A04B904B904C5AAB9" ++ $"04C5AABBABB904BBAB0A04B904BE6CC5AABE6CC5AAC113B904C1130A07B987B9" ++ $"BBBF3DBCCAC55CC50DC542C661C3D4C7CEC24CC79ABBDF400A07B987B9BBBF3D" ++ $"BCCAC55CC50DC542C661C3D4C7CEC24CC79ABBDF400A04BDCFC042C3BAC7B4C2" ++ $"4CC79ABBDF400A05BF71BEBAC542C647C3D4C7B4BDCFC042BF57BEBA0A04BF23" ++ $"BCCAC542C50DC527C661BF57BED406032FBC13BB0EBC13BB0EBC13BBF9BAA6BC" ++ $"7CBB91BC7CBAA6BC7CB987B9BB0E0A000100023F6E570000000000003F007992" ++ $"0DF9AFA7960A010101023F6E570000000000003F0079920DF9AFA7960A020102" ++ $"023F6E570000000000003F0079920DF9AFA7960A000103023F6E570000000000" ++ $"003F0079920DF9AFA7960A000104023F6E570000000000003F0079920DF9AFA7" ++ $"960A00020506023F6E570000000000003F0079920DF9AFA7960A02020708023F" ++ $"6E570000000000003F0079920DF9AFA7960A000109023E0AB60000000000003D" ++ $"2781493ACE49C5AC0A0A01251233B4D6BFA5C03F7D5C32C38F4788D04C593E01" ++ $"178422040A0E01260233B4D6BFA5C03F7D5C32C38F4788D04C593E0A0F012702" ++ $"33B4D6BFA5C03F7D5C32C38F4788D04C593E0A1001280233B4D6BFA5C03F7D5C" ++ $"32C38F4788D04C593E0A1101290233B4D6BFA5C03F7D5C32C38F4788D04C593E" ++ $"0A12012A0233B4D6BFA5C03F7D5C32C38F4788D04C593E" ++};' >/tmp/designer.rdef ++rc /tmp/designer.rdef ++xres -o "$QTROOT/boot/common/bin/designer" /tmp/designer.rsrc ++mimeset -f "$QTROOT/boot/common/bin/designer" ++ ++###################################################################### ++echo " Qt Linguist" ++###################################################################### ++echo 'resource app_signature "application/x-vnd.linguist"; ++ ++resource app_flags B_SINGLE_LAUNCH; ++ ++resource app_version { ++ major = 4, ++ middle = 7, ++ minor = 0, ++ variety = 0, ++ internal = 0, ++ short_info = "Qt Linguist", ++ long_info = "Qt Linguist" ++}; ++ ++resource vector_icon { ++ $"6E63696618030062250380C34205FF04003303663333020106023DDD49000000" ++ $"0000003DDD4949EEA449EEA400B00000FF993300020106043DA9380000000000" ++ $"003DA93849EEA449EEA400FFFFFF2FFF93936CFF0000FFCF000004FF7F04FF66" ++ $"04614C02000602000000BDC8803DC8800000004BD3074987D3000035EDFF0000" ++ $"8D020106063EFBB90000000000003EFBB949F0D94BC42D00FFFFFF53DEFFFFBF" ++ $"94CAFFDD499BFFF3147AFFFF006DFF020106023EAC420000000000003EAC424A" ++ $"2B784BC42D00FFFFFFFF00339902000602000000BCA3653CA3650000004A62E4" ++ $"49D43C00FFFFFFFFB3CAFF020006080000003B1FAABB1FAA0000004841E7484E" ++ $"3D00FFFFFF26FBFDFF4DEEF7FF75DAEDFF9EBDDFFFC697CCFFEF6AB6FFFF57AD" ++ $"FF020006053B84A70000000000003B84A749DF004B668300428AFF442969F88E" ++ $"124DF2CF053BEEFF0035ED020006053B84A70000000000003B84A749DF004B6A" ++ $"5900428AFF442969F88E124DF2CF053BEEFF0035ED020016063AF08600000000" ++ $"00003AF08649DEE04B3FE800E604E74CF980FFC3FAFFF0050003B1B1C5020006" ++ $"0238270AB103BF3103BF38270A48A9A849875A00FFFFFFFFCECEDB020016022F" ++ $"032F3626A4B626A42F032F4872BB48FFBD00FFFF0002000602B82720B103DDB1" ++ $"03DD3827204A7CE349876200FFFFFFFFCECEDB02001602AF0317362693362693" ++ $"2F03174A985648FFC600FFFF0036060AEFE707B93AB30DB93AB30DB8EB20B852" ++ $"B302B89DB2FCB852B302B852B302B639B327B650B325B464B34D20B6E320B4CE" ++ $"20B6E3CF6BB50DD154C9ABCDDDC9ABCDDDCB16CD9ECC35CA23CC35CBF2CC35CA" ++ $"23B6290606EF0BCC35CA23CC35CA23CC35CBF2C9ABCDDDCB16CD9EC9ABCDDDB5" ++ $"0DD154B50DB6C2B50DB6C2B50DB457B93AB30DB6FBB2AEB93AB30DCC35B62906" ++ $"149AF9FFFF99C5DBB9A3C785B9D1BCBDC965BCDFBEB4C785BE9EC785C551C785" ++ $"C551C785C5E6C7B7C671C796C646C7D4C699C840C6ACC803C6ACC846C6ACC853" ++ $"C6ACC84CC6ACC8B1C6A6C987C656C918C689C987C656C987C805C987C805C8C9" ++ $"C859C758C89AC80FC88BC73DC89CC70BC89DC723C89DC665C89DC58FC80CC5E6" ++ $"C86DC52AC79BC4F8C5EDC4F8C6E5C4F8C5EDBE80C412BE75BC7EC52ABC930A04" ++ $"C965BEB4C785BE9EC785BEA8C886BEB40205C7E9C69BC826C68CC802C6A7C840" ++ $"C6AC55C6ACC846C6ACC853C6ACC84CC6ACC8B1C6A6C987C656C918C689C987C6" ++ $"56C8A9C656C8A9C656C865C675060D9FF1FE03C58FC80CC5E6C86DC52AC79BC4" ++ $"F8C5EDC4F8C6E5C4F8C5EDBE80C412BE75BC7EC333C333BCEFC333BCEFC353BD" ++ $"68C37FBE79C36CBDEBC37FBE79C419BE80C419C5EDC419C5EDC419C6E5C4B1C8" ++ $"0CC44CC79BC507C86DC62CC89DC586C89DC62CC89DC70BC89DC70BC89DC665C8" ++ $"9D0A04C5DBB9A3C4FCB9A3C450BC83C52ABC93000BC02DC624C02DC624C084C5" ++ $"44C0AFC0FEC0AFC38DC0AFBEB2C02EBC40C085BD1EBFD8BB60BEA9BAD9BF57BA" ++ $"E8BE9CBAD8BE82BAD7BE8FBAD7BDE1BAD7BD0FBBF1BD66BB35BCB2BCBEBC83C0" ++ $"ECBC83BE68BC83C35ABD0DC617BCB1C514BD65C70EBE92C789BDE7C789BE9AC7" ++ $"89BEA9C788BEA1C788BF55C77DC02DC624BFD6C706C02DC6240211C2C7C6AFC3" ++ $"5DC54DC22EC817C008C96FC146C902C028CA13C099CABCC0595BC0CBCAE9C17F" ++ $"CB00C118CB00C19DCB00C1DFCAFAC1BDCAFEC1DFCAFAC1DFCCE0C1DFCCE0C1DF" ++ $"CCE0C103CCFDC103CCFDC0C2CD05C049CD09C084CD09BF88CD09BE76CC7CBEEC" ++ $"CCDBBDDBCBFFBD1EC9A9BD68CB0EBBCCC961BA0EC721BAC4C88AB955C5B2B8F6" ++ $"C0DDB8F6C39AB8F6BDE8BA75BA58B977BBBABB4BB92EBDEEB89BBC76B89BBE2B" ++ $"B89BBEA9B8A6BE69B89FC064B8D9C275BB14C1A4B9AAC342BC75C3A7C10BC3A7" ++ $"BE71C3A7C36D0203C17FCB00C162CB00C19DCB00C1DFCAFAC1BDCAFEC1DFCAFA" ++ $"C12CCAFAC12CCAFAC145CAFE020DBF44BC40BEFCBB85BF9BBD1EBFC5C0FEBFC5" ++ $"BEB2BFC5C38DBF43C624BF9AC544BEFDC6D9BE20C774BE9CC749BE44C782BE92" ++ $"C789BE6AC789BE9AC789BEA9C788BEA1C788BF55C77DC02DC624BFD6C706C084" ++ $"C544C0AFC0FEC0AFC38DC0AFBEB2C02EBC40C085BD1EBFD8BB60BEA9BAD9BF57" ++ $"BAE8BE9CBAD8BE82BAD7BE8FBAD7BE5ABAD7BE10BAE9BE34BADDBE10BAE9BE10" ++ $"BAE9BE10BAE9BE95BB120222BEEDCCC5BEEECCC6BEE9CCC4BEE1CCC0BEE5CCC2" ++ $"BEE1CCBFBEE0CCBFBEE0CCBFBEDCCCBDBED4CCB9BED8CCBBBED4CCB9BED2CCB8" ++ $"BED3CCB8BECFCCB6BEC8CCB3BECBCCB4BEC7CCB2BEC5CCB1BEC6CCB1BEC2CCAF" ++ $"BEBCCCACBEBFCCADBEBACCABBEB8CCA9BEB9CCAABEB5CCA8BEB0CCA4BEB2CCA6" ++ $"BEAECCA3BEAACCA1BEACCCA2BEA8CCA0BEA4CC9DBEA6CC9EBEA2CC9BBE9ECC99" ++ $"BEA0CC9ABE9CCC97BE98CC95BE9ACC96BE96CC93BE91CC90BE93CC92BE90CC8F" ++ $"BE8DCC8D3DCC8EBE8ACC8BBE84CC87BE87CC89BE83CC86BE81CC85BE82CC85BE" ++ $"7ECC82BE76CC7CBE7ACC7FBDDBCBFFBD1EC9A9BD68CB0EBBCCC961BA0EC721BA" ++ $"C4C88AB955C5B2B8F6C0DDB8F6C39AB8F6BDE8BA75BA58B977BBBABB4BB92EBD" ++ $"EEB89BBC76B89BBDF0B89BBD03B89BBD03B89BBB8CB89BB98BBA58BA61B92EB8" ++ $"8DBBBAB80CC0DDB80CBDE8B80CC39AB924C721B86AC5B2B9DAC88ABC34C9A9BA" ++ $"E2C961BC7ECB0EBD8CCC7CBCF0CBFFBE02CCDBBF5FCD09BE9ECD09BF63CD09BF" ++ $"6ACD09BF67CD09BF6ACD09C037CD09C037CD09BFB9CD07BEEECCC6BF4BCCF1BE" ++ $"EECCC60204B3A5BFF7B3A5B92CB3A5C6C2BFF7CC48B92CCC48C6C2CC48CC48BF" ++ $"F7CC48C6C2CC48B92CBFF7B3A5C6C2B3A5B92CB3A50204BB6DBFF7BB6DC277BB" ++ $"6DBD76BFF7BB6DBD76BB6DC277BB6DC481BFF7C481BD76C481C277BFF7C481C2" ++ $"77C481BD76C481020420BF8820B89F20C671BF88CC11B89FCC11C671CC11CC11" ++ $"BF88CC11C671CC11B89FBF8820C67120B89F200204BB36BF88BB36C1EABB36BD" ++ $"26BF88BB36BD26BB36C1EABB36C3DBBF88C3DBBD26C3DBC1EABF88C3DBC1EAC3" ++ $"DBBD26C3DB0204B337BF88B337B8BDB337C653BF88CBDAB8BDCBDAC653CBDACB" ++ $"DABF88CBDAC653CBDAB8BDBF88B337C653B337B8BDB3370204BAFEBF88BAFEC2" ++ $"09BAFEBD08BF88BAFEBD08BAFEC209BAFEC412BF88C412BD08C412C209BF88C4" ++ $"12C209C412BD08C4120204BF88B3DDC5FAB3DDB916B3DDB3DDBF88B3DDB916B3" ++ $"DDC5FABF88CB34B916CB34C5FACB34CB34BF88CB34C5FACB34B9160204BF88C4" ++ $"B8C264C4B8BCACC4B8BA58BF88BA58C264BA58BCACBF88BA58BCACBA58C264BA" ++ $"58C4B8BF88C4B8BCACC4B8C2640206BF88B63DB9D4B63DC53CB63DCA4FC04AC9" ++ $"EBBAAFCA53C00ACA56BF88CA56BFC9CA56B993BF88B4BAC57DB4BAB993B4BAB4" ++ $"BABF88B4BAB993B4BABFC9B4C2C04AB4BDC00AB525BAAF0206BF88C718BC32C7" ++ $"18C2DEC718C595C10BC595C462C595C0CAC589C04AC591C089C529C345BF88C5" ++ $"95C29DC595BC74C595B988C04AB9E7C345B980C089B97BC10BB97BC0CAB97BC4" ++ $"620206BF88CB34BD68CB34C1A8CB34C55EC9A3C3A6CAA1C55EC9A3C220C405C2" ++ $"20C405C15CC477BF88C4B8C07AC4B8BE97C4B8BCF1C405BDB4C477BCF1C405B9" ++ $"B3C9A3B9B3C9A3BB6ACAA10206BF88B3DDC1A8B3DDBD68B3DDB9B3B56DBB6AB4" ++ $"6FB9B3B56DBCF1BB0BBCF1BB0BBDB4BA9ABF88BA58BE97BA58C07ABA58C220BB" ++ $"0BC15CBA9AC220BB0BC55EB56DC55EB56DC3A6B46F0206C4B8BF88C4B8BE97C4" ++ $"B8C07AC405C220C477C15CC405C220C9A3C55EC9A3C55ECAA1C3A6CB34BF88CB" ++ $"34C1A8CB34BD68C9A3B9B3CAA1BB6AC9A3B9B3C405BCF1C405BCF1C477BDB402" ++ $"06BA58BF88BA58C07ABA58BE97BB0BBCF1BA9ABDB4BB0BBCF1B56DB9B3B56DB9" ++ $"B3B46FBB6AB3DDBF88B3DDBD68B3DDC1A8B56DC55EB46FC3A6B56DC55EBB0BC2" ++ $"20BB0BC220BA9AC15C0206BF88B90DC264B90DBCACB90DBA58BE3CBA58BB60BA" ++ $"58BE75BA63BEE2BA5CBEACBAB5BC54BF88BA58BCE4BA58C22CBA58C4ADBEE2C4" ++ $"5BBC54C4B4BEACC4B8BE3CC4B8BE75C4B8BB600206BF88C9E8C5C2C9E8B94EC9" ++ $"E8B3E2BEE2B438C507B3DFBF19B3DDBF88B3DDBF50B3DDC5FABF88CB34B916CB" ++ $"34C5FACB34CB34BF88CB34C5FACB34BF50CB2FBEE2CB32BF19CAD9C5070206BF" ++ $"88CB34B93ECB34C5D2CB34CB31BFFECAF2C639CB30BFE9CB2F40CB30BFD4CAD9" ++ $"C5E4BF88CAC5C5C2CAC5B94ECAC5B3E240B438C5E4B3E0BFD4B3E0BFFEB3E1BF" ++ $"E9B41EC6390206BA58BF1ABA58BC3DBA58BF2ABA5ABF49BA59BF39BA7BBC8ABF" ++ $"88BA58BCC1BA58C24FBA58C4B6BF49C495BC8AC4B7BF39C4B8BF1AC4B8BF2AC4" ++ $"B8BC3DBF88B9EAC264B9EABCACB9EA0209B3C1BF37B3C1BA88B3C1C1D2B846C5" ++ $"E1B56EC447B79FC6B5B68DC7ABB6FEC74DB68DC7ABB544C8BCB544C8BCB544C8" ++ $"BCB6EFC8A4B6EFC8A4B93156BC86C768BB12C819BD8CC79BBFA8C7B6BE99C7B6" ++ $"C639C7B6CB90BF37CB90C3E6CB90BA88BFA8B6B9C639B6B9B918B6B80209B3A8" ++ $"BEEEB3A8BA3FB3A8C1892DC598B556C3FDB787C66CB674C761B6E5C703B674C7" ++ $"61B52BC872B52BC872B52BC872B6D6C85BB6D6C85BB919C83BBC6DC71EBAF9C7" ++ $"D0BD7353BF90C76CBE81C76C50C76CCB77BEEECB77C39DCB77BA3EBF90B66F50" ++ $"B66FB8FFB66F0209B36ABEBDB36ABA0DB36A44B7EFC567B517C3CCB748C63BB6" ++ $"36C730B6A7C6D2B636C730B4EDC842B4EDC842B4EDC842B698C82AB698C82AB8" ++ $"DBC80ABC2FC6EEBABBC79FBD35C721BF52C73BBE42C73BC5E2C73BCB39BEBDCB" ++ $"39C36CCB39BA0EBF52B63EC5E2B63EB8C1B63E0207BF52B6CBC594B6CBB90FB6" ++ $"CBB3F7BEBDB3F7BA5BB3F7C169B8C4C537B5DDC3C7B7FEC64DB690C79DB733C7" ++ $"16B935C777BC1DC65BBAF6C6EFBD21C691BF52C6AEBE35C6AEC595C6AECAACBE" ++ $"BDCAACC31ECAACBA5B0204BB64C65BBB90C664BA5CC6E0B6A2C78EB8D7C75BB6" ++ $"9CC793B690C79D29C798B90FC779BBE9C674BAC3C6FEBBBDC66C0206BF52B6CB" ++ $"C594B6CBBF33B6CBBEF6B6CCBF14B6CCC50EB6EEC9F4BEBDC9F4BA71C9F4C308" ++ $"BEF7C6ADC50EC68ABF15C6AEBF52C6AEBF33C6AEC594C6AECAACBEBDCAACC31E" ++ $"CAACBA5B0204BCAFC65BBDA0C68DBCA2C662BC86C66FBC94C668BD6BC698BF52" ++ $"C6AEBE5BC6AEBF6DC6AEBFA3C6ADBF88C6AEBE9DC6A90208B690C79DB733C716" ++ $"B6C7C79AB731C7912AC796B7D1C70BB957C537B896C646B670C3C7B48ABEBDB4" ++ $"8AC169B48ABA6CBF9BB6CCB97AB6E7BF83B6CBBF52B6CBBF6AB6CBB90FB6CBB3" ++ $"F7BEBDB3F7BA5BB3F7C169B8C4C537B5DDC3C7B7FEC64D0205B6F4BAE5B869B8" ++ $"B3BA4FBCC5C20BBC36BE22BD3BC2DABBFCC477BB73C3ACBBB6C56CBB22C764BA" ++ $"8FC667BACFC5D3B88ABF4DB73FC2BDB73FBBB2B73F0207C459C0ACC48EC0A1C4" ++ $"59C0ACBA53C0ACBA53C0ACBA1EC0A1B9C1C0CAB9E9C0ABB99CC0E8B986C142B9" ++ $"86C113B986C396BF56C57BBC22C57B47C57BC526C142C526C396C526C113C4EB" ++ $"C0CAC511C0E8C4C4C0AB0207C459C0C5C48EC0B9C459C0C5BA53C0C5BA53C0C5" ++ $"BA1EC0B9B9C1C0E3B9E9C0C4B99CC100B986C15AB986C12CB986C3AFBF56C594" ++ $"BC22C59447C594C526C15AC526C3AFC526C12CC4EBC0E3C511C100C4C4C0C402" ++ $"05BA53C105BA53C105BA29C105BA07C141BA07C120BA07C358BF56C50ABC69C5" ++ $"0AC244C50AC4A6C141C4A6C358C4A6C120C45AC105C484C105C45AC1050204BB" ++ $"43B95BBA1BB95BBC6CB95BBD55BC63BD55BAB0BD55BE15BB43BF6BBC6CBF6BBA" ++ $"1BBF6BB931BC63B931BE15B931BAB00204BB4431BA4131BC4731BD12BC6BBD12" ++ $"BAF0BD12BDE5BB44BF0FBC47BF0FBA41BF0FB976BC6BB976BDE5B976BAF00204" ++ $"BB56BA02BA5FBA02BC4DBA02BD0FBC88BD0FBB1EBD0FBDF1BB56BF0DBC4DBF0D" ++ $"BA5FBF0DB99DBC88B99DBDF1B99DBB1E0205BA50BC7FBA30BD15BA8CBB5DBC1A" ++ $"BA9ABB54BA8EBBD7BA62BB38BA4CBB89BA45BA62BA5FB9E6BCA6B9CABB6CB9F3" ++ $"BD38BA6ABE19BA24BDB9BA3DBDA60204BBC2BC51BB41BC51BC43BC51BCA9BD37" ++ $"BCA9BCB6BCA9BDB9BBC2BE1EBC43BE1EBB41BE1EBADBBD37BADBBDB9BADBBCB6" ++ $"0204BBB6BC65BB52BC65BC1BBC65BC6BBD1ABC6BBCB5BC6BBD7FBBB6BDCEBC1B" ++ $"BDCEBB52BDCEBB02BD1ABB02BD7FBB02BCB50204C315B95BC1ECB95BC43EB95B" ++ $"C527BC63C527BAB0C527BE15C315BF6BC43EBF6BC1ECBF6BC103BC63C103BE15" ++ $"C103BAB00204C31431C21131C41731C4E2BC6BC4E2BAF0C4E2BDE5C314BF0FC4" ++ $"17BF0FC211BF0FC146BC6BC146BDE5C146BAF00204C302BA02C20BBA02C3F9BA" ++ $"02C4BBBC88C4BBBB1EC4BBBDF1C302BF0DC3F9BF0DC20BBF0DC149BC88C149BD" ++ $"F1C149BB1E0205C408BC7FC428BD15C3CCBB5DC23EBA9AC305BA8EC281BA62C3" ++ $"1FBA4CC2CFBA45C3F6BA5FC472BCA6C48EBB6CC465BD38C3EEBE19C434BDB9C4" ++ $"1BBDA60204C296BC50C215BC50C317BC50C37DBD37C37DBCB6C37DBDB9C296BE" ++ $"1FC317BE1FC215BE1FC1AFBD37C1AFBDB9C1AFBCB60204C2A1BC65C23CBC65C3" ++ $"06BC6549BD1A49BCB549BD7FC2A1BDCEC306BDCEC23CBDCEC1EDBD1AC1EDBD7F" ++ $"C1EDBCB50F0A000100023F6E570000000000003F0079920DF9AFA7960A010101" ++ $"023F6E570000000000003F0079920DF9AFA7960A020102023F6E570000000000" ++ $"003F0079920DF9AFA7960A000103023F6E570000000000003F0079920DF9AFA7" ++ $"960A000104023F6E570000000000003F0079920DF9AFA7960A00020506023F6E" ++ $"570000000000003F0079920DF9AFA7960A02020708023F6E570000000000003F" ++ $"0079920DF9AFA7960A000109023F6E570000000000003F0079920DF9AFA7960A" ++ $"03011E000A03011F000A0A0120023EBA690000000000003E684D48AAA149C7C1" ++ $"0A0B0121023EBA690000000000003E684D48AAA149C7C10A0C022223023EBA69" ++ $"0000000000003E684D48AAA149C7C10A0D022425023EBA690000000000003E68" ++ $"4D48AAA149C7C10A0E0126023EBA690000000000003E684D48AAA149C7C1" ++};' >/tmp/linguist.rdef ++rc /tmp/linguist.rdef ++xres -o "$QTROOT/boot/common/bin/linguist" /tmp/linguist.rsrc ++mimeset -f "$QTROOT/boot/common/bin/linguist" ++ ++###################################################################### ++echo " Qt Help Conversion Wizard" ++###################################################################### ++ ++echo 'resource app_signature "application/x-vnd.qhelpconverter"; ++ ++resource app_flags B_SINGLE_LAUNCH; ++ ++resource app_version { ++ major = 4, ++ middle = 7, ++ minor = 0, ++ variety = 0, ++ internal = 0, ++ short_info = "Qt Help Conversion Wizard", ++ long_info = "Qt Help Conversion Wizard" ++}; ++ ++resource vector_icon { ++$"6E6369660A030062250380C34205FF04003303663333020106023DDD49000000" ++ $"0000003DDD4949EEA449EEA400B00000FF993300020106043DA9380000000000" ++ $"003DA93849EEA449EEA400FFFFFF2FFF93936CFF0000FFCF000004FF7F04FF66" ++ $"04614C1E060AEFE707B93AB30DB93AB30DB8EB20B852B302B89DB2FCB852B302" ++ $"B852B302B639B327B650B325B464B34D20B6E320B4CE20B6E3CF6BB50DD154C9" ++ $"ABCDDDC9ABCDDDCB16CD9ECC35CA23CC35CBF2CC35CA23B6290606EF0BCC35CA" ++ $"23CC35CA23CC35CBF2C9ABCDDDCB16CD9EC9ABCDDDB50DD154B50DB6C2B50DB6" ++ $"C2B50DB457B93AB30DB6FBB2AEB93AB30DCC35B62906149AF9FFFF99C5DBB9A3" ++ $"C785B9D1BCBDC965BCDFBEB4C785BE9EC785C551C785C551C785C5E6C7B7C671" ++ $"C796C646C7D4C699C840C6ACC803C6ACC846C6ACC853C6ACC84CC6ACC8B1C6A6" ++ $"C987C656C918C689C987C656C987C805C987C805C8C9C859C758C89AC80FC88B" ++ $"C73DC89CC70BC89DC723C89DC665C89DC58FC80CC5E6C86DC52AC79BC4F8C5ED" ++ $"C4F8C6E5C4F8C5EDBE80C412BE75BC7EC52ABC930A04C965BEB4C785BE9EC785" ++ $"BEA8C886BEB40205C7E9C69BC826C68CC802C6A7C840C6AC55C6ACC846C6ACC8" ++ $"53C6ACC84CC6ACC8B1C6A6C987C656C918C689C987C656C8A9C656C8A9C656C8" ++ $"65C675060D9FF1FE03C58FC80CC5E6C86DC52AC79BC4F8C5EDC4F8C6E5C4F8C5" ++ $"EDBE80C412BE75BC7EC333C333BCEFC333BCEFC353BD68C37FBE79C36CBDEBC3" ++ $"7FBE79C419BE80C419C5EDC419C5EDC419C6E5C4B1C80CC44CC79BC507C86DC6" ++ $"2CC89DC586C89DC62CC89DC70BC89DC70BC89DC665C89D0A04C5DBB9A3C4FCB9" ++ $"A3C450BC83C52ABC93000BC02DC624C02DC624C084C544C0AFC0FEC0AFC38DC0" ++ $"AFBEB2C02EBC40C085BD1EBFD8BB60BEA9BAD9BF57BAE8BE9CBAD8BE82BAD7BE" ++ $"8FBAD7BDE1BAD7BD0FBBF1BD66BB35BCB2BCBEBC83C0ECBC83BE68BC83C35ABD" ++ $"0DC617BCB1C514BD65C70EBE92C789BDE7C789BE9AC789BEA9C788BEA1C788BF" ++ $"55C77DC02DC624BFD6C706C02DC6240211C2C7C6AFC35DC54DC22EC817C008C9" ++ $"6FC146C902C028CA13C099CABCC0595BC0CBCAE9C17FCB00C118CB00C19DCB00" ++ $"C1DFCAFAC1BDCAFEC1DFCAFAC1DFCCE0C1DFCCE0C1DFCCE0C103CCFDC103CCFD" ++ $"C0C2CD05C049CD09C084CD09BF88CD09BE76CC7CBEECCCDBBDDBCBFFBD1EC9A9" ++ $"BD68CB0EBBCCC961BA0EC721BAC4C88AB955C5B2B8F6C0DDB8F6C39AB8F6BDE8" ++ $"BA75BA58B977BBBABB4BB92EBDEEB89BBC76B89BBE2BB89BBEA9B8A6BE69B89F" ++ $"C064B8D9C275BB14C1A4B9AAC342BC75C3A7C10BC3A7BE71C3A7C36D0203C17F" ++ $"CB00C162CB00C19DCB00C1DFCAFAC1BDCAFEC1DFCAFAC12CCAFAC12CCAFAC145" ++ $"CAFE020DBF44BC40BEFCBB85BF9BBD1EBFC5C0FEBFC5BEB2BFC5C38DBF43C624" ++ $"BF9AC544BEFDC6D9BE20C774BE9CC749BE44C782BE92C789BE6AC789BE9AC789" ++ $"BEA9C788BEA1C788BF55C77DC02DC624BFD6C706C084C544C0AFC0FEC0AFC38D" ++ $"C0AFBEB2C02EBC40C085BD1EBFD8BB60BEA9BAD9BF57BAE8BE9CBAD8BE82BAD7" ++ $"BE8FBAD7BE5ABAD7BE10BAE9BE34BADDBE10BAE9BE10BAE9BE10BAE9BE95BB12" ++ $"0222BEEDCCC5BEEECCC6BEE9CCC4BEE1CCC0BEE5CCC2BEE1CCBFBEE0CCBFBEE0" ++ $"CCBFBEDCCCBDBED4CCB9BED8CCBBBED4CCB9BED2CCB8BED3CCB8BECFCCB6BEC8" ++ $"CCB3BECBCCB4BEC7CCB2BEC5CCB1BEC6CCB1BEC2CCAFBEBCCCACBEBFCCADBEBA" ++ $"CCABBEB8CCA9BEB9CCAABEB5CCA8BEB0CCA4BEB2CCA6BEAECCA3BEAACCA1BEAC" ++ $"CCA2BEA8CCA0BEA4CC9DBEA6CC9EBEA2CC9BBE9ECC99BEA0CC9ABE9CCC97BE98" ++ $"CC95BE9ACC96BE96CC93BE91CC90BE93CC92BE90CC8FBE8DCC8D3DCC8EBE8ACC" ++ $"8BBE84CC87BE87CC89BE83CC86BE81CC85BE82CC85BE7ECC82BE76CC7CBE7ACC" ++ $"7FBDDBCBFFBD1EC9A9BD68CB0EBBCCC961BA0EC721BAC4C88AB955C5B2B8F6C0" ++ $"DDB8F6C39AB8F6BDE8BA75BA58B977BBBABB4BB92EBDEEB89BBC76B89BBDF0B8" ++ $"9BBD03B89BBD03B89BBB8CB89BB98BBA58BA61B92EB88DBBBAB80CC0DDB80CBD" ++ $"E8B80CC39AB924C721B86AC5B2B9DAC88ABC34C9A9BAE2C961BC7ECB0EBD8CCC" ++ $"7CBCF0CBFFBE02CCDBBF5FCD09BE9ECD09BF63CD09BF6ACD09BF67CD09BF6ACD" ++ $"09C037CD09C037CD09BFB9CD07BEEECCC6BF4BCCF1BEEECCC60204B3A5BFF7B3" ++ $"A5B92CB3A5C6C2BFF7CC48B92CCC48C6C2CC48CC48BFF7CC48C6C2CC48B92CBF" ++ $"F7B3A5C6C2B3A5B92CB3A50204BB6DBFF7BB6DC277BB6DBD76BFF7BB6DBD76BB" ++ $"6DC277BB6DC481BFF7C481BD76C481C277BFF7C481C277C481BD76C481020420" ++ $"BF8820B89F20C671BF88CC11B89FCC11C671CC11CC11BF88CC11C671CC11B89F" ++ $"BF8820C67120B89F200204BB36BF88BB36C1EABB36BD26BF88BB36BD26BB36C1" ++ $"EABB36C3DBBF88C3DBBD26C3DBC1EABF88C3DBC1EAC3DBBD26C3DB0204B337BF" ++ $"88B337B8BDB337C653BF88CBDAB8BDCBDAC653CBDACBDABF88CBDAC653CBDAB8" ++ $"BDBF88B337C653B337B8BDB3370204BAFEBF88BAFEC209BAFEBD08BF88BAFEBD" ++ $"08BAFEC209BAFEC412BF88C412BD08C412C209BF88C412C209C412BD08C41202" ++ $"04BF88B3DDC5FAB3DDB916B3DDB3DDBF88B3DDB916B3DDC5FABF88CB34B916CB" ++ $"34C5FACB34CB34BF88CB34C5FACB34B9160204BF88C4B8C264C4B8BCACC4B8BA" ++ $"58BF88BA58C264BA58BCACBF88BA58BCACBA58C264BA58C4B8BF88C4B8BCACC4" ++ $"B8C2640206BF88B63DB9D4B63DC53CB63DCA4FC04AC9EBBAAFCA53C00ACA56BF" ++ $"88CA56BFC9CA56B993BF88B4BAC57DB4BAB993B4BAB4BABF88B4BAB993B4BABF" ++ $"C9B4C2C04AB4BDC00AB525BAAF0206BF88C718BC32C718C2DEC718C595C10BC5" ++ $"95C462C595C0CAC589C04AC591C089C529C345BF88C595C29DC595BC74C595B9" ++ $"88C04AB9E7C345B980C089B97BC10BB97BC0CAB97BC4620206BF88CB34BD68CB" ++ $"34C1A8CB34C55EC9A3C3A6CAA1C55EC9A3C220C405C220C405C15CC477BF88C4" ++ $"B8C07AC4B8BE97C4B8BCF1C405BDB4C477BCF1C405B9B3C9A3B9B3C9A3BB6ACA" ++ $"A10206BF88B3DDC1A8B3DDBD68B3DDB9B3B56DBB6AB46FB9B3B56DBCF1BB0BBC" ++ $"F1BB0BBDB4BA9ABF88BA58BE97BA58C07ABA58C220BB0BC15CBA9AC220BB0BC5" ++ $"5EB56DC55EB56DC3A6B46F0206C4B8BF88C4B8BE97C4B8C07AC405C220C477C1" ++ $"5CC405C220C9A3C55EC9A3C55ECAA1C3A6CB34BF88CB34C1A8CB34BD68C9A3B9" ++ $"B3CAA1BB6AC9A3B9B3C405BCF1C405BCF1C477BDB40206BA58BF88BA58C07ABA" ++ $"58BE97BB0BBCF1BA9ABDB4BB0BBCF1B56DB9B3B56DB9B3B46FBB6AB3DDBF88B3" ++ $"DDBD68B3DDC1A8B56DC55EB46FC3A6B56DC55EBB0BC220BB0BC220BA9AC15C02" ++ $"06BF88B90DC264B90DBCACB90DBA58BE3CBA58BB60BA58BE75BA63BEE2BA5CBE" ++ $"ACBAB5BC54BF88BA58BCE4BA58C22CBA58C4ADBEE2C45BBC54C4B4BEACC4B8BE" ++ $"3CC4B8BE75C4B8BB600206BF88C9E8C5C2C9E8B94EC9E8B3E2BEE2B438C507B3" ++ $"DFBF19B3DDBF88B3DDBF50B3DDC5FABF88CB34B916CB34C5FACB34CB34BF88CB" ++ $"34C5FACB34BF50CB2FBEE2CB32BF19CAD9C5070206BF88CB34B93ECB34C5D2CB" ++ $"34CB31BFFECAF2C639CB30BFE9CB2F40CB30BFD4CAD9C5E4BF88CAC5C5C2CAC5" ++ $"B94ECAC5B3E240B438C5E4B3E0BFD4B3E0BFFEB3E1BFE9B41EC6390206BA58BF" ++ $"1ABA58BC3DBA58BF2ABA5ABF49BA59BF39BA7BBC8ABF88BA58BCC1BA58C24FBA" ++ $"58C4B6BF49C495BC8AC4B7BF39C4B8BF1AC4B8BF2AC4B8BC3DBF88B9EAC264B9" ++ $"EABCACB9EA150A000100023F6E570000000000003F0079920DF9AFA7960A0101" ++ $"01023F6E570000000000003F0079920DF9AFA7960A020102023F6E5700000000" ++ $"00003F0079920DF9AFA7960A000103023F6E570000000000003F0079920DF9AF" ++ $"A7960A000104023F6E570000000000003F0079920DF9AFA7960A00020506023F" ++ $"6E570000000000003F0079920DF9AFA7960A02020708023F6E57000000000000" ++ $"3F0079920DF9AFA7960A000109023F6E570000000000003F0079920DF9AFA796" ++ $"0A00020A0B023D6A390000000000003D3C934A3EB74A17E90A03020C0D023DD6" ++ $"F90000000000003DF73F4A20004A10000A04020E0F023DD6F90000000000003D" ++ $"F73F4A20004A10000A05021011023DD6F90000000000003DF73F4A20004A1000" ++ $"0A06021213023DD6F90000000000003DF73F4A20004A10000A070114023DD6F9" ++ $"0000000000003DF73F4A20004A10000A080115023DD6F90000000000003DF73F" ++ $"4A20004A10000A020116023DD6F90000000000003DF73F4A20004A10000A0201" ++ $"17023DD6F90000000000003DF73F4A20004A10000A020118023DD6F900000000" ++ $"00003DF73F4A20004A10000A020119023DD6F90000000000003DF73F4A20004A" ++ $"10000A09021A1B023DD6F90000000000003DF73F4A20004A10000A09021C1D02" ++ $"3DD6F90000000000003DF73F4A20004A1000" ++};' >/tmp/qhelpconverter.rdef ++rc /tmp/qhelpconverter.rdef ++xres -o "$QTROOT/boot/common/bin/qhelpconverter" /tmp/qhelpconverter.rsrc ++mimeset -f "$QTROOT/boot/common/bin/qhelpconverter" ++ ++###################################################################### ++echo " Qt QML Viewer" ++###################################################################### ++ ++echo 'resource app_signature "application/x-vnd.qmlviewer"; ++ ++resource app_flags B_MULTIPLE_LAUNCH; ++ ++resource app_version { ++ major = 4, ++ middle = 7, ++ minor = 0, ++ variety = 0, ++ internal = 0, ++ short_info = "Qt QML Viewer", ++ long_info = "Qt QML Viewer" ++}; ++ ++resource file_types message { ++ "types" = "text/x-qml", ++ "types" = "application/x-qml" ++}; ++ ++resource vector_icon { ++ $"6E63696603030062250380C34205FF0C060AEFE707B93AB30DB93AB30DB8EB20" ++ $"B852B302B89DB2FCB852B302B852B302B639B327B650B325B464B34D20B6E320" ++ $"B4CE20B6E3CF6BB50DD154C9ABCDDDC9ABCDDDCB16CD9ECC35CA23CC35CBF2CC" ++ $"35CA23B6290606EF0BCC35CA23CC35CA23CC35CBF2C9ABCDDDCB16CD9EC9ABCD" ++ $"DDB50DD154B50DB6C2B50DB6C2B50DB457B93AB30DB6FBB2AEB93AB30DCC35B6" ++ $"2906149AF9FFFF99C5DBB9A3C785B9D1BCBDC965BCDFBEB4C785BE9EC785C551" ++ $"C785C551C785C5E6C7B7C671C796C646C7D4C699C840C6ACC803C6ACC846C6AC" ++ $"C853C6ACC84CC6ACC8B1C6A6C987C656C918C689C987C656C987C805C987C805" ++ $"C8C9C859C758C89AC80FC88BC73DC89CC70BC89DC723C89DC665C89DC58FC80C" ++ $"C5E6C86DC52AC79BC4F8C5EDC4F8C6E5C4F8C5EDBE80C412BE75BC7EC52ABC93" ++ $"0A04C965BEB4C785BE9EC785BEA8C886BEB40205C7E9C69BC826C68CC802C6A7" ++ $"C840C6AC55C6ACC846C6ACC853C6ACC84CC6ACC8B1C6A6C987C656C918C689C9" ++ $"87C656C8A9C656C8A9C656C865C675060D9FF1FE03C58FC80CC5E6C86DC52AC7" ++ $"9BC4F8C5EDC4F8C6E5C4F8C5EDBE80C412BE75BC7EC333C333BCEFC333BCEFC3" ++ $"53BD68C37FBE79C36CBDEBC37FBE79C419BE80C419C5EDC419C5EDC419C6E5C4" ++ $"B1C80CC44CC79BC507C86DC62CC89DC586C89DC62CC89DC70BC89DC70BC89DC6" ++ $"65C89D0A04C5DBB9A3C4FCB9A3C450BC83C52ABC93000BC02DC624C02DC624C0" ++ $"84C544C0AFC0FEC0AFC38DC0AFBEB2C02EBC40C085BD1EBFD8BB60BEA9BAD9BF" ++ $"57BAE8BE9CBAD8BE82BAD7BE8FBAD7BDE1BAD7BD0FBBF1BD66BB35BCB2BCBEBC" ++ $"83C0ECBC83BE68BC83C35ABD0DC617BCB1C514BD65C70EBE92C789BDE7C789BE" ++ $"9AC789BEA9C788BEA1C788BF55C77DC02DC624BFD6C706C02DC6240211C2C7C6" ++ $"AFC35DC54DC22EC817C008C96FC146C902C028CA13C099CABCC0595BC0CBCAE9" ++ $"C17FCB00C118CB00C19DCB00C1DFCAFAC1BDCAFEC1DFCAFAC1DFCCE0C1DFCCE0" ++ $"C1DFCCE0C103CCFDC103CCFDC0C2CD05C049CD09C084CD09BF88CD09BE76CC7C" ++ $"BEECCCDBBDDBCBFFBD1EC9A9BD68CB0EBBCCC961BA0EC721BAC4C88AB955C5B2" ++ $"B8F6C0DDB8F6C39AB8F6BDE8BA75BA58B977BBBABB4BB92EBDEEB89BBC76B89B" ++ $"BE2BB89BBEA9B8A6BE69B89FC064B8D9C275BB14C1A4B9AAC342BC75C3A7C10B" ++ $"C3A7BE71C3A7C36D0203C17FCB00C162CB00C19DCB00C1DFCAFAC1BDCAFEC1DF" ++ $"CAFAC12CCAFAC12CCAFAC145CAFE020DBF44BC40BEFCBB85BF9BBD1EBFC5C0FE" ++ $"BFC5BEB2BFC5C38DBF43C624BF9AC544BEFDC6D9BE20C774BE9CC749BE44C782" ++ $"BE92C789BE6AC789BE9AC789BEA9C788BEA1C788BF55C77DC02DC624BFD6C706" ++ $"C084C544C0AFC0FEC0AFC38DC0AFBEB2C02EBC40C085BD1EBFD8BB60BEA9BAD9" ++ $"BF57BAE8BE9CBAD8BE82BAD7BE8FBAD7BE5ABAD7BE10BAE9BE34BADDBE10BAE9" ++ $"BE10BAE9BE10BAE9BE95BB120222BEEDCCC5BEEECCC6BEE9CCC4BEE1CCC0BEE5" ++ $"CCC2BEE1CCBFBEE0CCBFBEE0CCBFBEDCCCBDBED4CCB9BED8CCBBBED4CCB9BED2" ++ $"CCB8BED3CCB8BECFCCB6BEC8CCB3BECBCCB4BEC7CCB2BEC5CCB1BEC6CCB1BEC2" ++ $"CCAFBEBCCCACBEBFCCADBEBACCABBEB8CCA9BEB9CCAABEB5CCA8BEB0CCA4BEB2" ++ $"CCA6BEAECCA3BEAACCA1BEACCCA2BEA8CCA0BEA4CC9DBEA6CC9EBEA2CC9BBE9E" ++ $"CC99BEA0CC9ABE9CCC97BE98CC95BE9ACC96BE96CC93BE91CC90BE93CC92BE90" ++ $"CC8FBE8DCC8D3DCC8EBE8ACC8BBE84CC87BE87CC89BE83CC86BE81CC85BE82CC" ++ $"85BE7ECC82BE76CC7CBE7ACC7FBDDBCBFFBD1EC9A9BD68CB0EBBCCC961BA0EC7" ++ $"21BAC4C88AB955C5B2B8F6C0DDB8F6C39AB8F6BDE8BA75BA58B977BBBABB4BB9" ++ $"2EBDEEB89BBC76B89BBDF0B89BBD03B89BBD03B89BBB8CB89BB98BBA58BA61B9" ++ $"2EB88DBBBAB80CC0DDB80CBDE8B80CC39AB924C721B86AC5B2B9DAC88ABC34C9" ++ $"A9BAE2C961BC7ECB0EBD8CCC7CBCF0CBFFBE02CCDBBF5FCD09BE9ECD09BF63CD" ++ $"09BF6ACD09BF67CD09BF6ACD09C037CD09C037CD09BFB9CD07BEEECCC6BF4BCC" ++ $"F1BEEECCC6090A000100023F8EB50000000000003F43B74400003FFD4E0A0101" ++ $"01023F8EB50000000000003F43B74400003FFD4E0A020102023F8EB500000000" ++ $"00003F43B74400003FFD4E0A000103023F8EB50000000000003F43B74400003F" ++ $"FD4E0A000104023F8EB50000000000003F43B74400003FFD4E0A00020506023F" ++ $"8EB50000000000003F43B74400003FFD4E0A02020708023F8EB5000000000000" ++ $"3F43B74400003FFD4E0A000109023F8EB50000000000003F43B74400003FFD4E" ++ $"0A00020A0B023F8EB50000000000003F43B74400003FFD4E" ++};' >/tmp/qmlviewer.rdef ++rc /tmp/qmlviewer.rdef ++xres -o "$QTROOT/boot/common/bin/qmlviewer" /tmp/qmlviewer.rsrc ++mimeset -f "$QTROOT/boot/common/bin/qmlviewer" ++ ++###################################################################### ++echo " Qt Config" ++###################################################################### ++ ++echo 'resource app_signature "application/x-vnd.qtconfig"; ++ ++resource app_flags B_SINGLE_LAUNCH; ++ ++resource app_version { ++ major = 4, ++ middle = 7, ++ minor = 0, ++ variety = 0, ++ internal = 0, ++ short_info = "Qt Config", ++ long_info = "Qt Configuration" ++}; ++ ++resource vector_icon { ++ $"6E6369660503076324037FC24105FF03FFC96903FFB23D120206B5BEB707B536" ++ $"2CB633B636B808B600B73BB634B74CB695B69AB859B683B751B68BBD18B68CC6" ++ $"98B6B0C1D8B611C63CB55AC544B53DC604B549C162B552B99BB55CBD7EB55AB8" ++ $"BE0206B84DBEAAB86CC012B83FBCDFB9F1B97DB827BA84B9F1B97DB9D031B9D0" ++ $"31B95DBAB7B8D7BCBFB8E7BBAFB8B7BE98BA29C21EB8CBC0B5BA29C21EBA5DC2" ++ $"5FBA5DC25FB8B3C2070204BF62BB21BF62BB21BF16BA7FC007B981BF98B9EAC0" ++ $"07B981BFF9B9DABFF9B9DABFE3BA57BF9BBB4ABFCDBAD5BF9BBB4A0203BC34BA" ++ $"5FBCD4BCAFBD21BB14BD2DBD61BD2CBC51BD27BEC2BC4EC16FBD5AC059BCB5BF" ++ $"180207BE8FBB35BE8FBB35BEACBB56BF01BBBBBEE5BB99BF45BC41BF88BD65BF" ++ $"91BCCBBF88BEE8BFCEC1ECBF8EC06DBFCEC1ECBFD8C237BFD8C237BE6DC0B2BE" ++ $"D5BCAABF6ABE7BBEC4BC49BE9EBB89BEB2BBE9BE9EBB890204C71DBD22C736BD" ++ $"A4C767BCD4C7EDBC2DC7ACBC81C7EABD15C816BEE3C7FCBDFCC7ECBED4C76FBE" ++ $"A8C799BEB6C754BE250204CC18BCAFCC3DBCCBCC35BCA2CC88BC7BCC6CBC88CC" ++ $"99BC97CCCDBCEDCCBBBCD0CCCDBCEDCCA9BD1CCCA9BD1CCC84BD010203BA8AC2" ++ $"60BAB9C313BB18C2A3BB94C3BDBB55C337BB94C3BDBBBAC414BBBAC414BAFBC3" ++ $"CD0204C139C355C166C38EC189C2FAC22CC246C1DAC29FC229C277C21FC30AC2" ++ $"22C2D9C20DC370C1EAC43BC1FDC3D645C4010203C630C65CC650C678C6A2C63C" ++ $"C790C627C719C631C7BEC694C6B1C6CDC70BC6E1C691C6B1000CB808B600B808" ++ $"B600BBE6B67FC399B7CCBFBCB740C3BFBA8DC3E2C011C34DBD5BC335C100C21F" ++ $"C30AC297C1FDC222C2D9C22CC246C229C277C1DAC29FC139C355C189C2FAC128" ++ $"C33FC0F3C2FDC104C313BFDDC3BEBE23C5C1BEE0C4A7BB94C5CAB689C6DBB90F" ++ $"C674B689C6DBB68CC698B68CC698B6B0C1D8B69AB859B68BBD18B683B751B808" ++ $"B600B74CB695B808B600021CB9D031BAB9B96FB9D031B9F1B97DB9F1B97DB827" ++ $"BA84B84DBEAAB83FBCDFB86CC012BA5DC25FB8B3C207BA5DC25FBA29C21EBA29" ++ $"C21EBA41C22EBA8AC260BA72C24FBAB9C313BBBAC414BAFBC3CDBBBAC414BB94" ++ $"C3BDBB94C3BDBC18C464BDC4C45DBCFDC485BE0FC38FBCC8C29ABD34C323BEDA" ++ $"C169BED5BCAABEF2BEC6BF6ABE7BBFD8C237BE6DC0B2BFD8C237BFCEC1ECBFCE" ++ $"C1ECC091C1E5C210C19FC152C1CDC1BAC13FC10EC07DC156C0E9C0EFBF38C0FE" ++ $"BCACC108BDF2C15738C209BC57C1B0BC73C209BC27C205BB96C207BBC6C1AEBB" ++ $"85C0FFBB63C156BB74C0FDBADEC0F7B9D3C0FBBA58C0B7B9D4BFF9B9DAC038B9" ++ $"D8BFF9B9DAC007B981C007B981BF98B9EABF62BB21BF16BA7FBF62BB21BF9BBB" ++ $"4ABF9BBB4ABF75BB66BF01BBBBBF28BB9FBEE5BB99BE8FBB35BEACBB56BE8FBB" ++ $"35BE9EBB89BE9EBB89BE4ABA9ABCB1B957BDB1B9A5BBB7B8ED0205BACDBE05BA" ++ $"DCBF5CBAD4BC9EBC25BA18BAAABAD6BC25BA18BC34BA5FBC34BA5FBCD4BCAFBC" ++ $"4EC16FBCB5BF18BC4EC16FBC45C1B1BC45C1B1BAC2C11C000BB9D031B9D031BA" ++ $"B9B96FBCB1B957BBB7B8EDBDB1B9A5BE9EBB89BE4ABA9ABEB2BBE9BED5BCAABE" ++ $"C4BC49BEF2BEC6BCC8C29ABEDAC169BD34C323BDC4C45DBE0FC38FBCFDC485BB" ++ $"94C3BDBC18C464BB55C337BA8AC260BB18C2A3BA72C24FBA29C21EBA41C22EB8" ++ $"CBC0B5B8D7BCBFB8B7BE98B8E7BBAFB9D031B95DBAB7B9D0310206BACDBE05BA" ++ $"D4BC9EBADCBF5CBC45C1B1BAC2C11CBC45C1B1BC4EC16FBC4EC16FBD5AC059BD" ++ $"2DBD61BD27BEC2BD2CBC51BC34BA5FBD21BB14BC34BA5FBC25BA18BC25BA18BA" ++ $"AABAD6020CBFF9B9DABFE3BA57C038B9D8C0F7B9D3C0B7B9D4C0FBBA58C0FFBB" ++ $"63C0FDBADEC156BB74C205BB96C1AEBB85C207BBC6C209BC57C209BC27C1B0BC" ++ $"73C0FEBCACC15738C108BDF2C10EC07DC0EFBF38C156C0E9C210C19FC1BAC13F" ++ $"C152C1CDBFCEC1ECC091C1E5BF8EC06DBF88BD65BF88BEE8BF91BCCBBF01BBBB" ++ $"BF45BC41BF28BB9FBF9BBB4ABF75BB66BFCDBAD50212C7EDBC2DC7EABD15C9C2" ++ $"BB14CDE2BA16CBBCBA3ECD99BAD4CD0EBC54CD4FBB93CCEDBC5ECC88BC7BCCA9" ++ $"BC71CC6CBC88CC18BCAFCC35BCA2CC3DBCCBCCA9BD1CCC84BD01CCA9BD1CCCF1" ++ $"BD33CCF1BD33CC7DBE87CBA3C136CC5BBFFDCB2AC222C93FC2D3CA15C25BC9B5" ++ $"C2EACAA2C31BCA2CC302CA24C47DC790C627C935C613C719C631C630C65CC6A2" ++ $"C63CC650C678C6B1C6CDC691C6B1C6B1C6CDC704C711C704C711C53AC85DC0CD" ++ $"C835C2ED56C330C72BC6C1C347C567C589C795C1E5C76FBEA8C7ACC037C799BE" ++ $"B6C816BEE3C7ECBED4C7FCBDFC020EC3E2C011C335C100C4E3BF09C71DBD22C5" ++ $"C2BDB8C736BDA4C76FBEA8C754BE25C7ACC037C6C1C347C795C1E5C567C589C0" ++ $"CDC835C330C72BBFD7C808BE02C755BEEAC7B0BBDFC875B712C8DFB96DC89CB6" ++ $"FAC8A4B6B2C7F5B6CAC82FB8C4C812BCD6C728BAE0C7D8BD88C6FEBE23C5C1BD" ++ $"C1C644BEE0C4A7C0F3C2FDBFDDC3BEC104C313C139C355C128C33FC166C38EC1" ++ $"EAC43B45C401C1FDC3D6C21FC30AC20DC370C297C1FD100A000100201B210A00" ++ $"0101201B210A000102201B210A000103201B210A000104201B210A000105201B" ++ $"210A000106201B210A000107201B210A000108201B210A000109201B210A0102" ++ $"0A0B201B210A01010C201B210A02020D0E201B210A02010F201B210A03011020" ++ $"1B210A040111201B21" ++};' >/tmp/qtconfig.rdef ++rc /tmp/qtconfig.rdef ++xres -o "$QTROOT/boot/common/bin/qtconfig" /tmp/qtconfig.rsrc ++mimeset -f "$QTROOT/boot/common/bin/qtconfig" ++ ++ ++###################################################################### ++echo "Make menu items" ++###################################################################### ++mkdir -p "$QTROOT/boot/home/config/be/Preferences" ++mkdir -p "$QTROOT/boot/home/config/be/Qt/Development" ++ln -s -f "/boot/common/data/licenses/LGPL v2.1" "$QTROOT/boot/home/config/be/Qt/LGPL v2.1" ++ln -s -f "/boot/common/bin/qtconfig" "$QTROOT/boot/home/config/be/Preferences/Qt Config" ++ln -s -f "/boot/common/bin/assistant" "$QTROOT/boot/home/config/be/Qt/Development/Qt Assistant" ++ln -s -f "/boot/common/bin/designer" "$QTROOT/boot/home/config/be/Qt/Development/Qt Designer" ++ln -s -f "/boot/common/bin/qhelpconverter" "$QTROOT/boot/home/config/be/Qt/Development/Qt Help Conversion Wizard" ++ln -s -f "/boot/common/bin/linguist" "$QTROOT/boot/home/config/be/Qt/Development/Qt Linguist" ++ln -s -f "/boot/common/bin/qmlviewer" "$QTROOT/boot/home/config/be/Qt/Development/Qt QML Viewer" ++ ++ ++###################################################################### ++# create GNU Free Documentation License file ++###################################################################### ++mkdir -p "$QTROOT/boot/common/data/licenses" ++echo " ++ GNU Free Documentation License ++ Version 1.3, 3 November 2008 ++ ++ ++ Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. ++ ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++0. PREAMBLE ++ ++The purpose of this License is to make a manual, textbook, or other ++functional and useful document \"free\" in the sense of freedom: to ++assure everyone the effective freedom to copy and redistribute it, ++with or without modifying it, either commercially or noncommercially. ++Secondarily, this License preserves for the author and publisher a way ++to get credit for their work, while not being considered responsible ++for modifications made by others. ++ ++This License is a kind of \"copyleft\", which means that derivative ++works of the document must themselves be free in the same sense. It ++complements the GNU General Public License, which is a copyleft ++license designed for free software. ++ ++We have designed this License in order to use it for manuals for free ++software, because free software needs free documentation: a free ++program should come with manuals providing the same freedoms that the ++software does. But this License is not limited to software manuals; ++it can be used for any textual work, regardless of subject matter or ++whether it is published as a printed book. We recommend this License ++principally for works whose purpose is instruction or reference. ++ ++ ++1. APPLICABILITY AND DEFINITIONS ++ ++This License applies to any manual or other work, in any medium, that ++contains a notice placed by the copyright holder saying it can be ++distributed under the terms of this License. Such a notice grants a ++world-wide, royalty-free license, unlimited in duration, to use that ++work under the conditions stated herein. The \"Document\", below, ++refers to any such manual or work. Any member of the public is a ++licensee, and is addressed as \"you\". You accept the license if you ++copy, modify or distribute the work in a way requiring permission ++under copyright law. ++ ++A \"Modified Version\" of the Document means any work containing the ++Document or a portion of it, either copied verbatim, or with ++modifications and/or translated into another language. ++ ++A \"Secondary Section\" is a named appendix or a front-matter section of ++the Document that deals exclusively with the relationship of the ++publishers or authors of the Document to the Document's overall ++subject (or to related matters) and contains nothing that could fall ++directly within that overall subject. (Thus, if the Document is in ++part a textbook of mathematics, a Secondary Section may not explain ++any mathematics.) The relationship could be a matter of historical ++connection with the subject or with related matters, or of legal, ++commercial, philosophical, ethical or political position regarding ++them. ++ ++The \"Invariant Sections\" are certain Secondary Sections whose titles ++are designated, as being those of Invariant Sections, in the notice ++that says that the Document is released under this License. If a ++section does not fit the above definition of Secondary then it is not ++allowed to be designated as Invariant. The Document may contain zero ++Invariant Sections. If the Document does not identify any Invariant ++Sections then there are none. ++ ++The \"Cover Texts\" are certain short passages of text that are listed, ++as Front-Cover Texts or Back-Cover Texts, in the notice that says that ++the Document is released under this License. A Front-Cover Text may ++be at most 5 words, and a Back-Cover Text may be at most 25 words. ++ ++A \"Transparent\" copy of the Document means a machine-readable copy, ++represented in a format whose specification is available to the ++general public, that is suitable for revising the document ++straightforwardly with generic text editors or (for images composed of ++pixels) generic paint programs or (for drawings) some widely available ++drawing editor, and that is suitable for input to text formatters or ++for automatic translation to a variety of formats suitable for input ++to text formatters. A copy made in an otherwise Transparent file ++format whose markup, or absence of markup, has been arranged to thwart ++or discourage subsequent modification by readers is not Transparent. ++An image format is not Transparent if used for any substantial amount ++of text. A copy that is not \"Transparent\" is called \"Opaque\". ++ ++Examples of suitable formats for Transparent copies include plain ++ASCII without markup, Texinfo input format, LaTeX input format, SGML ++or XML using a publicly available DTD, and standard-conforming simple ++HTML, PostScript or PDF designed for human modification. Examples of ++transparent image formats include PNG, XCF and JPG. Opaque formats ++include proprietary formats that can be read and edited only by ++proprietary word processors, SGML or XML for which the DTD and/or ++processing tools are not generally available, and the ++machine-generated HTML, PostScript or PDF produced by some word ++processors for output purposes only. ++ ++The \"Title Page\" means, for a printed book, the title page itself, ++plus such following pages as are needed to hold, legibly, the material ++this License requires to appear in the title page. For works in ++formats which do not have any title page as such, \"Title Page\" means ++the text near the most prominent appearance of the work's title, ++preceding the beginning of the body of the text. ++ ++The \"publisher\" means any person or entity that distributes copies of ++the Document to the public. ++ ++A section \"Entitled XYZ\" means a named subunit of the Document whose ++title either is precisely XYZ or contains XYZ in parentheses following ++text that translates XYZ in another language. (Here XYZ stands for a ++specific section name mentioned below, such as \"Acknowledgements\", ++\"Dedications\", \"Endorsements\", or \"History\".) To \"Preserve the Title\" ++of such a section when you modify the Document means that it remains a ++section \"Entitled XYZ\" according to this definition. ++ ++The Document may include Warranty Disclaimers next to the notice which ++states that this License applies to the Document. These Warranty ++Disclaimers are considered to be included by reference in this ++License, but only as regards disclaiming warranties: any other ++implication that these Warranty Disclaimers may have is void and has ++no effect on the meaning of this License. ++ ++2. VERBATIM COPYING ++ ++You may copy and distribute the Document in any medium, either ++commercially or noncommercially, provided that this License, the ++copyright notices, and the license notice saying this License applies ++to the Document are reproduced in all copies, and that you add no ++other conditions whatsoever to those of this License. You may not use ++technical measures to obstruct or control the reading or further ++copying of the copies you make or distribute. However, you may accept ++compensation in exchange for copies. If you distribute a large enough ++number of copies you must also follow the conditions in section 3. ++ ++You may also lend copies, under the same conditions stated above, and ++you may publicly display copies. ++ ++ ++3. COPYING IN QUANTITY ++ ++If you publish printed copies (or copies in media that commonly have ++printed covers) of the Document, numbering more than 100, and the ++Document's license notice requires Cover Texts, you must enclose the ++copies in covers that carry, clearly and legibly, all these Cover ++Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on ++the back cover. Both covers must also clearly and legibly identify ++you as the publisher of these copies. The front cover must present ++the full title with all words of the title equally prominent and ++visible. You may add other material on the covers in addition. ++Copying with changes limited to the covers, as long as they preserve ++the title of the Document and satisfy these conditions, can be treated ++as verbatim copying in other respects. ++ ++If the required texts for either cover are too voluminous to fit ++legibly, you should put the first ones listed (as many as fit ++reasonably) on the actual cover, and continue the rest onto adjacent ++pages. ++ ++If you publish or distribute Opaque copies of the Document numbering ++more than 100, you must either include a machine-readable Transparent ++copy along with each Opaque copy, or state in or with each Opaque copy ++a computer-network location from which the general network-using ++public has access to download using public-standard network protocols ++a complete Transparent copy of the Document, free of added material. ++If you use the latter option, you must take reasonably prudent steps, ++when you begin distribution of Opaque copies in quantity, to ensure ++that this Transparent copy will remain thus accessible at the stated ++location until at least one year after the last time you distribute an ++Opaque copy (directly or through your agents or retailers) of that ++edition to the public. ++ ++It is requested, but not required, that you contact the authors of the ++Document well before redistributing any large number of copies, to ++give them a chance to provide you with an updated version of the ++Document. ++ ++ ++4. MODIFICATIONS ++ ++You may copy and distribute a Modified Version of the Document under ++the conditions of sections 2 and 3 above, provided that you release ++the Modified Version under precisely this License, with the Modified ++Version filling the role of the Document, thus licensing distribution ++and modification of the Modified Version to whoever possesses a copy ++of it. In addition, you must do these things in the Modified Version: ++ ++A. Use in the Title Page (and on the covers, if any) a title distinct ++ from that of the Document, and from those of previous versions ++ (which should, if there were any, be listed in the History section ++ of the Document). You may use the same title as a previous version ++ if the original publisher of that version gives permission. ++B. List on the Title Page, as authors, one or more persons or entities ++ responsible for authorship of the modifications in the Modified ++ Version, together with at least five of the principal authors of the ++ Document (all of its principal authors, if it has fewer than five), ++ unless they release you from this requirement. ++C. State on the Title page the name of the publisher of the ++ Modified Version, as the publisher. ++D. Preserve all the copyright notices of the Document. ++E. Add an appropriate copyright notice for your modifications ++ adjacent to the other copyright notices. ++F. Include, immediately after the copyright notices, a license notice ++ giving the public permission to use the Modified Version under the ++ terms of this License, in the form shown in the Addendum below. ++G. Preserve in that license notice the full lists of Invariant Sections ++ and required Cover Texts given in the Document's license notice. ++H. Include an unaltered copy of this License. ++I. Preserve the section Entitled \"History\", Preserve its Title, and add ++ to it an item stating at least the title, year, new authors, and ++ publisher of the Modified Version as given on the Title Page. If ++ there is no section Entitled \"History\" in the Document, create one ++ stating the title, year, authors, and publisher of the Document as ++ given on its Title Page, then add an item describing the Modified ++ Version as stated in the previous sentence. ++J. Preserve the network location, if any, given in the Document for ++ public access to a Transparent copy of the Document, and likewise ++ the network locations given in the Document for previous versions ++ it was based on. These may be placed in the \"History\" section. ++ You may omit a network location for a work that was published at ++ least four years before the Document itself, or if the original ++ publisher of the version it refers to gives permission. ++K. For any section Entitled \"Acknowledgements\" or \"Dedications\", ++ Preserve the Title of the section, and preserve in the section all ++ the substance and tone of each of the contributor acknowledgements ++ and/or dedications given therein. ++L. Preserve all the Invariant Sections of the Document, ++ unaltered in their text and in their titles. Section numbers ++ or the equivalent are not considered part of the section titles. ++M. Delete any section Entitled \"Endorsements\". Such a section ++ may not be included in the Modified Version. ++N. Do not retitle any existing section to be Entitled \"Endorsements\" ++ or to conflict in title with any Invariant Section. ++O. Preserve any Warranty Disclaimers. ++ ++If the Modified Version includes new front-matter sections or ++appendices that qualify as Secondary Sections and contain no material ++copied from the Document, you may at your option designate some or all ++of these sections as invariant. To do this, add their titles to the ++list of Invariant Sections in the Modified Version's license notice. ++These titles must be distinct from any other section titles. ++ ++You may add a section Entitled \"Endorsements\", provided it contains ++nothing but endorsements of your Modified Version by various ++parties--for example, statements of peer review or that the text has ++been approved by an organization as the authoritative definition of a ++standard. ++ ++You may add a passage of up to five words as a Front-Cover Text, and a ++passage of up to 25 words as a Back-Cover Text, to the end of the list ++of Cover Texts in the Modified Version. Only one passage of ++Front-Cover Text and one of Back-Cover Text may be added by (or ++through arrangements made by) any one entity. If the Document already ++includes a cover text for the same cover, previously added by you or ++by arrangement made by the same entity you are acting on behalf of, ++you may not add another; but you may replace the old one, on explicit ++permission from the previous publisher that added the old one. ++ ++The author(s) and publisher(s) of the Document do not by this License ++give permission to use their names for publicity for or to assert or ++imply endorsement of any Modified Version. ++ ++ ++5. COMBINING DOCUMENTS ++ ++You may combine the Document with other documents released under this ++License, under the terms defined in section 4 above for modified ++versions, provided that you include in the combination all of the ++Invariant Sections of all of the original documents, unmodified, and ++list them all as Invariant Sections of your combined work in its ++license notice, and that you preserve all their Warranty Disclaimers. ++ ++The combined work need only contain one copy of this License, and ++multiple identical Invariant Sections may be replaced with a single ++copy. If there are multiple Invariant Sections with the same name but ++different contents, make the title of each such section unique by ++adding at the end of it, in parentheses, the name of the original ++author or publisher of that section if known, or else a unique number. ++Make the same adjustment to the section titles in the list of ++Invariant Sections in the license notice of the combined work. ++ ++In the combination, you must combine any sections Entitled \"History\" ++in the various original documents, forming one section Entitled ++\"History\"; likewise combine any sections Entitled \"Acknowledgements\", ++and any sections Entitled \"Dedications\". You must delete all sections ++Entitled \"Endorsements\". ++ ++ ++6. COLLECTIONS OF DOCUMENTS ++ ++You may make a collection consisting of the Document and other ++documents released under this License, and replace the individual ++copies of this License in the various documents with a single copy ++that is included in the collection, provided that you follow the rules ++of this License for verbatim copying of each of the documents in all ++other respects. ++ ++You may extract a single document from such a collection, and ++distribute it individually under this License, provided you insert a ++copy of this License into the extracted document, and follow this ++License in all other respects regarding verbatim copying of that ++document. ++ ++ ++7. AGGREGATION WITH INDEPENDENT WORKS ++ ++A compilation of the Document or its derivatives with other separate ++and independent documents or works, in or on a volume of a storage or ++distribution medium, is called an \"aggregate\" if the copyright ++resulting from the compilation is not used to limit the legal rights ++of the compilation's users beyond what the individual works permit. ++When the Document is included in an aggregate, this License does not ++apply to the other works in the aggregate which are not themselves ++derivative works of the Document. ++ ++If the Cover Text requirement of section 3 is applicable to these ++copies of the Document, then if the Document is less than one half of ++the entire aggregate, the Document's Cover Texts may be placed on ++covers that bracket the Document within the aggregate, or the ++electronic equivalent of covers if the Document is in electronic form. ++Otherwise they must appear on printed covers that bracket the whole ++aggregate. ++ ++ ++8. TRANSLATION ++ ++Translation is considered a kind of modification, so you may ++distribute translations of the Document under the terms of section 4. ++Replacing Invariant Sections with translations requires special ++permission from their copyright holders, but you may include ++translations of some or all Invariant Sections in addition to the ++original versions of these Invariant Sections. You may include a ++translation of this License, and all the license notices in the ++Document, and any Warranty Disclaimers, provided that you also include ++the original English version of this License and the original versions ++of those notices and disclaimers. In case of a disagreement between ++the translation and the original version of this License or a notice ++or disclaimer, the original version will prevail. ++ ++If a section in the Document is Entitled \"Acknowledgements\", ++\"Dedications\", or \"History\", the requirement (section 4) to Preserve ++its Title (section 1) will typically require changing the actual ++title. ++ ++ ++9. TERMINATION ++ ++You may not copy, modify, sublicense, or distribute the Document ++except as expressly provided under this License. Any attempt ++otherwise to copy, modify, sublicense, or distribute it is void, and ++will automatically terminate your rights under this License. ++ ++However, if you cease all violation of this License, then your license ++from a particular copyright holder is reinstated (a) provisionally, ++unless and until the copyright holder explicitly and finally ++terminates your license, and (b) permanently, if the copyright holder ++fails to notify you of the violation by some reasonable means prior to ++60 days after the cessation. ++ ++Moreover, your license from a particular copyright holder is ++reinstated permanently if the copyright holder notifies you of the ++violation by some reasonable means, this is the first time you have ++received notice of violation of this License (for any work) from that ++copyright holder, and you cure the violation prior to 30 days after ++your receipt of the notice. ++ ++Termination of your rights under this section does not terminate the ++licenses of parties who have received copies or rights from you under ++this License. If your rights have been terminated and not permanently ++reinstated, receipt of a copy of some or all of the same material does ++not give you any rights to use it. ++ ++ ++10. FUTURE REVISIONS OF THIS LICENSE ++ ++The Free Software Foundation may publish new, revised versions of the ++GNU Free Documentation License from time to time. Such new versions ++will be similar in spirit to the present version, but may differ in ++detail to address new problems or concerns. See ++http://www.gnu.org/copyleft/. ++ ++Each version of the License is given a distinguishing version number. ++If the Document specifies that a particular numbered version of this ++License \"or any later version\" applies to it, you have the option of ++following the terms and conditions either of that specified version or ++of any later version that has been published (not as a draft) by the ++Free Software Foundation. If the Document does not specify a version ++number of this License, you may choose any version ever published (not ++as a draft) by the Free Software Foundation. If the Document ++specifies that a proxy can decide which future versions of this ++License can be used, that proxy's public statement of acceptance of a ++version permanently authorizes you to choose that version for the ++Document. ++ ++11. RELICENSING ++ ++\"Massive Multiauthor Collaboration Site\" (or \"MMC Site\") means any ++World Wide Web server that publishes copyrightable works and also ++provides prominent facilities for anybody to edit those works. A ++public wiki that anybody can edit is an example of such a server. A ++\"Massive Multiauthor Collaboration\" (or \"MMC\") contained in the site ++means any set of copyrightable works thus published on the MMC site. ++ ++\"CC-BY-SA\" means the Creative Commons Attribution-Share Alike 3.0 ++license published by Creative Commons Corporation, a not-for-profit ++corporation with a principal place of business in San Francisco, ++California, as well as future copyleft versions of that license ++published by that same organization. ++ ++\"Incorporate\" means to publish or republish a Document, in whole or in ++part, as part of another Document. ++ ++An MMC is \"eligible for relicensing\" if it is licensed under this ++License, and if all works that were first published under this License ++somewhere other than this MMC, and subsequently incorporated in whole or ++in part into the MMC, (1) had no cover texts or invariant sections, and ++(2) were thus incorporated prior to November 1, 2008. ++ ++The operator of an MMC Site may republish an MMC contained in the site ++under CC-BY-SA on the same site at any time before August 1, 2009, ++provided the MMC is eligible for relicensing. ++ ++ ++ADDENDUM: How to use this License for your documents ++ ++To use this License in a document you have written, include a copy of ++the License in the document and put the following copyright and ++license notices just after the title page: ++ ++ Copyright (c) YEAR YOUR NAME. ++ Permission is granted to copy, distribute and/or modify this document ++ under the terms of the GNU Free Documentation License, Version 1.3 ++ or any later version published by the Free Software Foundation; ++ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. ++ A copy of the license is included in the section entitled \"GNU ++ Free Documentation License\". ++ ++If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, ++replace the \"with...Texts.\" line with this: ++ ++ with the Invariant Sections being LIST THEIR TITLES, with the ++ Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. ++ ++If you have Invariant Sections without Cover Texts, or some other ++combination of the three, merge those two alternatives to suit the ++situation. ++ ++If your document contains nontrivial examples of program code, we ++recommend releasing these examples in parallel under your choice of ++free software license, such as the GNU General Public License, ++to permit their use in free software. ++" >"$QTROOT/boot/common/data/licenses/FDL v1.3" ++mimeset -f "$QTROOT/boot/common/data/licenses/FDL v1.3" ++ ++###################################################################### ++# create GNU Free Documentation License file ++###################################################################### ++mkdir -p "$QTROOT/boot/common/data/licenses" ++echo " ++ GNU LESSER GENERAL PUBLIC LICENSE ++ Version 2.1, February 1999 ++ ++ Copyright (C) 1991, 1999 Free Software Foundation, Inc. ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ Everyone is permitted to copy and distribute verbatim copies ++ of this license document, but changing it is not allowed. ++ ++[This is the first released version of the Lesser GPL. It also counts ++ as the successor of the GNU Library Public License, version 2, hence ++ the version number 2.1.] ++ ++ Preamble ++ ++ The licenses for most software are designed to take away your ++freedom to share and change it. By contrast, the GNU General Public ++Licenses are intended to guarantee your freedom to share and change ++free software--to make sure the software is free for all its users. ++ ++ This license, the Lesser General Public License, applies to some ++specially designated software packages--typically libraries--of the ++Free Software Foundation and other authors who decide to use it. You ++can use it too, but we suggest you first think carefully about whether ++this license or the ordinary General Public License is the better ++strategy to use in any particular case, based on the explanations below. ++ ++ When we speak of free software, we are referring to freedom of use, ++not price. Our General Public Licenses are designed to make sure that ++you have the freedom to distribute copies of free software (and charge ++for this service if you wish); that you receive source code or can get ++it if you want it; that you can change the software and use pieces of ++it in new free programs; and that you are informed that you can do ++these things. ++ ++ To protect your rights, we need to make restrictions that forbid ++distributors to deny you these rights or to ask you to surrender these ++rights. These restrictions translate to certain responsibilities for ++you if you distribute copies of the library or if you modify it. ++ ++ For example, if you distribute copies of the library, whether gratis ++or for a fee, you must give the recipients all the rights that we gave ++you. You must make sure that they, too, receive or can get the source ++code. If you link other code with the library, you must provide ++complete object files to the recipients, so that they can relink them ++with the library after making changes to the library and recompiling ++it. And you must show them these terms so they know their rights. ++ ++ We protect your rights with a two-step method: (1) we copyright the ++library, and (2) we offer you this license, which gives you legal ++permission to copy, distribute and/or modify the library. ++ ++ To protect each distributor, we want to make it very clear that ++there is no warranty for the free library. Also, if the library is ++modified by someone else and passed on, the recipients should know ++that what they have is not the original version, so that the original ++author's reputation will not be affected by problems that might be ++introduced by others. ++ ++ Finally, software patents pose a constant threat to the existence of ++any free program. We wish to make sure that a company cannot ++effectively restrict the users of a free program by obtaining a ++restrictive license from a patent holder. Therefore, we insist that ++any patent license obtained for a version of the library must be ++consistent with the full freedom of use specified in this license. ++ ++ Most GNU software, including some libraries, is covered by the ++ordinary GNU General Public License. This license, the GNU Lesser ++General Public License, applies to certain designated libraries, and ++is quite different from the ordinary General Public License. We use ++this license for certain libraries in order to permit linking those ++libraries into non-free programs. ++ ++ When a program is linked with a library, whether statically or using ++a shared library, the combination of the two is legally speaking a ++combined work, a derivative of the original library. The ordinary ++General Public License therefore permits such linking only if the ++entire combination fits its criteria of freedom. The Lesser General ++Public License permits more lax criteria for linking other code with ++the library. ++ ++ We call this license the \"Lesser\" General Public License because it ++does Less to protect the user's freedom than the ordinary General ++Public License. It also provides other free software developers Less ++of an advantage over competing non-free programs. These disadvantages ++are the reason we use the ordinary General Public License for many ++libraries. However, the Lesser license provides advantages in certain ++special circumstances. ++ ++ For example, on rare occasions, there may be a special need to ++encourage the widest possible use of a certain library, so that it becomes ++a de-facto standard. To achieve this, non-free programs must be ++allowed to use the library. A more frequent case is that a free ++library does the same job as widely used non-free libraries. In this ++case, there is little to gain by limiting the free library to free ++software only, so we use the Lesser General Public License. ++ ++ In other cases, permission to use a particular library in non-free ++programs enables a greater number of people to use a large body of ++free software. For example, permission to use the GNU C Library in ++non-free programs enables many more people to use the whole GNU ++operating system, as well as its variant, the GNU/Linux operating ++system. ++ ++ Although the Lesser General Public License is Less protective of the ++users' freedom, it does ensure that the user of a program that is ++linked with the Library has the freedom and the wherewithal to run ++that program using a modified version of the Library. ++ ++ The precise terms and conditions for copying, distribution and ++modification follow. Pay close attention to the difference between a ++\"work based on the library\" and a \"work that uses the library\". The ++former contains code derived from the library, whereas the latter must ++be combined with the library in order to run. ++ ++ GNU LESSER GENERAL PUBLIC LICENSE ++ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ++ ++ 0. This License Agreement applies to any software library or other ++program which contains a notice placed by the copyright holder or ++other authorized party saying it may be distributed under the terms of ++this Lesser General Public License (also called \"this License\"). ++Each licensee is addressed as \"you\". ++ ++ A \"library\" means a collection of software functions and/or data ++prepared so as to be conveniently linked with application programs ++(which use some of those functions and data) to form executables. ++ ++ The \"Library\", below, refers to any such software library or work ++which has been distributed under these terms. A \"work based on the ++Library\" means either the Library or any derivative work under ++copyright law: that is to say, a work containing the Library or a ++portion of it, either verbatim or with modifications and/or translated ++straightforwardly into another language. (Hereinafter, translation is ++included without limitation in the term \"modification\".) ++ ++ \"Source code\" for a work means the preferred form of the work for ++making modifications to it. For a library, complete source code means ++all the source code for all modules it contains, plus any associated ++interface definition files, plus the scripts used to control compilation ++and installation of the library. ++ ++ Activities other than copying, distribution and modification are not ++covered by this License; they are outside its scope. The act of ++running a program using the Library is not restricted, and output from ++such a program is covered only if its contents constitute a work based ++on the Library (independent of the use of the Library in a tool for ++writing it). Whether that is true depends on what the Library does ++and what the program that uses the Library does. ++ ++ 1. You may copy and distribute verbatim copies of the Library's ++complete source code as you receive it, in any medium, provided that ++you conspicuously and appropriately publish on each copy an ++appropriate copyright notice and disclaimer of warranty; keep intact ++all the notices that refer to this License and to the absence of any ++warranty; and distribute a copy of this License along with the ++Library. ++ ++ You may charge a fee for the physical act of transferring a copy, ++and you may at your option offer warranty protection in exchange for a ++fee. ++ ++ 2. You may modify your copy or copies of the Library or any portion ++of it, thus forming a work based on the Library, and copy and ++distribute such modifications or work under the terms of Section 1 ++above, provided that you also meet all of these conditions: ++ ++ a) The modified work must itself be a software library. ++ ++ b) You must cause the files modified to carry prominent notices ++ stating that you changed the files and the date of any change. ++ ++ c) You must cause the whole of the work to be licensed at no ++ charge to all third parties under the terms of this License. ++ ++ d) If a facility in the modified Library refers to a function or a ++ table of data to be supplied by an application program that uses ++ the facility, other than as an argument passed when the facility ++ is invoked, then you must make a good faith effort to ensure that, ++ in the event an application does not supply such function or ++ table, the facility still operates, and performs whatever part of ++ its purpose remains meaningful. ++ ++ (For example, a function in a library to compute square roots has ++ a purpose that is entirely well-defined independent of the ++ application. Therefore, Subsection 2d requires that any ++ application-supplied function or table used by this function must ++ be optional: if the application does not supply it, the square ++ root function must still compute square roots.) ++ ++These requirements apply to the modified work as a whole. If ++identifiable sections of that work are not derived from the Library, ++and can be reasonably considered independent and separate works in ++themselves, then this License, and its terms, do not apply to those ++sections when you distribute them as separate works. But when you ++distribute the same sections as part of a whole which is a work based ++on the Library, the distribution of the whole must be on the terms of ++this License, whose permissions for other licensees extend to the ++entire whole, and thus to each and every part regardless of who wrote ++it. ++ ++Thus, it is not the intent of this section to claim rights or contest ++your rights to work written entirely by you; rather, the intent is to ++exercise the right to control the distribution of derivative or ++collective works based on the Library. ++ ++In addition, mere aggregation of another work not based on the Library ++with the Library (or with a work based on the Library) on a volume of ++a storage or distribution medium does not bring the other work under ++the scope of this License. ++ ++ 3. You may opt to apply the terms of the ordinary GNU General Public ++License instead of this License to a given copy of the Library. To do ++this, you must alter all the notices that refer to this License, so ++that they refer to the ordinary GNU General Public License, version 2, ++instead of to this License. (If a newer version than version 2 of the ++ordinary GNU General Public License has appeared, then you can specify ++that version instead if you wish.) Do not make any other change in ++these notices. ++ ++ Once this change is made in a given copy, it is irreversible for ++that copy, so the ordinary GNU General Public License applies to all ++subsequent copies and derivative works made from that copy. ++ ++ This option is useful when you wish to copy part of the code of ++the Library into a program that is not a library. ++ ++ 4. You may copy and distribute the Library (or a portion or ++derivative of it, under Section 2) in object code or executable form ++under the terms of Sections 1 and 2 above provided that you accompany ++it with the complete corresponding machine-readable source code, which ++must be distributed under the terms of Sections 1 and 2 above on a ++medium customarily used for software interchange. ++ ++ If distribution of object code is made by offering access to copy ++from a designated place, then offering equivalent access to copy the ++source code from the same place satisfies the requirement to ++distribute the source code, even though third parties are not ++compelled to copy the source along with the object code. ++ ++ 5. A program that contains no derivative of any portion of the ++Library, but is designed to work with the Library by being compiled or ++linked with it, is called a \"work that uses the Library\". Such a ++work, in isolation, is not a derivative work of the Library, and ++therefore falls outside the scope of this License. ++ ++ However, linking a \"work that uses the Library\" with the Library ++creates an executable that is a derivative of the Library (because it ++contains portions of the Library), rather than a \"work that uses the ++library\". The executable is therefore covered by this License. ++Section 6 states terms for distribution of such executables. ++ ++ When a \"work that uses the Library\" uses material from a header file ++that is part of the Library, the object code for the work may be a ++derivative work of the Library even though the source code is not. ++Whether this is true is especially significant if the work can be ++linked without the Library, or if the work is itself a library. The ++threshold for this to be true is not precisely defined by law. ++ ++ If such an object file uses only numerical parameters, data ++structure layouts and accessors, and small macros and small inline ++functions (ten lines or less in length), then the use of the object ++file is unrestricted, regardless of whether it is legally a derivative ++work. (Executables containing this object code plus portions of the ++Library will still fall under Section 6.) ++ ++ Otherwise, if the work is a derivative of the Library, you may ++distribute the object code for the work under the terms of Section 6. ++Any executables containing that work also fall under Section 6, ++whether or not they are linked directly with the Library itself. ++ ++ 6. As an exception to the Sections above, you may also combine or ++link a \"work that uses the Library\" with the Library to produce a ++work containing portions of the Library, and distribute that work ++under terms of your choice, provided that the terms permit ++modification of the work for the customer's own use and reverse ++engineering for debugging such modifications. ++ ++ You must give prominent notice with each copy of the work that the ++Library is used in it and that the Library and its use are covered by ++this License. You must supply a copy of this License. If the work ++during execution displays copyright notices, you must include the ++copyright notice for the Library among them, as well as a reference ++directing the user to the copy of this License. Also, you must do one ++of these things: ++ ++ a) Accompany the work with the complete corresponding ++ machine-readable source code for the Library including whatever ++ changes were used in the work (which must be distributed under ++ Sections 1 and 2 above); and, if the work is an executable linked ++ with the Library, with the complete machine-readable \"work that ++ uses the Library\", as object code and/or source code, so that the ++ user can modify the Library and then relink to produce a modified ++ executable containing the modified Library. (It is understood ++ that the user who changes the contents of definitions files in the ++ Library will not necessarily be able to recompile the application ++ to use the modified definitions.) ++ ++ b) Use a suitable shared library mechanism for linking with the ++ Library. A suitable mechanism is one that (1) uses at run time a ++ copy of the library already present on the user's computer system, ++ rather than copying library functions into the executable, and (2) ++ will operate properly with a modified version of the library, if ++ the user installs one, as long as the modified version is ++ interface-compatible with the version that the work was made with. ++ ++ c) Accompany the work with a written offer, valid for at ++ least three years, to give the same user the materials ++ specified in Subsection 6a, above, for a charge no more ++ than the cost of performing this distribution. ++ ++ d) If distribution of the work is made by offering access to copy ++ from a designated place, offer equivalent access to copy the above ++ specified materials from the same place. ++ ++ e) Verify that the user has already received a copy of these ++ materials or that you have already sent this user a copy. ++ ++ For an executable, the required form of the \"work that uses the ++Library\" must include any data and utility programs needed for ++reproducing the executable from it. However, as a special exception, ++the materials to be distributed need not include anything that is ++normally distributed (in either source or binary form) with the major ++components (compiler, kernel, and so on) of the operating system on ++which the executable runs, unless that component itself accompanies ++the executable. ++ ++ It may happen that this requirement contradicts the license ++restrictions of other proprietary libraries that do not normally ++accompany the operating system. Such a contradiction means you cannot ++use both them and the Library together in an executable that you ++distribute. ++ ++ 7. You may place library facilities that are a work based on the ++Library side-by-side in a single library together with other library ++facilities not covered by this License, and distribute such a combined ++library, provided that the separate distribution of the work based on ++the Library and of the other library facilities is otherwise ++permitted, and provided that you do these two things: ++ ++ a) Accompany the combined library with a copy of the same work ++ based on the Library, uncombined with any other library ++ facilities. This must be distributed under the terms of the ++ Sections above. ++ ++ b) Give prominent notice with the combined library of the fact ++ that part of it is a work based on the Library, and explaining ++ where to find the accompanying uncombined form of the same work. ++ ++ 8. You may not copy, modify, sublicense, link with, or distribute ++the Library except as expressly provided under this License. Any ++attempt otherwise to copy, modify, sublicense, link with, or ++distribute the Library is void, and will automatically terminate your ++rights under this License. However, parties who have received copies, ++or rights, from you under this License will not have their licenses ++terminated so long as such parties remain in full compliance. ++ ++ 9. You are not required to accept this License, since you have not ++signed it. However, nothing else grants you permission to modify or ++distribute the Library or its derivative works. These actions are ++prohibited by law if you do not accept this License. Therefore, by ++modifying or distributing the Library (or any work based on the ++Library), you indicate your acceptance of this License to do so, and ++all its terms and conditions for copying, distributing or modifying ++the Library or works based on it. ++ ++ 10. Each time you redistribute the Library (or any work based on the ++Library), the recipient automatically receives a license from the ++original licensor to copy, distribute, link with or modify the Library ++subject to these terms and conditions. You may not impose any further ++restrictions on the recipients' exercise of the rights granted herein. ++You are not responsible for enforcing compliance by third parties with ++this License. ++ ++ 11. If, as a consequence of a court judgment or allegation of patent ++infringement or for any other reason (not limited to patent issues), ++conditions are imposed on you (whether by court order, agreement or ++otherwise) that contradict the conditions of this License, they do not ++excuse you from the conditions of this License. If you cannot ++distribute so as to satisfy simultaneously your obligations under this ++License and any other pertinent obligations, then as a consequence you ++may not distribute the Library at all. For example, if a patent ++license would not permit royalty-free redistribution of the Library by ++all those who receive copies directly or indirectly through you, then ++the only way you could satisfy both it and this License would be to ++refrain entirely from distribution of the Library. ++ ++If any portion of this section is held invalid or unenforceable under any ++particular circumstance, the balance of the section is intended to apply, ++and the section as a whole is intended to apply in other circumstances. ++ ++It is not the purpose of this section to induce you to infringe any ++patents or other property right claims or to contest validity of any ++such claims; this section has the sole purpose of protecting the ++integrity of the free software distribution system which is ++implemented by public license practices. Many people have made ++generous contributions to the wide range of software distributed ++through that system in reliance on consistent application of that ++system; it is up to the author/donor to decide if he or she is willing ++to distribute software through any other system and a licensee cannot ++impose that choice. ++ ++This section is intended to make thoroughly clear what is believed to ++be a consequence of the rest of this License. ++ ++ 12. If the distribution and/or use of the Library is restricted in ++certain countries either by patents or by copyrighted interfaces, the ++original copyright holder who places the Library under this License may add ++an explicit geographical distribution limitation excluding those countries, ++so that distribution is permitted only in or among countries not thus ++excluded. In such case, this License incorporates the limitation as if ++written in the body of this License. ++ ++ 13. The Free Software Foundation may publish revised and/or new ++versions of the Lesser General Public License from time to time. ++Such new versions will be similar in spirit to the present version, ++but may differ in detail to address new problems or concerns. ++ ++Each version is given a distinguishing version number. If the Library ++specifies a version number of this License which applies to it and ++\"any later version\", you have the option of following the terms and ++conditions either of that version or of any later version published by ++the Free Software Foundation. If the Library does not specify a ++license version number, you may choose any version ever published by ++the Free Software Foundation. ++ ++ 14. If you wish to incorporate parts of the Library into other free ++programs whose distribution conditions are incompatible with these, ++write to the author to ask for permission. For software which is ++copyrighted by the Free Software Foundation, write to the Free ++Software Foundation; we sometimes make exceptions for this. Our ++decision will be guided by the two goals of preserving the free status ++of all derivatives of our free software and of promoting the sharing ++and reuse of software generally. ++ ++ NO WARRANTY ++ ++ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO ++WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. ++EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR ++OTHER PARTIES PROVIDE THE LIBRARY \"AS IS\" WITHOUT WARRANTY OF ANY ++KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE ++IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR ++PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE ++LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME ++THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. ++ ++ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN ++WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY ++AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU ++FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR ++CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE ++LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING ++RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A ++FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF ++SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH ++DAMAGES. ++ ++ END OF TERMS AND CONDITIONS ++ ++ How to Apply These Terms to Your New Libraries ++ ++ If you develop a new library, and you want it to be of the greatest ++possible use to the public, we recommend making it free software that ++everyone can redistribute and change. You can do so by permitting ++redistribution under these terms (or, alternatively, under the terms of the ++ordinary General Public License). ++ ++ To apply these terms, attach the following notices to the library. It is ++safest to attach them to the start of each source file to most effectively ++convey the exclusion of warranty; and each file should have at least the ++\"copyright\" line and a pointer to where the full notice is found. ++ ++ ++ Copyright (C) ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ This library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ ++Also add information on how to contact you by electronic and paper mail. ++ ++You should also get your employer (if you work as a programmer) or your ++school, if any, to sign a \"copyright disclaimer\" for the library, if ++necessary. Here is a sample; alter the names: ++ ++ Yoyodyne, Inc., hereby disclaims all copyright interest in the ++ library 'Frob' (a library for tweaking knobs) written by James Random Hacker. ++ ++ , 1 April 1990 ++ Ty Coon, President of Vice ++ ++That's all there is to it! ++" >"$QTROOT/boot/common/data/licenses/LGPL v2.1" ++mimeset -f "$QTROOT/boot/common/data/licenses/LGPL v2.1" ++ ++###################################################################### ++echo "Make full pack" ++###################################################################### ++cd $QTROOT/boot ++zip -ry9 ../qt_4.7.3_haiku_r1a3_$(date +%d%b%Y)_dev.zip * >/dev/null ++cd .. ++ ++###################################################################### ++echo "Remove files for minimal pack" ++###################################################################### ++echo " documantation" ++rm -rf $QTROOT/boot/common/documentation/doc/Qt ++echo " mkspecs" ++rm -rf $QTROOT/boot/common/data/Qt/mkspecs ++echo " include" ++rm -rf $QTROOT/boot/common/include ++echo " assistant" ++rm -f $QTROOT/boot/common/bin/assistant ++echo " designer" ++rm -f $QTROOT/boot/common/bin/designer ++echo " linguist" ++rm -f $QTROOT/boot/common/bin/linguist ++echo " qhelpconverter" ++rm -f $QTROOT/boot/common/bin/qhelpconverter ++echo " qhelpgenerator" ++rm -f $QTROOT/boot/common/bin/qhelpgenerator ++echo " qt3to4" ++rm -f $QTROOT/boot/common/bin/qt3to4 ++echo " pixeltool" ++rm -f $QTROOT/boot/common/bin/pixeltool ++echo " moc" ++rm -f $QTROOT/boot/common/bin/moc ++echo " qmake" ++rm -f $QTROOT/boot/common/bin/qmake ++echo " rcc" ++rm -f $QTROOT/boot/common/bin/rcc ++echo " qdoc3" ++rm -f $QTROOT/boot/common/bin/qdoc3 ++echo " rcc" ++rm -f $QTROOT/boot/common/bin/rcc ++echo " uic" ++rm -f $QTROOT/boot/common/bin/uic ++echo " uic3" ++rm -f $QTROOT/boot/common/bin/uic3 ++echo " libQtUiTools.a" ++rm -f $QTROOT/boot/common/lib/gcc4/libQtUiTools.a ++echo " *.la" ++rm -f $QTROOT/boot/common/lib/gcc4/*.la ++echo " *.prl" ++rm -f $QTROOT/boot/common/lib/gcc4/*.prl ++ ++echo " symlinks from menu" ++rm -f "$QTROOT/boot/home/config/be/Qt/Development/Qt Assistant" ++rm -f "$QTROOT/boot/home/config/be/Qt/Development/Qt Help Conversion Wizard" ++rm -f "$QTROOT/boot/home/config/be/Qt/Development/Qt Designer" ++rm -f "$QTROOT/boot/home/config/be/Qt/Development/Qt Linguist" ++ ++###################################################################### ++echo "Make min pack" ++###################################################################### ++cd $QTROOT/boot ++zip -ry9 ../qt_4.7.3_haiku_r1a3_$(date +%d%b%Y)_min.zip * >/dev/null ++cd .. ++ ++###################################################################### ++echo "Clean sandbox" ++###################################################################### ++rm -rf $QTROOT/boot ++ ++###################################################################### ++echo "Done" ++###################################################################### ++ +diff -rupN qt-everywhere-opensource-src-4.7.3/mkspecs/haiku-g++/qmake.conf qt-everywhere-opensource-src-4.7.3_haiku/mkspecs/haiku-g++/qmake.conf +--- qt-everywhere-opensource-src-4.7.3/mkspecs/haiku-g++/qmake.conf 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/mkspecs/haiku-g++/qmake.conf 2011-06-13 22:06:43.097255424 +0000 +@@ -0,0 +1,37 @@ ++# ++# qmake configuration for Haiku-g++ ++# ++ ++MAKEFILE_GENERATOR = UNIX ++TARGET_PLATFORM = haiku ++TEMPLATE = app ++CONFIG += qt warn_on release link_prl ++QT += core gui ++ ++QMAKE_LIBS = -lroot ++QMAKE_INCDIR = ++QMAKE_LIBDIR = ++QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] ++QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] ++QMAKE_LIBS_NETWORK = -lnetwork ++ ++QMAKE_MOC = $$[QT_INSTALL_BINS]/moc ++QMAKE_UIC = $$[QT_INSTALL_BINS]/uic ++ ++QMAKE_AR = ar cqs ++QMAKE_OBJCOPY = objcopy ++QMAKE_RANLIB = ++ ++QMAKE_TAR = tar -cf ++QMAKE_GZIP = gzip -9f ++ ++QMAKE_COPY = cp -f ++QMAKE_MOVE = mv -f ++QMAKE_DEL_FILE = rm -f ++QMAKE_DEL_DIR = rmdir ++QMAKE_CHK_DIR_EXISTS = test -d ++QMAKE_MKDIR = mkdir -p ++ ++include(../common/g++.conf) ++include(../common/unix.conf) ++load(qt_config) +diff -rupN qt-everywhere-opensource-src-4.7.3/mkspecs/haiku-g++/qplatformdefs.h qt-everywhere-opensource-src-4.7.3_haiku/mkspecs/haiku-g++/qplatformdefs.h +--- qt-everywhere-opensource-src-4.7.3/mkspecs/haiku-g++/qplatformdefs.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/mkspecs/haiku-g++/qplatformdefs.h 2011-06-13 22:06:43.106168320 +0000 +@@ -0,0 +1,43 @@ ++#ifndef QPLATFORMDEFS_H ++#define QPLATFORMDEFS_H ++ ++// Get Qt defines/settings ++ ++#include "qglobal.h" ++ ++// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs ++ ++#include ++ ++ ++// We are hot - unistd.h should have turned on the specific APIs we requested ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++//#include ++#include ++#include ++#include ++#include ++#ifndef QT_NO_IPV6IFNAME ++#include ++#endif ++ ++#include "../common/posix/qplatformdefs.h" ++ ++#define QT_SOCKLEN_T socklen_t ++ ++#define QT_SNPRINTF ::snprintf ++#define QT_VSNPRINTF ::vsnprintf ++ ++#endif // QPLATFORMDEFS_H +diff -rupN qt-everywhere-opensource-src-4.7.3/qmake/generators/makefile.cpp qt-everywhere-opensource-src-4.7.3_haiku/qmake/generators/makefile.cpp +--- qt-everywhere-opensource-src-4.7.3/qmake/generators/makefile.cpp 2011-03-30 05:15:42.028835840 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/qmake/generators/makefile.cpp 2011-06-13 22:06:43.110624768 +0000 +@@ -2202,6 +2202,8 @@ QString MakefileGenerator::buildArgs(con + ret += " -unix"; + else if (Option::target_mode == Option::TARG_WIN_MODE) + ret += " -win32"; ++ else if(Option::target_mode == Option::TARG_HAIKU_MODE) ++ ret += " -haiku"; + } + + //configs +diff -rupN qt-everywhere-opensource-src-4.7.3/qmake/generators/metamakefile.cpp qt-everywhere-opensource-src-4.7.3_haiku/qmake/generators/metamakefile.cpp +--- qt-everywhere-opensource-src-4.7.3/qmake/generators/metamakefile.cpp 2011-03-30 05:15:42.022806528 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/qmake/generators/metamakefile.cpp 2011-06-13 22:06:43.112721920 +0000 +@@ -525,6 +525,9 @@ MetaMakefileGenerator::modesForGenerator + #ifdef Q_OS_MAC + *host_mode = Option::HOST_MACX_MODE; + *target_mode = Option::TARG_MACX_MODE; ++#elif defined(Q_OS_HAIKU) ++ *host_mode = Option::HOST_HAIKU_MODE; ++ *target_mode = Option::TARG_HAIKU_MODE; + #else + *host_mode = Option::HOST_UNIX_MODE; + *target_mode = Option::TARG_UNIX_MODE; +diff -rupN qt-everywhere-opensource-src-4.7.3/qmake/generators/unix/unixmake.cpp qt-everywhere-opensource-src-4.7.3_haiku/qmake/generators/unix/unixmake.cpp +--- qt-everywhere-opensource-src-4.7.3/qmake/generators/unix/unixmake.cpp 2011-03-30 05:15:42.025427968 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/qmake/generators/unix/unixmake.cpp 2011-06-13 22:06:43.115343360 +0000 +@@ -811,6 +811,7 @@ UnixMakefileGenerator::defaultInstall(co + if(!links.isEmpty()) { + for(int i = 0; i < links.size(); ++i) { + if(Option::target_mode == Option::TARG_UNIX_MODE || ++ Option::target_mode == Option::TARG_HAIKU_MODE || + Option::target_mode == Option::TARG_MACX_MODE) { + QString link = Option::fixPathToTargetOS(destdir + links[i], false); + int lslash = link.lastIndexOf(Option::dir_sep); +diff -rupN qt-everywhere-opensource-src-4.7.3/qmake/option.cpp qt-everywhere-opensource-src-4.7.3_haiku/qmake/option.cpp +--- qt-everywhere-opensource-src-4.7.3/qmake/option.cpp 2011-03-30 05:15:42.029360128 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/qmake/option.cpp 2011-06-13 22:06:43.117702656 +0000 +@@ -260,6 +260,11 @@ Option::parseCommandLine(int argc, char + Option::host_mode = HOST_WIN_MODE; + Option::target_mode = TARG_WIN_MODE; + Option::target_mode_overridden = true; ++ } else if(opt == "haiku") { ++ fprintf(stderr, "-haiku is deprecated.\n"); ++ Option::host_mode = HOST_HAIKU_MODE; ++ Option::target_mode = TARG_HAIKU_MODE; ++ Option::target_mode_overridden = true; + } else if(opt == "d") { + Option::debug_level++; + } else if(opt == "version" || opt == "v" || opt == "-version") { +@@ -535,6 +540,9 @@ Option::init(int argc, char **argv) + #if defined(Q_OS_MAC) + Option::host_mode = Option::HOST_MACX_MODE; + Option::target_mode = Option::TARG_MACX_MODE; ++#elif defined(Q_OS_HAIKU) ++ Option::host_mode = Option::HOST_HAIKU_MODE; ++ Option::target_mode = Option::TARG_HAIKU_MODE; + #elif defined(Q_OS_UNIX) + Option::host_mode = Option::HOST_UNIX_MODE; + Option::target_mode = Option::TARG_UNIX_MODE; +diff -rupN qt-everywhere-opensource-src-4.7.3/qmake/option.h qt-everywhere-opensource-src-4.7.3_haiku/qmake/option.h +--- qt-everywhere-opensource-src-4.7.3/qmake/option.h 2011-03-30 05:15:42.030146560 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/qmake/option.h 2011-06-13 22:06:43.119799808 +0000 +@@ -153,10 +153,10 @@ struct Option + enum QMAKE_RECURSIVE { QMAKE_RECURSIVE_DEFAULT, QMAKE_RECURSIVE_YES, QMAKE_RECURSIVE_NO }; + static QMAKE_RECURSIVE recursive; + static QStringList before_user_vars, after_user_vars, user_configs, after_user_configs; +- enum HOST_MODE { HOST_UNKNOWN_MODE, HOST_UNIX_MODE, HOST_WIN_MODE, HOST_MACX_MODE }; ++ enum HOST_MODE { HOST_UNKNOWN_MODE, HOST_UNIX_MODE, HOST_WIN_MODE, HOST_MACX_MODE, HOST_HAIKU_MODE }; + static HOST_MODE host_mode; + enum TARG_MODE { TARG_UNKNOWN_MODE, TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, +- TARG_SYMBIAN_MODE }; ++ TARG_SYMBIAN_MODE, TARG_HAIKU_MODE }; + static TARG_MODE target_mode; + static bool target_mode_overridden; + static QString user_template, user_template_prefix; +diff -rupN qt-everywhere-opensource-src-4.7.3/qmake/project.cpp qt-everywhere-opensource-src-4.7.3_haiku/qmake/project.cpp +--- qt-everywhere-opensource-src-4.7.3/qmake/project.cpp 2011-03-30 05:15:42.030408704 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/qmake/project.cpp 2011-06-13 22:06:43.123994112 +0000 +@@ -541,6 +541,10 @@ QStringList qmake_feature_paths(QMakePro + case Option::TARG_UNIX_MODE: + concat << base_concat + QDir::separator() + "unix"; + break; ++ case Option::TARG_HAIKU_MODE: ++ concat << base_concat + QDir::separator() + "haiku"; ++ concat << base_concat + QDir::separator() + "unix"; ++ break; + case Option::TARG_WIN_MODE: + concat << base_concat + QDir::separator() + "win32"; + break; +@@ -1505,6 +1509,8 @@ void QMakeProject::validateModes() + const QString &os = tgt.first(); + if (os == "unix") + Option::target_mode = Option::TARG_UNIX_MODE; ++ else if (os == "haiku") ++ Option::target_mode = Option::TARG_HAIKU_MODE; + else if (os == "macx") + Option::target_mode = Option::TARG_MACX_MODE; + else if (os == "symbian") +@@ -1538,6 +1544,7 @@ QMakeProject::isActiveConfig(const QStri + validateModes(); + return Option::target_mode == Option::TARG_UNIX_MODE + || Option::target_mode == Option::TARG_MACX_MODE ++ || Option::target_mode == Option::TARG_HAIKU_MODE + || Option::target_mode == Option::TARG_SYMBIAN_MODE; + } else if (x == "macx" || x == "mac") { + validateModes(); +@@ -1548,6 +1555,9 @@ QMakeProject::isActiveConfig(const QStri + } else if (x == "win32") { + validateModes(); + return Option::target_mode == Option::TARG_WIN_MODE; ++ } else if (x == "haiku") { ++ validateModes(); ++ return Option::target_mode == Option::TARG_HAIKU_MODE; + } + + //mkspecs +diff -rupN qt-everywhere-opensource-src-4.7.3/src/3rdparty/clucene/src/CLucene/config/compiler.h qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/clucene/src/CLucene/config/compiler.h +--- qt-everywhere-opensource-src-4.7.3/src/3rdparty/clucene/src/CLucene/config/compiler.h 2011-03-30 05:18:56.033030144 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/clucene/src/CLucene/config/compiler.h 2011-06-13 22:06:43.126091264 +0000 +@@ -65,7 +65,7 @@ + //////////////////////////////////////////////////////////////////// + + /* Operating system recognition (basic) */ +-#if defined (__unix) || defined (__linux__) || defined (__QNX__) || defined (_AIX) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__Lynx__) || defined(hpux) || defined(__hpux) ++#if defined (__unix) || defined (__linux__) || defined (__QNX__) || defined (_AIX) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__Lynx__) || defined(hpux) || defined(__hpux) || defined (__HAIKU__) + #undef _UNIX + #define _UNIX 1 + #include "CLucene/config/PlatformUnix.h" +diff -rupN qt-everywhere-opensource-src-4.7.3/src/3rdparty/haiku-tools/qsystray/Makefile qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/haiku-tools/qsystray/Makefile +--- qt-everywhere-opensource-src-4.7.3/src/3rdparty/haiku-tools/qsystray/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/haiku-tools/qsystray/Makefile 2011-06-13 22:06:43.127926272 +0000 +@@ -0,0 +1,25 @@ ++all: clean qsystray qsystray_gcc2 ++ ++qsystray: ++ setgcc gcc4 ++ sleep 1 ++ make -f Makefile.gcc4 ++ ++qsystray_gcc2: ++ setgcc gcc2 ++ sleep 1 ++ make -f Makefile.gcc2 ++ setgcc gcc4 ++ sleep 1 ++ ++clean: ++ make -f Makefile.gcc4 clean ++ make -f Makefile.gcc2 clean ++ ++install: ++ make -f Makefile.gcc4 install ++ make -f Makefile.gcc2 install ++ ++ make -f Makefile.gcc4 clean ++ make -f Makefile.gcc2 clean ++ +diff -rupN qt-everywhere-opensource-src-4.7.3/src/3rdparty/haiku-tools/qsystray/Makefile.gcc2 qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/haiku-tools/qsystray/Makefile.gcc2 +--- qt-everywhere-opensource-src-4.7.3/src/3rdparty/haiku-tools/qsystray/Makefile.gcc2 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/haiku-tools/qsystray/Makefile.gcc2 2011-06-13 22:06:43.142082048 +0000 +@@ -0,0 +1,24 @@ ++CC=g++ ++SIGNATURE="application/x-vnd.QtSystrayManager_gcc2" ++ ++all: qsystray ++ ++qsystray: qsystray_gcc2.o ++ $(CC) -g qsystray_gcc2.o -ltracker -lroot -lbe -oqsystray_gcc2 ++ rc qsystray_gcc2.rdef ++ xres -o ./qsystray_gcc2 qsystray_gcc2.rsrc ++ mimeset -f ./qsystray_gcc2 ++ ++qsystray_gcc2.o: ++ $(CC) -g -oqsystray_gcc2.o -DGCC2BUILD=1 -DAPP_SIGNATURE="\"$(SIGNATURE)\"" -c qsystray.cpp ++ ++clean: ++ rm -f ./qsystray_gcc2.o ++ rm -f ./qsystray_gcc2.rsrc ++ rm -f ./qsystray_gcc2 ++ ++install: ++ cp -f ./qsystray_gcc2 /boot/common/bin/qsystray_gcc2 ++ rm -f ./qsystray_gcc2.o ++ rm -f ./qsystray_gcc2.rsrc ++ rm -f ./qsystray_gcc2 +diff -rupN qt-everywhere-opensource-src-4.7.3/src/3rdparty/haiku-tools/qsystray/Makefile.gcc4 qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/haiku-tools/qsystray/Makefile.gcc4 +--- qt-everywhere-opensource-src-4.7.3/src/3rdparty/haiku-tools/qsystray/Makefile.gcc4 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/haiku-tools/qsystray/Makefile.gcc4 2011-06-13 22:06:43.143392768 +0000 +@@ -0,0 +1,24 @@ ++CC=g++ ++SIGNATURE="application/x-vnd.QtSystrayManager_gcc4" ++ ++all: qsystray ++ ++qsystray: qsystray_gcc4.o ++ $(CC) -g qsystray_gcc4.o -ltracker -lroot -lbe -oqsystray ++ rc qsystray_gcc4.rdef ++ xres -o ./qsystray qsystray_gcc4.rsrc ++ mimeset -f ./qsystray ++ ++qsystray_gcc4.o: ++ $(CC) -g -oqsystray_gcc4.o -DGCC4BUILD=1 -DAPP_SIGNATURE="\"$(SIGNATURE)\"" -c qsystray.cpp ++ ++clean: ++ rm -f ./qsystray_gcc4.o ++ rm -f ./qsystray_gcc4.rsrc ++ rm -f ./qsystray ++ ++install: ++ cp -f ./qsystray /boot/common/bin/qsystray ++ rm -f ./qsystray_gcc4.o ++ rm -f ./qsystray_gcc4.rsrc ++ rm -f ./qsystray +diff -rupN qt-everywhere-opensource-src-4.7.3/src/3rdparty/haiku-tools/qsystray/qsystray.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/haiku-tools/qsystray/qsystray.cpp +--- qt-everywhere-opensource-src-4.7.3/src/3rdparty/haiku-tools/qsystray/qsystray.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/haiku-tools/qsystray/qsystray.cpp 2011-06-13 22:06:43.145489920 +0000 +@@ -0,0 +1,303 @@ ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "qsystray.h" ++ ++#ifndef APP_SIGNATURE ++#define APP_SIGNATURE "application/x-vnd.QtSystrayManager" ++#endif ++ ++#define REPL_NAME "QtTrayItem" ++#define DBAR_SIGNATURE "application/x-vnd.Be-TSKB" ++ ++ ++DeskbarView::DeskbarView(team_id tid) : BView(BRect(0,0,15,15), REPL_NAME,B_FOLLOW_NONE,B_WILL_DRAW) ++{ ++ id = -1; ++ team = tid; ++ ticks = 0; ++ icon = NULL; ++ traysysobject = NULL; ++ lastButtons = 0; ++} ++ ++DeskbarView::DeskbarView(BMessage *message) : BView(message) ++{ ++ const void* data; ++ ssize_t numBytes; ++ message->FindData("color",B_ANY_TYPE,&data,&numBytes); ++ color = *((rgb_color*)data); ++ message->FindData("team",B_ANY_TYPE,&data,&numBytes); ++ team = *((team_id*)data); ++ id = -1; ++ ticks = 0; ++ icon = NULL; ++ traysysobject = NULL; ++ lastButtons = 0; ++} ++ ++DeskbarView *DeskbarView::Instantiate(BMessage *data) { ++ if (!validate_instantiation(data, REPL_NAME)) return NULL; ++ return new DeskbarView(data); ++} ++ ++status_t DeskbarView::Archive(BMessage *data, bool deep) const { ++ BView::Archive(data, deep); ++ data->AddString("add_on", APP_SIGNATURE); ++ data->AddString("class", REPL_NAME); ++ ++ data->AddData("color",B_ANY_TYPE,&color,sizeof(rgb_color)); ++ data->AddData("team",B_ANY_TYPE,&team,sizeof(team_id)); ++ return B_OK; ++} ++ ++void DeskbarView::AttachedToWindow() ++{ ++ ticks = 0; ++ BMessage* tickMsg = new BMessage('LIVE'); ++ BMessageRunner *runner = new BMessageRunner( this, tickMsg, 1000000 ); ++ color = Parent()->ViewColor(); ++ BView::AttachedToWindow(); ++} ++ ++void DeskbarView::Draw(BRect r) ++{ ++ SetDrawingMode(B_OP_COPY); ++ SetHighColor(Parent()->ViewColor()); ++ FillRect(Bounds()); ++ if(ticks>3 && !icon) { ++ SetHighColor(32,32,32,100); ++ SetDrawingMode(B_OP_ALPHA); ++ DrawChar('?',BPoint(4,12)); ++ } ++ if(icon) { ++ float dx = (Bounds().Width() - icon->Bounds().Width())/2; ++ float dy = (Bounds().Height() - icon->Bounds().Height())/2; ++ SetDrawingMode(B_OP_ALPHA); ++ DrawBitmap(icon,BPoint(dx,dy)); ++ } ++} ++ ++void DeskbarView::MouseMoved(BPoint point, uint32 transit,const BMessage *message) ++{ ++} ++ ++void DeskbarView::MouseUp(BPoint point) ++{ ++ uint32 buttons = lastButtons; ++ ++ BMessage *mes = new BMessage('TRAY'); ++ mes->AddInt32("event",TRAY_MOUSEUP); ++ mes->AddPoint("point",ConvertToScreen(point)); ++ mes->AddInt32("buttons",buttons); ++ mes->AddInt32("clicks",1); ++ mes->AddData("qtrayobject",B_ANY_TYPE,&traysysobject,sizeof(void*)); ++ ReplyMessenger.SendMessage(mes); ++ ++} ++ ++void DeskbarView::MouseDown(BPoint point) ++{ ++ uint32 buttons = Window()->CurrentMessage()->FindInt32("buttons"); ++ int32 clicks = Window()->CurrentMessage()->FindInt32("clicks"); ++ lastButtons = buttons; ++ ++ BMessage *mes = new BMessage('TRAY'); ++ mes->AddInt32("event",TRAY_MOUSEDOWN); ++ mes->AddPoint("point",ConvertToScreen(point)); ++ mes->AddInt32("buttons",buttons); ++ mes->AddInt32("clicks",clicks); ++ mes->AddData("qtrayobject",B_ANY_TYPE,&traysysobject,sizeof(void*)); ++ ReplyMessenger.SendMessage(mes); ++ ++} ++ ++void DeskbarView::MessageReceived(BMessage *message) { ++// message->PrintToStream(); ++ switch (message->what) ++ { ++ case 'LIVE': ++ { ++ ticks++; ++ Invalidate(); ++ team_info teamInfo; ++ status_t error = get_team_info(team, &teamInfo); ++ if (error != B_OK && id>0) { ++ BDeskbar deskbar; ++ deskbar.RemoveItem(id); ++ } else { ++ BMessage *mes=new BMessage(*message); ++ mes->AddRect("rect",ConvertToScreen(Bounds())); ++ ReplyMessenger.SendMessage(mes); ++ } ++ break; ++ } ++ case B_SET_PROPERTY: ++ { ++ switch( message->FindInt32("what2") ) { ++ case 'TTIP': ++ { ++ const char *tip=NULL; ++ status_t res = message->FindString("tooltip",&tip); ++ ++ if(!tip || res!=B_OK) ++ tip = applicationName.String(); ++ if(strlen(tip)==0) ++ tip = applicationName.String(); ++ if(strlen(tip)!=0) ++ SetToolTip(tip); ++ ++ break; ++ } ++ case 'BITS': ++ { ++ BBitmap *oldicon=icon; ++ icon=NULL; ++ delete oldicon; ++ BMessage bits; ++ message->FindMessage("icon", &bits); ++ icon = new BBitmap(&bits); ++ bits.MakeEmpty(); ++ Invalidate(); ++ break; ++ } ++ case '_ID_': ++ { ++ message->FindInt32("ReplicantID",&id); ++ break; ++ } ++ case 'MSGR': ++ { ++ ssize_t numBytes; ++ const char *name=NULL; ++ message->FindMessenger("messenger", &ReplyMessenger); ++ message->FindData("qtrayobject",B_ANY_TYPE,&traysysobject,&numBytes); ++ if(message->FindString("application_name",&name)==B_OK) ++ applicationName.SetTo(name); ++ break; ++ } ++ } ++ } ++ break; ++ default: ++ BView::MessageReceived(message); ++ break; ++ } ++} ++ ++DeskbarView::~DeskbarView() ++{ ++ ++} ++ ++BMessenger GetMessenger(void) ++{ ++ BMessenger aResult; ++ status_t aErr = B_OK; ++ BMessenger aDeskbar(DBAR_SIGNATURE, -1, &aErr); ++ if (aErr != B_OK)return aResult; ++ ++ BMessage aMessage(B_GET_PROPERTY); ++ ++ aMessage.AddSpecifier("Messenger"); ++ aMessage.AddSpecifier("Shelf"); ++ aMessage.AddSpecifier("View", "Status"); ++ aMessage.AddSpecifier("Window", "Deskbar"); ++ ++ BMessage aReply; ++ ++ if (aDeskbar.SendMessage(&aMessage, &aReply, 1000000, 1000000) == B_OK) ++ aReply.FindMessenger("result", &aResult); ++ return aResult; ++} ++ ++ ++status_t SendMessageToReplicant(int32 index, BMessage *msg) ++{ ++ BMessage aReply; ++ status_t aErr = B_OK; ++ ++ msg->AddInt32( "what2", msg->what ); ++ msg->what = B_SET_PROPERTY; ++ ++ BMessage uid_specifier(B_ID_SPECIFIER); ++ ++ msg->AddSpecifier("View"); ++ uid_specifier.AddInt32("id", index); ++ uid_specifier.AddString("property", "Replicant"); ++ msg->AddSpecifier(&uid_specifier); ++ ++ aErr = GetMessenger().SendMessage( msg, (BHandler*)NULL, 1000000 ); ++ return aErr; ++} ++ ++int32 LoadIcon(team_id tid) ++{ ++ BDeskbar deskbar; ++ int32 id=-1; ++ ++ deskbar.AddItem(new DeskbarView(tid),&id); ++ ++ if(id>0) { ++ BMessage msg('_ID_'); ++ msg.AddInt32("ReplicantID",id); ++ SendMessageToReplicant(id,&msg); ++ } ++ ++ return id; ++} ++ ++int32 LoadIcon(void) ++{ ++ thread_info threadInfo; ++ status_t error = get_thread_info(find_thread(NULL), &threadInfo); ++ if (error != B_OK) { ++ return 0; ++ } ++ team_id sTeam = threadInfo.team; ++ ++ return LoadIcon(sTeam); ++} ++ ++void RemoveIcon(int32 id) ++{ ++ BDeskbar deskbar; ++ deskbar.RemoveItem(id); ++} ++ ++int main(int argc, char *argv[]) ++{ ++ BApplication(APP_SIGNATURE); ++ ++ if(argc<2) { ++#ifdef GCC4BUILD ++ printf("QtSystrayManager for Haiku v0.1\n\tqsystray [team_id]\n\n"); ++#else ++ printf("QtSystrayManager for Haiku v0.1 (gcc2 loader)\n\tqsystray_gcc2 [team_id]\n\n"); ++#endif ++ exit(0); ++ } ++ ++ int32 team_id = atoi(argv[1]); ++ int32 id = LoadIcon(team_id); ++#ifdef GCC4BUILD ++ if(id<=0) { ++ char cmd[128]; ++ sprintf(cmd,"qsystray_gcc2 %d",team_id); ++ return system(cmd); ++ } ++#endif ++ printf("%d\n",id); ++ ++ return id; ++} +diff -rupN qt-everywhere-opensource-src-4.7.3/src/3rdparty/haiku-tools/qsystray/qsystray.h qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/haiku-tools/qsystray/qsystray.h +--- qt-everywhere-opensource-src-4.7.3/src/3rdparty/haiku-tools/qsystray/qsystray.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/haiku-tools/qsystray/qsystray.h 2011-06-13 22:06:43.147324928 +0000 +@@ -0,0 +1,45 @@ ++#ifndef DESKBARVIEW_H ++#define DESKBARVIEW_H ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define TRAY_MOUSEDOWN 1 ++#define TRAY_MOUSEUP 2 ++ ++class DeskbarView : public BView { ++ public: ++ DeskbarView(team_id tid); ++ ~DeskbarView(); ++ void MouseDown(BPoint point); ++ void MouseUp(BPoint point); ++ void MouseMoved(BPoint point, uint32 transit,const BMessage *message); ++ void Draw(BRect r); ++ void MessageReceived(BMessage *message); ++ void AttachedToWindow(); ++ DeskbarView(BMessage *message); ++ static DeskbarView *Instantiate(BMessage *data); ++ virtual status_t Archive(BMessage *data, bool deep = true) const; ++ ++ private: ++ BPopUpMenu *RightClickPopUp; ++ BBitmap *fBitmap; ++ int32 lastButtons; ++ entry_ref appref; ++ rgb_color color; ++ team_id team; ++ int32 id; ++ unsigned int ticks; ++ BBitmap *icon; ++ BMessenger ReplyMessenger; ++ const void *traysysobject; ++ BString applicationName; ++}; ++ ++#endif +diff -rupN qt-everywhere-opensource-src-4.7.3/src/3rdparty/haiku-tools/qsystray/qsystray_gcc2.rdef qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/haiku-tools/qsystray/qsystray_gcc2.rdef +--- qt-everywhere-opensource-src-4.7.3/src/3rdparty/haiku-tools/qsystray/qsystray_gcc2.rdef 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/haiku-tools/qsystray/qsystray_gcc2.rdef 2011-06-13 22:06:43.148897792 +0000 +@@ -0,0 +1,13 @@ ++resource app_signature "application/x-vnd.QtSystrayManager_gcc2"; ++ ++resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP; ++ ++resource app_version { ++ major = 0, ++ middle = 1, ++ minor = 0, ++ variety = 0, ++ internal = 0, ++ short_info = "QtSystrayManager", ++ long_info = "QtSystrayManager (gcc2 loader)" ++}; +diff -rupN qt-everywhere-opensource-src-4.7.3/src/3rdparty/haiku-tools/qsystray/qsystray_gcc4.rdef qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/haiku-tools/qsystray/qsystray_gcc4.rdef +--- qt-everywhere-opensource-src-4.7.3/src/3rdparty/haiku-tools/qsystray/qsystray_gcc4.rdef 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/haiku-tools/qsystray/qsystray_gcc4.rdef 2011-06-13 22:06:43.150208512 +0000 +@@ -0,0 +1,13 @@ ++resource app_signature "application/x-vnd.QtSystrayManager_gcc4"; ++ ++resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP; ++ ++resource app_version { ++ major = 0, ++ middle = 1, ++ minor = 0, ++ variety = 0, ++ internal = 0, ++ short_info = "QtSystrayManager", ++ long_info = "QtSystrayManager" ++}; +diff -rupN qt-everywhere-opensource-src-4.7.3/src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h +--- qt-everywhere-opensource-src-4.7.3/src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h 2011-03-30 05:18:55.028573696 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/webkit/JavaScriptCore/wtf/MathExtras.h 2011-06-13 22:06:43.152043520 +0000 +@@ -190,7 +190,7 @@ inline float deg2turn(float d) { return + inline float rad2grad(float r) { return r * 200.0f / piFloat; } + inline float grad2rad(float g) { return g * piFloat / 200.0f; } + +-#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(ANDROID) && !COMPILER(WINSCW) ++#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(ANDROID) && !COMPILER(WINSCW) && !OS(HAIKU) + using std::isfinite; + using std::isinf; + using std::isnan; +diff -rupN qt-everywhere-opensource-src-4.7.3/src/3rdparty/webkit/WebCore/WebCore.pri qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/webkit/WebCore/WebCore.pri +--- qt-everywhere-opensource-src-4.7.3/src/3rdparty/webkit/WebCore/WebCore.pri 2011-03-30 05:18:48.014155776 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/webkit/WebCore/WebCore.pri 2011-06-13 22:06:43.154927104 +0000 +@@ -86,7 +86,7 @@ greaterThan(QT_MINOR_VERSION, 5) { + + # Nescape plugins support (NPAPI) + !contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=.) { +- unix|win32-*:!embedded:!wince*: { ++ unix|win32-*:!embedded:!wince*:!haiku: { + DEFINES += ENABLE_NETSCAPE_PLUGIN_API=1 + } else { + DEFINES += ENABLE_NETSCAPE_PLUGIN_API=0 +diff -rupN qt-everywhere-opensource-src-4.7.3/src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp +--- qt-everywhere-opensource-src-4.7.3/src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp 2011-03-30 05:18:51.049545216 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp 2011-06-13 22:06:43.157548544 +0000 +@@ -54,6 +54,29 @@ const char webSocketServerHandshakeHeade + const char webSocketUpgradeHeader[] = "Upgrade: WebSocket\r\n"; + const char webSocketConnectionHeader[] = "Connection: Upgrade\r\n"; + ++#if !defined(strnstr) && defined(__HAIKU__) ++static char * ++strnstr(const char *s, const char *find, size_t slen) ++{ ++ char c, sc; ++ size_t len; ++ ++ if ((c = *find++) != '\0') { ++ len = strlen(find); ++ do { ++ do { ++ if (slen-- < 1 || (sc = *s++) == '\0') ++ return (NULL); ++ } while (sc != c); ++ if (len > slen) ++ return (NULL); ++ } while (strncmp(s, find, len) != 0); ++ s--; ++ } ++ return ((char *)s); ++} ++#endif ++ + static String extractResponseCode(const char* header, int len) + { + const char* space1 = 0; +diff -rupN qt-everywhere-opensource-src-4.7.3/src/3rdparty/webkit/include/QtWebKit/libdummy.prl qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/webkit/include/QtWebKit/libdummy.prl +--- qt-everywhere-opensource-src-4.7.3/src/3rdparty/webkit/include/QtWebKit/libdummy.prl 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/3rdparty/webkit/include/QtWebKit/libdummy.prl 2011-06-13 22:06:43.159383552 +0000 +@@ -0,0 +1,5 @@ ++QMAKE_PRL_BUILD_DIR = /HaikuStorage/NewQt/qt-everywhere-opensource-src-4.7.3/./src/3rdparty/webkit/WebKit/qt/Api ++QMAKE_PRO_INPUT = DerivedSources.pro ++QMAKE_PRL_TARGET = libdummy.so.1.0.0 ++QMAKE_PRL_CONFIG = lex yacc warn_on uic resources qt warn_on release link_prl def_files_disabled exceptions no_mocdepend release stl qt_no_framework release shared dll stl mmx 3dnow sse sse2 sse3 ssse3 sse4_1 sse4_2 avx dylib create_prl link_prl depend_includepath fix_output_dirs QTDIR_build shared dll moc thread ++QMAKE_PRL_VERSION = 1.0.0 +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/animation/qvariantanimation.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/animation/qvariantanimation.cpp +--- qt-everywhere-opensource-src-4.7.3/src/corelib/animation/qvariantanimation.cpp 2011-03-30 05:19:08.061079552 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/animation/qvariantanimation.cpp 2011-06-13 22:06:43.186384384 +0000 +@@ -434,9 +434,15 @@ void QVariantAnimation::registerInterpol + #ifndef QT_NO_THREAD + QMutexLocker locker(QMutexPool::globalInstanceGet(interpolators)); + #endif ++#if defined(Q_OS_HAIKU) //temporary dirty hack ++if(interpolators) { ++#endif + if (int(interpolationType) >= interpolators->count()) + interpolators->resize(int(interpolationType) + 1); + interpolators->replace(interpolationType, func); ++#if defined(Q_OS_HAIKU) ++} ++#endif + } + + +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/concurrent/qtconcurrentiteratekernel.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/concurrent/qtconcurrentiteratekernel.cpp +--- qt-everywhere-opensource-src-4.7.3/src/corelib/concurrent/qtconcurrentiteratekernel.cpp 2011-03-30 05:19:08.058458112 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/concurrent/qtconcurrentiteratekernel.cpp 2011-06-13 22:06:43.188219392 +0000 +@@ -54,6 +54,9 @@ + #elif defined(Q_OS_WIN) + #include + #endif ++#if defined(Q_OS_HAIKU) ++#include ++#endif + + #include "private/qfunctions_p.h" + +@@ -67,7 +70,14 @@ enum { + MedianSize = 7 + }; + +-#if defined(Q_OS_MAC) ++#if defined(Q_OS_HAIKU) ++ ++static qint64 getticks() ++{ ++ return system_time(); ++} ++ ++#elif defined(Q_OS_MAC) + + static qint64 getticks() + { +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/corelib.pro qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/corelib.pro +--- qt-everywhere-opensource-src-4.7.3/src/corelib/corelib.pro 2011-03-30 05:19:08.013369344 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/corelib.pro 2011-06-13 22:06:43.190578688 +0000 +@@ -23,6 +23,7 @@ mac|darwin:LIBS_PRIVATE += -framework Ap + + mac:lib_bundle:DEFINES += QT_NO_DEBUG_PLUGIN_CHECK + win32:DEFINES-=QT_NO_CAST_TO_ASCII ++haiku:DEFINES += QT_NO_SHAREDMEMORY + + QMAKE_LIBS += $$QMAKE_LIBS_CORE + +@@ -40,3 +41,7 @@ symbian: { + "$${LITERAL_HASH}endif" + MMP_RULES += pagingBlock + } ++ ++haiku: { ++ LIBS_PRIVATE += -lbe ++} +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/global/qconfig.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/global/qconfig.cpp +--- qt-everywhere-opensource-src-4.7.3/src/corelib/global/qconfig.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/global/qconfig.cpp 2011-06-13 22:06:43.192937984 +0000 +@@ -0,0 +1,34 @@ ++/* License Info */ ++static const char qt_configure_licensee_str [256 + 12] = "qt_lcnsuser=Open Source\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; ++static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=OpenSource\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; ++ ++/* Installation date */ ++static const char qt_configure_installation [12+11] = "qt_instdate=2011-06-13"; ++/* Installation Info */ ++static const char qt_configure_prefix_path_str [256 + 12] = "qt_prfxpath=/boot/common\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; ++static const char qt_configure_documentation_path_str[256 + 12] = "qt_docspath=/boot/common/documentation/doc/Qt\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; ++static const char qt_configure_headers_path_str [256 + 12] = "qt_hdrspath=/boot/common/include\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; ++static const char qt_configure_libraries_path_str [256 + 12] = "qt_libspath=/boot/common/lib\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; ++static const char qt_configure_binaries_path_str [256 + 12] = "qt_binspath=/boot/common/bin\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; ++static const char qt_configure_plugins_path_str [256 + 12] = "qt_plugpath=/boot/common/add-ons/Qt/plugins\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; ++static const char qt_configure_imports_path_str [256 + 12] = "qt_impspath=/boot/common/add-ons/Qt/imports\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; ++static const char qt_configure_data_path_str [256 + 12] = "qt_datapath=/boot/common/data/Qt\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; ++static const char qt_configure_translations_path_str [256 + 12] = "qt_trnspath=/boot/common/data/Qt/translations\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; ++static const char qt_configure_settings_path_str [256 + 12] = "qt_stngpath=/boot/common/settings/Qt\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; ++static const char qt_configure_examples_path_str [256 + 12] = "qt_xmplpath=/boot/apps/Qt/Examples\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; ++static const char qt_configure_demos_path_str [256 + 12] = "qt_demopath=/boot/apps/Qt/Demos\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; ++/* strlen( "qt_lcnsxxxx" ) == 12 */ ++#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12; ++#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12; ++#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12; ++#define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12; ++#define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12; ++#define QT_CONFIGURE_LIBRARIES_PATH qt_configure_libraries_path_str + 12; ++#define QT_CONFIGURE_BINARIES_PATH qt_configure_binaries_path_str + 12; ++#define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12; ++#define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12; ++#define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12; ++#define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12; ++#define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12; ++#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12; ++#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12; +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/global/qconfig.h qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/global/qconfig.h +--- qt-everywhere-opensource-src-4.7.3/src/corelib/global/qconfig.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/global/qconfig.h 2011-06-13 22:06:43.194510848 +0000 +@@ -0,0 +1,225 @@ ++/* Everything */ ++ ++/* Qt Edition */ ++#ifndef QT_EDITION ++# define QT_EDITION QT_EDITION_OPENSOURCE ++#endif ++ ++/* Machine byte-order */ ++#define Q_BIG_ENDIAN 4321 ++#define Q_LITTLE_ENDIAN 1234 ++#define QT_BUILD_KEY "i386 haiku g++-4 full-config" ++#define QT_BUILD_KEY_COMPAT "BePC Haiku g++-4 full-config" ++ ++#ifdef QT_BOOTSTRAPPED ++#define Q_BYTE_ORDER Q_LITTLE_ENDIAN ++#else ++#define Q_BYTE_ORDER Q_LITTLE_ENDIAN ++#endif ++/* Machine Architecture */ ++#ifndef QT_BOOTSTRAPPED ++# define QT_ARCH_I386 ++#else ++# define QT_ARCH_I386 ++#endif ++/* Compile time features */ ++#define QT_POINTER_SIZE 4 ++ ++#ifndef QT_BOOTSTRAPPED ++ ++#if defined(QT_NO_ALSA) && defined(QT_ALSA) ++# undef QT_NO_ALSA ++#elif !defined(QT_NO_ALSA) && !defined(QT_ALSA) ++# define QT_NO_ALSA ++#endif ++ ++#if defined(QT_NO_CLOCK_MONOTONIC) && defined(QT_CLOCK_MONOTONIC) ++# undef QT_NO_CLOCK_MONOTONIC ++#elif !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_CLOCK_MONOTONIC) ++# define QT_NO_CLOCK_MONOTONIC ++#endif ++ ++#if defined(QT_NO_CUPS) && defined(QT_CUPS) ++# undef QT_NO_CUPS ++#elif !defined(QT_NO_CUPS) && !defined(QT_CUPS) ++# define QT_NO_CUPS ++#endif ++ ++#if defined(QT_NO_DBUS) && defined(QT_DBUS) ++# undef QT_NO_DBUS ++#elif !defined(QT_NO_DBUS) && !defined(QT_DBUS) ++# define QT_NO_DBUS ++#endif ++ ++#if defined(QT_NO_EGL) && defined(QT_EGL) ++# undef QT_NO_EGL ++#elif !defined(QT_NO_EGL) && !defined(QT_EGL) ++# define QT_NO_EGL ++#endif ++ ++#if defined(QT_NO_GETIFADDRS) && defined(QT_GETIFADDRS) ++# undef QT_NO_GETIFADDRS ++#elif !defined(QT_NO_GETIFADDRS) && !defined(QT_GETIFADDRS) ++# define QT_NO_GETIFADDRS ++#endif ++ ++#if defined(QT_NO_GLIB) && defined(QT_GLIB) ++# undef QT_NO_GLIB ++#elif !defined(QT_NO_GLIB) && !defined(QT_GLIB) ++# define QT_NO_GLIB ++#endif ++ ++#if defined(QT_NO_GSTREAMER) && defined(QT_GSTREAMER) ++# undef QT_NO_GSTREAMER ++#elif !defined(QT_NO_GSTREAMER) && !defined(QT_GSTREAMER) ++# define QT_NO_GSTREAMER ++#endif ++ ++#if defined(QT_NO_GUI) && defined(QT_GUI) ++# undef QT_NO_GUI ++#elif !defined(QT_NO_GUI) && !defined(QT_GUI) ++# define QT_NO_GUI ++#endif ++ ++#if defined(QT_NO_ICD) && defined(QT_ICD) ++# undef QT_NO_ICD ++#elif !defined(QT_NO_ICD) && !defined(QT_ICD) ++# define QT_NO_ICD ++#endif ++ ++#if defined(QT_NO_ICONV) && defined(QT_ICONV) ++# undef QT_NO_ICONV ++#elif !defined(QT_NO_ICONV) && !defined(QT_ICONV) ++# define QT_NO_ICONV ++#endif ++ ++#if defined(QT_NO_IMAGEFORMAT_JPEG) && defined(QT_IMAGEFORMAT_JPEG) ++# undef QT_NO_IMAGEFORMAT_JPEG ++#elif !defined(QT_NO_IMAGEFORMAT_JPEG) && !defined(QT_IMAGEFORMAT_JPEG) ++# define QT_NO_IMAGEFORMAT_JPEG ++#endif ++ ++#if defined(QT_NO_IMAGEFORMAT_MNG) && defined(QT_IMAGEFORMAT_MNG) ++# undef QT_NO_IMAGEFORMAT_MNG ++#elif !defined(QT_NO_IMAGEFORMAT_MNG) && !defined(QT_IMAGEFORMAT_MNG) ++# define QT_NO_IMAGEFORMAT_MNG ++#endif ++ ++#if defined(QT_NO_IMAGEFORMAT_TIFF) && defined(QT_IMAGEFORMAT_TIFF) ++# undef QT_NO_IMAGEFORMAT_TIFF ++#elif !defined(QT_NO_IMAGEFORMAT_TIFF) && !defined(QT_IMAGEFORMAT_TIFF) ++# define QT_NO_IMAGEFORMAT_TIFF ++#endif ++ ++#if defined(QT_NO_INOTIFY) && defined(QT_INOTIFY) ++# undef QT_NO_INOTIFY ++#elif !defined(QT_NO_INOTIFY) && !defined(QT_INOTIFY) ++# define QT_NO_INOTIFY ++#endif ++ ++#if defined(QT_NO_MREMAP) && defined(QT_MREMAP) ++# undef QT_NO_MREMAP ++#elif !defined(QT_NO_MREMAP) && !defined(QT_MREMAP) ++# define QT_NO_MREMAP ++#endif ++ ++#if defined(QT_NO_NAS) && defined(QT_NAS) ++# undef QT_NO_NAS ++#elif !defined(QT_NO_NAS) && !defined(QT_NAS) ++# define QT_NO_NAS ++#endif ++ ++#if defined(QT_NO_NIS) && defined(QT_NIS) ++# undef QT_NO_NIS ++#elif !defined(QT_NO_NIS) && !defined(QT_NIS) ++# define QT_NO_NIS ++#endif ++ ++#if defined(QT_NO_OPENGL) && defined(QT_OPENGL) ++# undef QT_NO_OPENGL ++#elif !defined(QT_NO_OPENGL) && !defined(QT_OPENGL) ++# define QT_NO_OPENGL ++#endif ++ ++#if defined(QT_NO_OPENVG) && defined(QT_OPENVG) ++# undef QT_NO_OPENVG ++#elif !defined(QT_NO_OPENVG) && !defined(QT_OPENVG) ++# define QT_NO_OPENVG ++#endif ++ ++#if defined(QT_NO_PULSEAUDIO) && defined(QT_PULSEAUDIO) ++# undef QT_NO_PULSEAUDIO ++#elif !defined(QT_NO_PULSEAUDIO) && !defined(QT_PULSEAUDIO) ++# define QT_NO_PULSEAUDIO ++#endif ++ ++#if defined(QT_NO_S60) && defined(QT_S60) ++# undef QT_NO_S60 ++#elif !defined(QT_NO_S60) && !defined(QT_S60) ++# define QT_NO_S60 ++#endif ++ ++#if defined(QT_NO_STYLE_GTK) && defined(QT_STYLE_GTK) ++# undef QT_NO_STYLE_GTK ++#elif !defined(QT_NO_STYLE_GTK) && !defined(QT_STYLE_GTK) ++# define QT_NO_STYLE_GTK ++#endif ++ ++#if defined(QT_NO_STYLE_S60) && defined(QT_STYLE_S60) ++# undef QT_NO_STYLE_S60 ++#elif !defined(QT_NO_STYLE_S60) && !defined(QT_STYLE_S60) ++# define QT_NO_STYLE_S60 ++#endif ++ ++#if defined(QT_NO_SXE) && defined(QT_SXE) ++# undef QT_NO_SXE ++#elif !defined(QT_NO_SXE) && !defined(QT_SXE) ++# define QT_NO_SXE ++#endif ++ ++#if defined(QT_NO_ZLIB) && defined(QT_ZLIB) ++# undef QT_NO_ZLIB ++#elif !defined(QT_NO_ZLIB) && !defined(QT_ZLIB) ++# define QT_NO_ZLIB ++#endif ++ ++#if defined(QT_RUNTIME_XCURSOR) && defined(QT_NO_RUNTIME_XCURSOR) ++# undef QT_RUNTIME_XCURSOR ++#elif !defined(QT_RUNTIME_XCURSOR) && !defined(QT_NO_RUNTIME_XCURSOR) ++# define QT_RUNTIME_XCURSOR ++#endif ++ ++#if defined(QT_RUNTIME_XFIXES) && defined(QT_NO_RUNTIME_XFIXES) ++# undef QT_RUNTIME_XFIXES ++#elif !defined(QT_RUNTIME_XFIXES) && !defined(QT_NO_RUNTIME_XFIXES) ++# define QT_RUNTIME_XFIXES ++#endif ++ ++#if defined(QT_RUNTIME_XINERAMA) && defined(QT_NO_RUNTIME_XINERAMA) ++# undef QT_RUNTIME_XINERAMA ++#elif !defined(QT_RUNTIME_XINERAMA) && !defined(QT_NO_RUNTIME_XINERAMA) ++# define QT_RUNTIME_XINERAMA ++#endif ++ ++#if defined(QT_RUNTIME_XINPUT) && defined(QT_NO_RUNTIME_XINPUT) ++# undef QT_RUNTIME_XINPUT ++#elif !defined(QT_RUNTIME_XINPUT) && !defined(QT_NO_RUNTIME_XINPUT) ++# define QT_RUNTIME_XINPUT ++#endif ++ ++#if defined(QT_RUNTIME_XRANDR) && defined(QT_NO_RUNTIME_XRANDR) ++# undef QT_RUNTIME_XRANDR ++#elif !defined(QT_RUNTIME_XRANDR) && !defined(QT_NO_RUNTIME_XRANDR) ++# define QT_RUNTIME_XRANDR ++#endif ++ ++#if defined(QT_USE_MATH_H_FLOATS) && defined(QT_NO_USE_MATH_H_FLOATS) ++# undef QT_USE_MATH_H_FLOATS ++#elif !defined(QT_USE_MATH_H_FLOATS) && !defined(QT_NO_USE_MATH_H_FLOATS) ++# define QT_USE_MATH_H_FLOATS ++#endif ++ ++#endif // QT_BOOTSTRAPPED ++ ++#define QT_VISIBILITY_AVAILABLE ++ +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/global/qconfig.h.qmake qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/global/qconfig.h.qmake +--- qt-everywhere-opensource-src-4.7.3/src/corelib/global/qconfig.h.qmake 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/global/qconfig.h.qmake 2011-06-13 22:06:43.196345856 +0000 +@@ -0,0 +1 @@ ++/* All features enabled while building qmake */ +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/global/qglobal.h qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/global/qglobal.h +--- qt-everywhere-opensource-src-4.7.3/src/corelib/global/qglobal.h 2011-03-30 05:19:08.006553600 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/global/qglobal.h 2011-06-13 22:06:43.213385216 +0000 +@@ -173,6 +173,7 @@ namespace QT_NAMESPACE {} + LYNX - LynxOS + BSD4 - Any BSD 4.4 system + UNIX - Any UNIX BSD/SYSV system ++ HAIKU - Haiku + */ + + #if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) +@@ -256,6 +257,8 @@ namespace QT_NAMESPACE {} + # define Q_OS_INTEGRITY + #elif defined(VXWORKS) /* there is no "real" VxWorks define - this has to be set in the mkspec! */ + # define Q_OS_VXWORKS ++#elif defined(__HAIKU__) ++# define Q_OS_HAIKU + #elif defined(__MAKEDEPEND__) + #else + # error "Qt has not been ported to this OS - talk to qt-bugs@trolltech.com" +@@ -781,6 +784,7 @@ namespace QT_NAMESPACE {} + S60 - Symbian S60 + PM - unsupported + WIN16 - unsupported ++ HAIKU - Haiku, Application Server + */ + + #if defined(Q_OS_MSDOS) +@@ -788,6 +792,8 @@ namespace QT_NAMESPACE {} + # error "Qt requires Win32 and does not work with Windows 3.x" + #elif defined(_WIN32_X11_) + # define Q_WS_X11 ++#elif defined(Q_OS_HAIKU) ++# define Q_WS_HAIKU + #elif defined(Q_OS_WIN32) + # define Q_WS_WIN32 + # if defined(Q_OS_WIN64) +@@ -820,6 +826,10 @@ namespace QT_NAMESPACE {} + # endif + #endif + ++#if defined(Q_OS_HAIKU) && defined (Q_WS_X11) ++#undef Q_WS_X11 ++#endif ++ + #if defined(Q_WS_WIN16) || defined(Q_WS_WIN32) || defined(Q_WS_WINCE) + # define Q_WS_WIN + #endif +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/global/qnamespace.h qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/global/qnamespace.h +--- qt-everywhere-opensource-src-4.7.3/src/corelib/global/qnamespace.h 2011-03-30 05:19:08.006291456 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/global/qnamespace.h 2011-06-13 22:06:43.216006656 +0000 +@@ -1670,6 +1670,8 @@ public: + typedef void * HANDLE; + #elif defined(Q_OS_SYMBIAN) + typedef unsigned long int HANDLE; // equivalent to TUint32 ++#elif defined(Q_OS_HAIKU) ++ typedef unsigned long HANDLE; + #endif + typedef WindowFlags WFlags; + +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/io/qfsfileengine_unix.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/io/qfsfileengine_unix.cpp +--- qt-everywhere-opensource-src-4.7.3/src/corelib/io/qfsfileengine_unix.cpp 2011-03-30 05:19:08.055312384 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/io/qfsfileengine_unix.cpp 2011-06-13 22:06:43.218628096 +0000 +@@ -625,6 +625,9 @@ QString QFSFileEngine::homePath() + QString home = rootPath(); + #else + QString home = QFile::decodeName(qgetenv("HOME")); ++#ifdef Q_OS_HAIKU ++ home += QLatin1String("/config/settings/Qt"); ++#endif + if (home.isNull()) + home = rootPath(); + #endif +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/io/qprocess_unix.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/io/qprocess_unix.cpp +--- qt-everywhere-opensource-src-4.7.3/src/corelib/io/qprocess_unix.cpp 2011-03-30 05:19:08.050331648 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/io/qprocess_unix.cpp 2011-06-13 22:06:43.221249536 +0000 +@@ -792,8 +792,12 @@ qint64 QProcessPrivate::bytesAvailableFr + { + int nbytes = 0; + qint64 available = 0; ++#ifdef Q_OS_HAIKU ++ available = 1024; ++#else + if (::ioctl(stdoutChannel.pipe[0], FIONREAD, (char *) &nbytes) >= 0) + available = (qint64) nbytes; ++#endif + #if defined (QPROCESS_DEBUG) + qDebug("QProcessPrivate::bytesAvailableFromStdout() == %lld", available); + #endif +@@ -804,8 +808,12 @@ qint64 QProcessPrivate::bytesAvailableFr + { + int nbytes = 0; + qint64 available = 0; ++#ifdef Q_OS_HAIKU ++ available = 1024; ++#else + if (::ioctl(stderrChannel.pipe[0], FIONREAD, (char *) &nbytes) >= 0) + available = (qint64) nbytes; ++#endif + #if defined (QPROCESS_DEBUG) + qDebug("QProcessPrivate::bytesAvailableFromStderr() == %lld", available); + #endif +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/kernel/qsystemsemaphore_unix.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/kernel/qsystemsemaphore_unix.cpp +--- qt-everywhere-opensource-src-4.7.3/src/corelib/kernel/qsystemsemaphore_unix.cpp 2011-03-30 05:19:08.063438848 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/kernel/qsystemsemaphore_unix.cpp 2011-06-13 22:06:43.223346688 +0000 +@@ -52,7 +52,9 @@ + #include + #include + #include ++#if !defined(Q_OS_HAIKU) + #include ++#endif + + #include + +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/thread/qthread_p.h qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/thread/qthread_p.h +--- qt-everywhere-opensource-src-4.7.3/src/corelib/thread/qthread_p.h 2011-03-30 05:19:08.008650752 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/thread/qthread_p.h 2011-06-13 22:06:43.225443840 +0000 +@@ -140,7 +140,7 @@ public: + QWaitCondition thread_done; + + static void *start(void *arg); +-#if defined(Q_OS_SYMBIAN) ++#if defined(Q_OS_SYMBIAN) || defined(Q_OS_HAIKU) + static void finish(void *arg, bool lockAnyway=true, bool closeNativeHandle=true); + #else + static void finish(void *); +@@ -156,7 +156,7 @@ public: + static void finish(void *, bool lockAnyway=true); + #endif // Q_OS_WIN32 + +-#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN) ++#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) || defined (Q_OS_SYMBIAN) || defined (Q_OS_HAIKU) + bool terminationEnabled, terminatePending; + # endif + QThreadData *data; +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/thread/qthread_unix.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/thread/qthread_unix.cpp +--- qt-everywhere-opensource-src-4.7.3/src/corelib/thread/qthread_unix.cpp 2011-03-30 05:19:08.009699328 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/thread/qthread_unix.cpp 2011-06-13 22:06:43.228327424 +0000 +@@ -274,7 +274,7 @@ void QThreadPrivate::createEventDispatch + void *QThreadPrivate::start(void *arg) + { + // Symbian Open C supports neither thread cancellation nor cleanup_push. +-#ifndef Q_OS_SYMBIAN ++#if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_HAIKU) + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); + pthread_cleanup_push(QThreadPrivate::finish, arg); + #endif +@@ -319,7 +319,7 @@ void *QThreadPrivate::start(void *arg) + #endif + thr->run(); + +-#ifdef Q_OS_SYMBIAN ++#if defined(Q_OS_SYMBIAN) || defined(Q_OS_HAIKU) + QThreadPrivate::finish(arg); + #else + pthread_cleanup_pop(1); +@@ -328,7 +328,7 @@ void *QThreadPrivate::start(void *arg) + return 0; + } + +-#ifdef Q_OS_SYMBIAN ++#if defined(Q_OS_SYMBIAN) || defined(Q_OS_HAIKU) + void QThreadPrivate::finish(void *arg, bool lockAnyway, bool closeNativeHandle) + #else + void QThreadPrivate::finish(void *arg) +@@ -336,7 +336,7 @@ void QThreadPrivate::finish(void *arg) + { + QThread *thr = reinterpret_cast(arg); + QThreadPrivate *d = thr->d_func(); +-#ifdef Q_OS_SYMBIAN ++#if defined(Q_OS_SYMBIAN) || defined(Q_OS_HAIKU) + if (lockAnyway) + #endif + d->mutex.lock(); +@@ -365,7 +365,7 @@ void QThreadPrivate::finish(void *arg) + d->data->symbian_thread_handle.Close(); + #endif + d->thread_done.wakeAll(); +-#ifdef Q_OS_SYMBIAN ++#if defined(Q_OS_SYMBIAN) || defined(Q_OS_HAIKU) + if (lockAnyway) + #endif + d->mutex.unlock(); +@@ -634,7 +634,7 @@ void QThread::start(Priority priority) + if (code == EPERM) { + // caller does not have permission to set the scheduling + // parameters/policy +-#ifndef Q_OS_SYMBIAN ++#if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_HAIKU) + pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); + #endif + code = +@@ -663,7 +663,7 @@ void QThread::terminate() + if (!d->thread_id) + return; + +-#ifndef Q_OS_SYMBIAN ++#if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_HAIKU) + int code = pthread_cancel(d->thread_id); + if (code) { + qWarning("QThread::start: Thread termination error: %s", +@@ -686,11 +686,14 @@ void QThread::terminate() + // 2. closeNativeSymbianHandle = false. We don't want to close the thread handle, + // because we need it here to terminate the thread. + QThreadPrivate::finish(this, false, false); ++#ifdef Q_OS_SYMBIAN + d->data->symbian_thread_handle.Terminate(KErrNone); + d->data->symbian_thread_handle.Close(); + #endif +- +- ++#ifdef Q_OS_HAIKU ++ pthread_kill(d->thread_id,0); ++#endif ++#endif + } + + bool QThread::wait(unsigned long time) +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/tools/qlocale.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/tools/qlocale.cpp +--- qt-everywhere-opensource-src-4.7.3/src/corelib/tools/qlocale.cpp 2011-03-30 05:19:08.013893632 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/tools/qlocale.cpp 2011-06-13 22:06:43.234356736 +0000 +@@ -63,6 +63,9 @@ QT_END_NAMESPACE + # include "qt_windows.h" + # include + #endif ++#if defined(Q_OS_HAIKU) ++#include ++#endif + #if !defined(QWS) && defined(Q_OS_MAC) + # include "private/qcore_mac_p.h" + # include +@@ -1249,6 +1252,78 @@ QVariant QSystemLocale::query(QueryType + return QVariant(); + } + ++#elif defined(Q_OS_HAIKU) && !defined(QT_BUILD_QMAKE) ++ ++QLocale QSystemLocale::fallbackLocale() const ++{ ++ BLanguage lang; ++ BLocale::Default()->GetLanguage(&lang); ++ return QLocale(QLatin1String(lang.ID())); ++} ++ ++QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const ++{ ++ BLanguage lang; ++ BLocale::Default()->GetLanguage(&lang); ++ ++ switch(type) { ++ case DecimalPoint: { ++ BString test, unitest; ++ BLocale::Default()->FormatNumber(&test,1.1); ++ BLocale::Default()->FormatNumber(&unitest,(int32)1); ++ QString result = QString().fromLocal8Bit(test.String()); ++ result.remove(QString().fromLocal8Bit(unitest.String())); ++ if(!result.isEmpty() && result.size()<=2) { ++ return result; ++ } ++ return QVariant(); ++ } ++ case GroupSeparator: { ++ BString test, unitest; ++ BLocale::Default()->FormatNumber(&test,(int32)11111); ++ BLocale::Default()->FormatNumber(&unitest,(int32)1); ++ QString result = QString().fromLocal8Bit(test.String()); ++ result.remove(QString().fromLocal8Bit(unitest.String())); ++ if(!result.isEmpty() && result.size()<=3) { ++ return result; ++ } ++ return QVariant(); ++ } ++ case LanguageId: ++ case CountryId: { ++ QString preferredLanguage = QString().fromLocal8Bit(lang.Code()); ++ QString preferredCountry(3, QChar()); ++ preferredCountry = QString().fromLocal8Bit(lang.CountryCode()); ++ QLocale::Language languageCode = (preferredLanguage.isEmpty() ? QLocale::C : codeToLanguage(preferredLanguage.data())); ++ QLocale::Country countryCode = (preferredCountry.isEmpty() ? QLocale::AnyCountry : codeToCountry(preferredCountry.data())); ++ const QLocalePrivate *d = findLocale(languageCode, countryCode); ++ if (type == LanguageId) { ++ return (QLocale::Language)d->languageId(); ++ } ++ return (QLocale::Country)d->countryId(); ++ } ++ case MeasurementSystem: { ++ BFormattingConventions conventions; ++ BLocale::Default()->GetFormattingConventions(&conventions); ++ if(conventions.MeasurementKind()==B_METRIC) { ++ return QLocale::MetricSystem; ++ } else { ++ return QLocale::ImperialSystem; ++ } ++ } ++ case NegativeSign: ++ case PositiveSign: ++ case ZeroDigit: ++ break; ++ case AMText: ++ case PMText: ++ break; ++ default: ++ break; ++ } ++ return QVariant(); ++} ++ + #elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) + + static uint unixGetSystemMeasurementSystem() +diff -rupN qt-everywhere-opensource-src-4.7.3/src/corelib/tools/tools.pri qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/tools/tools.pri +--- qt-everywhere-opensource-src-4.7.3/src/corelib/tools/tools.pri 2011-03-30 05:19:08.024117248 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/corelib/tools/tools.pri 2011-06-13 22:06:43.235929600 +0000 +@@ -110,5 +110,5 @@ INCLUDEPATH += ../3rdparty/md5 \ + ../3rdparty/md4 + + # Note: libm should be present by default becaue this is C++ +-!macx-icc:!vxworks:!symbian:unix:LIBS_PRIVATE += -lm ++!macx-icc:!vxworks:!symbian:!haiku:unix:LIBS_PRIVATE += -lm + +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/dialogs/dialogs.pri qt-everywhere-opensource-src-4.7.3_haiku/src/gui/dialogs/dialogs.pri +--- qt-everywhere-opensource-src-4.7.3/src/gui/dialogs/dialogs.pri 2011-03-30 05:19:03.013369344 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/dialogs/dialogs.pri 2011-06-13 22:06:43.238026752 +0000 +@@ -61,6 +61,11 @@ win32 { + !win32-borland:!wince*: LIBS += -lshell32 # the filedialog needs this library + } + ++haiku { ++ SOURCES += dialogs/qfiledialog_haiku.cpp ++ LIBS += -ltracker # the filedialog needs this library ++} ++ + !mac:!embedded:!symbian:unix { + HEADERS += dialogs/qpagesetupdialog_unix_p.h + SOURCES += dialogs/qprintdialog_unix.cpp \ +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/dialogs/qfiledialog.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/dialogs/qfiledialog.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/dialogs/qfiledialog.cpp 2011-03-30 05:19:03.020185088 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/dialogs/qfiledialog.cpp 2011-06-13 22:06:43.243269632 +0000 +@@ -292,7 +292,7 @@ Q_GUI_EXPORT _qt_filedialog_save_filenam + This signal is emitted when the user selects a \a filter. + */ + +-#if defined(Q_WS_WIN) || defined(Q_WS_MAC) ++#if defined(Q_WS_WIN) || defined(Q_WS_MAC) || defined(Q_WS_HAIKU) + bool Q_GUI_EXPORT qt_use_native_dialogs = true; // for the benefit of testing tools, until we have a proper API + #endif + +@@ -1617,6 +1617,25 @@ extern QString qt_win_get_existing_direc + #endif + + /* ++ For Haiku file dialogs ++*/ ++#if defined(Q_WS_HAIKU) ++extern QString qt_haiku_get_open_file_name(const QFileDialogArgs &args, ++ QString *initialDirectory, ++ QString *selectedFilter); ++ ++extern QString qt_haiku_get_save_file_name(const QFileDialogArgs &args, ++ QString *initialDirectory, ++ QString *selectedFilter); ++ ++extern QStringList qt_haiku_get_open_file_names(const QFileDialogArgs &args, ++ QString *initialDirectory, ++ QString *selectedFilter); ++ ++extern QString qt_haiku_get_existing_directory(const QFileDialogArgs &args); ++#endif ++ ++/* + For Symbian file dialogs + */ + #if defined(Q_WS_S60) +@@ -1713,6 +1732,12 @@ QString QFileDialog::getOpenFileName(QWi + } + #endif + ++#if defined(Q_WS_HAIKU) ++ if (qt_use_native_dialogs && !(args.options & DontUseNativeDialog)) { ++ return qt_haiku_get_open_file_name(args, &(args.directory), selectedFilter); ++ } ++#endif ++ + // create a qt dialog + QFileDialog dialog(args); + if (selectedFilter) +@@ -1806,6 +1831,12 @@ QStringList QFileDialog::getOpenFileName + } + #endif + ++#if defined(Q_WS_HAIKU) ++ if (qt_use_native_dialogs && !(args.options & DontUseNativeDialog)) { ++ return qt_haiku_get_open_file_names(args, &(args.directory), selectedFilter); ++ } ++#endif ++ + // create a qt dialog + QFileDialog dialog(args); + if (selectedFilter) +@@ -1900,6 +1931,12 @@ QString QFileDialog::getSaveFileName(QWi + } + #endif + ++#if defined(Q_WS_HAIKU) ++ if (qt_use_native_dialogs && !(args.options & DontUseNativeDialog)) { ++ return qt_haiku_get_save_file_name(args, &(args.directory), selectedFilter); ++ } ++#endif ++ + // create a qt dialog + QFileDialog dialog(args); + dialog.setAcceptMode(AcceptSave); +@@ -1984,6 +2021,11 @@ QString QFileDialog::getExistingDirector + } + #endif + ++#if defined(Q_WS_HAIKU) ++ if (qt_use_native_dialogs && !(args.options & DontUseNativeDialog) && (options & ShowDirsOnly)) ++ return qt_haiku_get_existing_directory(args); ++#endif ++ + // create a qt dialog + QFileDialog dialog(args); + if (dialog.exec() == QDialog::Accepted) { +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/dialogs/qfiledialog_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/dialogs/qfiledialog_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/dialogs/qfiledialog_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/dialogs/qfiledialog_haiku.cpp 2011-06-13 22:06:43.245628928 +0000 +@@ -0,0 +1,465 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ++** Contact: Qt Software Information (qt-info@nokia.com) ++** ++** This file is part of the QtGui module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial Usage ++** Licensees holding valid Qt Commercial licenses may use this file in ++** accordance with the Qt Commercial License Agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Nokia. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain ++** additional rights. These rights are described in the Nokia Qt LGPL ++** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this ++** package. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. ++** ++** If you are unsure which license is appropriate for your use, please ++** contact the sales department at qt-sales@nokia.com. ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include "qfiledialog.h" ++ ++#ifndef QT_NO_FILEDIALOG ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "qeventloop.h" ++ ++#ifndef QT_NO_THREAD ++# include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++QT_BEGIN_NAMESPACE ++ ++extern const char* qt_file_dialog_filter_reg_exp; // defined in qfiledialog.cpp ++extern QStringList qt_make_filter_list(const QString &filter); ++ ++const int maxNameLen = 1023; ++const int maxMultiLen = 65535; ++ ++class PanelLooper : public BLooper { ++public: ++ PanelLooper(); ++ virtual ~PanelLooper(); ++ virtual void MessageReceived(BMessage* message); ++ ++ int Wait(BFilePanel *panel); ++ ++ QString GetFilename(); ++ QStringList GetFilenames(); ++ ++private: ++ int state; ++ QString filename; ++ QStringList filenames; ++ entry_ref fRef; ++}; ++ ++ ++PanelLooper::PanelLooper() : BLooper("PanelLooper"), state(B_CANCEL) { } ++PanelLooper::~PanelLooper() { } ++ ++int ++PanelLooper::Wait(BFilePanel *panel) ++{ ++ QEventLoop::ProcessEventsFlags flags; ++ flags |= QEventLoop::WaitForMoreEvents; ++ while(panel->IsShowing()) { ++ QCoreApplication::processEvents(flags); ++ snooze(250); ++ } ++ return state; ++} ++ ++QString ++PanelLooper::GetFilename() ++{ ++ return filename; ++} ++ ++QStringList ++PanelLooper::GetFilenames() ++{ ++ return filenames; ++} ++ ++void ++PanelLooper::MessageReceived(BMessage* message) ++{ ++ switch (message->what) { ++ case B_SAVE_REQUESTED: ++ { ++ entry_ref ref; ++ const char *name; ++ message->FindRef("directory", &ref); ++ BDirectory dir(&ref); ++ BPath path(&dir, NULL, false); ++ message->FindString("name", &name); ++ path.Append(name); ++ filename = QString::fromUtf8(path.Path()); ++ filenames.append(filename); ++ ++ state = B_OK; ++ } ++ break; ++ case B_REFS_RECEIVED: ++ { ++ uint32 type; ++ int32 count; ++ ++ message->GetInfo("refs", &type, &count); ++ if ( type != B_REF_TYPE || count <= 0) ++ return; ++ ++ for ( long i = --count; i >= 0; i-- ) { ++ if ( message->FindRef("refs", i, &fRef) == B_OK ) { ++ BPath path(&fRef); ++ filename = QString::fromUtf8(path.Path()); ++ filenames.append(filename); ++ } ++ } ++ ++ state = B_OK; ++ } ++ break; ++ case B_CANCEL: ++ { ++ if(state!=B_OK) { ++ state = B_CANCEL; ++ filename.clear(); ++ filenames.clear(); ++ } ++ } ++ break; ++ default: ++ break; ++ } ++} ++ ++ ++// Returns the wildcard part of a filter. ++static QString qt_haiku_extract_filter(const QString &rawFilter) ++{ ++ QString result = rawFilter; ++ QRegExp r(QString::fromLatin1(qt_file_dialog_filter_reg_exp)); ++ int index = r.indexIn(result); ++ if (index >= 0) ++ result = r.cap(2); ++ QStringList list = result.split(QLatin1Char(' ')); ++ for(QStringList::iterator it = list.begin(); it < list.end(); ++it) { ++ if (*it == QLatin1String("*")) { ++ *it = QLatin1String("*.*"); ++ break; ++ } ++ } ++ return list.join(QLatin1String(";")); ++} ++ ++static QStringList qt_haiku_make_filters_list(const QString &filter) ++{ ++ QString f(filter); ++ ++ if (f.isEmpty()) ++ f = QFileDialog::tr("All Files (*.*)"); ++ ++ return qt_make_filter_list(f); ++} ++ ++// Makes a NUL-oriented Haiku filter from a Qt filter. ++static QString qt_haiku_filter(const QString &filter) ++{ ++ QStringList filterLst = qt_haiku_make_filters_list(filter); ++ QStringList::Iterator it = filterLst.begin(); ++ QString haikufilters; ++ for (; it != filterLst.end(); ++it) { ++ QString subfilter = *it; ++ if (!subfilter.isEmpty()) { ++ haikufilters += subfilter; ++ haikufilters += QChar(); ++ haikufilters += qt_haiku_extract_filter(subfilter); ++ haikufilters += QChar(); ++ } ++ } ++ haikufilters += QChar(); ++ return haikufilters; ++} ++ ++static QString qt_haiku_selected_filter(const QString &filter, int idx) ++{ ++ return qt_haiku_make_filters_list(filter).at((int)idx - 1); ++} ++ ++ ++QString qt_haiku_get_open_file_name(const QFileDialogArgs &args, ++ QString *initialDirectory, ++ QString *selectedFilter) ++{ ++ QString result; ++ ++ QString title = args.caption; ++ QString isel = args.selection; ++ ++ if (initialDirectory && initialDirectory->left(5) == QLatin1String("file:")) ++ initialDirectory->remove(0, 5); ++ QFileInfo fi(*initialDirectory); ++ ++ if (initialDirectory && !fi.isDir()) { ++ *initialDirectory = fi.absolutePath(); ++ if (isel.isEmpty()) ++ isel = fi.fileName(); ++ } ++ ++ if (!fi.exists() || *initialDirectory==QDir::homePath()) ++ *initialDirectory = QDesktopServices::storageLocation(QDesktopServices::HomeLocation); ++ ++/* int selFilIdx = 0; ++ ++ int idx = 0; ++ if (selectedFilter) { ++ QStringList filterLst = qt_haiku_make_filters_list(args.filter); ++ idx = filterLst.indexOf(*selectedFilter); ++ }*/ ++ ++ PanelLooper *looper = new PanelLooper(); ++ looper->Run(); ++ ++ BFilePanel *openpanel = new BFilePanel(B_OPEN_PANEL,NULL,NULL,0,false,NULL,NULL,true,true); ++ openpanel->SetTarget(BMessenger(looper)); ++ if(!title.isEmpty()) { ++ openpanel->Window()->SetTitle((title.toUtf8()).data()); ++ } ++ QByteArray dirpath = initialDirectory->toUtf8(); ++ openpanel->SetPanelDirectory(dirpath.data()); ++ openpanel->Show(); ++ ++ looper->Wait(openpanel); ++ result = looper->GetFilename(); ++ ++ delete openpanel; ++ ++ looper->Lock(); ++ looper->Quit(); ++ ++ if (result.isEmpty()) ++ return result; ++ ++ fi = result; ++ *initialDirectory = fi.path(); ++ ++ return fi.absoluteFilePath();; ++} ++ ++QString qt_haiku_get_save_file_name(const QFileDialogArgs &args, ++ QString *initialDirectory, ++ QString *selectedFilter) ++{ ++ QString result; ++ ++ QString title = args.caption; ++ QString isel = args.selection; ++ ++ if (initialDirectory && initialDirectory->left(5) == QLatin1String("file:")) ++ initialDirectory->remove(0, 5); ++ QFileInfo fi(*initialDirectory); ++ ++ if (initialDirectory && !fi.isDir()) { ++ *initialDirectory = fi.absolutePath(); ++ if (isel.isEmpty()) ++ isel = fi.fileName(); ++ } ++ ++ if (!fi.exists() || *initialDirectory==QDir::homePath()) ++ *initialDirectory = QDesktopServices::storageLocation(QDesktopServices::HomeLocation); ++/* ++ int selFilIdx = 0; ++ ++ int idx = 0; ++ if (selectedFilter) { ++ QStringList filterLst = qt_haiku_make_filters_list(args.filter); ++ idx = filterLst.indexOf(*selectedFilter); ++ } ++ ++ QString defaultSaveExt; ++ if (selectedFilter && !selectedFilter->isEmpty()) { ++ defaultSaveExt = qt_haiku_extract_filter(*selectedFilter); ++ // make sure we only have the extension ++ int firstDot = defaultSaveExt.indexOf(QLatin1Char('.')); ++ if (firstDot != -1) { ++ defaultSaveExt.remove(0, firstDot + 1); ++ } else { ++ defaultSaveExt.clear(); ++ } ++ }*/ ++ ++ PanelLooper *looper = new PanelLooper(); ++ looper->Run(); ++ ++ BFilePanel *savepanel = new BFilePanel(B_SAVE_PANEL,NULL,NULL,0,false,NULL,NULL,true,true); ++ savepanel->SetTarget(BMessenger(looper)); ++ if(!title.isEmpty()) { ++ savepanel->Window()->SetTitle((title.toUtf8()).data()); ++ } ++ QByteArray dirpath = initialDirectory->toUtf8(); ++ savepanel->SetPanelDirectory(dirpath.data()); ++ savepanel->SetSaveText((isel.toUtf8()).data()); ++ savepanel->Show(); ++ ++ looper->Wait(savepanel); ++ result = looper->GetFilename(); ++ ++ delete savepanel; ++ ++ looper->Lock(); ++ looper->Quit(); ++ ++ if (result.isEmpty()) ++ return result; ++ ++ fi = result; ++ *initialDirectory = fi.path(); ++/* if (selectedFilter) ++ *selectedFilter = qt_haiku_selected_filter(args.filter, selFilIdx);*/ ++ return fi.absoluteFilePath(); ++} ++ ++QStringList qt_haiku_get_open_file_names(const QFileDialogArgs &args, ++ QString *initialDirectory, ++ QString *selectedFilter) ++{ ++ QStringList result; ++ ++ QString title = args.caption; ++ QString isel = args.selection; ++ ++ if (initialDirectory && initialDirectory->left(5) == QLatin1String("file:")) ++ initialDirectory->remove(0, 5); ++ QFileInfo fi(*initialDirectory); ++ ++ if (initialDirectory && !fi.isDir()) { ++ *initialDirectory = fi.absolutePath(); ++ if (isel.isEmpty()) ++ isel = fi.fileName(); ++ } ++ ++ if (!fi.exists() || *initialDirectory==QDir::homePath()) ++ *initialDirectory = QDesktopServices::storageLocation(QDesktopServices::HomeLocation); ++ ++ int selFilIdx = 0; ++ ++/* int idx = 0; ++ if (selectedFilter) { ++ QStringList filterLst = qt_haiku_make_filters_list(args.filter); ++ idx = filterLst.indexOf(*selectedFilter); ++ }*/ ++ ++ PanelLooper *looper = new PanelLooper(); ++ looper->Run(); ++ ++ BFilePanel *openpanel = new BFilePanel(B_OPEN_PANEL,NULL,NULL,0,true,NULL,NULL,true,true); ++ openpanel->SetTarget(BMessenger(looper)); ++ if(!title.isEmpty()) { ++ openpanel->Window()->SetTitle((title.toUtf8()).data()); ++ } ++ QByteArray dirpath = initialDirectory->toUtf8(); ++ openpanel->SetPanelDirectory(dirpath.data()); ++ openpanel->Show(); ++ ++ looper->Wait(openpanel); ++ result = looper->GetFilenames(); ++ ++ delete openpanel; ++ ++ looper->Lock(); ++ looper->Quit(); ++ ++ if (!result.isEmpty()) { ++ *initialDirectory = fi.path(); // only save the path if there is a result ++ } ++ return result; ++} ++ ++class DirectoryFilter : public BRefFilter { ++public: ++ DirectoryFilter() {}; ++ virtual bool Filter(const entry_ref* ref, ++ BNode* node, struct stat_beos* st, const char* filetype) ++ { ++ return node->IsDirectory(); ++ } ++}; ++ ++ ++QString qt_haiku_get_existing_directory(const QFileDialogArgs &args) ++{ ++ QString initDir = QDir::toNativeSeparators(args.directory); ++ QString result; ++ ++ QString title = args.caption; ++ ++ PanelLooper *looper = new PanelLooper(); ++ looper->Run(); ++ ++ BFilePanel *dirpanel = new BFilePanel(B_OPEN_PANEL, NULL, NULL, B_DIRECTORY_NODE, true, NULL, NULL, true, true); ++ dirpanel->SetTarget(BMessenger(looper)); ++ dirpanel->SetButtonLabel(B_DEFAULT_BUTTON, "Select"); ++ if(!title.isEmpty()) { ++ dirpanel->Window()->SetTitle((title.toUtf8()).data()); ++ } ++ ++ BRefFilter *filter; ++ filter = new DirectoryFilter; ++ dirpanel->SetRefFilter(filter); ++ dirpanel->Show(); ++ ++ looper->Wait(dirpanel); ++ result = looper->GetFilename(); ++ ++ delete dirpanel; ++ ++ looper->Lock(); ++ looper->Quit(); ++ ++ return result; ++} ++ ++ ++QT_END_NAMESPACE ++ ++#endif +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/gui.pro qt-everywhere-opensource-src-4.7.3_haiku/src/gui/gui.pro +--- qt-everywhere-opensource-src-4.7.3/src/gui/gui.pro 2011-03-30 05:19:06.004980736 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/gui.pro 2011-06-13 22:06:43.247726080 +0000 +@@ -5,7 +5,7 @@ DEFINES += QT_BUILD_GUI_LIB QT_NO_USIN + win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000 + irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused + +-!win32:!embedded:!mac:!symbian:CONFIG += x11 ++!win32:!embedded:!mac:!symbian:!haiku:CONFIG += x11 + + unix:QMAKE_PKGCONFIG_REQUIRES = QtCore + +@@ -22,6 +22,7 @@ symbian { + include(kernel/symbian.pri) + include(s60framework/s60framework.pri) + } ++haiku:include(kernel/haiku.pri) + + #modules + include(animation/animation.pri) +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/image/image.pri qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/image.pri +--- qt-everywhere-opensource-src-4.7.3/src/gui/image/image.pri 2011-03-30 05:19:04.013893632 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/image.pri 2011-06-13 22:06:43.249561088 +0000 +@@ -71,6 +71,10 @@ else:symbian { + HEADERS += image/qpixmap_s60_p.h + SOURCES += image/qpixmap_s60.cpp + } ++else:haiku { ++ HEADERS += image/qpixmap_haiku_p.h ++ SOURCES += image/qpixmap_haiku.cpp ++} + + # Built-in image format support + HEADERS += \ +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/image/qnativeimage.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/qnativeimage.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/image/qnativeimage.cpp 2011-03-30 05:19:04.007602176 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/qnativeimage.cpp 2011-06-13 22:06:43.252182528 +0000 +@@ -268,6 +268,28 @@ QImage::Format QNativeImage::systemForma + return QImage::Format_RGB32; + } + ++#elif defined(Q_WS_HAIKU) ++ ++QNativeImage::QNativeImage(int width, int height, QImage::Format ++format, bool /* isTextBuffer */, QWidget *) ++ : image(width, height, format) ++{ ++ bitmap = new BBitmap(BRect(0,0,width-1,height-1), B_RGBA32, false, true); // we use continuous for now ++ uchar *bits = (uchar*)bitmap->Bits(); ++ image = QImage(bits, width, height, format); ++} ++ ++ ++QNativeImage::~QNativeImage() ++{ ++ delete bitmap; ++ bitmap = 0; ++} ++ ++QImage::Format QNativeImage::systemFormat() ++{ ++ return QImage::Format_RGB32; ++} + + #else // other platforms... + +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/image/qnativeimage_p.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/qnativeimage_p.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/image/qnativeimage_p.h 2011-03-30 05:19:04.011010048 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/qnativeimage_p.h 2011-06-13 22:06:43.254017536 +0000 +@@ -64,6 +64,9 @@ + #elif defined(Q_WS_MAC) + #include + ++#elif defined(Q_WS_HAIKU) ++#include ++ + #endif + + QT_BEGIN_NAMESPACE +@@ -95,6 +98,10 @@ public: + + #elif defined(Q_WS_MAC) + CGContextRef cg; ++ ++#elif defined(Q_WS_HAIKU) ++ BBitmap* bitmap; ++ + #endif + + private: +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/image/qpixmap.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/qpixmap.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/image/qpixmap.cpp 2011-03-30 05:19:04.009961472 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/qpixmap.cpp 2011-06-13 22:06:43.257425408 +0000 +@@ -71,6 +71,10 @@ + # include "private/qpixmap_mac_p.h" + #endif + ++#ifdef Q_WS_HAIKU ++# include "private/qpixmap_haiku_p.h" ++#endif ++ + #if defined(Q_WS_X11) + # include "qx11info_x11.h" + # include +@@ -1960,6 +1964,8 @@ int QPixmap::defaultDepth() + return 32; // XXX + #elif defined(Q_WS_MAC) + return 32; ++#elif defined(Q_WS_HAIKU) ++ return 32; + #elif defined(Q_OS_SYMBIAN) + return S60->screenDepth; + #endif +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/image/qpixmap.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/qpixmap.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/image/qpixmap.h 2011-03-30 05:19:04.009437184 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/qpixmap.h 2011-06-13 22:06:43.259784704 +0000 +@@ -57,6 +57,10 @@ class CFbsBitmap; + class RSgImage; + #endif + ++#if defined(Q_OS_HAIKU) ++class BBitmap; ++#endif ++ + QT_BEGIN_NAMESPACE + + QT_MODULE(Gui) +@@ -164,6 +168,11 @@ public: + static QPixmap fromMacCGImageRef(CGImageRef image); + #endif + ++#if defined(Q_OS_HAIKU) ++ BBitmap *toHaikuBitmap() const; ++ static QPixmap fromHaikuBitmap(BBitmap *); ++#endif ++ + #if defined(Q_OS_SYMBIAN) + CFbsBitmap *toSymbianCFbsBitmap() const; + static QPixmap fromSymbianCFbsBitmap(CFbsBitmap *bitmap); +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/image/qpixmap_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/qpixmap_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/image/qpixmap_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/qpixmap_haiku.cpp 2011-06-13 22:06:43.261619712 +0000 +@@ -0,0 +1,126 @@ ++#include "qpixmap.h" ++ ++#include "qpixmap_raster_p.h" ++ ++#include "qbitmap.h" ++#include "qimage.h" ++#include "qwidget.h" ++#include "qpainter.h" ++#include "qdatastream.h" ++#include "qbuffer.h" ++#include "qapplication.h" ++#include "qevent.h" ++#include "qfile.h" ++#include "qfileinfo.h" ++#include "qdatetime.h" ++#include "qpixmapcache.h" ++#include "qimagereader.h" ++#include "qimagewriter.h" ++#include "qdebug.h" ++ ++#include ++ ++#include ++#include ++#include ++#include ++ ++BBitmap * ++QPixmap::toHaikuBitmap() const ++{ ++ BBitmap *bitmap = NULL; ++ ++ if (isNull()) ++ return 0; ++ ++ if (data->classId() == QPixmapData::RasterClass) { ++ QRasterPixmapData* d = static_cast(data.data()); ++ int w = d->image.width(); ++ int h = d->image.height(); ++ ++ const QImage image = d->image.convertToFormat(QImage::Format_ARGB32); ++ int bytes_per_line = w * 4; ++ ++ bitmap = new BBitmap(BRect(0,0,w-1,h-1), B_RGBA32); ++ uchar *pixels = (uchar *)bitmap->Bits(); ++ ++ for (int y=0; yfromImage(toImage(), Qt::AutoColor); ++ return QPixmap(data).toHaikuBitmap(); ++ } ++ return bitmap; ++} ++ ++QPixmap ++QPixmap::fromHaikuBitmap(BBitmap *bmp) ++{ ++ if(!bmp) ++ return QPixmap(); ++ ++ int w = bmp->Bounds().IntegerWidth() + 1; ++ int h = bmp->Bounds().IntegerHeight() + 1; ++ ++ QImage image(w,h,QImage::Format_ARGB32); ++ ++ int bytes_per_line = w * 4; ++ uchar *pixels = (uchar *)bmp->Bits(); ++ ++ for (int y=0; yColorSpace()) { ++ case B_GRAY1: ++ format = QImage::Format_Mono; ++ break; ++ case B_GRAY8: ++ case B_CMAP8: ++ format = QImage::Format_Indexed8; ++ break; ++ case B_RGB15: ++ case B_RGBA15: ++ case B_RGB16: ++ format = QImage::Format_RGB16; ++ break; ++ case B_RGB32: ++ default: ++ format = QImage::Format_RGB32; ++ break; ++ } ++ ++ QRect grabRect(x,y,w,h); ++ QImage image((uchar*)bitmap->Bits(), screen_w, screen_h, bitmap->BytesPerRow(), format); ++ image = image.copy(grabRect); ++ ++ delete bitmap; ++ ++ return QPixmap::fromImage(image); ++} ++ +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/image/qpixmap_haiku_p.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/qpixmap_haiku_p.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/image/qpixmap_haiku_p.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/qpixmap_haiku_p.h 2011-06-13 22:06:43.272367616 +0000 +@@ -0,0 +1,6 @@ ++#include "qpixmap.h" ++#include "qpixmapdata_p.h" ++ ++#include ++#include ++ +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/image/qpixmapdatafactory.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/qpixmapdatafactory.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/image/qpixmapdatafactory.cpp 2011-03-30 05:19:04.015990784 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/image/qpixmapdatafactory.cpp 2011-06-13 22:06:43.274464768 +0000 +@@ -56,6 +56,9 @@ + #ifdef Q_OS_SYMBIAN + # include + #endif ++#ifdef Q_WS_HAIKU ++# include ++#endif + + #include "private/qapplication_p.h" + #include "private/qgraphicssystem_p.h" +@@ -83,7 +86,9 @@ QPixmapData* QSimplePixmapDataFactory::c + #elif defined(Q_WS_MAC) + return new QMacPixmapData(type); + #elif defined(Q_OS_SYMBIAN) +- return new QS60PixmapData(type); ++ return new QS60PixmapData(type); ++#elif defined(Q_WS_HAIKU) ++ return new QRasterPixmapData(type); + #else + #error QSimplePixmapDataFactory::create() not implemented + #endif +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/itemviews/qfileiconprovider.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/itemviews/qfileiconprovider.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/itemviews/qfileiconprovider.cpp 2011-03-30 05:19:05.040894464 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/itemviews/qfileiconprovider.cpp 2011-06-13 22:06:43.277348352 +0000 +@@ -53,6 +53,11 @@ + # include + #elif defined(Q_WS_MAC) + # include ++#elif defined(Q_WS_HAIKU) ++# include ++# include ++# include ++# include + #endif + + #include +@@ -98,6 +103,8 @@ public: + QIcon getWinIcon(const QFileInfo &fi) const; + #elif defined(Q_WS_MAC) + QIcon getMacIcon(const QFileInfo &fi) const; ++#elif defined(Q_WS_HAIKU) ++ QIcon getHaikuIcon(const QFileInfo &fi) const; + #endif + QFileIconProvider *q_ptr; + const QString homePath; +@@ -389,6 +396,33 @@ QIcon QFileIconProviderPrivate::getMacIc + + return retIcon; + } ++#elif defined(Q_WS_HAIKU) ++QIcon QFileIconProviderPrivate::getHaikuIcon(const QFileInfo &fi) const ++{ ++ QIcon retIcon; ++ ++ BNode node(fi.canonicalFilePath().toUtf8().constData()); ++ if (node.InitCheck() == B_OK) { ++ BNodeInfo nodeinfo(&node); ++ ++ BBitmap *hIcon = new BBitmap(BRect(0, 0, 15, 15), B_RGBA32); ++ nodeinfo.GetTrackerIcon(hIcon, B_MINI_ICON); ++ if(hIcon) { ++ QPixmap p = QPixmap::fromHaikuBitmap(hIcon); ++ retIcon.addPixmap(p); ++ delete hIcon; ++ } ++ ++ BBitmap *hIconBig = new BBitmap(BRect(0, 0, 31, 31), B_RGBA32); ++ nodeinfo.GetTrackerIcon(hIcon, B_LARGE_ICON); ++ if(hIconBig) { ++ QPixmap p = QPixmap::fromHaikuBitmap(hIconBig); ++ retIcon.addPixmap(p); ++ delete hIconBig; ++ } ++ } ++ return retIcon; ++} + #endif + + +@@ -420,6 +454,10 @@ QIcon QFileIconProvider::icon(const QFil + QIcon icon = d->getWinIcon(info); + if (!icon.isNull()) + return icon; ++#elif defined Q_WS_HAIKU ++ QIcon icon = d->getHaikuIcon(info); ++ if (!icon.isNull()) ++ return icon; + #endif + if (info.isRoot()) + #if defined (Q_WS_WIN) && !defined(Q_WS_WINCE) +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/haiku.pri qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/haiku.pri +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/haiku.pri 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/haiku.pri 2011-06-13 22:06:43.279445504 +0000 +@@ -0,0 +1,2 @@ ++DEFINES += QT_NO_FONTCONFIG ++LIBS_PRIVATE += -lbe +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/kernel.pri qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/kernel.pri +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/kernel.pri 2011-03-30 05:19:04.051118080 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/kernel.pri 2011-06-13 22:06:43.281018368 +0000 +@@ -262,3 +262,18 @@ wince*: { + ../corelib/kernel/qfunctions_wince.cpp \ + kernel/qguifunctions_wince.cpp + } ++ ++haiku { ++ HEADERS += kernel/qwidget_haiku.h ++ ++ SOURCES += \ ++ kernel/qapplication_haiku.cpp \ ++ kernel/qwidget_haiku.cpp \ ++ kernel/qdnd_haiku.cpp \ ++ kernel/qdesktopwidget_haiku.cpp \ ++ kernel/qclipboard_haiku.cpp \ ++ kernel/qcursor_haiku.cpp \ ++ kernel/qkeymapper_haiku.cpp \ ++ kernel/qsound_haiku.cpp \ ++ kernel/qeventdispatcher_haiku.cpp ++} +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qapplication.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qapplication.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qapplication.cpp 2011-03-30 05:19:04.057671680 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qapplication.cpp 2011-06-13 22:06:43.288096256 +0000 +@@ -4760,7 +4760,7 @@ bool QApplicationPrivate::notify_helper( + Stubbed session management support + *****************************************************************************/ + #ifndef QT_NO_SESSIONMANAGER +-#if defined(Q_WS_WIN) || defined(Q_WS_MAC) || defined(Q_WS_QWS) ++#if defined(Q_WS_WIN) || defined(Q_WS_MAC) || defined(Q_WS_QWS) || defined(Q_WS_HAIKU) + + #if defined(Q_OS_WINCE) + HRESULT qt_CoCreateGuid(GUID* guid) +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qapplication_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qapplication_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qapplication_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qapplication_haiku.cpp 2011-06-13 22:06:43.291241984 +0000 +@@ -0,0 +1,655 @@ ++#include "qapplication_p.h" ++#include "qsessionmanager.h" ++#include "qapplication.h" ++#include "qevent.h" ++#include "qeventdispatcher_haiku_p.h" ++#include "qwidget.h" ++#include "qwidget_p.h" ++#include "private/qsystemtrayicon_p.h" ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/***************************************************************************** ++ Internal variables and functions ++ *****************************************************************************/ ++static WId curWin; ++ ++// ignore the next release event if return from a modal widget ++Q_GUI_EXPORT bool qt_win_ignoreNextMouseReleaseEvent = false; ++ ++#if defined(QT_DEBUG) ++static bool appNoGrab = false; // mouse/keyboard grabbing ++#endif ++ ++static bool app_do_modal = false; // modal mode ++extern QWidgetList *qt_modal_stack; ++//extern QDesktopWidget *qt_desktopWidget; ++//static QPointer popupButtonFocus; ++ ++QPointer qt_last_mouse_receiver = 0; ++QWidget* qt_button_down = 0; ++QTextCodec * qt_input_mapper = 0; ++ ++char *qAppSignature = NULL; ++ ++bool qt_nograb() // application no-grab option ++{ ++#if defined(QT_DEBUG) ++ return appNoGrab; ++#else ++ return false; ++#endif ++} ++ ++class HQApplication : public BApplication ++{ ++public: ++ HQApplication(const char*, QApplicationPrivate *priv); ++ ~HQApplication(); ++ ++ virtual void MessageReceived(BMessage *message); ++ void ArgvReceived(int32 argc, char **argv); ++ void RefsReceived(BMessage *pmsg); ++ virtual bool QuitRequested(); ++ bool RefHandled; ++ entry_ref Ref; ++private: ++ BMessenger fTrackerMessenger; ++ QApplicationPrivate *priv_ptr; ++}; ++ ++namespace { ++static HQApplication* happ = 0; ++} ++ ++HQApplication::HQApplication(const char* signature, QApplicationPrivate *priv) ++ : BApplication(signature) ++{ ++ RefHandled = false; ++ ++ qDebug("Reimp: HQApplication::HQApplication\n"); ++ ++ if(qAppSignature) ++ free(qAppSignature); ++ qAppSignature = strdup(signature); ++ ++ priv_ptr = priv; ++} ++ ++HQApplication::~HQApplication() ++{ ++ qDebug("Reimp: HQApplication::~HQApplication\n"); ++} ++ ++void HQApplication::MessageReceived(BMessage* msg) ++{ ++ BApplication::MessageReceived(msg); ++} ++ ++void ++HQApplication::RefsReceived(BMessage *pmsg) ++{ ++ if (pmsg->HasMessenger("TrackerViewToken")) { ++ pmsg->FindMessenger("TrackerViewToken", &fTrackerMessenger); ++ } ++ ++ uint32 type; ++ int32 count; ++ status_t ret = pmsg->GetInfo("refs", &type, &count); ++ if (ret != B_OK || type != B_REF_TYPE) ++ return; ++ ++ entry_ref ref; ++ for (int32 i = 0; i < count; i++) { ++ if (pmsg->FindRef("refs", i, &ref) == B_OK) { ++ BPath p(&ref); ++ Ref = ref; ++ RefHandled = true; ++ } ++ } ++} ++ ++void ++HQApplication::ArgvReceived(int32 argc, char **argv) ++{ ++} ++ ++bool ++HQApplication::QuitRequested() { ++ QEvent quitEvent(QEvent::Quit); ++ QApplication::sendEvent(qApp, &quitEvent); ++ return true; ++} ++ ++ ++int32 AppThread(void *data) ++{ ++ HQApplication *app = (HQApplication*)data; ++ app->LockLooper(); ++ app->Run(); ++} ++ ++ ++void qt_init(QApplicationPrivate *priv, int) ++{ ++ int i; ++ qDebug("qt_init()"); ++ ++ thread_id my_thread; ++ ++ happ = new HQApplication("application/x-vnd."+QFileInfo(QApplication::applicationFilePath()).fileName().toLatin1(), priv ); ++ be_app = happ; ++ ++ QApplicationPrivate::haiku_apply_settings(); ++ ++ my_thread = spawn_thread(AppThread,"app_thread",1,(void*)happ); ++ resume_thread(my_thread); ++ ++ happ->UnlockLooper(); ++ ++ if(priv->argc==1) { ++ for(i=0;i<100;i++) { ++ if(happ->RefHandled) { ++ BPath p(&happ->Ref); ++ priv->argc = 2; ++ priv->argv[1]=strdup(p.Path()); ++ priv->argv[2]=0; ++ break; ++ } ++ snooze(1000); ++ } ++ ++ QString appDir = QCoreApplication::applicationDirPath(); ++ chdir(appDir.toUtf8()); ++ } ++} ++ ++void qt_cleanup() ++{ ++ qDebug("qt_cleanup()"); ++} ++ ++void QApplicationPrivate::_q_alertTimeOut() ++{ ++ qDebug("Unimplemented: void QApplicationPrivate::_q_alertTimeOut()\n"); ++} ++ ++QString QApplicationPrivate::appName() const ++{ ++ return QCoreApplicationPrivate::appName(); ++} ++ ++void QApplicationPrivate::createEventDispatcher() ++{ ++ Q_Q(QApplication); ++ qDebug("Reimplemented: void QApplicationPrivate::createEventDispatcher\n"); ++ if (q->type() != QApplication::Tty) ++ eventDispatcher = new QEventDispatcherHaiku(q); ++ else ++ eventDispatcher = new QEventDispatcherUNIX(q); ++} ++ ++/***************************************************************************** ++ Popup widget mechanism ++ ++ openPopup() ++ Adds a widget to the list of popup widgets ++ Arguments: ++ QWidget *widget The popup widget to be added ++ ++ closePopup() ++ Removes a widget from the list of popup widgets ++ Arguments: ++ QWidget *widget The popup widget to be removed ++ *****************************************************************************/ ++ ++ ++void QApplicationPrivate::openPopup(QWidget *popup) ++{ ++ if (!QApplicationPrivate::popupWidgets) ++ QApplicationPrivate::popupWidgets = new QWidgetList; ++ QApplicationPrivate::popupWidgets->append(popup); ++ if (!popup->isEnabled()) ++ return; ++ ++ if (QApplicationPrivate::popupWidgets->count() == 1 && !qt_nograb()) { ++ Q_ASSERT(popup->testAttribute(Qt::WA_WState_Created)); ++// setAutoCapture(popup->internalWinId()); // grab mouse/keyboard ++ } ++ // Popups are not focus-handled by the window system (the first ++ // popup grabbed the keyboard), so we have to do that manually: A ++ // new popup gets the focus ++ if (popup->focusWidget()) { ++ popup->focusWidget()->setFocus(Qt::PopupFocusReason); ++ } else if (QApplicationPrivate::popupWidgets->count() == 1) { // this was the first popup ++ if (QWidget *fw = q_func()->focusWidget()) { ++ QFocusEvent e(QEvent::FocusOut, Qt::PopupFocusReason); ++ q_func()->sendEvent(fw, &e); ++ } ++ } ++} ++ ++void QApplicationPrivate::closePopup(QWidget *popup) ++{ ++ if (!QApplicationPrivate::popupWidgets) ++ return; ++ QApplicationPrivate::popupWidgets->removeAll(popup); ++// POINT curPos; ++// GetCursorPos(&curPos); ++ ++ if (QApplicationPrivate::popupWidgets->isEmpty()) { // this was the last popup ++ delete QApplicationPrivate::popupWidgets; ++ QApplicationPrivate::popupWidgets = 0; ++// replayPopupMouseEvent = (!popup->geometry().contains(QPoint(curPos.x, curPos.y)) ++// && !popup->testAttribute(Qt::WA_NoMouseReplay)); ++ if (!popup->isEnabled()) ++ return; ++// if (!qt_nograb()) // grabbing not disabled ++// releaseAutoCapture(); ++ QWidget *fw = QApplicationPrivate::active_window ? QApplicationPrivate::active_window->focusWidget() ++ : q_func()->focusWidget(); ++ if (fw) { ++ if (fw != q_func()->focusWidget()) { ++ fw->setFocus(Qt::PopupFocusReason); ++ } else { ++ QFocusEvent e(QEvent::FocusIn, Qt::PopupFocusReason); ++ q_func()->sendEvent(fw, &e); ++ } ++ } ++ } else { ++ // Popups are not focus-handled by the window system (the ++ // first popup grabbed the keyboard), so we have to do that ++ // manually: A popup was closed, so the previous popup gets ++ // the focus. ++ QWidget* aw = QApplicationPrivate::popupWidgets->last(); ++ if (QApplicationPrivate::popupWidgets->count() == 1) { ++ Q_ASSERT(aw->testAttribute(Qt::WA_WState_Created)); ++// setAutoCapture(aw->internalWinId()); ++ } ++ if (QWidget *fw = aw->focusWidget()) ++ fw->setFocus(Qt::PopupFocusReason); ++ } ++} ++ ++void QApplicationPrivate::initializeWidgetPaletteHash() ++{ ++ qDebug("Unimplemented: QApplicationPrivate::initializeWidgetPaletteHash\n"); ++} ++ ++/*! \internal ++ apply the settings to the application ++*/ ++bool QApplicationPrivate::haiku_apply_settings() ++{ ++ QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); ++ ++ settings.beginGroup(QLatin1String("Qt")); ++ ++ /* ++ Qt settings. This is now they are written into the datastream. ++ ++ Palette / * - QPalette ++ font - QFont ++ libraryPath - QStringList ++ style - QString ++ doubleClickInterval - int ++ keyboardInputInterval - int ++ cursorFlashTime - int ++ wheelScrollLines - int ++ colorSpec - QString ++ defaultCodec - QString ++ globalStrut/width - int ++ globalStrut/height - int ++ GUIEffects - QStringList ++ Font Substitutions/ * - QStringList ++ Font Substitutions/... - QStringList ++ */ ++ ++ QStringList strlist; ++ int i; ++ QPalette pal(Qt::black); ++ int groupCount = 0; ++ strlist = settings.value(QLatin1String("Palette/active")).toStringList(); ++ if (!strlist.isEmpty()) { ++ ++groupCount; ++ for (i = 0; i < qMin(strlist.count(), int(QPalette::NColorRoles)); i++) ++ pal.setColor(QPalette::Active, (QPalette::ColorRole) i, ++ QColor(strlist[i])); ++ } ++ strlist = settings.value(QLatin1String("Palette/inactive")).toStringList(); ++ if (!strlist.isEmpty()) { ++ ++groupCount; ++ for (i = 0; i < qMin(strlist.count(), int(QPalette::NColorRoles)); i++) ++ pal.setColor(QPalette::Inactive, (QPalette::ColorRole) i, ++ QColor(strlist[i])); ++ } ++ strlist = settings.value(QLatin1String("Palette/disabled")).toStringList(); ++ if (!strlist.isEmpty()) { ++ ++groupCount; ++ for (i = 0; i < qMin(strlist.count(), int(QPalette::NColorRoles)); i++) ++ pal.setColor(QPalette::Disabled, (QPalette::ColorRole) i, ++ QColor(strlist[i])); ++ } ++ ++/* if (!appFont) { ++ QFont font(QApplication::font()); ++ QString fontDescription; ++ if (fontDescription.isEmpty()) ++ fontDescription = settings.value(QLatin1String("font")).toString(); ++ if (!fontDescription .isEmpty()) { ++ font.fromString(fontDescription ); ++ QApplicationPrivate::setSystemFont(font); ++ } ++ }*/ ++ ++ // read new QStyle ++ QString stylename = settings.value(QLatin1String("style")).toString(); ++ if (stylename.isEmpty() && QApplicationPrivate::styleOverride.isNull()) { ++ QStringList availableStyles = QStyleFactory::keys(); ++ } ++ ++ static QString currentStyleName = stylename; ++ if (QCoreApplication::startingUp()) { ++ if (!stylename.isEmpty() && QApplicationPrivate::styleOverride.isNull()) ++ QApplicationPrivate::styleOverride = stylename; ++ } else { ++ if (currentStyleName != stylename) { ++ currentStyleName = stylename; ++ QApplication::setStyle(stylename); ++ } ++ } ++ ++ int num = ++ settings.value(QLatin1String("doubleClickInterval"), ++ QApplication::doubleClickInterval()).toInt(); ++ QApplication::setDoubleClickInterval(num); ++ ++ num = ++ settings.value(QLatin1String("cursorFlashTime"), ++ QApplication::cursorFlashTime()).toInt(); ++ QApplication::setCursorFlashTime(num); ++ ++ num = ++ settings.value(QLatin1String("wheelScrollLines"), ++ QApplication::wheelScrollLines()).toInt(); ++ QApplication::setWheelScrollLines(num); ++ ++ QString colorspec = settings.value(QLatin1String("colorSpec"), ++ QVariant(QLatin1String("default"))).toString(); ++ if (colorspec == QLatin1String("normal")) ++ QApplication::setColorSpec(QApplication::NormalColor); ++ else if (colorspec == QLatin1String("custom")) ++ QApplication::setColorSpec(QApplication::CustomColor); ++ else if (colorspec == QLatin1String("many")) ++ QApplication::setColorSpec(QApplication::ManyColor); ++ else if (colorspec != QLatin1String("default")) ++ colorspec = QLatin1String("default"); ++ ++/* QString defaultcodec = settings.value(QLatin1String("defaultCodec"), ++ QVariant(QLatin1String("none"))).toString(); ++ if (defaultcodec != QLatin1String("none")) { ++ QTextCodec *codec = QTextCodec::codecForName(defaultcodec.toLatin1()); ++ if (codec) ++ QTextCodec::setCodecForTr(codec); ++ }*/ ++ QTextCodec *codec = QTextCodec::codecForName("UTF-8"); ++ if (codec) { ++ QTextCodec::setCodecForLocale(codec); ++ } ++ qt_input_mapper = QTextCodec::codecForName("UTF-8"); ++ ++ ++ int w = settings.value(QLatin1String("globalStrut/width")).toInt(); ++ int h = settings.value(QLatin1String("globalStrut/height")).toInt(); ++ QSize strut(w, h); ++ if (strut.isValid()) ++ QApplication::setGlobalStrut(strut); ++ ++ QStringList effects = settings.value(QLatin1String("GUIEffects")).toStringList(); ++ QApplication::setEffectEnabled(Qt::UI_General, ++ effects.contains(QLatin1String("general"))); ++ QApplication::setEffectEnabled(Qt::UI_AnimateMenu, ++ effects.contains(QLatin1String("animatemenu"))); ++ QApplication::setEffectEnabled(Qt::UI_FadeMenu, ++ effects.contains(QLatin1String("fademenu"))); ++ QApplication::setEffectEnabled(Qt::UI_AnimateCombo, ++ effects.contains(QLatin1String("animatecombo"))); ++ QApplication::setEffectEnabled(Qt::UI_AnimateTooltip, ++ effects.contains(QLatin1String("animatetooltip"))); ++ QApplication::setEffectEnabled(Qt::UI_FadeTooltip, ++ effects.contains(QLatin1String("fadetooltip"))); ++ QApplication::setEffectEnabled(Qt::UI_AnimateToolBox, ++ effects.contains(QLatin1String("animatetoolbox"))); ++ ++ settings.beginGroup(QLatin1String("Font Substitutions")); ++ QStringList fontsubs = settings.childKeys(); ++ if (!fontsubs.isEmpty()) { ++ QStringList::Iterator it = fontsubs.begin(); ++ for (; it != fontsubs.end(); ++it) { ++ QString fam = *it; ++ QStringList subs = settings.value(fam).toStringList(); ++ QFont::insertSubstitutions(fam, subs); ++ } ++ } ++ settings.endGroup(); ++ ++ settings.endGroup(); // Qt ++ ++ return true; ++} ++ ++ ++void QApplicationPrivate::haiku_initialize_style() ++{ ++ if (QApplicationPrivate::app_style) ++ return; ++ ++ QApplicationPrivate::app_style = QStyleFactory::create(QLatin1String("haiku")); ++} ++ ++/***************************************************************************** ++ Modal widgets; We have implemented our own modal widget mechanism ++ to get total control. ++ A modal widget without a parent becomes application-modal. ++ A modal widget with a parent becomes modal to its parent and grandparents.. ++ ++ QApplicationPrivate::enterModal() ++ Enters modal state ++ Arguments: ++ QWidget *widget A modal widget ++ ++ QApplicationPrivate::leaveModal() ++ Leaves modal state for a widget ++ Arguments: ++ QWidget *widget A modal widget ++ *****************************************************************************/ ++ ++bool QApplicationPrivate::modalState() ++{ ++ //qDebug()<<"Unimplemented: QApplicationPrivate::modalState():"<insert(0, widget); ++ app_do_modal = true; ++ curWin = 0; ++ qt_last_mouse_receiver = 0; ++ qt_win_ignoreNextMouseReleaseEvent = false; ++} ++ ++void QApplicationPrivate::leaveModal_sys(QWidget *widget) ++{ ++ //qDebug()<<"Unimplemented: QApplicationPrivate::leaveModal_sys(). Widget:"<removeAll(widget)) { ++ if (qt_modal_stack->isEmpty()) { ++ delete qt_modal_stack; ++ qt_modal_stack = 0; ++ QPoint p(QCursor::pos()); ++ app_do_modal = false; // necessary, we may get recursively into qt_try_modal below ++ QWidget* w = QApplication::widgetAt(p.x(), p.y()); ++ QWidget *leave = qt_last_mouse_receiver; ++ if (!leave) ++ leave = QWidget::find((WId)curWin); ++ if (QWidget *grabber = QWidget::mouseGrabber()) { ++ w = grabber; ++ if (leave == w) ++ leave = 0; ++ } ++ QApplicationPrivate::dispatchEnterLeave(w, leave); // send synthetic enter event ++ curWin = w ? w->effectiveWinId() : 0; ++ qt_last_mouse_receiver = w; ++ } ++ qt_win_ignoreNextMouseReleaseEvent = true; ++ } ++ app_do_modal = qt_modal_stack != 0; ++} ++ ++ ++/***************************************************************************** ++ Platform specific QApplication members ++ *****************************************************************************/ ++ ++#ifdef QT3_SUPPORT ++void QApplication::setMainWidget(QWidget *mainWidget) ++{ ++#ifndef QT_NO_DEBUG ++ if (mainWidget && mainWidget->parentWidget() && mainWidget->isWindow()) ++ qWarning("QApplication::setMainWidget: New main widget (%s/%s) " ++ "has a parent", ++ mainWidget->metaObject()->className(), mainWidget->objectName().toLocal8Bit().constData()); ++#endif ++ if (mainWidget) ++ mainWidget->d_func()->createWinId(); ++ QApplicationPrivate::main_widget = mainWidget; ++} ++#endif ++ ++void QApplication::setDoubleClickInterval(int ms) ++{ ++// qDebug("Reimplemented: QApplicationPrivate::setDoubleClickInterval - %d\n", ms); ++#if 0 //change system dblclick interval currently disabled ++ QApplicationPrivate::mouse_double_click_time = ms; ++ bigtime_t interval = ms*1000; ++ set_click_speed(interval); ++#endif ++} ++ ++int QApplication::doubleClickInterval() ++{ ++ bigtime_t interval; ++ get_click_speed(&interval); ++ ++ QApplicationPrivate::mouse_double_click_time = (int)(interval/1000); ++ ++ return QApplicationPrivate::mouse_double_click_time; ++} ++ ++void QApplication::setKeyboardInputInterval(int ms) ++{ ++ QApplicationPrivate::keyboard_input_time = ms; ++} ++ ++int QApplication::keyboardInputInterval() ++{ ++ // FIXME: get from the system ++ return QApplicationPrivate::keyboard_input_time; ++} ++ ++void QApplication::setWheelScrollLines(int n) ++{ ++ QApplicationPrivate::wheel_scroll_lines = n; ++} ++ ++int QApplication::wheelScrollLines() ++{ ++ return QApplicationPrivate::wheel_scroll_lines; ++} ++ ++void QApplication::setOverrideCursor(const QCursor &cursor) ++{ ++ Q_UNUSED(cursor); ++ qDebug("Unimplemented: QApplication::setOverrideCursor\n"); ++} ++ ++void QApplication::restoreOverrideCursor() ++{ ++ qDebug("Unimplemented: QApplication::restoreOverrideCursor\n"); ++} ++ ++void QApplication::setEffectEnabled(Qt::UIEffect effect, bool enable) ++{ ++ Q_UNUSED(effect); ++ Q_UNUSED(enable); ++// qDebug("Unimplemented: QApplication::setEffectEnabled\n"); ++} ++ ++bool QApplication::isEffectEnabled(Qt::UIEffect effect) ++{ ++ Q_UNUSED(effect); ++// qDebug("Unimplemented: QApplication::isEffectEnabled\n"); ++ return false; ++} ++ ++void QApplication::setCursorFlashTime(int msecs) ++{ ++ QApplicationPrivate::cursor_flash_time = msecs; ++} ++ ++int QApplication::cursorFlashTime() ++{ ++ return QApplicationPrivate::cursor_flash_time; ++} ++ ++QWidget *QApplication::topLevelAt(const QPoint &point) ++{ ++ QWidget *found = 0; ++ int lowestZ = INT_MAX; ++ QWidgetList list = QApplication::topLevelWidgets(); ++ for (int i = 0; i < list.count(); ++i) { ++ QWidget *widget = list.at(i); ++ if (widget->isVisible() && !(widget->windowType() == Qt::Desktop)) { ++ if (widget->geometry().adjusted(0,0,1,1).contains(point)) { ++ found = widget; //TODO: check for z-order needed! ++ if(widget->nativeView()->Window()->IsActive()) ++ break; ++ } ++ } ++ } ++ return found; ++} ++ ++void QApplication::beep() ++{ ++} ++ ++void QApplication::alert(QWidget *widget, int duration) ++{ ++} ++ ++void QApplicationPrivate::initializeMultitouch_sys() ++{ ++} ++ ++void QApplicationPrivate::cleanupMultitouch_sys() ++{ ++} +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qapplication_p.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qapplication_p.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qapplication_p.h 2011-03-30 05:19:04.050331648 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qapplication_p.h 2011-06-13 22:06:43.293339136 +0000 +@@ -302,6 +302,8 @@ public: + #elif defined(Q_WS_QWS) + static bool qws_apply_settings(); + static QWidget *findWidget(const QObjectList&, const QPoint &, bool rec); ++#elif defined(Q_WS_HAIKU) ++ static bool haiku_apply_settings(); + #endif + static bool quitOnLastWindowClosed; + static void emitLastWindowClosed(); +@@ -349,6 +351,10 @@ public: + static void x11_initialize_style(); + #endif + ++#if defined(Q_WS_HAIKU) ++ static void haiku_initialize_style(); ++#endif ++ + enum KeyPlatform { + KB_Win = 1, + KB_Mac = 2, +@@ -499,7 +505,7 @@ public: + static Qt::NavigationMode navigationMode; + #endif + +-#if defined(Q_WS_MAC) || defined(Q_WS_X11) ++#if defined(Q_WS_MAC) || defined(Q_WS_X11) || defined(Q_WS_HAIKU) + void _q_alertTimeOut(); + QHash alertTimerHash; + #endif +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qclipboard_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qclipboard_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qclipboard_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qclipboard_haiku.cpp 2011-06-13 22:06:43.295174144 +0000 +@@ -0,0 +1,105 @@ ++#include "qplatformdefs.h" ++#include "qclipboard.h" ++#include "qdebug.h" ++#include "qtextcodec.h" ++#include "qclipboard_p.h" ++#include "qstringlist.h" ++#include ++ ++#include ++#include ++ ++bool QClipboard::event(QEvent *e) ++{ ++ return true; ++} ++ ++void QClipboard::connectNotify(const char *) ++{ } ++ ++void QClipboard::ownerDestroyed() ++{ } ++ ++const QMimeData *QClipboard::mimeData(Mode mode) const ++{ ++ extern QTextCodec *qt_input_mapper; // from qapplication_haiku.cpp ++ ++ QMimeData *md = new QMimeData(); ++ if(mode == Clipboard) { ++ BMessage* clip = (BMessage *)NULL; ++ if (be_clipboard->Lock()) { ++ if( clip = be_clipboard->Data()) { ++ BMessage *msg = (BMessage*)(be_clipboard->Data()); ++ ++ char *name; ++ uint32 type; ++ int32 count; ++ ++ for ( int i = 0; msg->GetInfo(B_MIME_TYPE, i, &name, &type, &count) == B_OK; i++ ) { ++ const void *data; ++ int32 dataLen = 0; ++ qDebug() << "mimeData " << name; ++ status_t stat = msg->FindData(name,B_MIME_TYPE,&data,&dataLen); ++ if(dataLen && stat==B_OK) { ++ QString mime(name); ++ if(mime=="text/plain") { ++ QString text((const char*)data); ++ if (qt_input_mapper) ++ text = qt_input_mapper->toUnicode((const char*)data, dataLen, 0); ++ md->setText(text); ++ } else if(mime=="text/html") { ++ QString html((const char*)data); ++ if (qt_input_mapper) ++ html = qt_input_mapper->toUnicode((const char*)data, dataLen, 0); ++ md->setHtml(html); ++ } else { ++ QByteArray clip_data((const char*)data, dataLen); ++ md->setData(mime,clip_data); ++ } ++ ++ } ++ } ++ be_clipboard->Unlock(); ++ } ++ } ++ } ++ return md; ++} ++ ++void QClipboard::setMimeData(QMimeData *src, Mode mode) ++{ ++ if(mode != Clipboard) ++ return; ++ if (be_clipboard->Lock()) { ++ be_clipboard->Clear(); ++ if (src){ ++ BMessage* clip = (BMessage *)NULL; ++ if( clip = be_clipboard->Data()) { ++ QStringList formats = src->formats(); ++ for(int f = 0; f < formats.size(); ++f) { ++ QString mimeType = formats.at(f); ++ qDebug() << "setMimeData " << mimeType; ++ clip->AddData(mimeType.toUtf8(), B_MIME_TYPE, src->data(mimeType).data(), src->data(mimeType).count()); ++ } ++ } ++ } ++ be_clipboard->Commit(); ++ be_clipboard->Unlock(); ++ } ++} ++ ++void QClipboard::clear(Mode mode) ++{ ++ setMimeData(0, mode); ++} ++ ++bool QClipboard::supportsMode(QClipboard::Mode mode) const ++{ ++ return (mode == Clipboard); ++} ++ ++bool QClipboard::ownsMode(QClipboard::Mode) const ++{ ++ fprintf(stderr, "Unimplemented: QClipboard::ownsMode\n"); ++ return false; ++} +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qcursor.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qcursor.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qcursor.h 2011-03-30 05:19:04.046399488 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qcursor.h 2011-06-13 22:06:43.297271296 +0000 +@@ -76,6 +76,10 @@ class QCursorData; + class QBitmap; + class QPixmap; + ++#if defined(Q_WS_HAIKU) ++class BCursor; ++#endif ++ + #if defined(Q_WS_MAC) + void qt_mac_set_cursor(const QCursor *c, const QPoint &p); + #endif +@@ -130,6 +134,8 @@ public: + int handle() const; + #elif defined(Q_OS_SYMBIAN) + Qt::HANDLE handle() const; ++#elif defined(Q_WS_HAIKU) ++ BCursor *handle() const; + #endif + #endif + +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qcursor_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qcursor_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qcursor_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qcursor_haiku.cpp 2011-06-13 22:06:43.299630592 +0000 +@@ -0,0 +1,93 @@ ++#include "qcursor.h" ++#include "qcursor_p.h" ++ ++#include ++#include ++ ++#include ++ ++int haiku_global_mouse_x = 0; ++int haiku_global_mouse_y = 0; ++ ++BCursor *HaikuCursorCache[32]={NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL, ++ NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}; ++ ++int CursorMapList[]={ Qt::ArrowCursor, B_CURSOR_ID_SYSTEM_DEFAULT, ++ Qt::UpArrowCursor, B_CURSOR_ID_RESIZE_NORTH, ++ Qt::CrossCursor, B_CURSOR_ID_CROSS_HAIR, ++ Qt::WaitCursor, B_CURSOR_ID_PROGRESS, ++ Qt::IBeamCursor, B_CURSOR_ID_I_BEAM, ++ Qt::SizeVerCursor, B_CURSOR_ID_RESIZE_NORTH_SOUTH, ++ Qt::SizeHorCursor, B_CURSOR_ID_RESIZE_EAST_WEST, ++ Qt::SizeBDiagCursor, B_CURSOR_ID_RESIZE_NORTH_EAST_SOUTH_WEST, ++ Qt::SizeFDiagCursor, B_CURSOR_ID_RESIZE_NORTH_WEST_SOUTH_EAST, ++ Qt::SizeAllCursor, B_CURSOR_ID_MOVE, ++ Qt::BlankCursor, B_CURSOR_ID_NO_CURSOR, ++ Qt::SplitVCursor, B_CURSOR_ID_RESIZE_NORTH_SOUTH, ++ Qt::SplitHCursor, B_CURSOR_ID_RESIZE_EAST_WEST, ++ Qt::PointingHandCursor, B_CURSOR_ID_FOLLOW_LINK, ++ Qt::ForbiddenCursor, B_CURSOR_ID_NOT_ALLOWED, ++ Qt::OpenHandCursor, B_CURSOR_ID_GRAB, ++ Qt::ClosedHandCursor, B_CURSOR_ID_GRABBING, ++ Qt::WhatsThisCursor, B_CURSOR_ID_HELP, ++ Qt::BusyCursor, B_CURSOR_ID_PROGRESS ++}; ++ ++ ++extern QCursorData *qt_cursorTable[Qt::LastCursor + 1]; // qcursor.cpp ++ ++QPoint QCursor::pos() ++{ ++ return QPoint(haiku_global_mouse_x,haiku_global_mouse_y); ++} ++ ++void QCursor::setPos(int x, int y) ++{ ++// haiku_global_mouse_x = x; ++// haiku_global_mouse_y = y; ++} ++ ++BCursor *QCursor::handle() const ++{ ++ int i; ++ ++ if (!QCursorData::initialized) ++ QCursorData::initialize(); ++ ++ for(i=0;icshape) { ++ if(HaikuCursorCache[CursorMapList[i+1]]) ++ return HaikuCursorCache[CursorMapList[i+1]]; ++ } ++ } ++ ++ return (BCursor*)B_CURSOR_SYSTEM_DEFAULT; ++} ++ ++QCursorData::QCursorData(Qt::CursorShape s) ++ : cshape(s), bm(0), bmm(0), hx(0), hy(0) ++{ ++ int i; ++ for(i=0;iref.ref(); ++ return c; ++} +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qdesktopwidget_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qdesktopwidget_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qdesktopwidget_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qdesktopwidget_haiku.cpp 2011-06-13 22:06:43.301465600 +0000 +@@ -0,0 +1,75 @@ ++#include "qdesktopwidget.h" ++#include "interface/Screen.h" ++ ++ ++#include ++ ++QDesktopWidget::QDesktopWidget() ++ : QWidget(0, Qt::Desktop) ++{ ++ //fprintf(stderr, "Unimplemented: QDesktopWidget::QDesktopWidget\n"); ++} ++ ++QDesktopWidget::~QDesktopWidget() ++{ ++ //fprintf(stderr, "Unimplemented: QDesktopWidget::~QDesktopWidget\n"); ++} ++ ++void ++QDesktopWidget::resizeEvent(QResizeEvent*) ++{ ++ fprintf(stderr, "Unimplemented: QDesktopWidget::resizeEvent\n"); ++} ++ ++const QRect QDesktopWidget::availableGeometry(int screen) const ++{ ++ BScreen bscreen(B_MAIN_SCREEN_ID); ++ BRect nsg = bscreen.Frame(); ++ return QRect(nsg.left,nsg.top,nsg.right,nsg.bottom); ++} ++ ++const QRect QDesktopWidget::screenGeometry(int screen) const ++{ ++ BScreen bscreen(B_MAIN_SCREEN_ID); ++ BRect nsg = bscreen.Frame(); ++ return QRect(nsg.left,nsg.top,nsg.right,nsg.bottom); ++} ++ ++int QDesktopWidget::screenNumber(const QWidget *widget) const ++{ ++ Q_UNUSED(widget); ++ //fprintf(stderr, "Reimplemented: QDesktopWidget::screenNumber(widget) \n"); ++ return 0; ++} ++ ++int QDesktopWidget::screenNumber(const QPoint &point) const ++{ ++ Q_UNUSED(point); ++ //fprintf(stderr, "Reimplemented: QDesktopWidget::screenNumber\n"); ++ return 0; ++} ++ ++bool QDesktopWidget::isVirtualDesktop() const ++{ ++ //fprintf(stderr, "Unimplemented: QDesktopWidget::isVirtualDesktop\n"); ++ return true; ++} ++ ++int QDesktopWidget::primaryScreen() const ++{ ++ //fprintf(stderr, "Unimplemented: QDesktopWidget::primaryScreen\n"); ++ return 0; ++} ++ ++int QDesktopWidget::numScreens() const ++{ ++ //fprintf(stderr, "Unimplemented: QDesktopWidget::numScreens\n"); ++ return 1; ++} ++ ++QWidget *QDesktopWidget::screen(int /* screen */) ++{ ++ //fprintf(stderr, "Unimplemented: QDesktopWidget::screen\n"); ++ // It seems that a Qt::WType_Desktop cannot be moved? ++ return this; ++} +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qdnd_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qdnd_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qdnd_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qdnd_haiku.cpp 2011-06-13 22:06:43.304349184 +0000 +@@ -0,0 +1,274 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ++** All rights reserved. ++** Contact: Nokia Corporation (qt-info@nokia.com) ++** ++** This file is part of the QtGui module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** No Commercial Usage ++** This file contains pre-release code and may not be distributed. ++** You may use this file in accordance with the terms and conditions ++** contained in the Technology Preview License Agreement accompanying ++** this package. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain additional ++** rights. These rights are described in the Nokia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** If you have questions regarding the use of this file, please contact ++** Nokia at qt-info@nokia.com. ++** ++** ++** ++** ++** ++** ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include "qapplication.h" ++ ++#ifndef QT_NO_DRAGANDDROP ++ ++#include "qdebug.h" ++ ++#include "qwidget.h" ++#include "qdatetime.h" ++#include "qbitmap.h" ++#include "qcursor.h" ++#include "qevent.h" ++#include "qpainter.h" ++#include "qdnd_p.h" ++ ++#include ++ ++QT_BEGIN_NAMESPACE ++ ++static Qt::DropAction global_accepted_action = Qt::MoveAction; ++static Qt::DropActions possible_actions = Qt::IgnoreAction; ++ ++static QDrag *drag_object; ++static bool qt_haiku_dnd_dragging = false; ++ ++ ++static Qt::KeyboardModifiers oldstate; ++ ++void QDragManager::updatePixmap() { } ++void QDragManager::timerEvent(QTimerEvent *) { } ++void QDragManager::move(const QPoint&) { } ++void QDragManager::updateCursor() { } ++ ++bool QDragManager::eventFilter(QObject *o, QEvent *e) ++{ ++ if (beingCancelled) { ++ return false; ++ } ++ if (!o->isWidgetType()) ++ return false; ++ ++ switch(e->type()) { ++ case QEvent::MouseButtonPress: ++ { ++ } ++ case QEvent::MouseMove: ++ { ++ if (!object) { //#### this should not happen ++ qWarning("QDragManager::eventFilter: No object"); ++ return true; ++ } ++ QDragManager *manager = QDragManager::self(); ++ QMimeData *dropData = manager->object ? manager->dragPrivate()->data : manager->dropData; ++ if (manager->object) ++ possible_actions = manager->dragPrivate()->possible_actions; ++ else ++ possible_actions = Qt::IgnoreAction; ++ ++ QMouseEvent *me = (QMouseEvent *)e; ++ ++ if (me->buttons()) { ++ Qt::DropAction prevAction = global_accepted_action; ++ QWidget *cw = QApplication::widgetAt(me->globalPos()); ++ // map the Coords relative to the window. ++ if (!cw) ++ return true; ++ ++ while (cw && !cw->acceptDrops() && !cw->isWindow()) ++ cw = cw->parentWidget(); ++ ++ bool oldWillDrop = willDrop; ++ if (object->target() != cw) { ++ if (object->target()) { ++ QDragLeaveEvent dle; ++ QApplication::sendEvent(object->target(), &dle); ++ willDrop = false; ++ global_accepted_action = Qt::IgnoreAction; ++ if (oldWillDrop != willDrop) ++ updateCursor(); ++ object->d_func()->target = 0; ++ } ++ if (cw && cw->acceptDrops()) { ++ object->d_func()->target = cw; ++ QDragEnterEvent dee(cw->mapFromGlobal(me->globalPos()), possible_actions, dropData, ++ me->buttons(), me->modifiers()); ++ QApplication::sendEvent(object->target(), &dee); ++ willDrop = dee.isAccepted() && dee.dropAction() != Qt::IgnoreAction; ++ global_accepted_action = willDrop ? dee.dropAction() : Qt::IgnoreAction; ++ if (oldWillDrop != willDrop) ++ updateCursor(); ++ } ++ } else if (cw) { ++ QDragMoveEvent dme(cw->mapFromGlobal(me->globalPos()), possible_actions, dropData, ++ me->buttons(), me->modifiers()); ++ if (global_accepted_action != Qt::IgnoreAction) { ++ dme.setDropAction(global_accepted_action); ++ dme.accept(); ++ } ++ QApplication::sendEvent(cw, &dme); ++ willDrop = dme.isAccepted(); ++ global_accepted_action = willDrop ? dme.dropAction() : Qt::IgnoreAction; ++ if (oldWillDrop != willDrop) { ++ updatePixmap(); ++ updateCursor(); ++ } ++ } ++ if (global_accepted_action != prevAction) ++ emitActionChanged(global_accepted_action); ++ } ++ return true; // Eat all mouse events ++ } ++ ++ case QEvent::MouseButtonRelease: ++ { ++ qApp->removeEventFilter(this); ++#ifndef QT_NO_CURSOR ++ if (restoreCursor) { ++ QApplication::restoreOverrideCursor(); ++ willDrop = false; ++ restoreCursor = false; ++ } ++#endif ++ if (object && object->target()) { ++ ++ QMouseEvent *me = (QMouseEvent *)e; ++ ++ QDragManager *manager = QDragManager::self(); ++ QMimeData *dropData = manager->object ? manager->dragPrivate()->data : manager->dropData; ++ ++ QDropEvent de(object->target()->mapFromGlobal(me->globalPos()), possible_actions, dropData, ++ me->buttons(), me->modifiers()); ++ QApplication::sendEvent(object->target(), &de); ++ if (de.isAccepted()) ++ global_accepted_action = de.dropAction(); ++ else ++ global_accepted_action = Qt::IgnoreAction; ++ ++ if (object) ++ object->deleteLater(); ++ drag_object = object = 0; ++ } ++ eventLoop->exit(); ++ return true; // Eat all mouse events ++ } ++ ++ default: ++ break; ++ } ++ return false; ++} ++ ++Qt::DropAction QDragManager::drag(QDrag *o) ++{ ++ if (object == o || !o || !o->source()) { ++ return Qt::IgnoreAction; ++ } ++ ++ if (object) { ++ cancel(); ++ qApp->removeEventFilter(this); ++ beingCancelled = false; ++ } ++ ++ object = drag_object = o; ++ ++ oldstate = Qt::NoModifier; // #### Should use state that caused the drag ++ willDrop = false; ++ ++ object->d_func()->target = 0; ++ ++ qApp->installEventFilter(this); ++ ++ global_accepted_action = defaultAction(dragPrivate()->possible_actions, Qt::NoModifier); ++ qt_haiku_dnd_dragging = true; ++ ++ eventLoop = new QEventLoop; ++ // block ++ (void) eventLoop->exec(QEventLoop::AllEvents); ++ delete eventLoop; ++ eventLoop = 0; ++ ++ qt_haiku_dnd_dragging = false; ++ ++ return global_accepted_action; ++} ++ ++ ++void QDragManager::cancel(bool deleteSource) ++{ ++ beingCancelled = true; ++ ++ if (object->target()) { ++ QDragLeaveEvent dle; ++ QApplication::sendEvent(object->target(), &dle); ++ } ++ ++ if (drag_object) { ++ if (deleteSource) ++ object->deleteLater(); ++ drag_object = object = 0; ++ } ++ ++ global_accepted_action = Qt::IgnoreAction; ++} ++ ++ ++void QDragManager::drop() ++{ ++} ++ ++QVariant QDropData::retrieveData_sys(const QString &mimetype, QVariant::Type type) const ++{ ++ if (!drag_object) ++ return QVariant(); ++ QByteArray data = drag_object->mimeData()->data(mimetype); ++ if (type == QVariant::String) ++ return QString::fromUtf8(data); ++ return data; ++} ++ ++bool QDropData::hasFormat_sys(const QString &format) const ++{ ++ return formats().contains(format); ++} ++ ++QStringList QDropData::formats_sys() const ++{ ++ if (drag_object) ++ return drag_object->mimeData()->formats(); ++ return QStringList(); ++} ++ ++QT_END_NAMESPACE ++#endif // QT_NO_DRAGANDDROP +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qeventdispatcher_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qeventdispatcher_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qeventdispatcher_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qeventdispatcher_haiku.cpp 2011-06-13 22:06:43.305922048 +0000 +@@ -0,0 +1,94 @@ ++#include ++#include "qeventdispatcher_haiku_p.h" ++#include ++#include ++#include ++ ++#include ++#include ++ ++// Debugging part ++ ++#define DEBUG_HAIKU_LEVEL 0 ++// 1 Unimplemented ++// 2-4 nothing ++// 5 reimplemented ++ ++#if defined(DEBUG_HAIKU_LEVEL) && DEBUG_HAIKU_LEVEL > 0 ++void debugprint(int level, const char *msg, ...) ++{ ++ va_list args; ++ va_start(args, msg); ++ if (DEBUG_HAIKU_LEVEL >= level) ++ vfprintf(stderr, msg, args); ++ va_end(args); ++} ++#else ++#define debugprint(...) ++#endif ++ ++class QEventDispatcherHaikuPrivate : public QEventDispatcherUNIXPrivate ++{ ++ QEventDispatcherHaikuPrivate() : QEventDispatcherUNIXPrivate() { } ++ ~QEventDispatcherHaikuPrivate() { } ++}; ++ ++QEventDispatcherHaiku::QEventDispatcherHaiku(QObject *parent) ++ : QEventDispatcherUNIX(*new QEventDispatcherUNIXPrivate, parent) ++{ ++ debugprint(5, "Reimp: QEventDispatcherHaiku::QEventDispatcherHaiku \n"); ++} ++QEventDispatcherHaiku::~QEventDispatcherHaiku() ++{ ++ debugprint(5, "Reimp: QEventDispatcherHaiku::~QEventDispatcherHaiku \n"); ++} ++ ++bool ++QEventDispatcherHaiku::processEvents(QEventLoop::ProcessEventsFlags ++flags) ++{ ++ Q_D(QEventDispatcherHaiku); ++ debugprint(5, "Reimp: QEventDispatcherHaiku::processEvents\n"); ++ ++ d->interrupt = false; ++ emit awake(); ++ ++ bool canWait = false; ++ bool retVal = false; ++ do { ++ QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData); ++ QThreadData *data = d->threadData; ++ canWait = (//!retVal ++ data->canWait ++ && !d->interrupt ++ && (flags & QEventLoop::WaitForMoreEvents)); ++ } while (false);//canWait); ++ ++ if (!d->interrupt) { ++// fprintf(stderr, "Entering Unix processEvents\n"); ++ bool result = QEventDispatcherUNIX::processEvents(flags); ++// fprintf(stderr, "Exiting Unix processEvents\n"); ++ return result; ++ } ++ return true; ++} ++bool QEventDispatcherHaiku::hasPendingEvents() ++{ ++ debugprint(5, "Reimp: QEventDispatcherHaiku::hasPendingEvents\n"); ++ return false; ++} ++ ++void QEventDispatcherHaiku::flush() ++{ ++ debugprint(5, "Reimp: QEventDispatcherHaiku::flush\n"); ++} ++ ++void QEventDispatcherHaiku::startingUp() ++{ ++ debugprint(5, "Reimp: QEventDispatcherHaiku::startingUp\n"); ++} ++void QEventDispatcherHaiku::closingDown() ++{ ++ debugprint(5, "Reimp: QEventDispatcherHaiku::closingDown\n"); ++} ++ +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qeventdispatcher_haiku_p.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qeventdispatcher_haiku_p.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qeventdispatcher_haiku_p.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qeventdispatcher_haiku_p.h 2011-06-13 22:06:43.307757056 +0000 +@@ -0,0 +1,28 @@ ++#ifndef FEASOIFESWR ++#define FEASOIFESWR ++#include ++#include ++ ++class QEventDispatcherHaikuPrivate; ++ ++class QEventDispatcherHaiku : public QEventDispatcherUNIX ++{ ++ //Q_OBJECT ++ Q_DECLARE_PRIVATE(QEventDispatcherHaiku) ++ ++public: ++ explicit QEventDispatcherHaiku(QObject *parent = 0); ++ ~QEventDispatcherHaiku(); ++ ++ bool processEvents(QEventLoop::ProcessEventsFlags flags); ++ bool hasPendingEvents(); ++ ++ void flush(); ++ ++ void startingUp(); ++ void closingDown(); ++ ++protected: ++}; ++ ++#endif +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qguiplatformplugin.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qguiplatformplugin.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qguiplatformplugin.cpp 2011-03-30 05:19:04.050069504 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qguiplatformplugin.cpp 2011-06-13 22:06:43.310378496 +0000 +@@ -156,6 +156,8 @@ QString QGuiPlatformPlugin::styleName() + return QLatin1String("Plastique"); // default style for X11 and small devices + #elif defined(Q_WS_MAC) + return QLatin1String("Macintosh"); // default style for all Mac's ++#elif defined(Q_WS_HAIKU) ++ return QLatin1String("Haiku"); // default style for Haiku + #elif defined(Q_WS_X11) + QString stylename; + switch(X11->desktopEnvironment) { +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qkeymapper_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qkeymapper_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qkeymapper_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qkeymapper_haiku.cpp 2011-06-13 22:06:43.312475648 +0000 +@@ -0,0 +1,208 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ++** Contact: Nokia Corporation (qt-info@nokia.com) ++** ++** This file is part of the QtGui of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** No Commercial Usage ++** This file contains pre-release code and may not be distributed. ++** You may use this file in accordance with the terms and conditions ++** contained in the Technology Preview License Agreement accompanying ++** this package. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain ++** additional rights. These rights are described in the Nokia Qt LGPL ++** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this ++** package. ++** ++** If you have questions regarding the use of this file, please contact ++** Nokia at qt-info@nokia.com. ++** ++** ++** ++** ++** ++** ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include "qkeymapper_p.h" ++ ++#include ++ ++QKeyMapperPrivate::QKeyMapperPrivate() ++{ ++ uint32 scan_codes[] = { ++ Qt::Key_Escape, 0x01, ++ Qt::Key_F1, 0x02, ++ Qt::Key_F2, 0x03, ++ Qt::Key_F3, 0x04, ++ Qt::Key_F4, 0x05, ++ Qt::Key_F5, 0x06, ++ Qt::Key_F6, 0x07, ++ Qt::Key_F7, 0x08, ++ Qt::Key_F8, 0x09, ++ Qt::Key_F9, 0x0A, ++ Qt::Key_F10, 0x0B, ++ Qt::Key_F11, 0x0C, ++ Qt::Key_F12, 0x0D, ++ Qt::Key_Print, 0x0E, ++// Qt::Key_ScrollLock = 0x0F, //modificator ++ Qt::Key_Pause, 0x22, ++ ++ Qt::Key_AsciiTilde, 0x11, ++ Qt::Key_1, 0x12, ++ Qt::Key_2, 0x13, ++ Qt::Key_3, 0x14, ++ Qt::Key_4, 0x15, ++ Qt::Key_5, 0x16, ++ Qt::Key_6, 0x17, ++ Qt::Key_7, 0x18, ++ Qt::Key_8, 0x19, ++ Qt::Key_9, 0x1A, ++ Qt::Key_0, 0x1B, ++ Qt::Key_Minus, 0x1C, ++ Qt::Key_Plus, 0x1D, ++ Qt::Key_Backspace, 0x1E, ++ Qt::Key_Insert, 0x1F, ++ Qt::Key_Home, 0x20, ++ Qt::Key_PageUp, 0x21, ++// Qt::Key_NumLock, 0x22, //modificator ++ Qt::Key_Slash, 0x23, ++ Qt::Key_Asterisk, 0x24, ++ Qt::Key_Minus, 0x25, ++ ++ Qt::Key_Tab, 0x26, ++ Qt::Key_Q, 0x27, ++ Qt::Key_W, 0x28, ++ Qt::Key_E, 0x29, ++ Qt::Key_R, 0x2A, ++ Qt::Key_T, 0x2B, ++ Qt::Key_Y, 0x2C, ++ Qt::Key_U, 0x2D, ++ Qt::Key_I, 0x2E, ++ Qt::Key_O, 0x2F, ++ Qt::Key_P, 0x30, ++ Qt::Key_BracketLeft,0x31, ++ Qt::Key_BracketRight,0x32, ++ Qt::Key_Backslash, 0x33, ++ Qt::Key_Delete, 0x34, ++ Qt::Key_End, 0x35, ++ Qt::Key_PageDown, 0x36, ++ Qt::Key_Home, 0x37, //numpad ++ Qt::Key_Up, 0x38, //numpad ++ Qt::Key_PageUp, 0x39, //numpad ++ Qt::Key_Plus, 0x3A, //numpad ++ ++// Qt::Key_CapsLock, 0x3B, //modificator ++ Qt::Key_A, 0x3C, ++ Qt::Key_S, 0x3D, ++ Qt::Key_D, 0x3E, ++ Qt::Key_F, 0x3F, ++ Qt::Key_G, 0x40, ++ Qt::Key_H, 0x41, ++ Qt::Key_J, 0x42, ++ Qt::Key_K, 0x43, ++ Qt::Key_L, 0x44, ++ Qt::Key_Colon, 0x45, ++ Qt::Key_QuoteDbl, 0x46, ++ Qt::Key_Return, 0x47, ++ Qt::Key_Left, 0x48, //numpad ++ Qt::Key_5, 0x49, //numpad ??? ++ Qt::Key_Right, 0x4A, //numpad ++ ++ Qt::Key_Z, 0x4C, ++ Qt::Key_X, 0x4D, ++ Qt::Key_C, 0x4E, ++ Qt::Key_V, 0x4F, ++ Qt::Key_B, 0x50, ++ Qt::Key_N, 0x51, ++ Qt::Key_M, 0x51, ++ Qt::Key_Less, 0x52, ++ Qt::Key_Greater, 0x54, ++ Qt::Key_Question, 0x55, ++ Qt::Key_Up, 0x57, //cursor ++ Qt::Key_End, 0x58, //numpad ++ Qt::Key_Down, 0x59, //numpad ++ Qt::Key_PageDown, 0x5A, //numpad ++ Qt::Key_Enter, 0x5B, //numpad ++ ++ Qt::Key_Space, 0x5E, ++ Qt::Key_Left, 0x61, //cursor ++ Qt::Key_Down, 0x62, //cursor ++ Qt::Key_Right, 0x63, //cursor ++ Qt::Key_Insert, 0x64, //cursor ++ Qt::Key_Delete, 0x65, //numpad ++ 0, 0x00 ++ }; ++ ++uint32 scan_codes_numlock[] = { ++ Qt::Key_7, 0x37, ++ Qt::Key_8, 0x38, ++ Qt::Key_9, 0x39, ++ Qt::Key_Plus, 0x3A, ++ Qt::Key_4, 0x48, ++ Qt::Key_5, 0x49, ++ Qt::Key_6, 0x4A, ++ Qt::Key_1, 0x58, ++ Qt::Key_2, 0x59, ++ Qt::Key_3, 0x5A, ++ Qt::Key_Enter, 0x5B, ++ Qt::Key_Comma, 0x65, ++ 0, 0x00 ++ }; ++ ++ memcpy(ScanCodes,scan_codes,sizeof(scan_codes)); ++ memcpy(ScanCodes_Numlock,scan_codes_numlock,sizeof(scan_codes_numlock)); ++} ++ ++QKeyMapperPrivate::~QKeyMapperPrivate() ++{ } ++ ++void QKeyMapperPrivate::clearMappings() ++{ } ++ ++QList QKeyMapperPrivate::possibleKeys(QKeyEvent *) ++{ ++ return QList(); ++} ++ ++uint32 QKeyMapperPrivate::translateKeyCode(int32 key) ++{ ++ uint32 code = 0; ++ int i = 0; ++ if(modifiers()&&B_NUM_LOCK) { ++ while (ScanCodes_Numlock[i]) { ++ if ( key == ScanCodes_Numlock[i+1]) { ++ code = ScanCodes_Numlock[i]; ++ break; ++ } ++ i += 2; ++ } ++ if(code>0) ++ return code; ++ } ++ ++ i = 0; ++ while (ScanCodes[i]) { ++ if ( key == ScanCodes[i+1]) { ++ code = ScanCodes[i]; ++ break; ++ } ++ i += 2; ++ } ++ return code; ++} +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qkeymapper_p.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qkeymapper_p.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qkeymapper_p.h 2011-03-30 05:19:04.003145728 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qkeymapper_p.h 2011-06-13 22:06:43.314572800 +0000 +@@ -213,6 +213,10 @@ public: + int mapS60ScanCodesToQt(TUint s60key); + int mapQtToS60Key(int qtKey); + int mapQtToS60ScanCodes(int qtKey); ++#elif defined(Q_WS_HAIKU) ++ uint32 translateKeyCode(int32 key); ++ uint32 ScanCodes[256]; ++ uint32 ScanCodes_Numlock[16]; + #endif + }; + +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qsound_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qsound_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qsound_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qsound_haiku.cpp 2011-06-13 22:06:43.316932096 +0000 +@@ -0,0 +1,26 @@ ++#include "qapplication.h" ++#include "qsound.h" ++#include "qsound_p.h" ++ ++class QAuServerNull : public QAuServer ++{ ++public: ++ QAuServerNull(QObject* parent); ++ ++ void play(const QString&) { } ++ void play(QSound*s) { while(decLoop(s) > 0) /* nothing */ ; } ++ void stop(QSound*) { } ++ bool okay() { return false; } ++}; ++ ++QAuServerNull::QAuServerNull(QObject* parent) ++ : QAuServer(parent) ++{ ++} ++ ++QAuServer* qt_new_audio_server() ++{ ++// fprintf(stderr, "Unimplemented: qt_new_audio_server()\n"); ++ return new QAuServerNull(qApp); ++} ++ +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qwidget.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qwidget.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qwidget.cpp 2011-03-30 05:19:04.060030976 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qwidget.cpp 2011-06-13 22:06:43.326107136 +0000 +@@ -1466,6 +1466,18 @@ void QWidget::create(WId window, bool in + setAttribute(Qt::WA_WState_Created); // set created flag + d->create_sys(window, initializeWindow, destroyOldWindow); + ++#ifdef Q_WS_HAIKU ++if (windowType() != Qt::Desktop){ //temporary hack, Desktop don't have native view ++ QObject::connect((const QObject *)d->nativeView, SIGNAL(sendUpdateWidget()),this,SLOT(slot_updateWidget()), Qt::QueuedConnection); ++ QObject::connect((const QObject *)d->nativeView, SIGNAL(sendUpdateWidgetRect(QRect)),this,SLOT(slot_updateWidgetRect(QRect)), Qt::QueuedConnection); ++ QObject::connect((const QObject *)d->nativeView, SIGNAL(sendHaikuEvent(QObject *, QEvent *)),this,SLOT(slot_sendEvent(QObject *, QEvent *)),Qt::QueuedConnection); ++ QObject::connect((const QObject *)d->nativeView, SIGNAL(sendResizeWidget(int, int)),this,SLOT(slot_sendResizeWidget(int, int)), Qt::QueuedConnection); ++ QObject::connect((const QObject *)d->nativeView, SIGNAL(sendMoveWidget(int, int)),this,SLOT(slot_sendMoveWidget(int, int)), Qt::QueuedConnection); ++ QObject::connect((const QObject *)d->nativeView, SIGNAL(sendSetActiveWindow(QWidget *)),this,SLOT(slot_sendSetActiveWindow(QWidget *)), Qt::QueuedConnection); ++ QObject::connect((const QObject *)d->nativeView, SIGNAL(sendCloseWindow(QWidget *)),this,SLOT(slot_sendCloseWindow(QWidget *)), Qt::QueuedConnection); ++} ++#endif ++ + // a real toplevel window needs a backing store + if (isWindow() && windowType() != Qt::Desktop) { + d->topData()->backingStore.destroy(); +@@ -12547,6 +12559,53 @@ void QWidgetPrivate::syncUnifiedMode() { + + #endif // QT_MAC_USE_COCOA + ++/* ++ Trap slot functions for Haiku events ++*/ ++void QWidget::slot_updateWidget() ++{ ++ update(); ++} ++ ++void QWidget::slot_updateWidgetRect(QRect r) ++{ ++ update(r); ++} ++ ++void QWidget::slot_sendEvent(QObject *receiver, QEvent *event) ++{ ++ // close all active popup window ++ if (event->type() == QEvent::MouseButtonPress && ++ qApp->activePopupWidget() && ++ qApp->activePopupWidget()->nativeView()->Window() != nativeView()->Window()) ++ qApp->activePopupWidget()->close(); ++ ++ QApplication::sendSpontaneousEvent(receiver, event); ++ delete event; ++} ++ ++void QWidget::slot_sendResizeWidget(int width, int height) ++{ ++ resize(width, height); ++} ++ ++void QWidget::slot_sendMoveWidget(int x, int y) ++{ ++ move(x,y); ++} ++ ++void QWidget::slot_sendSetActiveWindow(QWidget *widget) ++{ ++ if (/*!d->inPopupMode() && */ widget || (!widget && QApplicationPrivate::active_window == this)) ++ qApp->setActiveWindow(widget); ++} ++ ++void QWidget::slot_sendCloseWindow(QWidget *widget) ++{ ++ QWidgetPrivate *widget_private = widget->d_func(); ++ widget_private->close_helper(QWidgetPrivate::CloseWithSpontaneousEvent); ++} ++ + QT_END_NAMESPACE + + #include "moc_qwidget.cpp" +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qwidget.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qwidget.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qwidget.h 2011-03-30 05:19:04.063963136 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qwidget.h 2011-06-13 22:06:43.328466432 +0000 +@@ -100,6 +100,9 @@ class QGraphicsEffect; + #if defined(Q_WS_X11) + class QX11Info; + #endif ++#if defined(Q_WS_HAIKU) && !defined(BUILD_WEBKIT) ++#include "qwidget_haiku.h" ++#endif + + class QWidgetData + { +@@ -254,6 +257,17 @@ public Q_SLOTS: + void setEnabled(bool); + void setDisabled(bool); + void setWindowModified(bool); ++ ++//#ifdef Q_WS_HAIKU // Its all for moc, but moc does not support #ifdef ++// Remove! break cross-platform! ++ void slot_updateWidget(); ++ void slot_updateWidgetRect(QRect r); ++ void slot_sendEvent(QObject *receiver, QEvent *event); ++ void slot_sendResizeWidget(int width, int height); ++ void slot_sendMoveWidget(int x, int y); ++ void slot_sendSetActiveWindow(QWidget *widget); ++ void slot_sendCloseWindow(QWidget *widget); ++//#endif + + // Widget coordinates + +@@ -604,6 +618,10 @@ public: + Qt::HANDLE handle() const; + #endif + ++#if defined(Q_WS_HAIKU) ++ BView* nativeView() const; ++#endif ++ + void setAttribute(Qt::WidgetAttribute, bool on = true); + inline bool testAttribute(Qt::WidgetAttribute) const; + +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qwidget_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qwidget_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qwidget_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qwidget_haiku.cpp 2011-06-13 22:06:43.333185024 +0000 +@@ -0,0 +1,1457 @@ ++#include "qwidget_haiku.h" ++#include ++#include "qapplication_p.h" ++#include "private/qkeymapper_p.h" ++#include "qdesktopwidget.h" ++#include "qwidget.h" ++#include "qwidget_p.h" ++#include "qtextcodec.h" ++ ++#include ++#include ++#include "qevent_p.h" ++#include "private/qwindowsurface_raster_p.h" ++#include "qapplication.h" ++#include "qfileinfo.h" ++#include ++#include ++#include ++ ++extern int haiku_global_mouse_x; ++extern int haiku_global_mouse_y; ++ ++static QWidget *keyboardGrb = 0; ++static QWidget *mouseGrb = 0; ++ ++QtHaikuView::QtHaikuView(BRect frame, const char *name, uint32 resizingMode, uint32 flags) ++ : QObject(), BView(frame, name, resizingMode, flags), ++ isVisible(true), fWidget(0), fWidgetPrivate(0), ++ last_down_buttons(0), last_clicked_buttons(0), last_mouse_x(-1), last_mouse_y(-1), last_click_time(0), last_draw_event(0) ++{ ++ ++} ++ ++Qt::MouseButton ++QtHaikuView::translateMouseButton(uint32 s) ++{ ++ Qt::MouseButton ret = Qt::NoButton; ++ if (s & B_PRIMARY_MOUSE_BUTTON) ++ ret = Qt::LeftButton; ++ if (s & B_SECONDARY_MOUSE_BUTTON) ++ ret = Qt::RightButton; ++ if (s & B_TERTIARY_MOUSE_BUTTON) ++ ret = Qt::MidButton; ++ return ret; ++} ++ ++Qt::MouseButtons ++QtHaikuView::translateMouseButtons(uint32 s) ++{ ++ Qt::MouseButtons ret = 0; ++ if (s & B_PRIMARY_MOUSE_BUTTON) ++ ret |= Qt::LeftButton; ++ if (s & B_SECONDARY_MOUSE_BUTTON) ++ ret |= Qt::RightButton; ++ if (s & B_TERTIARY_MOUSE_BUTTON) ++ ret |= Qt::MidButton; ++ return ret; ++} ++ ++void ++QtHaikuView::sendWheelEvent(int delta_x, int delta_y) ++{ ++ BPoint mouse_pos; ++ uint32 buttons; ++ uint32 mod = modifiers(); ++ ++ GetMouse(&mouse_pos,&buttons); ++ Qt::KeyboardModifiers qt_mod = translateModifiers(mod); ++ Qt::MouseButtons qt_buttons = translateMouseButtons(buttons); ++ ++ BPoint screen_pos = ConvertToScreen(mouse_pos); ++ const QPoint globalPos = QPoint(screen_pos.x,screen_pos.y); ++ QPoint pos = QPoint(mouse_pos.x,mouse_pos.y); ++ ++ if(delta_x!=0) ++ emit sendHaikuEvent(fWidget, new QWheelEvent(pos, globalPos, -delta_x, qt_buttons, qt_mod, Qt::Horizontal)); ++ if(delta_y!=0) ++ emit sendHaikuEvent(fWidget, new QWheelEvent(pos, globalPos, -delta_y, qt_buttons, qt_mod, Qt::Vertical)); ++} ++ ++Qt::KeyboardModifiers ++QtHaikuView::translateModifiers(uint32 s) ++{ ++ Qt::KeyboardModifiers ret = 0; ++ if (s & B_SHIFT_KEY) ++ ret |= Qt::ShiftModifier; ++ if (s & B_CONTROL_KEY) ++ ret |= Qt::AltModifier; ++ if (s & B_COMMAND_KEY) ++ ret |= Qt::ControlModifier; ++ return ret; ++} ++ ++void QtHaikuView::FrameResized(float width, float height) ++{ ++ QSize widgetSize = fWidget->size(); ++ QSize newSize = QSize(width, height); ++ if (widgetSize == newSize) ++ return; ++ fWidgetPrivate->data.fstrut_dirty = true; ++ ++ emit sendUpdateWidget(); ++} ++ ++void ++QtHaikuView::Hide() ++{ ++ if (!isVisible) return; ++ if (Window() && Window()->LockLooper()){ ++ BView::Hide(); ++ isVisible = false; ++ Window()->UnlockLooper(); ++ } ++} ++ ++void ++QtHaikuView::Show() ++{ ++ if (isVisible) return; ++ if (Window() && Window()->LockLooper()){ ++ BView::Show(); ++ isVisible = true; ++ Window()->UnlockLooper(); ++ } ++} ++ ++void ++QtHaikuWindow::Hide() ++{ ++ if (LockLooper()){ ++ if (!IsHidden()) ++ BWindow::Hide(); ++ UnlockLooper(); ++ } ++} ++ ++void ++QtHaikuWindow::Show() ++{ ++ if (LockLooper()){ ++ if (IsHidden()) ++ BWindow::Show(); ++ UnlockLooper(); ++ } ++} ++ ++ ++QtHaikuView::~QtHaikuView() ++{ ++// debugprint(5, "Reimplemented: QtHaikuView::~QtHaikuView\n"); ++} ++ ++inline void QtHaikuView::setWidget(QWidget *widget, QWidgetPrivate *widgetPrivate) ++{ ++ fWidget = widget; ++ fWidgetPrivate = widgetPrivate; ++} ++ ++void QtHaikuView::MouseUp(BPoint point) ++{ ++ BPoint point2; ++ uint32 h_mod=modifiers(); ++ uint32 h_buttons = 0; ++ uint32 h_button = last_down_buttons; ++ last_down_buttons = 0; ++ ++ Qt::MouseButton qt_button = translateMouseButton(h_button); ++ Qt::MouseButtons qt_buttons = translateMouseButtons(h_buttons); ++ Qt::KeyboardModifiers qt_mod = translateModifiers(h_mod); ++ ++ BPoint glob_pos = ConvertToScreen(point); ++ haiku_global_mouse_x = glob_pos.x; ++ haiku_global_mouse_y = glob_pos.y; ++ ++ QWidget *widget = fWidget->mouseGrabber(); ++ if(!widget) ++ widget = fWidget; ++ ++ QWidget *wat = QApplication::widgetAt(QPoint(glob_pos.x,glob_pos.y)); ++ ++// qDebug() << "MouseUp " << fWidget << widget << wat; ++ if(wat && wat!=widget) { ++ QPoint lpoint = wat->mapFromGlobal(QPoint(glob_pos.x,glob_pos.y)); ++ if(fWidget->nativeView()->Window()==wat->nativeView()->Window()) { ++ widget = wat; ++ point.x= lpoint.x(); ++ point.y= lpoint.y(); ++ } ++ } ++ ++ if (qt_button == Qt::RightButton) ++ emit sendHaikuEvent(widget, new QContextMenuEvent(QContextMenuEvent::Mouse, ++ QPoint(point.x,point.y), QPoint(haiku_global_mouse_x,haiku_global_mouse_y), qt_mod)); ++ else ++ emit sendHaikuEvent(widget, new QMouseEvent(QEvent::MouseButtonRelease, ++ QPoint(point.x,point.y), qt_button, qt_buttons, qt_mod)); ++} ++ ++void QtHaikuView::MouseDown(BPoint point) ++{ ++ uint32 h_mod=modifiers(); ++ uint32 h_buttons = Window()->CurrentMessage()->FindInt32("buttons"); ++ uint32 h_button = h_buttons; //TODO: only one button in per time ++ ++ Qt::MouseButton qt_button = translateMouseButton(h_button); ++ Qt::MouseButtons qt_buttons = translateMouseButtons(h_buttons); ++ Qt::KeyboardModifiers qt_mod = translateModifiers(h_mod); ++ ++ BPoint glob_pos = ConvertToScreen(point); ++ haiku_global_mouse_x = glob_pos.x; ++ haiku_global_mouse_y = glob_pos.y; ++ ++ SetMouseEventMask(B_POINTER_EVENTS,B_NO_POINTER_HISTORY); ++ ++ QWidget *widget = fWidget->mouseGrabber(); ++ if(!widget) ++ widget = fWidget; ++ ++ QWidget *wat = QApplication::widgetAt(QPoint(glob_pos.x,glob_pos.y)); ++ ++// qDebug() << "MouseDown " << fWidget << widget << wat; ++ if(wat && wat!=widget) { ++ QPoint lpoint = wat->mapFromGlobal(QPoint(glob_pos.x,glob_pos.y)); ++ if(fWidget->nativeView()->Window()==wat->nativeView()->Window()) { ++ widget = wat; ++ point.x= lpoint.x(); ++ point.y= lpoint.y(); ++ } ++ } ++ ++ bigtime_t now=system_time(); ++ ++ bigtime_t double_click_speed; ++ get_click_speed(&double_click_speed); ++ ++ if( now - last_click_time < double_click_speed && ++ last_clicked_buttons == h_buttons && ++ last_mouse_x==glob_pos.x && ++ last_mouse_y==glob_pos.y) { ++ last_clicked_buttons = 0; ++ emit sendHaikuEvent(widget, new QMouseEvent(QEvent::MouseButtonDblClick, ++ QPoint(point.x,point.y), qt_button, qt_buttons, qt_mod)); ++ } else { ++ emit sendHaikuEvent(widget, new QMouseEvent(QEvent::MouseButtonPress, ++ QPoint(point.x,point.y), qt_button, qt_buttons, qt_mod)); ++ } ++// qDebug()<<"MouseDown() "<cursor().handle(); ++ if(curs) ++ SetViewCursor(curs); ++ else ++ SetViewCursor(B_CURSOR_SYSTEM_DEFAULT); ++ } ++ break; ++ case B_EXITED_VIEW: ++ break; ++ } ++ ++ uint32 h_mod=modifiers(); ++ uint32 h_buttons = last_down_buttons; ++ uint32 h_button = h_buttons; //TODO: only one button in per time ++ ++ Qt::MouseButton qt_button = translateMouseButton(h_button); ++ Qt::MouseButtons qt_buttons = translateMouseButtons(h_buttons); ++ Qt::KeyboardModifiers qt_mod = translateModifiers(h_mod); ++ ++ BPoint glob_pos = ConvertToScreen(point); ++ ++ haiku_global_mouse_x = glob_pos.x; ++ haiku_global_mouse_y = glob_pos.y; ++ ++ QWidget *widget = fWidget->mouseGrabber(); ++ if(!widget) ++ widget = fWidget; ++ ++ ++ /*QWidget *wat = QApplication::widgetAt(QPoint(glob_pos.x,glob_pos.y)); ++ ++ if(wat && wat!=widget) { ++ QPoint lpoint = wat->mapFromGlobal(QPoint(glob_pos.x,glob_pos.y)); ++ widget = wat; ++ point.x= lpoint.x(); ++ point.y= lpoint.y(); ++ }*/ ++ ++ emit sendHaikuEvent(widget, new QMouseEvent(QEvent::MouseMove, QPoint(point.x,point.y), Qt::NoButton, qt_buttons, qt_mod)); ++// qDebug()<<"MouseMove()"<what) { ++ default: ++ BView::MessageReceived(msg); ++ break; ++ } ++} ++ ++QtHaikuWindow::QtHaikuWindow(BRect frame, const char *title, window_look look, window_feel feel, uint32 flags) ++ : BWindow(frame, title, look, feel, flags) ++{ ++} ++ ++QtHaikuWindow::~QtHaikuWindow() ++{ ++} ++ ++void ++QtHaikuWindow::sendKeyEvent(QEvent::Type type, BMessage *msg) ++{ ++ int32 key = 0; ++ uint32 code = 0; ++ uint32 mod = modifiers(); ++ extern QTextCodec *qt_input_mapper; // from qapplication_haiku.cpp ++ QChar converted; ++ const char *bytes; ++ QString text; ++ ++ if ( msg ) { ++ if(msg->FindString("bytes", &bytes) == B_OK) { ++ if (qt_input_mapper) ++ text = qt_input_mapper->toUnicode(bytes, strlen(bytes), 0); ++ } ++ if(msg->FindInt32("key", &key) == B_OK) { ++ code = qt_keymapper_private()->translateKeyCode(key); ++ } ++ } ++ ++ if (text.isEmpty()) { ++ text.fromLatin1(bytes); ++ } ++ ++ Qt::KeyboardModifiers qt_mod = fView->translateModifiers(mod); ++ ++ QWidget *widget; ++ widget = QWidget::keyboardGrabber(); ++ if (!widget) { ++ if (QApplicationPrivate::popupWidgets != 0) { ++ widget = QApplication::activePopupWidget()->focusWidget(); ++ if (!widget) { ++ widget = QApplication::activePopupWidget(); ++ } ++ } else { ++ widget = QApplicationPrivate::focus_widget; ++ if (!widget) { ++ widget = fView->fWidget; ++ } ++ } ++ } ++ ++// qDebug() << "KeyEvent: " << code << " (" <sendHaikuEvent(widget, new QKeyEvent(type, code, qt_mod, text, false, text.length())); ++} ++ ++void ++QtHaikuWindow::DispatchMessage(BMessage *msg, BHandler *handler) ++{ ++ switch(msg->what) { ++ case B_UNMAPPED_KEY_DOWN: ++ case B_KEY_DOWN: ++ { ++ sendKeyEvent(QEvent::KeyPress, msg); ++ break; ++ } ++ case B_UNMAPPED_KEY_UP: ++ case B_KEY_UP: ++ { ++ sendKeyEvent(QEvent::KeyRelease, msg); ++ break; ++ } ++ default: ++ break; ++ } ++ BWindow::DispatchMessage(msg, handler); ++} ++ ++void QtHaikuWindow::MessageReceived(BMessage* msg) ++{ ++ switch(msg->what) { ++ case B_MOUSE_WHEEL_CHANGED: ++ { ++ float shift_x=0; ++ float shift_y=0; ++ if(msg->FindFloat("be:wheel_delta_x",&shift_x)!=B_OK) ++ shift_x = 0; ++ if(msg->FindFloat("be:wheel_delta_y",&shift_y)!=B_OK) ++ shift_y = 0; ++ ++ if(shift_x != 0 || shift_y !=0) { ++ BView *view = LastMouseMovedView(); ++ QtHaikuView *widget_view = (QtHaikuView*)view; ++ widget_view->sendWheelEvent(shift_x*120, shift_y*120); ++ } ++ break; ++ } ++ default: ++ BWindow::MessageReceived(msg); ++ break; ++ } ++} ++ ++void QtHaikuWindow::FrameResized(float width, float height) ++{ ++ QRect cr = fView->fWidget->geometry(); ++ ++ QSize widgetSize = fView->fWidget->size(); ++ QSize newSize = QSize(width+1, height+1); ++ if (widgetSize == newSize) ++ return; ++ ++ cr.setSize(newSize); ++ fView->fWidgetPrivate->data.crect = cr; ++ fView->fWidgetPrivate->data.fstrut_dirty = true; ++ emit fView->sendHaikuEvent(fView->fWidget, new QResizeEvent(newSize, widgetSize)); ++} ++ ++void QtHaikuWindow::FrameMoved(BPoint point) ++{ ++ QRect cr = fView->fWidget->geometry(); ++ QPoint oldPos = cr.topLeft(); ++ QPoint newCPos(point.x,point.y); ++ ++ if(oldPos==newCPos) ++ return; ++ ++ while (qApp->activePopupWidget()) ++ qApp->activePopupWidget()->close(); ++ ++ fView->fWidgetPrivate->data.fstrut_dirty = true; ++ ++ cr.moveTopLeft(newCPos); ++ fView->fWidgetPrivate->data.crect = cr; ++ ++ emit fView->sendHaikuEvent(fView->fWidget, new QMoveEvent(newCPos,oldPos)); ++} ++ ++void QtHaikuWindow::WindowActivated(bool active) ++{ ++ if (active) { ++ emit fView->sendSetActiveWindow(fView->fWidget); ++ } else { ++ while (qApp->activePopupWidget()) // App(window) become inactive - we must close all popup ++ qApp->activePopupWidget()->close(); ++ emit fView->sendSetActiveWindow(0); ++ } ++} ++ ++bool QtHaikuWindow::QuitRequested() ++{ ++ emit fView->sendCloseWindow(fView->fWidget); ++ return false; ++} ++ ++inline void QtHaikuWindow::setView(QtHaikuView *view) ++{ ++ fView = view; ++ AddChild(view); ++ ++ fView->MoveTo(0,0); ++ fView->ResizeTo(Bounds().Width(),Bounds().Height()); ++ fView->SetResizingMode(B_FOLLOW_ALL_SIDES); ++} ++ ++void QtHaikuWindow::updateWindowFlags(Qt::WindowFlags flags) ++{ ++ Qt::WindowType type = static_cast(int(flags & Qt::WindowType_Mask)) ; ++ ++ bool popup = (type == Qt::Popup); ++ bool splash = (type == Qt::SplashScreen); ++ bool dialog = (type == Qt::Dialog ++ || type == Qt::Sheet ++ || (flags & Qt::MSWindowsFixedSizeDialogHint)); ++// bool desktop = (type == Qt::Desktop); ++ bool tool = (type == Qt::Tool || type == Qt::Drawer); ++ bool tooltip = (type == Qt::ToolTip); ++ ++ window_look wlook = B_TITLED_WINDOW_LOOK; ++ window_feel wfeel = B_NORMAL_WINDOW_FEEL; ++ uint32 wflag = B_NO_WORKSPACE_ACTIVATION | B_NOT_ANCHORED_ON_ACTIVATE ; ++ ++ if(tool) { ++ wlook = B_FLOATING_WINDOW_LOOK; ++ wflag |= B_WILL_ACCEPT_FIRST_CLICK; ++ } ++ ++ if(splash) { ++ wlook = B_NO_BORDER_WINDOW_LOOK; ++ } ++ ++ if(popup) { ++ wlook = B_NO_BORDER_WINDOW_LOOK; ++ wflag |= B_WILL_ACCEPT_FIRST_CLICK|B_AVOID_FRONT|B_AVOID_FOCUS; ++ flags |= Qt::WindowStaysOnTopHint; ++ } ++ ++ if (dialog) { ++// if (q->parentWidget()) ++// wfeel = B_MODAL_SUBSET_WINDOW_FEEL; ++// else ++ //wfeel = B_MODAL_APP_WINDOW_FEEL; ++ } ++ ++ if (tooltip) { ++ wlook = B_NO_BORDER_WINDOW_LOOK; ++ wflag |= B_WILL_ACCEPT_FIRST_CLICK|B_AVOID_FOCUS; ++ flags |= Qt::WindowStaysOnTopHint; ++ } ++ ++ if (flags & Qt::FramelessWindowHint) ++ wlook = B_NO_BORDER_WINDOW_LOOK; ++ if (flags & Qt::MSWindowsFixedSizeDialogHint)// (dialog) ++ wflag |= B_NOT_RESIZABLE | B_NOT_ZOOMABLE; ++ ++ if (flags & Qt::CustomizeWindowHint){ ++ //if (flags & Qt::WindowTitleHint) ++ //{ }; ++ //if (flags & Qt::WindowSystemMenuHint) ++ //{ }; ++ if (!(flags & Qt::WindowMinimizeButtonHint)) ++ wflag |= B_NOT_MINIMIZABLE; ++ if (!(flags & Qt::WindowMaximizeButtonHint)) ++ wflag |= B_NOT_ZOOMABLE; ++ if (!(flags & Qt::WindowCloseButtonHint)) ++ wflag |= B_NOT_CLOSABLE; ++ //if (flags & Qt::WindowContextHelpButtonHint) ++ // exsty |= WS_EX_CONTEXTHELP; ++ } ++ ++ if (flags & Qt::WindowStaysOnTopHint) ++ wfeel = B_FLOATING_ALL_WINDOW_FEEL; ++ ++// if (flags & Qt::WindowStaysOnBottomHint) ++// wfeel = B_FLOATING_ALL_WINDOW_FEEL; ++ ++ SetLook(wlook); ++ SetFeel(wfeel); ++ SetFlags(wflag); ++} ++ ++// Qt reimplementation ++ ++void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyOldWindow) ++{ ++ Q_Q(QWidget); ++// qDebug()<<"create_sys:"<windowType() == Qt::Desktop); ++ ++ BScreen bscreen(B_MAIN_SCREEN_ID); ++ BRect screen_frame = bscreen.Frame(); ++ ++ if (!window) // always initialize ++ initializeWindow = true; ++ ++ q->setAttribute(Qt::WA_WState_Created, false); ++ ++ if (desktop){ ++ } ++ ++ if (window) { // override the old window ++ if (destroyOldWindow) ++ destroyw = data.winid; ++ id = window; ++ nativeView = (QtHaikuView *)window; ++ ((QtHaikuWindow *)(window->Window()))->updateWindowFlags(data.window_flags); ++ } ++ else ++ if (desktop) { // desktop widget ++ if (!q->testAttribute(Qt::WA_DontShowOnScreen)) { ++ //popup = false; // force this flags off ++ data.crect.setRect(screen_frame.left,screen_frame.top,screen_frame.right,screen_frame.bottom); ++ } ++// id = GetDesktopWindow(); ++// setWinId(id); ++ } ++ else ++ { ++ if (topLevel) { // create top-level widget ++ int x=data.crect.left(), ++ y=data.crect.top(), ++ w=data.crect.width(), ++ h=data.crect.height(); ++ ++ const bool wasMoved = q->testAttribute(Qt::WA_Moved); ++ const bool wasResized = q->testAttribute(Qt::WA_Resized); ++ ++ if(!wasResized) { ++ w = screen_frame.right / 2; ++ h = (4 * screen_frame.bottom) / 10; ++ data.crect.setSize(QSize(w, h)); ++ } ++ ++ if(!wasMoved) { ++ srand(time(0)); ++ int dx = (screen_frame.right - w)/4; ++ int dy = (screen_frame.bottom - h)/4; ++ x = dx==0?0:rand() % dx + (dx/2); ++ y = dy==0?0:rand() % dy + (dy/2); ++ data.crect.moveTo(x,y); ++ } ++ ++ QString title = q->windowTitle(); ++ if (title.isEmpty()) ++ title = QFileInfo(QApplication::applicationFilePath()).fileName(); ++ nativeWindow = new QtHaikuWindow(BRect(x,y,x+w-1,y+h-1), title.toUtf8(), B_NO_BORDER_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, 0); ++ nativeWindow->updateWindowFlags(data.window_flags); ++ nativeView = new QtHaikuView(BRect(0,0,w,h), "RootView", B_FOLLOW_ALL_SIDES, B_WILL_DRAW); ++ nativeWindow->setView(nativeView); ++ } else { ++ nativeView = new QtHaikuView(BRect(data.crect.x(),data.crect.y(),data.crect.x()+data.crect.width(),data.crect.y()+data.crect.height()), ++ "WidgetView", B_FOLLOW_NONE, B_WILL_DRAW/* | B_NAVIGABLE*/); ++ q->parentWidget()->d_func()->nativeView->AddChild(nativeView); ++ nativeWindow = q->parentWidget()->d_func()->nativeWindow; ++ } ++ ++ nativeView->setWidget(q, this); ++ if (nativeView->LockLooper()){ ++ nativeView->SetViewColor(B_TRANSPARENT_32_BIT); ++ nativeView->UnlockLooper(); ++ } ++ if (q->isWindow()) { }//nativeWindow->Hide(); // BWindow created hidden (?) ++ else ++ nativeView->Hide(); ++ } ++ ++ setWinId(nativeView); ++ ++ if (desktop) { ++ q->setAttribute(Qt::WA_WState_Visible); ++ } else if (topLevel && !q->testAttribute(Qt::WA_DontShowOnScreen)) { ++/* RECT cr; ++ GetClientRect(id, &cr); ++ // one cannot trust cr.left and cr.top, use a correction POINT instead ++ POINT pt; ++ pt.x = 0; ++ pt.y = 0; ++ ClientToScreen(id, &pt); ++ ++ if (data.crect.width() == 0 || data.crect.height() == 0) { ++ data.crect = QRect(pt.x, pt.y, data.crect.width(), data.crect.height()); ++ } else { ++ data.crect = QRect(QPoint(pt.x, pt.y), ++ QPoint(pt.x + cr.right - 1, pt.y + cr.bottom - 1)); ++ } ++ ++ if (data.fstrut_dirty) { ++ // be nice to activeqt ++ updateFrameStrut(); ++ }*/ ++ } ++ ++ ++ q->setAttribute(Qt::WA_WState_Created); // accept move/resize events ++ q->setAttribute(Qt::WA_WState_Visible, false); ++ ++ if (window) { // got window from outside ++// if (IsWindowVisible(window)) ++// q->setAttribute(Qt::WA_WState_Visible); ++// else ++// q->setAttribute(Qt::WA_WState_Visible, false); ++ } ++ ++ if (extra && !extra->mask.isEmpty()) ++ setMask_sys(extra->mask); ++ ++ if (q->hasFocus() && q->testAttribute(Qt::WA_InputMethodEnabled)) { ++ q->setFocus(); ++ } ++ ++ //if (destroyw) { ++ //BWindow *win = destroyw->Window(); ++ //if(win->Lock()) { ++ // win->Quit(); ++ // win->Unlock(); ++ //} ++ //} ++ ++// if (q != qt_tablet_widget && QWidgetPrivate::mapper) ++// qt_tablet_init(); ++ ++ if (q->testAttribute(Qt::WA_DropSiteRegistered)) ++ registerDropSite(true); ++ ++// if (maybeTopData() && maybeTopData()->opacity != 255) ++// q->setWindowOpacity(maybeTopData()->opacity/255.); ++ ++ if (topLevel && (data.crect.width() == 0 || data.crect.height() == 0)) { ++ q->setAttribute(Qt::WA_OutsideWSRange, true); ++ } ++ ++ if (!topLevel && q->testAttribute(Qt::WA_NativeWindow) && q->testAttribute(Qt::WA_Mapped)) { ++ nativeView->Window()->Show(); ++ } ++ ++// qDebug() << "=< QWidgetPrivate::create_sys(); QWidget = "<< q ; ++} ++ ++void QWidgetPrivate::hide_sys() ++{ ++ Q_Q(QWidget); ++ deactivateWidgetCleanup(); ++ Q_ASSERT(q->testAttribute(Qt::WA_WState_Created)); ++ ++ if (q->isWindow()) ++ nativeWindow->Hide(); ++ else ++ nativeView->Hide(); ++ q->setAttribute(Qt::WA_Mapped, false); ++} ++ ++void QWidgetPrivate::show_sys() ++{ ++ Q_Q(QWidget); ++ Q_ASSERT(q->testAttribute(Qt::WA_WState_Created)); ++ ++ if (q->testAttribute(Qt::WA_OutsideWSRange)){ ++ qDebug("Qt::WA_OutsideWSRange"); ++ return; ++ } ++ ++ if (q->testAttribute(Qt::WA_DontShowOnScreen)) { ++ qDebug("Qt::WA_DontShowOnScreen"); ++ invalidateBuffer(q->rect()); ++ return; ++ } ++ ++ //hack for native resize holder for window ++ if(q->inherits("QSizeGrip")) { ++ nativeView->Window()->SetLook(B_DOCUMENT_WINDOW_LOOK); ++ q->setAttribute(Qt::WA_WState_Visible, false); ++ return; ++ } ++ ++ if (q->isWindow()) { ++ if (q->isMinimized()) { ++ // ### TODO: Should handle ++ } else if (q->isMaximized()) { ++ // ### TODO: Should handle ++ } ++ } ++ if (q->testAttribute(Qt::WA_ShowWithoutActivating) ++ || (q->windowType() == Qt::Popup) ++ || (q->windowType() == Qt::ToolTip) ++ || (q->windowType() == Qt::Tool)) { ++ // ### TODO: Should Handle ++ } ++ ++// if (data.fstrut_dirty) ++// updateFrameStrut(); ++ if (q->isWindow()) ++ nativeWindow->Show(); ++ else ++ nativeView->Show(); ++ ++ q->setAttribute(Qt::WA_Mapped); ++ ++ invalidateBuffer(q->rect()); ++} ++ ++void QWidgetPrivate::setParent_sys(QWidget* parent, Qt::WindowFlags f) ++{ ++ Q_Q(QWidget); ++ ++ bool wasCreated = q->testAttribute(Qt::WA_WState_Created); ++ if (q->isVisible() && q->parentWidget() && parent != q->parentWidget()) ++ q->parentWidget()->d_func()->invalidateBuffer(q->geometry()); ++ ++ WId old_winid = data.winid; ++ bool old_w = q->isWindow(); ++ bool widgetTypeChanged = false; ++ ++ if (wasCreated && q->isVisible()) { ++ if (q->isWindow()) ++ nativeWindow->Hide(); ++ else ++ nativeView->Hide(); ++ } ++ ++ bool dropSiteWasRegistered = false; ++ if (q->testAttribute(Qt::WA_DropSiteRegistered)) { ++ dropSiteWasRegistered = true; ++ q->setAttribute(Qt::WA_DropSiteRegistered, false); // ole dnd unregister (we will register again below) ++ } ++ ++ if ((q->windowType() == Qt::Desktop)) ++ old_winid = 0; ++ ++ QObjectPrivate::setParent_helper(parent); ++ ++ bool explicitlyHidden = q->testAttribute(Qt::WA_WState_Hidden) && q->testAttribute(Qt::WA_WState_ExplicitShowHide); ++ ++ data.window_flags = f; ++ data.fstrut_dirty = true; ++ q->setAttribute(Qt::WA_WState_Created, false); ++ q->setAttribute(Qt::WA_WState_Visible, false); ++ q->setAttribute(Qt::WA_WState_Hidden, false); ++ adjustFlags(data.window_flags, q); ++ widgetTypeChanged = old_w != q->isWindow(); // widget type changed (widget<->window) ++ ++ if (wasCreated){ ++ if (parent && !parent->testAttribute(Qt::WA_WState_Created)) ++ parent->createWinId(); ++ ++ if (widgetTypeChanged){ ++ ++ BWindow *win = nativeView->Window(); ++ if (win && win->LockLooper()){ ++ nativeView->RemoveSelf(); ++ if (old_w) ++ win->Quit(); ++ else ++ win->UnlockLooper(); ++ } ++ ++ if (old_w){ //was Window, become Widget(non-Window) ++ bool wasLocked = parent->nativeView()->Looper()->IsLocked(); ++ if (wasLocked || parent->nativeView()->LockLooper() ) ++ { ++ parent->nativeView()->AddChild(nativeView); ++ nativeView->Hide(); ++ ++ nativeView->SetResizingMode(B_FOLLOW_NONE); ++ nativeView->MoveTo(data.crect.x(),data.crect.y()); ++ nativeView->ResizeTo(data.crect.x()+data.crect.width(),data.crect.y()+data.crect.height()); ++ if (!wasLocked) ++ parent->nativeView()->UnlockLooper(); ++ } ++ nativeWindow = (QtHaikuWindow *)parent->nativeView()->Window(); ++ ++ q->setAttribute(Qt::WA_WState_Created, true); ++ } ++ else{// become Window (topLevel) ++ createWinId(); ++ ++ nativeView->RemoveSelf(); //Delete new view created in create_sys. We need only BWindow ++ delete nativeView; ++ ++ nativeView = (QtHaikuView *)old_winid; ++ nativeWindow->setView(nativeView); ++ ++ nativeView->Show(); ++ setWinId(nativeView); ++ } ++ } ++ else // widgetTypeChanged == false ++ { ++ if (q->isWindow()) ++ nativeWindow->updateWindowFlags(data.window_flags); ++ else{//already created widget change parent widget from one to another ++ BWindow *win = nativeView->Window(); ++ if (win && win->LockLooper()){ ++ nativeView->RemoveSelf(); ++ win->UnlockLooper(); ++ } ++ ++ if (parent->nativeView()->LockLooper()){ ++ parent->nativeView()->AddChild(nativeView); ++ parent->nativeView()->UnlockLooper(); ++ nativeWindow = (QtHaikuWindow *)parent->nativeView()->Window(); ++ } ++ } ++ q->setAttribute(Qt::WA_WState_Created, true); ++ } ++ } ++ else ++ if (!q->isWindow() && parent->testAttribute(Qt::WA_WState_Created)) ++ createWinId(); ++ ++ if (q->isWindow() || (!parent || parent->isVisible()) || explicitlyHidden) ++ q->setAttribute(Qt::WA_WState_Hidden); ++ q->setAttribute(Qt::WA_WState_ExplicitShowHide, explicitlyHidden); ++ ++ if (extra && !extra->mask.isEmpty()) { ++ QRegion r = extra->mask; ++ extra->mask = QRegion(); ++ q->setMask(r); ++ } ++ if (extra && extra->topextra && !extra->topextra->caption.isEmpty()) { ++ //setWindowIcon_sys(true); ++ setWindowTitle_helper(extra->topextra->caption); ++ } ++ ++ if (q->testAttribute(Qt::WA_AcceptDrops) || dropSiteWasRegistered ++ || (!q->isWindow() && q->parentWidget() && q->parentWidget()->testAttribute(Qt::WA_DropSiteRegistered))) ++ q->setAttribute(Qt::WA_DropSiteRegistered, true); ++ ++ invalidateBuffer(q->rect()); ++} ++ ++void QWidgetPrivate::raise_sys() ++{ ++// Q_Q(QWidget); ++// qDebug() << "Unimplemented: QWidgetPrivate::raise_sys() "<< q ; ++} ++ ++void QWidgetPrivate::lower_sys() ++{ ++// Q_Q(QWidget); ++// qDebug() << "Unimplemented: QWidgetPrivate::lower_sys() "<< q ; ++} ++ ++void QWidgetPrivate::stackUnder_sys(QWidget* widget) ++{ ++// Q_Q(QWidget); ++// qDebug() << "Unimplemented: QWidgetPrivate::stackUnder_sys() "<< q << " top:"<isWindow() && nativeWindow) ++ nativeWindow->SetTitle(title.toUtf8()); ++} ++ ++void QWidgetPrivate::updateSystemBackground() ++{ ++// Q_Q(QWidget); ++// qDebug() << "Unimplemented: QWidgetPrivate::UpdateSystemBackground() "<< q ; ++} ++ ++void QWidgetPrivate::setModal_sys() ++{ ++ Q_Q(QWidget); ++// qDebug() << "Unimplemented: QWidgetPrivate::setModal_sys() "<< q ; ++} ++ ++void QWidgetPrivate::setConstraints_sys() ++{ ++ Q_Q(QWidget); ++// qDebug() << "QWidgetPrivate::setConstraints_sys() "<< q ; ++ if (!q->isWindow() || !q->testAttribute(Qt::WA_WState_Created) || !extra) ++ return; ++ float minw = 0, minh = 0; ++ float maxw = 10000, maxh = 10000; ++ if (extra->minw > 0 || extra->minh > 0) { ++ // add minimum size hints ++ minw = qMin(10000, extra->minw); ++ minh = qMin(10000, extra->minh); ++ } ++ if (extra->maxw < QWIDGETSIZE_MAX || extra->maxh < QWIDGETSIZE_MAX) { ++ // add maximum size hints ++ maxw = qMin(10000, extra->maxw); ++ maxh = qMin(10000, extra->maxh); ++ } ++ nativeWindow->SetSizeLimits(minw,maxw,minh,maxh); ++} ++ ++void QWidgetPrivate::setCursor_sys(const QCursor& cursor) ++{ ++ Q_UNUSED(cursor); ++} ++ ++void QWidgetPrivate::unsetCursor_sys() ++{ ++} ++ ++void QWidgetPrivate::setWSGeometry(bool dontShow, const QRect &) ++{ ++ Q_UNUSED(dontShow); ++ Q_Q(QWidget); ++// qDebug() << "Unimplemented: QWidgetPrivate::setWSGeomerty() "<< q ; ++} ++ ++void QWidgetPrivate::setGeometry_sys(int x,int y,int w,int h,bool isMove) ++{ ++ Q_Q(QWidget); ++// qDebug()<<"setGeometry_sys() "<isWindow()) ++ { ++ nativeFrame = nativeView->Window()->Frame(); ++ } ++ else ++ { ++ if(nativeView->LockLooper()) { ++ nativeFrame = nativeView->Frame(); ++ nativeView->UnlockLooper(); ++ } ++ } ++ ++ QPoint oldPos(nativeFrame.left, nativeFrame.top); ++ QPoint newPos(x,y); ++ QSize oldSize(nativeFrame.IntegerWidth(), nativeFrame.IntegerHeight()); ++ QSize newSize(w,h); ++ ++ isMove = oldPos != newPos; ++ bool isResize = oldSize != newSize; ++ ++ if (!isResize && !isMove) ++ return; ++ ++ data.crect.setRect(x, y, w, h); ++ ++ QTLWExtra *tlwExtra = q->window()->d_func()->maybeTopData(); ++ const bool inTopLevelResize = tlwExtra ? tlwExtra->inTopLevelResize : false; ++ ++ if (q->isWindow()){ ++ if (w == 0 || h == 0) { ++ q->setAttribute(Qt::WA_OutsideWSRange, true); ++ if (q->isVisible() && q->testAttribute(Qt::WA_Mapped)) ++ hide_sys(); ++ } else if (q->isVisible() && q->testAttribute(Qt::WA_OutsideWSRange)) { ++ q->setAttribute(Qt::WA_OutsideWSRange, false); ++ ++ // put the window in its place and show it ++ if (data.winid){ ++ nativeView->Window()->MoveTo(x, y); ++ nativeView->Window()->ResizeTo(w-1, h-1); ++ } ++ setConstraints_sys();//do_size_hints(q, extra); ++ show_sys(); ++ } else { ++ if (isMove){ ++ nativeView->Window()->MoveTo(x, y); ++ } ++ if (isResize){ ++ nativeView->Window()->ResizeTo(w-1, h-1); ++ } ++ } ++ updateFrameStrut(); ++ } else { //not Window ++ if (isResize) { ++ if(nativeView->LockLooper()) { ++ nativeView->ResizeTo(w, h); ++ nativeView->UnlockLooper(); ++ } ++ } ++ if (isMove) ++ { ++ if(nativeView->LockLooper()) { ++ nativeView->MoveTo(x, y); ++ nativeView->UnlockLooper(); ++ } ++ } ++ } ++ ++ if (q->isWindow() && q->isVisible() && isResize && !inTopLevelResize) { ++ invalidateBuffer(q->rect()); //after the resize ++ } ++ ++ if (q->isVisible()) { ++ if (isMove && q->pos() != oldPos) { ++ QMoveEvent e(q->pos(), oldPos); ++ QApplication::sendEvent(q, &e); ++ } ++ if (isResize) { ++// static bool slowResize = qgetenv("QT_SLOW_TOPLEVEL_RESIZE").toInt(); ++ // If we have a backing store with static contents, we have to disable the top-level ++ // resize optimization in order to get invalidated regions for resized widgets. ++ // The optimization discards all invalidateBuffer() calls since we're going to ++ // repaint everything anyways, but that's not the case with static contents. ++// const bool setTopLevelResize = !slowResize && q->isWindow() && extra && extra->topextra ++// && !extra->topextra->inTopLevelResize ++// && (!extra->topextra->backingStore ++// || !extra->topextra->backingStore->hasStaticContents()); ++// if (setTopLevelResize) ++// extra->topextra->inTopLevelResize = true; ++ QResizeEvent e(q->size(), oldSize); ++ QApplication::sendEvent(q, &e); ++// if (setTopLevelResize) ++ // extra->topextra->inTopLevelResize = false; ++ } ++ } else { ++ if (isMove && q->pos() != oldPos) ++ q->setAttribute(Qt::WA_PendingMoveEvent, true); ++ if (isResize) ++ q->setAttribute(Qt::WA_PendingResizeEvent, true); ++ } ++} ++ ++void QWidgetPrivate::registerDropSite(bool) ++{ ++ //debugprint(1, "Unimplemented: QWidgetPrivate::registerDropSite\n"); ++} ++ ++void QWidgetPrivate::setWindowOpacity_sys(qreal) ++{ ++ //debugprint(1, "Unimplemented: QWidgetPrivate::setWindowOpacity_sys \n"); ++} ++/* ++void QWidgetPrivate::createTLExtra() ++{ ++// fprintf(stderr, "Unimplemented: QWidgetPrivate::createTLExtra\n"); ++} ++*/ ++void QWidgetPrivate::deleteSysExtra() ++{ ++// debugprint(1, "Unimplemented: QWidgetPrivate::deleteSysExtra\n"); ++} ++ ++void QWidgetPrivate::deleteTLSysExtra() ++{ ++ //debugprint(1, "Unimplemented: QWidgetPrivate::deleteTLSysExtra\n"); ++} ++ ++void QWidgetPrivate::createSysExtra() ++{ ++// debugprint(1, "Unimplemented: QWidgetPrivate::createSysExtra\n"); ++} ++ ++void QWidgetPrivate::createTLSysExtra() ++{ ++// debugprint(1, "Unimplemented: QWidgetPrivate::createTLSysExtra\n"); ++} ++ ++void QWidgetPrivate::setWindowIconText_sys(const QString&) ++{ ++// debugprint(1, "Unimplemented: QWidgetPrivate::setWindowIconText_sys \n"); ++} ++ ++void QWidgetPrivate::scroll_sys(int,int, const QRect& r) ++{ ++// debugprint(1, "Reimplemented: QWidgetPrivate::scroll(int,int,const QRect&\n"); ++ Q_Q(QWidget); ++ q->update(r); ++} ++ ++void QWidgetPrivate::scroll_sys(int, int) ++{ ++// debugprint(1, "Reimplemented: QWidgetPrivate::scroll(int,int)\n"); ++ Q_Q(QWidget); ++ q->update(); ++} ++ ++void QWidgetPrivate::updateFrameStrut() ++{ ++// debugprint(5, "Reimplemented: QWidgetPrivate::updateFrameStrut\n"); ++ QTLWExtra* top = this->topData(); ++ if(nativeView->LockLooper()) { ++ BRect frame = nativeView->Bounds(); ++ top->frameStrut.setCoords(frame.left, frame.top, frame.right, frame.bottom); ++ nativeView->UnlockLooper(); ++ } ++ data.fstrut_dirty = false; ++} ++ ++void QWidgetPrivate::setFocus_sys() ++{ ++} ++ ++QWindowSurface *QWidgetPrivate::createDefaultWindowSurface_sys() ++{ ++ Q_Q(QWidget); ++ return new QRasterWindowSurface(q); ++} ++ ++void QWidgetPrivate::setMask_sys(const QRegion ®ion) ++{ ++ Q_UNUSED(region); ++// debugprint(1, "Unimplemented: QWidgetPrivate::setMask_sys()\n"); ++} ++ ++int QWidget::metric(PaintDeviceMetric m) const ++{ ++//qDebug() << "QWidget::metric("<< m <<")"; ++ int val = 0; ++ if (m == PdmWidth) { ++ val = data->crect.width(); ++ } else if (m == PdmHeight) { ++ val = data->crect.height(); ++ } else { ++ switch (m) { ++ case PdmDpiX: ++ case PdmPhysicalDpiX: ++ case PdmDpiY: ++ case PdmPhysicalDpiY: ++ val = 72; ++ break; ++ case PdmWidthMM: ++ case PdmHeightMM: ++ case PdmNumColors: ++ case PdmDepth: ++// qWarning("QWidget::metric Unknown metric type requested\n"); ++ break; ++ default: ++ val = 0; ++ qWarning("QWidget::metric: Invalid metric command"); ++ } ++ } ++ ++ return val; ++} ++ ++QPaintEngine *QWidget::paintEngine() const ++{ ++ return 0; ++} ++ ++QPoint QWidget::mapToGlobal(const QPoint &pos) const ++{ ++ //Q_D(QWidget); ++// qDebug()<<"QWidget::mapToGlobal() pos:"<crect.topLeft(); ++ //cannot trust that !isWindow() implies parentWidget() before create ++ return (isWindow() || !parentWidget()) ? p : parentWidget()->mapToGlobal(p); ++ } ++ ++ if (nativeView()->LockLooper()) ++ { ++ BPoint p = nativeView()->ConvertToScreen(BPoint(pos.x(),pos.y())); ++ nativeView()->UnlockLooper(); ++ return QPoint(p.x,p.y); ++ } ++ return QPoint(); // ??? ++} ++ ++QPoint QWidget::mapFromGlobal(const QPoint &pos) const ++{ ++// qDebug()<<"QWidget::mapFromGlobal() pos:"<mapFromGlobal(pos); ++ return p - data->crect.topLeft(); ++ } ++ ++ if (nativeView()->LockLooper()) ++ { ++ BPoint p = nativeView()->ConvertFromScreen(BPoint(pos.x(),pos.y())); ++ nativeView()->UnlockLooper(); ++ return QPoint(p.x,p.y); ++ } ++ return QPoint(); // ??? ++} ++ ++void QWidget::activateWindow() ++{ ++ Q_D(QWidget); ++ if (isWindow()) { ++ d->nativeView->Window()->Activate(); ++ } ++} ++ ++void QWidget::setWindowState(Qt::WindowStates newstate) ++{ ++// qDebug() << "QWidgetPrivate::setWindowState() "<< this<<" "<topData()->normalGeometry = geometry(); ++ if (isVisible() && !(newstate & Qt::WindowMinimized)) { ++//TODO: Qt::WindowMaximized not supported yet. ++ d->nativeView->Window()->Show(); ++ ++ if (!(newstate & Qt::WindowFullScreen)) { ++ QRect r = d->topData()->normalGeometry; ++ if (!(newstate & Qt::WindowMaximized) && r.width() >= 0) { ++ if (pos() != r.topLeft() || size() !=r.size()) { ++ d->topData()->normalGeometry = QRect(0,0,-1,-1); ++ setGeometry(r); ++ } ++ } ++ } else { ++ d->updateFrameStrut(); ++ } ++ } ++ } ++ ++ // Qt::WindowFullScreen ++ if ((oldstate & Qt::WindowFullScreen) != (newstate & Qt::WindowFullScreen)) { ++ if (newstate & Qt::WindowFullScreen) { // save current window flags and geometry and go to FullScreen ++ if (d->topData()->normalGeometry.width() < 0 && !(oldstate & Qt::WindowMaximized)) ++ d->topData()->normalGeometry = geometry(); ++ d->topData()->savedFlags = d->data.window_flags; ++ ++ ++ d->data.window_flags |= Qt::SplashScreen; ++ d->nativeWindow->updateWindowFlags(d->data.window_flags); ++ ++ QRect r = qApp->desktop()->screenGeometry(this); ++ d->nativeView->Window()->Zoom(BPoint(r.left(),r.top()),r.width(),r.height()); ++ d->updateFrameStrut(); ++ } ++ else { //back from FullScreen (to saved flags and geomerty) ++ d->data.window_flags = d->topData()->savedFlags; ++ d->nativeWindow->updateWindowFlags(d->data.window_flags); ++ ++ if (!(newstate & Qt::WindowMaximized)) { ++ QRect r = d->topData()->normalGeometry; ++ d->topData()->normalGeometry = QRect(0,0,-1,-1); ++ if (r.isValid()) ++ setGeometry(r); ++ } ++ d->updateFrameStrut(); ++ } ++ } ++ } ++ ++ //Qt::WindowMinimized ++ if ((oldstate & Qt::WindowMinimized) != (newstate & Qt::WindowMinimized)) { ++ if (isVisible()) ++//TODO: Qt::WindowMinimized state changed... ++ d->nativeView->Window()->Minimize((newstate & Qt::WindowMinimized) ? true : ++ (newstate & Qt::WindowMaximized) ? false : false); ++ } ++ ++ data->window_state = newstate; ++ QWindowStateChangeEvent e(oldstate); ++ QApplication::sendEvent(this, &e); ++} ++ ++void QWidget::grabMouse() ++{ ++ if (mouseGrb) ++ mouseGrb->releaseMouse(); ++ mouseGrb = this; ++} ++ ++void QWidget::grabMouse(const QCursor &cursor) ++{ ++ Q_UNUSED(cursor); ++ if (mouseGrb) ++ mouseGrb->releaseMouse(); ++ mouseGrb = this; ++} ++ ++void QWidget::releaseMouse() ++{ ++ if(mouseGrb == this) { ++ mouseGrb = 0; ++ } ++} ++ ++QWidget *QWidget::mouseGrabber() ++{ ++ return mouseGrb; ++} ++ ++void QWidget::grabKeyboard() ++{ ++ if (keyboardGrb) ++ keyboardGrb->releaseKeyboard(); ++ keyboardGrb = this; ++} ++ ++void QWidget::releaseKeyboard() ++{ ++ if (keyboardGrb == this) { ++ keyboardGrb = 0; ++ } ++} ++ ++QWidget *QWidget::keyboardGrabber() ++{ ++ return keyboardGrb; ++} ++ ++void QWidget::destroy(bool destroyWindow, bool destroySubWindows) ++{ ++ Q_D(QWidget); ++// qDebug() << "Reimplemented: QWidgetPrivate::destroy() "<< this ; ++ if (!isWindow() && parentWidget()) ++ parentWidget()->d_func()->invalidateBuffer(geometry()); ++ d->deactivateWidgetCleanup(); ++ if (testAttribute(Qt::WA_WState_Created)) { ++ setAttribute(Qt::WA_WState_Created, false); ++ QObjectList childList = children(); ++ for (int i = 0; i < childList.size(); ++i) { // destroy all widget children ++ register QObject *obj = childList.at(i); ++ if (obj->isWidgetType()) ++ static_cast(obj)->destroy(destroySubWindows, ++ destroySubWindows); ++ } ++ ++ if (mouseGrb == this) ++ releaseMouse(); ++ ++ if (keyboardGrb == this) ++ releaseKeyboard(); ++ ++// if (testAttribute(Qt::WA_ShowModal)) // just be sure we leave modal ++// QApplicationPrivate::leaveModal(this); ++// else ++ if ((windowType() == Qt::Popup)) ++ qApp->d_func()->closePopup(this); ++ ++ if (isWindow()) { ++ if ((windowType() != Qt::Desktop) && destroyWindow){ ++ BWindow *win = d->nativeView->Window(); ++ ++ if (win->LockLooper()){ ++ for (int i =0;i<=win->CountChildren()-1;i++){ ++ BView *w = win->ChildAt(i); ++ w->RemoveSelf(); ++ delete w; ++ } ++ win->Quit(); ++ } ++ } ++ } else { ++ BWindow *win =d->nativeView->Window(); ++ bool wasLocked = win->Looper()->IsLocked(); ++ if (win && (wasLocked || win->LockLooper()) ){ ++ d->nativeView->RemoveSelf(); ++ if (!wasLocked) ++ win->UnlockLooper(); ++ } ++ delete d->nativeView; ++ } ++ ++ d->nativeView = NULL; ++ d->nativeWindow = NULL; ++ d->setWinId(0); ++ } ++} ++ ++BView* QWidget::nativeView() const ++{ ++ Q_D(const QWidget); ++ return d->nativeView; ++} +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qwidget_haiku.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qwidget_haiku.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qwidget_haiku.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qwidget_haiku.h 2011-06-13 22:06:43.334495744 +0000 +@@ -0,0 +1,105 @@ ++#ifndef QWIDGET_HAIKU_H ++#define QWIDGET_HAIKU_H ++ ++#include ++#include ++#include ++#include "qevent.h" ++ ++#include "qwidget.h" ++//#include "qwidget_p.h" ++//#include "qtextcodec.h" ++ ++//#include ++//#include "qevent_p.h" ++//#include "private/qwindowsurface_raster_p.h" ++//#include "qapplication.h" ++//#include "qfileinfo.h" ++ ++ ++QT_BEGIN_HEADER ++ ++QT_BEGIN_NAMESPACE ++ ++QT_MODULE(Gui) ++ ++class QWidgetPrivate; ++ ++class QtHaikuView : public QObject, public BView ++{ ++ Q_OBJECT ++ ++public: ++ QtHaikuView(BRect frame, const char *name, uint32 resizingMode, uint32 flags); ++ ~QtHaikuView(); ++ ++ virtual void MessageReceived(BMessage* msg); ++ virtual void FrameResized(float width, float height); ++ virtual void MouseDown(BPoint point); ++ virtual void MouseUp(BPoint point); ++ virtual void MouseMoved(BPoint where, uint32 code, const BMessage *message); ++ virtual void Hide(); ++ virtual void Show(); ++ virtual void Draw(BRect rect); ++ ++ inline void setWidget(QWidget *widget, QWidgetPrivate *widgetPrivate); ++ void sendWheelEvent(int delta_x, int delta_y); ++ ++ Qt::KeyboardModifiers translateModifiers(uint32 s); ++ bool isVisible; ++Q_SIGNALS: ++ void sendHaikuEvent(QObject *receiver, QEvent *event); ++ void sendUpdateWidget(); ++ void sendUpdateWidgetRect(QRect r); ++ void sendResizeWidget(int width, int height); ++ void sendMoveWidget(int x, int y); ++ void sendSetActiveWindow(QWidget *widget); ++ void sendCloseWindow(QWidget *widget); ++ ++private: ++ friend class QtHaikuWindow; ++ Qt::MouseButton translateMouseButton(uint32 s); ++ Qt::MouseButtons translateMouseButtons(uint32 s); ++ ++ QWidget* fWidget; ++ QWidgetPrivate* fWidgetPrivate; ++ ++ int last_down_buttons; ++ int last_clicked_buttons; ++ int last_mouse_x; ++ int last_mouse_y; ++ ++ bigtime_t last_click_time; ++ bigtime_t last_draw_event; ++}; ++ ++class QtHaikuWindow : public BWindow ++{ ++public: ++ QtHaikuWindow(BRect frame, const char *title, window_look look, window_feel feel, uint32 flags); ++ ~QtHaikuWindow(); ++ ++ void FrameResized(float width, float height); ++ void FrameMoved(BPoint point); ++ void MessageReceived(BMessage* msg); ++ virtual void DispatchMessage(BMessage *, BHandler *); ++ virtual void WindowActivated(bool active); ++ virtual bool QuitRequested(); ++ virtual void Hide(); ++ virtual void Show(); ++ ++ inline void setView(QtHaikuView *view); ++ ++ void sendKeyEvent(QEvent::Type type, BMessage *msg); ++ bool isVisible; ++ bool inDestroy; ++ void updateWindowFlags(Qt::WindowFlags f); ++private: ++ QtHaikuView *fView; ++}; ++ ++QT_END_NAMESPACE ++ ++QT_END_HEADER ++ ++#endif +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qwidget_p.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qwidget_p.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qwidget_p.h 2011-03-30 05:19:04.055836672 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qwidget_p.h 2011-06-13 22:06:43.337117184 +0000 +@@ -877,6 +877,9 @@ public: + void s60UpdateIsOpaque(); + void reparentChildren(); + void registerTouchWindow(); ++#elif defined(Q_WS_HAIKU) // <--------------------------------------------------------- HAIKU ++ QtHaikuWindow *nativeWindow; ++ QtHaikuView *nativeView; + #endif + + }; +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qwindowdefs.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qwindowdefs.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qwindowdefs.h 2011-03-30 05:19:04.046923776 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qwindowdefs.h 2011-06-13 22:06:43.338952192 +0000 +@@ -110,6 +110,10 @@ typedef long WId; + #include + #endif // Q_WS_WIN + ++#if defined(Q_WS_HAIKU) ++#include ++#endif ++ + #if defined(Q_WS_X11) + + typedef struct _XDisplay Display; +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qwindowdefs_haiku.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qwindowdefs_haiku.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/kernel/qwindowdefs_haiku.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/kernel/qwindowdefs_haiku.h 2011-06-13 22:06:43.341311488 +0000 +@@ -0,0 +1,72 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ++** Contact: Qt Software Information (qt-info@nokia.com) ++** ++** This file is part of the QtGui module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial Usage ++** Licensees holding valid Qt Commercial licenses may use this file in ++** accordance with the Qt Commercial License Agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Nokia. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain ++** additional rights. These rights are described in the Nokia Qt LGPL ++** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this ++** package. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. ++** ++** If you are unsure which license is appropriate for your use, please ++** contact the sales department at qt-sales@nokia.com. ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#ifndef QWINDOWDEFS_HAIKU_H ++#define QWINDOWDEFS_HAIKU_H ++ ++#include ++ ++QT_BEGIN_HEADER ++ ++QT_BEGIN_NAMESPACE ++ ++QT_MODULE(Gui) ++ ++QT_END_NAMESPACE ++#ifndef BUILD_WEBKIT ++#include ++#include ++#include ++#include ++#include ++#include ++#else ++class BView; ++#endif ++typedef BView *WId; ++ ++QT_BEGIN_NAMESPACE ++//? ++QT_END_NAMESPACE ++ ++QT_END_HEADER ++ ++#endif // QWINDOWDEFS_HAIKU_H +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/painting/painting.pri qt-everywhere-opensource-src-4.7.3_haiku/src/gui/painting/painting.pri +--- qt-everywhere-opensource-src-4.7.3/src/gui/painting/painting.pri 2011-03-30 05:19:07.043515904 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/painting/painting.pri 2011-06-13 22:06:43.343408640 +0000 +@@ -164,7 +164,7 @@ unix:!mac:!symbian { + painting/qprinterinfo_unix.cpp + } + +-win32|x11|mac|embedded|symbian { ++win32|x11|mac|embedded|symbian|haiku { + SOURCES += painting/qbackingstore.cpp + HEADERS += painting/qbackingstore_p.h + } +@@ -248,6 +248,12 @@ symbian { + QMAKE_CXXFLAGS.ARMCC *= -O3 + } + ++haiku { ++ SOURCES += \ ++# painting/qpaintdevice_haiku.cpp \ ++ painting/qcolormap_haiku.cpp ++} ++ + NEON_SOURCES += painting/qdrawhelper_neon.cpp + NEON_HEADERS += painting/qdrawhelper_neon_p.h + NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/painting/qcolormap_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/painting/qcolormap_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/painting/qcolormap_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/painting/qcolormap_haiku.cpp 2011-06-13 22:06:43.345767936 +0000 +@@ -0,0 +1,189 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ++** Contact: Qt Software Information (qt-info@nokia.com) ++** ++** This file is part of the QtGui module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial Usage ++** Licensees holding valid Qt Commercial licenses may use this file in ++** accordance with the Qt Commercial License Agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Nokia. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain ++** additional rights. These rights are described in the Nokia Qt LGPL ++** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this ++** package. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. ++** ++** If you are unsure which license is appropriate for your use, please ++** contact the sales department at qt-sales@nokia.com. ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include "qcolormap.h" ++ ++#include "qapplication.h" ++#include "qdebug.h" ++#include "qdesktopwidget.h" ++#include "qvarlengtharray.h" ++ ++#include ++ ++QT_BEGIN_NAMESPACE ++ ++class QColormapPrivate ++{ ++public: ++ QColormapPrivate() ++ : ref(1), mode(QColormap::Direct), depth(0), ++ defaultColormap(true), ++ defaultVisual(true), ++ r_max(0), g_max(0), b_max(0), ++ r_shift(0), g_shift(0), b_shift(0) ++ {} ++ ++ QAtomicInt ref; ++ ++ QColormap::Mode mode; ++ int depth; ++ ++// Colormap colormap; ++ bool defaultColormap; ++ ++// Visual *visual; ++ bool defaultVisual; ++ ++ int r_max; ++ int g_max; ++ int b_max; ++ ++ uint r_shift; ++ uint g_shift; ++ uint b_shift; ++ ++ QVector colors; ++ QVector pixels; ++}; ++ ++ ++static QColormap **cmaps = 0; ++ ++/*! \internal ++*/ ++void QColormap::initialize() ++{ ++} ++ ++/*! \internal ++*/ ++void QColormap::cleanup() ++{ ++ // Display *display = QX11Info::display(); ++ const int screens = 0;//ScreenCount(display); ++ ++ for (int i = 0; i < screens; ++i) ++ delete cmaps[i]; ++ ++ delete [] cmaps; ++ cmaps = 0; ++} ++ ++QColormap QColormap::instance(int screen) ++{ ++ //if (screen == -1) ++ // screen = QX11Info::appScreen(); ++ QColormap cm; ++ return cm;//*cmaps[screen]; ++} ++ ++/*! \internal ++ Constructs a new colormap. ++*/ ++QColormap::QColormap() ++ : d(new QColormapPrivate) ++{} ++ ++QColormap::QColormap(const QColormap &colormap) ++ :d (colormap.d) ++{ d->ref.ref(); } ++ ++QColormap::~QColormap() ++{ ++ if (!d->ref.deref()) { ++ if (!d->defaultColormap) {} ++// XFreeColormap(QX11Info::display(), d->colormap); ++ delete d; ++ } ++} ++ ++QColormap::Mode QColormap::mode() const ++{ return d->mode; } ++ ++int QColormap::depth() const ++{ return d->depth; } ++ ++int QColormap::size() const ++{ ++ return (d->mode == Gray ++ ? d->r_max ++ : (d->mode == Indexed ++ ? d->r_max * d->g_max * d->b_max ++ : -1)); ++} ++ ++uint QColormap::pixel(const QColor &color) const ++{ ++ const QColor c = color.toRgb(); ++ const uint r = (c.ct.argb.red * d->r_max) >> 16; ++ const uint g = (c.ct.argb.green * d->g_max) >> 16; ++ const uint b = (c.ct.argb.blue * d->b_max) >> 16; ++ if (d->mode != Direct) { ++ if (d->mode == Gray) ++ return d->pixels.at((r * 30 + g * 59 + b * 11) / 100); ++ return d->pixels.at(r * d->g_max * d->b_max + g * d->b_max + b); ++ } ++ return (r << d->r_shift) + (g << d->g_shift) + (b << d->b_shift); ++} ++ ++const QColor QColormap::colorAt(uint pixel) const ++{ ++ if (d->mode != Direct) { ++ Q_ASSERT(pixel <= (uint)d->colors.size()); ++ return d->colors.at(pixel); ++ } ++ ++ //const int r = (((pixel & d->visual->red_mask) >> d->r_shift) << 8) / d->r_max; ++ //const int g = (((pixel & d->visual->green_mask) >> d->g_shift) << 8) / d->g_max; ++ //const int b = (((pixel & d->visual->blue_mask) >> d->b_shift) << 8) / d->b_max; ++ return QColor(0, 0, 0); ++} ++ ++const QVector QColormap::colormap() const ++{ return d->colors; } ++ ++QColormap &QColormap::operator=(const QColormap &colormap) ++{ ++ qAtomicAssign(d, colormap.d); ++ return *this; ++} ++ ++QT_END_NAMESPACE +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/painting/qgraphicssystem.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/painting/qgraphicssystem.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/painting/qgraphicssystem.cpp 2011-03-30 05:19:07.046661632 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/painting/qgraphicssystem.cpp 2011-06-13 22:06:43.346816512 +0000 +@@ -44,7 +44,7 @@ + #ifdef Q_WS_X11 + # include + #endif +-#if defined(Q_WS_WIN) ++#if defined(Q_WS_WIN) || defined(Q_WS_HAIKU) + # include + #endif + #ifdef Q_WS_MAC +@@ -72,7 +72,9 @@ QPixmapData *QGraphicsSystem::createDefa + #elif defined(Q_WS_MAC) + return new QMacPixmapData(type); + #elif defined(Q_OS_SYMBIAN) +- return new QS60PixmapData(type); ++ return new QS60PixmapData(type); ++#elif defined(Q_WS_HAIKU) ++ return new QRasterPixmapData(type); + #elif !defined(Q_WS_QWS) + #error QGraphicsSystem::createDefaultPixmapData() not implemented + #endif +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/painting/qpaintengine_raster.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/painting/qpaintengine_raster.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/painting/qpaintengine_raster.cpp 2011-03-30 05:19:07.039583744 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/painting/qpaintengine_raster.cpp 2011-06-13 22:06:43.351010816 +0000 +@@ -96,6 +96,8 @@ + # include + #elif defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE) + # include ++#elif defined(Q_WS_HAIKU) ++# include + #endif + + #if defined(Q_WS_WIN64) +@@ -3408,7 +3410,7 @@ void QRasterPaintEngine::drawTextItem(co + } + #endif // Q_WS_QWS + +-#if (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)) && !defined(QT_NO_FREETYPE) ++#if (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) || defined(Q_WS_HAIKU)) && !defined(QT_NO_FREETYPE) + + #if defined(Q_WS_QWS) && !defined(QT_NO_QWS_QPF2) + if (fontEngine->type() == QFontEngine::QPF2) { +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/painting/qregion.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/painting/qregion.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/painting/qregion.cpp 2011-03-30 05:19:07.052953088 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/painting/qregion.cpp 2011-06-13 22:06:43.354156544 +0000 +@@ -1620,7 +1620,7 @@ QT_END_INCLUDE_NAMESPACE + QT_BEGIN_INCLUDE_NAMESPACE + # include "qregion_win.cpp" + QT_END_INCLUDE_NAMESPACE +-#elif defined(Q_WS_QWS) ++#elif defined(Q_WS_QWS) || defined(Q_WS_HAIKU) + static QRegionPrivate qrp; + QRegion::QRegionData QRegion::shared_empty = {Q_BASIC_ATOMIC_INITIALIZER(1), &qrp}; + #endif +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/painting/qregion.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/painting/qregion.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/painting/qregion.h 2011-03-30 05:19:07.041156608 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/painting/qregion.h 2011-06-13 22:06:43.355729408 +0000 +@@ -59,7 +59,7 @@ QT_MODULE(Gui) + template class QVector; + class QVariant; + +-#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN) ++#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_WS_HAIKU) + struct QRegionPrivate; + #endif + +@@ -203,7 +203,7 @@ private: + #elif defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA) + mutable RgnHandle unused; // Here for binary compatibility reasons. ### Qt 5 remove. + #endif +-#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN) ++#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_WS_HAIKU) + QRegionPrivate *qt_rgn; + #endif + }; +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/painting/qwindowsurface_raster.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/painting/qwindowsurface_raster.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/painting/qwindowsurface_raster.cpp 2011-03-30 05:19:07.048496640 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/painting/qwindowsurface_raster.cpp 2011-06-13 22:06:43.357302272 +0000 +@@ -66,6 +66,10 @@ + #include + #endif + ++#ifdef Q_WS_HAIKU ++#include ++#endif ++ + QT_BEGIN_NAMESPACE + + class QRasterWindowSurfacePrivate +@@ -298,6 +302,24 @@ void QRasterWindowSurface::flush(QWidget + #endif + #endif // Q_WS_MAC + ++#ifdef Q_WS_HAIKU ++ // d->image is the image to be painted ++ // widget is the widget to be painted on ++ BView *view = widget->nativeView(); ++ BLooper* looper = view->Looper(); ++ ++ if (looper->IsLocked()) ++ return; ++ if(view->LockLooper()) { ++ QRect r = rgn.boundingRect(); ++ BRect dst_region = BRect(r.x(), r.y(), r.x()+r.width(), r.y()+r.height()); ++ BRect src_region = dst_region; ++ src_region.OffsetBy(offset.x(),offset.y()); ++ view->DrawBitmap(d->image->bitmap, src_region, dst_region); ++ view->UnlockLooper(); ++ } ++#endif ++ + #ifdef Q_OS_SYMBIAN + Q_UNUSED(widget); + Q_UNUSED(rgn); +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/styles/qhaikustyle.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/styles/qhaikustyle.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/styles/qhaikustyle.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/styles/qhaikustyle.cpp 2011-06-13 22:06:43.365428736 +0000 +@@ -0,0 +1,3928 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ++** Contact: Qt Software Information (qt-info@nokia.com) ++** ++** This file is part of the QtGui module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial Usage ++** Licensees holding valid Qt Commercial licenses may use this file in ++** accordance with the Qt Commercial License Agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Nokia. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain ++** additional rights. These rights are described in the Nokia Qt LGPL ++** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this ++** package. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. ++** ++** If you are unsure which license is appropriate for your use, please ++** contact the sales department at qt-sales@nokia.com. ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include "qhaikustyle.h" ++#include "qhaikustyle_p.h" ++ ++#if !defined(QT_NO_STYLE_HAIKU) || defined(QT_PLUGIN) ++ ++#include "qwindowsstyle_p.h" ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define CL_MAX(a,b) (a)>(b) ? (a):(b) // ### qMin/qMax does not work for vc6 ++#define CL_MIN(a,b) (a)<(b) ? (a):(b) // remove this when it is working ++ ++QT_BEGIN_NAMESPACE ++ ++static const bool UsePixmapCache = true; ++ ++enum Direction { ++ TopDown, ++ FromLeft, ++ BottomUp, ++ FromRight ++}; ++ ++// from windows style ++static const int windowsItemFrame = 2; // menu item frame width ++static const int windowsSepHeight = 6; // separator item height ++static const int windowsItemHMargin = 3; // menu item hor text margin ++static const int windowsItemVMargin = 8; // menu item ver text margin ++static const int windowsArrowHMargin = 6; // arrow horizontal margin ++static const int windowsTabSpacing = 12; // space between text and tab ++static const int windowsCheckMarkHMargin = 2; // horiz. margins of check mark ++static const int windowsRightBorder = 15; // right border on windows ++static const int windowsCheckMarkWidth = 12; // checkmarks width on windows ++ ++/* XPM */ ++static const char * const dock_widget_close_xpm[] = { ++ "11 13 7 1", ++ " c None", ++ ". c #D5CFCB", ++ "+ c #8F8B88", ++ "@ c #6C6A67", ++ "# c #ABA6A3", ++ "$ c #B5B0AC", ++ "% c #A4A09D", ++ " ", ++ " +@@@@@@@+ ", ++ "+# #+", ++ "@ $@ @$ @", ++ "@ @@@ @@@ @", ++ "@ @@@@@ @", ++ "@ @@@ @", ++ "@ @@@@@ @", ++ "@ @@@ @@@ @", ++ "@ $@ @$ @", ++ "+% #+", ++ " +@@@@@@@+ ", ++ " "}; ++ ++ ++static const char * const dock_widget_restore_xpm[] = { ++ "11 13 7 1", ++ " c None", ++ ". c #D5CFCB", ++ "+ c #8F8B88", ++ "@ c #6C6A67", ++ "# c #ABA6A3", ++ "$ c #B5B0AC", ++ "% c #A4A09D", ++ " ", ++ " +@@@@@@@+ ", ++ "+# #+", ++ "@ #@@@# @", ++ "@ @ @ @", ++ "@ #@@@# @ @", ++ "@ @ @ @ @", ++ "@ @ @@@ @", ++ "@ @ @ @", ++ "@ #@@@# @", ++ "+% #+", ++ " +@@@@@@@+ ", ++ " "}; ++ ++static const char * const workspace_minimize[] = { ++ "11 13 7 1", ++ " c None", ++ ". c #D5CFCB", ++ "+ c #8F8B88", ++ "@ c #6C6A67", ++ "# c #ABA6A3", ++ "$ c #B5B0AC", ++ "% c #A4A09D", ++ " ", ++ " +@@@@@@@+ ", ++ "+# #+", ++ "@ @", ++ "@ @", ++ "@ @", ++ "@ @@@@@@@ @", ++ "@ @@@@@@@ @", ++ "@ @", ++ "@ @", ++ "+% #+", ++ " +@@@@@@@+ ", ++ " "}; ++ ++ ++static const char * const qt_titlebar_context_help[] = { ++ "10 10 3 1", ++ " c None", ++ "# c #000000", ++ "+ c #444444", ++ " +####+ ", ++ " ### ### ", ++ " ## ## ", ++ " +##+ ", ++ " +## ", ++ " ## ", ++ " ## ", ++ " ", ++ " ## ", ++ " ## "}; ++ ++ ++static const char * const qt_scrollbar_button_arrow_left[] = { ++"6 7 18 1", ++"d c #303030", ++"g c #333333", ++"c c #3d3d3d", ++"j c #4d4d4d", ++"l c #626262", ++"h c #656565", ++"p c #8b8b8b", ++"a c #919191", ++"k c #9a9a9a", ++"f c #9e9e9e", ++"n c #9f9f9f", ++"e c #a5a5a5", ++"m c #b3b3b3", ++"i c #b4b4b4", ++"b c #bababa", ++"o c #c6c6c6", ++"# c #cfcfcf", ++". c None", ++"...#a.", ++"..bcde", ++".fgdh.", ++"iddj..", ++".kgdl.", ++"..mcdn", ++"...op."}; ++ ++static const char * const qt_scrollbar_button_arrow_right[] = { ++"6 7 19 1", ++"c c #303030", ++"g c #333333", ++"n c #3d3d3d", ++"d c #3e3e3e", ++"i c #4d4d4d", ++"k c #626262", ++"f c #646464", ++"p c #8b8b8b", ++"# c #919191", ++"l c #9b9b9b", ++"h c #9e9e9e", ++"m c #9f9f9f", ++"b c #a5a5a5", ++"o c #b3b3b3", ++"j c #b4b4b4", ++"e c #bababa", ++"q c #c6c6c6", ++"a c #cfcfcf", ++". c None", ++".#a...", ++"bcde..", ++".fcgh.", ++"..iccj", ++".kcgl.", ++"mcno..", ++".pq..."}; ++ ++static const char * const qt_scrollbar_button_arrow_up[] = { ++"7 6 17 1", ++"b c #303030", ++"e c #333333", ++"h c #3d3d3d", ++"i c #4c4c4c", ++"m c #626262", ++"l c #656565", ++"n c #8a8a8a", ++"k c #919191", ++"c c #9a9a9a", ++"a c #9e9e9e", ++"o c #a4a4a4", ++"# c #afafaf", ++"f c #b3b3b3", ++"d c #b9b9b9", ++"j c #c5c5c5", ++"g c #cecece", ++". c None", ++"...#...", ++"..abc..", ++".debef.", ++"ghbibhj", ++"kbl.mbn", ++".o...a."}; ++ ++static const char * const qt_scrollbar_button_arrow_down[] = { ++"7 6 17 1", ++"c c #303030", ++"l c #333333", ++"h c #3d3d3d", ++"i c #4c4c4c", ++"e c #626262", ++"d c #656565", ++"f c #8a8a8a", ++"b c #919191", ++"n c #9a9a9a", ++"a c #9e9e9e", ++"# c #a4a4a4", ++"o c #afafaf", ++"m c #b3b3b3", ++"k c #b9b9b9", ++"j c #c5c5c5", ++"g c #cecece", ++". c None", ++".#...a.", ++"bcd.ecf", ++"ghcichj", ++".klclm.", ++"..acn..", ++"...o..."}; ++ ++static const char * const qt_scrollbar_buttons[] = { ++"15 15 31 1", ++" c None", ++"n c #303030", ++"q c #333333", ++"t c #3d3d3d", ++"u c #4c4c4c", ++"y c #626262", ++"x c #656565", ++"z c #8a8a8a", ++"w c #919191", ++". c #989898", ++"o c #9a9a9a", ++"m c #9e9e9e", ++"A c #a4a4a4", ++"l c #afafaf", ++"r c #b3b3b3", ++"p c #b9b9b9", ++"v c #c5c5c5", ++"k c #c6c6c6", ++"s c #cecece", ++"B c #d4d4d4", ++"j c #dbdbdb", ++"i c #dcdcdc", ++"h c #dedede", ++"g c #dfdfdf", ++"f c #e0e0e0", ++"e c #e6e6e6", ++"a c #e7e7e7", ++"d c #e8e8e8", ++"c c #e9e9e9", ++"b c #eaeaea", ++"# c #f7f7f7", ++"...............", ++".############a.", ++".# k.", ++".# k.", ++".# k.", ++".# k.", ++".# k.", ++".# k.", ++".# k.", ++".# k.", ++".# k.", ++".# k.", ++".# k.", ++".akkkkkkkkkkkk.", ++"..............."}; ++ ++ ++static const char * const qt_haiku_menuitem_checkbox_checked[] = { ++"9 9 31 1", ++"d c #000000", ++"t c #020202", ++"m c #060606", ++"e c #0b0b0b", ++"w c #0e0e0e", ++"j c #191919", ++"z c #1a1a1a", ++"s c #2b2b2b", ++"p c #2d2d2d", ++"# c #4d4d4d", ++"r c #555555", ++"o c #636363", ++"x c #646464", ++"a c #707070", ++"k c #808080", ++"y c #828282", ++"h c #838383", ++"c c #9a9a9a", ++"B c #9c9c9c", ++"g c #a7a7a7", ++"u c #b5b5b5", ++"l c #bfbfbf", ++"n c #c0c0c0", ++"f c #c8c8c8", ++"C c #c9c9c9", ++"v c #cdcdcd", ++"i c #d5d5d5", ++"A c #d6d6d6", ++"b c #d9d9d9", ++"q c #dedede", ++". c None", ++"......#ab", ++".....cdef", ++".gh.ijdk.", ++"ldmnodpq.", ++".rdsttu..", ++".vwddx...", ++"..ydzA...", ++"..qsB....", ++"...C....."}; ++ ++class TemporarySurface ++{ ++public: ++ TemporarySurface(const BRect& bounds) ++ : mBitmap(bounds, B_BITMAP_ACCEPTS_VIEWS, B_RGBA32) ++ , mView(bounds, "Qt temporary surface", 0, 0) ++ , mImage(reinterpret_cast(mBitmap.Bits()), ++ bounds.IntegerWidth() + 1, bounds.IntegerHeight() + 1, ++ mBitmap.BytesPerRow(), QImage::Format_ARGB32) ++ { ++ mBitmap.Lock(); ++ mBitmap.AddChild(&mView); ++ } ++ ++ ~TemporarySurface() ++ { ++ mBitmap.RemoveChild(&mView); ++ mBitmap.Unlock(); ++ } ++ ++ BView* view() ++ { ++ return &mView; ++ } ++ ++ QImage& image() ++ { ++ if(mView.Window()) ++ mView.Sync(); ++ return mImage; ++ } ++ ++private: ++ BBitmap mBitmap; ++ BView mView; ++ QImage mImage; ++}; ++ ++ ++static QColor mkQColor(rgb_color rgb) ++{ ++ return QColor(rgb.red, rgb.green, rgb.blue); ++} ++ ++static void qt_haiku_draw_button(QPainter *painter, const QRect &qrect, bool def, bool flat, bool pushed, bool focus, bool enabled) ++{ ++ QRect rect = qrect; ++ if (be_control_look != NULL) { ++ // TODO: If this button is embedded within a different color background, it would be ++ // nice to tell this function so the frame can be smoothly blended into the background. ++ rgb_color background = ui_color(B_PANEL_BACKGROUND_COLOR); ++ rgb_color base = background; ++ uint32 flags = 0; ++ if (pushed) ++ flags |= BControlLook::B_ACTIVATED; ++ if (focus) ++ flags |= BControlLook::B_FOCUSED; ++ if (def) { ++ flags |= BControlLook::B_DEFAULT_BUTTON; ++ rect = rect.adjusted(-2,-2,2,2); ++ } ++ if (!enabled) ++ flags |= BControlLook::B_DISABLED; ++ ++ BRect bRect(0.0f, 0.0f, rect.width() - 1, rect.height() - 1); ++ ++ TemporarySurface surface(bRect); ++ ++ be_control_look->DrawButtonFrame(surface.view(), bRect, bRect, base, background, flags); ++ be_control_look->DrawButtonBackground(surface.view(), bRect, bRect, base, flags); ++ ++ painter->drawImage(rect, surface.image()); ++ ++ return; ++ } ++} ++ ++static void qt_haiku_draw_gradient(QPainter *painter, const QRect &rect, const QColor &gradientStart, ++ const QColor &gradientStop, Direction direction = TopDown, QBrush bgBrush = QBrush()) ++{ ++ int x = rect.center().x(); ++ int y = rect.center().y(); ++ QLinearGradient *gradient; ++ switch(direction) { ++ case FromLeft: ++ gradient = new QLinearGradient(rect.left(), y, rect.right(), y); ++ break; ++ case FromRight: ++ gradient = new QLinearGradient(rect.right(), y, rect.left(), y); ++ break; ++ case BottomUp: ++ gradient = new QLinearGradient(x, rect.bottom(), x, rect.top()); ++ break; ++ case TopDown: ++ default: ++ gradient = new QLinearGradient(x, rect.top(), x, rect.bottom()); ++ break; ++ } ++ if (bgBrush.gradient()) ++ gradient->setStops(bgBrush.gradient()->stops()); ++ else { ++ gradient->setColorAt(0, gradientStart); ++ gradient->setColorAt(1, gradientStop); ++ } ++ painter->fillRect(rect, *gradient); ++ delete gradient; ++} ++ ++static QString uniqueName(const QString &key, const QStyleOption *option, const QSize &size) ++{ ++ QString tmp; ++ const QStyleOptionComplex *complexOption = qstyleoption_cast(option); ++ tmp.sprintf("%s-%d-%d-%lld-%dx%d-%d", key.toLatin1().constData(), uint(option->state), ++ complexOption ? uint(complexOption->activeSubControls) : uint(0), ++ option->palette.cacheKey(), size.width(), size.height(), option->direction); ++#ifndef QT_NO_SPINBOX ++ if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast(option)) { ++ tmp.append(QLatin1Char('-')); ++ tmp.append(QString::number(spinBox->buttonSymbols)); ++ tmp.append(QLatin1Char('-')); ++ tmp.append(QString::number(spinBox->stepEnabled)); ++ tmp.append(QLatin1Char('-')); ++ tmp.append(QLatin1Char(spinBox->frame ? '1' : '0')); ++ } ++#endif // QT_NO_SPINBOX ++ return tmp; ++} ++ ++static void qt_haiku_draw_mdibutton(QPainter *painter, const QStyleOptionTitleBar *option, const QRect &tmp, bool hover, bool sunken) ++{ ++ QColor dark; ++ dark.setHsv(option->palette.button().color().hue(), ++ CL_MIN(255, (int)(option->palette.button().color().saturation()*1.9)), ++ CL_MIN(255, (int)(option->palette.button().color().value()*0.7))); ++ ++ QColor highlight = option->palette.highlight().color(); ++ ++ bool active = (option->titleBarState & QStyle::State_Active); ++ QColor titleBarHighlight(255, 255, 255, 60); ++ ++ if (sunken) ++ painter->fillRect(tmp.adjusted(1, 1, -1, -1), option->palette.highlight().color().darker(120)); ++ else if (hover) ++ painter->fillRect(tmp.adjusted(1, 1, -1, -1), QColor(255, 255, 255, 20)); ++ ++ QColor mdiButtonGradientStartColor; ++ QColor mdiButtonGradientStopColor; ++ ++ mdiButtonGradientStartColor = QColor(0, 0, 0, 40); ++ mdiButtonGradientStopColor = QColor(255, 255, 255, 60); ++ ++ if (sunken) ++ titleBarHighlight = highlight.darker(130); ++ ++ QLinearGradient gradient(tmp.center().x(), tmp.top(), tmp.center().x(), tmp.bottom()); ++ gradient.setColorAt(0, mdiButtonGradientStartColor); ++ gradient.setColorAt(1, mdiButtonGradientStopColor); ++ QColor mdiButtonBorderColor(active ? option->palette.highlight().color().darker(180): dark.darker(110)); ++ ++ painter->setPen(QPen(mdiButtonBorderColor, 1)); ++ painter->drawLine(tmp.left() + 2, tmp.top(), tmp.right() - 2, tmp.top()); ++ painter->drawLine(tmp.left() + 2, tmp.bottom(), tmp.right() - 2, tmp.bottom()); ++ painter->drawLine(tmp.left(), tmp.top() + 2, tmp.left(), tmp.bottom() - 2); ++ painter->drawLine(tmp.right(), tmp.top() + 2, tmp.right(), tmp.bottom() - 2); ++ painter->drawPoint(tmp.left() + 1, tmp.top() + 1); ++ painter->drawPoint(tmp.right() - 1, tmp.top() + 1); ++ painter->drawPoint(tmp.left() + 1, tmp.bottom() - 1); ++ painter->drawPoint(tmp.right() - 1, tmp.bottom() - 1); ++ ++ painter->setPen(titleBarHighlight); ++ painter->drawLine(tmp.left() + 2, tmp.top() + 1, tmp.right() - 2, tmp.top() + 1); ++ painter->drawLine(tmp.left() + 1, tmp.top() + 2, tmp.left() + 1, tmp.bottom() - 2); ++ ++ painter->setPen(QPen(gradient, 1)); ++ painter->drawLine(tmp.right() + 1, tmp.top() + 2, tmp.right() + 1, tmp.bottom() - 2); ++ painter->drawPoint(tmp.right() , tmp.top() + 1); ++ ++ painter->drawLine(tmp.left() + 2, tmp.bottom() + 1, tmp.right() - 2, tmp.bottom() + 1); ++ painter->drawPoint(tmp.left() + 1, tmp.bottom()); ++ painter->drawPoint(tmp.right() - 1, tmp.bottom()); ++ painter->drawPoint(tmp.right() , tmp.bottom() - 1); ++} ++ ++/*! ++ \class QHaikuStyle ++ \brief The QHaikuStyle class provides a widget style similar to the ++ Clearlooks style available in GNOME. ++ \since 4.2 ++ ++ The Haiku style provides a look and feel for widgets ++ that closely resembles the Clearlooks style, introduced by Richard ++ Stellingwerff and Daniel Borgmann. ++ ++ \sa {Haiku Style Widget Gallery}, QWindowsXPStyle, QMacStyle, QWindowsStyle, ++ QCDEStyle, QMotifStyle, QPlastiqueStyle ++*/ ++ ++/*! ++ Constructs a QHaikuStyle object. ++*/ ++QHaikuStyle::QHaikuStyle() : QWindowsStyle(*new QHaikuStylePrivate) ++{ ++ setObjectName(QLatin1String("Haiku")); ++} ++ ++/*! ++ \internal ++ ++ Constructs a QHaikuStyle object. ++*/ ++QHaikuStyle::QHaikuStyle(QHaikuStylePrivate &dd) : QWindowsStyle(dd) ++{ ++} ++ ++/*! ++ Destroys the QHaikuStyle object. ++*/ ++QHaikuStyle::~QHaikuStyle() ++{ ++} ++ ++/*! ++ \fn void QHaikuStyle::drawItemText(QPainter *painter, const QRect &rectangle, int alignment, const QPalette &palette, ++ bool enabled, const QString& text, QPalette::ColorRole textRole) const ++ ++ Draws the given \a text in the specified \a rectangle using the ++ provided \a painter and \a palette. ++ ++ Text is drawn using the painter's pen. If an explicit \a textRole ++ is specified, then the text is drawn using the \a palette's color ++ for the specified role. The \a enabled value indicates whether or ++ not the item is enabled; when reimplementing, this value should ++ influence how the item is drawn. ++ ++ The text is aligned and wrapped according to the specified \a ++ alignment. ++ ++ \sa Qt::Alignment ++*/ ++void QHaikuStyle::drawItemText(QPainter *painter, const QRect &rect, int alignment, const QPalette &pal, ++ bool enabled, const QString& text, QPalette::ColorRole textRole) const ++{ ++ if (text.isEmpty()) ++ return; ++ ++ QPen savedPen = painter->pen(); ++ if (textRole != QPalette::NoRole) { ++ painter->setPen(QPen(pal.brush(textRole), savedPen.widthF())); ++ } ++ if (!enabled) { ++ QPen pen = painter->pen(); ++ painter->setPen(pen); ++ } ++ painter->drawText(rect, alignment, text); ++ painter->setPen(savedPen); ++} ++ ++static QColor mergedColors(const QColor &colorA, const QColor &colorB, int factor = 50) ++{ ++ const int maxFactor = 100; ++ QColor tmp = colorA; ++ tmp.setRed((tmp.red() * factor) / maxFactor + (colorB.red() * (maxFactor - factor)) / maxFactor); ++ tmp.setGreen((tmp.green() * factor) / maxFactor + (colorB.green() * (maxFactor - factor)) / maxFactor); ++ tmp.setBlue((tmp.blue() * factor) / maxFactor + (colorB.blue() * (maxFactor - factor)) / maxFactor); ++ return tmp; ++} ++ ++/*! ++ \reimp ++*/ ++void QHaikuStyle::drawPrimitive(PrimitiveElement elem, ++ const QStyleOption *option, ++ QPainter *painter, const QWidget *widget) const ++{ ++ Q_ASSERT(option); ++ QRect rect = option->rect; ++ int state = option->state; ++ QColor button = option->palette.button().color(); ++ QColor buttonShadow = option->palette.button().color().darker(110); ++ QColor buttonShadowAlpha = buttonShadow; ++ buttonShadowAlpha.setAlpha(128); ++ QColor darkOutline; ++ QColor dark; ++ darkOutline.setHsv(button.hue(), ++ CL_MIN(255, (int)(button.saturation()*3.0)), ++ CL_MIN(255, (int)(button.value()*0.6))); ++ dark.setHsv(button.hue(), ++ CL_MIN(255, (int)(button.saturation()*1.9)), ++ CL_MIN(255, (int)(button.value()*0.7))); ++ QColor tabFrameColor = mergedColors(option->palette.background().color(), ++ dark.lighter(135), 60); ++ ++ switch(elem) { ++#ifndef QT_NO_TABBAR ++ case PE_FrameTabBarBase: ++ if (const QStyleOptionTabBarBase *tbb ++ = qstyleoption_cast(option)) { ++ painter->save(); ++ painter->setPen(QPen(darkOutline.lighter(110), 0)); ++ switch (tbb->shape) { ++ case QTabBar::RoundedNorth: { ++ QRegion region(tbb->rect); ++ region -= tbb->selectedTabRect; ++ painter->drawLine(tbb->rect.topLeft(), tbb->rect.topRight()); ++ painter->setClipRegion(region); ++ painter->setPen(option->palette.light().color()); ++ painter->drawLine(tbb->rect.topLeft() + QPoint(0, 1), ++ tbb->rect.topRight() + QPoint(0, 1)); ++ } ++ break; ++ case QTabBar::RoundedWest: ++ painter->drawLine(tbb->rect.left(), tbb->rect.top(), tbb->rect.left(), tbb->rect.bottom()); ++ break; ++ case QTabBar::RoundedSouth: ++ painter->drawLine(tbb->rect.left(), tbb->rect.bottom(), ++ tbb->rect.right(), tbb->rect.bottom()); ++ break; ++ case QTabBar::RoundedEast: ++ painter->drawLine(tbb->rect.topRight(), tbb->rect.bottomRight()); ++ break; ++ case QTabBar::TriangularNorth: ++ case QTabBar::TriangularEast: ++ case QTabBar::TriangularWest: ++ case QTabBar::TriangularSouth: ++ painter->restore(); ++ QWindowsStyle::drawPrimitive(elem, option, painter, widget); ++ return; ++ } ++ painter->restore(); ++ } ++ return; ++#endif // QT_NO_TABBAR ++ case PE_IndicatorViewItemCheck: ++ { ++ QStyleOptionButton button; ++ button.QStyleOption::operator=(*option); ++ button.state &= ~State_MouseOver; ++ drawPrimitive(PE_IndicatorCheckBox, &button, painter, widget); ++ } ++ return; ++ case PE_IndicatorHeaderArrow: ++ if (const QStyleOptionHeader *header = qstyleoption_cast(option)) { ++ QRect r = header->rect; ++ QImage arrow; ++ if (header->sortIndicator & QStyleOptionHeader::SortUp) ++ arrow = QImage(qt_scrollbar_button_arrow_up); ++ else if (header->sortIndicator & QStyleOptionHeader::SortDown) ++ arrow = QImage(qt_scrollbar_button_arrow_down); ++ if (!arrow.isNull()) { ++ r.setSize(arrow.size()); ++ r.moveCenter(header->rect.center()); ++ arrow.setColor(1, header->palette.foreground().color().rgba()); ++ painter->drawImage(r, arrow); ++ } ++ } ++ break; ++ case PE_IndicatorButtonDropDown: ++ drawPrimitive(PE_PanelButtonCommand, option, painter, widget); ++ break; ++ case PE_IndicatorToolBarSeparator: ++ { ++ QRect rect = option->rect; ++ const int margin = 6; ++ if (option->state & State_Horizontal) { ++ const int offset = rect.width()/2; ++ painter->setPen(QPen(option->palette.background().color().darker(110))); ++ painter->drawLine(rect.bottomLeft().x() + offset, ++ rect.bottomLeft().y() - margin, ++ rect.topLeft().x() + offset, ++ rect.topLeft().y() + margin); ++ painter->setPen(QPen(option->palette.background().color().lighter(110))); ++ painter->drawLine(rect.bottomLeft().x() + offset + 1, ++ rect.bottomLeft().y() - margin, ++ rect.topLeft().x() + offset + 1, ++ rect.topLeft().y() + margin); ++ } else { //Draw vertical separator ++ const int offset = rect.height()/2; ++ painter->setPen(QPen(option->palette.background().color().darker(110))); ++ painter->drawLine(rect.topLeft().x() + margin , ++ rect.topLeft().y() + offset, ++ rect.topRight().x() - margin, ++ rect.topRight().y() + offset); ++ painter->setPen(QPen(option->palette.background().color().lighter(110))); ++ painter->drawLine(rect.topLeft().x() + margin , ++ rect.topLeft().y() + offset + 1, ++ rect.topRight().x() - margin, ++ rect.topRight().y() + offset + 1); ++ } ++ } ++ break; ++ case PE_Frame: ++ painter->save(); ++ painter->setPen(dark.lighter(108)); ++ painter->drawRect(option->rect.adjusted(0, 0, -1, -1)); ++ painter->restore(); ++ break; ++ case PE_FrameMenu: ++ painter->save(); ++ { ++ painter->setPen(QPen(darkOutline, 1)); ++ painter->drawRect(option->rect.adjusted(0, 0, -1, -1)); ++ QColor frameLight = option->palette.background().color().lighter(160); ++ QColor frameShadow = option->palette.background().color().darker(110); ++ ++ //paint beveleffect ++ QRect frame = option->rect.adjusted(1, 1, -1, -1); ++ painter->setPen(frameLight); ++ painter->drawLine(frame.topLeft(), frame.bottomLeft()); ++ painter->drawLine(frame.topLeft(), frame.topRight()); ++ ++ painter->setPen(frameShadow); ++ painter->drawLine(frame.topRight(), frame.bottomRight()); ++ painter->drawLine(frame.bottomLeft(), frame.bottomRight()); ++ } ++ painter->restore(); ++ break; ++ case PE_FrameDockWidget: ++ ++ painter->save(); ++ { ++ QColor softshadow = option->palette.background().color().darker(120); ++ ++ QRect rect= option->rect; ++ painter->setPen(softshadow); ++ painter->drawRect(option->rect.adjusted(0, 0, -1, -1)); ++ painter->setPen(QPen(option->palette.light(), 0)); ++ painter->drawLine(QPoint(rect.left() + 1, rect.top() + 1), QPoint(rect.left() + 1, rect.bottom() - 1)); ++ painter->setPen(QPen(option->palette.background().color().darker(120), 0)); ++ painter->drawLine(QPoint(rect.left() + 1, rect.bottom() - 1), QPoint(rect.right() - 2, rect.bottom() - 1)); ++ painter->drawLine(QPoint(rect.right() - 1, rect.top() + 1), QPoint(rect.right() - 1, rect.bottom() - 1)); ++ ++ } ++ painter->restore(); ++ break; ++ case PE_PanelButtonTool: ++ painter->save(); ++ if ((option->state & State_Enabled || option->state & State_On) || !(option->state & State_AutoRaise)) { ++ QRect rect = option->rect; ++ QPen oldPen = painter->pen(); ++ ++ if (widget && widget->inherits("QDockWidgetTitleButton")) { ++ if (option->state & State_MouseOver) ++ drawPrimitive(PE_PanelButtonCommand, option, painter, widget); ++ } else { ++ drawPrimitive(PE_PanelButtonCommand, option, painter, widget); ++ } ++ } ++ painter->restore(); ++ break; ++ case PE_IndicatorDockWidgetResizeHandle: ++ { ++ QStyleOption dockWidgetHandle = *option; ++ bool horizontal = option->state & State_Horizontal; ++ if (horizontal) ++ dockWidgetHandle.state &= ~State_Horizontal; ++ else ++ dockWidgetHandle.state |= State_Horizontal; ++ drawControl(CE_Splitter, &dockWidgetHandle, painter, widget); ++ } ++ break; ++ case PE_FrameWindow: ++ painter->save(); ++ { ++ QRect rect= option->rect; ++ painter->setPen(QPen(dark.darker(150), 0)); ++ painter->drawRect(option->rect.adjusted(0, 0, -1, -1)); ++ painter->setPen(QPen(option->palette.light(), 0)); ++ painter->drawLine(QPoint(rect.left() + 1, rect.top() + 1), ++ QPoint(rect.left() + 1, rect.bottom() - 1)); ++ painter->setPen(QPen(option->palette.background().color().darker(120), 0)); ++ painter->drawLine(QPoint(rect.left() + 1, rect.bottom() - 1), ++ QPoint(rect.right() - 2, rect.bottom() - 1)); ++ painter->drawLine(QPoint(rect.right() - 1, rect.top() + 1), ++ QPoint(rect.right() - 1, rect.bottom() - 1)); ++ } ++ painter->restore(); ++ break; ++#ifndef QT_NO_LINEDIT ++ case PE_FrameLineEdit: ++ // fall through ++#endif // QT_NO_LINEEDIT ++#ifdef QT3_SUPPORT ++ if (widget && widget->inherits("Q3ToolBar")) { ++ drawPrimitive(PE_Q3Separator, option, painter, widget); ++ break; ++ } ++#endif ++ { ++ QPen oldPen = painter->pen(); ++ if (option->state & State_Enabled) { ++ if(option->state & State_HasFocus) ++ painter->setPen(QPen(mkQColor(ui_color(B_NAVIGATION_BASE_COLOR)), 0)); ++ else ++ painter->setPen(QPen(QColor(129,129,129), 0)); ++ painter->drawRect(rect.adjusted(1, 1, -1, -1)); ++ } else { ++ painter->fillRect(rect, option->palette.background()); ++ painter->setPen(QPen(QColor(129,129,129), 0)); ++ painter->drawRect(rect.adjusted(1, 1, -1, -1)); ++ } ++ } ++ break; ++ case PE_IndicatorCheckBox: ++ painter->save(); ++ if (const QStyleOptionButton *checkbox = qstyleoption_cast(option)) { ++ ++ rect = rect.adjusted(-2, -2, 1, 1); ++ BRect bRect(0.0f, 0.0f, rect.width() - 1, rect.height() - 1); ++ TemporarySurface surface(bRect); ++ rgb_color base = ui_color(B_PANEL_BACKGROUND_COLOR); ++ uint32 flags = 0; ++ ++ if (!(state & State_Enabled)) ++ flags |= BControlLook::B_DISABLED; ++ if (checkbox->state & State_On) ++ flags |= BControlLook::B_ACTIVATED; ++ if (checkbox->state & State_HasFocus) ++ flags |= BControlLook::B_FOCUSED; ++ if (checkbox->state & State_Sunken) ++ flags |= BControlLook::B_CLICKED; ++ if (checkbox->state & State_NoChange) ++ flags |= BControlLook::B_DISABLED | BControlLook::B_ACTIVATED; ++ ++ be_control_look->DrawCheckBox(surface.view(), bRect, bRect, base, flags); ++ painter->drawImage(rect, surface.image()); ++ } ++ painter->restore(); ++ break; ++ case PE_IndicatorRadioButton: ++ painter->save(); ++ { ++ painter->setRenderHint(QPainter::SmoothPixmapTransform); ++ QRect checkRect = rect.adjusted(0, 0, 0, 0); ++ ++ painter->setRenderHint(QPainter::Antialiasing); ++ if (state & State_Sunken) ++ painter->setBrush(mkQColor(ui_color(B_PANEL_BACKGROUND_COLOR))); ++ else ++ painter->setBrush(QColor(255,255,255)); ++ ++ if(state & State_HasFocus) ++ painter->setPen(QPen(mkQColor(ui_color(B_NAVIGATION_BASE_COLOR)), 0)); ++ else ++ painter->setPen(QColor(129,129,129)); ++ painter->drawEllipse(rect); ++ ++ if (state & (State_On )) { ++ painter->setBrush(QColor(27,82,140)); ++ painter->setPen(Qt::NoPen); ++ painter->drawEllipse(rect.adjusted(3, 3, -3, -3)); ++ } ++ } ++ painter->restore(); ++ break; ++ case PE_IndicatorToolBarHandle: ++ painter->save(); ++ if (option->state & State_Horizontal) { ++ for (int i = rect.height()/5; i <= 4*(rect.height()/5) ; ++i) { ++ int y = rect.topLeft().y() + i + 1; ++ int x1 = rect.topLeft().x() + 3; ++ int x2 = rect.topRight().x() - 2; ++ ++ if (i % 2 == 0) ++ painter->setPen(QPen(option->palette.light(), 0)); ++ else ++ painter->setPen(QPen(dark.lighter(110), 0)); ++ painter->drawLine(x1, y, x2, y); ++ } ++ } ++ else { //vertical toolbar ++ for (int i = rect.width()/5; i <= 4*(rect.width()/5) ; ++i) { ++ int x = rect.topLeft().x() + i + 1; ++ int y1 = rect.topLeft().y() + 3; ++ int y2 = rect.topLeft().y() + 5; ++ ++ if (i % 2 == 0) ++ painter->setPen(QPen(option->palette.light(), 0)); ++ else ++ painter->setPen(QPen(dark.lighter(110), 0)); ++ painter->drawLine(x, y1, x, y2); ++ } ++ } ++ painter->restore(); ++ break; ++ case PE_FrameDefaultButton: ++ case PE_FrameFocusRect: ++ if (const QStyleOptionFocusRect *focusFrame = qstyleoption_cast(option)) { ++ if (!(focusFrame->state & State_KeyboardFocusChange)) ++ return; ++ QRect rect = focusFrame->rect; ++ painter->save(); ++ painter->setBackgroundMode(Qt::TransparentMode); ++ painter->setBrush(QBrush(dark.darker(120), Qt::Dense4Pattern)); ++ painter->setBrushOrigin(rect.topLeft()); ++ painter->setPen(Qt::NoPen); ++ painter->drawRect(rect.left(), rect.top(), rect.width(), 1); // Top ++ painter->drawRect(rect.left(), rect.bottom(), rect.width(), 1); // Bottom ++ painter->drawRect(rect.left(), rect.top(), 1, rect.height()); // Left ++ painter->drawRect(rect.right(), rect.top(), 1, rect.height()); // Right ++ painter->restore(); ++ } ++ break; ++ case PE_PanelButtonCommand: ++ painter->save(); ++ { ++ if (const QStyleOptionButton *btn = qstyleoption_cast(option)) { ++ QStyleOptionButton copy = *btn; ++ ++ bool enabled = option->state & State_Enabled; ++ bool pushed = (option->state & State_Sunken) || (option->state & State_On); ++ bool focus = option->state & State_HasFocus; ++ bool flat = btn->features & QStyleOptionFrameV2::Flat; ++ bool def = (btn->features & QStyleOptionButton::DefaultButton) && (btn->state & State_Enabled); ++ ++ qt_haiku_draw_button(painter, option->rect.adjusted(1,1,-1,-1), def, flat, pushed, focus, enabled); ++ } ++ painter->restore(); ++ } ++ break; ++#ifndef QT_NO_TABBAR ++ case PE_FrameTabWidget: ++ painter->save(); ++ { ++ painter->fillRect(option->rect, tabFrameColor); ++ } ++#ifndef QT_NO_TABWIDGET ++ if (const QStyleOptionTabWidgetFrame *twf = qstyleoption_cast(option)) { ++ QColor borderColor = darkOutline.lighter(110); ++ QColor alphaCornerColor = mergedColors(borderColor, option->palette.background().color()); ++ QColor innerShadow = mergedColors(borderColor, option->palette.base().color()); ++ ++ int borderThickness = pixelMetric(PM_TabBarBaseOverlap, twf, widget); ++ bool reverse = (twf->direction == Qt::RightToLeft); ++ QRect tabBarRect; ++ ++ switch (twf->shape) { ++ case QTabBar::RoundedNorth: ++ if (reverse) { ++ tabBarRect = QRect(twf->rect.right() - twf->leftCornerWidgetSize.width() ++ - twf->tabBarSize.width() + 1, ++ twf->rect.top(), ++ twf->tabBarSize.width(), borderThickness); ++ } else { ++ tabBarRect = QRect(twf->rect.left() + twf->leftCornerWidgetSize.width(), ++ twf->rect.top(), ++ twf->tabBarSize.width(), borderThickness); ++ } ++ break ; ++ case QTabBar::RoundedWest: ++ tabBarRect = QRect(twf->rect.left(), ++ twf->rect.top() + twf->leftCornerWidgetSize.height(), ++ borderThickness, ++ twf->tabBarSize.height()); ++ tabBarRect = tabBarRect; //adjust ++ break ; ++ case QTabBar::RoundedEast: ++ tabBarRect = QRect(twf->rect.right() - borderThickness + 1, ++ twf->rect.top() + twf->leftCornerWidgetSize.height(), ++ 0, ++ twf->tabBarSize.height()); ++ break ; ++ case QTabBar::RoundedSouth: ++ if (reverse) { ++ tabBarRect = QRect(twf->rect.right() - twf->leftCornerWidgetSize.width() - twf->tabBarSize.width() + 1, ++ twf->rect.bottom() + 1, ++ twf->tabBarSize.width(), ++ borderThickness); ++ } else { ++ tabBarRect = QRect(twf->rect.left() + twf->leftCornerWidgetSize.width(), ++ twf->rect.bottom() + 1, ++ twf->tabBarSize.width(), ++ borderThickness); ++ } ++ break; ++ default: ++ break; ++ } ++ ++ QRegion region(twf->rect); ++ region -= tabBarRect; ++ painter->setClipRegion(region); ++ ++ // Outer border ++ QLine leftLine = QLine(twf->rect.topLeft() + QPoint(0, 2), twf->rect.bottomLeft() - QPoint(0, 2)); ++ QLine rightLine = QLine(twf->rect.topRight(), twf->rect.bottomRight() - QPoint(0, 2)); ++ QLine bottomLine = QLine(twf->rect.bottomLeft() + QPoint(2, 0), twf->rect.bottomRight() - QPoint(2, 0)); ++ QLine topLine = QLine(twf->rect.topLeft(), twf->rect.topRight()); ++ ++ painter->setPen(borderColor); ++ painter->drawLine(topLine); ++ ++ // Inner border ++ QLine innerLeftLine = QLine(leftLine.p1() + QPoint(1, 0), leftLine.p2() + QPoint(1, 0)); ++ QLine innerRightLine = QLine(rightLine.p1() - QPoint(1, -1), rightLine.p2() - QPoint(1, 0)); ++ QLine innerBottomLine = QLine(bottomLine.p1() - QPoint(0, 1), bottomLine.p2() - QPoint(0, 1)); ++ QLine innerTopLine = QLine(topLine.p1() + QPoint(0, 1), topLine.p2() + QPoint(-1, 1)); ++ ++ // Rounded Corner ++ QPoint leftBottomOuterCorner = QPoint(innerLeftLine.p2() + QPoint(0, 1)); ++ QPoint leftBottomInnerCorner1 = QPoint(leftLine.p2() + QPoint(0, 1)); ++ QPoint leftBottomInnerCorner2 = QPoint(bottomLine.p1() - QPoint(1, 0)); ++ QPoint rightBottomOuterCorner = QPoint(innerRightLine.p2() + QPoint(0, 1)); ++ QPoint rightBottomInnerCorner1 = QPoint(rightLine.p2() + QPoint(0, 1)); ++ QPoint rightBottomInnerCorner2 = QPoint(bottomLine.p2() + QPoint(1, 0)); ++ QPoint leftTopOuterCorner = QPoint(innerLeftLine.p1() - QPoint(0, 1)); ++ QPoint leftTopInnerCorner1 = QPoint(leftLine.p1() - QPoint(0, 1)); ++ QPoint leftTopInnerCorner2 = QPoint(topLine.p1() - QPoint(1, 0)); ++ ++ painter->setPen(borderColor); ++ painter->drawLine(leftLine); ++ painter->drawLine(rightLine); ++ painter->drawLine(bottomLine); ++ painter->drawPoint(leftBottomOuterCorner); ++ painter->drawPoint(rightBottomOuterCorner); ++ painter->drawPoint(leftTopOuterCorner); ++ ++ painter->setPen(option->palette.light().color()); ++ painter->drawLine(innerLeftLine); ++ painter->drawLine(innerTopLine); ++ ++ painter->setPen(buttonShadowAlpha); ++ painter->drawLine(innerRightLine); ++ painter->drawLine(innerBottomLine); ++ ++ painter->setPen(alphaCornerColor); ++ painter->drawPoint(leftBottomInnerCorner1); ++ painter->drawPoint(leftBottomInnerCorner2); ++ painter->drawPoint(rightBottomInnerCorner1); ++ painter->drawPoint(rightBottomInnerCorner2); ++ painter->drawPoint(leftTopInnerCorner1); ++ painter->drawPoint(leftTopInnerCorner2); ++ } ++#endif // QT_NO_TABWIDGET ++ painter->restore(); ++ break ; ++ ++ case PE_FrameStatusBarItem: ++ break; ++ case PE_IndicatorTabClose: ++ { ++ Q_D(const QHaikuStyle); ++ if (d->tabBarcloseButtonIcon.isNull()) ++ d->tabBarcloseButtonIcon = standardIcon(SP_DialogCloseButton, option, widget); ++ if ((option->state & State_Enabled) && (option->state & State_MouseOver)) ++ drawPrimitive(PE_PanelButtonCommand, option, painter, widget); ++ QPixmap pixmap = d->tabBarcloseButtonIcon.pixmap(QSize(16, 16), QIcon::Normal, QIcon::On); ++ drawItemPixmap(painter, option->rect, Qt::AlignCenter, pixmap); ++ } ++ break; ++ ++#endif // QT_NO_TABBAR ++ default: ++ QWindowsStyle::drawPrimitive(elem, option, painter, widget); ++ break; ++ } ++} ++ ++/*! ++ \reimp ++*/ ++void QHaikuStyle::drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, ++ const QWidget *widget) const ++{ ++ QColor button = option->palette.button().color(); ++ QColor dark; ++ dark.setHsv(button.hue(), ++ CL_MIN(255, (int)(button.saturation()*1.9)), ++ CL_MIN(255, (int)(button.value()*0.7))); ++ QColor darkOutline; ++ darkOutline.setHsv(button.hue(), ++ CL_MIN(255, (int)(button.saturation()*2.0)), ++ CL_MIN(255, (int)(button.value()*0.6))); ++ QRect rect = option->rect; ++ QColor shadow = mergedColors(option->palette.background().color().darker(120), ++ dark.lighter(130), 60); ++ QColor tabFrameColor = mergedColors(option->palette.background().color(), ++ dark.lighter(135), 60); ++ ++ QColor highlight = option->palette.highlight().color(); ++ QColor highlightText = option->palette.highlightedText().color(); ++ ++ switch(element) { ++ case CE_RadioButton: //fall through ++ case CE_CheckBox: ++ if (const QStyleOptionButton *btn = qstyleoption_cast(option)) { ++ bool hover = (btn->state & State_MouseOver && btn->state & State_Enabled); ++ if (hover) ++ painter->fillRect(rect, btn->palette.background().color().lighter(104)); ++ QStyleOptionButton copy = *btn; ++ copy.rect.adjust(2, 0, -2, 0); ++ QWindowsStyle::drawControl(element, ©, painter, widget); ++ } ++ break; ++ case CE_Splitter: ++ painter->save(); ++ { ++ orientation orient = (option->state & State_Horizontal)?B_HORIZONTAL:B_VERTICAL; ++ ++ if (be_control_look != NULL) { ++ QRect r = option->rect; ++ rgb_color base = ui_color(B_PANEL_BACKGROUND_COLOR);; ++ uint32 flags = 0; ++ BRect bRect(0.0f, 0.0f, r.width() - 1, r.height() - 1); ++ TemporarySurface surface(bRect); ++ be_control_look->DrawSplitter(surface.view(), bRect, bRect, base, orient, flags); ++ painter->drawImage(r, surface.image()); ++ } ++ } ++ painter->restore(); ++ break; ++ case CE_SizeGrip: ++ painter->save(); ++ painter->fillRect(option->rect, option->palette.background().color()); ++ painter->restore(); ++ break; ++#ifndef QT_NO_TOOLBAR ++ case CE_ToolBar: ++ painter->save(); ++ if (const QStyleOptionToolBar *toolbar = qstyleoption_cast(option)) { ++ QRect rect = option->rect; ++ ++ bool paintLeftBorder = true; ++ bool paintRightBorder = true; ++ bool paintBottomBorder = true; ++ ++ switch (toolbar->toolBarArea) { ++ case Qt::BottomToolBarArea: ++ switch(toolbar->positionOfLine) { ++ case QStyleOptionToolBar::Beginning: ++ case QStyleOptionToolBar::OnlyOne: ++ paintBottomBorder = false; ++ default: ++ break; ++ } ++ case Qt::TopToolBarArea: ++ switch (toolbar->positionWithinLine) { ++ case QStyleOptionToolBar::Beginning: ++ paintLeftBorder = false; ++ break; ++ case QStyleOptionToolBar::End: ++ paintRightBorder = false; ++ break; ++ case QStyleOptionToolBar::OnlyOne: ++ paintRightBorder = false; ++ paintLeftBorder = false; ++ default: ++ break; ++ } ++ if (QApplication::layoutDirection() == Qt::RightToLeft) { //reverse layout changes the order of Beginning/end ++ bool tmp = paintLeftBorder; ++ paintRightBorder=paintLeftBorder; ++ paintLeftBorder=tmp; ++ } ++ break; ++ case Qt::RightToolBarArea: ++ switch (toolbar->positionOfLine) { ++ case QStyleOptionToolBar::Beginning: ++ case QStyleOptionToolBar::OnlyOne: ++ paintRightBorder = false; ++ break; ++ default: ++ break; ++ } ++ break; ++ case Qt::LeftToolBarArea: ++ switch (toolbar->positionOfLine) { ++ case QStyleOptionToolBar::Beginning: ++ case QStyleOptionToolBar::OnlyOne: ++ paintLeftBorder = false; ++ break; ++ default: ++ break; ++ } ++ break; ++ default: ++ break; ++ } ++ ++ QColor light = option->palette.background().color().lighter(110); ++ ++ //draw top border ++ painter->setPen(QPen(light)); ++ painter->drawLine(rect.topLeft().x(), ++ rect.topLeft().y(), ++ rect.topRight().x(), ++ rect.topRight().y()); ++ ++ if (paintLeftBorder) { ++ painter->setPen(QPen(light)); ++ painter->drawLine(rect.topLeft().x(), ++ rect.topLeft().y(), ++ rect.bottomLeft().x(), ++ rect.bottomLeft().y()); ++ } ++ ++ if (paintRightBorder) { ++ painter->setPen(QPen(shadow)); ++ painter->drawLine(rect.topRight().x(), ++ rect.topRight().y(), ++ rect.bottomRight().x(), ++ rect.bottomRight().y()); ++ } ++ ++ if (paintBottomBorder) { ++ painter->setPen(QPen(shadow)); ++ painter->drawLine(rect.bottomLeft().x(), ++ rect.bottomLeft().y(), ++ rect.bottomRight().x(), ++ rect.bottomRight().y()); ++ } ++ } ++ painter->restore(); ++ break; ++#endif // QT_NO_TOOLBAR ++#ifndef QT_NO_DOCKWIDGET ++ case CE_DockWidgetTitle: ++ painter->save(); ++ if (const QStyleOptionDockWidget *dwOpt = qstyleoption_cast(option)) { ++ const QStyleOptionDockWidgetV2 *v2 ++ = qstyleoption_cast(dwOpt); ++ bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar; ++ ++ QRect rect = dwOpt->rect; ++ QRect titleRect = subElementRect(SE_DockWidgetTitleBarText, option, widget); ++ QRect r = rect.adjusted(0, 0, -1, 0); ++ if (verticalTitleBar) ++ r.adjust(0, 0, 0, -1); ++ painter->setPen(option->palette.light().color()); ++ painter->drawRect(r.adjusted(1, 1, 1, 1)); ++ painter->setPen(shadow); ++ painter->drawRect(r); ++ ++ if (verticalTitleBar) { ++ QRect r = rect; ++ QSize s = r.size(); ++ s.transpose(); ++ r.setSize(s); ++ ++ titleRect = QRect(r.left() + rect.bottom() ++ - titleRect.bottom(), ++ r.top() + titleRect.left() - rect.left(), ++ titleRect.height(), titleRect.width()); ++ ++ painter->translate(r.left(), r.top() + r.width()); ++ painter->rotate(-90); ++ painter->translate(-r.left(), -r.top()); ++ ++ rect = r; ++ } ++ ++ if (!dwOpt->title.isEmpty()) { ++ QString titleText ++ = painter->fontMetrics().elidedText(dwOpt->title, ++ Qt::ElideRight, titleRect.width()); ++ drawItemText(painter, ++ titleRect, ++ Qt::AlignLeft | Qt::AlignVCenter | Qt::TextShowMnemonic, dwOpt->palette, ++ dwOpt->state & State_Enabled, titleText, ++ QPalette::WindowText); ++ } ++ } ++ painter->restore(); ++ break; ++#endif // QT_NO_DOCKWIDGET ++ case CE_HeaderSection: ++ painter->save(); ++ // Draws the header in tables. ++ if (const QStyleOptionHeader *header = qstyleoption_cast(option)) { ++ QPixmap cache; ++ QString pixmapName = uniqueName(QLatin1String("headersection"), option, option->rect.size()); ++ pixmapName += QLatin1String("-") + QString::number(int(header->position)); ++ pixmapName += QLatin1String("-") + QString::number(int(header->orientation)); ++ QRect r = option->rect; ++ QColor gradientStopColor; ++ QColor gradientStartColor = option->palette.button().color(); ++ gradientStopColor.setHsv(gradientStartColor.hue(), ++ CL_MIN(255, (int)(gradientStartColor.saturation()*2)), ++ CL_MIN(255, (int)(gradientStartColor.value()*0.96))); ++ QLinearGradient gradient(rect.topLeft(), rect.bottomLeft()); ++ if (option->palette.background().gradient()) { ++ gradient.setStops(option->palette.background().gradient()->stops()); ++ } else { ++ gradient.setColorAt(0, gradientStartColor); ++ gradient.setColorAt(0.8, gradientStartColor); ++ gradient.setColorAt(1, gradientStopColor); ++ } ++ painter->fillRect(r, gradient); ++ ++ if (!UsePixmapCache || !QPixmapCache::find(pixmapName, cache)) { ++ cache = QPixmap(r.size()); ++ cache.fill(Qt::transparent); ++ QRect pixmapRect(0, 0, r.width(), r.height()); ++ QPainter cachePainter(&cache); ++ if (header->orientation == Qt::Vertical) { ++ cachePainter.setPen(QPen(dark)); ++ cachePainter.drawLine(pixmapRect.topRight(), pixmapRect.bottomRight()); ++ if (header->position != QStyleOptionHeader::End) { ++ cachePainter.setPen(QPen(shadow)); ++ cachePainter.drawLine(pixmapRect.bottomLeft() + QPoint(3, -1), pixmapRect.bottomRight() + QPoint(-3, -1)); cachePainter.setPen(QPen(option->palette.light().color())); ++ cachePainter.drawLine(pixmapRect.bottomLeft() + QPoint(3, 0), pixmapRect.bottomRight() + QPoint(-3, 0)); } ++ } else { ++ cachePainter.setPen(QPen(dark)); ++ cachePainter.drawLine(pixmapRect.bottomLeft(), pixmapRect.bottomRight()); ++ cachePainter.setPen(QPen(shadow)); ++ cachePainter.drawLine(pixmapRect.topRight() + QPoint(-1, 3), pixmapRect.bottomRight() + QPoint(-1, -3)); cachePainter.setPen(QPen(option->palette.light().color())); ++ cachePainter.drawLine(pixmapRect.topRight() + QPoint(0, 3), pixmapRect.bottomRight() + QPoint(0, -3)); } ++ cachePainter.end(); ++ if (UsePixmapCache) ++ QPixmapCache::insert(pixmapName, cache); ++ } ++ painter->drawPixmap(r.topLeft(), cache); ++ } ++ painter->restore(); ++ break; ++ case CE_ProgressBarGroove: ++ painter->save(); ++ { ++ painter->fillRect(rect, option->palette.base()); ++ QColor borderColor = dark.lighter(110); ++ painter->setPen(QPen(borderColor, 0)); ++ painter->drawLine(QPoint(rect.left() + 1, rect.top()), QPoint(rect.right() - 1, rect.top())); ++ painter->drawLine(QPoint(rect.left() + 1, rect.bottom()), QPoint(rect.right() - 1, rect.bottom())); ++ painter->drawLine(QPoint(rect.left(), rect.top() + 1), QPoint(rect.left(), rect.bottom() - 1)); ++ painter->drawLine(QPoint(rect.right(), rect.top() + 1), QPoint(rect.right(), rect.bottom() - 1)); ++ QColor alphaCorner = mergedColors(borderColor, option->palette.background().color()); ++ QColor innerShadow = mergedColors(borderColor, option->palette.base().color()); ++ ++ //corner smoothing ++ painter->setPen(alphaCorner); ++ painter->drawPoint(rect.topRight()); ++ painter->drawPoint(rect.topLeft()); ++ painter->drawPoint(rect.bottomRight()); ++ painter->drawPoint(rect.bottomLeft()); ++ ++ //inner shadow ++ painter->setPen(innerShadow); ++ painter->drawLine(QPoint(rect.left() + 1, rect.top() + 1), ++ QPoint(rect.right() - 1, rect.top() + 1)); ++ painter->drawLine(QPoint(rect.left() + 1, rect.top() + 1), ++ QPoint(rect.left() + 1, rect.bottom() + 1)); ++ ++ } ++ painter->restore(); ++ break; ++ case CE_ProgressBarContents: ++ painter->save(); ++ if (const QStyleOptionProgressBar *bar = qstyleoption_cast(option)) { ++ QRect rect = bar->rect; ++ bool vertical = false; ++ bool inverted = false; ++ bool indeterminate = (bar->minimum == 0 && bar->maximum == 0); ++ ++ // Get extra style options if version 2 ++ if (const QStyleOptionProgressBarV2 *bar2 = qstyleoption_cast(option)) { ++ vertical = (bar2->orientation == Qt::Vertical); ++ inverted = bar2->invertedAppearance; ++ } ++ ++ // If the orientation is vertical, we use a transform to rotate ++ // the progress bar 90 degrees clockwise. This way we can use the ++ // same rendering code for both orientations. ++ if (vertical) { ++ rect = QRect(rect.left(), rect.top(), rect.height(), rect.width()); // flip width and height ++ QTransform m; ++ m.translate(rect.height()-1, -1.0); ++ m.rotate(90.0); ++ painter->setTransform(m, true); ++ } ++ ++ int maxWidth = rect.width() - 4; ++ int minWidth = 4; ++ qint64 progress = (qint64)qMax(bar->progress, bar->minimum); // workaround for bug in QProgressBar ++ double vc6_workaround = ((progress - qint64(bar->minimum)) / qMax(double(1.0), double(qint64(bar->maximum) - qint64(bar->minimum))) * maxWidth); ++ int progressBarWidth = (int(vc6_workaround) > minWidth ) ? int(vc6_workaround) : minWidth; ++ int width = indeterminate ? maxWidth : progressBarWidth; ++ ++ bool reverse = (!vertical && (bar->direction == Qt::RightToLeft)) || vertical; ++ if (inverted) ++ reverse = !reverse; ++ ++ QRect progressBar; ++ if (!indeterminate) { ++ if (!reverse) { ++ progressBar.setRect(rect.left() + 1, rect.top() + 1, width + 1, rect.height() - 3); ++ } else { ++ progressBar.setRect(rect.right() - 1 - width, rect.top() + 1, width + 1, rect.height() - 3); ++ } ++ } else { ++ Q_D(const QHaikuStyle); ++ int slideWidth = ((rect.width() - 4) * 2) / 3; ++ int step = ((d->animateStep * slideWidth) / d->animationFps) % slideWidth; ++ if ((((d->animateStep * slideWidth) / d->animationFps) % (2 * slideWidth)) >= slideWidth) ++ step = slideWidth - step; ++ progressBar.setRect(rect.left() + 1 + step, rect.top() + 1, ++ slideWidth / 2, rect.height() - 3); ++ } ++ QColor highlight = option->palette.color(QPalette::Normal, QPalette::Highlight); ++ painter->setPen(QPen(highlight.darker(140), 0)); ++ ++ QColor highlightedGradientStartColor = highlight.lighter(100); ++ QColor highlightedGradientStopColor = highlight.lighter(130); ++ ++ QLinearGradient gradient(rect.topLeft(), QPoint(rect.bottomLeft().x(), ++ rect.bottomLeft().y()*2)); ++ ++ gradient.setColorAt(0, highlightedGradientStartColor); ++ gradient.setColorAt(1, highlightedGradientStopColor); ++ ++ painter->setBrush(gradient); ++ painter->drawRect(progressBar); ++ ++ painter->setPen(QPen(highlight.lighter(120), 0)); ++ painter->drawLine(QPoint(progressBar.left() + 1, progressBar.top() + 1), ++ QPoint(progressBar.right(), progressBar.top() + 1)); ++ painter->drawLine(QPoint(progressBar.left() + 1, progressBar.top() + 1), ++ QPoint(progressBar.left() + 1, progressBar.bottom() - 1)); ++ ++ painter->setPen(QPen(highlightedGradientStartColor, 7.0));//QPen(option->palette.highlight(), 3)); ++ ++ painter->save(); ++ painter->setClipRect(progressBar.adjusted(2, 2, -1, -1)); ++ for (int x = progressBar.left() - 32; x < rect.right() ; x+=18) { ++ painter->drawLine(x, progressBar.bottom() + 1, x + 23, progressBar.top() - 2); ++ } ++ painter->restore(); ++ ++ } ++ painter->restore(); ++ break; ++ case CE_MenuBarItem: ++ painter->save(); ++ if (const QStyleOptionMenuItem *mbi = qstyleoption_cast(option)) ++ { ++ QStyleOptionMenuItem item = *mbi; ++ item.rect = mbi->rect.adjusted(0, 0, 0, 0); ++ if (be_control_look != NULL) { ++ QRect r = rect.adjusted(0,-1,0,0); ++ rgb_color base = ui_color(B_MENU_BACKGROUND_COLOR);; ++ uint32 flags = 0; ++ BRect bRect(0.0f, 0.0f, r.width() - 1, r.height() - 1); ++ TemporarySurface surface(bRect); ++ be_control_look->DrawMenuBarBackground(surface.view(), bRect, bRect, base, flags, 8); ++ painter->drawImage(r, surface.image()); ++ } ++ ++ bool act = mbi->state & State_Selected && mbi->state & State_Sunken; ++ bool dis = !(mbi->state & State_Enabled); ++ ++ QRect r = option->rect; ++ if (act) { ++ qt_haiku_draw_gradient(painter, r.adjusted(1, 1, -1, -1), ++ QColor(150,150,150), ++ QColor(168,168,168), TopDown, ++ QColor(168,168,168)); ++ ++ painter->setPen(QPen(QColor(168,168,168), 0)); ++ painter->drawLine(QPoint(r.left(), r.top()), QPoint(r.left(), r.bottom())); ++ painter->drawLine(QPoint(r.right(), r.top()), QPoint(r.right(), r.bottom())); ++ painter->drawLine(QPoint(r.left(), r.bottom()), QPoint(r.right(), r.bottom())); ++ painter->drawLine(QPoint(r.left(), r.top()), QPoint(r.right(), r.top())); ++ } ++ ++ QPalette::ColorRole textRole = QPalette::Text; ++ uint alignment = Qt::AlignCenter | Qt::TextHideMnemonic | Qt::TextDontClip | Qt::TextSingleLine; ++ drawItemText(painter, item.rect, alignment, mbi->palette, mbi->state & State_Enabled, mbi->text, textRole); ++ } ++ painter->restore(); ++ break; ++ case CE_MenuItem: ++ painter->save(); ++ // Draws one item in a popup menu. ++ if (const QStyleOptionMenuItem *menuItem = qstyleoption_cast(option)) { ++ QColor highlightOutline = QColor(168,168,168); ++ QColor menuBackground = option->palette.background().color().lighter(104); ++ QColor borderColor = option->palette.background().color().darker(160); ++ QColor alphaCornerColor; ++ ++ if (widget) { ++ // ### backgroundrole/foregroundrole should be part of the style option ++ alphaCornerColor = mergedColors(option->palette.color(widget->backgroundRole()), borderColor); ++ } else { ++ alphaCornerColor = mergedColors(option->palette.background().color(), borderColor); ++ } ++ QColor alphaTextColor = mergedColors(option->palette.background().color(), option->palette.text().color()); ++ if (menuItem->menuItemType == QStyleOptionMenuItem::Separator) { ++ painter->fillRect(menuItem->rect, menuBackground); ++ int w = 0; ++ if (!menuItem->text.isEmpty()) { ++ painter->setFont(menuItem->font); ++ drawItemText(painter, menuItem->rect.adjusted(5, 0, -5, 0), Qt::AlignLeft | Qt::AlignVCenter, ++ menuItem->palette, menuItem->state & State_Enabled, menuItem->text, ++ QPalette::Text); ++ w = menuItem->fontMetrics.width(menuItem->text) + 5; ++ } ++ painter->setPen(shadow.lighter(106)); ++ bool reverse = menuItem->direction == Qt::RightToLeft; ++ painter->drawLine(menuItem->rect.left() + 5 + (reverse ? 0 : w), menuItem->rect.center().y(), ++ menuItem->rect.right() - 5 - (reverse ? w : 0), menuItem->rect.center().y()); ++ painter->restore(); ++ break; ++ } ++ bool selected = menuItem->state & State_Selected; //&& menuItem->state & State_Enabled; ++ if (selected) { ++ QRect r = option->rect.adjusted(1, 0, -2, -1); ++ qt_haiku_draw_gradient(painter, r, QColor(150,150,150), ++ QColor(168,168,168), TopDown, ++ QColor(168,168,168)); ++ r = r.adjusted(-1, 0, 1, 0); ++ painter->setPen(QPen(QColor(168,168,168), 0)); ++ painter->drawLine(QPoint(r.left(), r.top()), QPoint(r.left(), r.bottom())); ++ painter->drawLine(QPoint(r.right(), r.top()), QPoint(r.right(), r.bottom())); ++ painter->drawLine(QPoint(r.left(), r.bottom()), QPoint(r.right(), r.bottom())); ++ painter->drawLine(QPoint(r.left(), r.top()), QPoint(r.right(), r.top())); ++ } else { ++ painter->fillRect(option->rect, menuBackground); ++ } ++ ++ bool checkable = menuItem->checkType != QStyleOptionMenuItem::NotCheckable; ++ bool checked = menuItem->checked; ++ bool sunken = menuItem->state & State_Sunken; ++ bool enabled = menuItem->state & State_Enabled; ++ ++ bool ignoreCheckMark = false; ++ int checkcol = qMax(menuItem->maxIconWidth, 20); ++ ++#ifndef QT_NO_COMBOBOX ++ if (qobject_cast(widget)) ++ ignoreCheckMark = true; //ignore the checkmarks provided by the QComboMenuDelegate ++#endif ++ ++ if (!ignoreCheckMark) { ++ // Check ++ QRect checkRect(option->rect.left() + 7, option->rect.center().y() - 6, 13, 13); ++ checkRect = visualRect(menuItem->direction, menuItem->rect, checkRect); ++ if (checkable) { ++ if (menuItem->checkType & QStyleOptionMenuItem::Exclusive) { ++ // Radio button ++ if (checked || sunken) { ++ painter->setRenderHint(QPainter::Antialiasing); ++ painter->setPen(Qt::NoPen); ++ ++ QPalette::ColorRole textRole = !enabled ? QPalette::Text: ++ selected ? QPalette::HighlightedText : QPalette::ButtonText; ++ painter->setBrush(option->palette.brush( option->palette.currentColorGroup(), textRole)); ++ painter->drawEllipse(checkRect.adjusted(4, 4, -4, -4)); ++ } ++ } else { ++ // Check box ++ if (menuItem->icon.isNull()) { ++ if (checked || sunken) { ++ QImage image(qt_haiku_menuitem_checkbox_checked); ++ if (enabled && (menuItem->state & State_Selected)) { ++ image.setColor(1, 0x55ffffff); ++ image.setColor(2, 0xAAffffff); ++ image.setColor(3, 0xBBffffff); ++ image.setColor(4, 0xFFffffff); ++ image.setColor(5, 0x33ffffff); ++ } else { ++ image.setColor(1, 0x55000000); ++ image.setColor(2, 0xAA000000); ++ image.setColor(3, 0xBB000000); ++ image.setColor(4, 0xFF000000); ++ image.setColor(5, 0x33000000); ++ } ++ painter->drawImage(QPoint(checkRect.center().x() - image.width() / 2, ++ checkRect.center().y() - image.height() / 2), image); ++ } ++ } ++ } ++ } ++ } else { //ignore checkmark ++ if (menuItem->icon.isNull()) ++ checkcol = 0; ++ else ++ checkcol = menuItem->maxIconWidth; ++ } ++ ++ // Text and icon, ripped from windows style ++ bool dis = !(menuItem->state & State_Enabled); ++ bool act = menuItem->state & State_Selected; ++ const QStyleOption *opt = option; ++ const QStyleOptionMenuItem *menuitem = menuItem; ++ ++ QPainter *p = painter; ++ QRect vCheckRect = visualRect(opt->direction, menuitem->rect, ++ QRect(menuitem->rect.x(), menuitem->rect.y(), ++ checkcol, menuitem->rect.height())); ++ if (!menuItem->icon.isNull()) { ++ QIcon::Mode mode = dis ? QIcon::Disabled : QIcon::Normal; ++ if (act && !dis) ++ mode = QIcon::Active; ++ QPixmap pixmap; ++ ++ int smallIconSize = pixelMetric(PM_SmallIconSize, option, widget); ++ QSize iconSize(smallIconSize, smallIconSize); ++#ifndef QT_NO_COMBOBOX ++ if (const QComboBox *combo = qobject_cast(widget)) ++ iconSize = combo->iconSize(); ++#endif // QT_NO_COMBOBOX ++ if (checked) ++ pixmap = menuItem->icon.pixmap(iconSize, mode, QIcon::On); ++ else ++ pixmap = menuItem->icon.pixmap(iconSize, mode); ++ ++ int pixw = pixmap.width(); ++ int pixh = pixmap.height(); ++ ++ QRect pmr(0, 0, pixw, pixh); ++ pmr.moveCenter(vCheckRect.center()); ++ painter->setPen(menuItem->palette.text().color()); ++ if (checkable && checked) { ++ QStyleOption opt = *option; ++ if (act) { ++ QColor activeColor = mergedColors(option->palette.background().color(), ++ option->palette.highlight().color()); ++ opt.palette.setBrush(QPalette::Button, activeColor); ++ } ++ opt.state |= State_Sunken; ++ opt.rect = vCheckRect; ++ bool enabled = opt.state & State_Enabled; ++ bool focus = opt.state & State_HasFocus; ++ qt_haiku_draw_button(painter, opt.rect, false, false, true, focus, enabled); ++ } ++ painter->drawPixmap(pmr.topLeft(), pixmap); ++ } ++ ++ painter->setPen(menuItem->palette.text().color()); ++ ++ int x, y, w, h; ++ menuitem->rect.getRect(&x, &y, &w, &h); ++ int tab = menuitem->tabWidth; ++ QColor discol; ++ if (dis) { ++ discol = menuitem->palette.text().color(); ++ p->setPen(discol); ++ } ++ int xm = windowsItemFrame + checkcol + windowsItemHMargin; ++ int xpos = menuitem->rect.x() + xm; ++ ++ QRect textRect(xpos, y + windowsItemVMargin, w - xm - windowsRightBorder - tab + 1, h - 2 * windowsItemVMargin); ++ QRect vTextRect = visualRect(opt->direction, menuitem->rect, textRect); ++ QString s = menuitem->text; ++ if (!s.isEmpty()) { // draw text ++ p->save(); ++ int t = s.indexOf(QLatin1Char('\t')); ++ int text_flags = Qt::AlignVCenter | Qt::TextShowMnemonic | Qt::TextDontClip | Qt::TextSingleLine; ++ if (!styleHint(SH_UnderlineShortcut, menuitem, widget)) ++ text_flags |= Qt::TextHideMnemonic; ++ text_flags |= Qt::AlignLeft; ++ if (t >= 0) { ++ QString sText = s.mid(t + 1); ++ sText.replace("Ctrl+","Alt+"); ++ QRect vShortcutRect = visualRect(opt->direction, menuitem->rect, ++ QRect(textRect.topRight(), QPoint(menuitem->rect.right(), textRect.bottom()))); ++ if (dis && !act && styleHint(SH_EtchDisabledText, option, widget)) { ++ p->setPen(menuitem->palette.light().color()); ++ p->drawText(vShortcutRect.adjusted(1, 1, 1, 1), text_flags, sText); ++ p->setPen(discol); ++ } ++ p->drawText(vShortcutRect, text_flags, sText); ++ s = s.left(t); ++ } ++ QFont font = menuitem->font; ++ ++ if (menuitem->menuItemType == QStyleOptionMenuItem::DefaultItem) ++ font.setBold(true); ++ ++ p->setFont(font); ++ if (dis && !act && styleHint(SH_EtchDisabledText, option, widget)) { ++ p->setPen(menuitem->palette.light().color()); ++ p->drawText(vTextRect.adjusted(1, 1, 1, 1), text_flags, s.left(t)); ++ p->setPen(discol); ++ } ++ p->drawText(vTextRect, text_flags, s.left(t)); ++ p->restore(); ++ } ++ ++ // Arrow ++ if (menuItem->menuItemType == QStyleOptionMenuItem::SubMenu) {// draw sub menu arrow ++ int dim = (menuItem->rect.height() - 4) / 2; ++ PrimitiveElement arrow; ++ arrow = QApplication::isRightToLeft() ? PE_IndicatorArrowLeft : PE_IndicatorArrowRight; ++ int xpos = menuItem->rect.left() + menuItem->rect.width() - 3 - dim; ++ QRect vSubMenuRect = visualRect(option->direction, menuItem->rect, ++ QRect(xpos, menuItem->rect.top() + menuItem->rect.height() / 2 - dim / 2, dim, dim)); ++ QStyleOptionMenuItem newMI = *menuItem; ++ newMI.rect = vSubMenuRect; ++ newMI.state = !enabled ? State_None : State_Enabled; ++ if (selected) ++ newMI.palette.setColor(QPalette::ButtonText, ++ newMI.palette.highlightedText().color()); ++ drawPrimitive(arrow, &newMI, painter, widget); ++ } ++ } ++ painter->restore(); ++ break; ++ case CE_MenuHMargin: ++ case CE_MenuVMargin: ++ break; ++ case CE_MenuEmptyArea: ++ break; ++ case CE_PushButtonLabel: ++ if (const QStyleOptionButton *button = qstyleoption_cast(option)) { ++ bool pushed = (option->state & State_Sunken) || (option->state & State_On); ++ ++ QRect ir = button->rect; ++ uint tf = Qt::AlignVCenter; ++ if (styleHint(SH_UnderlineShortcut, button, widget)) ++ tf |= Qt::TextShowMnemonic; ++ else ++ tf |= Qt::TextHideMnemonic; ++ ++ if (!button->icon.isNull() && button->text.isEmpty()) { ++ //Center both icon and text ++ QPoint point; ++ ++ QIcon::Mode mode = button->state & State_Enabled ? QIcon::Normal ++ : QIcon::Disabled; ++ if (mode == QIcon::Normal && button->state & State_HasFocus) ++ mode = QIcon::Active; ++ QIcon::State state = QIcon::Off; ++ if (button->state & State_On) ++ state = QIcon::On; ++ ++ QPixmap pixmap = button->icon.pixmap(button->iconSize, mode, state); ++ int w = pixmap.width(); ++ int h = pixmap.height(); ++ ++ if (!button->text.isEmpty()) ++ w += button->fontMetrics.boundingRect(option->rect, tf, button->text).width() + 2; ++ ++ point = QPoint(ir.x() + ir.width() / 2 - w / 2, ++ ir.y() + ir.height() / 2 - h / 2); ++ ++ if (button->direction == Qt::RightToLeft) ++ point.rx() += pixmap.width(); ++ ++ painter->drawPixmap(visualPos(button->direction, button->rect, point), pixmap); ++ ++ if (button->direction == Qt::RightToLeft) ++ ir.translate(-point.x() - 2, 0); ++ else ++ ir.translate(point.x() + pixmap.width(), 0); ++ ++ // left-align text if there is ++ if (!button->text.isEmpty()) ++ tf |= Qt::AlignLeft; ++ ++ } else { ++ tf |= Qt::AlignHCenter; ++ } ++ ++ if (button->features & QStyleOptionButton::HasMenu) ++ ir = ir.adjusted(0, 0, -pixelMetric(PM_MenuButtonIndicator, button, widget), 0); ++ if(pushed) ++ ir = ir.adjusted(1,1,0,0); ++ drawItemText(painter, ir, tf, button->palette, (button->state & State_Enabled), ++ button->text, QPalette::ButtonText); ++ } ++ break; ++ case CE_MenuBarEmptyArea: ++ painter->save(); ++ { ++ if (be_control_look != NULL) { ++ QRect r = rect.adjusted(0,0,0,-1); ++ rgb_color base = ui_color(B_MENU_BACKGROUND_COLOR);; ++ uint32 flags = 0; ++ BRect bRect(0.0f, 0.0f, r.width() - 1, r.height() - 1); ++ TemporarySurface surface(bRect); ++ be_control_look->DrawMenuBarBackground(surface.view(), bRect, bRect, base, flags); ++ painter->drawImage(r, surface.image()); ++ } ++ ++ painter->setPen(QPen(QColor(152,152,152))); ++ painter->drawLine(rect.bottomLeft(), rect.bottomRight()); ++ } ++ painter->restore(); ++ break; ++#ifndef QT_NO_TABBAR ++ case CE_TabBarTabShape: ++ painter->save(); ++ if (const QStyleOptionTab *tab = qstyleoption_cast(option)) { ++ ++ bool rtlHorTabs = (tab->direction == Qt::RightToLeft ++ && (tab->shape == QTabBar::RoundedNorth ++ || tab->shape == QTabBar::RoundedSouth)); ++ bool selected = tab->state & State_Selected; ++ bool lastTab = ((!rtlHorTabs && tab->position == QStyleOptionTab::End) ++ || (rtlHorTabs ++ && tab->position == QStyleOptionTab::Beginning)); ++ bool onlyTab = tab->position == QStyleOptionTab::OnlyOneTab; ++ bool leftCornerWidget = (tab->cornerWidgets & QStyleOptionTab::LeftCornerWidget); ++ ++ bool atBeginning = ((tab->position == (tab->direction == Qt::LeftToRight ? ++ QStyleOptionTab::Beginning : QStyleOptionTab::End)) || onlyTab); ++ ++ bool onlyOne = tab->position == QStyleOptionTab::OnlyOneTab; ++ bool previousSelected = ++ ((!rtlHorTabs ++ && tab->selectedPosition == QStyleOptionTab::PreviousIsSelected) ++ || (rtlHorTabs ++ && tab->selectedPosition == QStyleOptionTab::NextIsSelected)); ++ bool nextSelected = ++ ((!rtlHorTabs ++ && tab->selectedPosition == QStyleOptionTab::NextIsSelected) ++ || (rtlHorTabs ++ && tab->selectedPosition ++ == QStyleOptionTab::PreviousIsSelected)); ++ int tabBarAlignment = styleHint(SH_TabBar_Alignment, tab, widget); ++ bool leftAligned = (!rtlHorTabs && tabBarAlignment == Qt::AlignLeft) ++ || (rtlHorTabs ++ && tabBarAlignment == Qt::AlignRight); ++ ++ bool rightAligned = (!rtlHorTabs && tabBarAlignment == Qt::AlignRight) ++ || (rtlHorTabs ++ && tabBarAlignment == Qt::AlignLeft); ++ ++ QColor light = tab->palette.light().color(); ++ QColor midlight = tab->palette.midlight().color(); ++ ++ QColor background = tab->palette.background().color(); ++ int borderThinkness = pixelMetric(PM_TabBarBaseOverlap, tab, widget); ++ if (selected) ++ borderThinkness /= 2; ++ QRect r2(option->rect); ++ int x1 = r2.left(); ++ int x2 = r2.right(); ++ int y1 = r2.top()+2; ++ int y2 = r2.bottom(); ++ ++ QTransform rotMatrix; ++ bool flip = false; ++ painter->setPen(shadow); ++ QColor activeHighlight = option->palette.color(QPalette::Normal, QPalette::Highlight); ++ switch (tab->shape) { ++ case QTabBar::RoundedNorth: ++ break; ++ case QTabBar::RoundedSouth: ++ rotMatrix.rotate(180); ++ rotMatrix.translate(0, -rect.height() + 1); ++ rotMatrix.scale(-1, 1); ++ painter->setTransform(rotMatrix, true); ++ break; ++ case QTabBar::RoundedWest: ++ rotMatrix.rotate(180 + 90); ++ rotMatrix.scale(-1, 1); ++ flip = true; ++ painter->setTransform(rotMatrix, true); ++ break; ++ case QTabBar::RoundedEast: ++ rotMatrix.rotate(90); ++ rotMatrix.translate(0, - rect.width() + 1); ++ flip = true; ++ painter->setTransform(rotMatrix, true); ++ break; ++ default: ++ painter->restore(); ++ QWindowsStyle::drawControl(element, tab, painter, widget); ++ return; ++ } ++ ++ if (flip) { ++ QRect tmp = rect; ++ rect = QRect(tmp.y(), tmp.x(), tmp.height(), tmp.width()); ++ int temp = x1; ++ x1 = y1; ++ y1 = temp; ++ temp = x2; ++ x2 = y2; ++ y2 = temp; ++ } ++ ++ QLinearGradient gradient(rect.topLeft(), rect.bottomLeft()); ++ if (option->palette.button().gradient()) { ++ if (selected) ++ gradient.setStops(option->palette.background().gradient()->stops()); ++ else ++ gradient.setStops(option->palette.background().gradient()->stops()); ++ } ++ else if (selected) { ++ gradient.setColorAt(0, option->palette.background().color().lighter(104)); ++ gradient.setColorAt(1, tabFrameColor); ++ painter->fillRect(rect.adjusted(0, 2, 0, -2), gradient); ++ } else { ++ y1 += 2; ++ gradient.setColorAt(0, option->palette.background().color()); ++ gradient.setColorAt(1, dark.lighter(120)); ++ painter->fillRect(rect.adjusted(0, 2, 0, -2), gradient); ++ } ++ ++ // Delete border ++ if (selected) { ++ painter->setPen(QColor(200,200,200)); ++ painter->drawLine(x1 + 2, y2 - 1, x2 - 2, y2 - 1); ++ } else { ++ painter->setPen(dark); ++ painter->drawLine(x1, y2 - 1, x2 + 2, y2 - 1 ); ++ if (tab->shape == QTabBar::RoundedNorth || tab->shape == QTabBar::RoundedWest) { ++ painter->setPen(light); ++ painter->drawLine(x1, y2 , x2, y2 ); ++ } ++ } ++ // Left ++ if (atBeginning || selected ) { ++ painter->setPen(light); ++ painter->drawLine(x1 + 1, y1 + 2 + 1, x1 + 1, y2 - ((onlyOne || atBeginning) && selected && leftAligned ? 0 : borderThinkness) - (atBeginning && leftCornerWidget ? 1 : 0)); ++ //painter->drawPoint(x1 + 1, y1 + 1); ++ painter->setPen(dark); ++ painter->drawLine(x1, y1 + 2, x1, y2 - ((onlyOne || atBeginning) && leftAligned ? 0 : borderThinkness) - (atBeginning && leftCornerWidget ? 1 : 0)); ++ } ++ // Top ++ { ++ int beg = x1 + (previousSelected ? 0 : 1); ++ int end = x2 - (nextSelected ? 0 : 2); ++ //painter->setPen(light); ++ ++ // if (!selected)painter->drawLine(beg - 3, y1 + 1, end, y1 + 1); ++ ++/* if (selected) ++ painter->setPen(QPen(activeHighlight.darker(150), 0)); ++ else ++ painter->setPen(darkOutline);*/ ++ ++ painter->setPen(darkOutline); ++ painter->drawLine(beg, y1 , end, y1); ++ ++ if (atBeginning|| selected) { ++ painter->drawPoint(beg - 1, y1 + 1); ++ } else if (!atBeginning) { ++ painter->drawPoint(beg - 1, y1); ++ painter->drawPoint(beg - 2, y1); ++ if (!lastTab) { ++ painter->setPen(dark.lighter(130)); ++ painter->drawPoint(end + 1, y1); ++ painter->drawPoint(end + 2 , y1); ++ painter->drawPoint(end + 3, y1); ++ } ++ } ++ } ++ // Right ++ if (lastTab || selected || onlyOne || !nextSelected) { ++ painter->setPen(darkOutline); ++ ++ if (selected) { ++ painter->drawLine(x2, y1 + 2, x2, y2 - ((onlyOne || lastTab) && selected && rightAligned ? 0 : borderThinkness)); ++ painter->setPen(QPen(activeHighlight.darker(150), 0)); ++ painter->drawPoint(x2 - 1, y1 + 1); ++ } else { ++ painter->drawLine(x2, y1 + 1, x2, y2 - ((onlyOne || lastTab) && selected && rightAligned ? 0 : borderThinkness)); ++ painter->drawPoint(x2 - 1, y1); ++ } ++ ++ if (selected) { ++ painter->setPen(background.darker(110)); ++ painter->drawLine(x2 - 1, y1 + 2, x2 - 1, y2 - ((onlyOne || lastTab) && selected && rightAligned ? 0 : borderThinkness)); ++ } ++ } ++ } ++ painter->restore(); ++ break; ++ ++#endif // QT_NO_TABBAR ++ default: ++ QWindowsStyle::drawControl(element,option,painter,widget); ++ break; ++ } ++} ++ ++/*! ++ \reimp ++*/ ++ ++QPalette QHaikuStyle::standardPalette () const ++{ ++ QPalette palette = QWindowsStyle::standardPalette(); ++ palette.setBrush(QPalette::Active, QPalette::Highlight, QColor(98, 140, 178)); ++ palette.setBrush(QPalette::Inactive, QPalette::Highlight, QColor(145, 141, 126)); ++ palette.setBrush(QPalette::Disabled, QPalette::Highlight, QColor(145, 141, 126)); ++ ++ QColor backGround(mkQColor(ui_color(B_PANEL_BACKGROUND_COLOR))); ++ ++ QColor light = backGround.lighter(150); ++ QColor base = Qt::white; ++ QColor dark = QColor(170, 156, 143).darker(110); ++ dark = backGround.darker(150); ++ QColor darkDisabled = QColor(209, 200, 191).darker(110); ++ ++ //### Find the correct disabled text color ++ palette.setBrush(QPalette::Disabled, QPalette::Text, QColor(190, 190, 190)); ++ ++ palette.setBrush(QPalette::Window, backGround); ++ palette.setBrush(QPalette::Mid, backGround.darker(130)); ++ palette.setBrush(QPalette::Light, light); ++ ++ palette.setBrush(QPalette::Active, QPalette::Base, base); ++ palette.setBrush(QPalette::Inactive, QPalette::Base, base); ++ palette.setBrush(QPalette::Disabled, QPalette::Base, backGround); ++ ++ palette.setBrush(QPalette::Midlight, palette.mid().color().lighter(110)); ++ ++ palette.setBrush(QPalette::All, QPalette::Dark, dark); ++ palette.setBrush(QPalette::Disabled, QPalette::Dark, darkDisabled); ++ ++ QColor button = backGround; ++ ++ palette.setBrush(QPalette::Button, button); ++ ++ QColor shadow = dark.darker(135); ++ palette.setBrush(QPalette::Shadow, shadow); ++ palette.setBrush(QPalette::Disabled, QPalette::Shadow, shadow.lighter(150)); ++ palette.setBrush(QPalette::HighlightedText, QColor(QRgb(0xffffffff))); ++ return palette; ++} ++ ++/*! ++ \reimp ++*/ ++void QHaikuStyle::drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, ++ QPainter *painter, const QWidget *widget) const ++{ ++ QColor button = option->palette.button().color(); ++ QColor dark; ++ QColor grooveColor; ++ QColor darkOutline; ++ dark.setHsv(button.hue(), ++ CL_MIN(255, (int)(button.saturation()*1.9)), ++ CL_MIN(255, (int)(button.value()*0.7))); ++ grooveColor.setHsv(button.hue(), ++ CL_MIN(255, (int)(button.saturation()*2.6)), ++ CL_MIN(255, (int)(button.value()*0.9))); ++ darkOutline.setHsv(button.hue(), ++ CL_MIN(255, (int)(button.saturation()*3.0)), ++ CL_MIN(255, (int)(button.value()*0.6))); ++ ++ QColor alphaCornerColor; ++ if (widget) { ++ // ### backgroundrole/foregroundrole should be part of the style option ++ alphaCornerColor = mergedColors(option->palette.color(widget->backgroundRole()), darkOutline); ++ } else { ++ alphaCornerColor = mergedColors(option->palette.background().color(), darkOutline); ++ } ++ QColor gripShadow = grooveColor.darker(110); ++ QColor buttonShadow = option->palette.button().color().darker(110); ++ ++ QColor gradientStartColor = option->palette.button().color().lighter(108); ++ QColor gradientStopColor = mergedColors(option->palette.button().color().darker(108), dark.lighter(150), 70); ++ ++ QColor highlightedGradientStartColor = option->palette.button().color(); ++ QColor highlightedGradientStopColor = mergedColors(option->palette.button().color(), option->palette.highlight().color(), 85); ++ ++ QColor highlightedDarkInnerBorderColor = mergedColors(option->palette.button().color(), option->palette.highlight().color(), 35); ++ QColor highlightedLightInnerBorderColor = mergedColors(option->palette.button().color(), option->palette.highlight().color(), 58); ++ ++ QColor buttonShadowAlpha = option->palette.background().color().darker(105); ++ ++ QPalette palette = option->palette; ++ ++ switch (control) { ++#ifndef QT_NO_SPINBOX ++ case CC_SpinBox: ++ if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast(option)) { ++ QPixmap cache; ++ QString pixmapName = uniqueName(QLatin1String("spinbox"), spinBox, spinBox->rect.size()); ++ if (!UsePixmapCache || !QPixmapCache::find(pixmapName, cache)) { ++ cache = QPixmap(spinBox->rect.size()); ++ cache.fill(Qt::transparent); ++ QRect pixmapRect(0, 0, spinBox->rect.width(), spinBox->rect.height()); ++ QPainter cachePainter(&cache); ++ ++ bool isEnabled = (spinBox->state & State_Enabled); ++ //bool focus = isEnabled && (spinBox->state & State_HasFocus); ++ bool hover = isEnabled && (spinBox->state & State_MouseOver); ++ bool sunken = (spinBox->state & State_Sunken); ++ bool upIsActive = (spinBox->activeSubControls == SC_SpinBoxUp); ++ bool downIsActive = (spinBox->activeSubControls == SC_SpinBoxDown); ++ ++ QRect rect = pixmapRect; ++ QStyleOptionSpinBox spinBoxCopy = *spinBox; ++ spinBoxCopy.rect = pixmapRect; ++ QRect upRect = subControlRect(CC_SpinBox, &spinBoxCopy, SC_SpinBoxUp, widget); ++ QRect downRect = subControlRect(CC_SpinBox, &spinBoxCopy, SC_SpinBoxDown, widget); ++ ++ int fw = spinBoxCopy.frame ? pixelMetric(PM_SpinBoxFrameWidth, &spinBoxCopy, widget) : 0; ++ cachePainter.fillRect(rect.adjusted(1, qMax(fw - 1, 0), -1, -fw), ++ option->palette.base()); ++ ++ QRect r = rect.adjusted(0, 1, 0, -1); ++ if (spinBox->frame) { ++ ++ QColor topShadow = darkOutline; ++ topShadow.setAlpha(60); ++ cachePainter.setPen(topShadow); ++ ++ // antialias corners ++ cachePainter.drawPoint(QPoint(r.right(), r.top() + 1)); ++ cachePainter.drawPoint(QPoint(r.right() - 1, r.top() )); ++ cachePainter.drawPoint(QPoint(r.right(), r.bottom() - 1)); ++ cachePainter.drawPoint(QPoint(r.right() - 1, r.bottom() )); ++ cachePainter.drawPoint(QPoint(r.left() + 1, r.bottom())); ++ cachePainter.drawPoint(QPoint(r.left(), r.bottom() - 1)); ++ cachePainter.drawPoint(QPoint(r.left() + 1, r.top())); ++ cachePainter.drawPoint(QPoint(r.left(), r.top() + 1)); ++ ++ // draw frame ++ topShadow.setAlpha(30); ++ cachePainter.setPen(topShadow); ++ cachePainter.drawLine(QPoint(r.left() + 2, r.top() - 1), QPoint(r.right() - 2, r.top() - 1)); ++ ++ cachePainter.setPen(QPen(option->palette.background().color(), 1)); ++ cachePainter.drawLine(QPoint(r.left() + 2, r.top() + 1), QPoint(r.right() - 2, r.top() + 1)); ++ QColor highlight = Qt::white; ++ highlight.setAlpha(130); ++ cachePainter.setPen(option->palette.base().color().darker(120)); ++ cachePainter.drawLine(QPoint(r.left() + 1, r.top() + 1), ++ QPoint(r.right() - 1, r.top() + 1)); ++ cachePainter.drawLine(QPoint(r.left() + 1, r.top() + 1), ++ QPoint(r.left() + 1, r.bottom() - 1)); ++ cachePainter.setPen(option->palette.base().color()); ++ cachePainter.drawLine(QPoint(r.right() - 1, r.top() + 1), ++ QPoint(r.right() - 1, r.bottom() - 1)); ++ cachePainter.drawLine(QPoint(r.left() + 1, r.bottom() - 1), ++ QPoint(r.right() - 1, r.bottom() - 1)); ++ cachePainter.setPen(highlight); ++ cachePainter.drawLine(QPoint(r.left() + 3, r.bottom() + 1), ++ QPoint(r.right() - 3, r.bottom() + 1)); ++ ++ cachePainter.setPen(QPen(darkOutline, 1)); ++ ++ // top and bottom lines ++ cachePainter.drawLine(QPoint(r.left() + 2, r.bottom()), QPoint(r.right()- 2, r.bottom())); ++ cachePainter.drawLine(QPoint(r.left() + 2, r.top()), QPoint(r.right() - 2, r.top())); ++ cachePainter.drawLine(QPoint(r.right(), r.top() + 2), QPoint(r.right(), r.bottom() - 2)); ++ cachePainter.drawLine(QPoint(r.left(), r.top() + 2), QPoint(r.left(), r.bottom() - 2)); ++ } ++ ++ // gradients ++ qt_haiku_draw_gradient(&cachePainter, upRect, ++ gradientStartColor.darker(106), ++ gradientStopColor, TopDown, option->palette.button()); ++ qt_haiku_draw_gradient(&cachePainter, downRect.adjusted(0, 0, 0, 1), ++ gradientStartColor.darker(106), ++ gradientStopColor, TopDown, option->palette.button()); ++ if (isEnabled) { ++ if(upIsActive) { ++ if (sunken) { ++ cachePainter.fillRect(upRect.adjusted(1, 0, 0, 0), gradientStopColor.darker(110)); ++ } else if (hover) { ++ qt_haiku_draw_gradient(&cachePainter, upRect.adjusted(1, 0, 0, 0), ++ gradientStartColor.lighter(110), ++ gradientStopColor.lighter(110), TopDown, option->palette.button()); ++ } ++ } ++ if(downIsActive) { ++ if (sunken) { ++ cachePainter.fillRect(downRect.adjusted(1, 0, 0, 1), gradientStopColor.darker(110)); ++ ++ } else if (hover) { ++ qt_haiku_draw_gradient(&cachePainter, downRect.adjusted(1, 0, 0, 1), ++ gradientStartColor.lighter(110), ++ gradientStopColor.lighter(110), TopDown, option->palette.button()); ++ } ++ } ++ } ++ ++ if (spinBox->frame) { ++ // rounded corners ++ cachePainter.drawPoint(QPoint(r.left() + 1, r.bottom() - 1)); ++ cachePainter.drawPoint(QPoint(r.left() + 1, r.top() + 1)); ++ cachePainter.drawPoint(QPoint(r.right() - 1, r.bottom() - 1)); ++ cachePainter.drawPoint(QPoint(r.right() - 1, r.top() + 1)); ++ ++ if (option->state & State_HasFocus) { ++ QColor darkoutline = option->palette.highlight().color().darker(150); ++ QColor innerline = mergedColors(option->palette.highlight().color(), Qt::white); ++ cachePainter.setPen(QPen(innerline, 0)); ++ if (spinBox->direction == Qt::LeftToRight) { ++ cachePainter.drawRect(rect.adjusted(1, 2, -3 -downRect.width(), -3)); ++ cachePainter.setPen(QPen(darkoutline, 0)); ++ cachePainter.drawLine(QPoint(r.left() + 2, r.bottom()), QPoint(r.right()- downRect.width() - 1, r.bottom())); ++ cachePainter.drawLine(QPoint(r.left() + 2, r.top()), QPoint(r.right() - downRect.width() - 1, r.top())); ++ cachePainter.drawLine(QPoint(r.right() - downRect.width() - 1, r.top() + 1), QPoint(r.right()- downRect.width() - 1, r.bottom() - 1)); ++ cachePainter.drawLine(QPoint(r.left(), r.top() + 2), QPoint(r.left(), r.bottom() - 2)); ++ cachePainter.drawPoint(QPoint(r.left() + 1, r.bottom() - 1)); ++ cachePainter.drawPoint(QPoint(r.left() + 1, r.top() + 1)); ++ cachePainter.drawLine(QPoint(r.left(), r.top() + 2), QPoint(r.left(), r.bottom() - 2)); ++ } else { ++ cachePainter.drawRect(rect.adjusted(downRect.width() + 2, 2, -2, -3)); ++ cachePainter.setPen(QPen(darkoutline, 0)); ++ cachePainter.drawLine(QPoint(r.left() + downRect.width(), r.bottom()), QPoint(r.right()- 2 - 1, r.bottom())); ++ cachePainter.drawLine(QPoint(r.left() + downRect.width(), r.top()), QPoint(r.right() - 2 - 1, r.top())); ++ ++ cachePainter.drawLine(QPoint(r.right(), r.top() + 2), QPoint(r.right(), r.bottom() - 2)); ++ cachePainter.drawPoint(QPoint(r.right() - 1, r.bottom() - 1)); ++ cachePainter.drawPoint(QPoint(r.right() - 1, r.top() + 1)); ++ cachePainter.drawLine(QPoint(r.left() + downRect.width() + 1, r.top()), ++ QPoint(r.left() + downRect.width() + 1, r.bottom())); ++ } ++ } ++ } ++ ++ // outline the up/down buttons ++ cachePainter.setPen(darkOutline); ++ QColor light = option->palette.light().color().lighter(); ++ ++ if (spinBox->direction == Qt::RightToLeft) { ++ cachePainter.drawLine(upRect.right(), upRect.top() - 1, upRect.right(), downRect.bottom() + 1); ++ cachePainter.setPen(light); ++ cachePainter.drawLine(upRect.right() - 1, upRect.top() + 3, upRect.right() - 1, downRect.bottom() ); ++ } else { ++ cachePainter.drawLine(upRect.left(), upRect.top() - 1, upRect.left(), downRect.bottom() + 1); ++ cachePainter.setPen(light); ++ cachePainter.drawLine(upRect.left() + 1, upRect.top() , upRect.left() + 1, downRect.bottom() ); ++ } ++ if (upIsActive && sunken) { ++ cachePainter.setPen(gradientStopColor.darker(130)); ++ cachePainter.drawLine(upRect.left() + 1, upRect.top(), upRect.left() + 1, upRect.bottom()); ++ cachePainter.drawLine(upRect.left(), upRect.top() - 1, upRect.right(), upRect.top() - 1); ++ } else { ++ cachePainter.setPen(light); ++ cachePainter.drawLine(upRect.topLeft() + QPoint(1, -1), upRect.topRight() + QPoint(-1, -1)); ++ cachePainter.setPen(darkOutline); ++ cachePainter.drawLine(upRect.bottomLeft(), upRect.bottomRight()); ++ } ++ if (downIsActive && sunken) { ++ cachePainter.setPen(gradientStopColor.darker(130)); ++ cachePainter.drawLine(downRect.left() + 1, downRect.top(), downRect.left() + 1, downRect.bottom() + 1); ++ cachePainter.drawLine(downRect.left(), downRect.top(), downRect.right(), downRect.top()); ++ cachePainter.setPen(gradientStopColor.darker(110)); ++ cachePainter.drawLine(downRect.left(), downRect.bottom() + 1, downRect.right(), downRect.bottom() + 1); ++ } else { ++ cachePainter.setPen(light); ++ cachePainter.drawLine(downRect.topLeft() + QPoint(2,0), downRect.topRight()); ++ } ++ ++ if (spinBox->buttonSymbols == QAbstractSpinBox::PlusMinus) { ++ int centerX = upRect.center().x(); ++ int centerY = upRect.center().y(); ++ cachePainter.setPen(spinBox->palette.foreground().color()); ++ ++ // plus/minus ++ if (spinBox->activeSubControls == SC_SpinBoxUp && sunken) { ++ cachePainter.drawLine(1 + centerX - 2, 1 + centerY, 1 + centerX + 2, 1 + centerY); ++ cachePainter.drawLine(1 + centerX, 1 + centerY - 2, 1 + centerX, 1 + centerY + 2); ++ } else { ++ cachePainter.drawLine(centerX - 2, centerY, centerX + 2, centerY); ++ cachePainter.drawLine(centerX, centerY - 2, centerX, centerY + 2); ++ } ++ ++ centerX = downRect.center().x(); ++ centerY = downRect.center().y(); ++ if (spinBox->activeSubControls == SC_SpinBoxDown && sunken) { ++ cachePainter.drawLine(1 + centerX - 2, 1 + centerY, 1 + centerX + 2, 1 + centerY); ++ } else { ++ cachePainter.drawLine(centerX - 2, centerY, centerX + 2, centerY); ++ } ++ } else if (spinBox->buttonSymbols == QAbstractSpinBox::UpDownArrows){ ++ // arrows ++ QImage upArrow(qt_scrollbar_button_arrow_up); ++ upArrow.setColor(1, spinBox->palette.foreground().color().rgba()); ++ ++ cachePainter.drawImage(upRect.center().x() - upArrow.width() / 2, ++ upRect.center().y() - upArrow.height() / 2, ++ upArrow); ++ ++ QImage downArrow(qt_scrollbar_button_arrow_down); ++ downArrow.setColor(1, spinBox->palette.foreground().color().rgba()); ++ ++ cachePainter.drawImage(downRect.center().x() - downArrow.width() / 2, ++ downRect.center().y() - downArrow.height() / 2 + 1, ++ downArrow); ++ } ++ ++ QColor disabledColor = option->palette.background().color(); ++ disabledColor.setAlpha(150); ++ if (!(spinBox->stepEnabled & QAbstractSpinBox::StepUpEnabled)) ++ cachePainter.fillRect(upRect.adjusted(1, 0, 0, 0), disabledColor); ++ if (!(spinBox->stepEnabled & QAbstractSpinBox::StepDownEnabled)) { ++ cachePainter.fillRect(downRect.adjusted(1, 0, 0, 0), disabledColor); ++ } ++ cachePainter.end(); ++ if (UsePixmapCache) ++ QPixmapCache::insert(pixmapName, cache); ++ } ++ painter->drawPixmap(spinBox->rect.topLeft(), cache); ++ } ++ break; ++#endif // QT_NO_SPINBOX ++ case CC_TitleBar: ++ painter->save(); ++ if (const QStyleOptionTitleBar *titleBar = qstyleoption_cast(option)) { ++ const int buttonMargin = 5; ++ bool active = (titleBar->titleBarState & State_Active); ++ QRect fullRect = titleBar->rect; ++ QPalette palette = option->palette; ++ QColor highlight = option->palette.highlight().color(); ++ ++ QColor titleBarFrameBorder(active ? highlight.darker(180): dark.darker(110)); ++ QColor titleBarHighlight(active ? highlight.lighter(120): palette.background().color().lighter(120)); ++ QColor textColor(active ? 0xffffff : 0xff000000); ++ QColor textAlphaColor(active ? 0xffffff : 0xff000000 ); ++ ++#ifdef QT3_SUPPORT ++ if (widget && widget->inherits("Q3DockWindowTitleBar")) { ++ QStyleOptionDockWidgetV2 dockwidget; ++ dockwidget.QStyleOption::operator=(*option); ++ drawControl(CE_DockWidgetTitle, &dockwidget, painter, widget); ++ } else ++#endif // QT3_SUPPORT ++ { ++ // Fill title bar gradient ++ QColor titlebarColor = QColor(active ? highlight: palette.background().color()); ++ QColor titleBarGradientStop(active ? highlight.darker(150): palette.background().color().darker(120)); ++ QLinearGradient gradient(option->rect.center().x(), option->rect.top(), ++ option->rect.center().x(), option->rect.bottom()); ++ ++ gradient.setColorAt(0, titlebarColor.lighter(114)); ++ gradient.setColorAt(0.5, titlebarColor.lighter(102)); ++ gradient.setColorAt(0.51, titlebarColor.darker(104)); ++ gradient.setColorAt(1, titlebarColor); ++ painter->fillRect(option->rect.adjusted(1, 1, -1, 0), gradient); ++ ++ // Frame and rounded corners ++ painter->setPen(titleBarFrameBorder); ++ ++ // top outline ++ painter->drawLine(fullRect.left() + 5, fullRect.top(), fullRect.right() - 5, fullRect.top()); ++ painter->drawLine(fullRect.left(), fullRect.top() + 4, fullRect.left(), fullRect.bottom()); ++ painter->drawPoint(fullRect.left() + 4, fullRect.top() + 1); ++ painter->drawPoint(fullRect.left() + 3, fullRect.top() + 1); ++ painter->drawPoint(fullRect.left() + 2, fullRect.top() + 2); ++ painter->drawPoint(fullRect.left() + 1, fullRect.top() + 3); ++ painter->drawPoint(fullRect.left() + 1, fullRect.top() + 4); ++ ++ painter->drawLine(fullRect.right(), fullRect.top() + 4, fullRect.right(), fullRect.bottom()); ++ painter->drawPoint(fullRect.right() - 3, fullRect.top() + 1); ++ painter->drawPoint(fullRect.right() - 4, fullRect.top() + 1); ++ painter->drawPoint(fullRect.right() - 2, fullRect.top() + 2); ++ painter->drawPoint(fullRect.right() - 1, fullRect.top() + 3); ++ painter->drawPoint(fullRect.right() - 1, fullRect.top() + 4); ++ ++ // draw bottomline ++ painter->drawLine(fullRect.right(), fullRect.bottom(), fullRect.left(), fullRect.bottom()); ++ ++ // top highlight ++ painter->setPen(titleBarHighlight); ++ painter->drawLine(fullRect.left() + 6, fullRect.top() + 1, fullRect.right() - 6, fullRect.top() + 1); ++ } ++ // draw title ++ QRect textRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarLabel, widget); ++ QFont font = painter->font(); ++ font.setBold(true); ++ painter->setFont(font); ++ painter->setPen(active? (titleBar->palette.text().color().lighter(120)) : ++ titleBar->palette.text().color() ); ++ // Note workspace also does elliding but it does not use the correct font ++ QString title = QFontMetrics(font).elidedText(titleBar->text, Qt::ElideRight, textRect.width() - 14); ++ painter->drawText(textRect.adjusted(1, 1, 1, 1), title, QTextOption(Qt::AlignHCenter | Qt::AlignVCenter)); ++ painter->setPen(Qt::white); ++ if (active) ++ painter->drawText(textRect, title, QTextOption(Qt::AlignHCenter | Qt::AlignVCenter)); ++ // min button ++ if ((titleBar->subControls & SC_TitleBarMinButton) && (titleBar->titleBarFlags & Qt::WindowMinimizeButtonHint) && ++ !(titleBar->titleBarState& Qt::WindowMinimized)) { ++ QRect minButtonRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarMinButton, widget); ++ if (minButtonRect.isValid()) { ++ bool hover = (titleBar->activeSubControls & SC_TitleBarMinButton) && (titleBar->state & State_MouseOver); ++ bool sunken = (titleBar->activeSubControls & SC_TitleBarMinButton) && (titleBar->state & State_Sunken); ++ qt_haiku_draw_mdibutton(painter, titleBar, minButtonRect, hover, sunken); ++ QRect minButtonIconRect = minButtonRect.adjusted(buttonMargin ,buttonMargin , -buttonMargin, -buttonMargin); ++ painter->setPen(textColor); ++ painter->drawLine(minButtonIconRect.center().x() - 2, minButtonIconRect.center().y() + 3, ++ minButtonIconRect.center().x() + 3, minButtonIconRect.center().y() + 3); ++ painter->drawLine(minButtonIconRect.center().x() - 2, minButtonIconRect.center().y() + 4, ++ minButtonIconRect.center().x() + 3, minButtonIconRect.center().y() + 4); ++ painter->setPen(textAlphaColor); ++ painter->drawLine(minButtonIconRect.center().x() - 3, minButtonIconRect.center().y() + 3, ++ minButtonIconRect.center().x() - 3, minButtonIconRect.center().y() + 4); ++ painter->drawLine(minButtonIconRect.center().x() + 4, minButtonIconRect.center().y() + 3, ++ minButtonIconRect.center().x() + 4, minButtonIconRect.center().y() + 4); ++ } ++ } ++ // max button ++ if ((titleBar->subControls & SC_TitleBarMaxButton) && (titleBar->titleBarFlags & Qt::WindowMaximizeButtonHint) && ++ !(titleBar->titleBarState & Qt::WindowMaximized)) { ++ QRect maxButtonRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarMaxButton, widget); ++ if (maxButtonRect.isValid()) { ++ bool hover = (titleBar->activeSubControls & SC_TitleBarMaxButton) && (titleBar->state & State_MouseOver); ++ bool sunken = (titleBar->activeSubControls & SC_TitleBarMaxButton) && (titleBar->state & State_Sunken); ++ qt_haiku_draw_mdibutton(painter, titleBar, maxButtonRect, hover, sunken); ++ ++ QRect maxButtonIconRect = maxButtonRect.adjusted(buttonMargin, buttonMargin, -buttonMargin, -buttonMargin); ++ ++ painter->setPen(textColor); ++ painter->drawRect(maxButtonIconRect.adjusted(0, 0, -1, -1)); ++ painter->drawLine(maxButtonIconRect.left() + 1, maxButtonIconRect.top() + 1, ++ maxButtonIconRect.right() - 1, maxButtonIconRect.top() + 1); ++ painter->setPen(textAlphaColor); ++ painter->drawPoint(maxButtonIconRect.topLeft()); ++ painter->drawPoint(maxButtonIconRect.topRight()); ++ painter->drawPoint(maxButtonIconRect.bottomLeft()); ++ painter->drawPoint(maxButtonIconRect.bottomRight()); ++ } ++ } ++ ++ // close button ++ if ((titleBar->subControls & SC_TitleBarCloseButton) && (titleBar->titleBarFlags & Qt::WindowSystemMenuHint)) { ++ QRect closeButtonRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarCloseButton, widget); ++ if (closeButtonRect.isValid()) { ++ bool hover = (titleBar->activeSubControls & SC_TitleBarCloseButton) && (titleBar->state & State_MouseOver); ++ bool sunken = (titleBar->activeSubControls & SC_TitleBarCloseButton) && (titleBar->state & State_Sunken); ++ qt_haiku_draw_mdibutton(painter, titleBar, closeButtonRect, hover, sunken); ++ QRect closeIconRect = closeButtonRect.adjusted(buttonMargin, buttonMargin, -buttonMargin, -buttonMargin); ++ painter->setPen(textAlphaColor); ++ painter->drawLine(closeIconRect.left() + 1, closeIconRect.top(), ++ closeIconRect.right(), closeIconRect.bottom() - 1); ++ painter->drawLine(closeIconRect.left(), closeIconRect.top() + 1, ++ closeIconRect.right() - 1, closeIconRect.bottom()); ++ painter->drawLine(closeIconRect.right() - 1, closeIconRect.top(), ++ closeIconRect.left(), closeIconRect.bottom() - 1); ++ painter->drawLine(closeIconRect.right(), closeIconRect.top() + 1, ++ closeIconRect.left() + 1, closeIconRect.bottom()); ++ painter->drawPoint(closeIconRect.topLeft()); ++ painter->drawPoint(closeIconRect.topRight()); ++ painter->drawPoint(closeIconRect.bottomLeft()); ++ painter->drawPoint(closeIconRect.bottomRight()); ++ ++ painter->setPen(textColor); ++ painter->drawLine(closeIconRect.left() + 1, closeIconRect.top() + 1, ++ closeIconRect.right() - 1, closeIconRect.bottom() - 1); ++ painter->drawLine(closeIconRect.left() + 1, closeIconRect.bottom() - 1, ++ closeIconRect.right() - 1, closeIconRect.top() + 1); ++ } ++ } ++ ++ // normalize button ++ if ((titleBar->subControls & SC_TitleBarNormalButton) && ++ (((titleBar->titleBarFlags & Qt::WindowMinimizeButtonHint) && ++ (titleBar->titleBarState & Qt::WindowMinimized)) || ++ ((titleBar->titleBarFlags & Qt::WindowMaximizeButtonHint) && ++ (titleBar->titleBarState & Qt::WindowMaximized)))) { ++ QRect normalButtonRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarNormalButton, widget); ++ if (normalButtonRect.isValid()) { ++ ++ bool hover = (titleBar->activeSubControls & SC_TitleBarNormalButton) && (titleBar->state & State_MouseOver); ++ bool sunken = (titleBar->activeSubControls & SC_TitleBarNormalButton) && (titleBar->state & State_Sunken); ++ QRect normalButtonIconRect = normalButtonRect.adjusted(buttonMargin, buttonMargin, -buttonMargin, -buttonMargin); ++ qt_haiku_draw_mdibutton(painter, titleBar, normalButtonRect, hover, sunken); ++ ++ QRect frontWindowRect = normalButtonIconRect.adjusted(0, 3, -3, 0); ++ painter->setPen(textColor); ++ painter->drawRect(frontWindowRect.adjusted(0, 0, -1, -1)); ++ painter->drawLine(frontWindowRect.left() + 1, frontWindowRect.top() + 1, ++ frontWindowRect.right() - 1, frontWindowRect.top() + 1); ++ painter->setPen(textAlphaColor); ++ painter->drawPoint(frontWindowRect.topLeft()); ++ painter->drawPoint(frontWindowRect.topRight()); ++ painter->drawPoint(frontWindowRect.bottomLeft()); ++ painter->drawPoint(frontWindowRect.bottomRight()); ++ ++ QRect backWindowRect = normalButtonIconRect.adjusted(3, 0, 0, -3); ++ QRegion clipRegion = backWindowRect; ++ clipRegion -= frontWindowRect; ++ painter->save(); ++ painter->setClipRegion(clipRegion); ++ painter->setPen(textColor); ++ painter->drawRect(backWindowRect.adjusted(0, 0, -1, -1)); ++ painter->drawLine(backWindowRect.left() + 1, backWindowRect.top() + 1, ++ backWindowRect.right() - 1, backWindowRect.top() + 1); ++ painter->setPen(textAlphaColor); ++ painter->drawPoint(backWindowRect.topLeft()); ++ painter->drawPoint(backWindowRect.topRight()); ++ painter->drawPoint(backWindowRect.bottomLeft()); ++ painter->drawPoint(backWindowRect.bottomRight()); ++ painter->restore(); ++ } ++ } ++ ++ // context help button ++ if (titleBar->subControls & SC_TitleBarContextHelpButton ++ && (titleBar->titleBarFlags & Qt::WindowContextHelpButtonHint)) { ++ QRect contextHelpButtonRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarContextHelpButton, widget); ++ if (contextHelpButtonRect.isValid()) { ++ bool hover = (titleBar->activeSubControls & SC_TitleBarContextHelpButton) && (titleBar->state & State_MouseOver); ++ bool sunken = (titleBar->activeSubControls & SC_TitleBarContextHelpButton) && (titleBar->state & State_Sunken); ++ qt_haiku_draw_mdibutton(painter, titleBar, contextHelpButtonRect, hover, sunken); ++ ++ QColor blend; ++ QImage image(qt_titlebar_context_help); ++ QColor alpha = textColor; ++ alpha.setAlpha(128); ++ image.setColor(1, textColor.rgba()); ++ image.setColor(2, alpha.rgba()); ++ painter->setRenderHint(QPainter::SmoothPixmapTransform); ++ painter->drawImage(contextHelpButtonRect.adjusted(4, 4, -4, -4), image); ++ } ++ } ++ ++ // shade button ++ if (titleBar->subControls & SC_TitleBarShadeButton && (titleBar->titleBarFlags & Qt::WindowShadeButtonHint)) { ++ QRect shadeButtonRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarShadeButton, widget); ++ if (shadeButtonRect.isValid()) { ++ bool hover = (titleBar->activeSubControls & SC_TitleBarShadeButton) && (titleBar->state & State_MouseOver); ++ bool sunken = (titleBar->activeSubControls & SC_TitleBarShadeButton) && (titleBar->state & State_Sunken); ++ qt_haiku_draw_mdibutton(painter, titleBar, shadeButtonRect, hover, sunken); ++ QImage image(qt_scrollbar_button_arrow_up); ++ image.setColor(1, textColor.rgba()); ++ painter->drawImage(shadeButtonRect.adjusted(5, 7, -5, -7), image); ++ } ++ } ++ ++ // unshade button ++ if (titleBar->subControls & SC_TitleBarUnshadeButton && (titleBar->titleBarFlags & Qt::WindowShadeButtonHint)) { ++ QRect unshadeButtonRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarUnshadeButton, widget); ++ if (unshadeButtonRect.isValid()) { ++ bool hover = (titleBar->activeSubControls & SC_TitleBarUnshadeButton) && (titleBar->state & State_MouseOver); ++ bool sunken = (titleBar->activeSubControls & SC_TitleBarUnshadeButton) && (titleBar->state & State_Sunken); ++ qt_haiku_draw_mdibutton(painter, titleBar, unshadeButtonRect, hover, sunken); ++ QImage image(qt_scrollbar_button_arrow_down); ++ image.setColor(1, textColor.rgba()); ++ painter->drawImage(unshadeButtonRect.adjusted(5, 7, -5, -7), image); ++ } ++ } ++ ++ if ((titleBar->subControls & SC_TitleBarSysMenu) && (titleBar->titleBarFlags & Qt::WindowSystemMenuHint)) { ++ QRect iconRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarSysMenu, widget); ++ if (iconRect.isValid()) { ++ if (!titleBar->icon.isNull()) { ++ titleBar->icon.paint(painter, iconRect); ++ } else { ++ QStyleOption tool(0); ++ tool.palette = titleBar->palette; ++ QPixmap pm = standardIcon(SP_TitleBarMenuButton, &tool, widget).pixmap(16, 16); ++ tool.rect = iconRect; ++ painter->save(); ++ drawItemPixmap(painter, iconRect, Qt::AlignCenter, pm); ++ painter->restore(); ++ } ++ } ++ } ++ } ++ painter->restore(); ++ break; ++#ifndef QT_NO_SCROLLBAR ++ case CC_ScrollBar: ++ painter->save(); ++ if (const QStyleOptionSlider *scrollBar = qstyleoption_cast(option)) { ++ bool isEnabled = scrollBar->state & State_Enabled; ++ bool reverse = scrollBar->direction == Qt::RightToLeft; ++ bool horizontal = scrollBar->orientation == Qt::Horizontal; ++ bool sunken = scrollBar->state & State_Sunken; ++ ++ painter->fillRect(option->rect, option->palette.background()); ++ ++ QRect rect = scrollBar->rect; ++ QRect scrollBarSubLine = subControlRect(control, scrollBar, SC_ScrollBarSubLine, widget); ++ QRect scrollBarAddLine = subControlRect(control, scrollBar, SC_ScrollBarAddLine, widget); ++ QRect scrollBarSlider = subControlRect(control, scrollBar, SC_ScrollBarSlider, widget); ++ QRect grooveRect = subControlRect(control, scrollBar, SC_ScrollBarGroove, widget); ++ ++ // paint groove ++ if (scrollBar->subControls & SC_ScrollBarGroove) { ++ painter->setBrush(grooveColor); ++ painter->setPen(Qt::NoPen); ++ if (horizontal) { ++ painter->drawRect(grooveRect); ++ painter->setPen(darkOutline); ++ painter->drawLine(grooveRect.topLeft(), grooveRect.topRight()); ++ painter->drawLine(grooveRect.bottomLeft(), grooveRect.bottomRight()); ++ } else { ++ painter->drawRect(grooveRect); ++ painter->setPen(darkOutline); ++ painter->drawLine(grooveRect.topLeft(), grooveRect.bottomLeft()); ++ painter->drawLine(grooveRect.topRight(), grooveRect.bottomRight()); ++ } ++ } ++ //paint slider ++ if (scrollBar->subControls & SC_ScrollBarSlider) { ++ QRect pixmapRect = scrollBarSlider; ++ if (horizontal) ++ pixmapRect.adjust(-1, 0, 0, -1); ++ else ++ pixmapRect.adjust(0, -1, -1, 0); ++ ++ if (isEnabled) { ++ QLinearGradient gradient(pixmapRect.center().x(), pixmapRect.top(), ++ pixmapRect.center().x(), pixmapRect.bottom()); ++ if (!horizontal) ++ gradient = QLinearGradient(pixmapRect.left(), pixmapRect.center().y(), ++ pixmapRect.right(), pixmapRect.center().y()); ++ ++ if (option->palette.button().gradient()) { ++ gradient.setStops(option->palette.button().gradient()->stops()); ++ } else { ++ if (sunken || (option->state & State_MouseOver && ++ (scrollBar->activeSubControls & SC_ScrollBarSlider))) { ++ gradient.setColorAt(0, gradientStartColor.lighter(110)); ++ gradient.setColorAt(1, gradientStopColor.lighter(110)); ++ } else { ++ gradient.setColorAt(0, gradientStartColor); ++ gradient.setColorAt(1, gradientStopColor); ++ } ++ } ++ painter->setPen(QPen(darkOutline, 0)); ++ painter->setBrush(gradient); ++ painter->drawRect(pixmapRect); ++ ++ ++ //calculate offsets used by highlight and shadow ++ int yoffset, xoffset; ++ if (option->state & State_Horizontal) { ++ xoffset = 0; ++ yoffset = 1; ++ } else { ++ xoffset = 1; ++ yoffset = 0; ++ } ++ //draw slider highlights ++ painter->setPen(QPen(gradientStopColor, 0)); ++ painter->drawLine(scrollBarSlider.left() + xoffset, ++ scrollBarSlider.bottom() - yoffset, ++ scrollBarSlider.right() - xoffset, ++ scrollBarSlider.bottom() - yoffset); ++ painter->drawLine(scrollBarSlider.right() - xoffset, ++ scrollBarSlider.top() + yoffset, ++ scrollBarSlider.right() - xoffset, ++ scrollBarSlider.bottom() - yoffset); ++ ++ //draw slider shadow ++ painter->setPen(QPen(gradientStartColor, 0)); ++ painter->drawLine(scrollBarSlider.left() + xoffset, ++ scrollBarSlider.top() + yoffset, ++ scrollBarSlider.right() - xoffset, ++ scrollBarSlider.top() + yoffset); ++ painter->drawLine(scrollBarSlider.left() + xoffset, ++ scrollBarSlider.top() + yoffset, ++ scrollBarSlider.left() + xoffset, ++ scrollBarSlider.bottom() - yoffset); ++ } else { ++ QLinearGradient gradient(pixmapRect.center().x(), pixmapRect.top(), ++ pixmapRect.center().x(), pixmapRect.bottom()); ++ if (!horizontal) { ++ gradient = QLinearGradient(pixmapRect.left(), pixmapRect.center().y(), ++ pixmapRect.right(), pixmapRect.center().y()); ++ } ++ if (sunken) { ++ gradient.setColorAt(0, gradientStartColor.lighter(110)); ++ gradient.setColorAt(1, gradientStopColor.lighter(110)); ++ } else { ++ gradient.setColorAt(0, gradientStartColor); ++ gradient.setColorAt(1, gradientStopColor); ++ } ++ painter->setPen(darkOutline); ++ painter->setBrush(gradient); ++ painter->drawRect(pixmapRect); ++ } ++ int gripMargin = 4; ++ //draw grips ++ if (horizontal) { ++ for (int i = -3; i< 6 ; i += 3) { ++ painter->setPen(QPen(gripShadow, 1)); ++ painter->drawLine( ++ QPoint(scrollBarSlider.center().x() + i , ++ scrollBarSlider.top() + gripMargin), ++ QPoint(scrollBarSlider.center().x() + i, ++ scrollBarSlider.bottom() - gripMargin)); ++ painter->setPen(QPen(palette.light(), 1)); ++ painter->drawLine( ++ QPoint(scrollBarSlider.center().x() + i + 1, ++ scrollBarSlider.top() + gripMargin ), ++ QPoint(scrollBarSlider.center().x() + i + 1, ++ scrollBarSlider.bottom() - gripMargin)); ++ } ++ } else { ++ for (int i = -3; i < 6 ; i += 3) { ++ painter->setPen(QPen(gripShadow, 1)); ++ painter->drawLine( ++ QPoint(scrollBarSlider.left() + gripMargin , ++ scrollBarSlider.center().y()+ i), ++ QPoint(scrollBarSlider.right() - gripMargin, ++ scrollBarSlider.center().y()+ i)); ++ painter->setPen(QPen(palette.light(), 1)); ++ painter->drawLine( ++ QPoint(scrollBarSlider.left() + gripMargin, ++ scrollBarSlider.center().y() + 1 + i), ++ QPoint(scrollBarSlider.right() - gripMargin, ++ scrollBarSlider.center().y() + 1 + i)); ++ } ++ } ++ } ++ ++ // The SubLine (up/left) buttons ++ if (scrollBar->subControls & SC_ScrollBarSubLine) { ++ //int scrollBarExtent = pixelMetric(PM_ScrollBarExtent, option, widget); ++ QRect pixmapRect = scrollBarSubLine; ++ if (isEnabled ) { ++ QRect fillRect = pixmapRect.adjusted(1, 1, -1, -1); ++ // Gradients ++ if ((scrollBar->activeSubControls & SC_ScrollBarSubLine) && sunken) { ++ qt_haiku_draw_gradient(painter, ++ QRect(fillRect), ++ gradientStopColor.darker(120), ++ gradientStopColor.darker(120), ++ horizontal ? TopDown : FromLeft, option->palette.button()); ++ } else { ++ qt_haiku_draw_gradient(painter, ++ QRect(fillRect), ++ gradientStartColor.lighter(105), ++ gradientStopColor, ++ horizontal ? TopDown : FromLeft, option->palette.button()); ++ } ++ } ++ // Details ++ QImage subButton; ++ QImage subButtonArrow; ++ if (horizontal) { ++ subButton = QImage(reverse ? qt_scrollbar_buttons : qt_scrollbar_buttons); ++ subButtonArrow = QImage(reverse ? qt_scrollbar_button_arrow_right : qt_scrollbar_button_arrow_left); ++ } else { ++ subButton = QImage(qt_scrollbar_buttons); ++ subButtonArrow = QImage(qt_scrollbar_button_arrow_up); ++ } ++ subButton.setColor(1, alphaCornerColor.rgba()); ++ subButton.setColor(2, darkOutline.rgba()); ++ if ((scrollBar->activeSubControls & SC_ScrollBarSubLine) && sunken) { ++ subButton.setColor(3, gradientStopColor.darker(140).rgba()); ++ subButton.setColor(4, gradientStopColor.darker(120).rgba()); ++ } else { ++ subButton.setColor(3, gradientStartColor.lighter(105).rgba()); ++ subButton.setColor(4, gradientStopColor.rgba()); ++ } ++ subButton.setColor(5, scrollBar->palette.text().color().rgba()); ++ painter->drawImage(pixmapRect, subButton); ++ ++ // Arrows ++ QPoint a_pos = pixmapRect.topLeft()+QPoint(4,4); ++ painter->drawImage(a_pos, subButtonArrow); ++ ++ // The AddLine (down/right) button ++ if (scrollBar->subControls & SC_ScrollBarAddLine) { ++ QString addLinePixmapName = uniqueName(QLatin1String("scrollbar_addline"), option, QSize(16, 16)); ++ QRect pixmapRect = scrollBarAddLine; ++ if (isEnabled) { ++ QRect fillRect = pixmapRect.adjusted(1, 1, -1, -1); ++ // Gradients ++ if ((scrollBar->activeSubControls & SC_ScrollBarAddLine) && sunken) { ++ qt_haiku_draw_gradient(painter, ++ fillRect, ++ gradientStopColor.darker(120), ++ gradientStopColor.darker(120), ++ horizontal ? TopDown: FromLeft, option->palette.button()); ++ } else { ++ qt_haiku_draw_gradient(painter, ++ fillRect, ++ gradientStartColor.lighter(105), ++ gradientStopColor, ++ horizontal ? TopDown : FromLeft, option->palette.button()); ++ } ++ } ++ // Details ++ QImage addButton; ++ QImage subButtonArrow; ++ if (horizontal) { ++ addButton = QImage(reverse ? qt_scrollbar_buttons : qt_scrollbar_buttons); ++ subButtonArrow = QImage(reverse ? qt_scrollbar_button_arrow_left : qt_scrollbar_button_arrow_right); ++ } else { ++ addButton = QImage(qt_scrollbar_buttons); ++ subButtonArrow = QImage(qt_scrollbar_button_arrow_down); ++ } ++ addButton.setColor(1, alphaCornerColor.rgba()); ++ addButton.setColor(2, darkOutline.rgba()); ++ if ((scrollBar->activeSubControls & SC_ScrollBarAddLine) && sunken) { ++ addButton.setColor(3, gradientStopColor.darker(140).rgba()); ++ addButton.setColor(4, gradientStopColor.darker(120).rgba()); ++ } else { ++ addButton.setColor(3, gradientStartColor.lighter(105).rgba()); ++ addButton.setColor(4, gradientStopColor.rgba()); ++ } ++ addButton.setColor(5, scrollBar->palette.text().color().rgba()); ++ painter->drawImage(pixmapRect, addButton); ++ ++ QPoint a_pos = pixmapRect.topLeft()+QPoint(4,4); ++ painter->drawImage(a_pos, subButtonArrow); ++ } ++ } ++ } ++ painter->restore(); ++ break;; ++#endif // QT_NO_SCROLLBAR ++#ifndef QT_NO_COMBOBOX ++ case CC_ComboBox: ++ painter->save(); ++ if (const QStyleOptionComboBox *comboBox = qstyleoption_cast(option)) { ++ bool sunken = comboBox->state & State_On; // play dead, if combobox has no items ++ bool isEnabled = (comboBox->state & State_Enabled); ++ bool focus = isEnabled && (comboBox->state & State_HasFocus); ++ QPixmap cache; ++ QString pixmapName = uniqueName(QLatin1String("combobox"), option, comboBox->rect.size()); ++ if (sunken) ++ pixmapName += QLatin1String("-sunken"); ++ if (comboBox->editable) ++ pixmapName += QLatin1String("-editable"); ++ if (isEnabled) ++ pixmapName += QLatin1String("-enabled"); ++ ++ if (!UsePixmapCache || !QPixmapCache::find(pixmapName, cache)) { ++ cache = QPixmap(comboBox->rect.size()); ++ cache.fill(Qt::transparent); ++ QPainter cachePainter(&cache); ++ QRect pixmapRect(0, 0, comboBox->rect.width(), comboBox->rect.height()); ++ QStyleOptionComboBox comboBoxCopy = *comboBox; ++ comboBoxCopy.rect = pixmapRect; ++ ++ QRect rect = pixmapRect; ++ QRect downArrowRect = subControlRect(CC_ComboBox, &comboBoxCopy, ++ SC_ComboBoxArrow, widget); ++ QRect editRect = subControlRect(CC_ComboBox, &comboBoxCopy, ++ SC_ComboBoxEditField, widget); ++ // Draw a push button ++ if (comboBox->editable) { ++ QStyleOptionFrame buttonOption; ++ buttonOption.QStyleOption::operator=(*comboBox); ++ buttonOption.rect = rect; ++ buttonOption.state = comboBox->state & (State_Enabled | State_MouseOver); ++ ++ if (sunken) { ++ buttonOption.state |= State_Sunken; ++ buttonOption.state &= ~State_MouseOver; ++ } ++ ++ drawPrimitive(PE_PanelButtonCommand, &buttonOption, &cachePainter, widget); ++ ++ if (isEnabled) { ++ if(comboBox->state & State_HasFocus) ++ cachePainter.setPen(QPen(mkQColor(ui_color(B_NAVIGATION_BASE_COLOR)), 0)); ++ else ++ cachePainter.setPen(QPen(QColor(129,129,129), 0)); ++ cachePainter.drawRect(rect.adjusted(2, 2, -3, -2)); ++ } else { ++ QColor buttonBgColor = mkQColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), B_LIGHTEN_1_TINT)); ++ QColor dark1BorderColor = mkQColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), B_DARKEN_1_TINT)); ++ cachePainter.fillRect(rect, option->palette.background()); ++ cachePainter.fillRect(rect.adjusted(2, 2, -3, -2), buttonBgColor); ++ cachePainter.setPen(QPen(dark1BorderColor, 0)); ++ cachePainter.drawRect(rect.adjusted(2, 2, -3, -2)); ++ } ++ } else { ++ QStyleOptionButton buttonOption; ++ buttonOption.QStyleOption::operator=(*comboBox); ++ buttonOption.rect = rect; ++ buttonOption.state = comboBox->state & (State_Enabled | State_MouseOver); ++ if (sunken) { ++ buttonOption.state |= State_Sunken; ++ buttonOption.state &= ~State_MouseOver; ++ } ++ drawPrimitive(PE_PanelButtonCommand, &buttonOption, &cachePainter, widget); ++ ++ cachePainter.setPen(buttonShadow.darker(102)); ++ int borderSize = 4; ++ ++ if (!sunken) { ++ if (comboBox->direction == Qt::RightToLeft) { ++ cachePainter.drawLine(QPoint(downArrowRect.right() + 1, downArrowRect.top() + borderSize), ++ QPoint(downArrowRect.right() + 1, downArrowRect.bottom() - borderSize)); ++ cachePainter.setPen(option->palette.light().color()); ++ cachePainter.drawLine(QPoint(downArrowRect.right(), downArrowRect.top() + borderSize), ++ QPoint(downArrowRect.right(), downArrowRect.bottom() - borderSize)); ++ } else { ++ cachePainter.drawLine(QPoint(downArrowRect.left() - 1, downArrowRect.top() + borderSize), ++ QPoint(downArrowRect.left() - 1, downArrowRect.bottom() - borderSize)); ++ cachePainter.setPen(option->palette.light().color()); ++ cachePainter.drawLine(QPoint(downArrowRect.left() , downArrowRect.top() + borderSize), ++ QPoint(downArrowRect.left() , downArrowRect.bottom() - borderSize)); ++ } ++ } else { ++ cachePainter.setPen(dark.lighter(110)); ++ if (comboBox->direction == Qt::RightToLeft) { ++ cachePainter.drawLine(QPoint(downArrowRect.right() + 1, downArrowRect.top() + borderSize), ++ QPoint(downArrowRect.right() + 1, downArrowRect.bottom() - borderSize)); ++ ++ } else { ++ cachePainter.drawLine(QPoint(downArrowRect.left() - 1, downArrowRect.top() + borderSize), ++ QPoint(downArrowRect.left() - 1, downArrowRect.bottom() - borderSize)); ++ } ++ } ++ } ++ ++ ++ if (comboBox->subControls & SC_ComboBoxArrow) { ++ if (comboBox->editable) { ++ // Draw the down arrow ++ QImage downArrow(qt_scrollbar_button_arrow_down); ++ downArrow.setColor(1, comboBox->palette.foreground().color().rgba()); ++ cachePainter.drawImage(downArrowRect.center().x() - downArrow.width() / 2, ++ downArrowRect.center().y() - downArrow.height() / 2 + 1, downArrow); ++ } else { ++ // Draw the up/down arrow ++ QImage upArrow(qt_scrollbar_button_arrow_up); ++ upArrow.setColor(1, comboBox->palette.foreground().color().rgba()); ++ QImage downArrow(qt_scrollbar_button_arrow_down); ++ downArrow.setColor(1, comboBox->palette.foreground().color().rgba()); ++ cachePainter.drawImage(downArrowRect.center().x() - downArrow.width() / 2, ++ downArrowRect.center().y() - upArrow.height() - 1 , upArrow); ++ cachePainter.drawImage(downArrowRect.center().x() - downArrow.width() / 2, ++ downArrowRect.center().y() + 2, downArrow); ++ } ++ } ++ // Draw the focus rect ++ if ((focus && (option->state & State_KeyboardFocusChange)) && !comboBox->editable) { ++ QStyleOptionFocusRect focus; ++ focus.rect = subControlRect(CC_ComboBox, &comboBoxCopy, SC_ComboBoxEditField, widget) ++ .adjusted(0, 2, option->direction == Qt::RightToLeft ? 1 : -1, -2); ++ drawPrimitive(PE_FrameFocusRect, &focus, &cachePainter, widget); ++ } ++ cachePainter.end(); ++ if (UsePixmapCache) ++ QPixmapCache::insert(pixmapName, cache); ++ } ++ painter->drawPixmap(comboBox->rect.topLeft(), cache); ++ } ++ painter->restore(); ++ break; ++#endif // QT_NO_COMBOBOX ++#ifndef QT_NO_GROUPBOX ++ case CC_GroupBox: ++ painter->save(); ++ if (const QStyleOptionGroupBox *groupBox = qstyleoption_cast(option)) { ++ QRect textRect = subControlRect(CC_GroupBox, groupBox, SC_GroupBoxLabel, widget); ++ QRect checkBoxRect = subControlRect(CC_GroupBox, groupBox, SC_GroupBoxCheckBox, widget); ++ bool flat = groupBox->features & QStyleOptionFrameV2::Flat; ++ ++ if(!flat) { ++ if (groupBox->subControls & QStyle::SC_GroupBoxFrame) { ++ QStyleOptionFrameV2 frame; ++ frame.QStyleOption::operator=(*groupBox); ++ frame.features = groupBox->features; ++ frame.lineWidth = groupBox->lineWidth; ++ frame.midLineWidth = groupBox->midLineWidth; ++ frame.rect = subControlRect(CC_GroupBox, option, SC_GroupBoxFrame, widget); ++ ++ painter->save(); ++ QRegion region(groupBox->rect); ++ bool ltr = groupBox->direction == Qt::LeftToRight; ++ region -= checkBoxRect.united(textRect).adjusted(ltr ? -4 : 0, 0, ltr ? 0 : 4, 0); ++ if (!groupBox->text.isEmpty() || groupBox->subControls & SC_GroupBoxCheckBox) ++ painter->setClipRegion(region); ++ frame.palette.setBrush(QPalette::Dark, option->palette.mid().color().lighter(110)); ++ drawPrimitive(PE_FrameGroupBox, &frame, painter); ++ painter->restore(); ++ } ++ } ++ // Draw title ++ if ((groupBox->subControls & QStyle::SC_GroupBoxLabel) && !groupBox->text.isEmpty()) { ++ if (!groupBox->text.isEmpty()) { ++ QColor textColor = groupBox->textColor; ++ if (textColor.isValid()) ++ painter->setPen(textColor); ++ int alignment = int(groupBox->textAlignment); ++ if (!styleHint(QStyle::SH_UnderlineShortcut, option, widget)) ++ alignment |= Qt::TextHideMnemonic; ++ if (flat) { ++ QFont font = painter->font(); ++ font.setBold(true); ++ painter->setFont(font); ++ if (groupBox->subControls & SC_GroupBoxCheckBox) { ++ textRect.adjust(checkBoxRect.right() + 4, 0, checkBoxRect.right() + 4, 0); ++ } ++ } ++ painter->drawText(textRect, Qt::TextShowMnemonic | Qt::AlignLeft| alignment, groupBox->text); ++ } ++ } ++ if (groupBox->subControls & SC_GroupBoxCheckBox) { ++ QStyleOptionButton box; ++ box.QStyleOption::operator=(*groupBox); ++ box.rect = checkBoxRect; ++ drawPrimitive(PE_IndicatorCheckBox, &box, painter, widget); ++ } ++ } ++ painter->restore(); ++ break; ++#endif // QT_NO_GROUPBOX ++#ifndef QT_NO_SLIDER ++ case CC_Slider: ++ painter->save(); ++ if (const QStyleOptionSlider *slider = qstyleoption_cast(option)) { ++ QRect groove = subControlRect(CC_Slider, option, SC_SliderGroove, widget); ++ QRect handle = subControlRect(CC_Slider, option, SC_SliderHandle, widget); ++ QRect ticks = subControlRect(CC_Slider, option, SC_SliderTickmarks, widget); ++ ++ bool ticksAbove = slider->tickPosition & QSlider::TicksAbove; ++ bool ticksBelow = slider->tickPosition & QSlider::TicksBelow; ++ ++ orientation orient = slider->orientation == Qt::Horizontal?B_HORIZONTAL:B_VERTICAL; ++ ++ if (be_control_look != NULL) { ++ QRect r = groove; ++ rgb_color base = ui_color(B_PANEL_BACKGROUND_COLOR); ++ rgb_color fill_color = ui_color(B_PANEL_BACKGROUND_COLOR); ++ uint32 flags = 0; ++ ++ BRect bRect(0.0f, 0.0f, option->rect.width() - 1, option->rect.height() - 1); ++ TemporarySurface surface(bRect); ++ ++ surface.view()->SetHighColor(base); ++ surface.view()->SetLowColor(base); ++ surface.view()->FillRect(bRect); ++ ++ if ((option->subControls & SC_SliderGroove) && groove.isValid()) { ++ r = groove; ++ bRect = BRect(r.x(), r.y(), r.x()+r.width(), r.y()+r.height()); ++ be_control_look->DrawSliderBar(surface.view(), bRect, bRect, base, fill_color, flags, orient); ++ painter->drawImage(r, surface.image()); ++ } ++ ++ if (option->subControls & SC_SliderTickmarks) { ++ int mlocation = B_HASH_MARKS_NONE; ++ if(ticksAbove)mlocation|=B_HASH_MARKS_TOP; ++ if(ticksBelow)mlocation|=B_HASH_MARKS_BOTTOM; ++ int interval = slider->tickInterval<=0?1:slider->tickInterval; ++ int num = 1+((slider->maximum-slider->minimum)/interval); ++ int len = pixelMetric(PM_SliderLength, slider, widget)/2; ++ r=(orient==B_HORIZONTAL)?option->rect.adjusted(len,0,-len,0):option->rect.adjusted(0,len,0,-len); ++ bRect = BRect(r.x(), r.y(), r.x()+r.width(), r.y()+r.height()); ++ be_control_look->DrawSliderHashMarks(surface.view(), bRect, bRect, base, num, (hash_mark_location)mlocation, flags, orient); ++ } ++ ++ if (option->subControls & SC_SliderHandle ) { ++ r=handle.adjusted(1,1,0,0); ++ bRect = BRect(r.x(), r.y(), r.x()+r.width(), r.y()+r.height()); ++ be_control_look->DrawSliderThumb(surface.view(), bRect, bRect, base, flags, orient); ++ } ++ ++ painter->drawImage(slider->rect, surface.image()); ++ } ++ ++ painter->restore(); ++ } ++ break; ++#endif // QT_NO_SLIDER ++ case CC_ToolButton: ++ { ++ if (const QStyleOptionToolButton *toolbutton ++ = qstyleoption_cast(option)) { ++ QRect button; ++ bool flat = !(widget ? qobject_cast(widget->parentWidget()) : 0); ++ bool flat2 = toolbutton->features & QStyleOptionFrameV2::Flat; ++ bool enabled = toolbutton->state & State_Enabled; ++ bool pushed = (toolbutton->state & State_Sunken) || (toolbutton->state & State_On); ++ ++ button = subControlRect(control, toolbutton, SC_ToolButton, widget); ++ ++ painter->save(); ++ if(flat || flat2 || pushed) { ++ qt_haiku_draw_button(painter,button,false,false,pushed,false,enabled); ++ } ++ ++ painter->restore(); ++ } ++ QWindowsStyle::drawComplexControl(control, option, painter, widget); ++ } ++ break; ++ default: ++ QWindowsStyle::drawComplexControl(control, option, painter, widget); ++ break; ++ } ++} ++ ++/*! ++ \reimp ++*/ ++int QHaikuStyle::pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const ++{ ++ int ret = -1; ++ switch (metric) { ++ case PM_ButtonDefaultIndicator: ++ ret = 0; ++ break; ++ case PM_ButtonShiftHorizontal: ++ case PM_ButtonShiftVertical: ++ ret = 0; ++ break; ++ case PM_MessageBoxIconSize: ++ ret = 48; ++ break; ++ case PM_ListViewIconSize: ++ ret = 24; ++ break; ++ case PM_DialogButtonsSeparator: ++ case PM_SplitterWidth: ++ ret = 6; ++ break; ++ case PM_ScrollBarSliderMin: ++ ret = 26; ++ break; ++ case PM_MenuPanelWidth: //menu framewidth ++ ret = 2; ++ break; ++ case PM_TitleBarHeight: ++ ret = 24; ++ break; ++ case PM_ScrollBarExtent: ++ ret = 15; ++ break; ++ case PM_SliderThickness: ++ ret = 14; ++ break; ++ case PM_SliderLength: ++ ret = 18; ++ break; ++ case PM_DockWidgetTitleMargin: ++ ret = 1; ++ break; ++ case PM_MenuBarVMargin: ++ ret = 1; ++ break; ++ case PM_DefaultFrameWidth: ++ ret = 2; ++ break; ++ case PM_SpinBoxFrameWidth: ++ ret = 3; ++ break; ++ case PM_MenuBarItemSpacing: ++ ret = 6; ++ case PM_MenuBarHMargin: ++ ret = 0; ++ break; ++ case PM_ToolBarHandleExtent: ++ ret = 9; ++ break; ++ case PM_ToolBarItemSpacing: ++ ret = 2; ++ break; ++ case PM_ToolBarFrameWidth: ++ ret = 0; ++ break; ++ case PM_ToolBarItemMargin: ++ ret = 1; ++ break; ++ case PM_SmallIconSize: ++ ret = 16; ++ break; ++ case PM_ButtonIconSize: ++ ret = 24; ++ break; ++ case PM_MenuVMargin: ++ case PM_MenuHMargin: ++ ret = 0; ++ break; ++ case PM_DockWidgetTitleBarButtonMargin: ++ ret = 4; ++ break; ++ case PM_MaximumDragDistance: ++ return -1; ++ case PM_TabCloseIndicatorWidth: ++ case PM_TabCloseIndicatorHeight: ++ return 20; ++ default: ++ break; ++ } ++ ++ return ret != -1 ? ret : QWindowsStyle::pixelMetric(metric, option, widget); ++} ++ ++/*! ++ \reimp ++*/ ++QSize QHaikuStyle::sizeFromContents(ContentsType type, const QStyleOption *option, ++ const QSize &size, const QWidget *widget) const ++{ ++ QSize newSize = QWindowsStyle::sizeFromContents(type, option, size, widget); ++ switch (type) { ++ case CT_PushButton: ++ if (const QStyleOptionButton *btn = qstyleoption_cast(option)) { ++ if (!btn->text.isEmpty() && newSize.width() < 80) ++ newSize.setWidth(80); ++/* if (!btn->icon.isNull() && btn->iconSize.height() > 16) ++ newSize -= QSize(0, 2);*/ ++ } ++ if (const QPushButton *button = qobject_cast(widget)) { ++ if (qobject_cast(button->parentWidget())) { ++ if (newSize.height() < 32) ++ newSize.setHeight(32); ++ } ++ } ++ break; ++ case CT_GroupBox: ++ case CT_RadioButton: ++ case CT_CheckBox: ++ newSize += QSize(3, 2); ++ break; ++ case CT_ToolButton: ++#ifndef QT_NO_TOOLBAR ++ if (widget && qobject_cast(widget->parentWidget())) ++ newSize += QSize(4, 6); ++#endif // QT_NO_TOOLBAR ++ break; ++ case CT_SpinBox: ++ newSize += QSize(0, -2); ++ break; ++ case CT_ComboBox: ++ newSize += QSize(1, 4); ++ break; ++ case CT_LineEdit: ++ newSize += QSize(0, 2); ++ break; ++ case CT_MenuBarItem: ++ newSize += QSize(0, -2); ++ break; ++ case CT_MenuItem: ++ if (const QStyleOptionMenuItem *menuItem = qstyleoption_cast(option)) { ++ if (menuItem->menuItemType == QStyleOptionMenuItem::Separator) { ++ if (!menuItem->text.isEmpty()) { ++ newSize.setHeight(menuItem->fontMetrics.lineSpacing()); ++ } ++ } ++#ifndef QT_NO_COMBOBOX ++ else if (!menuItem->icon.isNull()) { ++ if (const QComboBox *combo = qobject_cast(widget)) { ++ newSize.setHeight(qMax(combo->iconSize().height() + 2, newSize.height())); ++ } ++ } ++#endif // QT_NO_COMBOBOX ++ } ++ break; ++ case CT_MdiControls: ++ if (const QStyleOptionComplex *styleOpt = qstyleoption_cast(option)) { ++ int width = 0; ++ if (styleOpt->subControls & SC_MdiMinButton) ++ width += 19 + 1; ++ if (styleOpt->subControls & SC_MdiNormalButton) ++ width += 19 + 1; ++ if (styleOpt->subControls & SC_MdiCloseButton) ++ width += 19 + 1; ++ newSize = QSize(width, 19); ++ } else { ++ newSize = QSize(60, 19); ++ } ++ break; ++ default: ++ break; ++ } ++ return newSize; ++} ++ ++/*! ++ \reimp ++*/ ++void QHaikuStyle::polish(QApplication *app) ++{ ++ QWindowsStyle::polish(app); ++} ++ ++/*! ++ \reimp ++*/ ++void QHaikuStyle::polish(QWidget *widget) ++{ ++ QWindowsStyle::polish(widget); ++ if (qobject_cast(widget) ++#ifndef QT_NO_COMBOBOX ++ || qobject_cast(widget) ++#endif ++#ifndef QT_NO_PROGRESSBAR ++ || qobject_cast(widget) ++#endif ++#ifndef QT_NO_SCROLLBAR ++ || qobject_cast(widget) ++#endif ++#ifndef QT_NO_SPLITTER ++ || qobject_cast(widget) ++#endif ++ || qobject_cast(widget) ++#ifndef QT_NO_SPINBOX ++ || qobject_cast(widget) ++#endif ++ || (widget->inherits("QWorkspaceChild")) ++ || (widget->inherits("QDockSeparator")) ++ || (widget->inherits("QDockWidgetSeparator")) ++ ) { ++ widget->setAttribute(Qt::WA_Hover, true); ++ } ++} ++ ++/*! ++ \reimp ++*/ ++void QHaikuStyle::polish(QPalette &pal) ++{ ++ QWindowsStyle::polish(pal); ++ //this is a workaround for some themes such as Human, where the contrast ++ //between text and background is too low. ++ QColor highlight = pal.highlight().color(); ++ QColor highlightText = pal.highlightedText().color(); ++ if (qAbs(qGray(highlight.rgb()) - qGray(highlightText.rgb())) < 150) { ++ if (qGray(highlightText.rgb()) < 128) ++ pal.setBrush(QPalette::Highlight, highlight.lighter(145)); ++ } ++} ++ ++/*! ++ \reimp ++*/ ++void QHaikuStyle::unpolish(QWidget *widget) ++{ ++ QWindowsStyle::unpolish(widget); ++ if (qobject_cast(widget) ++#ifndef QT_NO_COMBOBOX ++ || qobject_cast(widget) ++#endif ++#ifndef QT_NO_PROGRESSBAR ++ || qobject_cast(widget) ++#endif ++#ifndef QT_NO_SCROLLBAR ++ || qobject_cast(widget) ++#endif ++#ifndef QT_NO_SPLITTER ++ || qobject_cast(widget) ++#endif ++ || qobject_cast(widget) ++#ifndef QT_NO_SPINBOX ++ || qobject_cast(widget) ++#endif ++ || (widget->inherits("QWorkspaceChild")) ++ || (widget->inherits("QDockSeparator")) ++ || (widget->inherits("QDockWidgetSeparator")) ++ ) { ++ widget->setAttribute(Qt::WA_Hover, false); ++ } ++} ++ ++/*! ++ \reimp ++*/ ++void QHaikuStyle::unpolish(QApplication *app) ++{ ++ QWindowsStyle::unpolish(app); ++} ++ ++/*! ++ \reimp ++*/ ++QRect QHaikuStyle::subControlRect(ComplexControl control, const QStyleOptionComplex *option, ++ SubControl subControl, const QWidget *widget) const ++{ ++ QRect rect = QWindowsStyle::subControlRect(control, option, subControl, widget); ++ ++ switch (control) { ++#ifndef QT_NO_SLIDER ++ case CC_Slider: ++ if (const QStyleOptionSlider *slider = qstyleoption_cast(option)) { ++ int tickSize = pixelMetric(PM_SliderTickmarkOffset, option, widget); ++ switch (subControl) { ++ case SC_SliderHandle: { ++ if (slider->orientation == Qt::Horizontal) { ++ rect.setHeight(pixelMetric(PM_SliderThickness)); ++ rect.setWidth(pixelMetric(PM_SliderLength)); ++ int centerY = slider->rect.center().y() - rect.height() / 2; ++ if (slider->tickPosition & QSlider::TicksAbove) ++ centerY += tickSize; ++ if (slider->tickPosition & QSlider::TicksBelow) ++ centerY -= tickSize; ++ rect.moveTop(centerY); ++ } else { ++ rect.setWidth(pixelMetric(PM_SliderThickness)); ++ rect.setHeight(pixelMetric(PM_SliderLength)); ++ int centerX = slider->rect.center().x() - rect.width() / 2; ++ if (slider->tickPosition & QSlider::TicksAbove) ++ centerX += tickSize; ++ if (slider->tickPosition & QSlider::TicksBelow) ++ centerX -= tickSize; ++ rect.moveLeft(centerX); ++ } ++ } ++ break; ++ case SC_SliderGroove: { ++ QPoint grooveCenter = slider->rect.center(); ++ if (slider->orientation == Qt::Horizontal) { ++ rect.setHeight(7); ++ if (slider->tickPosition & QSlider::TicksAbove) ++ grooveCenter.ry() += tickSize; ++ if (slider->tickPosition & QSlider::TicksBelow) ++ grooveCenter.ry() -= tickSize; ++ } else { ++ rect.setWidth(7); ++ if (slider->tickPosition & QSlider::TicksAbove) ++ grooveCenter.rx() += tickSize; ++ if (slider->tickPosition & QSlider::TicksBelow) ++ grooveCenter.rx() -= tickSize; ++ } ++ rect.moveCenter(grooveCenter); ++ break; ++ } ++ default: ++ break; ++ } ++ } ++ break; ++#endif // QT_NO_SLIDER ++ case CC_ScrollBar: ++ break; ++#ifndef QT_NO_SPINBOX ++ case CC_SpinBox: ++ if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast(option)) { ++ QSize bs; ++ int center = spinbox->rect.height() / 2; ++ int fw = spinbox->frame ? pixelMetric(PM_SpinBoxFrameWidth, spinbox, widget) : 0; ++ int y = fw; ++ bs.setHeight(qMax(8, spinbox->rect.height()/2 - y)); ++ bs.setWidth(15); ++ int x, lx, rx; ++ x = spinbox->rect.width() - y - bs.width() + 2; ++ lx = fw; ++ rx = x - fw; ++ switch (subControl) { ++ case SC_SpinBoxUp: ++ if (spinbox->buttonSymbols == QAbstractSpinBox::NoButtons) ++ return QRect(); ++ rect = QRect(x, fw, bs.width(), center - fw); ++ break; ++ case SC_SpinBoxDown: ++ if (spinbox->buttonSymbols == QAbstractSpinBox::NoButtons) ++ return QRect(); ++ ++ rect = QRect(x, center, bs.width(), spinbox->rect.bottom() - center - fw + 1); ++ break; ++ case SC_SpinBoxEditField: ++ if (spinbox->buttonSymbols == QAbstractSpinBox::NoButtons) { ++ rect = QRect(lx, fw, spinbox->rect.width() - 2*fw, spinbox->rect.height() - 2*fw); ++ } else { ++ rect = QRect(lx, fw, rx - qMax(fw - 1, 0), spinbox->rect.height() - 2*fw); ++ } ++ break; ++ case SC_SpinBoxFrame: ++ rect = spinbox->rect; ++ default: ++ break; ++ } ++ rect = visualRect(spinbox->direction, spinbox->rect, rect); ++ } ++ break; ++#endif // Qt_NO_SPINBOX ++#ifndef QT_NO_GROUPBOX ++ case CC_GroupBox: ++ if (const QStyleOptionGroupBox *groupBox = qstyleoption_cast(option)) { ++ int topMargin = 0; ++ int topHeight = 0; ++ int verticalAlignment = styleHint(SH_GroupBox_TextLabelVerticalAlignment, groupBox, widget); ++ bool flat = groupBox->features & QStyleOptionFrameV2::Flat; ++ if (!groupBox->text.isEmpty()) { ++ topHeight = groupBox->fontMetrics.height(); ++ if (verticalAlignment & Qt::AlignVCenter) ++ topMargin = topHeight / 2; ++ else if (verticalAlignment & Qt::AlignTop) ++ topMargin = topHeight; ++ } ++ QRect frameRect = groupBox->rect; ++ frameRect.setTop(topMargin); ++ if (subControl == SC_GroupBoxFrame) { ++ return rect; ++ } ++ else if (subControl == SC_GroupBoxContents) { ++ if( flat ) { ++ int margin = 0; ++ int leftMarginExtension = 16; ++ rect = frameRect.adjusted(leftMarginExtension + margin, margin + topHeight, -margin, -margin); ++ } ++ break; ++ } ++ if(flat) { ++ if (const QGroupBox *groupBoxWidget = qobject_cast(widget)) { ++ //Prepare metrics for a bold font ++ QFont font = widget->font(); ++ font.setBold(true); ++ QFontMetrics fontMetrics(font); ++ ++ QSize textRect = fontMetrics.boundingRect(groupBoxWidget->title()).size() + QSize(2, 2); ++ if (subControl == SC_GroupBoxCheckBox) { ++ int indicatorWidth = pixelMetric(PM_IndicatorWidth, option, widget); ++ int indicatorHeight = pixelMetric(PM_IndicatorHeight, option, widget); ++ rect.setWidth(indicatorWidth); ++ rect.setHeight(indicatorHeight); ++ rect.moveTop((fontMetrics.height() - indicatorHeight) / 2 + 2); ++ } else if (subControl == SC_GroupBoxLabel) { ++ rect.setSize(textRect); ++ } ++ } ++ } ++ } ++ return rect; ++#ifndef QT_NO_COMBOBOX ++ case CC_ComboBox: ++ switch (subControl) { ++ case SC_ComboBoxArrow: ++ rect = visualRect(option->direction, option->rect, rect); ++ rect.setRect(rect.right() - 15, rect.top() - 2, ++ 16, rect.height() + 4); ++ rect = visualRect(option->direction, option->rect, rect); ++ break; ++ case SC_ComboBoxEditField: { ++ int frameWidth = pixelMetric(PM_DefaultFrameWidth)+1; ++ rect = visualRect(option->direction, option->rect, rect); ++ rect.setRect(option->rect.left() + frameWidth, option->rect.top() + frameWidth, ++ option->rect.width() - 16 - 2 * frameWidth, ++ option->rect.height() - 2 * frameWidth); ++ if (const QStyleOptionComboBox *box = qstyleoption_cast(option)) { ++ if (!box->editable) { ++ rect.adjust(2, 0, 0, 0); ++ if (box->state & (State_Sunken | State_On)) ++ rect.translate(1, 1); ++ } ++ } ++ rect = visualRect(option->direction, option->rect, rect); ++ break; ++ } ++ default: ++ break; ++ } ++ break; ++#endif // QT_NO_COMBOBOX ++#endif //QT_NO_GROUPBOX ++ case CC_TitleBar: ++ if (const QStyleOptionTitleBar *tb = qstyleoption_cast(option)) { ++ SubControl sc = subControl; ++ QRect &ret = rect; ++ const int indent = 3; ++ const int controlTopMargin = 3; ++ const int controlBottomMargin = 3; ++ const int controlWidthMargin = 2; ++ const int controlHeight = tb->rect.height() - controlTopMargin - controlBottomMargin ; ++ const int delta = controlHeight + controlWidthMargin; ++ int offset = 0; ++ ++ bool isMinimized = tb->titleBarState & Qt::WindowMinimized; ++ bool isMaximized = tb->titleBarState & Qt::WindowMaximized; ++ ++ switch (sc) { ++ case SC_TitleBarLabel: ++ if (tb->titleBarFlags & (Qt::WindowTitleHint | Qt::WindowSystemMenuHint)) { ++ ret = tb->rect; ++ if (tb->titleBarFlags & Qt::WindowSystemMenuHint) ++ ret.adjust(delta, 0, -delta, 0); ++ if (tb->titleBarFlags & Qt::WindowMinimizeButtonHint) ++ ret.adjust(0, 0, -delta, 0); ++ if (tb->titleBarFlags & Qt::WindowMaximizeButtonHint) ++ ret.adjust(0, 0, -delta, 0); ++ if (tb->titleBarFlags & Qt::WindowShadeButtonHint) ++ ret.adjust(0, 0, -delta, 0); ++ if (tb->titleBarFlags & Qt::WindowContextHelpButtonHint) ++ ret.adjust(0, 0, -delta, 0); ++ } ++ break; ++ case SC_TitleBarContextHelpButton: ++ if (tb->titleBarFlags & Qt::WindowContextHelpButtonHint) ++ offset += delta; ++ case SC_TitleBarMinButton: ++ if (!isMinimized && (tb->titleBarFlags & Qt::WindowMinimizeButtonHint)) ++ offset += delta; ++ else if (sc == SC_TitleBarMinButton) ++ break; ++ case SC_TitleBarNormalButton: ++ if (isMinimized && (tb->titleBarFlags & Qt::WindowMinimizeButtonHint)) ++ offset += delta; ++ else if (isMaximized && (tb->titleBarFlags & Qt::WindowMaximizeButtonHint)) ++ offset += delta; ++ else if (sc == SC_TitleBarNormalButton) ++ break; ++ case SC_TitleBarMaxButton: ++ if (!isMaximized && (tb->titleBarFlags & Qt::WindowMaximizeButtonHint)) ++ offset += delta; ++ else if (sc == SC_TitleBarMaxButton) ++ break; ++ case SC_TitleBarShadeButton: ++ if (!isMinimized && (tb->titleBarFlags & Qt::WindowShadeButtonHint)) ++ offset += delta; ++ else if (sc == SC_TitleBarShadeButton) ++ break; ++ case SC_TitleBarUnshadeButton: ++ if (isMinimized && (tb->titleBarFlags & Qt::WindowShadeButtonHint)) ++ offset += delta; ++ else if (sc == SC_TitleBarUnshadeButton) ++ break; ++ case SC_TitleBarCloseButton: ++ if (tb->titleBarFlags & Qt::WindowSystemMenuHint) ++ offset += delta; ++ else if (sc == SC_TitleBarCloseButton) ++ break; ++ ret.setRect(tb->rect.right() - indent - offset, tb->rect.top() + controlTopMargin, ++ controlHeight, controlHeight); ++ break; ++ case SC_TitleBarSysMenu: ++ if (tb->titleBarFlags & Qt::WindowSystemMenuHint) { ++ ret.setRect(tb->rect.left() + controlWidthMargin + indent, tb->rect.top() + controlTopMargin, ++ controlHeight, controlHeight); ++ } ++ break; ++ default: ++ break; ++ } ++ ret = visualRect(tb->direction, tb->rect, ret); ++ } ++ break; ++ default: ++ break; ++ } ++ ++ return rect; ++} ++ ++ ++/*! ++ \reimp ++*/ ++QRect QHaikuStyle::itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const ++{ ++ return QWindowsStyle::itemPixmapRect(r, flags, pixmap); ++} ++ ++/*! ++ \reimp ++*/ ++void QHaikuStyle::drawItemPixmap(QPainter *painter, const QRect &rect, ++ int alignment, const QPixmap &pixmap) const ++{ ++ QWindowsStyle::drawItemPixmap(painter, rect, alignment, pixmap); ++} ++ ++/*! ++ \reimp ++*/ ++QStyle::SubControl QHaikuStyle::hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, ++ const QPoint &pt, const QWidget *w) const ++{ ++ return QWindowsStyle::hitTestComplexControl(cc, opt, pt, w); ++} ++ ++/*! ++ \reimp ++*/ ++QPixmap QHaikuStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, ++ const QStyleOption *opt) const ++{ ++ return QWindowsStyle::generatedIconPixmap(iconMode, pixmap, opt); ++} ++ ++/*! ++ \reimp ++*/ ++int QHaikuStyle::styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, ++ QStyleHintReturn *returnData) const ++{ ++ int ret = 0; ++ switch (hint) { ++ case SH_ScrollBar_MiddleClickAbsolutePosition: ++ ret = true; ++ break; ++ case SH_EtchDisabledText: ++ ret = 1; ++ break; ++ case SH_Menu_AllowActiveAndDisabled: ++ ret = false; ++ break; ++ case SH_MainWindow_SpaceBelowMenuBar: ++ ret = 0; ++ break; ++ case SH_MenuBar_MouseTracking: ++ ret = 1; ++ break; ++ case SH_TitleBar_AutoRaise: ++ ret = 1; ++ break; ++ case SH_TitleBar_NoBorder: ++ ret = 1; ++ break; ++ case SH_ItemView_ShowDecorationSelected: ++ ret = true; ++ break; ++ case SH_Table_GridLineColor: ++ if (option) { ++ ret = option->palette.background().color().darker(120).rgb(); ++ break; ++ } ++ case SH_ComboBox_Popup: ++#ifdef QT3_SUPPORT ++ if (widget && widget->inherits("Q3ComboBox")) ++ return 0; ++#endif ++ if (const QStyleOptionComboBox *cmb = qstyleoption_cast(option)) ++ ret = !cmb->editable; ++ else ++ ret = 0; ++ break; ++ case SH_WindowFrame_Mask: ++ ret = 1; ++ if (QStyleHintReturnMask *mask = qstyleoption_cast(returnData)) { ++ //left rounded corner ++ mask->region = option->rect; ++ mask->region -= QRect(option->rect.left(), option->rect.top(), 5, 1); ++ mask->region -= QRect(option->rect.left(), option->rect.top() + 1, 3, 1); ++ mask->region -= QRect(option->rect.left(), option->rect.top() + 2, 2, 1); ++ mask->region -= QRect(option->rect.left(), option->rect.top() + 3, 1, 2); ++ ++ //right rounded corner ++ mask->region -= QRect(option->rect.right() - 4, option->rect.top(), 5, 1); ++ mask->region -= QRect(option->rect.right() - 2, option->rect.top() + 1, 3, 1); ++ mask->region -= QRect(option->rect.right() - 1, option->rect.top() + 2, 2, 1); ++ mask->region -= QRect(option->rect.right() , option->rect.top() + 3, 1, 2); ++ } ++ break; ++ case SH_MessageBox_TextInteractionFlags: ++ ret = Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse; ++ break; ++ case SH_DialogButtonBox_ButtonsHaveIcons: ++ ret = true; ++ break; ++ case SH_MessageBox_CenterButtons: ++ ret = false; ++ break; ++#ifndef QT_NO_WIZARD ++ case SH_WizardStyle: ++ ret = QWizard::ClassicStyle; ++ break; ++#endif ++ case SH_ItemView_ArrowKeysNavigateIntoChildren: ++ ret = false; ++ break; ++ case SH_Menu_SubMenuPopupDelay: ++ ret = 225; // default from GtkMenu ++ break; ++ default: ++ ret = QWindowsStyle::styleHint(hint, option, widget, returnData); ++ break; ++ } ++ return ret; ++} ++ ++/*! \reimp */ ++QRect QHaikuStyle::subElementRect(SubElement sr, const QStyleOption *opt, const QWidget *w) const ++{ ++ QRect r = QWindowsStyle::subElementRect(sr, opt, w); ++ switch (sr) { ++ case SE_PushButtonFocusRect: ++ r.adjust(0, 1, 0, -1); ++ break; ++ case SE_DockWidgetTitleBarText: { ++ const QStyleOptionDockWidgetV2 *v2 ++ = qstyleoption_cast(opt); ++ bool verticalTitleBar = v2 == 0 ? false : v2->verticalTitleBar; ++ if (verticalTitleBar) { ++ r.adjust(0, 0, 0, -4); ++ } else { ++ if (QApplication::layoutDirection() == Qt::LeftToRight) ++ r.adjust(4, 0, 0, 0); ++ else ++ r.adjust(0, 0, -4, 0); ++ } ++ ++ break; ++ } ++ case SE_ProgressBarContents: ++ r = subElementRect(SE_ProgressBarGroove, opt, w); ++ break; ++ default: ++ break; ++ } ++ return r; ++} ++ ++void QHaikuStylePrivate::lookupIconTheme() const ++{ ++} ++ ++/*! ++ \internal ++*/ ++ ++QPixmap ++haikuIconFromMime(const char *mime, icon_size which) ++{ ++ QPixmap pixmap; ++ BMimeType mtype(mime); ++ BBitmap *bmp = new BBitmap(BRect(0, 0, which - 1, which - 1), B_RGBA32); ++ ++ if (mtype.GetIcon(bmp, which) != B_OK) { ++ BMimeType super; ++ mtype.GetSupertype(&super); ++ if (super.GetIcon(bmp, which) != B_OK) { ++ delete bmp; ++ bmp = NULL; ++ } ++ } ++ ++ if(bmp) { ++ pixmap = QPixmap::fromHaikuBitmap(bmp); ++ delete bmp; ++ } ++ ++ return pixmap; ++} ++ ++QIcon QHaikuStyle::standardIconImplementation(StandardPixmap standardIcon, ++ const QStyleOption *option, ++ const QWidget *widget) const ++{ ++ QIcon icon; ++ QPixmap pixmap; ++ ++ switch (standardIcon) { ++ case SP_ComputerIcon: ++ { ++ icon.addPixmap(haikuIconFromMime("application/x-vnd.Be-root",B_MINI_ICON)); ++ icon.addPixmap(haikuIconFromMime("application/x-vnd.Be-root",B_LARGE_ICON)); ++ break; ++ } ++ default: ++ break; ++ } ++ ++ if (icon.isNull()) ++ icon = QCommonStyle::standardIconImplementation(standardIcon, option, widget); ++ return icon; ++} ++ ++/*! ++ \reimp ++ */ ++QPixmap QHaikuStyle::standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, ++ const QWidget *widget) const ++{ ++ return QWindowsStyle::standardPixmap(standardPixmap, opt, widget); ++} ++ ++QT_END_NAMESPACE ++ ++#endif // QT_NO_STYLE_HAIKU || QT_PLUGIN +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/styles/qhaikustyle.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/styles/qhaikustyle.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/styles/qhaikustyle.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/styles/qhaikustyle.h 2011-06-13 22:06:43.366477312 +0000 +@@ -0,0 +1,114 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ++** Contact: Qt Software Information (qt-info@nokia.com) ++** ++** This file is part of the QtGui module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial Usage ++** Licensees holding valid Qt Commercial licenses may use this file in ++** accordance with the Qt Commercial License Agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Nokia. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain ++** additional rights. These rights are described in the Nokia Qt LGPL ++** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this ++** package. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. ++** ++** If you are unsure which license is appropriate for your use, please ++** contact the sales department at qt-sales@nokia.com. ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#ifndef QHAIKYSTYLE_H ++#define QHAIKYSTYLE_H ++ ++#include ++ ++QT_BEGIN_HEADER ++ ++QT_BEGIN_NAMESPACE ++ ++QT_MODULE(Gui) ++ ++#if !defined(QT_NO_STYLE_HAIKU) ++ ++class QHaikuStylePrivate; ++class Q_GUI_EXPORT QHaikuStyle : public QWindowsStyle ++{ ++ Q_OBJECT ++ Q_DECLARE_PRIVATE(QHaikuStyle) ++ ++public: ++ QHaikuStyle(); ++ ~QHaikuStyle(); ++ ++ QPalette standardPalette () const; ++ void drawPrimitive(PrimitiveElement elem, ++ const QStyleOption *option, ++ QPainter *painter, const QWidget *widget = 0) const; ++ void drawControl(ControlElement ce, const QStyleOption *option, QPainter *painter, ++ const QWidget *widget) const; ++ int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const; ++ void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, ++ QPainter *painter, const QWidget *widget) const; ++ QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const; ++ QSize sizeFromContents(ContentsType type, const QStyleOption *option, ++ const QSize &size, const QWidget *widget) const; ++ SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, ++ const QPoint &pt, const QWidget *w = 0) const; ++ QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, ++ SubControl sc, const QWidget *widget) const; ++ QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, ++ const QStyleOption *opt) const; ++ int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, ++ QStyleHintReturn *returnData = 0) const; ++ QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const; ++ QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, ++ const QWidget *widget = 0) const; ++ void drawItemPixmap(QPainter *painter, const QRect &rect, ++ int alignment, const QPixmap &pixmap) const; ++ void drawItemText(QPainter *painter, const QRect &rect, ++ int flags, const QPalette &pal, bool enabled, ++ const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const; ++ void polish(QWidget *widget); ++ void polish(QApplication *app); ++ void polish(QPalette &pal); ++ void unpolish(QWidget *widget); ++ void unpolish(QApplication *app); ++ ++protected Q_SLOTS: ++ QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, ++ const QWidget *widget = 0) const; ++ ++protected: ++ QHaikuStyle(QHaikuStylePrivate &dd); ++ ++}; ++ ++#endif // QT_NO_STYLE_HAIKU ++ ++QT_END_NAMESPACE ++ ++QT_END_HEADER ++ ++#endif // QHAIKUSTYLE_H +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/styles/qhaikustyle_p.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/styles/qhaikustyle_p.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/styles/qhaikustyle_p.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/styles/qhaikustyle_p.h 2011-06-13 22:06:43.367788032 +0000 +@@ -0,0 +1,82 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ++** Contact: Qt Software Information (qt-info@nokia.com) ++** ++** This file is part of the QtGui module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial Usage ++** Licensees holding valid Qt Commercial licenses may use this file in ++** accordance with the Qt Commercial License Agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Nokia. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain ++** additional rights. These rights are described in the Nokia Qt LGPL ++** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this ++** package. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. ++** ++** If you are unsure which license is appropriate for your use, please ++** contact the sales department at qt-sales@nokia.com. ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#ifndef QHAIKYSTYLE_P_H ++#define QHAIKUSTYLE_P_H ++ ++// ++// W A R N I N G ++// ------------- ++// ++// This file is not part of the Qt API. It exists for the convenience ++// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp. This header ++// file may change from version to version without notice, or even be removed. ++// ++// We mean it. ++// ++ ++#include "qwindowsstyle.h" ++#include "qwindowsstyle_p.h" ++ ++#ifndef QT_NO_STYLE_HAIKU ++ ++QT_BEGIN_NAMESPACE ++ ++class QHaikuStylePrivate : public QWindowsStylePrivate ++{ ++ Q_DECLARE_PUBLIC(QHaikuStyle) ++public: ++ QHaikuStylePrivate() ++ : QWindowsStylePrivate() { ++ animationFps = 24; ++ } ++ ++ ~QHaikuStylePrivate() { ++ } ++ ++ void lookupIconTheme() const; ++}; ++ ++QT_END_NAMESPACE ++ ++#endif // QT_NO_STYLE_HAIKU ++ ++#endif //QHAIKUSTYLE_P_H +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/styles/qstylefactory.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/styles/qstylefactory.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/styles/qstylefactory.cpp 2011-03-30 05:19:06.011796480 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/styles/qstylefactory.cpp 2011-06-13 22:06:43.383516672 +0000 +@@ -54,6 +54,9 @@ + #ifndef QT_NO_STYLE_CLEANLOOKS + #include "qcleanlooksstyle.h" + #endif ++#ifndef QT_NO_STYLE_HAIKU ++#include "qhaikustyle.h" ++#endif + #ifndef QT_NO_STYLE_GTK + #include "qgtkstyle.h" + #endif +@@ -172,6 +175,11 @@ QStyle *QStyleFactory::create(const QStr + ret = new QCleanlooksStyle; + else + #endif ++#ifndef QT_NO_STYLE_HAIKU ++ if (style == QLatin1String("haiku")) ++ ret = new QHaikuStyle; ++ else ++#endif + #ifndef QT_NO_STYLE_GTK + if (style == QLatin1String("gtk") || style == QLatin1String("gtk+")) + ret = new QGtkStyle; +@@ -257,6 +265,10 @@ QStringList QStyleFactory::keys() + if (!list.contains(QLatin1String("Cleanlooks"))) + list << QLatin1String("Cleanlooks"); + #endif ++#ifndef QT_NO_STYLE_HAIKU ++ if (!list.contains(QLatin1String("Haiku"))) ++ list << QLatin1String("Haiku"); ++#endif + #ifndef QT_NO_STYLE_MAC + QString mstyle = QLatin1String("Macintosh"); + # ifdef Q_WS_MAC +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/styles/styles.pri qt-everywhere-opensource-src-4.7.3_haiku/src/gui/styles/styles.pri +--- qt-everywhere-opensource-src-4.7.3/src/gui/styles/styles.pri 2011-03-30 05:19:06.011796480 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/styles/styles.pri 2011-06-13 22:06:43.384827392 +0000 +@@ -188,3 +188,11 @@ contains( styles, s60 ):contains(QT_CONF + } + DEFINES += QT_NO_STYLE_S60 + } ++ ++haiku { ++ HEADERS += styles/qhaikustyle.h ++ HEADERS += styles/qhaikustyle_p.h ++ SOURCES += styles/qhaikustyle.cpp ++} else { ++ DEFINES += QT_NO_STYLE_HAIKU ++} +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/text/qfont.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfont.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/text/qfont.cpp 2011-03-30 05:19:05.023592960 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfont.cpp 2011-06-13 22:06:43.387710976 +0000 +@@ -202,6 +202,8 @@ Q_GUI_EXPORT int qt_defaultDpiY() + dpi = qRound(screen->height() / (screen->physicalHeight() / qreal(25.4))); + #elif defined(Q_OS_SYMBIAN) + dpi = S60->defaultDpiY; ++#elif defined(Q_WS_HAIKU) ++ dpi = 72; + #endif // Q_WS_X11 + + return dpi; +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/text/qfont_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfont_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/text/qfont_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfont_haiku.cpp 2011-06-13 22:06:43.389021696 +0000 +@@ -0,0 +1,149 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ++** Contact: Qt Software Information (qt-info@nokia.com) ++** ++** This file is part of the QtGui module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial Usage ++** Licensees holding valid Qt Commercial licenses may use this file in ++** accordance with the Qt Commercial License Agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Nokia. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain ++** additional rights. These rights are described in the Nokia Qt LGPL ++** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this ++** package. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. ++** ++** If you are unsure which license is appropriate for your use, please ++** contact the sales department at qt-sales@nokia.com. ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include "qfont.h" ++#include "qfont_p.h" ++#include "qfontengine_p.h" ++#include "qfontinfo.h" ++#include "qfontmetrics.h" ++#include "qpaintdevice.h" ++#include "qstring.h" ++#include ++#include ++#include ++#include "qfontdatabase.h" ++#include ++#include "qtextengine_p.h" ++#include ++ ++QT_BEGIN_NAMESPACE ++ ++float qt_haiku_defaultDpi_x() ++{ ++ return 72.0; ++} ++ ++int qt_haiku_pixelsize(const QFontDef &def, int dpi) ++{ ++ float ret; ++ if(def.pixelSize == -1) ++ ret = def.pointSize * dpi / qt_haiku_defaultDpi_x(); ++ else ++ ret = def.pixelSize; ++ return qRound(ret); ++} ++ ++int qt_haiku_pointsize(const QFontDef &def, int dpi) ++{ ++ float ret; ++ if(def.pointSize < 0) ++ ret = def.pixelSize * qt_haiku_defaultDpi_x() / float(dpi); ++ else ++ ret = def.pointSize; ++ return qRound(ret); ++} ++ ++Q_GUI_EXPORT const char *qt_fontFamilyFromStyleHint(const QFontDef &request) ++{ ++ const char *family = 0; ++ switch (request.styleHint) { ++ case QFont::Helvetica: ++ family = "DejaVu Sans"; ++ break; ++ case QFont::Times: ++ case QFont::OldEnglish: ++ family = "DejaVu Serif"; ++ break; ++ case QFont::Courier: ++ family = "DejaVu Sans Mono"; ++ break; ++ case QFont::System: ++ family = "DejaVu Sans"; ++ break; ++ case QFont::AnyStyle: ++ if (request.fixedPitch) ++ family = "DejaVu Sans Mono"; ++ else ++ family = "DejaVu Sans"; ++ break; ++ } ++ return family; ++} ++ ++/***************************************************************************** ++ QFont member functions ++ *****************************************************************************/ ++ ++void QFont::initialize() ++{ ++} ++ ++void QFont::cleanup() ++{ ++ QFontCache::cleanup(); ++} ++ ++QString QFont::rawName() const ++{ ++ return family(); ++} ++ ++void QFont::setRawName(const QString &name) ++{ ++ setFamily(name); ++} ++ ++QString QFont::defaultFamily() const ++{ ++ return QLatin1String(qt_fontFamilyFromStyleHint(d->request)); ++} ++ ++QString QFont::lastResortFamily() const ++{ ++ return QString::fromLatin1("DejaVu Sans"); ++} ++ ++QString QFont::lastResortFont() const ++{ ++ return QString::fromLatin1("DejaVu Sans"); ++} ++ ++QT_END_NAMESPACE +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/text/qfont_p.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfont_p.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/text/qfont_p.h 2011-03-30 05:19:05.022806528 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfont_p.h 2011-06-13 22:06:43.390332416 +0000 +@@ -273,6 +273,10 @@ public: + int timer_id; + }; + ++#ifdef Q_WS_HAIKU ++Q_GUI_EXPORT const char *qt_fontFamilyFromStyleHint(const QFontDef &request); ++#endif ++ + QT_END_NAMESPACE + + #endif // QFONT_P_H +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/text/qfontdatabase.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfontdatabase.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/text/qfontdatabase.cpp 2011-03-30 05:19:05.024903680 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfontdatabase.cpp 2011-06-13 22:06:43.392953856 +0000 +@@ -151,10 +151,10 @@ struct QtFontSize + uint yres = 0, uint avgwidth = 0, bool add = false); + unsigned short count : 16; + #endif // Q_WS_X11 +-#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) ++#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) || defined(Q_WS_HAIKU) + QByteArray fileName; + int fileIndex; +-#endif // defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) ++#endif // defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) || defined(Q_WS_HAIKU) + + unsigned short pixelSize : 16; + }; +@@ -230,14 +230,14 @@ struct QtFontStyle + delete [] weightName; + delete [] setwidthName; + #endif +-#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) ++#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) || defined(Q_WS_HAIKU) + while (count) { + // bitfield count-- in while condition does not work correctly in mwccsym2 + count--; + #ifdef Q_WS_X11 + free(pixelSizes[count].encodings); + #endif +-#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) ++#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) || defined(Q_WS_HAIKU) + pixelSizes[count].fileName.~QByteArray(); + #endif + } +@@ -255,7 +255,7 @@ struct QtFontStyle + const char *weightName; + const char *setwidthName; + #endif // Q_WS_X11 +-#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) ++#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) || defined(Q_WS_HAIKU) + bool antialiased; + #endif + +@@ -301,7 +301,7 @@ QtFontSize *QtFontStyle::pixelSize(unsig + pixelSizes[count].count = 0; + pixelSizes[count].encodings = 0; + #endif +-#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) ++#if defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) || defined(Q_WS_HAIKU) + new (&pixelSizes[count].fileName) QByteArray; + pixelSizes[count].fileIndex = 0; + #endif +@@ -474,7 +474,7 @@ QtFontFoundry *QtFontFamily::foundry(con + + // ### copied to tools/makeqpf/qpf2.cpp + +-#if (defined(Q_WS_QWS) && !defined(QT_NO_FREETYPE)) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN) || (defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)) ++#if (defined(Q_WS_QWS) && !defined(QT_NO_FREETYPE)) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_WS_HAIKU) || (defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)) + // see the Unicode subset bitfields in the MSDN docs + static int requiredUnicodeBits[QFontDatabase::WritingSystemsCount][2] = { + // Any, +@@ -994,7 +994,7 @@ static void initFontDef(const QtFontDesc + #endif + #endif + +-#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN) ++#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_WS_HAIKU) + static void getEngineData(const QFontPrivate *d, const QFontCache::Key &key) + { + // look for the requested font in the engine data cache +@@ -1057,6 +1057,8 @@ QT_BEGIN_INCLUDE_NAMESPACE + # include "qfontdatabase_qws.cpp" + #elif defined(Q_OS_SYMBIAN) + # include "qfontdatabase_s60.cpp" ++#elif defined(Q_WS_HAIKU) ++# include "qfontdatabase_haiku.cpp" + #endif + QT_END_INCLUDE_NAMESPACE + +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/text/qfontdatabase_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfontdatabase_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/text/qfontdatabase_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfontdatabase_haiku.cpp 2011-06-13 22:06:43.395051008 +0000 +@@ -0,0 +1,373 @@ ++#include "qfontdatabase.h" ++#include //to get qfontdatabase.cpp compiling ++#include "qfont_p.h" ++#include "qfontengine_p.h" ++#include "qfontengine_ft_p.h" ++#include "qfontengine_haiku_p.h" ++#include "qpaintdevice.h" ++#include "qlibrary.h" ++#include "qabstractfileengine.h" ++#include "qendian.h" ++ ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include FT_FREETYPE_H ++#include FT_TYPES_H ++#include FT_TRUETYPE_TABLES_H ++#include FT_LCD_FILTER_H ++ ++struct FaceData ++{ ++ int index; ++ QString familyName; ++ QtFontStyle::Key styleKey; ++ QList systems; ++ bool fixedPitch; ++ bool smoothScalable; ++ QList pixelSizes; ++}; ++ ++// from qfont_haiku.cpp ++extern int qt_haiku_pixelsize(const QFontDef &def, int dpi); ++extern int qt_haiku_pointsize(const QFontDef &def, int dpi); ++extern float qt_haiku_defaultDpi_x(); ++ ++static void initializeDb() ++{ ++ QFontDatabasePrivate *db = privateDb(); ++ if(!db || db->count) ++ return; ++ ++ extern FT_Library qt_getFreetype(); // qfontengine_ft.cpp ++ FT_Library lib = qt_getFreetype(); ++ ++ directory_which FontDirs[] = { ++ B_BEOS_FONTS_DIRECTORY, ++ B_COMMON_FONTS_DIRECTORY, ++ B_USER_FONTS_DIRECTORY ++ }; ++ ++ ++ for(int nfont=0;nfont<3;nfont++) ++ { ++ BPath fontDir; ++ find_directory(FontDirs[nfont],&fontDir); ++ fontDir.Append("ttfonts"); ++ ++ BDirectory dir(fontDir.Path()); ++ if (dir.InitCheck() != B_OK) ++ continue; ++ ++ BEntry ent; ++ char filename[B_FILE_NAME_LENGTH]; ++ int file_index_value = 0; ++ ++ while (dir.GetNextEntry(&ent) == B_NO_ERROR) ++ { ++ QList facedata; ++ ++ ent.GetName(filename); ++ BPath path = BPath(&dir, filename); ++ ++ FT_Long numFaces = 0; ++ FT_Face face; ++ ++ FT_Error rc = FT_New_Face(lib, path.Path(), -1, &face); ++ if (rc == 0) { ++ numFaces = face->num_faces; ++ FT_Done_Face(face); ++ } ++ ++ for (FT_Long idx = 0; idx < numFaces; ++idx) { ++ rc = FT_New_Face(lib, path.Path(), idx, &face); ++ FaceData fdata; ++ fdata.index = idx; ++ fdata.familyName = QString::fromLatin1(face->family_name); ++ fdata.familyName = fdata.familyName.trimmed(); ++ ++ fdata.styleKey.style = face->style_flags & FT_STYLE_FLAG_ITALIC ? QFont::StyleItalic : QFont::StyleNormal; ++ ++ TT_OS2 *os2_table = 0; ++ if (face->face_flags & FT_FACE_FLAG_SFNT) { ++ os2_table = (TT_OS2 *)FT_Get_Sfnt_Table(face, ft_sfnt_os2); ++ } ++ if (os2_table) { ++ // map weight and width values ++ if (os2_table->usWeightClass < 400) ++ fdata.styleKey.weight = QFont::Light; ++ else if (os2_table->usWeightClass < 600) ++ fdata.styleKey.weight = QFont::Normal; ++ else if (os2_table->usWeightClass < 700) ++ fdata.styleKey.weight = QFont::DemiBold; ++ else if (os2_table->usWeightClass < 800) ++ fdata.styleKey.weight = QFont::Bold; ++ else ++ fdata.styleKey.weight = QFont::Black; ++ ++ switch (os2_table->usWidthClass) { ++ case 1: fdata.styleKey.stretch = QFont::UltraCondensed; break; ++ case 2: fdata.styleKey.stretch = QFont::ExtraCondensed; break; ++ case 3: fdata.styleKey.stretch = QFont::Condensed; break; ++ case 4: fdata.styleKey.stretch = QFont::SemiCondensed; break; ++ case 5: fdata.styleKey.stretch = QFont::Unstretched; break; ++ case 6: fdata.styleKey.stretch = QFont::SemiExpanded; break; ++ case 7: fdata.styleKey.stretch = QFont::Expanded; break; ++ case 8: fdata.styleKey.stretch = QFont::ExtraExpanded; break; ++ case 9: fdata.styleKey.stretch = QFont::UltraExpanded; break; ++ default: fdata.styleKey.stretch = QFont::Unstretched; break; ++ } ++ quint32 unicodeRange[4] = { ++ os2_table->ulUnicodeRange1, os2_table->ulUnicodeRange2, ++ os2_table->ulUnicodeRange3, os2_table->ulUnicodeRange4 ++ }; ++ quint32 codePageRange[2] = { ++ os2_table->ulCodePageRange1, os2_table->ulCodePageRange2 ++ }; ++ fdata.systems = determineWritingSystemsFromTrueTypeBits(unicodeRange, codePageRange); ++ } else { ++ fdata.styleKey.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? QFont::Bold : QFont::Normal; ++ fdata.styleKey.stretch = QFont::Unstretched; ++ } ++ ++ fdata.fixedPitch = face->face_flags & FT_FACE_FLAG_FIXED_WIDTH; ++ fdata.smoothScalable = face->face_flags & FT_FACE_FLAG_SCALABLE; ++ ++ if (face->face_flags & FT_FACE_FLAG_FIXED_SIZES) { ++ for (FT_Int i = 0; i < face->num_fixed_sizes; ++i) { ++ fdata.pixelSizes << face->available_sizes[i].height; ++ } ++ } ++ facedata << fdata; ++ ++ if(face) ++ FT_Done_Face(face); ++ } ++ ++ foreach(FaceData cached, facedata) { ++ const QString foundryName; ++ QtFontFamily *family = privateDb()->family(cached.familyName, true); ++ family->fixedPitch = cached.fixedPitch; ++ ++ for (int i = 0; i < cached.systems.count(); ++i) ++ family->writingSystems[cached.systems.at(i)] = QtFontFamily::Supported; ++ ++ QtFontFoundry *foundry = family->foundry(foundryName, true); ++ QtFontStyle *style = foundry->style(cached.styleKey, true); ++ ++ style->antialiased = true; ++ ++ QByteArray file((const char *)path.Path()); ++ ++ if (cached.smoothScalable && !style->smoothScalable) { ++ style->smoothScalable = true; ++ QtFontSize *size = style->pixelSize(SMOOTH_SCALABLE, true); ++ size->fileName = file; ++ size->fileIndex = cached.index; ++ } ++ ++ foreach(unsigned short pixelSize, cached.pixelSizes) { ++ QtFontSize *size = style->pixelSize(pixelSize, true); ++ // the first bitmap style with a given pixel and point size wins ++ if (!size->fileName.isEmpty()) ++ continue; ++ size->fileName = file; ++ size->fileIndex = cached.index; ++ } ++ } ++ file_index_value++; ++ } ++ } ++} ++ ++static inline void load(const QString &family = QString(), int = -1) ++{ ++} ++ ++static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt) ++{ ++} ++ ++static QFontDef fontDescToFontDef(const QFontDef &req, const QtFontDesc &desc) ++{ ++ static long dpi = qt_haiku_defaultDpi_x(); ++ ++ QFontDef fontDef; ++ ++ fontDef.family = desc.family->name; ++ ++ if (desc.size->pixelSize == SMOOTH_SCALABLE) { ++ // scalable font matched, calculate the missing size (points or pixels) ++ fontDef.pointSize = req.pointSize; ++ fontDef.pixelSize = req.pixelSize; ++ if (req.pointSize < 0) { ++ fontDef.pointSize = req.pixelSize * 72. / dpi; ++ } else if (req.pixelSize == -1) { ++ fontDef.pixelSize = qRound(req.pointSize * dpi / 72.); ++ } ++ } else { ++ // non-scalable font matched, calculate both point and pixel size ++ fontDef.pixelSize = desc.size->pixelSize; ++ fontDef.pointSize = desc.size->pixelSize * 72. / dpi; ++ } ++ ++ fontDef.styleStrategy = req.styleStrategy; ++ fontDef.styleHint = req.styleHint; ++ ++ fontDef.weight = desc.style->key.weight; ++ fontDef.fixedPitch = desc.family->fixedPitch; ++ fontDef.style = desc.style->key.style; ++ fontDef.stretch = desc.style->key.stretch; ++ ++ return fontDef; ++} ++ ++static QFontEngine *loadEngine(const QFontDef &req, const QtFontDesc &desc) ++{ ++ // @todo all these fixed so far; make configurable through the Registry ++ // on per-family basis ++ QFontEngineHaiku::HintStyle hintStyle = QFontEngineHaiku::HintFull; ++ bool autoHint = true; ++ QFontEngineFT::SubpixelAntialiasingType subPixel = QFontEngineFT::Subpixel_None; ++ int lcdFilter = FT_LCD_FILTER_DEFAULT; ++ bool useEmbeddedBitmap = true; ++ ++ QFontEngine::FaceId faceId; ++ faceId.filename = desc.size->fileName; ++ faceId.index = desc.size->fileIndex; ++ ++ QFontEngineFT *fe = new QFontEngineHaiku(fontDescToFontDef(req, desc), faceId, ++ desc.style->antialiased, hintStyle, ++ autoHint, subPixel, lcdFilter, ++ useEmbeddedBitmap); ++ Q_ASSERT(fe); ++ if (fe && fe->invalid()) { ++ FM_DEBUG(" --> invalid!\n"); ++ delete fe; ++ fe = 0; ++ } ++ return fe; ++} ++ ++static QFontEngine *loadHaikuFT(const QFontPrivate *d, int script, const QFontDef &req) ++{ ++ // list of families to try ++ QStringList families = familyList(req); ++ ++ const char *styleHint = qt_fontFamilyFromStyleHint(d->request); ++ if (styleHint) ++ families << QLatin1String(styleHint); ++ ++ // add the default family ++ QString defaultFamily = QApplication::font().family(); ++ if (! families.contains(defaultFamily)) ++ families << defaultFamily; ++ ++ // add QFont::defaultFamily() to the list, for compatibility with ++ // previous versions ++ families << QApplication::font().defaultFamily(); ++ ++ // null family means find the first font matching the specified script ++ families << QString(); ++ ++ QtFontDesc desc; ++ QFontEngine *fe = 0; ++ QList blacklistedFamilies; ++ ++ while (!fe) { ++ for (int i = 0; i < families.size(); ++i) { ++ QString family, foundry; ++ parseFontName(families.at(i), foundry, family); ++ QT_PREPEND_NAMESPACE(match)(script, req, family, foundry, -1, &desc, blacklistedFamilies); ++ if (desc.family) ++ break; ++ } ++ if (!desc.family) ++ break; ++ fe = loadEngine(req, desc); ++ if (!fe) ++ blacklistedFamilies.append(desc.familyIndex); ++ } ++ return fe; ++} ++ ++void QFontDatabase::load(const QFontPrivate *d, int script) ++{ ++ Q_ASSERT(script >= 0 && script < QUnicodeTables::ScriptCount); ++ ++ // normalize the request to get better caching ++ QFontDef req = d->request; ++ ++ if (req.pixelSize <= 0) ++ req.pixelSize = qMax(1, qRound(req.pointSize * d->dpi / qt_haiku_defaultDpi_x())); ++ req.pointSize = 0; ++ if (req.weight == 0) ++ req.weight = QFont::Normal; ++ if (req.stretch == 0) ++ req.stretch = 100; ++ ++ QFontCache::Key key(req, d->rawMode ? QUnicodeTables::Common : script, d->screen); ++ if (!d->engineData) ++ getEngineData(d, key); ++ ++ // the cached engineData could have already loaded the engine we want ++ if (d->engineData->engines[script]) ++ return; ++ ++ // set it to the actual pointsize, so QFontInfo will do the right thing ++ req.pointSize = req.pixelSize * qt_haiku_defaultDpi_x() / d->dpi; ++ ++ QFontEngine *fe = QFontCache::instance()->findEngine(key); ++ ++ // qDebug()<<"QFontDatabase::load(2) pixelsize:"<fontDef = req; ++ } else { ++ QMutexLocker locker(fontDatabaseMutex()); ++ if (!privateDb()->count) ++ initializeDb(); ++ fe = loadHaikuFT(d, script, req); ++ } ++ if (!fe) { ++ fe = new QFontEngineBox(req.pixelSize); ++ fe->fontDef = QFontDef(); ++ } ++ } ++ if (fe->symbol || (d->request.styleStrategy & QFont::NoFontMerging)) { ++ for (int i = 0; i < QUnicodeTables::ScriptCount; ++i) { ++ if (!d->engineData->engines[i]) { ++ d->engineData->engines[i] = fe; ++ fe->ref.ref(); ++ } ++ } ++ } else { ++ d->engineData->engines[script] = fe; ++ fe->ref.ref(); ++ } ++ QFontCache::instance()->insertEngine(key, fe); ++} ++ ++ ++bool QFontDatabase::removeApplicationFont(int handle) ++{ ++ return false; ++} ++ ++bool QFontDatabase::removeAllApplicationFonts() ++{ ++ return false; ++} ++ ++bool QFontDatabase::supportsThreadedFontRendering() ++{ ++ return true; ++} +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/text/qfontengine.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfontengine.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/text/qfontengine.cpp 2011-03-30 05:19:05.028311552 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfontengine.cpp 2011-06-13 22:06:43.396623872 +0000 +@@ -737,7 +737,7 @@ QFontEngineGlyphCache *QFontEngine::glyp + return 0; + } + +-#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) ++#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) || defined(Q_WS_HAIKU) + static inline QFixed kerning(int left, int right, const QFontEngine::KernPair *pairs, int numPairs) + { + uint left_right = (left << 16) + right; +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/text/qfontengine_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfontengine_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/text/qfontengine_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfontengine_haiku.cpp 2011-06-13 22:06:43.397934592 +0000 +@@ -0,0 +1,93 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ++** Contact: Qt Software Information (qt-info@nokia.com) ++** ++** Copyright (C) 2009 netlabs.org. OS/2 parts. ++** ++** This file is part of the QtGui module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial Usage ++** Licensees holding valid Qt Commercial licenses may use this file in ++** accordance with the Qt Commercial License Agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Nokia. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain ++** additional rights. These rights are described in the Nokia Qt LGPL ++** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this ++** package. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. ++** ++** If you are unsure which license is appropriate for your use, please ++** contact the sales department at qt-sales@nokia.com. ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include "qfontengine_p.h" ++#include "qtextengine_p.h" ++ ++#include "qfontengine_haiku_p.h" ++ ++QT_BEGIN_NAMESPACE ++ ++#ifndef QT_NO_FREETYPE ++ ++// ------------------------------------------------------------------ ++// PM FT engine ++// ------------------------------------------------------------------ ++ ++QFontEngineHaiku::QFontEngineHaiku(const QFontDef &fd, const FaceId &faceId, ++ bool antialias, HintStyle hintStyle, ++ bool autoHint, SubpixelAntialiasingType subPixel, ++ int lcdFilter, bool useEmbeddedBitmap) ++ : QFontEngineFT(fd) ++{ ++ subpixelType = subPixel; ++ ++ default_hint_style = (QFontEngineFT::HintStyle)hintStyle; ++ ++#if defined(FT_LOAD_FORCE_AUTOHINT) ++ if (autoHint) ++ default_load_flags |= FT_LOAD_FORCE_AUTOHINT; ++#endif ++ ++ lcdFilterType = lcdFilter; ++ embeddedbitmap = useEmbeddedBitmap; ++ ++ GlyphFormat defaultFormat = Format_None; ++ if (subpixelType != QFontEngineFT::Subpixel_None) ++ defaultFormat = Format_A32; ++ else if (antialias) ++ defaultFormat = Format_A8; ++ else ++ defaultFormat = Format_Mono; ++ ++ init(faceId, antialias, defaultFormat); ++} ++ ++QFontEngineHaiku::~QFontEngineHaiku() ++{ ++ freeGlyphSets(); ++} ++ ++#endif // QT_NO_FREETYPE ++ ++QT_END_NAMESPACE +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/text/qfontengine_haiku_p.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfontengine_haiku_p.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/text/qfontengine_haiku_p.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfontengine_haiku_p.h 2011-06-13 22:06:43.398983168 +0000 +@@ -0,0 +1,90 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ++** Contact: Qt Software Information (qt-info@nokia.com) ++** ++** Copyright (C) 2009 netlabs.org. OS/2 parts. ++** ++** This file is part of the QtGui module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial Usage ++** Licensees holding valid Qt Commercial licenses may use this file in ++** accordance with the Qt Commercial License Agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Nokia. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain ++** additional rights. These rights are described in the Nokia Qt LGPL ++** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this ++** package. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. ++** ++** If you are unsure which license is appropriate for your use, please ++** contact the sales department at qt-sales@nokia.com. ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#ifndef QFONTENGINE_HAIKU_P_H ++#define QFONTENGINE_HAIKU_P_H ++ ++// ++// W A R N I N G ++// ------------- ++// ++// This file is not part of the Qt API. It exists purely as an ++// implementation detail. This header file may change from version to ++// version without notice, or even be removed. ++// ++// We mean it. ++// ++ ++#include ++ ++#ifdef QT_NO_FREETYPE ++# error "The OS/2 version of Qt requires FreeType support, but QT_NO_FREETYPE " \ ++ "is defined!" ++#endif ++ ++QT_BEGIN_NAMESPACE ++ ++#ifndef QT_NO_FREETYPE ++ ++class Q_GUI_EXPORT QFontEngineHaiku : public QFontEngineFT ++{ ++public: ++ enum HintStyle { ++ HintNone = QFontEngineFT::HintNone, ++ HintLight = QFontEngineFT::HintLight, ++ HintMedium = QFontEngineFT::HintMedium, ++ HintFull = QFontEngineFT::HintFull ++ }; ++ ++ explicit QFontEngineHaiku(const QFontDef &fd, const FaceId &faceId, ++ bool antialias, HintStyle hintStyle, ++ bool autoHint, SubpixelAntialiasingType subPixel, ++ int lcdFilter, bool useEmbeddedBitmap); ++ ~QFontEngineHaiku(); ++}; ++ ++#endif ++ ++QT_END_NAMESPACE ++ ++#endif // QFONTENGINE_HAIKU_P_H +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/text/qfontengine_p.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfontengine_p.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/text/qfontengine_p.h 2011-03-30 05:19:05.031457280 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/qfontengine_p.h 2011-06-13 22:06:43.400556032 +0000 +@@ -168,7 +168,7 @@ public: + virtual void recalcAdvances(QGlyphLayout *, QTextEngine::ShaperFlags) const {} + virtual void doKerning(QGlyphLayout *, QTextEngine::ShaperFlags) const; + +-#if !defined(Q_WS_X11) && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) && !defined(Q_OS_SYMBIAN) ++#if !defined(Q_WS_X11) && !defined(Q_WS_WIN) && !defined(Q_WS_MAC) && !defined(Q_OS_SYMBIAN) && !defined(Q_WS_HAIKU) + virtual void draw(QPaintEngine *p, qreal x, qreal y, const QTextItemInt &si) = 0; + #endif + virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs, +@@ -237,7 +237,7 @@ public: + bool symbol; + mutable HB_FontRec hbFont; + mutable HB_Face hbFace; +-#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) ++#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) || defined(Q_WS_HAIKU) + struct KernPair { + uint left_right; + QFixed adjust; +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/text/text.pri qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/text.pri +--- qt-everywhere-opensource-src-4.7.3/src/gui/text/text.pri 2011-03-30 05:19:05.029622272 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/text/text.pri 2011-06-13 22:06:43.401866752 +0000 +@@ -203,5 +203,15 @@ contains(QT_CONFIG, fontconfig) { + CONFIG += opentype + } + ++haiku*: { ++ HEADERS += \ ++ text/qfontengine_ft_p.h \ ++ text/qfontengine_haiku_p.h ++ SOURCES += \ ++ text/qfont_haiku.cpp \ ++ text/qfontengine_ft.cpp \ ++ text/qfontengine_haiku.cpp ++} ++ + DEFINES += QT_NO_OPENTYPE + INCLUDEPATH += ../3rdparty/harfbuzz/src +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/util/qdesktopservices.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/util/qdesktopservices.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/util/qdesktopservices.cpp 2011-03-30 05:19:06.001310720 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/util/qdesktopservices.cpp 2011-06-13 22:06:43.403439616 +0000 +@@ -55,6 +55,8 @@ + #include "qdesktopservices_mac.cpp" + #elif defined(Q_OS_SYMBIAN) + #include "qdesktopservices_s60.cpp" ++#elif defined(Q_WS_HAIKU) ++#include "qdesktopservices_haiku.cpp" + #endif + + #include +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/util/qdesktopservices_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/util/qdesktopservices_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/util/qdesktopservices_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/util/qdesktopservices_haiku.cpp 2011-06-13 22:06:43.404750336 +0000 +@@ -0,0 +1,81 @@ ++#include "qdesktopservices.h" ++#include "qdir.h" ++#include "qurl.h" ++ ++#ifndef QT_NO_DESKTOPSERVICES ++ ++#include ++ ++QT_BEGIN_NAMESPACE ++ ++static bool openDocument(const QUrl &file) ++{ ++ QString cmd = QLatin1String("open ") + file.toString(); ++ system((cmd.toUtf8()).data()); ++ return true; ++} ++ ++static bool launchWebBrowser(const QUrl &url) ++{ ++ QString cmd = QLatin1String("open ") + url.toString(); ++ system((cmd.toUtf8()).data()); ++ return true; ++} ++ ++QString QDesktopServices::storageLocation(StandardLocation type) ++{ ++ if (type == QDesktopServices::HomeLocation) ++ return QLatin1String("/boot/home"); ++ if (type == QDesktopServices::TempLocation) ++ return QDir::tempPath(); ++ ++ if (type == QDesktopServices::CacheLocation) { ++ return QDir::homePath() + QLatin1String("/cache"); ++ } ++ ++ if (type == QDesktopServices::DataLocation) { ++ return QDir::homePath() + QLatin1String("/data"); ++ } ++ ++ QDir emptyDir; ++ QString path; ++ switch (type) { ++ case DesktopLocation: ++ path = QLatin1String("/boot/home/Desktop"); ++ break; ++ case DocumentsLocation: ++ path = QLatin1String("/boot/home/Documents"); ++ break; ++ case PicturesLocation: ++ path = QLatin1String("/boot/home/Pictures"); ++ break; ++ ++ case FontsLocation: ++ path = QLatin1String("/boot/system/data/fonts/ttfonts"); ++ break; ++ ++ case MusicLocation: ++ path = QLatin1String("/boot/home/Music"); ++ break; ++ ++ case MoviesLocation: ++ path = QLatin1String("/boot/home/Videos"); ++ break; ++ ++ case ApplicationsLocation: ++ default: ++ break; ++ } ++ return path; ++} ++ ++QString QDesktopServices::displayName(StandardLocation type) ++{ ++ Q_UNUSED(type); ++ return QString(); ++} ++ ++ ++QT_END_NAMESPACE ++ ++#endif // QT_NO_DESKTOPSERVICES +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/util/qsystemtrayicon.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/util/qsystemtrayicon.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/util/qsystemtrayicon.cpp 2011-03-30 05:19:06.066584576 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/util/qsystemtrayicon.cpp 2011-06-13 22:06:43.406323200 +0000 +@@ -573,7 +573,19 @@ void QBalloonTip::balloon(const QPoint& + } + + QPainterPath path; +-#if defined(QT_NO_XSHAPE) && defined(Q_WS_X11) ++#if defined(Q_WS_HAIKU) ++ path.moveTo(0, 0); ++ path.lineTo(sz.width() - 1, 0); ++ path.lineTo(sz.width() - 1, sz.height() - 1); ++ path.lineTo(0, sz.height() - 1); ++ path.lineTo(0, 0); ++ int dx = pos.x(),dy = pos.y(); ++ if(pos.x()+sz.width() > scr.right()) ++ dx=pos.x()-sz.width(); ++ if(pos.y()+sz.height() > scr.bottom()) ++ dy=pos.y()-sz.height(); ++ move(dx,dy); ++#elif defined(QT_NO_XSHAPE) && defined(Q_WS_X11) + // XShape is required for setting the mask, so we just + // draw an ugly square when its not available + path.moveTo(0, 0); +@@ -581,7 +593,7 @@ void QBalloonTip::balloon(const QPoint& + path.lineTo(sz.width() - 1, sz.height() - 1); + path.lineTo(0, sz.height() - 1); + path.lineTo(0, 0); +- move(qMax(pos.x() - sz.width(), scr.left()), pos.y()); ++ move(qMax(pos.x() - sz.width(), scr.left()), pos.y()); + #else + path.moveTo(ml + rc, mt); + if (arrowAtTop && arrowAtLeft) { +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/util/qsystemtrayicon_haiku.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/gui/util/qsystemtrayicon_haiku.cpp +--- qt-everywhere-opensource-src-4.7.3/src/gui/util/qsystemtrayicon_haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/util/qsystemtrayicon_haiku.cpp 2011-06-13 22:06:43.408158208 +0000 +@@ -0,0 +1,482 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ++** All rights reserved. ++** Contact: Nokia Corporation (qt-info@nokia.com) ++** ++** This file is part of the QtGui module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** No Commercial Usage ++** This file contains pre-release code and may not be distributed. ++** You may use this file in accordance with the terms and conditions ++** contained in the Technology Preview License Agreement accompanying ++** this package. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain additional ++** rights. These rights are described in the Nokia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** If you have questions regarding the use of this file, please contact ++** Nokia at qt-info@nokia.com. ++** ++** ++** ++** ++** ++** ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include "qsystemtrayicon_p.h" ++ ++#ifndef QT_NO_SYSTEMTRAYICON ++ ++QT_BEGIN_NAMESPACE ++ ++#include "qapplication.h" ++#include "qsystemtrayicon.h" ++#include "qdebug.h" ++#include "qcolor.h" ++#include "qfileinfo.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++#define TRAY_MOUSEDOWN 1 ++#define TRAY_MOUSEUP 2 ++ ++#define NF_NONE 0 ++#define NF_QT 1 ++#define NF_NATIVE 2 ++ ++#define maxTipLength 128 ++ ++#define DBAR_SIGNATURE "application/x-vnd.Be-TSKB" ++ ++static int32 notifyMode = NF_NONE; ++ ++QSystemTrayIconLooper::QSystemTrayIconLooper() : QObject(), BLooper("traylooper") ++{ ++} ++ ++thread_id ++QSystemTrayIconLooper::Run(void) ++{ ++ thread_id Thread = BLooper::Run(); ++ return Thread; ++} ++ ++void ++QSystemTrayIconLooper::MessageReceived(BMessage* theMessage) ++{ ++ if( theMessage->what == 'TRAY' || ++ theMessage->what == 'PULS' || ++ theMessage->what == 'LIVE') { ++ BMessage *mes = new BMessage(*theMessage); ++ emit sendHaikuMessage(mes); ++ } ++ BLooper::MessageReceived(theMessage); ++} ++ ++QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *object) ++ : ReplicantId(0), q(object), ignoreNextMouseRelease(false), LiveFactor(0) ++{ ++ Looper = new QSystemTrayIconLooper(); ++ Looper->Run(); ++ ++ pulse = new BMessageRunner(BMessenger(NULL, Looper),new BMessage('PULS'),1000000); ++ ++ InstallIcon(); ++ ++ QObject::connect(Looper,SIGNAL(sendHaikuMessage(BMessage *)),this,SLOT(HaikuEvent(BMessage *)),Qt::QueuedConnection); ++} ++ ++QSystemTrayIconSys::~QSystemTrayIconSys() ++{ ++ BDeskbar deskbar; ++ if(ReplicantId>0) ++ deskbar.RemoveItem(ReplicantId); ++ if(pulse) ++ delete pulse; ++ if(Looper->Lock()) ++ Looper->Quit(); ++} ++ ++void ++QSystemTrayIconSys::InstallIcon(void) ++{ ++ ReplicantId = DeskBarLoadIcon(); ++ ++ QString appName = QFileInfo(QApplication::applicationFilePath()).fileName(); ++ BString app_name((const char *)(appName.toUtf8())); ++ ++ BMessage mes('MSGR'); ++ QSystemTrayIconSys *sys=this; ++ mes.AddMessenger("messenger",BMessenger(NULL,Looper)); ++ mes.AddData("qtrayobject",B_ANY_TYPE,&sys,sizeof(void*)); ++ mes.AddString( "application_name",app_name); ++ ++ SendMessageToReplicant(&mes); ++} ++ ++void QSystemTrayIconSys::HaikuEvent(BMessage *m) ++{ ++ if(m->what == 'PULS') { ++ LiveFactor--; ++ if(LiveFactor<-5) { //Reinstallation time ++ LiveFactor = 0; ++ ReplicantId = 0; ++ InstallIcon(); ++ LiveFactor = 0; ++ UpdateIcon(); ++ UpdateTooltip(); ++ } ++ } ++ if(m->what == 'LIVE') { ++ LiveFactor++; ++ BRect rect; ++ if(m->FindRect("rect",&rect)==B_OK) { ++ shelfRect.setRect(rect.left, rect.top, rect.Width(), rect.Height()); ++ } ++ } ++ if(m->what == 'TRAY') { ++ int32 event = 0; ++ BPoint point(0,0); ++ int32 buttons = 0, ++ clicks = 0; ++ ++ m->FindInt32("event",&event); ++ m->FindPoint("point",&point); ++ m->FindInt32("buttons",&buttons); ++ m->FindInt32("clicks",&clicks); ++ ++ switch(event) { ++ case TRAY_MOUSEUP: ++ { ++ if(buttons==B_PRIMARY_MOUSE_BUTTON) { ++ if (ignoreNextMouseRelease) ++ ignoreNextMouseRelease = false; ++ else ++ emit q->activated(QSystemTrayIcon::Trigger); ++ break; ++ } ++ if(buttons==B_TERTIARY_MOUSE_BUTTON) { ++ emit q->activated(QSystemTrayIcon::MiddleClick); ++ break; ++ } ++ if(buttons==B_SECONDARY_MOUSE_BUTTON) { ++ QPoint gpos = QPoint(point.x,point.y); ++ if (q->contextMenu()) { ++ q->contextMenu()->popup(gpos); ++ ++ BScreen screen(NULL); ++ QRect desktopRect( screen.Frame().left, screen.Frame().top, ++ screen.Frame().right, screen.Frame().bottom); ++ int maxY = desktopRect.y() + desktopRect.height() - q->contextMenu()->height(); ++ if (gpos.y() > maxY) { ++ gpos.ry() = maxY; ++ q->contextMenu()->move(gpos); ++ } ++ } ++ emit q->activated(QSystemTrayIcon::Context); ++ break; ++ } ++ } ++ break; ++ case TRAY_MOUSEDOWN: ++ { ++ if(buttons==B_PRIMARY_MOUSE_BUTTON && clicks==2) { ++ ignoreNextMouseRelease = true; ++ emit q->activated(QSystemTrayIcon::DoubleClick); ++ break; ++ } ++ } ++ break; ++ default: ++ break; ++ } ++ } ++} ++ ++void QSystemTrayIconSys::UpdateTooltip() ++{ ++ QString tip = q->toolTip(); ++ ++ BString tipStr(""); ++ ++ if (!tip.isNull()) { ++ tip = tip.left(maxTipLength - 1) + QChar(); ++ const char *str = (const char *)(tip.toUtf8()); ++ tipStr.SetTo(str); ++ } ++ ++ BMessage *mes = new BMessage('TTIP'); ++ mes->AddString("tooltip",tipStr.String()); ++ SendMessageToReplicant(mes); ++} ++ ++void QSystemTrayIconSys::UpdateIcon() ++{ ++ QIcon qicon = q->icon(); ++ if (qicon.isNull()) ++ return; ++ ++ QSize size = qicon.actualSize(QSize(16, 16)); ++ QPixmap pm = qicon.pixmap(size); ++ if (pm.isNull()) ++ return; ++ ++ BBitmap *icon = pm.toHaikuBitmap(); ++ if(icon) { ++ BMessage bits(B_ARCHIVED_OBJECT); ++ icon->Archive(&bits); ++ BMessage *mes = new BMessage('BITS'); ++ mes->AddMessage("icon",&bits); ++ bits.MakeEmpty(); ++ SendMessageToReplicant(mes); ++ delete icon; ++ } ++ UpdateTooltip(); ++} ++ ++BMessenger ++QSystemTrayIconSys::GetShelfMessenger(void) ++{ ++ BMessenger aResult; ++ status_t aErr = B_OK; ++ BMessenger aDeskbar(DBAR_SIGNATURE, -1, &aErr); ++ if (aErr != B_OK)return aResult; ++ ++ BMessage aMessage(B_GET_PROPERTY); ++ ++ aMessage.AddSpecifier("Messenger"); ++ aMessage.AddSpecifier("Shelf"); ++ aMessage.AddSpecifier("View", "Status"); ++ aMessage.AddSpecifier("Window", "Deskbar"); ++ ++ BMessage aReply; ++ ++ if (aDeskbar.SendMessage(&aMessage, &aReply, 500000, 500000) == B_OK) ++ aReply.FindMessenger("result", &aResult); ++ return aResult; ++} ++ ++status_t ++QSystemTrayIconSys::SendMessageToReplicant(BMessage *msg) ++{ ++ if(ReplicantId<=0) ++ return B_ERROR; ++ ++ BMessage aReply; ++ status_t aErr = B_OK; ++ ++ msg->AddInt32( "what2", msg->what ); ++ msg->what = B_SET_PROPERTY; ++ ++ BMessage uid_specifier(B_ID_SPECIFIER); ++ ++ msg->AddSpecifier("View"); ++ uid_specifier.AddInt32("id", ReplicantId); ++ uid_specifier.AddString("property", "Replicant"); ++ msg->AddSpecifier(&uid_specifier); ++ ++ aErr = GetShelfMessenger().SendMessage( msg, (BHandler*)NULL, 500000 ); ++ return aErr; ++} ++ ++int32 ++QSystemTrayIconSys::ExecuteCommand(char *command) ++{ ++ FILE *fpipe; ++ char line[256]; ++ if ( !(fpipe = (FILE*)popen(command,"r")) ) ++ return -1; ++ ++ fgets( line, sizeof line, fpipe); ++ pclose(fpipe); ++ ++ int res = atoi(line); ++ return res; ++} ++ ++int32 ++QSystemTrayIconSys::DeskBarLoadIcon(team_id tid) ++{ ++ char cmd[256]; ++ sprintf(cmd,"qsystray %d",(int)tid); ++ int32 id = ExecuteCommand(cmd); ++ return id; ++} ++ ++int32 ++QSystemTrayIconSys::DeskBarLoadIcon(void) ++{ ++ thread_info threadInfo; ++ status_t error = get_thread_info(find_thread(NULL), &threadInfo); ++ if (error != B_OK) { ++ fprintf(stderr, "Failed to get info for the current thread: %s\n", strerror(error)); ++ return -1; ++ } ++ team_id sTeam = threadInfo.team; ++ ++ return DeskBarLoadIcon(sTeam); ++} ++ ++void QSystemTrayIconPrivate::install_sys() ++{ ++ fprintf(stderr, "Reimplemented: QSystemTrayIconPrivate::install_sys \n"); ++ Q_Q(QSystemTrayIcon); ++ if (!sys) { ++ sys = new QSystemTrayIconSys(q); ++ sys->UpdateIcon(); ++ } ++ supportsMessages_sys(); ++} ++ ++void QSystemTrayIconPrivate::showMessage_sys(const QString &title, const QString &message, QSystemTrayIcon::MessageIcon type, int timeOut) ++{ ++ fprintf(stderr, "Reimplemented: QSystemTrayIconPrivate::showMessage_sys()\n"); ++ ++ if(notifyMode == NF_QT) { ++ QPoint point(sys->shelfRect.x(),sys->shelfRect.y()); ++ ++ BDeskbar deskbar; ++ BRect deskRect = deskbar.Frame(); ++ BScreen screen(B_MAIN_SCREEN_ID); ++ ++ switch(deskbar.Location()) ++ { ++ case B_DESKBAR_TOP: ++ point.setX(screen.Frame().Width()-8); ++ point.setY(deskRect.Height()+8); ++ break; ++ case B_DESKBAR_RIGHT_TOP: ++ point.setX(screen.Frame().Width()-deskRect.Width()-8); ++ point.setY(8); ++ break; ++ case B_DESKBAR_BOTTOM: ++ point.setX(screen.Frame().Width()-8); ++ point.setY(screen.Frame().Height()-deskRect.Height()-8); ++ break; ++ case B_DESKBAR_LEFT_BOTTOM: ++ point.setX(deskRect.Width()+8); ++ point.setY(screen.Frame().Height()-8); ++ break; ++ case B_DESKBAR_RIGHT_BOTTOM: ++ point.setX(deskRect.Width()-deskRect.Width()-8); ++ point.setY(screen.Frame().Height()-8); ++ break; ++ case B_DESKBAR_LEFT_TOP: ++ point.setX(deskRect.Width()+8); ++ point.setY(8); ++ break; ++ } ++ QBalloonTip::showBalloon(type, title, message, sys->q, point, timeOut, false); ++ } ++ if(notifyMode == NF_NATIVE) { ++ QString cmd; ++ QString stitle(title); ++ stitle.replace(L'"',"''"); ++ stitle.remove(L'\r'); ++ stitle.remove(L'\n'); ++ ++ QString smessage(message); ++ smessage.replace(L'"',"''"); ++ smessage.remove(L'\r'); ++ smessage.remove(L'\n'); ++ ++ cmd = QString("notify --app \"%1\" --type %2 --title \"%3\" --timeout %4 \"%5\"") ++ .arg(QFileInfo(QApplication::applicationFilePath()).fileName()) ++ .arg(type==QSystemTrayIcon::Warning?"important":type==QSystemTrayIcon::Critical?"error":"information") ++ .arg(stitle) ++ .arg(timeOut/1000) ++ .arg(smessage); ++ ++ const char *str = (const char *)(cmd.toUtf8()); ++ system(str); ++ } ++} ++ ++QRect QSystemTrayIconPrivate::geometry_sys() const ++{ ++ fprintf(stderr, "Reimplemented: QSystemTrayIconPrivate::geometry_sys \n"); ++ return sys->shelfRect; ++} ++ ++void QSystemTrayIconPrivate::remove_sys() ++{ ++ fprintf(stderr, "Reimplemented: QSystemTrayIconPrivate::remove_sys \n"); ++ if(sys) { ++ delete sys; ++ sys = NULL; ++ } ++} ++ ++void QSystemTrayIconPrivate::updateIcon_sys() ++{ ++ fprintf(stderr, "Reimplemented: QSystemTrayIconPrivate::updateIcon_sys\n"); ++ if (sys) { ++ sys->UpdateIcon(); ++ } ++} ++ ++void QSystemTrayIconPrivate::updateMenu_sys() ++{ ++ fprintf(stderr, "Unimplemented: QSystemTrayIconPrivate::updateMenu_sys\n"); ++} ++ ++void QSystemTrayIconPrivate::updateToolTip_sys() ++{ ++ fprintf(stderr, "Reimplemented: QSystemTrayIconPrivate::updateToolTip_sys\n"); ++ if (sys) { ++ sys->UpdateTooltip(); ++ } ++} ++ ++bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys() ++{ ++ supportsMessages_sys(); ++ QFileInfo qsystrayfile("/boot/common/bin/qsystray"); ++ return qsystrayfile.exists(); ++} ++ ++bool QSystemTrayIconPrivate::supportsMessages_sys() ++{ ++ QFileInfo notifyfile("/bin/notify"); ++ if(notifyfile.exists()) { ++ notifyMode = NF_NATIVE; ++ } else { ++ notifyMode = NF_QT; ++ } ++ return true; ++} ++ ++QT_END_NAMESPACE ++ ++#endif // QT_NO_SYSTEMTRAYICON +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/util/qsystemtrayicon_haiku.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/util/qsystemtrayicon_haiku.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/util/qsystemtrayicon_haiku.h 1970-01-01 00:00:00.000000000 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/util/qsystemtrayicon_haiku.h 2011-06-13 22:06:43.408944640 +0000 +@@ -0,0 +1,116 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ++** All rights reserved. ++** Contact: Nokia Corporation (qt-info@nokia.com) ++** ++** This file is part of the QtGui module of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** No Commercial Usage ++** This file contains pre-release code and may not be distributed. ++** You may use this file in accordance with the terms and conditions ++** contained in the Technology Preview License Agreement accompanying ++** this package. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain additional ++** rights. These rights are described in the Nokia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** If you have questions regarding the use of this file, please contact ++** Nokia at qt-info@nokia.com. ++** ++** ++** ++** ++** ++** ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#ifndef QSYSTRAYICONHAIKU_H ++#define QSYSTRAYICONHAIKU_H ++ ++#include ++#include ++#include ++#include "qsystemtrayicon.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++QT_BEGIN_HEADER ++ ++QT_BEGIN_NAMESPACE ++ ++QT_MODULE(Gui) ++ ++ ++class QSystemTrayIconLooper :public QObject, public BLooper ++{ ++ Q_OBJECT ++public: ++ QSystemTrayIconLooper(); ++ virtual void MessageReceived(BMessage* theMessage); ++ thread_id Run(void); ++Q_SIGNALS: ++ void sendHaikuMessage(BMessage *); ++}; ++ ++class QSystemTrayIconSys : public QWidget ++{ ++ Q_OBJECT ++public: ++ QSystemTrayIconSys(QSystemTrayIcon *object); ++ ~QSystemTrayIconSys(); ++ ++ void UpdateIcon(); ++ void UpdateTooltip(); ++ status_t SendMessageToReplicant(BMessage *msg); ++ ++ QSystemTrayIcon *q; ++ QSystemTrayIconLooper* Looper; ++ ++ QRect shelfRect; ++ ++public slots: ++ void HaikuEvent(BMessage *m); ++ ++private: ++ BMessenger GetShelfMessenger(void); ++ int32 ExecuteCommand(char *command); ++ int32 DeskBarLoadIcon(team_id tid); ++ int32 DeskBarLoadIcon(void); ++ void InstallIcon(void); ++ ++ int32 ReplicantId; ++ int32 LiveFactor; ++ ++ bool ignoreNextMouseRelease; ++ ++ BMessageRunner *pulse; ++ ++ friend class QSystemTrayIconPrivate; ++}; ++ ++ ++QT_END_NAMESPACE ++ ++QT_END_HEADER ++ ++#endif //QSYSTRAYICONHAIKU_H +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/util/qsystemtrayicon_p.h qt-everywhere-opensource-src-4.7.3_haiku/src/gui/util/qsystemtrayicon_p.h +--- qt-everywhere-opensource-src-4.7.3/src/gui/util/qsystemtrayicon_p.h 2011-03-30 05:19:06.000262144 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/util/qsystemtrayicon_p.h 2011-06-13 22:06:43.409993216 +0000 +@@ -178,6 +178,12 @@ private: + }; + #endif // Q_WS_X11 + ++#if defined(Q_WS_HAIKU) ++QT_BEGIN_INCLUDE_NAMESPACE ++#include "qsystemtrayicon_haiku.h" ++QT_END_INCLUDE_NAMESPACE ++#endif // Q_WS_HAIKU ++ + QT_END_NAMESPACE + + #endif // QT_NO_SYSTEMTRAYICON +diff -rupN qt-everywhere-opensource-src-4.7.3/src/gui/util/util.pri qt-everywhere-opensource-src-4.7.3_haiku/src/gui/util/util.pri +--- qt-everywhere-opensource-src-4.7.3/src/gui/util/util.pri 2011-03-30 05:19:06.002097152 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/gui/util/util.pri 2011-06-13 22:06:43.411303936 +0000 +@@ -56,4 +56,11 @@ symbian { + } else { + DEFINES += USE_SCHEMEHANDLER + } +-} +\ No newline at end of file ++} ++ ++haiku { ++ HEADERS += \ ++ util/qsystemtrayicon_haiku.h ++ SOURCES += \ ++ util/qsystemtrayicon_haiku.cpp ++} +diff -rupN qt-everywhere-opensource-src-4.7.3/src/network/kernel/qnetworkinterface_unix.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/network/kernel/qnetworkinterface_unix.cpp +--- qt-everywhere-opensource-src-4.7.3/src/network/kernel/qnetworkinterface_unix.cpp 2011-03-30 05:19:09.012582912 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/network/kernel/qnetworkinterface_unix.cpp 2011-06-13 22:06:43.413138944 +0000 +@@ -52,6 +52,10 @@ + #include + #include + ++#ifdef Q_OS_HAIKU ++# include ++#endif ++ + #ifdef Q_OS_SOLARIS + # include + #endif +@@ -92,7 +96,9 @@ static QNetworkInterface::InterfaceFlags + { + QNetworkInterface::InterfaceFlags flags = 0; + flags |= (rawFlags & IFF_UP) ? QNetworkInterface::IsUp : QNetworkInterface::InterfaceFlag(0); ++#ifndef Q_OS_HAIKU + flags |= (rawFlags & IFF_RUNNING) ? QNetworkInterface::IsRunning : QNetworkInterface::InterfaceFlag(0); ++#endif + flags |= (rawFlags & IFF_BROADCAST) ? QNetworkInterface::CanBroadcast : QNetworkInterface::InterfaceFlag(0); + flags |= (rawFlags & IFF_LOOPBACK) ? QNetworkInterface::IsLoopBack : QNetworkInterface::InterfaceFlag(0); + #ifdef IFF_POINTOPOINT //cygwin doesn't define IFF_POINTOPOINT +diff -rupN qt-everywhere-opensource-src-4.7.3/src/network/socket/qnativesocketengine_unix.cpp qt-everywhere-opensource-src-4.7.3_haiku/src/network/socket/qnativesocketengine_unix.cpp +--- qt-everywhere-opensource-src-4.7.3/src/network/socket/qnativesocketengine_unix.cpp 2011-03-30 05:19:09.024379392 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/network/socket/qnativesocketengine_unix.cpp 2011-06-13 22:06:43.414973952 +0000 +@@ -705,6 +705,9 @@ qint64 QNativeSocketEnginePrivate::nativ + memcpy(&sockAddrIPv6.sin6_addr.s6_addr, &tmp, sizeof(tmp)); + sockAddrSize = sizeof(sockAddrIPv6); + sockAddrPtr = (struct sockaddr *)&sockAddrIPv6; ++#ifdef Q_OS_HAIKU ++ sockAddrIPv6.sin6_len = sockAddrSize; ++#endif + } else + #endif + if (host.protocol() == QAbstractSocket::IPv4Protocol) { +@@ -714,6 +717,9 @@ qint64 QNativeSocketEnginePrivate::nativ + sockAddrIPv4.sin_addr.s_addr = htonl(host.toIPv4Address()); + sockAddrSize = sizeof(sockAddrIPv4); + sockAddrPtr = (struct sockaddr *)&sockAddrIPv4; ++#ifdef Q_OS_HAIKU ++ sockAddrIPv4.sin_len = sockAddrSize; ++#endif + } + + // ignore the SIGPIPE signal +diff -rupN qt-everywhere-opensource-src-4.7.3/src/tools/uic/qclass_lib_map.h qt-everywhere-opensource-src-4.7.3_haiku/src/tools/uic/qclass_lib_map.h +--- qt-everywhere-opensource-src-4.7.3/src/tools/uic/qclass_lib_map.h 2011-03-30 05:19:08.002883584 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/src/tools/uic/qclass_lib_map.h 2011-06-13 22:06:43.417333248 +0000 +@@ -1410,3 +1410,8 @@ QT_CLASS_LIB(Q3PaintDeviceMetrics, Qt3Su + QT_CLASS_LIB(Q3Painter, Qt3Support, q3painter.h) + QT_CLASS_LIB(Q3Picture, Qt3Support, q3picture.h) + QT_CLASS_LIB(Q3PointArray, Qt3Support, q3pointarray.h) ++QT_CLASS_LIB(QtHaikuView, QtGui, qwidget_haiku.h) ++QT_CLASS_LIB(QtHaikuWindow, QtGui, qwidget_haiku.h) ++QT_CLASS_LIB(QHaikuStyle, QtGui, qhaikustyle.h) ++QT_CLASS_LIB(QSystemTrayIconLooper, QtGui, qsystemtrayicon_haiku.h) ++QT_CLASS_LIB(QSystemTrayIconSys, QtGui, qsystemtrayicon_haiku.h) +diff -rupN qt-everywhere-opensource-src-4.7.3/tools/designer/src/designer/designer.pro qt-everywhere-opensource-src-4.7.3_haiku/tools/designer/src/designer/designer.pro +--- qt-everywhere-opensource-src-4.7.3/tools/designer/src/designer/designer.pro 2011-03-30 05:16:34.058720256 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/tools/designer/src/designer/designer.pro 2011-06-13 22:06:43.419168256 +0000 +@@ -87,4 +87,4 @@ INSTALLS += target + + include(../sharedcomponents.pri) + +-unix:!mac:LIBS += -lm ++unix:!mac:!haiku:LIBS += -lm +diff -rupN qt-everywhere-opensource-src-4.7.3/tools/qtconfig/mainwindow.cpp qt-everywhere-opensource-src-4.7.3_haiku/tools/qtconfig/mainwindow.cpp +--- qt-everywhere-opensource-src-4.7.3/tools/qtconfig/mainwindow.cpp 2011-03-30 05:16:29.027787264 +0000 ++++ qt-everywhere-opensource-src-4.7.3_haiku/tools/qtconfig/mainwindow.cpp 2011-06-13 22:06:43.421265408 +0000 +@@ -73,7 +73,9 @@ + #include + #endif + ++#ifndef Q_OS_HAIKU + #include ++#endif + + QT_BEGIN_NAMESPACE + +@@ -234,9 +236,11 @@ MainWindow::MainWindow() + connect(buttonMainColor2, SIGNAL(colorChanged(QColor)), + this, SLOT(buildPalette())); + ++#ifndef Q_OS_HAIKU + if (X11->desktopEnvironment == DE_KDE) + colorConfig->hide(); + else ++#endif + labelKDENote->hide(); + + QFontDatabase db; \ No newline at end of file diff --git a/dev-qt/qtcore/qtcore-4.7.3.bep b/dev-qt/qtcore/qtcore-4.7.3.bep new file mode 100644 index 000000000..2ac139579 --- /dev/null +++ b/dev-qt/qtcore/qtcore-4.7.3.bep @@ -0,0 +1,24 @@ +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" +HOMEPAGE="http://qt-haiku.ru" +SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/qt/qt-everywhere-opensource-src-4.7.3.tar.gz/49b96eefb1224cc529af6fe5608654fe/qt-everywhere-opensource-src-4.7.3.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="49b96eefb1224cc529af6fe5608654fe" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +BUILD { + cd qt-everywhere-opensource-src-4.7.3 + configure --prefix-install=no -no-pch -no-opengl -no-largefile \ + -fast -nomake examples -nomake demos -release -opensource \ + -confirm-license -no-iconv -phonon -no-phonon-backend \ + -multimedia -no-audio-backend + make +} + +INSTALL { + cd qt-everywhere-opensource-src-4.7.3 + make install INSTALL_ROOT=${DESTDIR} +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2011 Nokia Corporation and/or its subsidiary(-ies)." diff --git a/x11-libs/qt/qt-4.8.x-git.bep b/dev-qt/qtcore/qtcore-4.8.x-git.bep similarity index 78% rename from x11-libs/qt/qt-4.8.x-git.bep rename to dev-qt/qtcore/qtcore-4.8.x-git.bep index 3f2387679..eacedad16 100644 --- a/x11-libs/qt/qt-4.8.x-git.bep +++ b/dev-qt/qtcore/qtcore-4.8.x-git.bep @@ -5,9 +5,9 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -MESSAGE="This port requires gcc4" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." BUILD { - cd qt-4.8.x-git + cd qtcore-4.8.x-git configure --prefix-install=no -no-pch -no-opengl -no-largefile \ -fast -nomake examples -nomake demos -release -opensource \ -confirm-license -no-iconv -phonon -no-phonon-backend \ @@ -16,8 +16,8 @@ BUILD { } INSTALL { - cd qt-4.8.x-git - make install + cd qtcore-4.8.x-git + make install INSTALL_ROOT=${DESTDIR} } LICENSE="GNU LGPL v2.1" diff --git a/dev-qt/qtcore/qtcore-4.8.x.bep b/dev-qt/qtcore/qtcore-4.8.x.bep new file mode 100644 index 000000000..af23591c3 --- /dev/null +++ b/dev-qt/qtcore/qtcore-4.8.x.bep @@ -0,0 +1,24 @@ +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" +HOMEPAGE="http://qt-haiku.ru" +SRC_URI="git://gitorious.org/+qt-haiku/qt/qt-haiku-port.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +#CHECKSUM_MD5="" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +BUILD { + cd qtcore-4.8.x + configure --prefix-install=no -no-pch -no-opengl -no-largefile \ + -fast -nomake examples -nomake demos -release -opensource \ + -confirm-license -no-iconv -phonon -no-phonon-backend \ + -multimedia -no-audio-backend + make +} + +INSTALL { + cd qtcore-4.8.x + make install INSTALL_ROOT=${DESTDIR} +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2011 Nokia Corporation and/or its subsidiary(-ies)." diff --git a/dev-scheme/chicken/chicken-4.7.0.bep b/dev-scheme/chicken/chicken-4.7.0.bep new file mode 100644 index 000000000..a08075989 --- /dev/null +++ b/dev-scheme/chicken/chicken-4.7.0.bep @@ -0,0 +1,40 @@ +DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler" +HOMEPAGE="http://www.call-cc.org/" +SRC_URI="http://code.call-cc.org/releases/4.7.0/chicken-4.7.0.tar.gz" +CHECKSUM_MD5="9389388fdf04c3c64de29633aae12539" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd chicken-4.7.0 + if [ `gcc -dumpversion | cut -f1 -d.` -eq "2" ];then + echo "Removing -fwrapv flag for gcc2 build" + sed -i 's/-fwrapv//' Makefile.haiku + fi + make PLATFORM=haiku PREFIX=`finddir B_COMMON_DIRECTORY` \ + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1 \ + DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/chicken \ + DATADIR=`finddir B_COMMON_DATA_DIRECTORY`/chicken + +} + +INSTALL { + cd chicken-4.7.0 + make PLATFORM=haiku PREFIX=`finddir B_COMMON_DIRECTORY` install \ + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1 \ + DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/chicken \ + DATADIR=`finddir B_COMMON_DATA_DIRECTORY`/chicken +} + +TEST { + if ! type -p csi > /dev/null;then + echo "ERROR: Chicken must be installed before running the test suite" + exit 1 + fi + cd chicken-4.7.0 + make PLATFORM=haiku PREFIX=`finddir B_COMMON_DIRECTORY` check +} + +LICENSE="BSD (2-clause)" +COPYRIGHT="2008-2011 The Chicken Team + 2000-2007 Felix L. Winkelmann" diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.bep b/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.bep new file mode 100644 index 000000000..c16b203e5 --- /dev/null +++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.bep @@ -0,0 +1,34 @@ +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" +STATUS_HAIKU="broken" +DEPEND="" +CHECKSUM_MD5="e2ca96bf71b014eefa11fe10a6f7d1f6" +BUILD { + cd abi-compliance-checker-1.98.3 + sed -i 's/linux|freebsd|openbsd|netbsd/linux|freebsd|openbsd|netbsd|haiku/' Makefile.pl + sed -i 's/$PREFIX\/share\/$TOOL_SNAME/$PREFIX\/data\/$TOOL_SNAME/' Makefile.pl + sed -i 's/..\/share\/$TOOL_SNAME/..\/data\/$TOOL_SNAME/' Makefile.pl +} + +INSTALL { + cd abi-compliance-checker-1.98.3 + mkdir -p $DESTDIR/`finddir B_COMMON_DIRECTORY`/example-descriptors + perl Makefile.pl -install --prefix=`finddir B_COMMON_DIRECTORY` \ + --destdir=$DESTDIR + cp -r `haikuporter -t`/dev-util/abi-compliance-checker/example-descriptors \ + $DESTDIR/`finddir B_COMMON_DIRECTORY`/data/abi-compliance-checker +} + +TEST { + cd abi-compliance-checker-1.98.3 +# make test +# make check +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2009-2010 The Linux Foundation + 2009-2011 Institute for System Programming, RAS + 2011-2012 Nokia Corporation and/or its subsidiary(-ies) + 2011-2012 ROSA Laboratory" diff --git a/dev-util/abi-compliance-checker/example-descriptors/README b/dev-util/abi-compliance-checker/example-descriptors/README new file mode 100644 index 000000000..0d01be915 --- /dev/null +++ b/dev-util/abi-compliance-checker/example-descriptors/README @@ -0,0 +1,29 @@ +This tool can be used to compare the ABIs of different versions of a shared +library. As part of the checking process, it invokes gcc in order to generate +a compiled header, which is not supported by gcc2. +So: only execute this tool if you have gcc4 installed and set as your current +compiler! + +Enclosed are a couple of example descriptors (*.desc), which have been used +to analyze the ABI compatibility of zlib, libpng and libjpeg. + +If you want to do your own checks, you are expected to unpack the sources of +all libraries that you'd like to compare in a folder (such that there is a +subfolder for each library, as usually is the case with xxx.tar.gz +distributions) and build each versions of library. + +Before you can invoke the checker, you need to give it some info about each +library version, by means of a descriptor file. You can ask the checker to +generate a generic descriptor template, or you can use one of the enclosed +descriptor examples as a starting point. + +abi-compliance-checker.pl -l -d1 .desc -d2 .desc + +More info can be found on the tool's homepage: + + http://ispras.linux-foundation.org/index.php/ABI_compliance_checker + +Please send your haiku-specific questions my way: + Oliver Tappe + +Have fun. diff --git a/dev-util/abi-compliance-checker/example-descriptors/libjpeg-6.2.desc b/dev-util/abi-compliance-checker/example-descriptors/libjpeg-6.2.desc new file mode 100644 index 000000000..bd989514b --- /dev/null +++ b/dev-util/abi-compliance-checker/example-descriptors/libjpeg-6.2.desc @@ -0,0 +1,44 @@ + + + + 6.2 + + + + jconfig.h + jerror.h + jmorecfg.h + jpeglib.h + + + + jpeg-6b/.libs/libjpeg.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + jpeg-6b + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + stdio.h + diff --git a/dev-util/abi-compliance-checker/example-descriptors/libjpeg-7.desc b/dev-util/abi-compliance-checker/example-descriptors/libjpeg-7.desc new file mode 100644 index 000000000..4370d5206 --- /dev/null +++ b/dev-util/abi-compliance-checker/example-descriptors/libjpeg-7.desc @@ -0,0 +1,44 @@ + + + + 7 + + + + jconfig.h + jerror.h + jmorecfg.h + jpeglib.h + + + + jpeg-7/.libs/libjpeg.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + jpeg-7 + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + stdio.h + diff --git a/dev-util/abi-compliance-checker/example-descriptors/libjpeg-8.desc b/dev-util/abi-compliance-checker/example-descriptors/libjpeg-8.desc new file mode 100644 index 000000000..3de5327fb --- /dev/null +++ b/dev-util/abi-compliance-checker/example-descriptors/libjpeg-8.desc @@ -0,0 +1,44 @@ + + + + 8 + + + + jconfig.h + jerror.h + jmorecfg.h + jpeglib.h + + + + jpeg-8/.libs/libjpeg.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + jpeg-8 + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + stdio.h + diff --git a/dev-util/abi-compliance-checker/example-descriptors/libpng-1.2.42.desc b/dev-util/abi-compliance-checker/example-descriptors/libpng-1.2.42.desc new file mode 100644 index 000000000..fe6871a3f --- /dev/null +++ b/dev-util/abi-compliance-checker/example-descriptors/libpng-1.2.42.desc @@ -0,0 +1,41 @@ + + + + 1.2.42 + + + + pngconf.h + png.h + + + + libpng-1.2.42/.libs/libpng12.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + libpng-1.2.42 + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + diff --git a/dev-util/abi-compliance-checker/example-descriptors/libpng-1.4.0.desc b/dev-util/abi-compliance-checker/example-descriptors/libpng-1.4.0.desc new file mode 100644 index 000000000..e62a209a2 --- /dev/null +++ b/dev-util/abi-compliance-checker/example-descriptors/libpng-1.4.0.desc @@ -0,0 +1,41 @@ + + + + 1.4.0 + + + + pngconf.h + png.h + + + + libpng-1.4.0/.libs/libpng14.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + libpng-1.4.0 + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + diff --git a/dev-util/abi-compliance-checker/example-descriptors/zlib-1.1.4.desc b/dev-util/abi-compliance-checker/example-descriptors/zlib-1.1.4.desc new file mode 100644 index 000000000..a7b773a9e --- /dev/null +++ b/dev-util/abi-compliance-checker/example-descriptors/zlib-1.1.4.desc @@ -0,0 +1,42 @@ + + + + 1.1.4 + + + + zconf.h + zlib.h + zutil.h + + + + zlib-1.1.4/libz.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + zlib-1.1.4 + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + diff --git a/dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.2.desc b/dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.2.desc new file mode 100644 index 000000000..b1b747ed2 --- /dev/null +++ b/dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.2.desc @@ -0,0 +1,42 @@ + + + + 1.2.2 + + + + zconf.h + zlib.h + zutil.h + + + + zlib-1.2.2/libz.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + zlib-1.2.2 + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + diff --git a/dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.3.desc b/dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.3.desc new file mode 100644 index 000000000..bd15398f4 --- /dev/null +++ b/dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.3.desc @@ -0,0 +1,42 @@ + + + + 1.2.3 + + + + zconf.h + zlib.h + zutil.h + + + + zlib-1.2.3/libz.so + + + + /* The list of paths to be searched for header files needed for compiling of library headers, one per line */ + /* This section is not necessary */ + zlib-1.2.3 + + + + /* Addition gcc options, one per line */ + /* This section is not necessary */ + + + + /* The list of types that should be skipped while checking, one per line */ + /* This section is not necessary */ + + + + /* The list of interfaces that should be skipped while checking, one mangled name per line */ + /* This section is not necessary */ + + + + /* The list of header files that should be included before other headers, one per line */ + /* For example, it is a tree.h for libxml2 and ft2build.h for freetype2 */ + /* This section is not necessary */ + diff --git a/dev-util/astyle/astyle-r339.bep b/dev-util/astyle/astyle-r339.bep new file mode 100644 index 000000000..b7d557061 --- /dev/null +++ b/dev-util/astyle/astyle-r339.bep @@ -0,0 +1,22 @@ +DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code." +HOMEPAGE="http://astyle.sourceforge.net" +SRC_URI="svn+https://astyle.svn.sourceforge.net/svnroot/astyle/trunk/AStyle#339" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +BUILD { + cd astyle-r339/build/gcc + make prefix=$(finddir B_COMMON_DIRECTORY) +} + +INSTALL { + cd astyle-r339/build/gcc + make install \ + prefix="${DESTDIR}/$(finddir B_COMMON_DIRECTORY)" \ + SYSCONF_PATH="${DESTDIR}/$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc/astyle" \ + INSTALL=install +} +LICENSE="GNU LGPL v3" +COPYRIGHT="1998-2002 by Tal Davidson + 2006-2012 Jim Pattee" diff --git a/dev-util/astyle/astyle-r361.bep b/dev-util/astyle/astyle-r361.bep new file mode 100644 index 000000000..820652fd6 --- /dev/null +++ b/dev-util/astyle/astyle-r361.bep @@ -0,0 +1,22 @@ +DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code." +HOMEPAGE="http://astyle.sourceforge.net" +SRC_URI="svn+https://astyle.svn.sourceforge.net/svnroot/astyle/trunk/AStyle#361" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +BUILD { + cd astyle-r361/build/gcc + make prefix=$(finddir B_COMMON_DIRECTORY) +} + +INSTALL { + cd astyle-r361/build/gcc + make install \ + prefix="${DESTDIR}/$(finddir B_COMMON_DIRECTORY)" \ + SYSCONF_PATH="${DESTDIR}/$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc/astyle" \ + INSTALL=install +} +LICENSE="GNU LGPL v3" +COPYRIGHT="1998-2002 by Tal Davidson + 2006-2012 Jim Pattee" diff --git a/dev-util/automoc/automoc-4-git.bep b/dev-util/automoc/automoc-4-git.bep new file mode 100644 index 000000000..c05ae9b06 --- /dev/null +++ b/dev-util/automoc/automoc-4-git.bep @@ -0,0 +1,20 @@ +DESCRIPTION="KDE Meta Object Compiler" +HOMEPAGE="http://techbase.kde.org/Development/Tools/Automoc4" +SRC_URI="git://anongit.kde.org/automoc" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="qt4, + cmake" +BUILD { + cd automoc-4-git + cmake CMakeLists.txt + make +} + +INSTALL { + cd automoc-4-git + make install +} + +LICENSE="BSD (2-clause)" +COPYRIGHT="The KDE Project" \ No newline at end of file diff --git a/dev-util/bakefile/bakefile-0.2.8.bep b/dev-util/bakefile/bakefile-0.2.8.bep index b50fe9a19..e668d3760 100644 --- a/dev-util/bakefile/bakefile-0.2.8.bep +++ b/dev-util/bakefile/bakefile-0.2.8.bep @@ -10,7 +10,7 @@ BUILD { touch ./ChangeLog libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-util/bsdbuild/bsdbuild-2.9.bep b/dev-util/bsdbuild/bsdbuild-2.9.bep new file mode 100644 index 000000000..e77108333 --- /dev/null +++ b/dev-util/bsdbuild/bsdbuild-2.9.bep @@ -0,0 +1,39 @@ +DESCRIPTION="a simple, self-contained and portable build system" +HOMEPAGE="http://hypertriton.com/bsdbuild/" +SRC_URI="http://stable.hypertriton.com/bsdbuild/bsdbuild-2.9.tar.gz" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="dev-lang/perl >= 5.10 + dev-lang/lua >= 5.1" +CHECKSUM_MD5="fd0d4a754024a39d9cf1f5e42f8075b5" +BUILD { + cd bsdbuild-2.9 + cp mkconfigure.pl mkconfigure +# cp gen-dotdepend.pl gen-dotdepend-tmp.pl + sed -i 's#/usr/bin/perl#/boot/common/bin/perl#' mkconfigure + sed -i 's#$INSTALLDIR/gen-dotdepend.pl#./gen-dotdepend.pl#' mkconfigure + cat configure.in | mkconfigure > configure + rm mkconfigure + ./configure --prefix=/boot/common \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --sharedir=`finddir B_COMMON_DATA_DIRECTORY` + make +} + +INSTALL { + cd bsdbuild-2.9 + make install +} + +TEST { + cd bsdbuild-2.9 +# make test +# make check +} + +LICENSE="BSD (2-clause)" +COPYRIGHT="2002-2011 Hypertrition, Inc." diff --git a/dev-util/bsdbuild/patches/bsdbuild-2.9.patch b/dev-util/bsdbuild/patches/bsdbuild-2.9.patch new file mode 100644 index 000000000..971ad9d24 --- /dev/null +++ b/dev-util/bsdbuild/patches/bsdbuild-2.9.patch @@ -0,0 +1,27 @@ +diff -urN bsdbuild-2.9/configure.in bsdbuild-2.9-haiku/configure.in +--- bsdbuild-2.9/configure.in 2011-06-20 12:46:10.031719424 +0000 ++++ bsdbuild-2.9-haiku/configure.in 2011-08-11 21:05:19.596377600 +0000 +@@ -4,7 +4,7 @@ + VERSION("2.9") + RELEASE("Blast of Ancient Atmospheres") + +-MDEFINE(SHAREDIR, "$PREFIX/share/bsdbuild") ++MDEFINE(SHAREDIR, "$SHAREDIR/bsdbuild") + + echo "*" + echo "* Configuration successful." +diff -urN bsdbuild-2.9/mkconfigure.pl bsdbuild-2.9-haiku/mkconfigure.pl +--- bsdbuild-2.9/mkconfigure.pl 2011-05-17 08:06:19.033554432 +0000 ++++ bsdbuild-2.9-haiku/mkconfigure.pl 2011-08-11 22:05:40.015728640 +0000 +@@ -865,7 +865,10 @@ + datadir=$optarg + ;; + --sharedir=*) +- datadir=$optarg ++ sharedir=$optarg ++ ;; ++ --sbindir=*) ++ sbindir=$optarg + ;; + --localedir=*) + localedir=$optarg diff --git a/dev-util/buildsystem/buildsystem-0.bep b/dev-util/buildsystem/buildsystem-0.bep new file mode 100644 index 000000000..3b3a51491 --- /dev/null +++ b/dev-util/buildsystem/buildsystem-0.bep @@ -0,0 +1,19 @@ +DESCRIPTION="NetSurf build framework for compiling some of their libraries" +HOMEPAGE="http://www.netsurf-browser.org/" +SRC_URI="git://git.netsurf-browser.org/buildsystem" +REVISION="1" +STATUS_HAIKU="stable" + +BUILD { + cd buildsystem-0 + make +} + +INSTALL { + cd buildsystem-0 + make install PREFIX=/boot/common/ +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/dev-util/ccache/ccache-3.0.1.bep b/dev-util/ccache/ccache-3.0.1.bep index 0f7300168..afd44e30a 100644 --- a/dev-util/ccache/ccache-3.0.1.bep +++ b/dev-util/ccache/ccache-3.0.1.bep @@ -7,7 +7,8 @@ DEPEND="" CHECKSUM_MD5="223449f7891e5d6a15b25100eca5cca4" BUILD { cd ccache-3.0.1 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } INSTALL { diff --git a/dev-util/ccache/ccache-3.1.4.bep b/dev-util/ccache/ccache-3.1.4.bep new file mode 100644 index 000000000..82185cdb3 --- /dev/null +++ b/dev-util/ccache/ccache-3.1.4.bep @@ -0,0 +1,22 @@ +DESCRIPTION="ccache is a fast compiler cache." +HOMEPAGE="http://ccache.samba.org/" +SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.4.tar.bz2" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="676fda8a9a5e02574435c32b22942abd" +BUILD { + cd ccache-3.1.4 + sed -i 's/\-lm//g' Ma* + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} +INSTALL { + cd ccache-3.1.4 + make install +} + +LICENSE="GNU GPL v3" +COPYRIGHT="2002-2007 Andrew Tridgell + 2009-2011 Joel Rosdahl" diff --git a/dev-util/ccache/ccache-3.1.7.bep b/dev-util/ccache/ccache-3.1.7.bep new file mode 100644 index 000000000..88e8845fc --- /dev/null +++ b/dev-util/ccache/ccache-3.1.7.bep @@ -0,0 +1,22 @@ +DESCRIPTION="ccache is a fast compiler cache." +HOMEPAGE="http://ccache.samba.org/" +SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.7.tar.bz2" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="82257745eac54826527946e9e3d046f4" +BUILD { + cd ccache-3.1.7 + sed -i 's/\-lm//g' Ma* + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} +INSTALL { + cd ccache-3.1.7 + make install +} + +LICENSE="GNU GPL v3" +COPYRIGHT="2002-2007 Andrew Tridgell + 2009-2012 Joel Rosdahl" diff --git a/dev-util/cmake/cmake-2.8-git.bep b/dev-util/cmake/cmake-2.8-git.bep new file mode 100644 index 000000000..bb2e85396 --- /dev/null +++ b/dev-util/cmake/cmake-2.8-git.bep @@ -0,0 +1,33 @@ +DESCRIPTION="cmake - Cross platform Make" +HOMEPAGE="http://www.cmake.org" +SRC_URI="git+http://cmake.org/cmake.git" +#CHECKSUM_MD5="" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="" +BUILD { + cd cmake-2.8-git + # cmake appends the prefix to mandir and datadir + # so using ../../ to back that part out but for some reason + # the doc was also picking up /boot, so had to back it out 3 times + # this seems to work but might still need some further adjusting +# sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=/data/cmake \ + --docdir=/documentation/doc/CMake \ + --mandir=/documentation/man + make +} + +INSTALL { + cd cmake-2.8-git + make install +} + +TEST { + cd cmake-2.8-git + make test +} + +LICENSE="CMake" +COPYRIGHT="2002-2012 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.10.2.bep b/dev-util/cmake/cmake-2.8.10.2.bep new file mode 100644 index 000000000..72db78d2a --- /dev/null +++ b/dev-util/cmake/cmake-2.8.10.2.bep @@ -0,0 +1,27 @@ +DESCRIPTION="cmake - Cross platform Make" +HOMEPAGE="http://www.cmake.org" +SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz" +CHECKSUM_MD5="097278785da7182ec0aea8769d06860c" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd cmake-2.8.10.2 + # cmake assumes the aclocal dir is in share/aclocal + sed -i 's/share\/aclocal/data\/aclocal/g' Source/cmakemain.cxx + sed -i 's/share\/aclocal/data\/aclocal/g' Utilities/CMakeLists.txt + + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=/data/cmake \ + --docdir=/documentation/doc/CMake \ + --mandir=/documentation/man + make +} + +INSTALL { + cd cmake-2.8.10.2 + make install +} + +LICENSE="CMake" +COPYRIGHT="2002-2012 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/patches/cmake-2.8-git.patch b/dev-util/cmake/patches/cmake-2.8-git.patch new file mode 100644 index 000000000..cf4523c08 --- /dev/null +++ b/dev-util/cmake/patches/cmake-2.8-git.patch @@ -0,0 +1,229 @@ +diff -urN cmake-2.8-git-orig/Modules/Platform/Haiku.cmake cmake-2.8-git/Modules/Platform/Haiku.cmake +--- cmake-2.8-git-orig/Modules/Platform/Haiku.cmake 2012-12-03 12:11:47.804519936 -0800 ++++ cmake-2.8-git/Modules/Platform/Haiku.cmake 2012-12-03 12:02:17.652738560 -0800 +@@ -1,20 +1,25 @@ ++set(HAIKU 1) ++set(UNIX 1) ++ ++set(CMAKE_DL_LIBS "") +-set(BEOS 1) +- +-set(CMAKE_DL_LIBS root be) +-set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC") +-set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE") + set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") ++set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") +-set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") + set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") + set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") ++set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") + set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") ++set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") ++ ++list(APPEND CMAKE_SYSTEM_PREFIX_PATH ++ /boot/common/non-packaged ++ /boot/common ++ /boot/system ++ ) ++list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ++ /boot/common/non-packaged/lib ++ /boot/common/lib ++ /boot/develop/lib/x86 ++ ) +- +-include(Platform/UnixPaths) +-list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) +-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) +-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) + list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) + list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) + +diff -urN cmake-2.8-git-orig/Source/cmExportCommand.cxx cmake-2.8-git/Source/cmExportCommand.cxx +--- cmake-2.8-git-orig/Source/cmExportCommand.cxx 2012-11-27 05:26:33.039059456 -0800 ++++ cmake-2.8-git/Source/cmExportCommand.cxx 2012-12-03 12:02:17.665059328 -0800 +@@ -20,7 +20,8 @@ + #include "cmExportBuildFileGenerator.h" + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + cmExportCommand::cmExportCommand() +@@ -305,14 +306,15 @@ + const char* hash) + { + #if defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) != ++ B_OK) + { + return; + } +- dir.Append("cmake/packages"); +- dir.Append(package.c_str()); +- std::string fname = dir.Path(); ++ std::string fname = dir; ++ fname += "/cmake/packages/"; ++ fname += package; + #else + const char* home = cmSystemTools::GetEnv("HOME"); + if(!home) +diff -urN cmake-2.8-git-orig/Source/cmFindPackageCommand.cxx cmake-2.8-git/Source/cmFindPackageCommand.cxx +--- cmake-2.8-git-orig/Source/cmFindPackageCommand.cxx 2012-11-27 05:26:33.059768832 -0800 ++++ cmake-2.8-git/Source/cmFindPackageCommand.cxx 2012-12-03 12:02:17.666107904 -0800 +@@ -19,7 +19,9 @@ + #endif + + #if defined(__HAIKU__) +-#include ++#include ++#include ++#include + #endif + + void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, +@@ -1583,12 +1585,13 @@ + #if defined(_WIN32) && !defined(__CYGWIN__) + this->LoadPackageRegistryWinUser(); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == ++ B_OK) + { +- dir.Append("cmake/packages"); +- dir.Append(this->Name.c_str()); +- this->LoadPackageRegistryDir(dir.Path()); ++ strlcat(dir, "/cmake/packages/", sizeof(dir)); ++ strlcat(dir, this->Name.c_str(), sizeof(dir)); ++ this->LoadPackageRegistryDir(dir); + } + #else + if(const char* home = cmSystemTools::GetEnv("HOME")) +diff -urN cmake-2.8-git-orig/Source/cmLocalGenerator.cxx cmake-2.8-git/Source/cmLocalGenerator.cxx +--- cmake-2.8-git-orig/Source/cmLocalGenerator.cxx 2012-11-27 05:26:33.035389440 -0800 ++++ cmake-2.8-git/Source/cmLocalGenerator.cxx 2012-12-03 12:02:17.672399360 -0800 +@@ -37,7 +37,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + cmLocalGenerator::cmLocalGenerator() +@@ -354,12 +355,12 @@ + prefix = prefix_win32.c_str(); + } + #elif defined(__HAIKU__) ++ char dir[B_PATH_NAME_LENGTH]; + if (!prefix) + { +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- prefix = dir.Path(); ++ prefix = dir; + } + else + { +diff -urN cmake-2.8-git-orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8-git/Source/CPack/cmCPackGenerator.cxx +--- cmake-2.8-git-orig/Source/CPack/cmCPackGenerator.cxx 2012-11-27 05:26:32.015466496 -0800 ++++ cmake-2.8-git/Source/CPack/cmCPackGenerator.cxx 2012-12-03 12:02:17.677904384 -0800 +@@ -27,7 +27,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + //---------------------------------------------------------------------- +@@ -1265,10 +1266,10 @@ + this->InstallPath += "-"; + this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- this->InstallPath = dir.Path(); ++ this->InstallPath = dir; + } + else + { +diff -urN cmake-2.8-git-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8-git/Tests/ComplexOneConfig/Library/CMakeLists.txt +--- cmake-2.8-git-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-11-27 05:26:34.013369344 -0800 ++++ cmake-2.8-git/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-12-03 12:02:42.181665792 -0800 +@@ -51,7 +51,7 @@ + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-if(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") + endif() + get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) +diff -urN cmake-2.8-git-orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8-git/Utilities/cmcurl/CMake/CurlTests.c +--- cmake-2.8-git-orig/Utilities/cmcurl/CMake/CurlTests.c 2012-11-27 05:26:34.045350912 -0800 ++++ cmake-2.8-git/Utilities/cmcurl/CMake/CurlTests.c 2012-12-03 12:02:42.189005824 -0800 +@@ -38,7 +38,7 @@ + # define PLATFORM_AIX_V3 + #endif + +-#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) ++#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) + #error "O_NONBLOCK does not work on this platform" + #endif + int socket; +diff -urN cmake-2.8-git-orig/Utilities/cmcurl/select.c cmake-2.8-git/Utilities/cmcurl/select.c +--- cmake-2.8-git-orig/Utilities/cmcurl/select.c 2012-11-27 05:26:34.055312384 -0800 ++++ cmake-2.8-git/Utilities/cmcurl/select.c 2012-12-03 12:02:42.189792256 -0800 +@@ -39,7 +39,7 @@ + #error "We can't compile without select() support!" + #endif + +-#if defined(__BEOS__) && !defined(__HAIKU__) ++#if defined(__BEOS__) + /* BeOS has FD_SET defined in socket.h */ + #include + #endif +diff -urN cmake-2.8-git-orig/Utilities/cmzlib/zconf.h cmake-2.8-git/Utilities/cmzlib/zconf.h +--- cmake-2.8-git-orig/Utilities/cmzlib/zconf.h 2012-11-27 05:26:34.022020096 -0800 ++++ cmake-2.8-git/Utilities/cmzlib/zconf.h 2012-12-03 12:02:42.190578688 -0800 +@@ -237,7 +237,7 @@ + # endif + #endif + +-#if defined (__BEOS__) && !defined (__HAIKU__) ++#if defined (__BEOS__) + # ifdef ZLIB_DLL + # ifdef ZLIB_INTERNAL + # define ZEXPORT __declspec(dllexport) +diff -urN cmake-2.8-git-orig/Utilities/cmzlib/zutil.h cmake-2.8-git/Utilities/cmzlib/zutil.h +--- cmake-2.8-git-orig/Utilities/cmzlib/zutil.h 2012-11-27 05:26:34.022806528 -0800 ++++ cmake-2.8-git/Utilities/cmzlib/zutil.h 2012-12-03 12:02:42.195559424 -0800 +@@ -147,12 +147,6 @@ + # define OS_CODE 0x0f + #endif + +-/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ +-/* many BeOS workarounds are no longer needed in Haiku */ +-#if defined(__HAIKU__) && defined(__BEOS__) +-#undef __BEOS__ +-#endif +- + #if defined(_BEOS_) || defined(RISCOS) + # define fdopen(fd,mode) NULL /* No fdopen() */ + #endif diff --git a/dev-util/cmake/patches/cmake-2.8.10.2.patch b/dev-util/cmake/patches/cmake-2.8.10.2.patch new file mode 100644 index 000000000..da4732325 --- /dev/null +++ b/dev-util/cmake/patches/cmake-2.8.10.2.patch @@ -0,0 +1,460 @@ +diff -urN cmake-2.8.10.2-orig/bootstrap cmake-2.8.10.2/bootstrap +--- cmake-2.8.10.2-orig/bootstrap 2012-11-27 05:26:34.015728640 -0800 ++++ cmake-2.8.10.2/bootstrap 2012-12-03 12:02:17.615251968 -0800 +@@ -146,7 +146,9 @@ + cmake_default_prefix="c:/Program Files/CMake" + fi + elif ${cmake_system_haiku}; then +- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` ++ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` ++ cmake_man_dir="/documentation/man" ++ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" + else + cmake_default_prefix="/usr/local" + fi +diff -urN cmake-2.8.10.2-orig/Modules/CMakePlatformId.h.in cmake-2.8.10.2/Modules/CMakePlatformId.h.in +--- cmake-2.8.10.2-orig/Modules/CMakePlatformId.h.in 2012-11-27 05:26:32.056623104 -0800 ++++ cmake-2.8.10.2/Modules/CMakePlatformId.h.in 2012-12-03 12:02:17.633864192 -0800 +@@ -35,11 +35,8 @@ + #elif defined(__hpux) || defined(__hpux__) + # define PLATFORM_ID "HP-UX" + +-#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) ++#elif defined(__HAIKU__) + # define PLATFORM_ID "Haiku" +-/* Haiku also defines __BEOS__ so we must +- put it prior to the check for __BEOS__ +-*/ + + #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) + # define PLATFORM_ID "BeOS" +--- cmake-2.8.10.2-orig/Modules/FindFreetype.cmake 2012-11-27 13:26:32.037486592 +0000 ++++ cmake-2.8.10.2/Modules/FindFreetype.cmake 2013-02-10 23:15:25.000000000 +0000 +@@ -46,20 +46,22 @@ + HINTS + ENV FREETYPE_DIR + PATHS ++ /boot/develop/headers + /usr/local/X11R6 + /usr/local/X11 + /usr/freeware +- PATH_SUFFIXES include/freetype2 include ++ PATH_SUFFIXES include/freetype2 include 3rdparty + ) + + find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h + HINTS + ENV FREETYPE_DIR + PATHS ++ /boot/develop/headers + /usr/local/X11R6 + /usr/local/X11 + /usr/freeware +- PATH_SUFFIXES include/freetype2 include ++ PATH_SUFFIXES include/freetype2 include 3rdparty/freetype2 3rdparty + ) + + find_library(FREETYPE_LIBRARY +@@ -68,6 +70,7 @@ + ENV FREETYPE_DIR + PATH_SUFFIXES lib + PATHS ++ /boot/system/lib + /usr/local/X11R6 + /usr/local/X11 + /usr/freeware + +diff -urN cmake-2.8.10.2-orig/Modules/FindGLUT.cmake cmake-2.8.10.2/Modules/FindGLUT.cmake +--- cmake-2.8.10.2-orig/Modules/FindGLUT.cmake 2012-11-27 13:26:32.057147392 +0000 ++++ cmake-2.8.10.2/Modules/FindGLUT.cmake 2012-12-04 09:11:43.176422912 +0000 +@@ -46,19 +46,23 @@ + /usr/openwin/include + /opt/graphics/OpenGL/include + /opt/graphics/OpenGL/contrib/libglut ++ /boot/develop/headers/os/opengl + ) + + find_library( GLUT_glut_LIBRARY glut + /usr/openwin/lib ++ /boot/develop/lib/x86/ + ) + +- find_library( GLUT_Xi_LIBRARY Xi +- /usr/openwin/lib +- ) +- +- find_library( GLUT_Xmu_LIBRARY Xmu +- /usr/openwin/lib +- ) ++ if(NOT BEOS AND NOT HAIKU) ++ find_library( GLUT_Xi_LIBRARY Xi ++ /usr/openwin/lib ++ ) ++ ++ find_library( GLUT_Xmu_LIBRARY Xmu ++ /usr/openwin/lib ++ ) ++ endif() + + endif () + +@@ -70,12 +74,18 @@ + if (GLUT_FOUND) + # Is -lXi and -lXmu required on all platforms that have it? + # If not, we need some way to figure out what platform we are on. +- set( GLUT_LIBRARIES +- ${GLUT_glut_LIBRARY} +- ${GLUT_Xmu_LIBRARY} +- ${GLUT_Xi_LIBRARY} +- ${GLUT_cocoa_LIBRARY} +- ) ++ if(BEOS OR HAIKU) ++ set( GLUT_LIBRARIES ++ ${GLUT_glut_LIBRARY} ++ ) ++ else ++ set( GLUT_LIBRARIES ++ ${GLUT_glut_LIBRARY} ++ ${GLUT_Xmu_LIBRARY} ++ ${GLUT_Xi_LIBRARY} ++ ${GLUT_cocoa_LIBRARY} ++ ) ++ endif() + + #The following deprecated settings are for backwards compatibility with CMake1.4 + set (GLUT_LIBRARY ${GLUT_LIBRARIES}) + +diff -urN cmake-2.8.10.2-orig/Modules/FindLua51.cmake cmake-2.8.10.2/Modules/FindLua51.cmake +--- cmake-2.8.10.2-orig/Modules/FindLua51.cmake 2012-11-27 05:26:32.033030144 -0800 ++++ cmake-2.8.10.2/Modules/FindLua51.cmake 2012-12-03 12:02:17.644612096 -0800 +@@ -54,7 +54,7 @@ + + if(LUA_LIBRARY) + # include the math library for Unix +- if(UNIX AND NOT APPLE) ++ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) + find_library(LUA_MATH_LIBRARY m) + set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") + # For Windows and Mac, don't need to explicitly include the math library +diff -urN cmake-2.8.10.2-orig/Modules/FindOpenGL.cmake cmake-2.8.10.2/Modules/FindOpenGL.cmake +--- cmake-2.8.10.2-orig/Modules/FindOpenGL.cmake 2012-11-27 05:26:32.034340864 -0800 ++++ cmake-2.8.10.2/Modules/FindOpenGL.cmake 2012-12-03 12:02:17.651952128 -0800 +@@ -80,6 +80,7 @@ + /usr/share/doc/NVIDIA_GLX-1.0/include + /usr/openwin/share/include + /opt/graphics/OpenGL/include /usr/X11R6/include ++ /boot/develop/headers/os/opengl + ) + + find_path(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h +@@ -94,6 +95,7 @@ + /usr/openwin/lib + /usr/shlib /usr/X11R6/lib + ${HPUX_IA_OPENGL_LIB_PATH} ++ /boot/develop/lib/x86/ + ) + + # On Unix OpenGL most certainly always requires X11. +diff -urN cmake-2.8.10.2-orig/Modules/Platform/Haiku.cmake cmake-2.8.10.2/Modules/Platform/Haiku.cmake +--- cmake-2.8.10.2-orig/Modules/Platform/Haiku.cmake 2012-12-03 12:11:47.804519936 -0800 ++++ cmake-2.8.10.2/Modules/Platform/Haiku.cmake 2012-12-03 12:02:17.652738560 -0800 +@@ -1,20 +1,25 @@ ++set(HAIKU 1) ++set(UNIX 1) ++ ++set(CMAKE_DL_LIBS "") +-set(BEOS 1) +- +-set(CMAKE_DL_LIBS root be) +-set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC") +-set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE") + set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") ++set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") +-set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") + set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") + set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") ++set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") + set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") ++set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") ++ ++list(APPEND CMAKE_SYSTEM_PREFIX_PATH ++ /boot/common/non-packaged ++ /boot/common ++ /boot/system ++ ) ++list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ++ /boot/common/non-packaged/lib ++ /boot/common/lib ++ /boot/develop/lib/x86 ++ ) +- +-include(Platform/UnixPaths) +-list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) +-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) +-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) + list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) + list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) + +diff -urN cmake-2.8.10.2-orig/Source/cmCTest.cxx cmake-2.8.10.2/Source/cmCTest.cxx +--- cmake-2.8.10.2-orig/Source/cmCTest.cxx 2012-11-27 05:26:32.060030976 -0800 ++++ cmake-2.8.10.2/Source/cmCTest.cxx 2012-12-03 12:02:17.659816448 -0800 +@@ -53,7 +53,7 @@ + #include + #include + +-#if defined(__BEOS__) && !defined(__HAIKU__) ++#if defined(__BEOS__) + #include /* disable_debugger() API. */ + #endif + +diff -urN cmake-2.8.10.2-orig/Source/cmExportCommand.cxx cmake-2.8.10.2/Source/cmExportCommand.cxx +--- cmake-2.8.10.2-orig/Source/cmExportCommand.cxx 2012-11-27 05:26:33.039059456 -0800 ++++ cmake-2.8.10.2/Source/cmExportCommand.cxx 2012-12-03 12:02:17.665059328 -0800 +@@ -20,7 +20,8 @@ + #include "cmExportBuildFileGenerator.h" + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + cmExportCommand::cmExportCommand() +@@ -305,14 +306,15 @@ + const char* hash) + { + #if defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) != ++ B_OK) + { + return; + } +- dir.Append("cmake/packages"); +- dir.Append(package.c_str()); +- std::string fname = dir.Path(); ++ std::string fname = dir; ++ fname += "/cmake/packages/"; ++ fname += package; + #else + const char* home = cmSystemTools::GetEnv("HOME"); + if(!home) +diff -urN cmake-2.8.10.2-orig/Source/cmFindPackageCommand.cxx cmake-2.8.10.2/Source/cmFindPackageCommand.cxx +--- cmake-2.8.10.2-orig/Source/cmFindPackageCommand.cxx 2012-11-27 05:26:33.059768832 -0800 ++++ cmake-2.8.10.2/Source/cmFindPackageCommand.cxx 2012-12-03 12:02:17.666107904 -0800 +@@ -19,7 +19,9 @@ + #endif + + #if defined(__HAIKU__) +-#include ++#include ++#include ++#include + #endif + + void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, +@@ -1583,12 +1585,13 @@ + #if defined(_WIN32) && !defined(__CYGWIN__) + this->LoadPackageRegistryWinUser(); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == ++ B_OK) + { +- dir.Append("cmake/packages"); +- dir.Append(this->Name.c_str()); +- this->LoadPackageRegistryDir(dir.Path()); ++ strlcat(dir, "/cmake/packages/", sizeof(dir)); ++ strlcat(dir, this->Name.c_str(), sizeof(dir)); ++ this->LoadPackageRegistryDir(dir); + } + #else + if(const char* home = cmSystemTools::GetEnv("HOME")) +diff -urN cmake-2.8.10.2-orig/Source/cmLocalGenerator.cxx cmake-2.8.10.2/Source/cmLocalGenerator.cxx +--- cmake-2.8.10.2-orig/Source/cmLocalGenerator.cxx 2012-11-27 05:26:33.035389440 -0800 ++++ cmake-2.8.10.2/Source/cmLocalGenerator.cxx 2012-12-03 12:02:17.672399360 -0800 +@@ -37,7 +37,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + cmLocalGenerator::cmLocalGenerator() +@@ -354,12 +355,12 @@ + prefix = prefix_win32.c_str(); + } + #elif defined(__HAIKU__) ++ char dir[B_PATH_NAME_LENGTH]; + if (!prefix) + { +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- prefix = dir.Path(); ++ prefix = dir; + } + else + { +diff -urN cmake-2.8.10.2-orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8.10.2/Source/CPack/cmCPackGenerator.cxx +--- cmake-2.8.10.2-orig/Source/CPack/cmCPackGenerator.cxx 2012-11-27 05:26:32.015466496 -0800 ++++ cmake-2.8.10.2/Source/CPack/cmCPackGenerator.cxx 2012-12-03 12:02:17.677904384 -0800 +@@ -27,7 +27,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + //---------------------------------------------------------------------- +@@ -1265,10 +1266,10 @@ + this->InstallPath += "-"; + this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- this->InstallPath = dir.Path(); ++ this->InstallPath = dir; + } + else + { +diff -urN cmake-2.8.10.2-orig/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.8.10.2/Source/CPack/cmCPackGeneratorFactory.cxx +--- cmake-2.8.10.2-orig/Source/CPack/cmCPackGeneratorFactory.cxx 2012-12-03 12:07:50.301203456 -0800 ++++ cmake-2.8.10.2/Source/CPack/cmCPackGeneratorFactory.cxx 2012-12-03 12:02:17.678428672 -0800 +@@ -113,7 +113,7 @@ + } + #endif + #if !defined(_WIN32) \ ++ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) +- && !defined(__QNXNTO__) && !defined(__BEOS__) + if (cmCPackDebGenerator::CanGenerate()) + { + this->RegisterGenerator("DEB", "Debian packages", +diff -urN cmake-2.8.10.2-orig/Source/kwsys/ProcessUNIX.c cmake-2.8.10.2/Source/kwsys/ProcessUNIX.c +--- cmake-2.8.10.2-orig/Source/kwsys/ProcessUNIX.c 2012-11-27 05:26:33.000524288 -0800 ++++ cmake-2.8.10.2/Source/kwsys/ProcessUNIX.c 2012-12-03 12:02:17.707264512 -0800 +@@ -63,10 +63,6 @@ + #include /* DIR, dirent */ + #include /* isspace */ + +-#ifdef __HAIKU__ +-#undef __BEOS__ +-#endif +- + #if defined(__VMS) + # define KWSYSPE_VMS_NONBLOCK , O_NONBLOCK + #else +diff -urN cmake-2.8.10.2-orig/Source/kwsys/SystemTools.cxx cmake-2.8.10.2/Source/kwsys/SystemTools.cxx +--- cmake-2.8.10.2-orig/Source/kwsys/SystemTools.cxx 2012-11-27 05:26:33.005505024 -0800 ++++ cmake-2.8.10.2/Source/kwsys/SystemTools.cxx 2012-12-03 12:02:17.708313088 -0800 +@@ -157,7 +157,7 @@ + #include + #endif + +-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) ++#if defined(__BEOS__) && !defined(__ZETA__) + #include + #include + +diff -urN cmake-2.8.10.2-orig/Source/kwsys/testDynamicLoader.cxx cmake-2.8.10.2/Source/kwsys/testDynamicLoader.cxx +--- cmake-2.8.10.2-orig/Source/kwsys/testDynamicLoader.cxx 2012-11-27 05:26:33.006815744 -0800 ++++ cmake-2.8.10.2/Source/kwsys/testDynamicLoader.cxx 2012-12-03 12:02:17.713818112 -0800 +@@ -15,7 +15,7 @@ + #include KWSYS_HEADER(ios/iostream) + #include KWSYS_HEADER(stl/string) + +-#if defined(__BEOS__) && !defined(__HAIKU__) ++#if defined(__BEOS__) + #include /* disable_debugger() API. */ + #endif + +diff -urN cmake-2.8.10.2-orig/Source/kwsys/testProcess.c cmake-2.8.10.2/Source/kwsys/testProcess.c +--- cmake-2.8.10.2-orig/Source/kwsys/testProcess.c 2012-11-27 05:26:33.007602176 -0800 ++++ cmake-2.8.10.2/Source/kwsys/testProcess.c 2012-12-03 12:02:17.714604544 -0800 +@@ -32,7 +32,7 @@ + # pragma warn -8060 /* possibly incorrect assignment */ + #endif + +-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) ++#if defined(__BEOS__) && !defined(__ZETA__) + /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ + # include + static inline void testProcess_usleep(unsigned int msec) +diff -urN cmake-2.8.10.2-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8.10.2/Tests/ComplexOneConfig/Library/CMakeLists.txt +--- cmake-2.8.10.2-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-11-27 05:26:34.013369344 -0800 ++++ cmake-2.8.10.2/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-12-03 12:02:42.181665792 -0800 +@@ -51,7 +51,7 @@ + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-if(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") + endif() + get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) +diff -urN cmake-2.8.10.2-orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.10.2/Utilities/cmcurl/CMake/CurlTests.c +--- cmake-2.8.10.2-orig/Utilities/cmcurl/CMake/CurlTests.c 2012-11-27 05:26:34.045350912 -0800 ++++ cmake-2.8.10.2/Utilities/cmcurl/CMake/CurlTests.c 2012-12-03 12:02:42.189005824 -0800 +@@ -38,7 +38,7 @@ + # define PLATFORM_AIX_V3 + #endif + +-#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) ++#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) + #error "O_NONBLOCK does not work on this platform" + #endif + int socket; +diff -urN cmake-2.8.10.2-orig/Utilities/cmcurl/select.c cmake-2.8.10.2/Utilities/cmcurl/select.c +--- cmake-2.8.10.2-orig/Utilities/cmcurl/select.c 2012-11-27 05:26:34.055312384 -0800 ++++ cmake-2.8.10.2/Utilities/cmcurl/select.c 2012-12-03 12:02:42.189792256 -0800 +@@ -39,7 +39,7 @@ + #error "We can't compile without select() support!" + #endif + +-#if defined(__BEOS__) && !defined(__HAIKU__) ++#if defined(__BEOS__) + /* BeOS has FD_SET defined in socket.h */ + #include + #endif +diff -urN cmake-2.8.10.2-orig/Utilities/cmzlib/zconf.h cmake-2.8.10.2/Utilities/cmzlib/zconf.h +--- cmake-2.8.10.2-orig/Utilities/cmzlib/zconf.h 2012-11-27 05:26:34.022020096 -0800 ++++ cmake-2.8.10.2/Utilities/cmzlib/zconf.h 2012-12-03 12:02:42.190578688 -0800 +@@ -237,7 +237,7 @@ + # endif + #endif + +-#if defined (__BEOS__) && !defined (__HAIKU__) ++#if defined (__BEOS__) + # ifdef ZLIB_DLL + # ifdef ZLIB_INTERNAL + # define ZEXPORT __declspec(dllexport) +diff -urN cmake-2.8.10.2-orig/Utilities/cmzlib/zutil.h cmake-2.8.10.2/Utilities/cmzlib/zutil.h +--- cmake-2.8.10.2-orig/Utilities/cmzlib/zutil.h 2012-11-27 05:26:34.022806528 -0800 ++++ cmake-2.8.10.2/Utilities/cmzlib/zutil.h 2012-12-03 12:02:42.195559424 -0800 +@@ -147,12 +147,6 @@ + # define OS_CODE 0x0f + #endif + +-/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ +-/* many BeOS workarounds are no longer needed in Haiku */ +-#if defined(__HAIKU__) && defined(__BEOS__) +-#undef __BEOS__ +-#endif +- + #if defined(_BEOS_) || defined(RISCOS) + # define fdopen(fd,mode) NULL /* No fdopen() */ + #endif diff --git a/dev-util/cppunit/cppunit-1.12.1.bep b/dev-util/cppunit/cppunit-1.12.1.bep new file mode 100644 index 000000000..b6acee2c0 --- /dev/null +++ b/dev-util/cppunit/cppunit-1.12.1.bep @@ -0,0 +1,21 @@ +DESCRIPTION="C++ port of the famous JUnit framework for unit testing" +HOMEPAGE="http://cppunit.sourceforge.net/" +SRC_URI="http://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/cppunit-1.12.1.tar.gz/download" +CHECKSUM_MD5 = "bd30e9cf5523cdfc019b94f5e1d7fd19" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd cppunit-1.12.1 + libtoolize --force --copy --install + autoreconf -i + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd cppunit-1.12.1 + make install +} + +LICENSE="GNU LGPL v2.1" diff --git a/dev-util/cscope/cscope-15.7a.bep b/dev-util/cscope/cscope-15.7a.bep index c1a5c5651..de9159eb5 100644 --- a/dev-util/cscope/cscope-15.7a.bep +++ b/dev-util/cscope/cscope-15.7a.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd cscope-15.7a autoreconf -fvi - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-util/ctags/ctags-5.8.bep b/dev-util/ctags/ctags-5.8.bep index 73a66b7bf..409a72ab6 100644 --- a/dev-util/ctags/ctags-5.8.bep +++ b/dev-util/ctags/ctags-5.8.bep @@ -7,13 +7,15 @@ DEPEND="" CHECKSUM_MD5="c00f82ecdcc357434731913e5b48630d" BUILD { cd ctags-5.8 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } INSTALL { cd ctags-5.8 - make install prefix=${DESTDIR}/boot/common + make install prefix=${DESTDIR}`finddir B_COMMON_DIRECTORY` \ + mandir=${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man } LICENSE="GNU GPL v2" diff --git a/dev-util/diffstat/diffstat-1.51.bep b/dev-util/diffstat/diffstat-1.51.bep index bff1e6fa2..d3a73f46f 100644 --- a/dev-util/diffstat/diffstat-1.51.bep +++ b/dev-util/diffstat/diffstat-1.51.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd diffstat-1.51 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-util/fastdep/fastdep-0.16.bep b/dev-util/fastdep/fastdep-0.16.bep index c22ca22f2..d299b7249 100644 --- a/dev-util/fastdep/fastdep-0.16.bep +++ b/dev-util/fastdep/fastdep-0.16.bep @@ -1,6 +1,6 @@ DESCRIPTION="fastdep is a fast dependency generator for C/C++ files." HOMEPAGE="http://www.irule.be/bvh/c++/fastdep/" -SRC_URI="http://www.irule.be/bvh/c++/fastdep/fastdep-0.16.tar.gz" +SRC_URI="http://ports-space.haiku-files.org/dev-util/source/fastdep-0.16.tar.gz" REVISION="1" STATUS_HAIKU="stable" DEPEND="" diff --git a/dev-util/global/global-5.8.1.bep b/dev-util/global/global-5.8.1.bep deleted file mode 100644 index 60359156b..000000000 --- a/dev-util/global/global-5.8.1.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="GNU Global is a source code tagging system." -HOMEPAGE="http://www.gnu.org/software/global/" -SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-5.8.1.tar.gz" -CHECKSUM_MD5="9c357098e42c9ba32776ccd6b549d85d" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd global-5.8.1 - ./configure --prefix=/boot/common --with-exuberant-ctags=/bin/ctags - make -} - -INSTALL { - cd global-5.8.1 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="2000-2007 Tama Communications Corporation - 2007-2010 Free Software Foundation, Inc." diff --git a/dev-util/global/global-5.8.2.bep b/dev-util/global/global-5.8.2.bep deleted file mode 100644 index ffc53cb71..000000000 --- a/dev-util/global/global-5.8.2.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="GNU Global is a source code tagging system." -HOMEPAGE="http://www.gnu.org/software/global/" -SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-5.8.2.tar.gz" -CHECKSUM_MD5="380a496cbe24263a80eb895f87b7c7f4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd global-5.8.2 - autoreconf -fi - ./configure --prefix=/boot/common --with-exuberant-ctags=/bin/ctags - make -} - -INSTALL { - cd global-5.8.2 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="2000-2007 Tama Communications Corporation - 2007-2010 Free Software Foundation, Inc." diff --git a/dev-util/global/global-5.8.bep b/dev-util/global/global-5.8.bep deleted file mode 100644 index 2649f36eb..000000000 --- a/dev-util/global/global-5.8.bep +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="GNU Global is a source code tagging system." -HOMEPAGE="http://www.gnu.org/software/global/" -SRC_URI="http://tamacom.com/global/global-5.8.tar.gz" -CHECKSUM_MD5="7ba2efb55269615b2722cca36aced2cb" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd global-5.8 - ./configure --prefix=/boot/common - make -} - -INSTALL { - cd global-5.8 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="2000-2007 Tama Communications Corporation - 2007-2010 Free Software Foundation, Inc." diff --git a/dev-util/global/global-5.9.1.bep b/dev-util/global/global-5.9.1.bep deleted file mode 100644 index 4a89f4f80..000000000 --- a/dev-util/global/global-5.9.1.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="GNU Global is a source code tagging system." -HOMEPAGE="http://www.gnu.org/software/global/" -SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-5.9.1.tar.gz" -CHECKSUM_MD5="eaeba27e23f9a0518c4ce66f4797accf" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd global-5.9.1 - autoreconf -fi - ./configure --prefix=/boot/common --with-exuberant-ctags=/bin/ctags --with-posix-sort=/bin/sort - make -} - -INSTALL { - cd global-5.9.1 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="2000-2010 Tama Communications Corporation - 2007-2010 Free Software Foundation, Inc." diff --git a/dev-util/global/global-5.9.bep b/dev-util/global/global-5.9.bep deleted file mode 100644 index 0027af52c..000000000 --- a/dev-util/global/global-5.9.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="GNU Global is a source code tagging system." -HOMEPAGE="http://www.gnu.org/software/global/" -SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-5.9.tar.gz" -CHECKSUM_MD5="258276ba3ba2ca1faa3c86bd6b4d8c95" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd global-5.9 - autoreconf -fi - ./configure --prefix=/boot/common --with-exuberant-ctags=/bin/ctags --with-posix-sort=/bin/sort - make -} - -INSTALL { - cd global-5.9 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="2000-2010 Tama Communications Corporation - 2007-2010 Free Software Foundation, Inc." diff --git a/dev-util/global/global-6.2.2.bep b/dev-util/global/global-6.2.2.bep new file mode 100644 index 000000000..34cb8672f --- /dev/null +++ b/dev-util/global/global-6.2.2.bep @@ -0,0 +1,27 @@ +DESCRIPTION="GNU Global is a source code tagging system." +HOMEPAGE="http://www.gnu.org/software/global/" +SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-6.2.2.tar.gz" +CHECKSUM_MD5="8317d2d6914a8e18cd725f9cd7164b87" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/ctags >= 5.8" +BUILD { + cd global-6.2.2 + autoreconf -fi + ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ + --datadir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc" \ + --mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \ + --infodir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/info" \ + --with-ncurses \ + --with-exuberant-ctags="$(finddir B_COMMON_BIN_DIRECTORY)/ctags" \ + --with-posix-sort=/bin/sort + make +} + +INSTALL { + cd global-6.2.2 + make install +} +LICENSE="GNU GPL v3" +COPYRIGHT="2000-2012 Tama Communications Corporation + 2007-2012 Free Software Foundation, Inc." diff --git a/dev-util/global/global-6.2.4.bep b/dev-util/global/global-6.2.4.bep new file mode 100644 index 000000000..2fea5fdf7 --- /dev/null +++ b/dev-util/global/global-6.2.4.bep @@ -0,0 +1,27 @@ +DESCRIPTION="GNU Global is a source code tagging system." +HOMEPAGE="http://www.gnu.org/software/global/" +SRC_URI="http://ftp.gnu.org/pub/gnu/global/global-6.2.4.tar.gz" +CHECKSUM_MD5="c778d4e52a30706db7a02070cce1078c" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/ctags >= 5.8" +BUILD { + cd global-6.2.4 + autoreconf -fi + ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ + --datadir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc" \ + --mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \ + --infodir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/info" \ + --with-ncurses \ + --with-exuberant-ctags="$(finddir B_COMMON_BIN_DIRECTORY)/ctags" \ + --with-posix-sort=/bin/sort + make +} + +INSTALL { + cd global-6.2.4 + make install +} +LICENSE="GNU GPL v3" +COPYRIGHT="2000-2012 Tama Communications Corporation + 2007-2012 Free Software Foundation, Inc." diff --git a/dev-util/global/patches/global-5.8.1.patch b/dev-util/global/patches/global-5.8.1.patch deleted file mode 100644 index 68352c771..000000000 --- a/dev-util/global/patches/global-5.8.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up global-5.8.1/libdb/db.h.orig global-5.8.1/libdb/db.h ---- global-5.8.1/libdb/db.h.orig 2010-03-06 04:08:14.003145728 -0700 -+++ global-5.8.1/libdb/db.h 2010-03-11 16:10:46.316145664 -0700 -@@ -43,6 +43,10 @@ - - #include "compat.h" - -+#if defined(__HAIKU__) -+#include -+#endif -+ - #define RET_ERROR -1 /* Return values. */ - #define RET_SUCCESS 0 - #define RET_SPECIAL 1 diff --git a/dev-util/global/patches/global-5.8.2.patch b/dev-util/global/patches/global-5.8.2.patch deleted file mode 100644 index 9840f8655..000000000 --- a/dev-util/global/patches/global-5.8.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up global-5.8.2/configure.ac.orig global-5.8.2/configure.ac ---- global-5.8.2/configure.ac.orig 2010-05-23 01:40:56.774635520 -0600 -+++ global-5.8.2/configure.ac 2010-05-23 01:41:23.901775360 -0600 -@@ -57,7 +57,7 @@ LTDL_INIT([recursive]) - dnl Checks for libraries. - - dnl Checks for header files. --AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h sys/time.h fcntl.h) -+AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h stdint.h sys/time.h fcntl.h) - AC_CHECK_HEADERS(sys/resource.h) - AC_HEADER_DIRENT - if test ${ac_header_dirent} = no; then -diff -up global-5.8.2/libdb/db.h.orig global-5.8.2/libdb/db.h ---- global-5.8.2/libdb/db.h.orig 2010-05-23 01:42:09.494665728 -0600 -+++ global-5.8.2/libdb/db.h 2010-05-23 01:42:55.554434560 -0600 -@@ -40,6 +40,9 @@ - #ifdef HAVE_UNISTD_H - #include - #endif -+#ifdef HAVE_STDINT_H -+#include -+#endif - - #include "compat.h" - diff --git a/dev-util/global/patches/global-5.8.patch b/dev-util/global/patches/global-5.8.patch deleted file mode 100644 index f820bafd9..000000000 --- a/dev-util/global/patches/global-5.8.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur global-5.8/libdb/db.h global-5.8-haiku/libdb/db.h ---- global-5.8/libdb/db.h 2009-12-19 03:49:27.000000000 -0700 -+++ global-5.8-haiku/libdb/db.h 2009-12-29 02:50:48.000000000 -0700 -@@ -43,6 +43,10 @@ - - #include "compat.h" - -+#if defined(__HAIKU__) -+#include -+#endif -+ - #define RET_ERROR -1 /* Return values. */ - #define RET_SUCCESS 0 - #define RET_SPECIAL 1 diff --git a/dev-util/global/patches/global-5.9.1.patch b/dev-util/global/patches/global-5.9.1.patch deleted file mode 100644 index 4e107028b..000000000 --- a/dev-util/global/patches/global-5.9.1.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up global-5.9.1/configure.ac.orig global-5.9.1/configure.ac ---- global-5.9.1/configure.ac.orig 2010-07-18 23:28:56.009175040 -0600 -+++ global-5.9.1/configure.ac 2010-07-18 23:59:03.300941312 -0600 -@@ -57,7 +57,7 @@ LTDL_INIT([recursive]) - dnl Checks for libraries. - - dnl Checks for header files. --AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h sys/time.h fcntl.h) -+AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h stdint.h sys/time.h fcntl.h) - AC_CHECK_HEADERS(sys/resource.h) - AC_HEADER_DIRENT - if test ${ac_header_dirent} = no; then -diff -up global-5.9.1/libdb/db.h.orig global-5.9.1/libdb/db.h ---- global-5.9.1/libdb/db.h.orig 2010-07-18 23:28:56.033292288 -0600 -+++ global-5.9.1/libdb/db.h 2010-07-18 23:59:03.303824896 -0600 -@@ -40,6 +40,9 @@ - #ifdef HAVE_UNISTD_H - #include - #endif -+#ifdef HAVE_STDINT_H -+#include -+#endif - - #include "compat.h" - diff --git a/dev-util/global/patches/global-5.9.patch b/dev-util/global/patches/global-5.9.patch deleted file mode 100644 index be036718f..000000000 --- a/dev-util/global/patches/global-5.9.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up global-5.9/configure.ac.orig global-5.9/configure.ac ---- global-5.9/configure.ac.orig 2010-06-07 22:07:47.039059456 -0600 -+++ global-5.9/configure.ac 2010-07-03 16:16:00.980418560 -0600 -@@ -57,7 +57,7 @@ LTDL_INIT([recursive]) - dnl Checks for libraries. - - dnl Checks for header files. --AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h sys/time.h fcntl.h) -+AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h stdint.h sys/time.h fcntl.h) - AC_CHECK_HEADERS(sys/resource.h) - AC_HEADER_DIRENT - if test ${ac_header_dirent} = no; then -diff -up global-5.9/libdb/db.h.orig global-5.9/libdb/db.h ---- global-5.9/libdb/db.h.orig 2010-06-07 22:07:47.062914560 -0600 -+++ global-5.9/libdb/db.h 2010-07-03 16:16:00.983564288 -0600 -@@ -40,6 +40,9 @@ - #ifdef HAVE_UNISTD_H - #include - #endif -+#ifdef HAVE_STDINT_H -+#include -+#endif - - #include "compat.h" - diff --git a/dev-util/global/patches/global-6.2.2.patch b/dev-util/global/patches/global-6.2.2.patch new file mode 100644 index 000000000..916a5b54d --- /dev/null +++ b/dev-util/global/patches/global-6.2.2.patch @@ -0,0 +1,38 @@ +diff -up global-6.2.2/configure.ac.orig global-6.2.2/configure.ac +--- global-6.2.2/configure.ac.orig 2012-03-14 23:23:56.037486592 -0600 ++++ global-6.2.2/configure.ac 2012-05-02 21:19:08.722993152 -0600 +@@ -58,7 +58,7 @@ LTDL_INIT([recursive]) + dnl Checks for libraries. + + dnl Checks for header files. +-AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h sys/time.h fcntl.h) ++AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h stdint.h sys/time.h fcntl.h) + AC_CHECK_HEADERS(sys/resource.h) + AC_HEADER_DIRENT + if test ${ac_header_dirent} = no; then +diff -up global-6.2.2/libdb/db.h.orig global-6.2.2/libdb/db.h +--- global-6.2.2/libdb/db.h.orig 2012-03-14 23:23:56.062390272 -0600 ++++ global-6.2.2/libdb/db.h 2012-05-02 21:19:08.744751104 -0600 +@@ -40,6 +40,9 @@ + #ifdef HAVE_UNISTD_H + #include + #endif ++#ifdef HAVE_STDINT_H ++#include ++#endif + + #include "compat.h" + +diff -up global-6.2.2/m4/check_curses.m4.orig global-6.2.2/m4/check_curses.m4 +--- global-6.2.2/m4/check_curses.m4.orig 2012-03-14 23:23:56.037224448 -0600 ++++ global-6.2.2/m4/check_curses.m4 2012-05-02 21:19:08.754188288 -0600 +@@ -240,6 +240,9 @@ AC_DEFUN([AC_SEARCH_NCURSES], [ + + AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses") + ++ AC_NCURSES(/boot/develop/headers/3rdparty, ncurses.h, -lncurses, -I/boot/develop/headers/3rdparty, "ncurses on /boot/develop") ++ AC_NCURSES(/boot/common/include/ncurses, ncurses.h, -lncurses, -I/boot/common/include/ncurses, "ncurses on /boot/common") ++ + dnl + dnl We couldn't find ncurses, try SysV curses + dnl diff --git a/dev-util/global/patches/global-6.2.4.patch b/dev-util/global/patches/global-6.2.4.patch new file mode 100644 index 000000000..267ae6111 --- /dev/null +++ b/dev-util/global/patches/global-6.2.4.patch @@ -0,0 +1,38 @@ +diff -up global-6.2.4/configure.ac.orig global-6.2.4/configure.ac +--- global-6.2.4/configure.ac.orig 2012-05-30 03:30:15.003670016 -0600 ++++ global-6.2.4/configure.ac 2012-07-26 22:38:17.379060224 -0600 +@@ -58,7 +58,7 @@ LTDL_INIT([recursive]) + dnl Checks for libraries. + + dnl Checks for header files. +-AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h sys/time.h fcntl.h) ++AC_CHECK_HEADERS(limits.h string.h unistd.h stdarg.h stdint.h sys/time.h fcntl.h) + AC_CHECK_HEADERS(sys/resource.h) + AC_HEADER_DIRENT + if test ${ac_header_dirent} = no; then +diff -up global-6.2.4/libdb/db.h.orig global-6.2.4/libdb/db.h +--- global-6.2.4/libdb/db.h.orig 2012-05-30 03:30:15.028311552 -0600 ++++ global-6.2.4/libdb/db.h 2012-07-26 22:38:17.392429568 -0600 +@@ -40,6 +40,9 @@ + #ifdef HAVE_UNISTD_H + #include + #endif ++#ifdef HAVE_STDINT_H ++#include ++#endif + + #include "compat.h" + +diff -up global-6.2.4/m4/check_curses.m4.orig global-6.2.4/m4/check_curses.m4 +--- global-6.2.4/m4/check_curses.m4.orig 2012-05-30 03:30:15.003407872 -0600 ++++ global-6.2.4/m4/check_curses.m4 2012-07-26 22:38:17.409206784 -0600 +@@ -240,6 +240,9 @@ AC_DEFUN([AC_SEARCH_NCURSES], [ + + AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses") + ++ AC_NCURSES(/boot/develop/headers/3rdparty, ncurses.h, -lncurses, -I/boot/develop/headers/3rdparty, "ncurses on /boot/develop") ++ AC_NCURSES(/boot/common/include/ncurses, ncurses.h, -lncurses, -I/boot/common/include/ncurses, "ncurses on /boot/common") ++ + dnl + dnl We couldn't find ncurses, try SysV curses + dnl diff --git a/dev-util/gperf/gperf-3.0.4.bep b/dev-util/gperf/gperf-3.0.4.bep index ac009b985..c4071044c 100644 --- a/dev-util/gperf/gperf-3.0.4.bep +++ b/dev-util/gperf/gperf-3.0.4.bep @@ -1,13 +1,17 @@ DESCRIPTION="gperf" HOMEPAGE="http://www.gnu.org/software/gperf/" SRC_URI="http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="c1f1db32fb6598d6a93e6e88796a8632" BUILD { cd gperf-3.0.4 - ./configure --prefix=/boot/common + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --docdir=$COMMON_DOCS/doc/gperf \ + --infodir=$COMMON_DOCS/info \ + --mandir=$COMMON_DOCS/man make } @@ -15,5 +19,6 @@ INSTALL { cd gperf-3.0.4 make install } + LICENSE="GNU GPL v3" COPYRIGHT="1989-1998, 2000-2004, 2006-2009 Free Software Foundation, Inc." diff --git a/dev-util/gtk-doc/gtk-doc-1.15.bep b/dev-util/gtk-doc/gtk-doc-1.15.bep index 1c9f24f98..dbb09f8c3 100644 --- a/dev-util/gtk-doc/gtk-doc-1.15.bep +++ b/dev-util/gtk-doc/gtk-doc-1.15.bep @@ -8,7 +8,7 @@ DEPEND="pkgconfig >= 0.23 dev-libs/libxslt >= 1.1.26" BUILD { cd gtk-doc-1.15 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-util/idutils/idutils-20061208.bep b/dev-util/idutils/idutils-20061208.bep index a2d05bed4..680bf7356 100644 --- a/dev-util/idutils/idutils-20061208.bep +++ b/dev-util/idutils/idutils-20061208.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd idutils-cvs libtoolize --force --copy --install - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-util/idutils/idutils-4.2.bep b/dev-util/idutils/idutils-4.2.bep index 45cff03e4..137fb9d96 100644 --- a/dev-util/idutils/idutils-4.2.bep +++ b/dev-util/idutils/idutils-4.2.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd idutils-4.2 libtoolize --force --copy --install - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-util/intltool/intltool-0.40.6.bep b/dev-util/intltool/intltool-0.40.6.bep index b1628d954..9b91877ea 100644 --- a/dev-util/intltool/intltool-0.40.6.bep +++ b/dev-util/intltool/intltool-0.40.6.bep @@ -2,12 +2,15 @@ DESCRIPTION="intltool" HOMEPAGE="http://www.gnome.org/" SRC_URI="ftp://ftp.gnome.org/pub/gnome/sources/intltool/0.40/intltool-0.40.6.tar.gz" CHECKSUM_MD5="8e40f9d1c7308eddbfd24b22cd540631" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" +MESSAGE="Requires XML::Parser perl module installed" DEPEND="" BUILD { cd intltool-0.40.6 - configure --prefix=/boot/common + ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ + --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ + --mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \ make } diff --git a/dev-util/patchutils/patchutils-0.3.1.bep b/dev-util/patchutils/patchutils-0.3.1.bep index 56f39f7e5..1e5a0f704 100644 --- a/dev-util/patchutils/patchutils-0.3.1.bep +++ b/dev-util/patchutils/patchutils-0.3.1.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd patchutils-0.3.1 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/dev-util/patchutils/patchutils-0.3.2.bep b/dev-util/patchutils/patchutils-0.3.2.bep new file mode 100644 index 000000000..db1ed8e5e --- /dev/null +++ b/dev-util/patchutils/patchutils-0.3.2.bep @@ -0,0 +1,20 @@ +DESCRIPTION="A collection of tools that operate on patch files." +HOMEPAGE="http://cyberelk.net/tim/patchutils/" +SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.2.tar.bz2" +CHECKSUM_MD5="74607b4a28c9009c6aeeed0e91098917" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd patchutils-0.3.2 + ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ + --mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" + make +} + +INSTALL { + cd patchutils-0.3.2 + make install +} +LICENSE="GNU GPL v2" +COPYRIGHT="2001-2011 Tim Waugh" diff --git a/dev-util/pkgconfig/pkgconfig-0.23.bep b/dev-util/pkgconfig/pkgconfig-0.23.bep index 0a4cfc607..2a71b584d 100644 --- a/dev-util/pkgconfig/pkgconfig-0.23.bep +++ b/dev-util/pkgconfig/pkgconfig-0.23.bep @@ -8,27 +8,17 @@ DEPEND="" BUILD { cd pkg-config-0.23/glib-1.2.10 mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 libtoolize --force --copy --install - aclocal -I m4 + aclocal --install -I m4 autoreconf cd .. mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 libtoolize --force --copy --install - aclocal -I m4 + aclocal --install -I m4 autoreconf automake autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } @@ -36,5 +26,6 @@ INSTALL { cd pkg-config-0.23 make install } + LICENSE="GNU GPL v2" COPYRIGHT="1998, 2001-2006 Red Hat Inc." diff --git a/dev-util/pkgconfig/pkgconfig-0.25.bep b/dev-util/pkgconfig/pkgconfig-0.25.bep index 547651da0..6df116054 100644 --- a/dev-util/pkgconfig/pkgconfig-0.25.bep +++ b/dev-util/pkgconfig/pkgconfig-0.25.bep @@ -2,33 +2,27 @@ DESCRIPTION="pkgconfig" HOMEPAGE="http://pkg-config.freedesktop.org/wiki/" SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.25.tar.gz" CHECKSUM_MD5="a3270bab3f4b69b7dc6dbdacbcae9745" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" BUILD { cd pkg-config-0.25/glib-1.2.10 mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 libtoolize --force --copy --install - aclocal -I m4 + aclocal --install -I m4 autoreconf cd .. mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 libtoolize --force --copy --install - aclocal -I m4 + aclocal --install -I m4 autoreconf automake autoconf - ./configure --prefix=/boot/common + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --docdir=$COMMON_DOCS/doc/pkg-config \ + --mandir=$COMMON_DOCS/man make } diff --git a/dev-util/premake/patches/premake-4.3.patch b/dev-util/premake/patches/premake-4.3.patch new file mode 100644 index 000000000..e02982f80 --- /dev/null +++ b/dev-util/premake/patches/premake-4.3.patch @@ -0,0 +1,37 @@ +diff -Naur premake-4.3/build/gmake.unix/Premake4.make premake-4.3-haiku/build/gmake.unix/Premake4.make +--- premake-4.3/build/gmake.unix/Premake4.make 2010-11-16 11:29:14.028311552 +0000 ++++ premake-4.3-haiku/build/gmake.unix/Premake4.make 2012-12-27 23:50:16.043253760 +0000 +@@ -28,8 +28,8 @@ + CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) + CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -Os + CXXFLAGS += $(CFLAGS) +- LDFLAGS += -s -rdynamic +- LIBS += -lm -ldl ++ LDFLAGS += -s ++ LIBS += + RESFLAGS += $(DEFINES) $(INCLUDES) + LDDEPS += + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS) +diff -Naur premake-4.3/src/host/lua-5.1.4/src/luaconf.h premake-4.3-haiku/src/host/lua-5.1.4/src/luaconf.h +--- premake-4.3/src/host/lua-5.1.4/src/luaconf.h 2010-11-16 11:29:12.042991616 +0000 ++++ premake-4.3-haiku/src/host/lua-5.1.4/src/luaconf.h 2012-12-27 23:50:16.050331648 +0000 +@@ -55,7 +55,6 @@ + #define LUA_USE_MKSTEMP + #define LUA_USE_ISATTY + #define LUA_USE_POPEN +-#define LUA_USE_ULONGJMP + #endif + + +diff -Naur premake-4.3/src/host/premake.h premake-4.3-haiku/src/host/premake.h +--- premake-4.3/src/host/premake.h 2010-11-16 11:29:12.047185920 +0000 ++++ premake-4.3-haiku/src/host/premake.h 2012-12-27 23:50:16.052166656 +0000 +@@ -12,7 +12,7 @@ + + /* Identify the current platform I'm not sure how to reliably detect + * Windows but since it is the most common I use it as the default */ +-#if defined(__linux__) ++#if defined(__linux__) || defined(__HAIKU__) + #define PLATFORM_LINUX (1) + #define PLATFORM_STRING "linux" + #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) diff --git a/dev-util/premake/premake-4.3.bep b/dev-util/premake/premake-4.3.bep new file mode 100644 index 000000000..823710ef2 --- /dev/null +++ b/dev-util/premake/premake-4.3.bep @@ -0,0 +1,21 @@ +DESCRIPTION="Powerfully simple build configuration" +HOMEPAGE="http://industriousone.com/premake" +SRC_URI="http://sourceforge.net/projects/premake/files/Premake/4.3/premake-4.3-src.zip/download" +CHECKSUM_MD5="8cfafee76f9665c93b2e9ad15b015eb7" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + cd premake-4.3/build/gmake.unix + make config=release +} + +INSTALL { + cd premake-4.3/bin/release + mkdir -p $DESTDIR`finddir B_COMMON_BIN_DIRECTORY` + install -m 0755 premake4 $DESTDIR`finddir B_COMMON_BIN_DIRECTORY` +} + +LICENSE="BSD (2-clause)" +COPYRIGHT="2012 Industrious One, LLC" diff --git a/dev-util/quilt/quilt-0.48.bep b/dev-util/quilt/quilt-0.48.bep index 42b700f47..ec42bbf25 100644 --- a/dev-util/quilt/quilt-0.48.bep +++ b/dev-util/quilt/quilt-0.48.bep @@ -9,7 +9,7 @@ DEPEND="dev-util/diffstat >= 1.51 BUILD { cd quilt-0.48 autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make EDITOR=nano } diff --git a/dev-util/scons/patches/scons-2.0.1.patch b/dev-util/scons/patches/scons-2.0.1.patch new file mode 100644 index 000000000..7271f58e4 --- /dev/null +++ b/dev-util/scons/patches/scons-2.0.1.patch @@ -0,0 +1,70 @@ +diff -Naur scons-2.0.1/engine/SCons/Platform/__init__.py scons-2.0.1-haiku/engine/SCons/Platform/__init__.py +--- scons-2.0.1/engine/SCons/Platform/__init__.py 2010-08-17 06:02:51.023068672 +0000 ++++ scons-2.0.1-haiku/engine/SCons/Platform/__init__.py 2011-07-26 06:05:15.824967168 +0000 +@@ -78,6 +78,8 @@ + return 'aix' + elif sys.platform.find('darwin') != -1: + return 'darwin' ++ elif sys.platform.find('haiku') != -1: ++ return 'haiku' + else: + return 'posix' + elif os.name == 'os2': +diff -Naur scons-2.0.1/engine/SCons/Platform/haiku.py scons-2.0.1-haiku/engine/SCons/Platform/haiku.py +--- scons-2.0.1/engine/SCons/Platform/haiku.py 1970-01-01 00:00:00.000000000 +0000 ++++ scons-2.0.1-haiku/engine/SCons/Platform/haiku.py 2011-07-26 22:13:19.692584448 +0000 +@@ -0,0 +1,54 @@ ++"""SCons.Platform.haiku ++ ++Platform-specific initialization for Haiku systems. ++ ++There normally shouldn't be any need to import this module directly. It ++will usually be imported through the generic SCons.Platform.Platform() ++selection method. ++""" ++ ++# ++# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation ++# ++# Permission is hereby granted, free of charge, to any person obtaining ++# a copy of this software and associated documentation files (the ++# "Software"), to deal in the Software without restriction, including ++# without limitation the rights to use, copy, modify, merge, publish, ++# distribute, sublicense, and/or sell copies of the Software, and to ++# permit persons to whom the Software is furnished to do so, subject to ++# the following conditions: ++# ++# The above copyright notice and this permission notice shall be included ++# in all copies or substantial portions of the Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY ++# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE ++# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++# ++ ++__revision__ = "" ++ ++import posix ++import commands ++ ++def findDir( identifier ): ++ return commands.getoutput( 'finddir %s' % identifier ) ++ ++def generate(env): ++ posix.generate(env) ++ ++ # path list ++ listPath = [ '.' ] ++ listPath.append( '%s/bin' % findDir( 'B_USER_CONFIG_DIRECTORY' ) ) ++ listPath.append( findDir( 'B_COMMON_BIN_DIRECTORY' ) ) ++ listPath.append( findDir( 'B_SYSTEM_BIN_DIRECTORY' ) ) ++ listPath.append( findDir( 'B_BEOS_BIN_DIRECTORY' ) ) ++ listPath.append( '%s/tools/gnupro/bin' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' ) ) ++ env['ENV']['PATH'] = ':'.join( listPath ) ++ ++ # help the linker find the startfiles ++ env['ENV']['BELIBRARIES'] = ':%s/lib/x86' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' ) diff --git a/dev-util/scons/patches/scons-2.2.0.patch b/dev-util/scons/patches/scons-2.2.0.patch new file mode 100644 index 000000000..15d06891d --- /dev/null +++ b/dev-util/scons/patches/scons-2.2.0.patch @@ -0,0 +1,70 @@ +diff -Naur ./scons-2.2.0/engine/SCons/Platform/__init__.py ./scons-2.2.0-haiku/engine/SCons/Platform/__init__.py +--- ./scons-2.2.0/engine/SCons/Platform/__init__.py 2012-08-05 15:38:31.009961472 +0000 ++++ ./scons-2.2.0-haiku/engine/SCons/Platform/__init__.py 2012-09-30 13:28:21.978583552 +0000 +@@ -78,6 +78,8 @@ + return 'aix' + elif sys.platform.find('darwin') != -1: + return 'darwin' ++ elif sys.platform.find('haiku') != -1: ++ return 'haiku' + else: + return 'posix' + elif os.name == 'os2': +diff -Naur ./scons-2.2.0/engine/SCons/Platform/haiku.py ./scons-2.2.0-haiku/engine/SCons/Platform/haiku.py +--- ./scons-2.2.0/engine/SCons/Platform/haiku.py 1970-01-01 00:00:00.000000000 +0000 ++++ ./scons-2.2.0-haiku/engine/SCons/Platform/haiku.py 2012-09-30 13:30:07.109051904 +0000 +@@ -0,0 +1,54 @@ ++"""SCons.Platform.haiku ++ ++Platform-specific initialization for Haiku systems. ++ ++There normally shouldn't be any need to import this module directly. It ++will usually be imported through the generic SCons.Platform.Platform() ++selection method. ++""" ++ ++# ++# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation ++# ++# Permission is hereby granted, free of charge, to any person obtaining ++# a copy of this software and associated documentation files (the ++# "Software"), to deal in the Software without restriction, including ++# without limitation the rights to use, copy, modify, merge, publish, ++# distribute, sublicense, and/or sell copies of the Software, and to ++# permit persons to whom the Software is furnished to do so, subject to ++# the following conditions: ++# ++# The above copyright notice and this permission notice shall be included ++# in all copies or substantial portions of the Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY ++# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE ++# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++# ++ ++__revision__ = "" ++ ++import posix ++import commands ++ ++def findDir( identifier ): ++ return commands.getoutput( 'finddir %s' % identifier ) ++ ++def generate(env): ++ posix.generate(env) ++ ++ # path list ++ listPath = [ '.' ] ++ listPath.append( '%s/bin' % findDir( 'B_USER_CONFIG_DIRECTORY' ) ) ++ listPath.append( findDir( 'B_COMMON_BIN_DIRECTORY' ) ) ++ listPath.append( findDir( 'B_SYSTEM_BIN_DIRECTORY' ) ) ++ listPath.append( findDir( 'B_BEOS_BIN_DIRECTORY' ) ) ++ listPath.append( '%s/tools/gnupro/bin' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' ) ) ++ env['ENV']['PATH'] = ':'.join( listPath ) ++ ++ # help the linker find the startfiles ++ env['ENV']['BELIBRARIES'] = ':%s/lib/x86' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' ) diff --git a/dev-util/scons/scons-2.0.1.bep b/dev-util/scons/scons-2.0.1.bep new file mode 100644 index 000000000..6ec4b1a5e --- /dev/null +++ b/dev-util/scons/scons-2.0.1.bep @@ -0,0 +1,28 @@ +DESCRIPTION="Open Source next-generation build tool." +HOMEPAGE="http://www.scons.org/" +LICENSE="MIT" +COPYRIGHT="2001-2010 The SCons Foundation" +SRC_URI="http://ovh.dl.sourceforge.net/sourceforge/scons/scons-2.0.1.tar.gz" +CHECKSUM_MD5="beca648b894cdbf85383fffc79516d18" +REVISION="2" +STATUS_HAIKU="stable" +DEPEND="dev-lang/python >= 2.5.4" +BUILD { + cd scons-2.0.1 + for f in "script/scons script/scons-time script/sconsign"; do + sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f + done + python setup.py build +} + +INSTALL { + if [ ! -z ${DESTDIR} ]; then + options="${options} --root=${DESTDIR}" + fi + options="${options} --prefix=`finddir B_COMMON_DIRECTORY`" + options="${options} --install-data=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`" + options="${options} --symlink-scons" + options="${options} --standard-lib" + cd scons-2.0.1 + python setup.py install $options +} diff --git a/dev-util/scons/scons-2.2.0.bep b/dev-util/scons/scons-2.2.0.bep new file mode 100644 index 000000000..8ecad51b5 --- /dev/null +++ b/dev-util/scons/scons-2.2.0.bep @@ -0,0 +1,28 @@ +DESCRIPTION="Open Source next-generation build tool." +HOMEPAGE="http://www.scons.org/" +LICENSE="MIT" +COPYRIGHT="2001-2012 The SCons Foundation" +SRC_URI="http://superb-dca3.dl.sourceforge.net/project/scons/scons/2.2.0/scons-2.2.0.tar.gz" +CHECKSUM_MD5="f737f474a02d08156c821bd2d4d4b632" +REVISION="2" +STATUS_HAIKU="stable" +DEPEND="dev-lang/python >= 2.5.4" +BUILD { + cd scons-2.2.0 + for f in "script/scons script/scons-time script/sconsign"; do + sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f + done + python setup.py build +} + +INSTALL { + if [ ! -z ${DESTDIR} ]; then + options="${options} --root=${DESTDIR}" + fi + options="${options} --prefix=`finddir B_COMMON_DIRECTORY`" + options="${options} --install-data=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`" + options="${options} --symlink-scons" + options="${options} --standard-lib" + cd scons-2.2.0 + python setup.py install $options +} diff --git a/dev-vcs/bzr/bzr-2.2.0.bep b/dev-vcs/bzr/bzr-2.2.0.bep index c3999cdba..d2019e4ec 100644 --- a/dev-vcs/bzr/bzr-2.2.0.bep +++ b/dev-vcs/bzr/bzr-2.2.0.bep @@ -1,6 +1,6 @@ -DESCRIPTION="Bazaar" -HOMEPAGE="https://launchpad.net/bzr/" -SRC_URI="http://launchpad.net/bzr/2.2/2.2.0/+download/bzr-2.2.0.tar.gz" +DESCRIPTION="Bazaar" +HOMEPAGE="https://launchpad.net/bzr/" +SRC_URI="http://launchpad.net/bzr/2.2/2.2.0/+download/bzr-2.2.0.tar.gz" CHECKSUM_MD5="e47fa50e1fedc01c4761925e9d0d39ac" REVISION="1" STATUS_HAIKU="stable" @@ -17,16 +17,19 @@ BUILD { INSTALL { cd bzr-2.2.0 + COMMON_DIR=`finddir B_COMMON_DIRECTORY` + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + if [ -n "$(setgcc | grep '2')" ]; then - python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} + python setup.py build_ext --allow-python-fallback install --prefix=$COMMON_DIR --root=${DESTDIR} else - python setup.py install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} + python setup.py install --prefix=$COMMON_DIR --root=${DESTDIR} fi ## Now put the man file(s) in the correct directory - mkdir -p ${DESTDIR}$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1 - mv ${DESTDIR}/$(finddir B_COMMON_DIRECTORY)/man/man1/bzr* ${DESTDIR}/$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1/ + mkdir -p ${DESTDIR}$COMMON_DOCS/man/man1 + mv ${DESTDIR}/$COMMON_DIR/man/man1/bzr* ${DESTDIR}/$COMMON_DOCS/man/man1/ if [ -e "${DESTDIR}" ]; then - rm -rf ${DESTDIR}/$(finddir B_COMMON_DIRECTORY)/man + rm -rf ${DESTDIR}/$COMMON_DIR/man fi } diff --git a/dev-vcs/bzr/bzr-2.5.1.bep b/dev-vcs/bzr/bzr-2.5.1.bep new file mode 100644 index 000000000..c13bb217c --- /dev/null +++ b/dev-vcs/bzr/bzr-2.5.1.bep @@ -0,0 +1,35 @@ +DESCRIPTION="Bazaar" +HOMEPAGE="https://launchpad.net/bzr/" +SRC_URI="http://launchpad.net/bzr/2.5/2.5.1/+download/bzr-2.5.1.tar.gz" +CHECKSUM_MD5="ac5079858364a046071000d5cdccb67b" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + cd bzr-2.5.1 + if [ -n "$(setgcc | grep '2')" ]; then + python setup.py build_ext --allow-python-fallback + else + python setup.py build + fi +} + +INSTALL { + cd bzr-2.5.1 + if [ -n "$(setgcc | grep '2')" ]; then + python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} + else + python setup.py install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} + fi +## Now put the man file(s) in the correct directory + mkdir -p ${DESTDIR}$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1 + mv ${DESTDIR}/$(finddir B_COMMON_DIRECTORY)/man/man1/bzr* ${DESTDIR}/$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1/ + if [ -e "${DESTDIR}" ]; then + rm -rf ${DESTDIR}/$(finddir B_COMMON_DIRECTORY)/man + fi +} + +LICENSE="GNU GPL v2 + GNU GPL v3" +COPYRIGHT="2007-2012 The Bazaar Team" diff --git a/dev-vcs/bzr/bzr-2.6b1.bep b/dev-vcs/bzr/bzr-2.6b1.bep new file mode 100644 index 000000000..d7c6b572a --- /dev/null +++ b/dev-vcs/bzr/bzr-2.6b1.bep @@ -0,0 +1,35 @@ +DESCRIPTION="Bazaar" +HOMEPAGE="https://launchpad.net/bzr/" +SRC_URI="http://launchpad.net/bzr/2.6/2.6b1/+download/bzr-2.6b1.tar.gz" +CHECKSUM_MD5="d2319a1a793d47d8b02ca33298742ad7" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + cd bzr-2.6b1 + if [ -n "$(setgcc | grep '2')" ]; then + python setup.py build_ext --allow-python-fallback + else + python setup.py build + fi +} + +INSTALL { + cd bzr-2.6b1 + if [ -n "$(setgcc | grep '2')" ]; then + python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} + else + python setup.py install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} + fi +## Now put the man file(s) in the correct directory + mkdir -p ${DESTDIR}$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1 + mv ${DESTDIR}/$(finddir B_COMMON_DIRECTORY)/man/man1/bzr* ${DESTDIR}/$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1/ + if [ -e "${DESTDIR}" ]; then + rm -rf ${DESTDIR}/$(finddir B_COMMON_DIRECTORY)/man + fi +} + +LICENSE="GNU GPL v2 + GNU GPL v3" +COPYRIGHT="2007-2012 The Bazaar Team" diff --git a/dev-vcs/cvs/cvs-1.12.13.bep b/dev-vcs/cvs/cvs-1.12.13.bep index 704e48c1e..2db43f73e 100644 --- a/dev-vcs/cvs/cvs-1.12.13.bep +++ b/dev-vcs/cvs/cvs-1.12.13.bep @@ -9,7 +9,12 @@ BUILD { cd cvs-1.12.13 libtoolize --force --copy --install autoconf - ./configure --prefix=/boot/common --enable-rootcommit EDITOR=nano + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --enable-rootcommit \ + EDITOR=nano make } diff --git a/dev-vcs/cvs/patches/cvs-1.12.13.1.patch b/dev-vcs/cvs/patches/cvs-1.12.13.1.patch index f9c67a4a6..94eb64e2a 100644 --- a/dev-vcs/cvs/patches/cvs-1.12.13.1.patch +++ b/dev-vcs/cvs/patches/cvs-1.12.13.1.patch @@ -1,19 +1,7 @@ -diff -ur cvs-1.12.13.1/configure cvs-1.12.13.1-haiku/configure ---- cvs-1.12.13.1/configure 2006-07-07 15:31:08.000000000 -0600 -+++ cvs-1.12.13.1-haiku/configure 2009-11-24 15:37:33.000000000 -0700 -@@ -45920,7 +45920,7 @@ - return 0; - } - _ACEOF --for ac_lib in '' xnet socket inet; do -+for ac_lib in '' xnet network socket inet; do - if test -z "$ac_lib"; then - ac_res="none required" - else -diff -ur cvs-1.12.13.1/configure.in cvs-1.12.13.1-haiku/configure.in ---- cvs-1.12.13.1/configure.in 2006-06-29 09:13:10.000000000 -0600 -+++ cvs-1.12.13.1-haiku/configure.in 2009-11-24 15:37:33.000000000 -0700 -@@ -541,7 +541,7 @@ +diff -up cvs-1.12.13.1/configure.in.orig cvs-1.12.13.1/configure.in +--- cvs-1.12.13.1/configure.in.orig 2006-06-29 09:13:10.006815744 -0600 ++++ cvs-1.12.13.1/configure.in 2012-05-02 20:46:57.544735232 -0600 +@@ -541,7 +541,7 @@ CVS_FUNC_PRINTF_PTR # Try to find connect and gethostbyname. AC_CHECK_LIB(nsl, main) @@ -22,10 +10,58 @@ diff -ur cvs-1.12.13.1/configure.in cvs-1.12.13.1-haiku/configure.in AC_DEFINE(HAVE_CONNECT, 1, [Define if you have the connect function.])) dnl no need to search nsl for gethostbyname here since we should have -diff -ur cvs-1.12.13.1/src/cvs.h cvs-1.12.13.1-haiku/src/cvs.h ---- cvs-1.12.13.1/src/cvs.h 2006-04-25 14:01:47.000000000 -0600 -+++ cvs-1.12.13.1-haiku/src/cvs.h 2009-11-24 15:37:33.000000000 -0700 -@@ -181,8 +181,13 @@ +diff -up cvs-1.12.13.1/configure.orig cvs-1.12.13.1/configure +--- cvs-1.12.13.1/configure.orig 2006-07-07 15:31:08.010485760 -0600 ++++ cvs-1.12.13.1/configure 2012-05-02 20:56:54.292290560 -0600 +@@ -9566,7 +9566,7 @@ return getaddrinfo (); + return 0; + } + _ACEOF +-for ac_lib in '' nsl socket; do ++for ac_lib in '' nsl network socket; do + if test -z "$ac_lib"; then + ac_res="none required" + else +@@ -10083,7 +10083,7 @@ return getservbyname (); + return 0; + } + _ACEOF +-for ac_lib in '' inet nsl socket xnet; do ++for ac_lib in '' inet nsl network socket xnet; do + if test -z "$ac_lib"; then + ac_res="none required" + else +@@ -21471,7 +21471,7 @@ return getaddrinfo (); + return 0; + } + _ACEOF +-for ac_lib in '' nsl socket; do ++for ac_lib in '' nsl network socket; do + if test -z "$ac_lib"; then + ac_res="none required" + else +@@ -21988,7 +21988,7 @@ return getservbyname (); + return 0; + } + _ACEOF +-for ac_lib in '' inet nsl socket xnet; do ++for ac_lib in '' inet nsl network socket xnet; do + if test -z "$ac_lib"; then + ac_res="none required" + else +@@ -45920,7 +45920,7 @@ return connect (); + return 0; + } + _ACEOF +-for ac_lib in '' xnet socket inet; do ++for ac_lib in '' xnet network socket inet; do + if test -z "$ac_lib"; then + ac_res="none required" + else +diff -up cvs-1.12.13.1/src/cvs.h.orig cvs-1.12.13.1/src/cvs.h +--- cvs-1.12.13.1/src/cvs.h.orig 2006-04-25 14:01:47.044302336 -0600 ++++ cvs-1.12.13.1/src/cvs.h 2012-05-02 20:46:57.547356672 -0600 +@@ -181,8 +181,13 @@ char *strerror (int); #define CVSRFLPAT "#cvs.rfl.*" /* wildcard expr to match read locks */ #define CVSEXT_LOG ",t" #define CVSPREFIX ",," @@ -39,9 +75,9 @@ diff -ur cvs-1.12.13.1/src/cvs.h cvs-1.12.13.1-haiku/src/cvs.h /* Command attributes -- see function lookup_command_attribute(). */ #define CVS_CMD_IGNORE_ADMROOT 1 -diff -ur cvs-1.12.13.1/src/cvsrc.c cvs-1.12.13.1-haiku/src/cvsrc.c ---- cvs-1.12.13.1/src/cvsrc.c 2006-03-31 14:54:57.000000000 -0700 -+++ cvs-1.12.13.1-haiku/src/cvsrc.c 2009-11-24 15:37:33.000000000 -0700 +diff -up cvs-1.12.13.1/src/cvsrc.c.orig cvs-1.12.13.1/src/cvsrc.c +--- cvs-1.12.13.1/src/cvsrc.c.orig 2006-03-31 14:54:57.034603008 -0700 ++++ cvs-1.12.13.1/src/cvsrc.c 2012-05-02 20:46:57.549715968 -0600 @@ -20,7 +20,11 @@ /* this file is to be found in the user's home directory */ @@ -55,7 +91,7 @@ diff -ur cvs-1.12.13.1/src/cvsrc.c cvs-1.12.13.1-haiku/src/cvsrc.c #endif char cvsrc[] = CVSRC_FILENAME; -@@ -64,7 +68,7 @@ +@@ -64,7 +68,7 @@ read_cvsrc (int *argc, char ***argv, con /* determine filename for ~/.cvsrc */ @@ -64,9 +100,9 @@ diff -ur cvs-1.12.13.1/src/cvsrc.c cvs-1.12.13.1-haiku/src/cvsrc.c /* If we can't find a home directory, ignore ~/.cvsrc. This may make tracking down problems a bit of a pain, but on the other hand it might be obnoxious to complain when CVS will function -diff -ur cvs-1.12.13.1/src/filesubr.c cvs-1.12.13.1-haiku/src/filesubr.c ---- cvs-1.12.13.1/src/filesubr.c 2006-07-05 20:14:08.000000000 -0600 -+++ cvs-1.12.13.1-haiku/src/filesubr.c 2009-11-24 15:51:02.000000000 -0700 +diff -up cvs-1.12.13.1/src/filesubr.c.orig cvs-1.12.13.1/src/filesubr.c +--- cvs-1.12.13.1/src/filesubr.c.orig 2006-07-05 20:14:08.035913728 -0600 ++++ cvs-1.12.13.1/src/filesubr.c 2012-05-02 20:46:57.553385984 -0600 @@ -32,6 +32,11 @@ /* CVS */ #include "cvs.h" @@ -79,7 +115,7 @@ diff -ur cvs-1.12.13.1/src/filesubr.c cvs-1.12.13.1-haiku/src/filesubr.c static int deep_remove_dir (const char *path); -@@ -859,6 +864,36 @@ +@@ -859,6 +864,36 @@ get_homedir (void) return home; } @@ -116,10 +152,10 @@ diff -ur cvs-1.12.13.1/src/filesubr.c cvs-1.12.13.1-haiku/src/filesubr.c /* Compose a path to a file in the home directory. This is necessary because * of different behavior on UNIX and VMS. See the notes in vms/filesubr.c. * -diff -ur cvs-1.12.13.1/src/filesubr.h cvs-1.12.13.1-haiku/src/filesubr.h ---- cvs-1.12.13.1/src/filesubr.h 2006-07-05 20:14:08.000000000 -0600 -+++ cvs-1.12.13.1-haiku/src/filesubr.h 2009-11-24 15:37:33.000000000 -0700 -@@ -33,6 +33,7 @@ +diff -up cvs-1.12.13.1/src/filesubr.h.orig cvs-1.12.13.1/src/filesubr.h +--- cvs-1.12.13.1/src/filesubr.h.orig 2006-07-05 20:14:08.035913728 -0600 ++++ cvs-1.12.13.1/src/filesubr.h 2012-05-02 20:46:57.554696704 -0600 +@@ -33,6 +33,7 @@ bool isreadable (const char *file); bool iswritable (const char *file); bool isaccessible (const char *file, const int mode); char *get_homedir (void); @@ -127,10 +163,10 @@ diff -ur cvs-1.12.13.1/src/filesubr.h cvs-1.12.13.1-haiku/src/filesubr.h char *strcat_filename_onto_homedir (const char *, const char *); char *cvs_temp_name (void); FILE *cvs_temp_file (char **filename); -diff -ur cvs-1.12.13.1/src/history.c cvs-1.12.13.1-haiku/src/history.c ---- cvs-1.12.13.1/src/history.c 2006-06-09 15:28:17.000000000 -0600 -+++ cvs-1.12.13.1-haiku/src/history.c 2009-11-24 15:37:33.000000000 -0700 -@@ -807,7 +807,7 @@ +diff -up cvs-1.12.13.1/src/history.c.orig cvs-1.12.13.1/src/history.c +--- cvs-1.12.13.1/src/history.c.orig 2006-06-09 15:28:17.036700160 -0600 ++++ cvs-1.12.13.1/src/history.c 2012-05-02 20:46:57.558891008 -0600 +@@ -807,7 +807,7 @@ history_write (int type, const char *upd { char *pwdir; @@ -139,10 +175,10 @@ diff -ur cvs-1.12.13.1/src/history.c cvs-1.12.13.1-haiku/src/history.c PrCurDir = CurDir; if (pwdir != NULL) { -diff -ur cvs-1.12.13.1/src/ignore.c cvs-1.12.13.1-haiku/src/ignore.c ---- cvs-1.12.13.1/src/ignore.c 2006-04-24 12:50:26.000000000 -0600 -+++ cvs-1.12.13.1-haiku/src/ignore.c 2009-11-24 15:37:33.000000000 -0700 -@@ -98,7 +98,7 @@ +diff -up cvs-1.12.13.1/src/ignore.c.orig cvs-1.12.13.1/src/ignore.c +--- cvs-1.12.13.1/src/ignore.c.orig 2006-04-24 12:50:26.036700160 -0600 ++++ cvs-1.12.13.1/src/ignore.c 2012-05-02 20:46:57.561512448 -0600 +@@ -98,7 +98,7 @@ ign_setup (void) } /* Then add entries found in home dir, (if user has one) and file exists */ @@ -151,9 +187,9 @@ diff -ur cvs-1.12.13.1/src/ignore.c cvs-1.12.13.1-haiku/src/ignore.c /* If we can't find a home directory, ignore ~/.cvsignore. This may make tracking down problems a bit of a pain, but on the other hand it might be obnoxious to complain when CVS will function -diff -ur cvs-1.12.13.1/src/login.c cvs-1.12.13.1-haiku/src/login.c ---- cvs-1.12.13.1/src/login.c 2006-06-28 08:25:26.000000000 -0600 -+++ cvs-1.12.13.1-haiku/src/login.c 2009-11-24 15:37:33.000000000 -0700 +diff -up cvs-1.12.13.1/src/login.c.orig cvs-1.12.13.1/src/login.c +--- cvs-1.12.13.1/src/login.c.orig 2006-06-28 08:25:26.037748736 -0600 ++++ cvs-1.12.13.1/src/login.c 2012-05-02 20:46:57.563871744 -0600 @@ -28,7 +28,11 @@ @@ -167,7 +203,7 @@ diff -ur cvs-1.12.13.1/src/login.c cvs-1.12.13.1-haiku/src/login.c #endif /* If non-NULL, get_cvs_password() will just return this. */ -@@ -49,7 +53,7 @@ +@@ -49,7 +53,7 @@ construct_cvspass_filename (void) /* Construct absolute pathname to user's password file. */ /* todo: does this work under OS/2 ? */ @@ -176,10 +212,10 @@ diff -ur cvs-1.12.13.1/src/login.c cvs-1.12.13.1-haiku/src/login.c if (! homedir) { /* FIXME? This message confuses a lot of users, at least -diff -ur cvs-1.12.13.1/src/wrapper.c cvs-1.12.13.1-haiku/src/wrapper.c ---- cvs-1.12.13.1/src/wrapper.c 2006-04-24 12:50:27.000000000 -0600 -+++ cvs-1.12.13.1-haiku/src/wrapper.c 2009-11-24 15:37:33.000000000 -0700 -@@ -125,7 +125,7 @@ +diff -up cvs-1.12.13.1/src/wrapper.c.orig cvs-1.12.13.1/src/wrapper.c +--- cvs-1.12.13.1/src/wrapper.c.orig 2006-04-24 12:50:27.043778048 -0600 ++++ cvs-1.12.13.1/src/wrapper.c 2012-05-02 20:46:57.566493184 -0600 +@@ -125,7 +125,7 @@ void wrap_setup(void) /* Then add entries found in home dir, (if user has one) and file exists. */ diff --git a/dev-vcs/fossil/fossil-1.22-fossil.bep b/dev-vcs/fossil/fossil-1.22-fossil.bep new file mode 100644 index 000000000..5096cb997 --- /dev/null +++ b/dev-vcs/fossil/fossil-1.22-fossil.bep @@ -0,0 +1,23 @@ +DESCRIPTION="Simple, high-reliability, distributed software configuration management" +HOMEPAGE="http://www.fossil-scm.org/" +SRC_URI="fossil+http://www.fossil-scm.org/" +#CHECKSUM_MD5="" +REVISION="3" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + make install +} + +TEST { + make test +} + +LICENSE="BSD (2-clause)" +COPYRIGHT="2007 D. Richard Hipp" diff --git a/dev-vcs/fossil/fossil-1.22.bep b/dev-vcs/fossil/fossil-1.22.bep new file mode 100644 index 000000000..2faffcee5 --- /dev/null +++ b/dev-vcs/fossil/fossil-1.22.bep @@ -0,0 +1,26 @@ +DESCRIPTION="Simple, high-reliability, distributed software configuration management" +HOMEPAGE="http://www.fossil-scm.org/" +SRC_URI="http://www.fossil-scm.org/download/fossil-src-20120317175325.tar.gz" +CHECKSUM_MD5="a7106450722e8477972d230fa535702f" +REVISION="3" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + cd fossil-src-20120317175325 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd fossil-src-20120317175325 + make install +} + +TEST { + cd fossil-src-20120317175325 + make test +} + +LICENSE="BSD (2-clause)" +COPYRIGHT="2007 D. Richard Hipp" diff --git a/dev-vcs/fossil/patches/fossil-1.22.patch b/dev-vcs/fossil/patches/fossil-1.22.patch new file mode 100644 index 000000000..c0e765c57 --- /dev/null +++ b/dev-vcs/fossil/patches/fossil-1.22.patch @@ -0,0 +1,20 @@ +--- fossil-src-20120317175325/src/main.c.org 2012-04-21 05:23:25.719847424 +0200 ++++ fossil-src-20120317175325/src/main.c 2012-04-21 05:24:46.773062656 +0200 +@@ -1625,7 +1625,7 @@ + } + + #if !defined(_WIN32) +-#if !defined(__DARWIN__) && !defined(__APPLE__) ++#if !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__HAIKU__) + /* + ** Search for an executable on the PATH environment variable. + ** Return true (1) if found and false (0) if not found. +@@ -1721,7 +1721,7 @@ + #if !defined(_WIN32) + /* Unix implementation */ + if( isUiCmd ){ +-#if !defined(__DARWIN__) && !defined(__APPLE__) ++#if !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__HAIKU__) + zBrowser = db_get("web-browser", 0); + if( zBrowser==0 ){ + static char *azBrowserProg[] = { "xdg-open", "gnome-open", "firefox" }; diff --git a/dev-vcs/git/git-1.6.5.3.bep b/dev-vcs/git/git-1.6.5.3.bep deleted file mode 100644 index 53a818c0f..000000000 --- a/dev-vcs/git/git-1.6.5.3.bep +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION="git a fast version control system" -HOMEPAGE="http://git-scm.com/" -SRC_URI="http://kernel.org/pub/software/scm/git/git-1.6.5.3.tar.bz2" -CHECKSUM_MD5="a1dbc3da46cbf33c4367db689853c142" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD { - cd git-1.6.5.3 - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=/boot/common --enable-pthreads="" - make prefix=/boot/common NO_R_TO_GCC_LINKER=YesPlease \ - NO_C99_FORMAT=YesPlease \ - NO_ST_BLOCKS_IN_STRUCT_STAT=YesPlease \ - NO_MEMMEM=YesPlease NO_MKSTEMPS=YesPlease \ - NO_MKDTEMP=YesPlease NO_IPV6=YesPlease \ - NO_TCLTK=YesPlease CURLDIR=/boot/common \ - PERL_PATH=/boot/common/bin/perl \ - CFLAGS="-g -O2 -I/boot/common/include" \ - LIBS="" \ - LDFLAGS="-L/boot/common/lib -lnetwork -lbsd -liconv" \ - strip -} - -INSTALL { - cd git-1.6.5.3 - make install prefix=/boot/common NO_R_TO_GCC_LINKER=YesPlease \ - NO_C99_FORMAT=YesPlease NO_ST_BLOCKS_IN_STRUCT_STAT=YesPlease \ - NO_MEMMEM=YesPlease NO_MKSTEMPS=YesPlease \ - NO_MKDTEMP=YesPlease NO_IPV6=YesPlease NO_TCLTK=YesPlease \ - CURLDIR=/boot/common PERL_PATH=/boot/common/bin/perl \ - CFLAGS="-g -O2 -I/boot/common/include" \ - LIBS="" \ - LDFLAGS="-L/boot/common/lib -lnetwork -lbsd -liconv" \ - strip -} -LICENSE="GNU GPL v2" diff --git a/dev-vcs/git/git-1.7.0.1.bep b/dev-vcs/git/git-1.7.0.1.bep deleted file mode 100644 index e4a7d25d2..000000000 --- a/dev-vcs/git/git-1.7.0.1.bep +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION="git a fast version control system" -HOMEPAGE="http://git-scm.com/" -SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.0.1.tar.gz" -CHECKSUM_MD5="05485caf5c503ce378a87759bc3a0509" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD { - cd git-1.7.0.1 -# libtoolize --force --copy --install -# aclocal -# autoconf - ./configure --prefix=/boot/common --enable-pthreads="" - make prefix=/boot/common \ - NO_R_TO_GCC_LINKER=YesPlease \ - NO_C99_FORMAT=YesPlease \ - NO_ST_BLOCKS_IN_STRUCT_STAT=YesPlease \ - NO_MEMMEM=YesPlease \ - NO_MKSTEMPS=YesPlease \ - NO_MKDTEMP=YesPlease \ - NO_IPV6=YesPlease \ - NO_TCLTK=YesPlease \ - CURLDIR=/boot/common \ - PERL_PATH=/boot/common/bin/perl \ - CFLAGS="-g -O2 -I/boot/common/include" \ - LIBS="" \ - LDFLAGS="-L/boot/common/lib -lnetwork -lbsd -liconv" \ - strip -} - -INSTALL { - cd git-1.7.0.1 - make install prefix=/boot/common \ - NO_R_TO_GCC_LINKER=YesPlease \ - NO_C99_FORMAT=YesPlease \ - NO_ST_BLOCKS_IN_STRUCT_STAT=YesPlease \ - NO_MEMMEM=YesPlease \ - NO_MKSTEMPS=YesPlease \ - NO_MKDTEMP=YesPlease \ - NO_IPV6=YesPlease \ - NO_TCLTK=YesPlease \ - CURLDIR=/boot/common \ - PERL_PATH=/boot/common/bin/perl \ - CFLAGS="-g -O2 -I/boot/common/include" \ - LIBS="" \ - LDFLAGS="-L/boot/common/lib -lnetwork -lbsd -liconv" \ - strip -} -LICENSE="GNU GPL v2" diff --git a/dev-vcs/git/git-1.7.0.4.bep b/dev-vcs/git/git-1.7.0.4.bep deleted file mode 100644 index 26c90e674..000000000 --- a/dev-vcs/git/git-1.7.0.4.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="git a fast version control system" -HOMEPAGE="http://git-scm.com/" -SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.0.4.tar.bz2" -CHECKSUM_MD5="1cc8b2aea57e5e999ccac18ae355f760" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd git-1.7.0.4 - autoconf - CFLAGS="-I/boot/common/include" LDFLAGS="-L/boot/common/lib -L/boot/system/lib -lbsd -lnetwork" \ - ./configure --prefix=/boot/common --with-editor=nano --enable-pthreads="-lroot" \ - --with-perl=/boot/common/bin/perl --with-python=/boot/common/bin/python --without-tcltk - make strip -} - -INSTALL { - cd git-1.7.0.4 - make install -} -LICENSE="GNU GPL v2" diff --git a/dev-vcs/git/git-1.7.0.5.bep b/dev-vcs/git/git-1.7.0.5.bep deleted file mode 100644 index 7c8141dd0..000000000 --- a/dev-vcs/git/git-1.7.0.5.bep +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="git a fast version control system" -HOMEPAGE="http://git-scm.com/" -SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.0.5.tar.bz2" -CHECKSUM_MD5="77d50f41ef282752dc69d9a47765f5c7" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd git-1.7.0.5 - autoconf - CFLAGS="-I/boot/common/include" LDFLAGS="-L/boot/common/lib -L/boot/system/lib -lbsd -lnetwork" \ - ./configure --prefix=/boot/common --with-editor=nano --enable-pthreads="-lroot" \ - --with-perl=/boot/common/bin/perl --with-python=/boot/common/bin/python --without-tcltk - make strip -} - -INSTALL { - cd git-1.7.0.5 - make install -} -LICENSE="GNU GPL v2" diff --git a/dev-vcs/git/git-1.7.1.bep b/dev-vcs/git/git-1.7.1.bep deleted file mode 100644 index 546588724..000000000 --- a/dev-vcs/git/git-1.7.1.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="git a fast version control system" -HOMEPAGE="http://git-scm.com/" -SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.1.tar.bz2" -CHECKSUM_MD5="3da231dbe82ad103373cb530ae7475d5" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="net-misc/curl >= 7.20.0 - dev-lang/perl >= 5.10.1" -BUILD { - cd git-1.7.1 - autoconf - CFLAGS="-I/boot/common/include" LDFLAGS="-L/boot/common/lib -L/boot/system/lib -lbsd -lnetwork" \ - ./configure --prefix=/boot/common --with-editor=nano --enable-pthreads="-lroot" \ - --with-perl=/boot/common/bin/perl --with-python=/boot/common/bin/python --without-tcltk - make strip -} - -INSTALL { - cd git-1.7.1 - make install -} -LICENSE="GNU GPL v2" diff --git a/dev-vcs/git/git-1.7.10.2.bep b/dev-vcs/git/git-1.7.10.2.bep new file mode 100644 index 000000000..16648b18e --- /dev/null +++ b/dev-vcs/git/git-1.7.10.2.bep @@ -0,0 +1,26 @@ +DESCRIPTION="git a fast version control system" +HOMEPAGE="http://git-scm.com/" +SRC_URI="http://git-core.googlecode.com/files/git-1.7.10.2.tar.gz" +CHECKSUM_MD5="2e2ee53243ab8e7cf10f15c5229c3fce" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="net-misc/curl >= 7.20.0 + dev-lang/perl >= 5.10.1 + dev-vcs/gitdoc == 1.7.10" +BUILD { + cd git-1.7.10.2 + make strip +} + +INSTALL { + cd git-1.7.10.2 + make install +} + +TEST { + cd git-1.7.10.2 + make check +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2012 Git Authors (see git web site for list)" diff --git a/dev-vcs/git/git-1.7.11.3.bep b/dev-vcs/git/git-1.7.11.3.bep new file mode 100644 index 000000000..b7eb17c0a --- /dev/null +++ b/dev-vcs/git/git-1.7.11.3.bep @@ -0,0 +1,26 @@ +DESCRIPTION="git a fast version control system" +HOMEPAGE="http://git-scm.com/" +SRC_URI="http://git-core.googlecode.com/files/git-1.7.11.3.tar.gz" +CHECKSUM_MD5="23caacd9f3f421b6c05b40796df3505d" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="net-misc/curl >= 7.20.0 + dev-lang/perl >= 5.10.1 + dev-vcs/gitdoc == 1.7.11.3" +BUILD { + cd git-1.7.11.3 + make strip +} + +INSTALL { + cd git-1.7.11.3 + make install +} + +TEST { + cd git-1.7.11.3 + make check +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2012 Git Authors (see git web site for list)" diff --git a/dev-vcs/git/git-1.7.3.1.bep b/dev-vcs/git/git-1.7.3.1.bep deleted file mode 100644 index 69550c83c..000000000 --- a/dev-vcs/git/git-1.7.3.1.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="git a fast version control system" -HOMEPAGE="http://git-scm.com/" -SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.3.1.tar.bz2" -CHECKSUM_MD5="77e1611498919965fb65fd1f229ee155" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="net-misc/curl >= 7.20.0 - dev-lang/perl >= 5.10.1" -BUILD { - cd git-1.7.3.1 - autoconf - CFLAGS="-I/boot/common/include" LDFLAGS="-L/boot/common/lib -L/boot/system/lib -lbsd -lnetwork" \ - ./configure --prefix=/boot/common --with-editor=nano --enable-pthreads="-lroot" \ - --with-perl=/boot/common/bin/perl --with-python=/boot/common/bin/python --without-tcltk - make strip -} - -INSTALL { - cd git-1.7.3.1 - make install -} -LICENSE="GNU GPL v2" diff --git a/dev-vcs/git/git-1.7.3.5.bep b/dev-vcs/git/git-1.7.3.5.bep deleted file mode 100644 index 492d77acb..000000000 --- a/dev-vcs/git/git-1.7.3.5.bep +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="git a fast version control system" -HOMEPAGE="http://git-scm.com/" -SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.3.5.tar.bz2" -CHECKSUM_MD5="8a8cd93b8a4dff0a03c0fdc77253af3e" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="net-misc/curl >= 7.20.0 - dev-lang/perl >= 5.10.1" -BUILD { - cd git-1.7.3.5 - autoconf - sed -i 's/lgen/ /' configure - sed -i 's/-lgen/ /' Makefile - CFLAGS="-I/boot/common/include" LDFLAGS="-L/boot/common/lib -L/boot/system/lib -lbsd -lnetwork" \ - ./configure --prefix=/boot/common --with-editor=nano --enable-pthreads \ - --with-perl=/boot/common/bin/perl --with-python=/boot/common/bin/python --without-tcltk - make strip -} - -INSTALL { - cd git-1.7.3.5 - make install -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2011 Git Authors (see git web site for list)" diff --git a/dev-vcs/git/git-1.8.0.bep b/dev-vcs/git/git-1.8.0.bep new file mode 100644 index 000000000..7f984a813 --- /dev/null +++ b/dev-vcs/git/git-1.8.0.bep @@ -0,0 +1,26 @@ +DESCRIPTION="git a fast version control system" +HOMEPAGE="http://git-scm.com/" +SRC_URI="http://git-core.googlecode.com/files/git-1.8.0.tar.gz" +CHECKSUM_MD5="12f4d20f34ae37086d86dd3b9d037bba" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="net-misc/curl >= 7.20.0 + dev-lang/perl >= 5.10.1 + dev-vcs/gitdoc == 1.8.0" +BUILD { + cd git-1.8.0 + make strip +} + +INSTALL { + cd git-1.8.0 + make install +} + +TEST { + cd git-1.8.0 + make check +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2012 Git Authors (see git web site for list)" diff --git a/dev-vcs/git/git-1.8.1.3.bep b/dev-vcs/git/git-1.8.1.3.bep new file mode 100644 index 000000000..ba37b6fe3 --- /dev/null +++ b/dev-vcs/git/git-1.8.1.3.bep @@ -0,0 +1,26 @@ +DESCRIPTION="git a fast version control system" +HOMEPAGE="http://git-scm.com/" +SRC_URI="http://git-core.googlecode.com/files/git-1.8.1.3.tar.gz" +CHECKSUM_MD5="05fb5ea3792a51cef2becc8d06ea9b87" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="net-misc/curl >= 7.20.0 + dev-lang/perl >= 5.10.1 + dev-vcs/gitdoc == 1.8.0" +BUILD { + cd git-1.8.1.3 + make strip +} + +INSTALL { + cd git-1.8.1.3 + make install +} + +TEST { + cd git-1.8.1.3 + make check +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2013 Git Authors (see git web site for list)" diff --git a/dev-vcs/git/patches/git-1.5.5.diff b/dev-vcs/git/patches/git-1.5.5.diff deleted file mode 100644 index 213279c18..000000000 --- a/dev-vcs/git/patches/git-1.5.5.diff +++ /dev/null @@ -1,54 +0,0 @@ ---- git-1.5.5/Makefile 2008-04-08 07:10:01.000000000 +0000 -+++ git-1.5.5.patched/Makefile 2008-04-19 00:20:29.000000000 +0000 -@@ -989,7 +989,7 @@ - '-DGIT_INFO_PATH="$(infodir_SQ)"' $< - - $(BUILT_INS): git$X -- $(QUIET_BUILT_IN)$(RM) $@ && ln git$X $@ -+ $(QUIET_BUILT_IN)$(RM) $@ && ln -s git$X $@ - - common-cmds.h: ./generate-cmdlist.sh command-list.txt - -@@ -1230,7 +1230,7 @@ - cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \ - '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \ - fi -- $(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) -+ $(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln -s '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;) - ifneq (,$X) - $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';) - endif ---- git-1.5.5/git-compat-util.h 2008-04-08 07:10:01.000000000 +0000 -+++ git-1.5.5.patched/git-compat-util.h 2008-04-18 22:15:48.000000000 +0000 -@@ -453,4 +453,8 @@ - # define FORCE_DIR_SET_GID 0 - #endif - -+#ifndef INET_ADDRSTRLEN -+#define INET_ADDRSTRLEN 16 -+#endif -+ - #endif ---- git-1.5.5/builtin-count-objects.c 2008-04-08 07:10:01.000000000 +0000 -+++ git-1.5.5.patched/builtin-count-objects.c 2008-04-19 00:32:05.000000000 +0000 -@@ -43,7 +43,8 @@ - if (lstat(path, &st) || !S_ISREG(st.st_mode)) - bad = 1; - else -- (*loose_size) += xsize_t(st.st_blocks); -+// (*loose_size) += xsize_t(st.st_blocks); -+ (*loose_size) += ceil(st.st_size / 512.0); - } - if (bad) { - if (verbose) { ---- git-1.5.5/templates/Makefile 2008-04-08 07:10:01.000000000 +0000 -+++ git-1.5.5.patched/templates/Makefile 2008-04-19 00:44:46.000000000 +0000 -@@ -23,7 +23,7 @@ - - bpsrc = $(filter-out %~,$(wildcard *--*)) - boilerplates.made : $(bpsrc) -- $(QUIET)ls *--* 2>/dev/null | \ -+ $(QUIET)ls -1 *--* 2>/dev/null | \ - while read boilerplate; \ - do \ - case "$$boilerplate" in *~) continue ;; esac && \ diff --git a/dev-vcs/git/patches/git-1.7.0.4.patch b/dev-vcs/git/patches/git-1.7.0.4.patch deleted file mode 100644 index 68e66a2d4..000000000 --- a/dev-vcs/git/patches/git-1.7.0.4.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up git-1.7.0.4/configure.ac.orig git-1.7.0.4/configure.ac ---- git-1.7.0.4/configure.ac.orig 2010-04-03 18:57:28.303824896 -0600 -+++ git-1.7.0.4/configure.ac 2010-04-03 18:59:05.954990592 -0600 -@@ -527,17 +527,13 @@ test -n "$NEEDS_SOCKET" && LIBS="$LIBS - - # Define NEEDS_RESOLV if linking with -lnsl and/or -lsocket is not enough. - # Notably on Solaris hstrerror resides in libresolv and on Solaris 7 - # inet_ntop and inet_pton additionally reside there. --AC_CHECK_LIB([c], [hstrerror], --[NEEDS_RESOLV=], --[NEEDS_RESOLV=YesPlease]) -+AC_SEARCH_LIBS([hstrerror], [resolv], -+[AC_DEFINE([NEEDS_RESOLV], [YesPlease])]) - AC_SUBST(NEEDS_RESOLV) --test -n "$NEEDS_RESOLV" && LIBS="$LIBS -lresolv" - --AC_CHECK_LIB([c], [basename], --[NEEDS_LIBGEN=], --[NEEDS_LIBGEN=YesPlease]) -+AC_SEARCH_LIBS([basename], [gen], -+[AC_DEFINE([NEEDS_LIBGEN], [YesPlease])]) - AC_SUBST(NEEDS_LIBGEN) --test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen" - - ## Checks for header files. - AC_MSG_NOTICE([CHECKS for header files]) diff --git a/dev-vcs/git/patches/git-1.7.0.5.patch b/dev-vcs/git/patches/git-1.7.0.5.patch deleted file mode 100644 index 8770e4cde..000000000 --- a/dev-vcs/git/patches/git-1.7.0.5.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up git-1.7.0.5/configure.ac.orig git-1.7.0.4/configure.ac ---- git-1.7.0.5/configure.ac.orig 2010-04-03 18:57:28.303824896 -0600 -+++ git-1.7.0.5/configure.ac 2010-04-03 18:59:05.954990592 -0600 -@@ -527,17 +527,13 @@ test -n "$NEEDS_SOCKET" && LIBS="$LIBS - - # Define NEEDS_RESOLV if linking with -lnsl and/or -lsocket is not enough. - # Notably on Solaris hstrerror resides in libresolv and on Solaris 7 - # inet_ntop and inet_pton additionally reside there. --AC_CHECK_LIB([c], [hstrerror], --[NEEDS_RESOLV=], --[NEEDS_RESOLV=YesPlease]) -+AC_SEARCH_LIBS([hstrerror], [resolv], -+[AC_DEFINE([NEEDS_RESOLV], [YesPlease])]) - AC_SUBST(NEEDS_RESOLV) --test -n "$NEEDS_RESOLV" && LIBS="$LIBS -lresolv" - --AC_CHECK_LIB([c], [basename], --[NEEDS_LIBGEN=], --[NEEDS_LIBGEN=YesPlease]) -+AC_SEARCH_LIBS([basename], [gen], -+[AC_DEFINE([NEEDS_LIBGEN], [YesPlease])]) - AC_SUBST(NEEDS_LIBGEN) --test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen" - - ## Checks for header files. - AC_MSG_NOTICE([CHECKS for header files]) diff --git a/dev-vcs/git/patches/git-1.7.1.patch b/dev-vcs/git/patches/git-1.7.1.patch deleted file mode 100644 index 5ef8295ad..000000000 --- a/dev-vcs/git/patches/git-1.7.1.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up git-1.7.1/configure.ac.orig git-1.7.1/configure.ac ---- git-1.7.1/configure.ac.orig 2010-04-23 20:38:35.035127296 -0600 -+++ git-1.7.1/configure.ac 2010-05-13 18:03:30.180355072 -0600 -@@ -547,17 +547,13 @@ test -n "$NEEDS_SOCKET" && LIBS="$LIBS - - # Define NEEDS_RESOLV if linking with -lnsl and/or -lsocket is not enough. - # Notably on Solaris hstrerror resides in libresolv and on Solaris 7 - # inet_ntop and inet_pton additionally reside there. --AC_CHECK_LIB([c], [hstrerror], --[NEEDS_RESOLV=], --[NEEDS_RESOLV=YesPlease]) -+AC_SEARCH_LIBS([hstrerror], [resolv], -+[AC_DEFINE([NEEDS_RESOLV], [YesPlease])]) - AC_SUBST(NEEDS_RESOLV) --test -n "$NEEDS_RESOLV" && LIBS="$LIBS -lresolv" - --AC_CHECK_LIB([c], [basename], --[NEEDS_LIBGEN=], --[NEEDS_LIBGEN=YesPlease]) -+AC_SEARCH_LIBS([basename], [gen], -+[AC_DEFINE([NEEDS_LIBGEN], [YesPlease])]) - AC_SUBST(NEEDS_LIBGEN) --test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen" - - ## Checks for header files. - AC_MSG_NOTICE([CHECKS for header files]) diff --git a/dev-vcs/git/patches/git-1.7.10.2.patch b/dev-vcs/git/patches/git-1.7.10.2.patch new file mode 100644 index 000000000..36c719f64 --- /dev/null +++ b/dev-vcs/git/patches/git-1.7.10.2.patch @@ -0,0 +1,47 @@ +diff -up git-1.7.10.2/Makefile.orig git-1.7.10.2/Makefile +--- git-1.7.10.2/Makefile.orig 2012-05-11 14:25:45.066322432 -0600 ++++ git-1.7.10.2/Makefile 2012-05-19 12:53:42.392429568 -0600 +@@ -1242,6 +1242,31 @@ ifeq ($(uname_S),Minix) + NO_CURL = + NO_EXPAT = + endif ++ifeq ($(uname_S),Haiku) ++ NO_LIBGEN_H = YesPlease ++ NO_MEMMEM = YesPlease ++ NO_MKSTEMPS = YesPlease ++ NEEDS_LIBICONV = YesPlease ++ PERL_PATH = perl ++ PYTHON_PATH = python ++# TCL_PATH = tclsh ++ mandir = /boot/common/documentation/man ++ infodir = /boot/common/documentation/info ++ htmldir = /boot/common/documentation/doc/git-1.7.10.2 ++ gitexecdir = /boot/common/bin/git-core ++ gitwebdir = /boot/common/data/gitweb ++ template_dir = /boot/common/data/git-core/templates ++ NO_TCLTK = YesPlease ++ DEFAULT_EDITOR = nano ++ CURL_DIR = /boot/common ++ EXPAT_DIR = /boot/common ++ BASIC_CFLAGS += -I/boot/common/include ++ BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib ++ PTHREAD_LIBS = ++ prefix = /boot/common ++ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease ++ NO_GETTEXT = YesPlease ++endif + ifneq (,$(findstring MINGW,$(uname_S))) + pathsep = ; + NO_PREAD = YesPlease +diff -up git-1.7.10.2/git-web--browse.sh.orig git-1.7.10.2/git-web--browse.sh +--- git-1.7.10.2/git-web--browse.sh.orig 2012-05-11 14:25:45.053477376 -0600 ++++ git-1.7.10.2/git-web--browse.sh 2012-05-19 12:53:42.405536768 -0600 +@@ -116,7 +116,7 @@ if test -z "$browser" ; then + browser_candidates="konqueror $browser_candidates" + fi + else +- browser_candidates="w3m elinks links lynx" ++ browser_candidates="w3m elinks links lynx open" + fi + # SECURITYSESSIONID indicates an OS X GUI login session + if test -n "$SECURITYSESSIONID" \ diff --git a/dev-vcs/git/patches/git-1.7.11.3.patch b/dev-vcs/git/patches/git-1.7.11.3.patch new file mode 100644 index 000000000..5ffff15ee --- /dev/null +++ b/dev-vcs/git/patches/git-1.7.11.3.patch @@ -0,0 +1,47 @@ +diff -up git-1.7.11.3/Makefile.orig git-1.7.11.3/Makefile +--- git-1.7.11.3/Makefile.orig 2012-07-22 14:44:07.027525120 -0600 ++++ git-1.7.11.3/Makefile 2012-07-28 22:12:40.271056896 -0600 +@@ -1297,6 +1297,31 @@ ifeq ($(uname_S),Minix) + NO_CURL = + NO_EXPAT = + endif ++ifeq ($(uname_S),Haiku) ++ NO_LIBGEN_H = YesPlease ++ NO_MEMMEM = YesPlease ++ NO_MKSTEMPS = YesPlease ++ NEEDS_LIBICONV = YesPlease ++ PERL_PATH = perl ++ PYTHON_PATH = python ++# TCL_PATH = tclsh ++ mandir = /boot/common/documentation/man ++ infodir = /boot/common/documentation/info ++ htmldir = /boot/common/documentation/doc/git-1.7.11.3 ++ gitexecdir = /boot/common/bin/git-core ++ gitwebdir = /boot/common/data/gitweb ++ template_dir = /boot/common/data/git-core/templates ++ NO_TCLTK = YesPlease ++ DEFAULT_EDITOR = nano ++ CURL_DIR = /boot/common ++ EXPAT_DIR = /boot/common ++ BASIC_CFLAGS += -I/boot/common/include ++ BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib ++ PTHREAD_LIBS = ++ prefix = /boot/common ++ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease ++ NO_GETTEXT = YesPlease ++endif + ifneq (,$(findstring MINGW,$(uname_S))) + pathsep = ; + NO_PREAD = YesPlease +diff -up git-1.7.11.3/git-web--browse.sh.orig git-1.7.11.3/git-web--browse.sh +--- git-1.7.11.3/git-web--browse.sh.orig 2012-07-22 14:44:07.017039360 -0600 ++++ git-1.7.11.3/git-web--browse.sh 2012-07-28 22:12:40.283115520 -0600 +@@ -116,7 +116,7 @@ if test -z "$browser" ; then + browser_candidates="konqueror $browser_candidates" + fi + else +- browser_candidates="w3m elinks links lynx" ++ browser_candidates="w3m elinks links lynx open" + fi + # SECURITYSESSIONID indicates an OS X GUI login session + if test -n "$SECURITYSESSIONID" \ diff --git a/dev-vcs/git/patches/git-1.8.0.patch b/dev-vcs/git/patches/git-1.8.0.patch new file mode 100644 index 000000000..20f31f3de --- /dev/null +++ b/dev-vcs/git/patches/git-1.8.0.patch @@ -0,0 +1,47 @@ +diff -up git-1.8.0/Makefile.orig git-1.8.0/Makefile +--- git-1.8.0/Makefile.orig 2012-10-21 15:32:15.034078720 -0600 ++++ git-1.8.0/Makefile 2012-11-04 15:47:49.335020032 -0700 +@@ -1382,6 +1382,31 @@ ifeq ($(uname_S),NONSTOP_KERNEL) + # RFE 10-120912-4693 submitted to HP NonStop development. + NO_SETITIMER = UnfortunatelyYes + endif ++ifeq ($(uname_S),Haiku) ++ NO_LIBGEN_H = YesPlease ++ NO_MEMMEM = YesPlease ++ NO_MKSTEMPS = YesPlease ++ NEEDS_LIBICONV = YesPlease ++ PERL_PATH = perl ++ PYTHON_PATH = python ++# TCL_PATH = tclsh ++ mandir = /boot/common/documentation/man ++ infodir = /boot/common/documentation/info ++ htmldir = /boot/common/documentation/doc/git-1.8.0 ++ gitexecdir = /boot/common/bin/git-core ++ gitwebdir = /boot/common/data/gitweb ++ template_dir = /boot/common/data/git-core/templates ++ NO_TCLTK = YesPlease ++ DEFAULT_EDITOR = nano ++ CURL_DIR = /boot/common ++ EXPAT_DIR = /boot/common ++ BASIC_CFLAGS += -I/boot/common/include ++ BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib ++ PTHREAD_LIBS = ++ prefix = /boot/common ++ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease ++ NO_GETTEXT = YesPlease ++endif + ifneq (,$(findstring MINGW,$(uname_S))) + pathsep = ; + NO_PREAD = YesPlease +diff -up git-1.8.0/git-web--browse.sh.orig git-1.8.0/git-web--browse.sh +--- git-1.8.0/git-web--browse.sh.orig 2012-10-21 15:32:15.028311552 -0600 ++++ git-1.8.0/git-web--browse.sh 2012-11-04 15:47:49.345505792 -0700 +@@ -116,7 +116,7 @@ if test -z "$browser" ; then + browser_candidates="konqueror $browser_candidates" + fi + else +- browser_candidates="w3m elinks links lynx" ++ browser_candidates="w3m elinks links lynx open" + fi + # SECURITYSESSIONID indicates an OS X GUI login session + if test -n "$SECURITYSESSIONID" \ diff --git a/dev-vcs/git/patches/git-1.8.1.3.patch b/dev-vcs/git/patches/git-1.8.1.3.patch new file mode 100644 index 000000000..ce6762401 --- /dev/null +++ b/dev-vcs/git/patches/git-1.8.1.3.patch @@ -0,0 +1,47 @@ +diff -up git-1.8.1.3/Makefile.orig git-1.8.0/Makefile +--- git-1.8.1.3/Makefile.orig ++++ git-1.8.1.3/Makefile +@@ -1382,6 +1382,31 @@ ifeq ($(uname_S),NONSTOP_KERNEL) + # RFE 10-120912-4693 submitted to HP NonStop development. + NO_SETITIMER = UnfortunatelyYes + endif ++ifeq ($(uname_S),Haiku) ++ NO_LIBGEN_H = YesPlease ++ NO_MEMMEM = YesPlease ++ NO_MKSTEMPS = YesPlease ++ NEEDS_LIBICONV = YesPlease ++ PERL_PATH = perl ++ PYTHON_PATH = python ++# TCL_PATH = tclsh ++ mandir = /boot/common/documentation/man ++ infodir = /boot/common/documentation/info ++ htmldir = /boot/common/documentation/doc/git-1.8.0 ++ gitexecdir = /boot/common/bin/git-core ++ gitwebdir = /boot/common/data/gitweb ++ template_dir = /boot/common/data/git-core/templates ++ NO_TCLTK = YesPlease ++ DEFAULT_EDITOR = nano ++ CURL_DIR = /boot/common ++ EXPAT_DIR = /boot/common ++ BASIC_CFLAGS += -I/boot/common/include ++ BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib ++ PTHREAD_LIBS = ++ prefix = /boot/common ++ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease ++ NO_GETTEXT = YesPlease ++endif + ifneq (,$(findstring MINGW,$(uname_S))) + pathsep = ; + NO_PREAD = YesPlease +diff -up git-1.8.1.3/git-web--browse.sh.orig git-1.8.0/git-web--browse.sh +--- git-1.8.1.3/git-web--browse.sh.orig ++++ git-1.8.1.3/git-web--browse.sh +@@ -116,7 +116,7 @@ if test -z "$browser" ; then + browser_candidates="konqueror $browser_candidates" + fi + else +- browser_candidates="w3m elinks links lynx" ++ browser_candidates="w3m elinks links lynx open" + fi + # SECURITYSESSIONID indicates an OS X GUI login session + if test -n "$SECURITYSESSIONID" \ diff --git a/dev-vcs/gitdoc/gitdoc-1.7.10.2.bep b/dev-vcs/gitdoc/gitdoc-1.7.10.2.bep new file mode 100644 index 000000000..0eff3fdf2 --- /dev/null +++ b/dev-vcs/gitdoc/gitdoc-1.7.10.2.bep @@ -0,0 +1,32 @@ +DESCRIPTION="git a fast version control system" +HOMEPAGE="http://code.google.com/p/git-core/" +SRC_URI="http://git-core.googlecode.com/files/git-manpages-1.7.10.2.tar.gz" +CHECKSUM_MD5="79bae5456db8366803d28db867892d74" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + echo "Attempting to download additional formats" + wget http://git-core.googlecode.com/files/git-htmldocs-1.7.10.2.tar.gz + if [ $? != 0 ];then + echo "Error downloading additional formats" + exit 1 + fi +} + +INSTALL { + MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man + mkdir -p "${DESTDIR}/${MAN_DIR}" + cp -afv man* "${DESTDIR}/${MAN_DIR}" + + echo "Extracting extra docs" + DOC_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc/git-1.7.10.2 + mkdir -p "${DESTDIR}/${DOC_DIR}" + WORKDIR="$(pwd)" + cd "${DESTDIR}/${DOC_DIR}" + tar xvf "${WORKDIR}/git-htmldocs-1.7.10.2.tar.gz" +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2012 Git Authors (see git web site for list)" diff --git a/dev-vcs/gitdoc/gitdoc-1.7.11.3.bep b/dev-vcs/gitdoc/gitdoc-1.7.11.3.bep new file mode 100644 index 000000000..2299ff1a8 --- /dev/null +++ b/dev-vcs/gitdoc/gitdoc-1.7.11.3.bep @@ -0,0 +1,32 @@ +DESCRIPTION="git a fast version control system" +HOMEPAGE="http://code.google.com/p/git-core/" +SRC_URI="http://git-core.googlecode.com/files/git-manpages-1.7.10.2.tar.gz" +CHECKSUM_MD5="79bae5456db8366803d28db867892d74" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + echo "Attempting to download additional formats" + wget http://git-core.googlecode.com/files/git-htmldocs-1.7.11.3.tar.gz + if [ $? != 0 ];then + echo "Error downloading additional formats" + exit 1 + fi +} + +INSTALL { + MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man + mkdir -p "${DESTDIR}/${MAN_DIR}" + cp -afv man* "${DESTDIR}/${MAN_DIR}" + + echo "Extracting extra docs" + DOC_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc/git-1.7.11.3 + mkdir -p "${DESTDIR}/${DOC_DIR}" + WORKDIR="$(pwd)" + cd "${DESTDIR}/${DOC_DIR}" + tar xvf "${WORKDIR}/git-htmldocs-1.7.11.3.tar.gz" +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2012 Git Authors (see git web site for list)" diff --git a/dev-vcs/gitdoc/gitdoc-1.8.0.bep b/dev-vcs/gitdoc/gitdoc-1.8.0.bep new file mode 100644 index 000000000..01bf49658 --- /dev/null +++ b/dev-vcs/gitdoc/gitdoc-1.8.0.bep @@ -0,0 +1,32 @@ +DESCRIPTION="git a fast version control system" +HOMEPAGE="http://code.google.com/p/git-core/" +SRC_URI="http://git-core.googlecode.com/files/git-manpages-1.8.0.tar.gz" +CHECKSUM_MD5="66f0a839d933c7d573fb40cb051b5e66" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + echo "Attempting to download additional formats" + wget http://git-core.googlecode.com/files/git-htmldocs-1.8.0.tar.gz + if [ $? != 0 ];then + echo "Error downloading additional formats" + exit 1 + fi +} + +INSTALL { + MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man + mkdir -p "${DESTDIR}/${MAN_DIR}" + cp -afv man* "${DESTDIR}/${MAN_DIR}" + + echo "Extracting extra docs" + DOC_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc/git-1.8.0 + mkdir -p "${DESTDIR}/${DOC_DIR}" + WORKDIR="$(pwd)" + cd "${DESTDIR}/${DOC_DIR}" + tar xvf "${WORKDIR}/git-htmldocs-1.8.0.tar.gz" +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2012 Git Authors (see git web site for list)" diff --git a/dev-vcs/gitdoc/gitdoc-1.8.1.3.bep b/dev-vcs/gitdoc/gitdoc-1.8.1.3.bep new file mode 100644 index 000000000..743a2b073 --- /dev/null +++ b/dev-vcs/gitdoc/gitdoc-1.8.1.3.bep @@ -0,0 +1,32 @@ +DESCRIPTION="git a fast version control system" +HOMEPAGE="http://code.google.com/p/git-core/" +SRC_URI="http://git-core.googlecode.com/files/git-manpages-1.8.1.3.tar.gz" +CHECKSUM_MD5="b8e050c3c96b0b9fa28a7b7e9413af01" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + echo "Attempting to download additional formats" + wget http://git-core.googlecode.com/files/git-htmldocs-1.8.1.3.tar.gz + if [ $? != 0 ];then + echo "Error downloading additional formats" + exit 1 + fi +} + +INSTALL { + MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man + mkdir -p "${DESTDIR}/${MAN_DIR}" + cp -afv man* "${DESTDIR}/${MAN_DIR}" + + echo "Extracting extra docs" + DOC_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/doc/git-1.8.1.3 + mkdir -p "${DESTDIR}/${DOC_DIR}" + WORKDIR="$(pwd)" + cd "${DESTDIR}/${DOC_DIR}" + tar xvf "${WORKDIR}/git-htmldocs-1.8.1.3.tar.gz" +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2013 Git Authors (see git web site for list)" diff --git a/dev-vcs/mercurial/mercurial-1.4.2.bep b/dev-vcs/mercurial/mercurial-1.4.2.bep deleted file mode 100644 index c90bf3ed7..000000000 --- a/dev-vcs/mercurial/mercurial-1.4.2.bep +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION="Mercurial is a free, distributed source control management tool" -HOMEPAGE="http://mercurial.selenic.com/" -SRC_URI="http://mercurial.selenic.com/release/mercurial-1.4.2.tar.gz" -CHECKSUM_MD5="cf23b0887f0437c8601d5b89ae4663a6" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd mercurial-1.4.2 - python setup.py build -} - -INSTALL { - cd mercurial-1.4.2 - python setup.py install --prefix=/boot/common -} -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2010 Matt Mackall et al. " diff --git a/dev-vcs/mercurial/mercurial-1.4.bep b/dev-vcs/mercurial/mercurial-1.4.bep deleted file mode 100644 index eabf12e46..000000000 --- a/dev-vcs/mercurial/mercurial-1.4.bep +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION="Mercurial is a free, distributed source control management tool" -HOMEPAGE="http://mercurial.selenic.com/" -SRC_URI="http://mercurial.selenic.com/release/mercurial-1.4.tar.gz" -CHECKSUM_MD5="951ebd4a8153eaa3c56fc0ce2575ab70" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD { - cd mercurial-1.4 - python setup.py install --prefix="/boot/common" --force -} - -INSTALL { - cd mercurial-1.4 - make install PREFIX=/boot/common -} -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2010 Matt Mackall et al. " diff --git a/dev-vcs/mercurial/mercurial-1.5.1.bep b/dev-vcs/mercurial/mercurial-1.5.1.bep deleted file mode 100644 index 35d5b3d8f..000000000 --- a/dev-vcs/mercurial/mercurial-1.5.1.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Mercurial is a free, distributed source control management tool" -HOMEPAGE="http://mercurial.selenic.com/" -SRC_URI="http://mercurial.selenic.com/release/mercurial-1.5.1.tar.gz" -CHECKSUM_MD5="22eac5602d777f9601e23700e641503f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd mercurial-1.5.1 - python setup.py build --force -} - -INSTALL { - cd mercurial-1.5.1 - if [ -n ${DESTDIR} ];then - python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force - else - python setup.py install --prefix="/boot/common" --force - fi -} -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2010 Matt Mackall et al. " diff --git a/dev-vcs/mercurial/mercurial-1.5.2.bep b/dev-vcs/mercurial/mercurial-1.5.2.bep deleted file mode 100644 index f9f5e32fb..000000000 --- a/dev-vcs/mercurial/mercurial-1.5.2.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Mercurial is a free, distributed source control management tool" -HOMEPAGE="http://mercurial.selenic.com/" -SRC_URI="http://mercurial.selenic.com/release/mercurial-1.5.2.tar.gz" -CHECKSUM_MD5="deafaaf017fc3c8a9deef39e566aec80" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd mercurial-1.5.2 - python setup.py build --force -} - -INSTALL { - cd mercurial-1.5.2 - if [ -n ${DESTDIR} ];then - python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force - else - python setup.py install --prefix="/boot/common" --force - fi -} -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2010 Matt Mackall et al. " diff --git a/dev-vcs/mercurial/mercurial-1.5.3.bep b/dev-vcs/mercurial/mercurial-1.5.3.bep deleted file mode 100644 index 1ec3f0351..000000000 --- a/dev-vcs/mercurial/mercurial-1.5.3.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Mercurial is a free, distributed source control management tool" -HOMEPAGE="http://mercurial.selenic.com/" -SRC_URI="http://mercurial.selenic.com/release/mercurial-1.5.3.tar.gz" -CHECKSUM_MD5="0969b8109f1b5a9c4debf985cca938f9" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-lang/python >= 2.3" -BUILD { - cd mercurial-1.5.3 - python setup.py build --force -} - -INSTALL { - cd mercurial-1.5.3 - if [ -n ${DESTDIR} ];then - python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force - else - python setup.py install --prefix="/boot/common" --force - fi -} -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2010 Matt Mackall et al. " diff --git a/dev-vcs/mercurial/mercurial-1.5.bep b/dev-vcs/mercurial/mercurial-1.5.bep deleted file mode 100644 index fb1b85aa6..000000000 --- a/dev-vcs/mercurial/mercurial-1.5.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Mercurial is a free, distributed source control management tool" -HOMEPAGE="http://mercurial.selenic.com/" -SRC_URI="http://mercurial.selenic.com/release/mercurial-1.5.tar.gz" -CHECKSUM_MD5="6e31357ada35fe20557f08a4e89f9c42" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd mercurial-1.5 - python setup.py build --force -} - -INSTALL { - cd mercurial-1.5 - if [ -n ${DESTDIR} ];then - python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force - else - python setup.py install --prefix="/boot/common" --force - fi -} -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2010 Matt Mackall et al. " diff --git a/dev-vcs/mercurial/mercurial-1.6.bep b/dev-vcs/mercurial/mercurial-1.6.bep deleted file mode 100644 index 2e993e784..000000000 --- a/dev-vcs/mercurial/mercurial-1.6.bep +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Mercurial is a free, distributed source control management tool" -HOMEPAGE="http://mercurial.selenic.com/" -SRC_URI="http://mercurial.selenic.com/release/mercurial-1.6.tar.gz" -CHECKSUM_MD5="e97772cb424d29d9382c41daafa6f92d" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-lang/python >= 2.3" -BUILD { - cd mercurial-1.6 - python setup.py build --force -} - -INSTALL { - cd mercurial-1.6 - if [ -n "${DESTDIR}" ];then - python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force - else - python setup.py install --prefix="/boot/common" --force - fi -} -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2010 Matt Mackall et al. " diff --git a/dev-vcs/mercurial/mercurial-1.7.3.bep b/dev-vcs/mercurial/mercurial-1.7.3.bep deleted file mode 100644 index dcd197d07..000000000 --- a/dev-vcs/mercurial/mercurial-1.7.3.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="Mercurial is a free, distributed source control management tool" -HOMEPAGE="http://mercurial.selenic.com/" -SRC_URI="http://mercurial.selenic.com/release/mercurial-1.7.3.tar.gz" -CHECKSUM_MD5="1d635ad307fa20a5e9c6afba6145a73b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-lang/python >= 2.3" -BUILD { - cd mercurial-1.7.3 - python setup.py build --force -} - -INSTALL { - cd mercurial-1.7.3 - if [ -n "${DESTDIR}" ];then - python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --force - else - python setup.py install --prefix="/boot/common" --force - fi -} - -TEST { - cd mercurial-1.7.3/tests - python run-tests.py -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2010 Matt Mackall et al. " diff --git a/dev-vcs/mercurial/mercurial-2.2.2.bep b/dev-vcs/mercurial/mercurial-2.2.2.bep new file mode 100644 index 000000000..7afde93e2 --- /dev/null +++ b/dev-vcs/mercurial/mercurial-2.2.2.bep @@ -0,0 +1,30 @@ +DESCRIPTION="Mercurial is a free, distributed source control management tool" +HOMEPAGE="http://mercurial.selenic.com/" +SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz" +CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-lang/python >= 2.3" +BUILD { + cd mercurial-2.2.2 + python setup.py build --force +} + +INSTALL { + cd mercurial-2.2.2 + if [ -n "${DESTDIR}" ];then + python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force + else + python setup.py install --prefix="$(finddir B_COMMON_DIRECTORY)" --force + fi +} + +TEST { + cd mercurial-2.2.2/tests + shopt -s extglob + sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) + python run-tests.py +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2012 Matt Mackall et al." diff --git a/dev-vcs/mercurial/mercurial-2.2.3.bep b/dev-vcs/mercurial/mercurial-2.2.3.bep new file mode 100644 index 000000000..9ea952ad0 --- /dev/null +++ b/dev-vcs/mercurial/mercurial-2.2.3.bep @@ -0,0 +1,30 @@ +DESCRIPTION="Mercurial is a free, distributed source control management tool" +HOMEPAGE="http://mercurial.selenic.com/" +SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.3.tar.gz" +CHECKSUM_MD5="f4c70af3892d964b83b2718bde44c2f8" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-lang/python >= 2.3" +BUILD { + cd mercurial-2.2.3 + python setup.py build --force +} + +INSTALL { + cd mercurial-2.2.3 + if [ -n "${DESTDIR}" ];then + python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force + else + python setup.py install --prefix="$(finddir B_COMMON_DIRECTORY)" --force + fi +} + +TEST { + cd mercurial-2.2.3/tests + shopt -s extglob + sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) + python run-tests.py +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2012 Matt Mackall et al." diff --git a/dev-vcs/mercurial/mercurial-2.3.bep b/dev-vcs/mercurial/mercurial-2.3.bep new file mode 100644 index 000000000..3889beedc --- /dev/null +++ b/dev-vcs/mercurial/mercurial-2.3.bep @@ -0,0 +1,30 @@ +DESCRIPTION="Mercurial is a free, distributed source control management tool" +HOMEPAGE="http://mercurial.selenic.com/" +SRC_URI="http://mercurial.selenic.com/release/mercurial-2.3.tar.gz" +CHECKSUM_MD5="8d9f776e432239571dfab2b5f88b3675" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-lang/python >= 2.3" +BUILD { + cd mercurial-2.3 + python setup.py build --force +} + +INSTALL { + cd mercurial-2.3 + if [ -n "${DESTDIR}" ];then + python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force + else + python setup.py install --prefix="$(finddir B_COMMON_DIRECTORY)" --force + fi +} + +TEST { + cd mercurial-2.3/tests + shopt -s extglob + sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) + python run-tests.py +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2012 Matt Mackall et al." diff --git a/dev-vcs/mercurial/mercurial-2.4.bep b/dev-vcs/mercurial/mercurial-2.4.bep new file mode 100644 index 000000000..70186e0c6 --- /dev/null +++ b/dev-vcs/mercurial/mercurial-2.4.bep @@ -0,0 +1,30 @@ +DESCRIPTION="Mercurial is a free, distributed source control management tool" +HOMEPAGE="http://mercurial.selenic.com/" +SRC_URI="http://mercurial.selenic.com/release/mercurial-2.4.tar.gz" +CHECKSUM_MD5="c1fc9bec6951dd3c913092c3c72da014" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-lang/python >= 2.4" +BUILD { + cd mercurial-2.4 + python setup.py build --force +} + +INSTALL { + cd mercurial-2.4 + if [ -n "${DESTDIR}" ];then + python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force + else + python setup.py install --prefix="$(finddir B_COMMON_DIRECTORY)" --force + fi +} + +TEST { + cd mercurial-2.4/tests + shopt -s extglob + sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) + python run-tests.py +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2012 Matt Mackall et al." diff --git a/dev-vcs/mercurial/patches/mercurial-1.0.2-haiku.diff b/dev-vcs/mercurial/patches/mercurial-1.0.2-haiku.diff deleted file mode 100644 index 03ba71c96..000000000 --- a/dev-vcs/mercurial/patches/mercurial-1.0.2-haiku.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN mercurial-1.0.2/mercurial/bdiff.c mercurial-1.0.2-haiku/mercurial/bdiff.c ---- mercurial-1.0.2/mercurial/bdiff.c 2008-08-13 22:11:47.000000000 +0000 -+++ mercurial-1.0.2-haiku/mercurial/bdiff.c 2008-09-09 15:43:50.000000000 +0000 -@@ -34,7 +34,7 @@ - } - #else - #include --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - #include - #else - #include -diff -urN mercurial-1.0.2/mercurial/mpatch.c mercurial-1.0.2-haiku/mercurial/mpatch.c ---- mercurial-1.0.2/mercurial/mpatch.c 2008-08-13 22:11:47.000000000 +0000 -+++ mercurial-1.0.2-haiku/mercurial/mpatch.c 2008-09-09 15:44:29.000000000 +0000 -@@ -52,7 +52,7 @@ - #else - /* not windows */ - # include --# ifdef __BEOS__ -+# if defined __BEOS__ && !defined __HAIKU__ - # include - # else - # include diff --git a/dev-vcs/mercurial/patches/mercurial-1.5.1.patch b/dev-vcs/mercurial/patches/mercurial-1.5.1.patch deleted file mode 100644 index e93404db5..000000000 --- a/dev-vcs/mercurial/patches/mercurial-1.5.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mercurial-1.5.1/mercurial/ui.py.orig mercurial-1.5.1/mercurial/ui.py ---- mercurial-1.5.1/mercurial/ui.py.orig 2010-04-30 23:51:42.741605376 -0600 -+++ mercurial-1.5.1/mercurial/ui.py 2010-04-30 23:52:08.309854208 -0600 -@@ -384,7 +384,7 @@ class ui(object): - return (os.environ.get("HGEDITOR") or - self.config("ui", "editor") or - os.environ.get("VISUAL") or -- os.environ.get("EDITOR", "vi")) -+ os.environ.get("EDITOR", "nano")) - - def progress(self, topic, pos, item="", unit="", total=None): - '''show a progress message diff --git a/dev-vcs/mercurial/patches/mercurial-1.5.2.patch b/dev-vcs/mercurial/patches/mercurial-1.5.2.patch deleted file mode 100644 index 2f8db7ab5..000000000 --- a/dev-vcs/mercurial/patches/mercurial-1.5.2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mercurial-1.5.2/mercurial/ui.py.orig mercurial-1.5.2/mercurial/ui.py ---- mercurial-1.5.2/mercurial/ui.py.orig 2010-05-01 15:02:48.041156608 -0600 -+++ mercurial-1.5.2/mercurial/ui.py 2010-05-01 17:04:56.068943872 -0600 -@@ -384,7 +384,7 @@ class ui(object): - return (os.environ.get("HGEDITOR") or - self.config("ui", "editor") or - os.environ.get("VISUAL") or -- os.environ.get("EDITOR", "vi")) -+ os.environ.get("EDITOR", "nano")) - - def progress(self, topic, pos, item="", unit="", total=None): - '''show a progress message diff --git a/dev-vcs/mercurial/patches/mercurial-1.5.3.patch b/dev-vcs/mercurial/patches/mercurial-1.5.3.patch deleted file mode 100644 index 9aae6cec9..000000000 --- a/dev-vcs/mercurial/patches/mercurial-1.5.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mercurial-1.5.3/mercurial/ui.py.orig mercurial-1.5.3/mercurial/ui.py ---- mercurial-1.5.3/mercurial/ui.py.orig 2010-05-13 10:30:46.037224448 -0600 -+++ mercurial-1.5.3/mercurial/ui.py 2010-05-13 17:58:50.218890240 -0600 -@@ -384,7 +384,7 @@ class ui(object): - return (os.environ.get("HGEDITOR") or - self.config("ui", "editor") or - os.environ.get("VISUAL") or -- os.environ.get("EDITOR", "vi")) -+ os.environ.get("EDITOR", "nano")) - - def progress(self, topic, pos, item="", unit="", total=None): - '''show a progress message diff --git a/dev-vcs/mercurial/patches/mercurial-1.6.patch b/dev-vcs/mercurial/patches/mercurial-1.6.patch deleted file mode 100644 index 570190c90..000000000 --- a/dev-vcs/mercurial/patches/mercurial-1.6.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mercurial-1.6/mercurial/ui.py.orig mercurial-1.6/mercurial/ui.py ---- mercurial-1.6/mercurial/ui.py.orig 2010-07-01 11:06:27.030670848 -0600 -+++ mercurial-1.6/mercurial/ui.py 2010-07-01 11:41:21.504365056 -0600 -@@ -557,7 +557,7 @@ class ui(object): - return (os.environ.get("HGEDITOR") or - self.config("ui", "editor") or - os.environ.get("VISUAL") or -- os.environ.get("EDITOR", "vi")) -+ os.environ.get("EDITOR", "nano")) - - def progress(self, topic, pos, item="", unit="", total=None): - '''show a progress message diff --git a/dev-vcs/mercurial/patches/mercurial-1.7.3.patch b/dev-vcs/mercurial/patches/mercurial-1.7.3.patch deleted file mode 100644 index 003c2d4cd..000000000 --- a/dev-vcs/mercurial/patches/mercurial-1.7.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mercurial-1.7.3/mercurial/ui.py.orig mercurial-1.7.3/mercurial/ui.py ---- mercurial-1.7.3/mercurial/ui.py.orig 2010-07-01 11:06:27.030670848 -0600 -+++ mercurial-1.7.3/mercurial/ui.py 2010-07-01 11:41:21.504365056 -0600 -@@ -557,7 +557,7 @@ class ui(object): - return (os.environ.get("HGEDITOR") or - self.config("ui", "editor") or - os.environ.get("VISUAL") or -- os.environ.get("EDITOR", "vi")) -+ os.environ.get("EDITOR", "nano")) - - def progress(self, topic, pos, item="", unit="", total=None): - '''show a progress message diff --git a/dev-vcs/mercurial/patches/mercurial-2.2.2.patch b/dev-vcs/mercurial/patches/mercurial-2.2.2.patch new file mode 100644 index 000000000..285c8f417 --- /dev/null +++ b/dev-vcs/mercurial/patches/mercurial-2.2.2.patch @@ -0,0 +1,12 @@ +diff -up mercurial-2.2.2/mercurial/ui.py.orig mercurial-2.2.2/mercurial/ui.py +--- mercurial-2.2.2/mercurial/ui.py.orig 2012-06-01 22:48:21.025690112 -0600 ++++ mercurial-2.2.2/mercurial/ui.py 2012-06-04 17:15:16.317980672 -0600 +@@ -693,7 +693,7 @@ class ui(object): + # avoid confusion. + editor = 'E' + else: +- editor = 'vi' ++ editor = 'nano' + return (os.environ.get("HGEDITOR") or + self.config("ui", "editor") or + os.environ.get("VISUAL") or diff --git a/dev-vcs/mercurial/patches/mercurial-2.2.3.patch b/dev-vcs/mercurial/patches/mercurial-2.2.3.patch new file mode 100644 index 000000000..818833f7d --- /dev/null +++ b/dev-vcs/mercurial/patches/mercurial-2.2.3.patch @@ -0,0 +1,12 @@ +diff -up mercurial-2.2.3/mercurial/ui.py.orig mercurial-2.2.3/mercurial/ui.py +--- mercurial-2.2.3/mercurial/ui.py.orig 2012-06-01 22:48:21.025690112 -0600 ++++ mercurial-2.2.3/mercurial/ui.py 2012-06-04 17:15:16.317980672 -0600 +@@ -693,7 +693,7 @@ class ui(object): + # avoid confusion. + editor = 'E' + else: +- editor = 'vi' ++ editor = 'nano' + return (os.environ.get("HGEDITOR") or + self.config("ui", "editor") or + os.environ.get("VISUAL") or diff --git a/dev-vcs/mercurial/patches/mercurial-2.3.patch b/dev-vcs/mercurial/patches/mercurial-2.3.patch new file mode 100644 index 000000000..2bca746e2 --- /dev/null +++ b/dev-vcs/mercurial/patches/mercurial-2.3.patch @@ -0,0 +1,12 @@ +diff -up mercurial-2.3/mercurial/ui.py.orig mercurial-2.3/mercurial/ui.py +--- mercurial-2.3/mercurial/ui.py.orig 2012-08-02 00:49:31.022544384 -0600 ++++ mercurial-2.3/mercurial/ui.py 2012-08-02 01:06:19.942407680 -0600 +@@ -701,7 +701,7 @@ class ui(object): + # avoid confusion. + editor = 'E' + else: +- editor = 'vi' ++ editor = 'nano' + return (os.environ.get("HGEDITOR") or + self.config("ui", "editor") or + os.environ.get("VISUAL") or diff --git a/dev-vcs/mercurial/patches/mercurial-2.4.patch b/dev-vcs/mercurial/patches/mercurial-2.4.patch new file mode 100644 index 000000000..1ea197e37 --- /dev/null +++ b/dev-vcs/mercurial/patches/mercurial-2.4.patch @@ -0,0 +1,12 @@ +diff -up mercurial-2.4/mercurial/ui.py.orig mercurial-2.4/mercurial/ui.py +--- mercurial-2.4/mercurial/ui.py.orig 2012-08-02 00:49:31.022544384 -0600 ++++ mercurial-2.4/mercurial/ui.py 2012-08-02 01:06:19.942407680 -0600 +@@ -701,7 +701,7 @@ class ui(object): + # avoid confusion. + editor = 'E' + else: +- editor = 'vi' ++ editor = 'nano' + return (os.environ.get("HGEDITOR") or + self.config("ui", "editor") or + os.environ.get("VISUAL") or diff --git a/dev-vcs/subversion/patches/subversion-1.6.17.patch b/dev-vcs/subversion/patches/subversion-1.6.17.patch new file mode 100644 index 000000000..8db6b23c0 --- /dev/null +++ b/dev-vcs/subversion/patches/subversion-1.6.17.patch @@ -0,0 +1,86 @@ +diff -urN subversion-1.6.17/configure.ac subversion-1.6.17-haiku/configure.ac +--- subversion-1.6.17/configure.ac 2009-10-13 09:09:30.026214400 -0700 ++++ subversion-1.6.17-haiku/configure.ac 2011-08-02 14:32:39.227278848 -0700 +@@ -249,7 +249,7 @@ + dnl Check for libraries -------------------- + + # Berkeley DB on SCO OpenServer needs -lsocket +-AC_CHECK_LIB(socket, socket) ++AC_SEARCH_LIBS(socket, socket network) + + # Build the BDB filesystem library only if we have an appropriate + # version of Berkeley DB. +diff -urN subversion-1.6.17/subversion/libsvn_subr/config_file.c subversion-1.6.17-haiku/subversion/libsvn_subr/config_file.c +--- subversion-1.6.17/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 ++++ subversion-1.6.17-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 +@@ -32,6 +32,11 @@ + + #include "svn_private_config.h" + ++#ifdef __HAIKU__ ++# include ++# include ++#endif ++ + /* Used to terminate lines in large multi-line string literals. */ + #define NL APR_EOL_STR + +@@ -326,7 +331,19 @@ + SVN_CONFIG__SUBDIRECTORY, fname, NULL); + } + +-#else /* ! WIN32 */ ++#elif defined(__HAIKU__) ++{ ++ char folder[B_PATH_NAME_LENGTH]; ++ ++ status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, ++ folder, sizeof(folder)); ++ if (error) ++ return SVN_NO_ERROR; ++ ++ *path_p = svn_path_join_many(pool, folder, ++ SVN_CONFIG__SYS_DIRECTORY, fname, NULL); ++} ++#else /* ! WIN32 && !__HAIKU__ */ + + *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); + +@@ -1115,8 +1132,21 @@ + *path = svn_path_join_many(pool, folder, + SVN_CONFIG__SUBDIRECTORY, fname, NULL); + } ++ ++#elif defined(__HAIKU__) ++{ ++ char folder[B_PATH_NAME_LENGTH]; ++ ++ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, ++ folder, sizeof(folder)); ++ if (error) ++ return SVN_NO_ERROR; ++ ++ *path = svn_path_join_many(pool, folder, ++ SVN_CONFIG__USR_DIRECTORY, fname, NULL); ++} ++#else /* ! WIN32 && !__HAIKU__ */ + +-#else /* ! WIN32 */ + { + const char *homedir = svn_user_get_homedir(pool); + if (! homedir) +diff -urN subversion-1.6.17/subversion/libsvn_subr/config_impl.h subversion-1.6.17-haiku/subversion/libsvn_subr/config_impl.h +--- subversion-1.6.17/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 ++++ subversion-1.6.17-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 +@@ -109,7 +109,10 @@ + or svn_config_get_user_config_path() instead. */ + #ifdef WIN32 + # define SVN_CONFIG__SUBDIRECTORY "Subversion" +-#else /* ! WIN32 */ ++#elif defined __HAIKU__ /* HAIKU */ ++# define SVN_CONFIG__SYS_DIRECTORY "subversion" ++# define SVN_CONFIG__USR_DIRECTORY "subversion" ++#else /* ! WIN32 && ! __HAIKU__ */ + # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" + # define SVN_CONFIG__USR_DIRECTORY ".subversion" + #endif /* WIN32 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.18.patch b/dev-vcs/subversion/patches/subversion-1.6.18.patch new file mode 100644 index 000000000..ac6c86321 --- /dev/null +++ b/dev-vcs/subversion/patches/subversion-1.6.18.patch @@ -0,0 +1,86 @@ +diff -urN subversion-1.6.18/configure.ac subversion-1.6.18-haiku/configure.ac +--- subversion-1.6.18/configure.ac 2009-10-13 09:09:30.026214400 -0700 ++++ subversion-1.6.18-haiku/configure.ac 2011-08-02 14:32:39.227278848 -0700 +@@ -249,7 +249,7 @@ + dnl Check for libraries -------------------- + + # Berkeley DB on SCO OpenServer needs -lsocket +-AC_CHECK_LIB(socket, socket) ++AC_SEARCH_LIBS(socket, socket network) + + # Build the BDB filesystem library only if we have an appropriate + # version of Berkeley DB. +diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.18-haiku/subversion/libsvn_subr/config_file.c +--- subversion-1.6.18/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 ++++ subversion-1.6.18-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 +@@ -32,6 +32,11 @@ + + #include "svn_private_config.h" + ++#ifdef __HAIKU__ ++# include ++# include ++#endif ++ + /* Used to terminate lines in large multi-line string literals. */ + #define NL APR_EOL_STR + +@@ -326,7 +331,19 @@ + SVN_CONFIG__SUBDIRECTORY, fname, NULL); + } + +-#else /* ! WIN32 */ ++#elif defined(__HAIKU__) ++{ ++ char folder[B_PATH_NAME_LENGTH]; ++ ++ status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, ++ folder, sizeof(folder)); ++ if (error) ++ return SVN_NO_ERROR; ++ ++ *path_p = svn_path_join_many(pool, folder, ++ SVN_CONFIG__SYS_DIRECTORY, fname, NULL); ++} ++#else /* ! WIN32 && !__HAIKU__ */ + + *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); + +@@ -1115,8 +1132,21 @@ + *path = svn_path_join_many(pool, folder, + SVN_CONFIG__SUBDIRECTORY, fname, NULL); + } ++ ++#elif defined(__HAIKU__) ++{ ++ char folder[B_PATH_NAME_LENGTH]; ++ ++ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, ++ folder, sizeof(folder)); ++ if (error) ++ return SVN_NO_ERROR; ++ ++ *path = svn_path_join_many(pool, folder, ++ SVN_CONFIG__USR_DIRECTORY, fname, NULL); ++} ++#else /* ! WIN32 && !__HAIKU__ */ + +-#else /* ! WIN32 */ + { + const char *homedir = svn_user_get_homedir(pool); + if (! homedir) +diff -urN subversion-1.6.18/subversion/libsvn_subr/config_impl.h subversion-1.6.18-haiku/subversion/libsvn_subr/config_impl.h +--- subversion-1.6.18/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 ++++ subversion-1.6.18-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 +@@ -109,7 +109,10 @@ + or svn_config_get_user_config_path() instead. */ + #ifdef WIN32 + # define SVN_CONFIG__SUBDIRECTORY "Subversion" +-#else /* ! WIN32 */ ++#elif defined __HAIKU__ /* HAIKU */ ++# define SVN_CONFIG__SYS_DIRECTORY "subversion" ++# define SVN_CONFIG__USR_DIRECTORY "subversion" ++#else /* ! WIN32 && ! __HAIKU__ */ + # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" + # define SVN_CONFIG__USR_DIRECTORY ".subversion" + #endif /* WIN32 */ diff --git a/dev-vcs/subversion/subversion-1.6.11.bep b/dev-vcs/subversion/subversion-1.6.11.bep index 279a7d6c3..97693b80f 100644 --- a/dev-vcs/subversion/subversion-1.6.11.bep +++ b/dev-vcs/subversion/subversion-1.6.11.bep @@ -10,9 +10,9 @@ BUILD { libtoolize --force --copy --install aclocal -I build -I build/ac-macros autogen.sh - ./configure --prefix=/boot/common \ - --with-apr=/boot/common/bin/apr-1-config \ - --with-apr-util=/boot/common/bin/apu-1-config \ + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ + --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ --with-neon=/boot/common \ --with-editor=lpe \ --with-zlib=/boot/common diff --git a/dev-vcs/subversion/subversion-1.6.12.bep b/dev-vcs/subversion/subversion-1.6.12.bep index 61f09eac1..a6fe5aa74 100644 --- a/dev-vcs/subversion/subversion-1.6.12.bep +++ b/dev-vcs/subversion/subversion-1.6.12.bep @@ -11,9 +11,9 @@ BUILD { aclocal -I build -I build/ac-macros autoconf ./autogen.sh - ./configure --prefix=/boot/common \ - --with-apr=/boot/common/bin/apr-1-config \ - --with-apr-util=/boot/common/bin/apu-1-config \ + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ + --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ --with-neon=/boot/common \ --with-editor=nano \ --with-zlib=/boot/common diff --git a/dev-vcs/subversion/subversion-1.6.13.bep b/dev-vcs/subversion/subversion-1.6.13.bep index b0d994536..b2fd911fb 100644 --- a/dev-vcs/subversion/subversion-1.6.13.bep +++ b/dev-vcs/subversion/subversion-1.6.13.bep @@ -11,9 +11,9 @@ BUILD { aclocal -I build -I build/ac-macros autoconf ./autogen.sh - ./configure --prefix=/boot/common \ - --with-apr=/boot/common/bin/apr-1-config \ - --with-apr-util=/boot/common/bin/apu-1-config \ + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ + --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ --with-neon=/boot/common \ --with-editor=nano \ --with-zlib=/boot/common diff --git a/dev-vcs/subversion/subversion-1.6.17.bep b/dev-vcs/subversion/subversion-1.6.17.bep new file mode 100644 index 000000000..cafa62e18 --- /dev/null +++ b/dev-vcs/subversion/subversion-1.6.17.bep @@ -0,0 +1,56 @@ +DESCRIPTION="Subversion is an open source version control system" +HOMEPAGE="http://subversion.apache.org" +SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2" +CHECKSUM_MD5="81e5dc5beee4b3fc025ac70c0b6caa14" +REVISION="3" +STATUS_HAIKU="stable" +DEPEND="dev-libs/apr >= 1.4.4 + dev-libs/apr-util >= 1.3.12 + net-misc/neon >= 0.29.6 + dev-libs/libiconv >= 1.13.1 + dev-db/sqlite >= 3.7.7.1 + dev-libs/expat >= 2.0.1 + dev-libs/openssl >= 1.0.0d + dev-libs/libxml2 >= 2.7.8" + +BUILD { + cd subversion-1.6.17 + libtoolize --force --copy --install + aclocal -I build -I build/ac-macros + autoconf + COMMON_DIR=`finddir B_COMMON_DIRECTORY` + ./configure --prefix=$COMMON_DIR \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ + --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ + --with-neon=$COMMON_DIR \ + --with-zlib=$COMMON_DIR \ + --with-editor=nano \ + --disable-nls + make +} + +INSTALL { + cd subversion-1.6.17 + make install + if type -p swig > /dev/null;then + if type -p python > /dev/null;then + PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") + make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn + fi + #if type -p perl > /dev/null;then + # make install-swig-pl + #fi + #if type -p ruby > /dev/null;then + # make install-swig-rb + #fi + fi +} + +TEST { + cd subversion-1.6.17 + make check +} + +LICENSE="Apache-Subversion" +COPYRIGHT="2011 The Apache Software Foundation" diff --git a/dev-vcs/subversion/subversion-1.6.18.bep b/dev-vcs/subversion/subversion-1.6.18.bep new file mode 100644 index 000000000..5985c1fcd --- /dev/null +++ b/dev-vcs/subversion/subversion-1.6.18.bep @@ -0,0 +1,56 @@ +DESCRIPTION="Subversion is an open source version control system" +HOMEPAGE="http://subversion.apache.org" +SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2" +CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925" +REVISION="3" +STATUS_HAIKU="stable" +DEPEND="dev-libs/apr >= 1.4.4 + dev-libs/apr-util >= 1.3.12 + net-misc/neon >= 0.29.6 + dev-libs/libiconv >= 1.13.1 + dev-db/sqlite >= 3.7.7.1 + dev-libs/expat >= 2.0.1 + dev-libs/openssl >= 1.0.0d + dev-libs/libxml2 >= 2.7.8" + +BUILD { + cd subversion-1.6.18 + libtoolize --force --copy --install + aclocal -I build -I build/ac-macros + autoconf + COMMON_DIR=`finddir B_COMMON_DIRECTORY` + ./configure --prefix=$COMMON_DIR \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ + --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ + --with-neon=$COMMON_DIR \ + --with-zlib=$COMMON_DIR \ + --with-editor=nano \ + --disable-nls + make +} + +INSTALL { + cd subversion-1.6.18 + make install + if type -p swig > /dev/null;then + if type -p python > /dev/null;then + PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") + make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn + fi + #if type -p perl > /dev/null;then + # make install-swig-pl + #fi + #if type -p ruby > /dev/null;then + # make install-swig-rb + #fi + fi +} + +TEST { + cd subversion-1.6.18 + make check +} + +LICENSE="Apache-Subversion" +COPYRIGHT="2000-2009 CollabNet" diff --git a/dev-vcs/subversion/subversion-1.6.6.bep b/dev-vcs/subversion/subversion-1.6.6.bep index 710316480..969735f17 100644 --- a/dev-vcs/subversion/subversion-1.6.6.bep +++ b/dev-vcs/subversion/subversion-1.6.6.bep @@ -10,7 +10,7 @@ BUILD { libtoolize --force --copy --install aclocal -I build -I build/ac-macros autogen.sh - ./configure --prefix=/boot/common --with-apr=/boot/common/bin/apr-1-config --with-apr-util=/boot/common/bin/apu-1-config --with-neon=/boot/common --with-editor=lpe --with-zlib=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config --with-neon=/boot/common --with-editor=lpe --with-zlib=/boot/common make } diff --git a/dev-vcs/subversion/subversion-1.6.9.bep b/dev-vcs/subversion/subversion-1.6.9.bep index 033d85d5b..858cd6a22 100644 --- a/dev-vcs/subversion/subversion-1.6.9.bep +++ b/dev-vcs/subversion/subversion-1.6.9.bep @@ -10,7 +10,7 @@ BUILD { libtoolize --force --copy --install aclocal -I build -I build/ac-macros autogen.sh - ./configure --prefix=/boot/common --with-apr=/boot/common/bin/apr-1-config --with-apr-util=/boot/common/bin/apu-1-config --with-neon=/boot/common --with-editor=nano --with-zlib=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config --with-neon=/boot/common --with-editor=nano --with-zlib=/boot/common make } diff --git a/dev-vcs/subversion/subversion-1.7.0-rc2.bep b/dev-vcs/subversion/subversion-1.7.0-rc2.bep new file mode 100644 index 000000000..06ea4070a --- /dev/null +++ b/dev-vcs/subversion/subversion-1.7.0-rc2.bep @@ -0,0 +1,56 @@ +DESCRIPTION="Subversion is an open source version control system" +HOMEPAGE="http://subversion.apache.org" +SRC_URI="http://apache.deathculture.net/subversion/subversion-1.7.0-rc2.tar.bz2" +CHECKSUM_MD5="f0242ae5a2abc14cc22e65c2a23b09c4" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/apr >= 1.4.4 + dev-libs/apr-util >= 1.3.12 + net-misc/neon >= 0.29.6 + dev-libs/libiconv >= 1.13.1 + dev-db/sqlite >= 3.7.7.1 + dev-libs/expat >= 2.0.1 + dev-libs/openssl >= 1.0.0d + dev-libs/libxml2 >= 2.7.8" + +BUILD { + cd subversion-1.7.0-rc2 + libtoolize --force --copy --install + aclocal -I build -I build/ac-macros + autoconf + COMMON_DIR=`finddir B_COMMON_DIRECTORY` + ./configure --prefix=$COMMON_DIR \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ + --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ + --with-neon=$COMMON_DIR \ + --with-zlib=$COMMON_DIR \ + --with-editor=nano \ + --disable-nls + make +} + +INSTALL { + cd subversion-1.7.0-rc2 + make install + if type -p swig > /dev/null;then + if type -p python > /dev/null;then + PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") + make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn + fi + #if type -p perl > /dev/null;then + # make install-swig-pl + #fi + #if type -p ruby > /dev/null;then + # make install-swig-rb + #fi + fi +} + +TEST { + cd subversion-1.7.0-rc2 + make check +} + +LICENSE="Apache-Subversion" +COPYRIGHT="2011 The Apache Software Foundation" diff --git a/dev-vcs/subversion/subversion-1.7.xx-svn.bep b/dev-vcs/subversion/subversion-1.7.xx-svn.bep index 6519e2d3d..5e5fa165c 100644 --- a/dev-vcs/subversion/subversion-1.7.xx-svn.bep +++ b/dev-vcs/subversion/subversion-1.7.xx-svn.bep @@ -11,9 +11,9 @@ BUILD { aclocal -I build -I build/ac-macros autoconf ./autogen.sh - ./configure --prefix=/boot/common \ - --with-apr=/boot/common/bin/apr-1-config \ - --with-apr-util=/boot/common/bin/apu-1-config \ + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ + --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ --with-neon=/boot/common \ --with-editor=nano \ --with-zlib=/boot/common diff --git a/dev-vcs/tig/tig-0.16.bep b/dev-vcs/tig/tig-0.16.bep index bbf3db4da..cbd93d145 100644 --- a/dev-vcs/tig/tig-0.16.bep +++ b/dev-vcs/tig/tig-0.16.bep @@ -9,7 +9,7 @@ BUILD { cd tig-0.16 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/games-action/bzflag/bzflag-2.0.14.bep b/games-action/bzflag/bzflag-2.0.14.bep index c785dfb05..b169244d9 100644 --- a/games-action/bzflag/bzflag-2.0.14.bep +++ b/games-action/bzflag/bzflag-2.0.14.bep @@ -10,7 +10,7 @@ BUILD { mkdir -p m4 libtoolize --force --copy --install ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/games-action/cylindrix/cylindrix-1.0.bep b/games-action/cylindrix/cylindrix-1.0.bep index 5dca733d2..579964e86 100644 --- a/games-action/cylindrix/cylindrix-1.0.bep +++ b/games-action/cylindrix/cylindrix-1.0.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="media-libs/allegro >= 4.4.1.1" BUILD { cd cylindrix - CFLAGS='-O2' ./configure --prefix=/boot/common + CFLAGS='-O2' ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/games-arcade/alienblaster/alienblaster-1.1.0.bep b/games-arcade/alienblaster/alienblaster-1.1.0.bep new file mode 100644 index 000000000..d8ebd7e39 --- /dev/null +++ b/games-arcade/alienblaster/alienblaster-1.1.0.bep @@ -0,0 +1,26 @@ +DESCRIPTION="Action loaded 2D shooter" +MESSAGE="As of right now this app can only be run through terminal" +HOMEPAGE="www.schwardtnet.de/alienblaster" +SRC_URI="http://www.schwardtnet.de/alienblaster/archives/alienblaster-1.1.0.tgz" +CHECKSUM_MD5="27412a868f7d4ae0949036aeb29a6691" +STATUS_HAIKU="stable" +REVISION="1" +DEPEND="media-libs/libsdl >= 1.2.7 + media-libs/sdl-mixer >= 1.2.5" +BUILD { + cd alienblaster + make +} + +INSTALL { + cd alienblaster + GAMEDIR=`finddir B_APPS_DIRECTORY`/"AlienBlaster" + mkdir -p ${DESTDIR}/${GAMEDIR} + cp -af alienBlaster ${DESTDIR}/${GAMEDIR} + cp -af sound ${DESTDIR}/${GAMEDIR} + cp -af images ${DESTDIR}/${GAMEDIR} + cp -af cfg ${DESTDIR}/${GAMEDIR} +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2004 Paul Grathwol, Arne Hormann, Daniel Kuhn, Sonke Schwardt" \ No newline at end of file diff --git a/games-arcade/supertux/patches/supertux-0.1.3.patch b/games-arcade/supertux/patches/supertux-0.1.3.patch new file mode 100644 index 000000000..08c03d475 --- /dev/null +++ b/games-arcade/supertux/patches/supertux-0.1.3.patch @@ -0,0 +1,12 @@ +diff -Naur supertux-0.1.3/data/Makefile.am supertux-0.1.3-haiku/data/Makefile.am +--- supertux-0.1.3/data/Makefile.am 2005-07-08 22:18:26.015990784 +1000 ++++ supertux-0.1.3-haiku/data/Makefile.am 2012-11-28 23:13:56.921960448 +1000 +@@ -2,8 +2,6 @@ + supertux.strf \ + $(wildcard *.txt) \ + CREDITS \ +- $(wildcard sounds/*.wav) \ +- images/icon.xpm \ + $(wildcard images/*.png) \ + $(wildcard images/*.xpm) \ + $(wildcard images/background/*.png) \ diff --git a/games-arcade/supertux/supertux-0.1.3.bep b/games-arcade/supertux/supertux-0.1.3.bep new file mode 100644 index 000000000..159c000b3 --- /dev/null +++ b/games-arcade/supertux/supertux-0.1.3.bep @@ -0,0 +1,22 @@ +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" +CHECKSUM_MD5="f2fc288459f33d5cd8f645fbca737a63" +DEPEND=">=media-libs/libsdl-1.2.4" +REVISION="1" + +BUILD { + cd supertux-0.1.3 + autoreconf --force --install + ./configure --prefix="`finddir B_COMMON_DIRECTORY`" + make +} + +INSTALL { + cd supertux-0.1.3 + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2003 SuperTux Devel Team" diff --git a/games-emulation/dosbox/dosbox-0.74-svn.bep b/games-emulation/dosbox/dosbox-0.74-svn.bep new file mode 100644 index 000000000..0051b990a --- /dev/null +++ b/games-emulation/dosbox/dosbox-0.74-svn.bep @@ -0,0 +1,25 @@ +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/dosbox-0.74-svn.patch b/games-emulation/dosbox/dosbox-0.74-svn.patch new file mode 100644 index 000000000..1e81c8f9e --- /dev/null +++ b/games-emulation/dosbox/dosbox-0.74-svn.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. diff --git a/games-emulation/visualboyadvance/patches/visualboyadvance-1.7.2.patch b/games-emulation/visualboyadvance/patches/visualboyadvance-1.7.2.patch new file mode 100644 index 000000000..1f45d7d7b --- /dev/null +++ b/games-emulation/visualboyadvance/patches/visualboyadvance-1.7.2.patch @@ -0,0 +1,11 @@ +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.bep b/games-emulation/visualboyadvance/visualboyadvance-1.7.2.bep new file mode 100644 index 000000000..68b9d2f0b --- /dev/null +++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2.bep @@ -0,0 +1,31 @@ +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-misc/sdljoytest/sdljoytest-11102003.bep b/games-misc/sdljoytest/sdljoytest-11102003.bep new file mode 100644 index 000000000..bd4f42bf0 --- /dev/null +++ b/games-misc/sdljoytest/sdljoytest-11102003.bep @@ -0,0 +1,26 @@ +DESCRIPTION="Simple Direct Media Layer" +HOMEPAGE="http://sdljoytest.sourceforge.net" +SRC_URI="http://sourceforge.net/projects/sdljoytest/files/sdljoytest/SDLJoytest-GL/SDLJoytest-GL-11102003.tar.bz2/download" +CHECKSUM_MD5="bd80f7a1537dc0e17c9d524f0b29f5ee" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + cd SDLJoytest-GL + sed -i 's/\-lpthread/ /' Makefile + make +} + +INSTALL { + cd SDLJoytest-GL + BINDIR=${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` + MANDIR=${DESTDIR}`finddir B_COMMON_DATA_DIRECTORY`/man/man1 + mkdir -p ${BINDIR} + mkdir -p ${MANDIR} + cp SDLJoytest-GL ${BINDIR} + cp SDLJoytest.1 ${DESTDIR}`finddir B_COMMON_DATA_DIRECTORY`/man/man1 +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2003 Samuel E. Bray" diff --git a/games-puzzle/abrick/abrick-1.12.bep b/games-puzzle/abrick/abrick-1.12.bep new file mode 100644 index 000000000..b15ac2326 --- /dev/null +++ b/games-puzzle/abrick/abrick-1.12.bep @@ -0,0 +1,23 @@ +DESCRIPTION="Abandoned Bricks is a tetris like cross-platform puzzle game written in C++ using the SDL Library" +HOMEPAGE="www.abrick.sourceforge.net" +SRC_URI="http://sourceforge.net/projects/abrick/files/abrick/abrick-1.12/abrick-1.12-src.tar.gz" +CHECKSUM_MD5="56bdb952e2c247abfccf6e4a5251753c" +STATUS_HAIKU="stable" +REVISION="1" +DEPEND="media-libs/libsdl >= 1.2.14 + media-libs/sdl-mixer >=1.2.0" +BUILD { + cd abrick-1.12-src + make +} + +INSTALL { + cd abrick-1.12-src + GAMEDIR=`finddir B_APPS_DIRECTORY`/abrick + mkdir -p ${DESTDIR}/${GAMEDIR} + cp -af abrick ${DESTDIR}/${GAMEDIR} + cp -af data ${DESTDIR}/${GAMEDIR} +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2004, 2005 Milan Babuskov " diff --git a/games-puzzle/wizznic/patches/wizznic-0.9.9.patch b/games-puzzle/wizznic/patches/wizznic-0.9.9.patch new file mode 100644 index 000000000..dbc2d7aba --- /dev/null +++ b/games-puzzle/wizznic/patches/wizznic-0.9.9.patch @@ -0,0 +1,12 @@ +diff -ur wizznic-0.9.9-src/Makefile wizznic-0.9.9-src-haiku/Makefile +--- wizznic-0.9.9-src/Makefile 2011-12-29 22:12:52.035651584 +0000 ++++ wizznic-0.9.9-src-haiku/Makefile 2012-12-06 22:26:56.127926272 +0000 +@@ -19,7 +19,7 @@ + INCS = -I. -I/usr/include -I/usr/include/SDL + + LDFLAGS=$(CFLAGS) +-LIBS = -lSDL -lSDL_image -lSDL_mixer -lpng -lm -lz -lpthread ++LIBS = -lSDL -lSDL_image -lSDL_mixer -lpng -lz + + #Are we compiling with gl? + ifneq ($(WITH_OPENGL),false) diff --git a/games-puzzle/wizznic/wizznic-0.9.9.bep b/games-puzzle/wizznic/wizznic-0.9.9.bep new file mode 100644 index 000000000..f81063a12 --- /dev/null +++ b/games-puzzle/wizznic/wizznic-0.9.9.bep @@ -0,0 +1,30 @@ +DESCRIPTION="Wizznic!" +MESSAGE="Only compiles with gcc4, and only runs from terminal!" +HOMEPAGE="http://wizznic.sourceforge.net/" +SRC_URI="http://sourceforge.net/projects/wizznic/files/Source%20Releases/wizznic-0.9.9-src.tar.bz2/download" +CHECKSUM_MD5="1b017cd84903f40f2a3ae7aef9951e8d" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-lib/libsdl >= 1.2.14 + media-lib/sdl-mixer >= 1.2.11 + media-lib/sdl-image >= 1.2.10" +BUILD { + cd wizznic-0.9.9-src + make +} + +INSTALL { + cd wizznic-0.9.9-src + GAMEDIR=`finddir B_APPS_DIRECTORY`/"Wizznic" + mkdir -p ${DESTDIR}/${GAMEDIR} + cp -af wizznic ${DESTDIR}/${GAMEDIR} + cp -af data ${DESTDIR}/${GAMEDIR} + cp -af editorlevels ${DESTDIR}/${GAMEDIR} + cp -af highscores ${DESTDIR}/${GAMEDIR} + cp -af packs ${DESTDIR}/${GAMEDIR} + + +} + +LICENSE="GNU GPL v3" +COPYRIGHT="2011 Jimmy Christensen" diff --git a/games-rpg/freedroid/freedroid-1.0.2.bep b/games-rpg/freedroid/freedroid-1.0.2.bep new file mode 100644 index 000000000..5feecf4fd --- /dev/null +++ b/games-rpg/freedroid/freedroid-1.0.2.bep @@ -0,0 +1,24 @@ +DESCRIPTION="Freedroid Classic Game" +HOMEPAGE="http://freedroid.sourceforge.net/" +SRC_URI="http://sourceforge.net/projects/freedroid/files/freedroidClassic/FreedroidClassic-1.0.2/freedroid-1.0.2.tar.gz" +REVISION="1" +DEPEND="SDL >= 1.2.3 " +CHECKSUM_MD5="585a65f61c2cd308ab45d5c514f695dc" +BUILD { + cd freedroid-1.0.2 + libtoolize --force --copy --install + aclocal + autoconf + automake +# chmod 755 configure + ./configure --prefix=`finddir B_APPS_DIRECTORY`/FreeDroid + make +} + +INSTALL { + cd freedroid-1.0.2 + make install +} +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2010 The Freedroid Team" + diff --git a/games-rpg/freedroid/patches/freedroid-1.0.2.patch b/games-rpg/freedroid/patches/freedroid-1.0.2.patch new file mode 100644 index 000000000..1d4f5ca62 --- /dev/null +++ b/games-rpg/freedroid/patches/freedroid-1.0.2.patch @@ -0,0 +1,16 @@ +diff -urN freedroid-1.0.2/configure.ac freedroid-1.0.2-haiku/configure.ac +--- freedroid-1.0.2/configure.ac 2003-08-09 10:04:33.031981568 -0700 ++++ freedroid-1.0.2-haiku/configure.ac 2012-12-12 22:59:04.623116288 -0800 +@@ -20,9 +20,9 @@ + AC_PROG_MAKE_SET + + # 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_CHECK_LIB([c], [printf],, AC_MSG_ERROR([libc not found!! ])) + diff --git a/games-simulation/openttd/openttd-1.2.3.bep b/games-simulation/openttd/openttd-1.2.3.bep new file mode 100644 index 000000000..e97ac9d7c --- /dev/null +++ b/games-simulation/openttd/openttd-1.2.3.bep @@ -0,0 +1,30 @@ +DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe" +MESSAGE="This port requires gcc4. You require game graphics/sound files to use this port" +HOMEPAGE="http://www.openttd.org" +SRC_URI="http://binaries.openttd.org/releases/1.2.3/openttd-1.2.3-source.tar.xz" +CHECKSUM_MD5="e1cf40f7c29f8f4b3e96c21626db241d" +REVISION="1" +STATUS_HAIKU="unstable" +DEPEND="media-libs/libsdl, + zlib, + xz-utils, + pkgconfig, + lzo" + +BUILD { + cd openttd-1.2.3 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd openttd-1.2.3 + make install + cp -R bundle /boot/apps + mv /boot/apps/bundle /boot/apps/OpenTTD\ 1.2.3 +} + +# no TEST script available + +COPYRIGHT="2005-2013 OpenTTD Team" +LICENSE="GNU GPL v2" diff --git a/gnome-base/gnome-common/gnome-common-2.28.bep b/gnome-base/gnome-common/gnome-common-2.28.bep index 0a9982fe7..b5cdf1967 100644 --- a/gnome-base/gnome-common/gnome-common-2.28.bep +++ b/gnome-base/gnome-common/gnome-common-2.28.bep @@ -7,7 +7,7 @@ DEPEND="" BUILD { cd gnome-common-2.28 ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/gnome-extra/libgsf/libgsf-1.14.18.bep b/gnome-extra/libgsf/libgsf-1.14.18.bep index 1f585b8a8..f91ef5d09 100644 --- a/gnome-extra/libgsf/libgsf-1.14.18.bep +++ b/gnome-extra/libgsf/libgsf-1.14.18.bep @@ -13,7 +13,7 @@ BUILD { cd libgsf-1.14.18 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make cd thumbnailer make diff --git a/haiku-apps/W6/W6-1.7.bep b/haiku-apps/W6/W6-1.7.bep new file mode 100644 index 000000000..70d7588e6 --- /dev/null +++ b/haiku-apps/W6/W6-1.7.bep @@ -0,0 +1,26 @@ +DESCRIPTION="What Went Wrong? it's a World Wide War!" +HOMEPAGE="http://lema.link-u.com/be/" +SRC_URI="http://lema.link-u.com/be/W6Haiku.zip" +CHECKSUM_MD5="763e608d79ee6de6efe6dcb77600a331" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + cd W6Haiku + make + cd ../ + wget http://lema.link-u.com/be/W6forR5-with-sources.zip + unzip W6forR5-with-sources.zip + cp -r W6/w6s W6Haiku +} + +INSTALL { + cd W6Haiku + mkdir -p $DESTDIR`finddir B_APPS_DIRECTORY`/W6 + install -m 0755 objects.x86-gcc`setgcc | tail -c -2`-release/W6Haiku $DESTDIR`finddir B_APPS_DIRECTORY`/W6/W6 + cp -r w6s $DESTDIR`finddir B_APPS_DIRECTORY`/W6 +} + +LICENSE="Public Domain" +COPYRIGHT="1998-1999 Santiago Lema" diff --git a/haiku-apps/W6/patches/w6-1.7.patch b/haiku-apps/W6/patches/w6-1.7.patch new file mode 100644 index 000000000..a99e78ed2 --- /dev/null +++ b/haiku-apps/W6/patches/w6-1.7.patch @@ -0,0 +1,34 @@ +diff -Naur W6Haiku/InfoView.cpp W6Haiku-haiku/InfoView.cpp +--- W6Haiku/InfoView.cpp 2008-08-16 02:57:03.065798144 +0000 ++++ W6Haiku-haiku/InfoView.cpp 2013-01-13 11:59:46.657457152 +0000 +@@ -280,7 +280,7 @@ + sprintf(str2,_jour->month_name); strcat(str,str2); + sprintf(str2," %i, %i",_jour->month_counter, _jour->year); strcat(str,str2); + strcat(str,")"); +- Window()->SetTitle(str); ++ //Window()->SetTitle(str); + + + //A l'ancienne +@@ -567,4 +567,4 @@ + x->Close(); + delete upBitmap; + delete downBitmap; +-} +\ No newline at end of file ++} +diff -Naur W6Haiku/W6.cpp W6Haiku-haiku/W6.cpp +--- W6Haiku/W6.cpp 2008-08-16 04:35:06.002359296 +0000 ++++ W6Haiku-haiku/W6.cpp 2013-01-13 12:00:52.285736960 +0000 +@@ -89,9 +89,9 @@ + + + //classe qui tourne en permanence et qui fait les daypassed (et par conséquent, les battle etc. +- run_me = new Running(_country,_group,_politic,_weapon,_jour); ++ //run_me = new Running(_country,_group,_politic,_weapon,_jour); + runWin = new BWindow(BRect(0,0,0,0), "W6 time run", B_TITLED_WINDOW, B_NOT_RESIZABLE); +- runWin->AddChild(run_me); //sinon le pulse fonctionne pas... ++ //runWin->AddChild(run_me); //sinon le pulse fonctionne pas... + runWin->Lock(); + runWin->Show(); //faut faire show pour lancer le pulse dans les views + runWin->Hide(); //quitte à hider la window ensuite diff --git a/haiku-apps/album/album-0.9.2.bep b/haiku-apps/album/album-0.9.2.bep new file mode 100644 index 000000000..dd26abcd6 --- /dev/null +++ b/haiku-apps/album/album-0.9.2.bep @@ -0,0 +1,18 @@ +DESCRIPTION="An image viewer/organiser designed for BeOS-compatible operating systems" +HOMEPAGE="http://users.volja.net/mkovac1/proj/album/" +SRC_URI="http://users.volja.net/mkovac1/proj/album/album-0.9.2.zip" +CHECKSUM_MD5="d22d1850ba5807c5da0432ecd530c372" +STATUS_HAIKU="stable" +REVISION="1" +DEPEND=" " +BUILD { + cd album-0.9.2/src + make +} +INSTALL { + cd album-0.9.2 + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Album + cp -a Album ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Album +} +LICENSE="MIT" +COPYRIGHT="2006-2009 by Matjaž Kovač" \ No newline at end of file diff --git a/haiku-apps/aplayer/aplayer-4.0.1.bep b/haiku-apps/aplayer/aplayer-4.0.1.bep new file mode 100644 index 000000000..5152ab11d --- /dev/null +++ b/haiku-apps/aplayer/aplayer-4.0.1.bep @@ -0,0 +1,21 @@ +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" +STATUS_HAIKU="broken" +DEPEND="" + +BUILD { + cd aplayer-4.0.1/Master + make +} + +INSTALL { + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/APlayer + cp -a APlayer ${DESTDIR}/`finddir B_APPS_DIRECTORY`/APlayer +} + +LICENSE="Artistic Licence" +COPYRIGHT="1994-2002 Polycode + 2011-2012 Adrien Destugues" + diff --git a/haiku-apps/armyknife/armyknife-61.bep b/haiku-apps/armyknife/armyknife-61.bep index c80674051..252077a6a 100644 --- a/haiku-apps/armyknife/armyknife-61.bep +++ b/haiku-apps/armyknife/armyknife-61.bep @@ -1,6 +1,6 @@ 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" +SRC_URI="svn+http://svn.osdrawer.net/armyknife#61" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/taglib >= 1.6.3" diff --git a/haiku-apps/armyknife/armyknife-62.bep b/haiku-apps/armyknife/armyknife-62.bep new file mode 100644 index 000000000..5bff3c87a --- /dev/null +++ b/haiku-apps/armyknife/armyknife-62.bep @@ -0,0 +1,18 @@ +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 +} diff --git a/haiku-apps/armyknife/armyknife-63.bep b/haiku-apps/armyknife/armyknife-63.bep new file mode 100644 index 000000000..c8cd02afa --- /dev/null +++ b/haiku-apps/armyknife/armyknife-63.bep @@ -0,0 +1,18 @@ +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#63" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/taglib >= 1.6.3" +#CHECKSUM_MD5="" +BUILD { + cd armyknife-63 + make +} + +INSTALL { + cd armyknife-63 + make zipfile + mkdir -p ${DESTDIR}/boot/apps + unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps +} diff --git a/haiku-apps/armyknife/armyknife-999-git.bep b/haiku-apps/armyknife/armyknife-999-git.bep new file mode 100644 index 000000000..6307acc63 --- /dev/null +++ b/haiku-apps/armyknife/armyknife-999-git.bep @@ -0,0 +1,19 @@ +DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of audio files." +HOMEPAGE="http://dev.osdrawer.net/projects/armyknife" +SRC_URI="git+https://github.com/scottmc/ArmyKnife.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/taglib >= 1.6.3" +#CHECKSUM_MD5="" +BUILD { + cd armyknife-999-git + make +} + +INSTALL { + cd armyknife-999-git + make zipfile + mkdir -p ${DESTDIR}/boot/apps + unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps +} + diff --git a/haiku-apps/artpaint/artpaint-339.bep b/haiku-apps/artpaint/artpaint-339.bep index c62b03f98..c0514179e 100644 --- a/haiku-apps/artpaint/artpaint-339.bep +++ b/haiku-apps/artpaint/artpaint-339.bep @@ -2,7 +2,7 @@ DESCRIPTION="Artpaint is a painting and image processing program" HOMEPAGE="http://dev.osdrawer.net/projects/artpaint" SRC_URI="svn+http://svn.osdrawer.net/artpaint/trunk" REVISION="1" -STATUS_HAIKU="stable" +STATUS_HAIKU="broken" DEPEND="" #CHECKSUM_MD5="" BUILD { diff --git a/haiku-apps/beae/beae-25.bep b/haiku-apps/beae/beae-25.bep new file mode 100644 index 000000000..ae9d26e62 --- /dev/null +++ b/haiku-apps/beae/beae-25.bep @@ -0,0 +1,27 @@ +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" diff --git a/haiku-apps/beam/beam-1.2alpha.bep b/haiku-apps/beam/beam-1.2alpha.bep new file mode 100644 index 000000000..f8fe770d2 --- /dev/null +++ b/haiku-apps/beam/beam-1.2alpha.bep @@ -0,0 +1,26 @@ +DESCRIPTION="An e-mail client." +HOMEPAGE="http://beam.sourceforge.net" +SRC_URI="git://beam.git.sourceforge.net/gitroot/beam/beam" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="liblayout >= 1.4.0 + libpcre >= 8.00" +#CHECKSUM_MD5="" +BUILD { + cd beam-1.2alpha + jam +} + +INSTALL { + cd beam-1.2alpha + mkdir -p ${DESTDIR}/boot/apps/Beam + cp -a generated/distro-haiku/* ${DESTDIR}/boot/apps/Beam + cp -a Changes.txt GnuGeneralPublicLicense.txt Readme.txt ${DESTDIR}/boot/apps/Beam + mkdir -p ${DESTDIR}/boot/apps/Beam/Icons + cp -a resources/iconset* ${DESTDIR}/boot/apps/Beam/Icons + cd ${DESTDIR}/boot/apps/Beam/tools + ln -s ../lib . + ln -s ../add-ons . +} +LICENSE="GNU GPL v2" +COPYRIGHT="2000-2012 Oliver Tappe" diff --git a/haiku-apps/beezer/beezer-1.bep b/haiku-apps/beezer/beezer-1.bep new file mode 100644 index 000000000..bb215a60a --- /dev/null +++ b/haiku-apps/beezer/beezer-1.bep @@ -0,0 +1,26 @@ +DESCRIPTION="beezer, an archiving tool for the Haiku operating system, similar to winzip" +HOMEPAGE="https://bitbucket.org/cpr/beezer" +SRC_URI="https://bitbucket.org/cpr/beezer/get/82199f683571.zip" +REVISION="1" +STATUS_HAIKU="stable" +CHECKSUM_MD5="b27479b8a8afc1bc105ad9a6d8911f74" +DEPEND="cmake >= 2.8" +BUILD { + cd cpr-beezer-82199f683571/Source + cmake . + make +} + +INSTALL { + cd cpr-beezer-82199f683571/Source/build + BEEZER_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Beezer + mkdir -p $BEEZER_DIR/add-ons + cp -a Beezer $BEEZER_DIR + cp -a add-ons/* $BEEZER_DIR/add-ons + mkdir -p ${DESTDIR}/`finddir B_USER_ADDONS_DIRECTORY`/Tracker + cp -a TrackerAddOn/BeezerAddOn ${DESTDIR}/`finddir B_USER_ADDONS_DIRECTORY`/Tracker +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="2009 Ramshankar (aka Teknomancer) + 2011-2012 Chris Roberts" diff --git a/haiku-apps/beget/beget-1.2.3.bep b/haiku-apps/beget/beget-1.2.3.bep new file mode 100644 index 000000000..c87a6858f --- /dev/null +++ b/haiku-apps/beget/beget-1.2.3.bep @@ -0,0 +1,24 @@ +DESCRIPTION="A GUI frontend to the command-line downloader wget" +HOMEPAGE="http://dev.osdrawer.net/projects/beget" +SRC_URI="svn+http://svn.osdrawer.net/beget#6" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="net-misc/wget" + +BUILD { + cd beget-1.2.3 + cmake . + make +} + +INSTALL { + cd beget-1.2.3 + mkdir -p $DESTDIR`finddir B_APPS_DIRECTORY` + cp BeGet $DESTDIR`finddir B_APPS_DIRECTORY` + mkdir -p $DESTDIR`finddir B_USER_DESKBAR_DIRECTORY` + ln -s $DESTDIR`finddir B_APPS_DIRECTORY`/BeGet \ + $DESTDIR`finddir B_USER_DESKBAR_DIRECTORY`/Applications +} + +LICENSE="GNU GPL v2" +COPYRIGHT="1999-2001 Atsushi Takamatsu" diff --git a/haiku-apps/behappy/behappy-16.bep b/haiku-apps/behappy/behappy-16.bep new file mode 100644 index 000000000..82da09219 --- /dev/null +++ b/haiku-apps/behappy/behappy-16.bep @@ -0,0 +1,19 @@ +DESCRIPTION="HTML documentation viewer" +HOMEPAGE="http://www.becoz.org/beos-en/behappy" +SRC_URI="svn+http://svn.osdrawer.net/behappy/trunk#16" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="www-client/netsurf >= 2.6" +#CHECKSUM_MD5="" +BUILD { + cd "behappy-16" + make +} + +INSTALL { + cd "behappy-16" +} + +LICENSE="MIT" +COPYRIGHT="2006 Sylvain Tertois + 2008-2009 François Revol" diff --git a/haiku-apps/behappy/patches/Makefile b/haiku-apps/behappy/patches/Makefile new file mode 100644 index 000000000..5ff97b937 --- /dev/null +++ b/haiku-apps/behappy/patches/Makefile @@ -0,0 +1,27 @@ +NAME= BeHappy +TYPE= APP +SRCS= BeHappy.cpp AddOnPrefFile.cpp Eraser.cpp Preferences.cpp Tasks.cpp TranslateEntities.cpp Version.cpp WindowMonitor.cpp InfoWindow.cpp MainWindow.cpp PathWindow.cpp BrowseView.cpp Mover.cpp NetView.cpp LanguageHandler.cpp Locale.cpp HTMLProject.cpp HTMLFile.cpp HappyLink.cpp +RSRCS= Netpositive Replicant.rsrc BeHappy.rsrc +LIBS= /boot/develop/lib/x86/libbe.so /boot/develop/lib/x86/libroot.so /boot/develop/lib/x86/libtracker.so /boot/develop/lib/x86/libsupc++.so +LIBPATHS= +SYSTEM_INCLUDE_PATHS= /boot/develop/headers/be /boot/develop/headers/cpp /boot/develop/headers/posix /boot/develop/lib /boot/beos/system/lib +LOCAL_INCLUDE_PATHS= +OPTIMIZE=FULL +# 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 = +# Build with debugging symbols if set to TRUE +SYMBOLS= +COMPILER_FLAGS=-Woverloaded-virtual -funsigned-bitfields -Wwrite-strings -D _NODEBUG +LINKER_FLAGS= + +## include the makefile-engine +include $(BUILDHOME)/etc/makefile-engine diff --git a/haiku-apps/bepdf/bepdf-1.1.1b2-532.bep b/haiku-apps/bepdf/bepdf-1.1.1b4.bep similarity index 54% rename from haiku-apps/bepdf/bepdf-1.1.1b2-532.bep rename to haiku-apps/bepdf/bepdf-1.1.1b4.bep index cb215662e..61df256e4 100644 --- a/haiku-apps/bepdf/bepdf-1.1.1b2-532.bep +++ b/haiku-apps/bepdf/bepdf-1.1.1b4.bep @@ -1,22 +1,20 @@ DESCRIPTION="BePDF is a PDF viewer for the BeOS, Haiku & Zeta" HOMEPAGE="http://bepdf.sourceforge.net/" -SRC_URI="svn+http://bepdf.svn.sourceforge.net/svnroot/bepdf/trunk#532" +SRC_URI="cvs://:pserver:anonymous@bepdf.cvs.sourceforge.net:/cvsroot/bepdf/BePDF" REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" +STATUS_HAIKU="stable" +DEPEND="app-text/htmldoc == 1.8.27" BUILD { export BEPDF_BUILD_GCC=`setgcc | cut -d/ -f2` - cd bepdf-1.1.1b2-532 + cd bepdf-1.1.1b4 ./build.sh package } INSTALL { - cd bepdf-1.1.1b2-532 - - # TODO:... - echo "Implement me ..." - exit 1 + cd bepdf-1.1.1b4 + mkdir -p ${DESTDIR}/boot/apps + unzip generated/BePDF-1.1.1b4.x86.zip -d ${DESTDIR}/boot/apps } COPYRIGHT="1997 Benoit Triquet diff --git a/haiku-apps/beshare/beshare-4.bep b/haiku-apps/beshare/beshare-4.bep new file mode 100644 index 000000000..70162a75d --- /dev/null +++ b/haiku-apps/beshare/beshare-4.bep @@ -0,0 +1,18 @@ +DESCRIPTION="Beshare" +HOMEPAGE="http://dev.osdrawer.net/projects/beshare/" +SRC_URI="svn+http://svn.osdrawer.net/beshare" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="muscle >= 4.63" +#CHECKSUM_MD5="" +BUILD { + cd beshare-4/source + make +} + +INSTALL { + cd beshare-4 +} + +#LICENSE="" +#COPYRIGHT="" diff --git a/haiku-apps/bowser/bowser-1.1.1-cvs.bep b/haiku-apps/bowser/bowser-1.1.1-cvs.bep new file mode 100644 index 000000000..03e44cf2b --- /dev/null +++ b/haiku-apps/bowser/bowser-1.1.1-cvs.bep @@ -0,0 +1,17 @@ +DESCRIPTION="bowser" +HOMEPAGE="http://bowser.sourceforge.net" +SRC_URI="cvs://:pserver:anonymous@bowser.cvs.sourceforge.net:/cvsroot/bowser/Bowser" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + +} + +INSTALL { + +} + +#COPYRIGHT="" +#LICENSE=" diff --git a/haiku-apps/burnitnow/burnitnow-2-svn.bep b/haiku-apps/burnitnow/burnitnow-2-svn.bep new file mode 100644 index 000000000..375b2f3d8 --- /dev/null +++ b/haiku-apps/burnitnow/burnitnow-2-svn.bep @@ -0,0 +1,24 @@ +DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" +HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" +SRC_URI="svn+http://svn.osdrawer.net/burnitnow/trunk" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/cmake >= 2.8.0 + app-cdr/cdrtools > 3.00" +#CHECKSUM_MD5="" +BUILD { + cd burnitnow-2-svn + cmake . + make +} + +INSTALL { + cd burnitnow-2-svn + mkdir -p ${DESTDIR}/boot/apps/BurnItNow + cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow + if [ -z ${DESTDIR} ];then + find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf + fi +} +LICENSE="MIT" +COPYRIGHT="Copyright 2010-2011 BurnItNow Team" diff --git a/haiku-apps/burnitnow/burnitnow-43.bep b/haiku-apps/burnitnow/burnitnow-43.bep new file mode 100644 index 000000000..afb02e8fa --- /dev/null +++ b/haiku-apps/burnitnow/burnitnow-43.bep @@ -0,0 +1,31 @@ +DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" +HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" +SRC_URI="svn+http://svn.osdrawer.net/burnitnow/branches/legacy#43" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/cmake >= 2.8.0 + app-cdr/cdrtools > 3.00" +#CHECKSUM_MD5="" +BUILD { + cd burnitnow-43 + cmake . + make +} + +INSTALL { + cd burnitnow-43 + mkdir -p ${DESTDIR}/boot/apps/BurnItNow + cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow + cp -a LICENSE ${DESTDIR}/boot/apps/BurnItNow/LICENSE + cp -a TODO ${DESTDIR}/boot/apps/BurnItNow/TODO + cp -a README ${DESTDIR}/boot/apps/BurnItNow/README + mkdir -p ${DESTDIR}/boot/apps/BurnItNow/Docs + cp -a Docs/BurnItNowHelp.html ${DESTDIR}/boot/apps/BurnItNow/Docs/BurnItNowHelp.html + cp -a Docs/helpbg.gif ${DESTDIR}/boot/apps/BurnItNow/Docs/helpbg.gif + if [ -z ${DESTDIR} ];then + find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf + fi +} +LICENSE="MIT" +COPYRIGHT="2000-2002 Johan Nilsson + 2010-2011 BurnItNow Maintainers" diff --git a/haiku-apps/burnitnow/burnitnow-beta5-svn.bep b/haiku-apps/burnitnow/burnitnow-beta5-svn.bep new file mode 100644 index 000000000..00ea2266f --- /dev/null +++ b/haiku-apps/burnitnow/burnitnow-beta5-svn.bep @@ -0,0 +1,31 @@ +DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" +HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" +SRC_URI="svn+http://svn.osdrawer.net/burnitnow/branches/legacy" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/cmake >= 2.8.0 + app-cdr/cdrtools > 3.00" +#CHECKSUM_MD5="" +BUILD { + cd burnitnow-beta5-svn + cmake . + make +} + +INSTALL { + cd burnitnow-beta5-svn + mkdir -p ${DESTDIR}/boot/apps/BurnItNow + cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow + cp -a LICENSE ${DESTDIR}/boot/apps/BurnItNow/LICENSE + cp -a TODO ${DESTDIR}/boot/apps/BurnItNow/TODO + cp -a README ${DESTDIR}/boot/apps/BurnItNow/README + mkdir -p ${DESTDIR}/boot/apps/BurnItNow/Docs + cp -a Docs/BurnItNowHelp.html ${DESTDIR}/boot/apps/BurnItNow/Docs/BurnItNowHelp.html + cp -a Docs/helpbg.gif ${DESTDIR}/boot/apps/BurnItNow/Docs/helpbg.gif + if [ -z ${DESTDIR} ];then + find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf + fi +} +LICENSE="MIT" +COPYRIGHT="2000-2002 Johan Nilsson + 2010-2011 BurnItNow Maintainers" diff --git a/haiku-apps/burnitnow/burnitnow-beta6-git.bep b/haiku-apps/burnitnow/burnitnow-beta6-git.bep new file mode 100644 index 000000000..99afe0ec0 --- /dev/null +++ b/haiku-apps/burnitnow/burnitnow-beta6-git.bep @@ -0,0 +1,33 @@ +DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" +HOMEPAGE="http://github.com/scottmc/burnitnow" +SRC_URI="git://github.com/scottmc/BurnItNow.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="app-cdr/cdrtools > 3.00" +#CHECKSUM_MD5="" + +BUILD { + cd burnitnow-beta6-git/legacy + cmake . + make +} + +INSTALL { + cd burnitnow-beta6-git/legacy + BURNITNOWDIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/BurnItNow + mkdir -p ${BURNITNOWDIR}/Docs + cp -a BurnItNow ${BURNITNOWDIR} + cp -a LICENSE ${BURNITNOWDIR}/LICENSE + cp -a TODO ${BURNITNOWDIR}/TODO + cp -a README ${BURNITNOWDIR}/README + cp -a AUTHORS ${BURNITNOWDIR}/AUTHORS + cp -a Changes ${BURNITNOWDIR}/Changes + cp -a Docs ${BURNITNOWDIR}/ + if [ -z ${DESTDIR} ];then + find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf + fi +} + +LICENSE="MIT" +COPYRIGHT="2000-2002 Johan Nilsson + 2010-2013 BurnItNow Maintainers" diff --git a/haiku-apps/burnitnow/burnitnow-beta6.bep b/haiku-apps/burnitnow/burnitnow-beta6.bep new file mode 100644 index 000000000..cb0e31b32 --- /dev/null +++ b/haiku-apps/burnitnow/burnitnow-beta6.bep @@ -0,0 +1,33 @@ +DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" +HOMEPAGE="http://github.com/scottmc/burnitnow" +SRC_URI="git://github.com/scottmc/BurnItNow.git#6367b5beb2" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="app-cdr/cdrtools > 3.00" +#CHECKSUM_MD5="" + +BUILD { + cd burnitnow-beta6/legacy + cmake . + make +} + +INSTALL { + cd burnitnow-beta6/legacy + BURNITNOWDIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/BurnItNow + mkdir -p ${BURNITNOWDIR}/Docs + cp -a BurnItNow ${BURNITNOWDIR} + cp -a LICENSE ${BURNITNOWDIR}/LICENSE + cp -a TODO ${BURNITNOWDIR}/TODO + cp -a README ${BURNITNOWDIR}/README + cp -a AUTHORS ${BURNITNOWDIR}/AUTHORS + cp -a Changes ${BURNITNOWDIR}/Changes + cp -a Docs ${BURNITNOWDIR}/ + if [ -z ${DESTDIR} ];then + find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf + fi +} + +LICENSE="MIT" +COPYRIGHT="2000-2002 Johan Nilsson + 2010-2013 BurnItNow Maintainers" diff --git a/haiku-apps/burnitnow/patches/burnitnow-beta5-svn.patch b/haiku-apps/burnitnow/patches/burnitnow-beta5-svn.patch new file mode 100644 index 000000000..a07409cfc --- /dev/null +++ b/haiku-apps/burnitnow/patches/burnitnow-beta5-svn.patch @@ -0,0 +1,146 @@ +diff -Naur burnitnow-beta5-svn/const.h burnitnow-beta5-svn-patch/const.h +--- burnitnow-beta5-svn/const.h 2012-11-20 19:48:42.045350912 +0100 ++++ burnitnow-beta5-svn-patch/const.h 2012-11-20 17:57:36.000000000 +0100 +@@ -64,7 +64,7 @@ + const uint32 AUDIO_NOFIX = 'AuNF'; + + const uint32 MISC_DAO = 'MiDA'; +-const uint32 MISC_BURNPROOF = 'MiBP'; ++const uint32 MISC_BURNFREE = 'MiBP'; + + + const uint32 BURN_WITH_CDRECORD = 'BWCR'; +diff -Naur burnitnow-beta5-svn/jpWindow.cpp burnitnow-beta5-svn-patch/jpWindow.cpp +--- burnitnow-beta5-svn/jpWindow.cpp 2012-11-20 19:48:42.007602176 +0100 ++++ burnitnow-beta5-svn-patch/jpWindow.cpp 2012-11-20 18:03:09.000000000 +0100 +@@ -65,7 +65,7 @@ + char* BURN_DIR; + BPath CDRTOOLS_DIR; + +-char BURNPROOF[30]; // driveropts = burnproof ++char BURNFREE[30]; // driveropts=burnfree + char PAD[10]; // -pad (audio) + char DAO[10]; // -dao + char NOFIX[10]; // -nofix (audio) +@@ -714,10 +714,10 @@ + else + strcpy(DAO, " "); + +- if (fBurnItPrefs->FindString("BURNPROOF", &tr) == B_OK) +- strcpy(BURNPROOF, tr); ++ if (fBurnItPrefs->FindString("BURNFREE", &tr) == B_OK) ++ strcpy(BURNFREE, tr); + else +- strcpy(BURNPROOF, " "); ++ strcpy(BURNFREE, " "); + + if (fBurnItPrefs->FindString("NOFIX", &tr) == B_OK) + strcpy(NOFIX, tr); +@@ -1398,11 +1398,11 @@ + strcpy(DAO, " "); + break; + +- case MISC_BURNPROOF: +- if (fPrefsView->fBurnProofCheckBox->Value() == 1) +- strcpy(BURNPROOF, "driveropts = burnproof"); ++ case MISC_BURNFREE: ++ if (fPrefsView->fBurnFreeCheckBox->Value() == 1) ++ strcpy(BURNFREE, "driveropts=burnfree"); + else +- strcpy(BURNPROOF, " "); ++ strcpy(BURNFREE, " "); + break; + + case MENU_FILE_ABOUT: +@@ -1643,7 +1643,7 @@ + fBurnItPrefs->SetString("DATA_STRING", DATA_STRING); + fBurnItPrefs->SetString("PAD", PAD); + fBurnItPrefs->SetString("DAO", DAO); +- fBurnItPrefs->SetString("BURNPROOF", BURNPROOF); ++ fBurnItPrefs->SetString("BURNFREE", BURNFREE); + fBurnItPrefs->SetString("SWAB", SWAB); + fBurnItPrefs->SetString("NOFIX", NOFIX); + fBurnItPrefs->SetString("PREEMP", PREEMP); +@@ -1812,7 +1812,7 @@ + commandstr << BURN_DIR << '"' << " | " << CDRTOOLS_DIR.Path(); + commandstr << "/cdrecord dev=" << fBurnDevice->scsiid; + commandstr << " speed=" << BURN_SPD ; +- commandstr << " " << BURNPROOF; ++ commandstr << " " << BURNFREE; + commandstr << "tsize" << tsize << " "; + commandstr << DAO << " -data "; + commandstr << DUMMYMODE ; +@@ -1822,7 +1822,7 @@ + commandstr.SetTo(CDRTOOLS_DIR.Path()); + commandstr << "/"; + commandstr << "cdrecord dev=" << fBurnDevice->scsiid << " speed=" << BURN_SPD ; +- commandstr << " " << BURNPROOF << " " << DAO; ++ commandstr << " " << BURNFREE << " " << DAO; + commandstr << " -data " << DUMMYMODE ; + commandstr << " " << EJECT ; + commandstr << " -v" ; // aw 110910 +@@ -1847,7 +1847,7 @@ + commandstr << "//"; + commandstr << "cdrecord dev=" << fBurnDevice->scsiid; + commandstr << " speed=" << BURN_SPD; +- commandstr << " " << BURNPROOF ; ++ commandstr << " " << BURNFREE ; + commandstr << " " << DAO; + commandstr << " " << PAD; + commandstr << " " << PREEMP ; +@@ -1880,7 +1880,7 @@ + commandstr << '"' << VOL_NAME << '"' << BURN_DIR << '"' << " |"; + commandstr << CDRTOOLS_DIR.Path() << "/cdrecord dev=" ; + commandstr << fBurnDevice->scsiid << "speed=" << BURN_SPD ; +- commandstr << " " << BURNPROOF; ++ commandstr << " " << BURNFREE; + commandstr << " tsize=" << tsize ; + commandstr << " " << DAO << " " << DUMMYMODE ; + commandstr << " " << EJECT << " " << PAD ; +@@ -1893,7 +1893,7 @@ + commandstr << "//"; + commandstr << "cdrecord dev=" << fBurnDevice->scsiid; + commandstr << " speed=" << BURN_SPD ; +- commandstr << " " << BURNPROOF << " " << DAO << " " << PAD ; ++ commandstr << " " << BURNFREE << " " << DAO << " " << PAD ; + commandstr << " " << PREEMP << " " << SWAB ; + commandstr << " " << NOFIX ; + commandstr << " " << DUMMYMODE ; +diff -Naur burnitnow-beta5-svn/PrefsView.cpp burnitnow-beta5-svn-patch/PrefsView.cpp +--- burnitnow-beta5-svn/PrefsView.cpp 2012-11-20 19:48:42.031981568 +0100 ++++ burnitnow-beta5-svn-patch/PrefsView.cpp 2012-11-20 18:02:46.000000000 +0100 +@@ -16,7 +16,7 @@ + + + extern char DAO[10]; +-extern char BURNPROOF[30]; ++extern char BURNFREE[30]; + + + PrefsView::PrefsView(BRect size) +@@ -59,9 +59,9 @@ + + r.top += 15; + r.bottom += 15; +- fBurnProofCheckBox = new BCheckBox(r, "burnproof", "BurnProof (read help)", new BMessage(MISC_BURNPROOF)); +- if (!strncmp(BURNPROOF, "driveropts = burnproof", 22)) +- fBurnProofCheckBox->SetValue(B_CONTROL_ON); ++ fBurnFreeCheckBox = new BCheckBox(r, "burnfree", "BurnFree (read help)", new BMessage(MISC_BURNFREE)); ++ if (!strncmp(BURNFREE, "driveropts=burnfree", 22)) ++ fBurnFreeCheckBox->SetValue(B_CONTROL_ON); + +- miscOptBox->AddChild(fBurnProofCheckBox); ++ miscOptBox->AddChild(fBurnFreeCheckBox); + } +diff -Naur burnitnow-beta5-svn/PrefsView.h burnitnow-beta5-svn-patch/PrefsView.h +--- burnitnow-beta5-svn/PrefsView.h 2012-11-20 19:48:42.015990784 +0100 ++++ burnitnow-beta5-svn-patch/PrefsView.h 2012-11-20 17:57:08.000000000 +0100 +@@ -15,7 +15,7 @@ + PrefsView(BRect size); + + BMenu* fRecordersMenu; +- BCheckBox* fDAOCheckBox, *fBurnProofCheckBox; ++ BCheckBox* fDAOCheckBox, *fBurnFreeCheckBox; + }; + + diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.bep new file mode 100644 index 000000000..12cc49369 --- /dev/null +++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.bep @@ -0,0 +1,29 @@ +DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" +HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" +SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="caya" +#CHECKSUM_MD5="" +BUILD { + cd caya-gpl-protocols-0.HEAD + ./configure + jam +} + +INSTALL { + cd caya-gpl-protocols-0.HEAD + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + PLATFORM=`setgcc|tr / -|cut -f3 -d' '` + cp generated/distro-haiku-$PLATFORM-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-$PLATFORM-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-$PLATFORM-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-$PLATFORM-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-$PLATFORM-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2010-2011 Casalinuovo Dario + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes" + diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.bep new file mode 100644 index 000000000..811ae698c --- /dev/null +++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.bep @@ -0,0 +1,28 @@ +DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" +HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" +SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#19" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="caya" +#CHECKSUM_MD5="" +MESSAGE="This port only builds with gcc4." +BUILD { + cd caya-gpl-protocols-19 + ./configure + jam +} + +INSTALL { + cd caya-gpl-protocols-19 + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2010-2011 Casalinuovo Dario + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes" + diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.bep new file mode 100644 index 000000000..7d9006de3 --- /dev/null +++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.bep @@ -0,0 +1,29 @@ +DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" +HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" +SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#24" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="caya" +#CHECKSUM_MD5="" +MESSAGE="This port only builds with gcc4." +BUILD { + cd caya-gpl-protocols-24 + ./configure + jam +} + +INSTALL { + cd caya-gpl-protocols-24 + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2010-2011 Casalinuovo Dario + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes" + diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.bep new file mode 100644 index 000000000..af80c8f9b --- /dev/null +++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.bep @@ -0,0 +1,29 @@ +DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" +HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" +SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#35" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="caya" +#CHECKSUM_MD5="" +MESSAGE="This port only builds with gcc4." +BUILD { + cd caya-gpl-protocols-35 + ./configure + jam +} + +INSTALL { + cd caya-gpl-protocols-35 + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2010-2011 Casalinuovo Dario + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes" + diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.bep new file mode 100644 index 000000000..e7b5d637e --- /dev/null +++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.bep @@ -0,0 +1,29 @@ +DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" +HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" +SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#36" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="caya" +#CHECKSUM_MD5="" +MESSAGE="This port only builds with gcc4." +BUILD { + cd caya-gpl-protocols-36 + ./configure + jam +} + +INSTALL { + cd caya-gpl-protocols-36 + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp generated/distro-haiku-x86-gcc4-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2010-2011 Casalinuovo Dario + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes" + diff --git a/haiku-apps/caya-gpl-protocols/patches/caya-gpl-protocols-0.HEAD.patch b/haiku-apps/caya-gpl-protocols/patches/caya-gpl-protocols-0.HEAD.patch new file mode 100644 index 000000000..a45bd230b --- /dev/null +++ b/haiku-apps/caya-gpl-protocols/patches/caya-gpl-protocols-0.HEAD.patch @@ -0,0 +1,214 @@ +Index: libs/libmsn/msnobject.cpp +=================================================================== +--- libs/libmsn/msnobject.cpp (revision 36) ++++ libs/libmsn/msnobject.cpp (working copy) +@@ -30,7 +30,7 @@ + { + void MSNObject::addMSNObject(std::string filename, int Type) + { +- std::ifstream::pos_type size; ++ std::streampos size; + char * memblock; + SHA_CTX ctx; + unsigned char digest[SHA_DIGEST_LENGTH]; +Index: libs/libmsn/Jamfile +=================================================================== +--- libs/libmsn/Jamfile (revision 36) ++++ libs/libmsn/Jamfile (working copy) +@@ -2,6 +2,7 @@ + + SubDirSysHdrs [ FDirName $(TOP) ] ; + SubDirSysHdrs [ FDirName $(TOP) libs ] ; ++SubDirSysHdrs [ FDirName $(TOP) libs libmsn ] ; + + SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ; + +Index: libs/libmsn/connection.h +=================================================================== +--- libs/libmsn/connection.h (revision 36) ++++ libs/libmsn/connection.h (working copy) +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #ifdef _MSC_VER + #pragma warning( disable : 4290 ) +Index: libs/libmsn/util.cpp +=================================================================== +--- libs/libmsn/util.cpp (revision 36) ++++ libs/libmsn/util.cpp (working copy) +@@ -146,8 +146,8 @@ + it1 != s1.end() && it2 != s2.end(); + ++it1, ++it2) + { +- if (std::toupper(*it1) != std::toupper(*it2)) +- return std::toupper(*it1) - std::toupper(*it2); ++ if (toupper(*it1) != toupper(*it2)) ++ return toupper(*it1) - toupper(*it2); + } + size_t size1 = s1.size(), size2 = s2.size(); + return (int) (size1 - size2); +@@ -358,11 +358,11 @@ + int FileSize(const char* sFileName) + { + std::ifstream f; +- f.open(sFileName, std::ios_base::binary | std::ios_base::in); ++ f.open(sFileName, std::ios::binary | std::ios::in); + if (!f.good() || f.eof() || !f.is_open()) { return 0; } +- f.seekg(0, std::ios_base::beg); +- std::ifstream::pos_type begin_pos = f.tellg(); +- f.seekg(0, std::ios_base::end); ++ f.seekg(0, std::ios::beg); ++ std::streampos begin_pos = f.tellg(); ++ f.seekg(0, std::ios::end); + return static_cast(f.tellg() - begin_pos); + } + +Index: libs/libmsn/message.cpp +=================================================================== +--- libs/libmsn/message.cpp (revision 36) ++++ libs/libmsn/message.cpp (working copy) +@@ -124,7 +124,7 @@ + { + std::string color = this->getFormatInfo()["CO"]; + assert(color.size() <= 6 && color.size() >= 0); +- color.insert(0U, 6 - color.size(), '0'); ++ color.insert((size_t)0, (size_t)(6 - color.size()), '0'); + int r = 0, g = 0, b = 0; + + b = strtol(color.substr(0, 2).c_str(), NULL, 16); +@@ -167,7 +167,7 @@ + + void Message::setColor(std::string color) + { +- color.insert(0U, 6 - color.size(), '0'); ++ color.insert((size_t)0, (size_t)(6 - color.size()), '0'); + int r = 0, g = 0, b = 0; + + r = strtol(color.substr(0, 2).c_str(), NULL, 16); +Index: libs/libyahoo2/yahoo_httplib.c +=================================================================== +--- libs/libyahoo2/yahoo_httplib.c (revision 36) ++++ libs/libyahoo2/yahoo_httplib.c (working copy) +@@ -29,19 +29,7 @@ + #include + #include + +-#if STDC_HEADERS + # include +-#else +-# if !HAVE_STRCHR +-# define strchr index +-# define strrchr rindex +-# endif +-char *strchr(), *strrchr(); +-# if !HAVE_MEMCPY +-# define memcpy(d, s, n) bcopy ((s), (d), (n)) +-# define memmove(d, s, n) bcopy ((s), (d), (n)) +-# endif +-#endif + + #include + #if HAVE_UNISTD_H +@@ -374,7 +362,6 @@ + void yahoo_http_head(int id, const char *url, const char *cookies, int len, + char *payload, yahoo_get_fd_callback callback, void *data) + { +- printf("yahoo_http_read\n"); + char host[255]; + int port = 80; + char path[255]; +Index: libs/libgloox/parser.cpp +=================================================================== +--- libs/libgloox/parser.cpp (revision 36) ++++ libs/libgloox/parser.cpp (working copy) +@@ -141,7 +141,7 @@ + { + if( pos + needle.length() <= data.length() ) + { +- if( !data.compare( pos, needle.length(), needle ) ) ++ if( !data.compare(pos, needle.length(), needle ) ) + { + pos += needle.length() - 1; + return ForwardFound; +Index: libs/libgloox/siprofileft.cpp +=================================================================== +--- libs/libgloox/siprofileft.cpp (revision 36) ++++ libs/libgloox/siprofileft.cpp (working copy) +@@ -84,11 +84,11 @@ + DataFormField* dff = df.addField( DataFormField::TypeListSingle, "stream-method" ); + StringMultiMap sm; + if( streamTypes & FTTypeS5B ) +- sm.insert( std::make_pair( "s5b", XMLNS_BYTESTREAMS ) ); ++ sm.insert( std::make_pair( "s5b", XMLNS_BYTESTREAMS ) ); + if( streamTypes & FTTypeIBB ) +- sm.insert( std::make_pair( "ibb", XMLNS_IBB ) ); ++ sm.insert( std::make_pair( "ibb", XMLNS_IBB ) ); + if( streamTypes & FTTypeOOB ) +- sm.insert( std::make_pair( "oob", XMLNS_IQ_OOB ) ); ++ sm.insert( std::make_pair( "oob", XMLNS_IQ_OOB ) ); + dff->setOptions( sm ); + feature->addChild( df.tag() ); + +Index: libs/libgloox/connectionbosh.cpp +=================================================================== +--- libs/libgloox/connectionbosh.cpp (revision 36) ++++ libs/libgloox/connectionbosh.cpp (working copy) +@@ -303,7 +303,7 @@ + + bool ci_equal( char ch1, char ch2 ) + { +- return std::toupper( (unsigned char)ch1 ) == std::toupper( (unsigned char)ch2 ); ++ return toupper( (unsigned char)ch1 ) == toupper( (unsigned char)ch2 ); + } + + std::string::size_type ci_find( const std::string& str1, const std::string& str2 ) +Index: libs/libgloox/gloox.h +=================================================================== +--- libs/libgloox/gloox.h (revision 36) ++++ libs/libgloox/gloox.h (working copy) +@@ -1214,7 +1214,7 @@ + /** + * A multimap of strings. + */ +- typedef std::multimap StringMultiMap; ++ typedef std::multimap StringMultiMap; + + class StanzaExtension; + /** +Index: protocols/msn/MSN.cpp +=================================================================== +--- protocols/msn/MSN.cpp (revision 36) ++++ protocols/msn/MSN.cpp (working copy) +@@ -52,7 +52,7 @@ + const uint32 kAvatarCheckMessage = 'AVMs'; + + struct pollfd* kPollSockets = NULL; +-struct ssl { ++struct Ssl { + bool isSSL; + bool isConnected; + SSL *ssl; +@@ -718,7 +718,7 @@ + return; + } + +- kSocketsSsl = (struct ssl*) realloc(kSocketsSsl, (kSocketsAvailable + 10) * sizeof(struct ssl)); ++ kSocketsSsl = (struct Ssl*) realloc(kSocketsSsl, (kSocketsAvailable + 10) * sizeof(struct Ssl)); + if (kSocketsSsl == NULL) { + Error("Memory Error!!\n", NULL); + return; +Index: protocols/xmpp/Jamfile +=================================================================== +--- protocols/xmpp/Jamfile (revision 36) ++++ protocols/xmpp/Jamfile (working copy) +@@ -2,6 +2,7 @@ + + SubDirSysHdrs [ FDirName $(TOP) ] ; + SubDirSysHdrs [ FDirName $(TOP) libs ] ; ++SubDirSysHdrs [ FDirName $(TOP) libs libgloox ] ; + SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ; + SubDirSysHdrs [ FDirName $(CAYA_INCLUDE_DIR) ] ; + diff --git a/haiku-apps/caya/caya-0.HEAD.bep b/haiku-apps/caya/caya-0.HEAD.bep new file mode 100644 index 000000000..4b0144ad6 --- /dev/null +++ b/haiku-apps/caya/caya-0.HEAD.bep @@ -0,0 +1,34 @@ +DESCRIPTION="Caya is a multiprotocol IM client." +HOMEPAGE="http://dev.osdrawer.net/projects/caya" +SRC_URI="svn+http://svn.osdrawer.net/caya/trunk" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/expat >= 2.0.1" +#CHECKSUM_MD5="" +BUILD { + cd caya-0.HEAD + ./configure + jam +} + +INSTALL { + cd caya-0.HEAD + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + + ARCH=`readlink /boot/develop/abi/current |sed -e s!/!-!g` + cp generated/distro-haiku-${ARCH}-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya + cp generated/distro-haiku-${ARCH}-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys + cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ +} + +LICENSE="MIT" +COPYRIGHT="2009-2011 Andrea Anzani + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes + 2011-2012 Casalinuovo Dario" diff --git a/haiku-apps/caya/caya-236.bep b/haiku-apps/caya/caya-236.bep new file mode 100644 index 000000000..e828b4871 --- /dev/null +++ b/haiku-apps/caya/caya-236.bep @@ -0,0 +1,33 @@ +DESCRIPTION="Caya is a multiprotocol IM client." +HOMEPAGE="http://dev.osdrawer.net/projects/caya" +SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#236" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="net-misc/curl >= 7.21.6" +#CHECKSUM_MD5="" +MESSAGE="This port only builds with gcc4." +BUILD { + cd caya-236 + ./configure + jam +} + +INSTALL { + cd caya-236 + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + + cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya + cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys + cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ +} + +LICENSE="MIT" +COPYRIGHT="2009-2011 Andrea Anzani + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes" diff --git a/haiku-apps/caya/caya-240.bep b/haiku-apps/caya/caya-240.bep new file mode 100644 index 000000000..e18e4cf32 --- /dev/null +++ b/haiku-apps/caya/caya-240.bep @@ -0,0 +1,33 @@ +DESCRIPTION="Caya is a multiprotocol IM client." +HOMEPAGE="http://dev.osdrawer.net/projects/caya" +SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#240" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="net-misc/curl >= 7.21.6" +#CHECKSUM_MD5="" +MESSAGE="This port only builds with gcc4." +BUILD { + cd caya-240 + ./configure + jam +} + +INSTALL { + cd caya-240 + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + + cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya + cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys + cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ +} + +LICENSE="MIT" +COPYRIGHT="2009-2011 Andrea Anzani + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes" diff --git a/haiku-apps/caya/caya-264.bep b/haiku-apps/caya/caya-264.bep new file mode 100644 index 000000000..98ebf5180 --- /dev/null +++ b/haiku-apps/caya/caya-264.bep @@ -0,0 +1,34 @@ +DESCRIPTION="Caya is a multiprotocol IM client." +HOMEPAGE="http://dev.osdrawer.net/projects/caya" +SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#264" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/expat >= 2.0.1" +#CHECKSUM_MD5="" +MESSAGE="This port only builds with gcc4." +BUILD { + cd caya-264 + ./configure + jam +} + +INSTALL { + cd caya-264 + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + + cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya + cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys + cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ +} + +LICENSE="MIT" +COPYRIGHT="2009-2011 Andrea Anzani + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes + 2011-2012 Casalinuovo Dario" diff --git a/haiku-apps/caya/caya-278.bep b/haiku-apps/caya/caya-278.bep new file mode 100644 index 000000000..7b717dae6 --- /dev/null +++ b/haiku-apps/caya/caya-278.bep @@ -0,0 +1,34 @@ +DESCRIPTION="Caya is a multiprotocol IM client." +HOMEPAGE="http://dev.osdrawer.net/projects/caya" +SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#278" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/expat >= 2.0.1" +#CHECKSUM_MD5="" +MESSAGE="This port only builds with gcc4." +BUILD { + cd caya-278 + ./configure + jam +} + +INSTALL { + cd caya-278 + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + + cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya + cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys + cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ +} + +LICENSE="MIT" +COPYRIGHT="2009-2011 Andrea Anzani + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes + 2011-2012 Casalinuovo Dario" diff --git a/haiku-apps/caya/caya-279.bep b/haiku-apps/caya/caya-279.bep new file mode 100644 index 000000000..17b1b63d6 --- /dev/null +++ b/haiku-apps/caya/caya-279.bep @@ -0,0 +1,34 @@ +DESCRIPTION="Caya is a multiprotocol IM client." +HOMEPAGE="http://dev.osdrawer.net/projects/caya" +SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#279" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/expat >= 2.0.1" +#CHECKSUM_MD5="" +MESSAGE="This port only builds with gcc4." +BUILD { + cd caya-279 + ./configure + jam +} + +INSTALL { + cd caya-279 + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + + cp generated/distro-haiku-x86-gcc4-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya + cp generated/distro-haiku-x86-gcc4-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys + cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ + cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ +} + +LICENSE="MIT" +COPYRIGHT="2009-2011 Andrea Anzani + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes + 2011-2012 Casalinuovo Dario" diff --git a/haiku-apps/clockwerk/clockwerk-80.bep b/haiku-apps/clockwerk/clockwerk-80.bep new file mode 100644 index 000000000..7da9b2836 --- /dev/null +++ b/haiku-apps/clockwerk/clockwerk-80.bep @@ -0,0 +1,23 @@ +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" +STATUS_HAIKU="stable" +DEPEND="" +#CHECKSUM_MD5="" +BUILD { + cd clockwerk-80 + jam +} + +INSTALL { + cd clockwerk-80 + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk + cp generated/distro-haiku/* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2012 Stephan Aßmus + 2005-2006 Axel Dörfler + 2006-2009 Ingo Weinhold" + diff --git a/haiku-apps/documentviewer/documentviewer-0.3.2.bep b/haiku-apps/documentviewer/documentviewer-0.3.2.bep new file mode 100644 index 000000000..510b358a2 --- /dev/null +++ b/haiku-apps/documentviewer/documentviewer-0.3.2.bep @@ -0,0 +1,23 @@ +DESCRIPTION="DocumentViewer is a Viewer supporting PDF and DJVU Files." +HOMEPAGE="http://haiku.bplaced.net/" +SRC_URI="http://haiku.bplaced.net/DocumentViewer/sources/documentviewer-0.3.2.zip" +CHECKSUM_MD5="1fddc4292ecb14f343eb18b0bf723b13" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/fitz >= 1.0 + media-libs/djvulibre >= 3.5.25" +MESSAGE="This port only builds with gcc4." + +BUILD { + cd documentviewer-0.3.2 + jam +} + +INSTALL { + cd documentviewer-0.3.2 + mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/DocumentViewer + cp application/DocumentViewer ${DESTDIR}/`finddir B_APPS_DIRECTORY`/DocumentViewer +} + +LICENSE="MIT" +COPYRIGHT="2010-2012 Haiku, Inc" diff --git a/haiku-apps/friss/friss-0.7-svn.bep b/haiku-apps/friss/friss-0.7-svn.bep new file mode 100644 index 000000000..627e6cc41 --- /dev/null +++ b/haiku-apps/friss/friss-0.7-svn.bep @@ -0,0 +1,27 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" + +BUILD { + cd friss-0.7-svn/src + if [ -n "$(setgcc | grep '4')" ]; then + sed -i 's/lstdc++.r4/lstdc++/' Jamfile + fi + jam + mv friss ../bin/apps/friss/FRiSS + chmod 755 ../bin/apps/friss/FRiSS +} + +INSTALL { + cd friss-0.7-svn + mkdir -p ${DESTDIR}/boot/apps/FRiSS + cp -a bin/apps/friss/* ${DESTDIR}/boot/apps/FRiSS + mkdir -p ${DESTDIR}/boot/home/config/settings/deskbar/Applications + ln -sf /boot/apps/FRiSS/FRiSS ${DESTDIR}/boot/home/config/settings/deskbar/Applications/FRiSS +} + +LICENSE="MIT" +COPYRIGHT="2004 Andreas Herzig (N3S) + 2010-2012 Adrien Destugues (PulkoMandy)" diff --git a/haiku-apps/globe/globe-0.4.bep b/haiku-apps/globe/globe-0.4.bep new file mode 100644 index 000000000..69c8e3dbe --- /dev/null +++ b/haiku-apps/globe/globe-0.4.bep @@ -0,0 +1,25 @@ +DESCRIPTION="Globe Web Editor" +HOMEPAGE="http://globe.beos.hu/index_en.html" +SRC_URI="http://ports-space.haiku-files.org/source/globe-0.4.zip" +CHECKSUM_MD5="61601576e59b0dc5ab6364f684a47236" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd globe0.4 + make +} + +INSTALL { + cd globe0.4 + TARGET_DIR=${DESTDIR}`finddir B_APPS_DIRECTORY`/Globe + mkdir -p $TARGET_DIR + cp Globe $TARGET_DIR + cp GlobeBUGList.txt $TARGET_DIR + cp globe* $TARGET_DIR + cp LICENSE.txt $TARGET_DIR + cp NewFeatures.txt $TARGET_DIR + cp objects.*/Globe* $TARGET_DIR +} +LICENSE="GNU GPL v2" +COPYRIGHT="2001-2004 Gergely Rózsahegyi" diff --git a/haiku-apps/globe/patches/globe-0.4.patch b/haiku-apps/globe/patches/globe-0.4.patch new file mode 100644 index 000000000..64a1f4be6 --- /dev/null +++ b/haiku-apps/globe/patches/globe-0.4.patch @@ -0,0 +1,92 @@ +diff -Naur globe0.4/Makefile globe0.4-haiku/Makefile +--- globe0.4/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ globe0.4-haiku/Makefile 2012-12-30 19:40:59.058720256 +0000 +@@ -0,0 +1,27 @@ ++NAME= Globe ++TYPE= APP ++SRCS= RHTML_app.cpp RHTML_win.cpp RHTML_numview.cpp RHTML_savewin.cpp RHTML_aboutwin.cpp RHTML_prefwin.cpp RHTML_fmenu.cpp RHTML_buttonmenu.cpp RHTML_bmenu.cpp RHTML_parammenu.cpp RHTML_colorwin.cpp RHTML_amenu.cpp RHTML_textview.cpp RHTML_tabbutton.cpp RHTML_tagmenu.cpp RHTML_filetypes.cpp RHTML_options.cpp ToolTip/TToolTip.cpp Timer/RTimer.cpp URLView/URLView.cpp Tool/RadioBar.cpp Tool/ToolBar.cpp Tool/ToolItem.cpp Tool/ToolView.cpp ++RSRCS= Globe.rsrc ++LIBS= /boot/system/lib/libbe.so /boot/system/lib/libtextencoding.so /boot/system/lib/libtracker.so /boot/system/lib/libroot.so /boot/system/lib/libtranslation.so /boot/system/lib/libgame.so /boot/system/lib/libstdc++.r4.so ++LIBPATHS= ++SYSTEM_INCLUDE_PATHS= /boot/develop/headers/be /boot/develop/headers/cpp /boot/develop/headers/posix /boot/develop/lib /boot/beos/system/lib ++LOCAL_INCLUDE_PATHS= ./../../../config/lib ./Genesis ToolTip Timer URLView Tool ++OPTIMIZE=FULL ++# 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 = ++# Build with debugging symbols if set to TRUE ++SYMBOLS= ++COMPILER_FLAGS=-Woverloaded-virtual -funsigned-bitfields -D_HAIKU_ ++LINKER_FLAGS= ++ ++## include the makefile-engine ++include $(BUILDHOME)/etc/makefile-engine +diff -Naur globe0.4/RHTML_win.cpp globe0.4-haiku/RHTML_win.cpp +--- globe0.4/RHTML_win.cpp 2004-10-21 14:16:28.000000000 +0000 ++++ globe0.4-haiku/RHTML_win.cpp 2012-12-30 18:28:09.000000000 +0000 +@@ -288,7 +288,9 @@ + if (textdb>0) + { + close->SetEnabled(true); ++ #ifndef _HAIKU_ + fmenu->FindToolItem("CLOSEBUTTON")->SetEnabled(true); ++ #endif + } + } + // - End - RHTML_Win - AddText ------------------------------------------------------------------------------- +@@ -310,7 +312,9 @@ + if (textdb<=0) + { + close->SetEnabled(false); ++ #ifndef _HAIKU_ + fmenu->FindToolItem("CLOSEBUTTON")->SetEnabled(false); ++ #endif + } + } + // - End - RHTML_Win - RemoveText ---------------------------------------------------------------------------- +@@ -1122,7 +1126,9 @@ + break; + case 'RTMM': + { ++ #ifndef _HAIKU_ + fmenu->FindToolItem("SAVEBUTTON")->SetEnabled(textview[current]->Modify()); ++ #endif + save->SetEnabled(textview[current]->Modify()); + // save_as->SetEnabled(textview[current]->Modify()); + bool mod=false; +@@ -1130,7 +1136,9 @@ + if (textview[i]->Modify()) + mod=true; + save_all->SetEnabled(mod); ++ #ifndef _HAIKU_ + fmenu->FindToolItem("SAVEALLBUTTON")->SetEnabled(mod); ++ #endif + } + break; + case 'ABWQ': +diff -Naur globe0.4/URLView/URLView.cpp globe0.4-haiku/URLView/URLView.cpp +--- globe0.4/URLView/URLView.cpp 2002-03-10 00:38:20.000000000 +0000 ++++ globe0.4-haiku/URLView/URLView.cpp 2012-12-29 14:17:53.000000000 +0000 +@@ -30,9 +30,13 @@ + + #include + ++#ifndef _HAIKU_ + #include ++#endif + +- ++#ifdef _HAIKU_ ++#include ++#endif + + URLView::URLView( BRect frame, const char *name, const char *label, + const char *url, uint32 resizingMode, uint32 flags ) diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0-svn.bep b/haiku-apps/haikutwitter/haikutwitter-1.0-svn.bep new file mode 100644 index 000000000..72c54af13 --- /dev/null +++ b/haiku-apps/haikutwitter/haikutwitter-1.0-svn.bep @@ -0,0 +1,18 @@ +DESCRIPTION="Twitter client for Haiku OS" +HOMEPAGE="http://code.google.com/p/haikutwitter/" +SRC_URI="svn+http://haikutwitter.googlecode.com/svn/trunk/HaikuTwitter" +REVISION="1" +STATUS_HAIKUE="broken" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +DEPEND="net-misc/curl >= 7.26.0" +BUILD { + cd haikutwitter-1.0-svn + make +} + +INSTALL { + cd haikutwitter-1.0-svn + make install +} +LICENSE="MIT" +COPYRIGHT="2010-2012 Martin Hebnes Pedersen" diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0.bep b/haiku-apps/haikutwitter/haikutwitter-1.0.bep new file mode 100644 index 000000000..008d6f9ba --- /dev/null +++ b/haiku-apps/haikutwitter/haikutwitter-1.0.bep @@ -0,0 +1,18 @@ +DESCRIPTION="Twitter client for Haiku OS" +HOMEPAGE="http://code.google.com/p/haikutwitter/" +SRC_URI="svn+http://haikutwitter.googlecode.com/svn/tags/1.0/HaikuTwitter" +REVISION="1" +STATUS_HAIKUE="broken" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +DEPEND="net-misc/curl >= 7.26.0" +BUILD { + cd haikutwitter-1.0 + make +} + +INSTALL { + cd haikutwitter-1.0 + make install +} +LICENSE="MIT" +COPYRIGHT="2010-2012 Martin Hebnes Pedersen" diff --git a/haiku-apps/hare/hare-beta1-git.bep b/haiku-apps/hare/hare-beta1-git.bep new file mode 100644 index 000000000..d7ad0f796 --- /dev/null +++ b/haiku-apps/hare/hare-beta1-git.bep @@ -0,0 +1,28 @@ +DESCRIPTION="Hare - Haiku Audio Ripper Encoder" +HOMEPAGE="http://github.com/scottmc/hare" +SRC_URI="git://github.com/scottmc/Hare.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/lame > 3.98.4 + media-libs/gogo-no-coda >= 3.13 + media-libs/libogg >= 1.3.0" + +#CHECKSUM_MD5="" + +BUILD { + cd hare-beta1-git + cmake . + make +} + +INSTALL { + cd hare-beta1-git + HARE_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Hare + mkdir -p ${HARE_DIR} + cp -r build/ ${HARE_DIR} +} + +LICENSE="MIT" +COPYRIGHT="2000 FlipSide Software + 2001-2003 BeUnited.org + 2009-2013 Hare Maintainers" diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.bep b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.bep new file mode 100644 index 000000000..79bb31fb2 --- /dev/null +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.bep @@ -0,0 +1,20 @@ +DESCRIPTION="keymap switcher for Haiku." +HOMEPAGE="http://www.switcher.sourceforge.net" +SRC_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher\(haiku\)" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +#CHECKSUM_MD5="" +BUILD { + cd keymapswitcher-1.2.7 + make +} + +INSTALL { + cd keymapswitcher-1.2.7 + make package + cp dist/*.zip ../.. +} + +COPYRIGHT="1999-2003 Stas Maximov" +LICENSE="BSD (4-clause)" diff --git a/haiku-apps/paladin/paladin-1.3-hg.bep b/haiku-apps/paladin/paladin-1.3-hg.bep index 01ad25b1c..fccfd5c99 100644 --- a/haiku-apps/paladin/paladin-1.3-hg.bep +++ b/haiku-apps/paladin/paladin-1.3-hg.bep @@ -7,13 +7,35 @@ DEPEND="" #CHECKSUM_MD5="" BUILD { cd paladin-1.3-hg - ./buildsuite.sh 1 +# ./buildsuite.sh 1 + cd Paladin +# chmod 755 buildhaikugcc2.sh +# chmod 755 buildhaikugcc4.sh + if [ -n "$(setgcc | grep '2')" ]; then + ./buildhaikugcc2.sh + cd ../SymbolFinder + ../Paladin/Paladin -r -d SymbolFinder.pld + else + ./buildhaikugcc4.sh + cd ../SymbolFinder + sed -i 's/gcc4\///g' * + make + cp objects.x86-gcc4-release/SymbolFinder SymbolFinder + fi + cd ../PalEdit + jam } INSTALL { cd paladin-1.3-hg mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin - unzip PaladinFiles.zip -d ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin + cp -f Paladin/Paladin ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/ + cp -f Paladin/WHAT* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/ + cp -f Paladin/README ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/ + cp -f -r Paladin/Templates ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/ + cp -f -r PalEdit/generated/distro/* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/ + cp -f SymbolFinder/SymbolFinder ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/ + cp -f -r Paladin/Licenses ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/ } LICENSE="MIT" -COPYRIGHT="2008-2010 Jon Yoder" +COPYRIGHT="2008-2011 DarkWyrm" diff --git a/haiku-apps/paladin/paladin-1.3.bep b/haiku-apps/paladin/paladin-1.3.bep index 6ac9ea4ea..cb7986d52 100644 --- a/haiku-apps/paladin/paladin-1.3.bep +++ b/haiku-apps/paladin/paladin-1.3.bep @@ -16,6 +16,7 @@ BUILD { else ./buildhaikugcc4.sh cd ../SymbolFinder + sed -i 's/gcc4\///g' * make cp objects.x86-gcc4-release/SymbolFinder SymbolFinder fi @@ -32,6 +33,7 @@ INSTALL { cp -f -r Paladin/Templates ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/ cp -f -r PalEdit/generated/distro/* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/ cp -f SymbolFinder/SymbolFinder ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/ + cp -f -r Paladin/Licenses ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/ } LICENSE="MIT" COPYRIGHT="2008-2010 DarkWyrm" diff --git a/haiku-apps/pe/pe-2.4.3-600.bep b/haiku-apps/pe/pe-2.4.3-600.bep index 0371a7165..bc857b363 100644 --- a/haiku-apps/pe/pe-2.4.3-600.bep +++ b/haiku-apps/pe/pe-2.4.3-600.bep @@ -11,16 +11,14 @@ BUILD { } INSTALL { - cd pe-2.4.3-600/generated - if [ -d distro ];then - mv -f distro Pe - fi + cd pe-2.4.3-600 mkdir -p ${DESTDIR}/boot/apps - cp -a Pe ${DESTDIR}/boot/apps - rm -f ${DESTDIR}/boot/apps/Pe/.OptionalPackageDescription - if [ -z ${DESTDIR} ];then - find /boot/apps/Pe -type d -name ".svn" | xargs rm -rf - fi + cp -a generated/distro ${DESTDIR}/boot/apps/Pe + cp -a doc ${DESTDIR}/boot/apps/Pe/Documentation + rm -f ${DESTDIR}/boot/apps/Pe/.OptionalPackageDescription + if [ -z "${DESTDIR}" ];then + find /boot/apps/Pe -type d -name ".svn" | xargs rm -rf + fi } LICENSE="BSD (4-clause) MIT" diff --git a/haiku-apps/pe/pe-2.4.3-hg.bep b/haiku-apps/pe/pe-2.4.3-hg.bep new file mode 100644 index 000000000..ce5e6fc70 --- /dev/null +++ b/haiku-apps/pe/pe-2.4.3-hg.bep @@ -0,0 +1,26 @@ +DESCRIPTION="Pe - Programmer's Editor" +HOMEPAGE="http://pe-editor.berlios.de/" +SRC_URI="hg+http://hg.berlios.de/repos/pe-editor" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libpcre >= 8.00" +#CHECKSUM_MD5="" +BUILD { + cd pe-2.4.3-hg + jam +} + +INSTALL { + cd pe-2.4.3-hg + mkdir -p ${DESTDIR}/boot/apps + cp -a generated/distro ${DESTDIR}/boot/apps/Pe + cp -a doc ${DESTDIR}/boot/apps/Pe/Documentation + rm -f ${DESTDIR}/boot/apps/Pe/.OptionalPackageDescription + if [ -z "${DESTDIR}" ];then + find /boot/apps/Pe -type d -name ".svn" | xargs rm -rf + fi +} +LICENSE="BSD (4-clause) + MIT" +COPYRIGHT="1996-2002 Maarteen Hekkelman + 2003-2012 Team Pe" diff --git a/haiku-apps/puri/puri-0.3.9.1.bep b/haiku-apps/puri/puri-0.3.9.1.bep new file mode 100644 index 000000000..8f7f1d4e1 --- /dev/null +++ b/haiku-apps/puri/puri-0.3.9.1.bep @@ -0,0 +1,27 @@ +DESCRIPTION="Puri is a 2D and 3D chess game. Playing online is also supported" +HOMEPAGE="http://haiku.bplaced.net/" +SRC_URI="http://haiku.bplaced.net/puri/sources/puri-0.3.9.1.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="6e0a48e31dae972ccb010437a2d72dd8" +MESSAGE="This port only builds with gcc4." +BUILD { + cd puri-0.3.9.1 + jam +} + +INSTALL { + puri=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Puri + mkdir -p ${puri} + mkdir -p ${puri}/data/ + mkdir -p ${puri}/Engines/ + cd puri-0.3.9.1 + cp Puri ${puri} + cp -R ./data/* ${puri}/data + cp ./Engines/* ${puri}/Engines + chmod 755 ${puri}/Engines/stockfish +} + +LICENSE="MIT" +COPYRIGHT="2010-2012 Haiku inc." diff --git a/haiku-apps/sawteeth/sawteeth-1.3.bep b/haiku-apps/sawteeth/sawteeth-1.3.bep new file mode 100644 index 000000000..3155d4445 --- /dev/null +++ b/haiku-apps/sawteeth/sawteeth-1.3.bep @@ -0,0 +1,27 @@ +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" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + cd sawteeth-1.3 + cmake . + make +} + +INSTALL { + cd sawteeth-1.3 + SAWTEETH_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Sawteeth + mkdir -p ${SAWTEETH_DIR}/sounds + mkdir -p ${SAWTEETH_DIR}/songs + mkdir -p ${SAWTEETH_DIR}/lib + cp Sawteeth ${SAWTEETH_DIR}/Sawteeth + cp -r sounds ${SAWTEETH_DIR} + cp -r songs ${SAWTEETH_DIR} + cp -r lib ${SAWTEETH_DIR} +} + +LICENSE="MIT" +COPYRIGHT="2001 Jonas Norberg" diff --git a/haiku-apps/thememanager/thememanager-0-svn.bep b/haiku-apps/thememanager/thememanager-0-svn.bep new file mode 100644 index 000000000..49ca68421 --- /dev/null +++ b/haiku-apps/thememanager/thememanager-0-svn.bep @@ -0,0 +1,18 @@ +DESCRIPTION="ThemeManager" +HOMEPAGE="http://dev.osdrawer.net/projects/thememanager/" +SRC_URI="http://svn.osdrawer.net/thememanager/trunk" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +#CHECKSUM_MD5="" +BUILD { + cd trunk + make +} + +INSTALL { + cd trunk +} + +LICENSE="MIT" +COPYRIGHT="2000-2012 François Revol" diff --git a/haiku-apps/vision/VisionSettings b/haiku-apps/vision/VisionSettings new file mode 100644 index 0000000000000000000000000000000000000000..1718334982fdbc841c38f0b5a5358b168d1a2397 GIT binary patch literal 4311 zcmeH~+iw(A9LLYH6v~!66;KogS)>?+1;VDGi7GBrTWl@ zS1*AV-%O0Y5fe$|K_ApU84_bmd}@L*#s_0!BoW_u8Na{Z&d%G0_l=lkENm-oSdS!{pRBsyuEFgX3;lbwC|xX&=JwbKgzWQ6_{__GoE z8Sq09dJX*P2>qMjN`(F`@Z%BskHC*a=syMTi_m`qel$XVAG|w4|0npd2z?xzyg5RD z2s{ZM$8JxJoJ$X&`~z|;I33y;c6)i9TT$PE1NvNu)A(KnKM~?I&m4GDh|{{f1Kt+m z?Wlha-V)+8p9kR7fAx6i{2s(1eLjM>f_H>Ceb<-3sh?^)v_D=4?_|C$m@oCa2HqRu zw4Xl)KN;c*>R*AM3UOMWU%`7qoc8TrIFtSmr*qf}POg&tUU~g#-=6`eZ&d9c==|q> zeH^F0+8^EkAHw^vpS%S=$aZ!F_UYVx2>t@|ivOYce&*Y+?w9zt0k04I^B*{)Kl?l* zvue?B9q~#`h%p3$OvYS7@v(v6UA)7$=3H6;RFJ3)yO?-gFko`@luEiS0VhXEP78Y& z`pN>*2c;ZmUa~`F+CWptB|8;8jbqK{rdp8f;e#3J8ELv443>09w@hJ6)nFNI{4uFJ z(wvuePARA>N?u)(ietz{SIJ9T3RBk>H~@^P`a(XuS}T}PEH8Za`o)Wnd^(HnSr$!tc|FS z9Mx_9c&Iu;nwpi-%^b%lO?9>Wu;I=Lp&2?BZ%#MUQgbn%dn2X1e^iKHQp>uTv6e?I zZNYy{Q?8^*=}y}+TWLLp)|4Nmg!m*ypTHT{9XHgN`ViurG;15*0p379H7eF_rc}eR zUNx;{bJ*ed-!`~1I4H7eK{r-9`Nl9Ruc{Y|%8Y6{!f{s&*~!x#v8)B*=x<2$aeDZl za>-a%w6U&=v68MkTGt)c^+fA>!n)pQU2j;|7p?0H>-wX0{bAiev~HlH<6TFeh>oFG zSNEPr<-}{Zy*07s-AyFC@9XNkMB+>DUZTWusKZj} zZx!#^F8-msioCwQ&f}xL$TsyOm$2zOIZn2;v?$3*r73y-baJ>E?!i&6TDmDSikp{; zmRC(v8tsBxbn(r`Z$U~!X59!~H{V=*o$e^u#>xWiWd&`Lrf;o>?-LRIUn}aaaz35H zpwi8yo_jeKSM@wErKv2ycVVDe+bSr@lrp~p<5i9N_=3ZYQp&8gsB1i*9GZ}Ha!5(e zmdy9FYidhQwkgSU2@U)mo#cyP)gb(Z!chGw4f2(X43n1wgPh#kY4hTtQpI&JGqsw-1@i5L_E7%|{#XUKO^#Ov;>`rrc!{{{w2Vlhi)^vp{`KmV2p!LxJ2{0pZZ29E@`DuJA|?RZD}AdsK6v6(5V6%n+`*OV9{F@mem lZLK})3)(S782C@62D)tipDNcb`Z3)>o<}*Brz=}R`~|DpUk(5O literal 0 HcmV?d00001 diff --git a/haiku-apps/vision/vision-908.bep b/haiku-apps/vision/vision-908.bep index 0ef0a05b5..6e8b0d45b 100644 --- a/haiku-apps/vision/vision-908.bep +++ b/haiku-apps/vision/vision-908.bep @@ -15,12 +15,15 @@ BUILD { } INSTALL { + VISIONSETTINGSDIR=${DESTDIR}/`finddir B_USER_SETTINGS_DIRECTORY`/Vision + mkdir -p ${VISIONSETTINGSDIR} cd vision-908 cd Vision mkdir -p ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision cp Vision ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision cd data - cp -r * ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision + cp -a * ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision + cp -a `haikuporter -t`/haiku-apps/vision/VisionSettings ${VISIONSETTINGSDIR}/ } COPYRIGHT="1999-2010 The Vision Team" diff --git a/haiku-apps/yab/patches/yab-1.6.patch b/haiku-apps/yab/patches/yab-1.6.patch new file mode 100644 index 000000000..e3b3ee9e5 --- /dev/null +++ b/haiku-apps/yab/patches/yab-1.6.patch @@ -0,0 +1,20 @@ +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/yab-1.6.bep b/haiku-apps/yab/yab-1.6.bep new file mode 100644 index 000000000..3c8340fa3 --- /dev/null +++ b/haiku-apps/yab/yab-1.6.bep @@ -0,0 +1,26 @@ +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" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="071e8653265a60fea96cceab46f67e5b" +BUILD { + cd yab-1.6/src + make clean + make +} + +INSTALL { + cd yab-1.6 + mkdir -p ${DESTDIR}/boot/apps/yab + cp -a src/yab ${DESTDIR}/boot/apps/yab + cp -a Documentation ${DESTDIR}/boot/apps/yab + cp -a Programs ${DESTDIR}/boot/apps/yab + cp -a yab-IDE ${DESTDIR}/boot/apps/yab +} + +LICENSE="Artistic + GNU GPL v2" +COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic) + 2006-2009 Jan Bungeroth (yab improvements)" diff --git a/haiku-apps/libwalter/libwalter-97.bep b/haiku-libs/libwalter/libwalter-97.bep similarity index 100% rename from haiku-apps/libwalter/libwalter-97.bep rename to haiku-libs/libwalter/libwalter-97.bep diff --git a/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.bep b/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.bep new file mode 100644 index 000000000..4d1dde0d9 --- /dev/null +++ b/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.bep @@ -0,0 +1,26 @@ +DESCRIPTION="Arabeyes Arabic TrueType fonts" +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" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="11000a74da50b461b374f711392f1d46" +BUILD { + cd ae_fonts1-1.1 +} + +INSTALL { + cd ae_fonts1-1.1 + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/arabeyes + mkdir -p ${FONTDIR} + cp -r AAHS ${FONTDIR}/ + cp -r AGA ${FONTDIR}/ + cp -r FS ${FONTDIR}/ + cp -r Kasr ${FONTDIR}/ + cp -r MCS ${FONTDIR}/ + cp -r Shmookh ${FONTDIR}/ +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2003-2007 Arabeyes.org + 2002-2005 Free Software Foundation" diff --git a/media-fonts/courier-prime/courier-prime-1.0.bep b/media-fonts/courier-prime/courier-prime-1.0.bep new file mode 100644 index 000000000..91be0bec0 --- /dev/null +++ b/media-fonts/courier-prime/courier-prime-1.0.bep @@ -0,0 +1,21 @@ +DESCRIPTION="It's Courier, just better." +HOMEPAGE="http://quoteunquoteapps.com/courierprime/" +SRC_URI="http://quoteunquoteapps.com/downloads/courier-prime.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="cf79336ce1cf439560a5364ab7856738" +BUILD { + echo "No building required." +} + +INSTALL { + cd "Courier Prime" + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/courier-prime + mkdir -p ${FONTDIR} + cp -r *.ttf ${FONTDIR}/ + cp Read\ me.txt ${FONTDIR}/README.txt +} + +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2013 Quote-Unquote Apps" diff --git a/media-fonts/courier-prime/licenses/SIL Open Font License v1.1 b/media-fonts/courier-prime/licenses/SIL Open Font License v1.1 new file mode 100644 index 000000000..075d1aefb --- /dev/null +++ b/media-fonts/courier-prime/licenses/SIL Open Font License v1.1 @@ -0,0 +1,91 @@ +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/farsi-fonts/farsi-fonts-0.4.bep b/media-fonts/farsi-fonts/farsi-fonts-0.4.bep new file mode 100644 index 000000000..103144133 --- /dev/null +++ b/media-fonts/farsi-fonts/farsi-fonts-0.4.bep @@ -0,0 +1,19 @@ +DESCRIPTION="Farsi (Perisian) Unicode fonts" +HOMEPAGE="http://www.farsiweb.ir/" +SRC_URI="http://www.farsiweb.ir/font/farsifonts-0.4.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="65a78975c923fd9db7b9441c32559c1b" +BUILD { + echo "No building required." +} + +INSTALL { + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ + mkdir -p ${FONTDIR} + cp -r *.ttf {FONTDIR} +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2003 Sharif FarsiWeb Inc." diff --git a/media-fonts/inconsolata/inconsolata-1.0.bep b/media-fonts/inconsolata/inconsolata-1.0.bep new file mode 100644 index 000000000..d531ce2ef --- /dev/null +++ b/media-fonts/inconsolata/inconsolata-1.0.bep @@ -0,0 +1,24 @@ +DESCRIPTION="Inconsolata Programmer's font" +HOMEPAGE="http://www.levien.com/type/myfonts/inconsolata.html" +SRC_URI="http://media.nodnod.net/Inconsolata-dz.otf.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="8510443343f43382566511e73abc06f8" +BUILD { + echo "No building required." +} + +INSTALL { + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/inconsolata + mkdir -p ${FONTDIR} + wget http://levien.com/type/myfonts/Inconsolata.otf + wget http://www.cosmix.org/software/files/InconsolataHellenic.zip + unzip -o InconsolataHellenic.zip + cp -r *.otf ${FONTDIR}/ +} + +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2006 Raph Levien + 2009 David Zhou + 2010-2012 Dimosthenis Kaponis" diff --git a/media-fonts/kacst-fonts/kacst-fonts-5.0.bep b/media-fonts/kacst-fonts/kacst-fonts-5.0.bep new file mode 100644 index 000000000..2c773bcf1 --- /dev/null +++ b/media-fonts/kacst-fonts/kacst-fonts-5.0.bep @@ -0,0 +1,25 @@ +DESCRIPTION="KACST Arabic Truetype Fonts" +HOMEPAGE="http://www.arabeyes.org/project.php?proj=Khotot" +SRC_URI="http://sourceforge.net/projects/arabeyes/files/latest/download?source=files" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="0a7ad4538d3b97adfbefa4c5cf8c2660" +BUILD { + cd kacst_one_5.0 +} + +INSTALL { + cd kacst_one_5.0 + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/arabeyes + mkdir -p ${FONTDIR} + cp KacstOne-Bold.sfd ${FONTDIR}/ + cp KacstOne-Bold.ttf ${FONTDIR}/ + cp KacstOne.sfd ${FONTDIR}/ + cp KacstOne.ttf ${FONTDIR}/ +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2004 KACST + 2002,2003,2005,2008,2009 Free Software Foundation + 2009-2011 Kahled Hosny (Arabeyes additions)" diff --git a/media-fonts/lateef-font/lateef-font-1.001.bep b/media-fonts/lateef-font/lateef-font-1.001.bep new file mode 100644 index 000000000..bc38efee9 --- /dev/null +++ b/media-fonts/lateef-font/lateef-font-1.001.bep @@ -0,0 +1,19 @@ +DESCRIPTION="Arabic font" +HOMEPAGE="http://scripts.sil.org/ArabicFonts_Download" +SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Lateef_OT_1_001&filename=LateefRegOT_1.001.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="c060ab84ab33ae8f991103258b8e7f22" +BUILD { + echo "No building required." +} + +INSTALL { + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ + mkdir -p ${FONTDIR} + cp -r *.ttf ${FONTDIR} +} + +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2004-2008 SIL International" diff --git a/media-fonts/lateef-font/licenses/SIL Open Font License v1.1 b/media-fonts/lateef-font/licenses/SIL Open Font License v1.1 new file mode 100644 index 000000000..075d1aefb --- /dev/null +++ b/media-fonts/lateef-font/licenses/SIL Open Font License v1.1 @@ -0,0 +1,91 @@ +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/nafees-nastaleeq/licenses/CRULP b/media-fonts/nafees-nastaleeq/licenses/CRULP new file mode 100644 index 000000000..3bbef24a0 --- /dev/null +++ b/media-fonts/nafees-nastaleeq/licenses/CRULP @@ -0,0 +1,19 @@ +License Agreement +  +Copyright (c) 2004 by Center for Research in Urdu Language Processing (CRULP), National University of Computer and Emerging Sciences, Lahore, Pakistan. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of the font accompanying this license ("Font") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: + +1. The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. + +2. The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the font is renamed to names not containing either the words "Nafees" or the word "CRULP". + +3. This License becomes null and void to the extent applicable to Font or Font Software that has been modified and is distributed under the "Nafees*" names. + +4. The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. + +5. The font software is provided "as is", without warranty of any kind, express or implied, including but not limited to any warranties of merchantability, fitness for a particular purpose and noninfringement of copyright, patent, trademark, or other right. In no event shall CRULP or NUCES be liable for any claim, damages or other liability, including any general, special, indirect, incidental, or consequential damages, whether in an action of contract, or otherwise, arising from, out of the use or inability to use the font software or from other dealings in the font software. + +6. Except as contained in this notice, the names of "CRULP" or "Nafees" shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from CRULP. + +7. As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to  be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version diff --git a/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.bep b/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.bep new file mode 100644 index 000000000..dd201fb6f --- /dev/null +++ b/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.bep @@ -0,0 +1,19 @@ +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" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="34ca164ce011b682522431fc332c0cb6" +BUILD { + echo "Nothing to be done. To install this font, run haikuporter with -i option" +} + +INSTALL { + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nafees-nastaleeq + mkdir -p ${FONTDIR} + cp "Nafees Nastaleeq v1.02.ttf" ${FONTDIR} +} + +LICENSE="CRULP" +COPYRIGHT="2004 Center for Research in Urdu Language Processing" diff --git a/media-fonts/nafees-riqa/licenses/CRULP b/media-fonts/nafees-riqa/licenses/CRULP new file mode 100644 index 000000000..3bbef24a0 --- /dev/null +++ b/media-fonts/nafees-riqa/licenses/CRULP @@ -0,0 +1,19 @@ +License Agreement +  +Copyright (c) 2004 by Center for Research in Urdu Language Processing (CRULP), National University of Computer and Emerging Sciences, Lahore, Pakistan. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of the font accompanying this license ("Font") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: + +1. The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. + +2. The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the font is renamed to names not containing either the words "Nafees" or the word "CRULP". + +3. This License becomes null and void to the extent applicable to Font or Font Software that has been modified and is distributed under the "Nafees*" names. + +4. The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. + +5. The font software is provided "as is", without warranty of any kind, express or implied, including but not limited to any warranties of merchantability, fitness for a particular purpose and noninfringement of copyright, patent, trademark, or other right. In no event shall CRULP or NUCES be liable for any claim, damages or other liability, including any general, special, indirect, incidental, or consequential damages, whether in an action of contract, or otherwise, arising from, out of the use or inability to use the font software or from other dealings in the font software. + +6. Except as contained in this notice, the names of "CRULP" or "Nafees" shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from CRULP. + +7. As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to  be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version diff --git a/media-fonts/nafees-riqa/nafees-riqa-1.00.bep b/media-fonts/nafees-riqa/nafees-riqa-1.00.bep new file mode 100644 index 000000000..805653aed --- /dev/null +++ b/media-fonts/nafees-riqa/nafees-riqa-1.00.bep @@ -0,0 +1,19 @@ +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" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="504c6ada41a408575a120daf2a110b6f" +BUILD { + echo "Nothing to be done. To install this font, run haikuporter with -i option" +} + +INSTALL { + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nafees-riqa + mkdir -p ${FONTDIR} + cp "Nafees Riqa v1.0.ttf" ${FONTDIR} +} + +LICENSE="CRULP" +COPYRIGHT="2004 Center for Research in Urdu Language Processing" diff --git a/media-fonts/nanumfont/licenses/SIL Open Font License v1.1 b/media-fonts/nanumfont/licenses/SIL Open Font License v1.1 new file mode 100644 index 000000000..075d1aefb --- /dev/null +++ b/media-fonts/nanumfont/licenses/SIL Open Font License v1.1 @@ -0,0 +1,91 @@ +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/nanumfont/nanumfont-2.0.bep b/media-fonts/nanumfont/nanumfont-2.0.bep new file mode 100644 index 000000000..8f0cc9baf --- /dev/null +++ b/media-fonts/nanumfont/nanumfont-2.0.bep @@ -0,0 +1,19 @@ +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" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="6214a5844454c96faeac9a60539c7daf" +BUILD { + echo "No building required." +} + +INSTALL { + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nanumfont + mkdir -p ${FONTDIR} + cp -r *.ttf ${FONTDIR}/ +} + +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2009 NHN Corp." diff --git a/media-fonts/scheherazade-font/licenses/SIL Open Font License v1.1 b/media-fonts/scheherazade-font/licenses/SIL Open Font License v1.1 new file mode 100644 index 000000000..075d1aefb --- /dev/null +++ b/media-fonts/scheherazade-font/licenses/SIL Open Font License v1.1 @@ -0,0 +1,91 @@ +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/scheherazade-font/scheherazade-font-1.005.bep b/media-fonts/scheherazade-font/scheherazade-font-1.005.bep new file mode 100644 index 000000000..307e71ece --- /dev/null +++ b/media-fonts/scheherazade-font/scheherazade-font-1.005.bep @@ -0,0 +1,20 @@ +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" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="3c7e7d7f93802162effe2b517af98be0" + +BUILD { + echo "No building required." +} + +INSTALL { + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/scheherazade + mkdir -p ${FONTDIR} + cp -r *.ttf ${FONTDIR} +} + +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2004-2011 SIL International" \ No newline at end of file diff --git a/media-fonts/ukijorgfonts/licenses/SIL Open Font License v1.1 b/media-fonts/ukijorgfonts/licenses/SIL Open Font License v1.1 new file mode 100644 index 000000000..075d1aefb --- /dev/null +++ b/media-fonts/ukijorgfonts/licenses/SIL Open Font License v1.1 @@ -0,0 +1,91 @@ +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.bep b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.bep new file mode 100644 index 000000000..5620593ce --- /dev/null +++ b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.bep @@ -0,0 +1,21 @@ +DESCRIPTION="Uyghur Computer Science Association font project" +HOMEPAGE="http://www.ukij.org/fonts/" +SRC_URI="http://ukijorgfonts.googlecode.com/files/ukijorgfonts.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="e50ed1b90f96cad12e31f8769bd598dc" +BUILD { + echo "Nothing to be done. To install this font, run haikuporter with -i option" +} + +INSTALL { + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ukijorgfonts + mkdir -p ${FONTDIR} + cp *.ttf ${FONTDIR} +} + +LICENSE="SIL Open Font License v1.1 + GNU LGPL v2 + GNU GPL v2" +COPYRIGHT="2004-2011 Uyghur Computer Science Association" diff --git a/media-fonts/x-series-fonts/x-series-fonts-2.0.bep b/media-fonts/x-series-fonts/x-series-fonts-2.0.bep new file mode 100644 index 000000000..93c2f2064 --- /dev/null +++ b/media-fonts/x-series-fonts/x-series-fonts-2.0.bep @@ -0,0 +1,131 @@ +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" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="1e45723ebad5e748d4b5f6f28074833f" +BUILD { + cd Zar +} + +INSTALL { + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/x-series + mkdir -p ${FONTDIR} + wget http://irmug.com/downloads/dl.php?id=21 + unzip -o Zar.zip + cd Zar + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=3 + unzip -o Niloofar.zip + cd Niloofar + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=2 + unzip -o Khoramshahr.zip + cd Khoramshahr + cp -f *.ttf ${FONTDIR}/ + + wget http://www.irmug.com/downloads/dl.php?id=1 + unzip -o Kayhan.zip + cd Kayhan + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=17 + unzip -o Yagut.zip + cd Yagut + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=5 + unzip -o Riyaz.zip + cd Riyaz + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=6 + unzip -o Roya.zip + cd Roya + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=7 + unzip -o Shafigh.zip + cd Shafigh + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=9 + unzip -o "Shafigh Kurd.zip" + cd "Shafigh Kurd" + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=8 + unzip -o "Shafigh Uzbek.zip" + cd "Shafigh Uzbek" + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=10 + unzip -o Shiraz.zip + cd Shiraz + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=11 + unzip -o Sols.zip + cd Sols + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=12 + unzip -o Tabriz.zip + cd Tabriz + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=13 + unzip -o Titre.zip + cd Titre + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=14 + unzip -o Traffic.zip + cd Traffic + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=4 + unzip -o Paatch.zip + cd Paatch + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=15 + unzip -o Vahid.zip + cd Vahid + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=16 + unzip -o Vosta.zip + cd Vosta + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=19 + unzip -o Yekan.zip + cd Yekan + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=20 + unzip -o Yermook.zip + cd Yermook + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=18 + unzip -o Yas.zip + cd Yas + cp -f *.ttf ${FONTDIR}/ + + wget http://irmug.com/downloads/dl.php?id=22 + unzip -o Ziba.zip + cd Ziba + cp -f *.ttf ${FONTDIR}/ + + + + +} + +LICENSE="GNU GPL v2" +#COPYRIGHT="" diff --git a/media-gfx/flam3/flam3-3.0.bep b/media-gfx/flam3/flam3-3.0.bep index e5faf7032..3f3aa7c32 100644 --- a/media-gfx/flam3/flam3-3.0.bep +++ b/media-gfx/flam3/flam3-3.0.bep @@ -14,7 +14,7 @@ BUILD { fi libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-gfx/fontforge/fontforge-201005010.bep b/media-gfx/fontforge/fontforge-201005010.bep index 1cee88b67..d4cadf981 100644 --- a/media-gfx/fontforge/fontforge-201005010.bep +++ b/media-gfx/fontforge/fontforge-201005010.bep @@ -10,7 +10,7 @@ BUILD { libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-gfx/graphviz/graphviz-2.24.bep b/media-gfx/graphviz/graphviz-2.24.bep index 72d6651e1..2285c4260 100644 --- a/media-gfx/graphviz/graphviz-2.24.bep +++ b/media-gfx/graphviz/graphviz-2.24.bep @@ -7,22 +7,23 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd graphviz-2.24.0 - cp /boot/common/share/libtool/config/config.guess config - cp /boot/common/share/libtool/config/config.guess lib/gd/config - cp /boot/common/share/libtool/config/config.guess libltdl - cp /boot/common/share/libtool/config/config.sub config - cp /boot/common/share/libtool/config/config.sub lib/gd/config - cp /boot/common/share/libtool/config/config.sub libltdl + libtoolize -fci + aclocal -I m4 autoconf - ./configure --prefix=/boot/common --disable-shared --enable-static CFLAGS="-O0" LDFLAGS="-L/boot/common/lib -liconv" + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --disable-shared \ + --enable-static \ + CFLAGS="-O0" \ + LDFLAGS="-L`finddir B_COMMON_LIB_DIRECTORY` -liconv" make } INSTALL { cd graphviz-2.24.0 make install - cd /boot/common/bin + cd `finddir B_COMMON_BIN_DIRECTORY` ln -s dot_static dot } + LICENSE="CPL v1.0" COPYRIGHT="1994-2010 AT&T Corp." diff --git a/media-gfx/graphviz/graphviz-2.26.3.bep b/media-gfx/graphviz/graphviz-2.26.3.bep index 17830cce1..702281e4d 100644 --- a/media-gfx/graphviz/graphviz-2.26.3.bep +++ b/media-gfx/graphviz/graphviz-2.26.3.bep @@ -1,5 +1,5 @@ -DESCRIPTION="graphviz - Open Source Graph Visualization Software." -HOMEPAGE="http://www.graphviz.org/" +DESCRIPTION="graphviz - Open Source Graph Visualization Software." +HOMEPAGE="http://www.graphviz.org/" SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.26.3.tar.gz" CHECKSUM_MD5="6f45946fa622770c45609778c0a982ee" REVISION="1" @@ -7,17 +7,20 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd graphviz-2.26.3 - libtoolize --force --copy --install + libtoolize -fci autoconf - ./configure --prefix=/boot/common --disable-shared --enable-static --disable-perl CFLAGS="-O0" LDFLAGS="-L/boot/common/lib -liconv" + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --enable-shared \ + --disable-perl make } INSTALL { cd graphviz-2.26.3 make install - cd ${DESTDIR}/boot/common/bin - ln -s dot_static dot } + LICENSE="CPL v1.0" COPYRIGHT="1994-2010 AT&T Corp." diff --git a/media-gfx/graphviz/patches/graphviz-2.26.3.patch b/media-gfx/graphviz/patches/graphviz-2.26.3.patch index e0a582001..3fcfede3b 100644 --- a/media-gfx/graphviz/patches/graphviz-2.26.3.patch +++ b/media-gfx/graphviz/patches/graphviz-2.26.3.patch @@ -4,7 +4,7 @@ diff -up graphviz-2.26.3/config.h.in.orig graphviz-2.26.3/config.h.in @@ -427,6 +427,9 @@ /* Define to 1 if you have struct dioattr */ #undef HAVE_STRUCT_DIOATTR - + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYSEXITS_H + @@ -14,13 +14,13 @@ diff -up graphviz-2.26.3/config.h.in.orig graphviz-2.26.3/config.h.in @@ -578,6 +581,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME - + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION - + diff -up graphviz-2.26.3/configure.ac.orig graphviz-2.26.3/configure.ac --- graphviz-2.26.3/configure.ac.orig 2010-01-26 09:00:29.029622272 -0700 +++ graphviz-2.26.3/configure.ac 2010-03-18 18:03:33.265289728 -0600 @@ -82,9 +82,52 @@ diff -up graphviz-2.26.3/lib/gd/gd_png.c.orig graphviz-2.26.3/lib/gd/gd_png.c @@ -150,7 +150,7 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFro return NULL; } - + - if (!png_check_sig (sig, 8)) { /* bad signature */ + if (png_sig_cmp(sig, 0, 8)) { /* bad signature */ return NULL; /* bad signature */ } - + +diff -up graphviz-2.26.3/lib/gvc/gvcext.h.orig graphviz-2.26.3/lib/gvc/gvcext.h +--- graphviz-2.26.3/lib/gvc/gvcext.h.orig 2009-07-08 17:14:20.054525952 +0200 ++++ graphviz-2.26.3/lib/gvc/gvcext.h 2011-04-13 19:38:04.150470656 +0200 +@@ -65,6 +65,9 @@ extern "C" { + + typedef struct gvplugin_available_s gvplugin_available_t; + ++#undef lt_preloaded_symbols ++#define lt_preloaded_symbols lt_GRAPHVIZ_LTX_preloaded_symbols ++ + /*visual studio*/ + #ifdef WIN32_DLL + #ifndef GVC_EXPORTS +diff -up graphviz-2.26.3/lib/vmalloc/vmhdr.h.orig graphviz-2.26.3/lib/vmalloc/vmhdr.h +--- graphviz-2.26.3/lib/vmalloc/vmhdr.h.orig 2009-06-03 03:10:55.040894464 +0200 ++++ graphviz-2.26.3/lib/vmalloc/vmhdr.h 2011-04-04 18:51:05.289931264 +0200 +@@ -54,6 +54,10 @@ extern "C" { + #include + #include "FEATURE/vmalloc" + ++#ifdef __HAIKU__ ++ #undef _hdr_malloc ++#endif ++ + #endif /*_PACKAGE_ast*/ + + #undef free +diff -up graphviz-2.26.3/lib/common/const.h.orig graphviz-2.26.3/lib/common/const.h +--- graphviz-2.26.3/lib/common/const.h.orig 2009-08-28 21:46:42.059506688 +0200 ++++ graphviz-2.26.3/lib/common/const.h 2011-02-18 18:48:44.856162304 +0100 +@@ -67,7 +67,11 @@ + #define DEFAULT_FONTSIZE 14.0 + #define DEFAULT_LABEL_FONTSIZE 11.0 /* for head/taillabel */ + #define MIN_FONTSIZE 1.0 +-#define DEFAULT_FONTNAME "Times-Roman" ++#ifdef __HAIKU__ ++ #define DEFAULT_FONTNAME "DejaVuSans" ++#else ++ #define DEFAULT_FONTNAME "Times-Roman" ++#endif + #define DEFAULT_FILL "lightgrey" + #define LINESPACING 1.20 + diff --git a/media-gfx/hqx/hqx-1.1.bep b/media-gfx/hqx/hqx-1.1.bep new file mode 100644 index 000000000..ba9a5e07f --- /dev/null +++ b/media-gfx/hqx/hqx-1.1.bep @@ -0,0 +1,25 @@ +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" +STATUS_HAIKU="untested" +DEPEND="media-libs/devil >= 1.7.8" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." + +CHECKSUM_MD5="e4d3132b5f3614a75975b62fe6a066bb" +BUILD { + cd hqx-1.1 + + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + + cd hqx-1.1 + make install +} + +LICENSE="GNU LGPL v2" +COPYRIGHT="2003 Maxim Stepin, + 2010 Cameron Zemek" diff --git a/media-gfx/imagemagick/imagemagick-6.6.1-10.bep b/media-gfx/imagemagick/imagemagick-6.6.1-10.bep index c80a9415d..21b575066 100644 --- a/media-gfx/imagemagick/imagemagick-6.6.1-10.bep +++ b/media-gfx/imagemagick/imagemagick-6.6.1-10.bep @@ -1,6 +1,6 @@ DESCRIPTION="ImageMagick - A collection of tools and libraries for many image formats" HOMEPAGE="A collection of tools and libraries for many image formats" -SRC_URI="ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick.tar.gz" +SRC_URI="http://www.imagemagick.org/download/legacy/ImageMagick-6.6.1-10.tar.gz" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libpng, @@ -19,7 +19,7 @@ BUILD { aclocal -I m4 autoconf automake - ./configure --prefix=/boot/common \ + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --enable-shared \ --enable-fast-install \ --with-modules=yes \ diff --git a/media-gfx/pngcrush/pngcrush-1.7.6.bep b/media-gfx/pngcrush/pngcrush-1.7.6.bep index ef7238fe3..20dcd81d1 100644 --- a/media-gfx/pngcrush/pngcrush-1.7.6.bep +++ b/media-gfx/pngcrush/pngcrush-1.7.6.bep @@ -12,7 +12,7 @@ BUILD { INSTALL { cd pngcrush-1.7.6-nolib - cp -a -f pngcrush /boot/common/bin + cp -a -f pngcrush `finddir B_COMMON_BIN_DIRECTORY` } LICENSE="LibPNG" COPYRIGHT="1998-2009 Glenn Randers-Pehrson diff --git a/media-libs/aalib/aalib-1.4rc4.bep b/media-libs/aalib/aalib-1.4rc4.bep new file mode 100644 index 000000000..34b9d7925 --- /dev/null +++ b/media-libs/aalib/aalib-1.4rc4.bep @@ -0,0 +1,29 @@ +DESCRIPTION="aalib is an ASCII rendering 2D library" +HOMEPAGE="http://aa-project.sourceforge.net/aalib/" +SRC_URI="http://prdownloads.sourceforge.net/aa-project/aalib-1.4rc4.tar.gz" +#CHECKSUM_MD5="fddc3c704c5489de2a3cf0fedfec59db" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd aalib-1.4.0 + libtoolize --force --copy --install +# aclocal +# autoconf +# automake + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR \ + --enable-static + make +} + +INSTALL { + cd aalib-1.4.0 + make install +} + +LICENSE="Public Domain" +#COPYRIGHT="" diff --git a/media-libs/agar/agar-1.4.1.bep b/media-libs/agar/agar-1.4.1.bep new file mode 100644 index 000000000..5c13d6e2d --- /dev/null +++ b/media-libs/agar/agar-1.4.1.bep @@ -0,0 +1,26 @@ +DESCRIPTION="a modern open-source, cross-platform toolkit for graphical applications" +HOMEPAGE="http://libagar.org/index.html.en" +SRC_URI="http://stable.hypertriton.com/agar/agar-1.4.1.tar.gz" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="" +CHECKSUM_MD5="ce71fb11ad79c926a968a4ed29053820" +BUILD { + cd agar-1.4.1 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd agar-1.4.1 + make install +} + +TEST { + cd agar-1.4.1 +# make test +# make check +} + +LICENSE="BSD (2-clause)" +COPYRIGHT="2002-2011 Hypertrition, Inc." diff --git a/media-libs/allegro/allegro-4.4.1.1.bep b/media-libs/allegro/allegro-4.4.1.1.bep index 470abd7ef..c4a2019cd 100644 --- a/media-libs/allegro/allegro-4.4.1.1.bep +++ b/media-libs/allegro/allegro-4.4.1.1.bep @@ -7,11 +7,12 @@ 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.1.1 - mkdir -p `finddir B_COMMON_DIRECTORY`/share/info + mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - cmake . -DINFODIR:=`finddir B_COMMON_DIRECTORY`/share/info \ + cmake . -DINFODIR:=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ -DMANDIR:=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } diff --git a/media-libs/allegro/allegro-4.4.x-svn.bep b/media-libs/allegro/allegro-4.4.x-svn.bep new file mode 100644 index 000000000..ca03a5837 --- /dev/null +++ b/media-libs/allegro/allegro-4.4.x-svn.bep @@ -0,0 +1,25 @@ +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.x-svn.patch b/media-libs/allegro/patches/allegro-4.4.x-svn.patch new file mode 100644 index 000000000..2e81e77f1 --- /dev/null +++ b/media-libs/allegro/patches/allegro-4.4.x-svn.patch @@ -0,0 +1,51 @@ +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/cal3d/cal3d-0.11.0.bep b/media-libs/cal3d/cal3d-0.11.0.bep index 410f95eac..1522e449d 100644 --- a/media-libs/cal3d/cal3d-0.11.0.bep +++ b/media-libs/cal3d/cal3d-0.11.0.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/devil/devil-1.7.8.bep b/media-libs/devil/devil-1.7.8.bep index 8f058ef6d..29a5e75d9 100644 --- a/media-libs/devil/devil-1.7.8.bep +++ b/media-libs/devil/devil-1.7.8.bep @@ -14,7 +14,7 @@ BUILD { cd devil-1.7.8 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/djvulibre/djvulibre-3.5.25.bep b/media-libs/djvulibre/djvulibre-3.5.25.bep new file mode 100644 index 000000000..a4355f690 --- /dev/null +++ b/media-libs/djvulibre/djvulibre-3.5.25.bep @@ -0,0 +1,26 @@ +DESCRIPTION="DjVu is a web-centric format and software platform for distributing documents and images" +HOMEPAGE="http://djvulibre.sourceforge.net/" +SRC_URI="http://downloads.sourceforge.net/project/djvu/DjVuLibre/3.5.25/djvulibre-3.5.25.2.tar.gz" +CHECKSUM_MD5="994e2ff1d4ae6a763764dfe20509826e" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +BUILD { + cd djvulibre-3.5.25 + COMMON_DIR=`finddir B_COMMON_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` + make +} + +INSTALL { + cd djvulibre-3.5.25 + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2002 Leon Bottou and Yann Le Cun. + 2001 AT&T + 1999-2001 LizardTech, Inc." diff --git a/media-libs/djvulibre/patches/djvulibre-3.5.25.patch b/media-libs/djvulibre/patches/djvulibre-3.5.25.patch new file mode 100644 index 000000000..1d12ad8fd --- /dev/null +++ b/media-libs/djvulibre/patches/djvulibre-3.5.25.patch @@ -0,0 +1,12 @@ +diff -Naur djvulibre-3.5.25/libdjvu/miniexp.cpp djvulibre-3.5.25-haiku/libdjvu/miniexp.cpp +--- djvulibre-3.5.25/libdjvu/miniexp.cpp 2012-03-17 23:49:02.048758784 +0100 ++++ djvulibre-3.5.25-haiku/libdjvu/miniexp.cpp 2012-03-25 14:42:11.949223424 +0200 +@@ -1010,7 +1010,7 @@ + if (io == &miniexp_io && !CompatCounter::count) + return (*minilisp_getc)(); /* compatibility hack */ + FILE *f = (io->data[0]) ? (FILE*)(io->data[0]) : stdin; +- return ::getc(f); ++ return getc(f); + } + + static int diff --git a/media-libs/faac/faac-1.28.bep b/media-libs/faac/faac-1.28.bep new file mode 100644 index 000000000..5d03c0a98 --- /dev/null +++ b/media-libs/faac/faac-1.28.bep @@ -0,0 +1,28 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="c5dde68840cefe46532089c9392d1df0" +MESSAGE="See FAAC file in licenses directory for restrictions on binary releases. Binary releases may require a patent license in some countries." +BUILD { + cd faac-1.28 + libtoolize --force --copy --install + aclocal + autoconf + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR + make +} + +INSTALL { + cd faac-1.28 + make install +} + +LICENSE="FAAC" +COPYRIGHT="2001 M. Bakker" diff --git a/media-libs/faac/licenses/FAAC b/media-libs/faac/licenses/FAAC new file mode 100644 index 000000000..8b08ee0a5 --- /dev/null +++ b/media-libs/faac/licenses/FAAC @@ -0,0 +1,70 @@ +__________ +COPYRIGHTS + +FAAC is based on the ISO MPEG-4 reference code. For this base code the +following license applies: + + +********************************************************************** +This software module was originally developed by + +FirstName LastName (CompanyName) + +and edited by + +FirstName LastName (CompanyName) +FirstName LastName (CompanyName) + +in the course of development of the MPEG-2 NBC/MPEG-4 Audio standard +ISO/IEC 13818-7, 14496-1,2 and 3. This software module is an +implementation of a part of one or more MPEG-2 NBC/MPEG-4 Audio tools +as specified by the MPEG-2 NBC/MPEG-4 Audio standard. ISO/IEC gives +users of the MPEG-2 NBC/MPEG-4 Audio standards free license to this +software module or modifications thereof for use in hardware or +software products claiming conformance to the MPEG-2 NBC/ MPEG-4 Audio +standards. Those intending to use this software module in hardware or +software products are advised that this use may infringe existing +patents. The original developer of this software module and his/her +company, the subsequent editors and their companies, and ISO/IEC have +no liability for use of this software module or modifications thereof +in an implementation. Copyright is not released for non MPEG-2 +NBC/MPEG-4 Audio conforming products. The original developer retains +full right to use the code for his/her own purpose, assign or donate +the code to a third party and to inhibit third party from using the +code for non MPEG-2 NBC/MPEG-4 Audio conforming products. This +copyright notice must be included in all copies or derivative works. + +Copyright (c) 1997. +********************************************************************** + + +For the changes made for the FAAC project the GNU Library General +Public License (LGPL), version 2 1991 applies. For the changes the +following statement applies: + +********************************************************************** +FAAC - Freeware Advanced Audio Coder +Copyright (C) 2001 M. Bakker + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library 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 +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +********************************************************************** + + + +Please note that the use of this software may require the payment of +patent royalties. You need to consider this issue before you start +building derivative works. We are not warranting or indemnifying you in +any way for patent royalities! YOU ARE SOLELY RESPONSIBLE FOR YOUR OWN +ACTIONS! \ No newline at end of file diff --git a/media-libs/faad2/faad2-2.7.bep b/media-libs/faad2/faad2-2.7.bep index d97c7acee..215d00dbb 100644 --- a/media-libs/faad2/faad2-2.7.bep +++ b/media-libs/faad2/faad2-2.7.bep @@ -1,5 +1,5 @@ -DESCRIPTION="FAAD2 is an open source MPEG-4 and MPEG-2 AAC decoder" -HOMEPAGE="http://www.audiocoding.com/" +DESCRIPTION="FAAD2 is an open source MPEG-4 and MPEG-2 AAC decoder" +HOMEPAGE="http://www.audiocoding.com/" SRC_URI="http://downloads.sourceforge.net/faac/faad2-2.7.tar.gz" REVISION="1" STATUS_HAIKU="stable" @@ -12,11 +12,7 @@ BUILD { aclocal autoconf MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/media-libs/fitz/fitz-1.0.bep b/media-libs/fitz/fitz-1.0.bep new file mode 100644 index 000000000..aab114c98 --- /dev/null +++ b/media-libs/fitz/fitz-1.0.bep @@ -0,0 +1,28 @@ +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." +HOMEPAGE="http://code.google.com/p/mupdf/" +SRC_URI="http://mupdf.googlecode.com/files/mupdf-1.0-source.tar.gz" +CHECKSUM_MD5="d986ab98e2b035b7abd61afc474562b3" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="jbig2dec >= 0.11 + openjpeg >= 1.5.0 + jpeg >= 8d + zlib >= 1.2.5 + freetype >=2.4.9" +BUILD { + cd mupdf-1.0-source + make libs +} + +INSTALL { + cd mupdf-1.0-source + make install \ + prefix=${DESTDIR}/`finddir B_COMMON_DIRECTORY` \ + bindir=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` \ + libdir=${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY` \ + incdir=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` \ + mandir=${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man +} + +LICENSE="GNU GPL v3" +COPYRIGHT="2007 Free Software Foundation, Inc." diff --git a/media-libs/fitz/patches/fitz-1.0.patch b/media-libs/fitz/patches/fitz-1.0.patch new file mode 100644 index 000000000..6946f4464 --- /dev/null +++ b/media-libs/fitz/patches/fitz-1.0.patch @@ -0,0 +1,36 @@ +diff -Naur mupdf-1.0-source/Makefile mupdf-1.0-source-haiku/Makefile +--- mupdf-1.0-source/Makefile 2012-04-24 16:41:33.029097984 +0000 ++++ mupdf-1.0-source-haiku/Makefile 2012-06-07 17:13:57.000000000 +0000 +@@ -12,8 +12,8 @@ + # Do not specify CFLAGS or LIBS on the make invocation line - specify + # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that + # set a variable that was set on the command line. +-CFLAGS += $(XCFLAGS) -Ifitz -Ipdf -Ixps -Icbz -Iscripts +-LIBS += $(XLIBS) -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz -lm ++CFLAGS += $(XCFLAGS) -Ifitz -Ipdf -Ixps -Icbz -Iscripts -I/boot/develop/headers/3rdparty/freetype2 ++LIBS += -L/boot/common/lib/ -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz -lroot + + include Makerules + include Makethird +@@ -144,7 +144,7 @@ + + ifeq "$(NOX11)" "" + MUPDF := $(OUT)/mupdf +-$(MUPDF) : $(FITZ_LIB) $(THIRD_LIBS) ++$(MUPDF) : $(FITZ_LIB) + $(MUPDF) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o) + $(LINK_CMD) $(X11_LIBS) + endif +@@ -167,11 +167,10 @@ + incdir ?= $(prefix)/include + mandir ?= $(prefix)/share/man + +-install: $(FITZ_LIB) $(MU_APPS) $(MUPDF) ++install: $(FITZ_LIB) + install -d $(bindir) $(libdir) $(incdir) $(mandir)/man1 + install $(FITZ_LIB) $(libdir) + install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h $(incdir) +- install $(MU_APPS) $(MUPDF) $(bindir) + install $(wildcard apps/man/*.1) $(mandir)/man1 + + # --- Clean and Default --- diff --git a/media-libs/flac/flac-1.2.1.bep b/media-libs/flac/flac-1.2.1.bep index 21f69bcc4..1a5b26f0a 100644 --- a/media-libs/flac/flac-1.2.1.bep +++ b/media-libs/flac/flac-1.2.1.bep @@ -7,20 +7,28 @@ STATUS_HAIKU="stable" DEPEND="gettext >= 0.17" BUILD { cd flac-1.2.1 + haikuporter -b libiconv-1.13.1 + cp -a `haikuporter -t`/dev-libs/libiconv/work/libiconv-1.13.1/srcm4/. m4 libtoolize --force --copy --install - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./autogen.sh --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR + aclocal -I m4 + autoconf + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' src/libFLAC/M* + sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' src/libFLAC++/M* + automake + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=$COMMON_DOCS \ + --docdir=$COMMON_DOCS/doc/flac \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --mandir=$COMMON_DOCS/man make - } INSTALL { cd flac-1.2.1 make install } + LICENSE="GNU LGPL v2.1 GNU GPL v2 BSD (3-clause)" diff --git a/media-libs/fontconfig/fontconfig-2.10.0.bep b/media-libs/fontconfig/fontconfig-2.10.0.bep new file mode 100644 index 000000000..271be1d39 --- /dev/null +++ b/media-libs/fontconfig/fontconfig-2.10.0.bep @@ -0,0 +1,37 @@ +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.10.0.tar.bz2" +CHECKSUM_MD5="3950e82cf5885b41cba8a2bf466aa6f9" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/pkgconfig >= 0.23 + media-libs/freetype >= 2.4.9" +BUILD { + cd fontconfig-2.10.0 + mkdir -p `finddir B_USER_CACHE_DIRECTORY` + libtoolize --force --copy --install + aclocal + autoconf + automake + FONTS_DIR=`finddir B_SYSTEM_FONTS_DIRECTORY` + FONTS_DIR2=`finddir B_COMMON_FONTS_DIRECTORY` + FONTS_DIR3=`finddir B_BEOS_FONTS_DIRECTORY` + FONTS_DIR4=`finddir B_USER_FONTS_DIRECTORY` + CACHE_DIR=`finddir B_USER_CACHE_DIRECTORY` + DOCS_DIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + DATA_DIR=`finddir B_COMMON_DATA_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-libxml2 \ + --with-default-fonts=${FONTS_DIR} \ + --with-add-fonts=${FONTS_DIR2},${FONTS_DIR3},${FONTS_DIR4} \ + --with-cache-dir=${CACHE_DIR} \ + --mandir=${DOCS_DIR}/man \ + --docdir=${DOCS_DIR}/doc \ + --datarootdir=${DATA_DIR} + make +} + +INSTALL { + cd fontconfig-2.10.0 + make install +} diff --git a/media-libs/fontconfig/fontconfig-2.10.2.bep b/media-libs/fontconfig/fontconfig-2.10.2.bep new file mode 100644 index 000000000..b082b6fd1 --- /dev/null +++ b/media-libs/fontconfig/fontconfig-2.10.2.bep @@ -0,0 +1,37 @@ +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.10.2.tar.bz2" +CHECKSUM_MD5="2f239690057d1438aa282e051f721d08" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/pkgconfig >= 0.23 + media-libs/freetype >= 2.4.9" +BUILD { + cd fontconfig-2.10.2 + mkdir -p `finddir B_USER_CACHE_DIRECTORY` + libtoolize --force --copy --install + aclocal + autoconf + automake + FONTS_DIR=`finddir B_SYSTEM_FONTS_DIRECTORY` + FONTS_DIR2=`finddir B_COMMON_FONTS_DIRECTORY` + FONTS_DIR3=`finddir B_BEOS_FONTS_DIRECTORY` + FONTS_DIR4=`finddir B_USER_FONTS_DIRECTORY` + CACHE_DIR=`finddir B_USER_CACHE_DIRECTORY` + DOCS_DIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + DATA_DIR=`finddir B_COMMON_DATA_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-libxml2 \ + --with-default-fonts=${FONTS_DIR} \ + --with-add-fonts=${FONTS_DIR2},${FONTS_DIR3},${FONTS_DIR4} \ + --with-cache-dir=${CACHE_DIR} \ + --mandir=${DOCS_DIR}/man \ + --docdir=${DOCS_DIR}/doc \ + --datarootdir=${DATA_DIR} + make +} + +INSTALL { + cd fontconfig-2.10.2 + make install +} diff --git a/media-libs/fontconfig/fontconfig-2.8.0.bep b/media-libs/fontconfig/fontconfig-2.8.0.bep deleted file mode 100644 index 12c084014..000000000 --- a/media-libs/fontconfig/fontconfig-2.8.0.bep +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="Fontconfig is a library for font customization and configuration." -HOMEPAGE="http://fontconfig.org" -SRC_URI="http://fontconfig.org/release/fontconfig-2.8.0.tar.gz" -CHECKSUM_MD5="77e15a92006ddc2adbb06f840d591c0e" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="dev-util/pkgconfig >= 0.23" -BUILD { - cd fontconfig-2.8.0 - mkdir -p `finddir B_USER_CACHE_DIRECTORY` - libtoolize --force --copy --install - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in - aclocal - autoconf - automake - FONTS_DIR=`finddir B_SYSTEM_FONTS_DIRECTORY` - FONTS_DIR2=`finddir B_COMMON_FONTS_DIRECTORY` - FONTS_DIR3=`finddir B_BEOS_FONTS_DIRECTORY` - FONTS_DIR4=`finddir B_USER_FONTS_DIRECTORY` - CACHE_DIR=`finddir B_USER_CACHE_DIRECTORY` - ./configure --prefix=/boot/common --enable-libxml2 --with-default-fonts=${FONTS_DIR} --with-add-fonts=${FONTS_DIR2},${FONTS_DIR3},${FONTS_DIR4} --with-cache-dir=${CACHE_DIR} - make -} - -INSTALL { - cd fontconfig-2.8.0 - make install -} diff --git a/media-libs/fontconfig/patches/fontconfig-2.10.0.patch b/media-libs/fontconfig/patches/fontconfig-2.10.0.patch new file mode 100644 index 000000000..40083e093 --- /dev/null +++ b/media-libs/fontconfig/patches/fontconfig-2.10.0.patch @@ -0,0 +1,12 @@ +diff -ur fontconfig-2.10.0/src/fcatomic.c fontconfig-2.10.0-haiku/src/fcatomic.c +--- fontconfig-2.10.0/src/fcatomic.c 2012-06-17 21:49:30.023855104 -0400 ++++ fontconfig-2.10.0-haiku/src/fcatomic.c 2012-07-18 19:39:56.629145600 -0400 +@@ -132,7 +132,7 @@ + return FcFalse; + } + ret = link ((char *) atomic->tmp, (char *) atomic->lck); +- if (ret < 0 && errno == EPERM) ++ if (ret < 0 && (errno == EPERM || errno == B_UNSUPPORTED)) + { + /* the filesystem where atomic->lck points to may not supports + * the hard link. so better try to fallback diff --git a/media-libs/freealut/freealut-1.1.0.bep b/media-libs/freealut/freealut-1.1.0.bep index f9c6fdb51..33cdd225b 100644 --- a/media-libs/freealut/freealut-1.1.0.bep +++ b/media-libs/freealut/freealut-1.1.0.bep @@ -11,7 +11,7 @@ BUILD { cd freealut-1.1.0 libtoolize --force --copy --install ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/freeimage/freeimage-3.15.3.bep b/media-libs/freeimage/freeimage-3.15.3.bep new file mode 100644 index 000000000..a24b5c2f4 --- /dev/null +++ b/media-libs/freeimage/freeimage-3.15.3.bep @@ -0,0 +1,24 @@ +DESCRIPTION="FreeImage is an Open Source library project for developers who would like to support popular graphics image formats like PNG, BMP, JPEG, TIFF and others as needed by today's multimedia applications" +HOMEPAGE="http://freeimage.sourceforge.net" +SRC_URI="http://downloads.sourceforge.net/freeimage/FreeImage3153.zip" +REVISION="1" +CHECKSUM_MD5="6c305b4086500ff8541c596ea6fc7cd7" +STATUS_HAIKU="stable" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +DEPEND="" +BUILD { + cd FreeImage + make -f Makefile.gnu \ + INCDIR=`finddir B_COMMON_HEADERS_DIRECTORY` \ + INSTALLDIR=`finddir B_COMMON_LIB_DIRECTORY` +} + +INSTALL { + cd FreeImage + make -f Makefile.gnu install \ + INCDIR=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` \ + INSTALLDIR=${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY` +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2003-2010 FreeImage Project" diff --git a/media-libs/freeimage/patches/freeimage-3.15.3.patch b/media-libs/freeimage/patches/freeimage-3.15.3.patch new file mode 100644 index 000000000..4f9288cbb --- /dev/null +++ b/media-libs/freeimage/patches/freeimage-3.15.3.patch @@ -0,0 +1,16 @@ +diff -Naur FreeImage/Makefile.gnu FreeImage-haiku/Makefile.gnu +--- FreeImage/Makefile.gnu 2012-03-10 19:24:28.065011712 +0000 ++++ FreeImage-haiku/Makefile.gnu 2012-08-12 16:23:37.864550912 +0000 +@@ -62,9 +62,9 @@ + + install: + install -d $(INCDIR) $(INSTALLDIR) +- install -m 644 -o root -g root $(HEADER) $(INCDIR) +- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) +- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) ++ install -m 644 $(HEADER) $(INCDIR) ++ install -m 644 $(STATICLIB) $(INSTALLDIR) ++ install -m 755 $(SHAREDLIB) $(INSTALLDIR) + ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) + ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) + # ldconfig diff --git a/media-libs/freetype/freetype-2.3.11.bep b/media-libs/freetype/freetype-2.3.11.bep index f8a474fcb..d3cf73bb5 100644 --- a/media-libs/freetype/freetype-2.3.11.bep +++ b/media-libs/freetype/freetype-2.3.11.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd freetype-2.3.11 sh ./autogen.sh - ./configure --prefix=/boot/common --includedir=/boot/develop/headers/3rdparty + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty make } diff --git a/media-libs/freetype/freetype-2.4.11.bep b/media-libs/freetype/freetype-2.4.11.bep new file mode 100644 index 000000000..eba796d93 --- /dev/null +++ b/media-libs/freetype/freetype-2.4.11.bep @@ -0,0 +1,22 @@ +DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" +HOMEPAGE="http://www.freetype.org" +SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.11.tar.bz2" +CHECKSUM_MD5="b93435488942486c8d0ca22e8f768034" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd freetype-2.4.11 + sh ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --includedir=/boot/develop/headers/3rdparty \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` + make +} + +INSTALL { + cd freetype-2.4.11 + make install +} +LICENSE="FreeType" +COPYRIGHT="1996-2013 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/freetype/freetype-2.4.2.bep b/media-libs/freetype/freetype-2.4.2.bep index 06afc9334..a8b96329f 100644 --- a/media-libs/freetype/freetype-2.4.2.bep +++ b/media-libs/freetype/freetype-2.4.2.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd freetype-2.4.2 sh ./autogen.sh - ./configure --prefix=/boot/common --includedir=/boot/develop/headers/3rdparty + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty make } diff --git a/media-libs/freetype/freetype-2.4.4.bep b/media-libs/freetype/freetype-2.4.4.bep index 65ba77d85..ea267c28f 100644 --- a/media-libs/freetype/freetype-2.4.4.bep +++ b/media-libs/freetype/freetype-2.4.4.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd freetype-2.4.4 sh ./autogen.sh - ./configure --prefix=/boot/common --includedir=/boot/develop/headers/3rdparty + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty make } diff --git a/media-libs/freetype/freetype-2.4.6.bep b/media-libs/freetype/freetype-2.4.6.bep new file mode 100644 index 000000000..fc759031f --- /dev/null +++ b/media-libs/freetype/freetype-2.4.6.bep @@ -0,0 +1,22 @@ +DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" +HOMEPAGE="http://www.freetype.org" +SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.6.tar.bz2" +CHECKSUM_MD5="5e6510613f612809d2d7862592b92ab7" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd freetype-2.4.6 + sh ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --includedir=/boot/develop/headers/3rdparty \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` + make +} + +INSTALL { + cd freetype-2.4.6 + make install +} +LICENSE="FreeType" +COPYRIGHT="1996-2011 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.bep b/media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.bep new file mode 100644 index 000000000..088c810cf --- /dev/null +++ b/media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.bep @@ -0,0 +1,22 @@ +DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" +HOMEPAGE="http://www.freetype.org" +SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2" +CHECKSUM_MD5="77a893dae81fd5b896632715ca041179" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd freetype-2.4.9 + sh ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --includedir=/boot/develop/headers/3rdparty \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` + make +} + +INSTALL { + cd freetype-2.4.9 + make install +} +LICENSE="FreeType" +COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/freetype/freetype-2.4.9.bep b/media-libs/freetype/freetype-2.4.9.bep new file mode 100644 index 000000000..088c810cf --- /dev/null +++ b/media-libs/freetype/freetype-2.4.9.bep @@ -0,0 +1,22 @@ +DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" +HOMEPAGE="http://www.freetype.org" +SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2" +CHECKSUM_MD5="77a893dae81fd5b896632715ca041179" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd freetype-2.4.9 + sh ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --includedir=/boot/develop/headers/3rdparty \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` + make +} + +INSTALL { + cd freetype-2.4.9 + make install +} +LICENSE="FreeType" +COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/freetype/patches/freetype-2.4.9-with-subpixel-rendering-enabled.patch b/media-libs/freetype/patches/freetype-2.4.9-with-subpixel-rendering-enabled.patch new file mode 100644 index 000000000..407d769c7 --- /dev/null +++ b/media-libs/freetype/patches/freetype-2.4.9-with-subpixel-rendering-enabled.patch @@ -0,0 +1,12 @@ +diff -urN freetype-2.4.9/include/freetype/config/ftoption.h freetype-2.4.9-enable-subpixel-rendering/include/freetype/config/ftoption.h +--- freetype-2.4.9/include/freetype/config/ftoption.h 2011-07-20 04:46:15.035913728 +0000 ++++ freetype-2.4.9-enable-subpixel-rendering/include/freetype/config/ftoption.h 2012-09-05 16:30:50.453509120 +0000 +@@ -92,7 +92,7 @@ + /* This is done to allow FreeType clients to run unmodified, forcing */ + /* them to display normal gray-level anti-aliased glyphs. */ + /* */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /*************************************************************************/ diff --git a/media-libs/ftgl/ftgl-2.1-svn.bep b/media-libs/ftgl/ftgl-2.1-svn.bep index ce0ec4a76..4c482e482 100644 --- a/media-libs/ftgl/ftgl-2.1-svn.bep +++ b/media-libs/ftgl/ftgl-2.1-svn.bep @@ -9,8 +9,9 @@ DEPEND="pkgconfig >= 0.23" BUILD { cd ftgl-2.1-svn libtoolize --copy --force --install + aclocal --install -I m4 ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/ftgl/ftgl-2.1.3.bep b/media-libs/ftgl/ftgl-2.1.3.bep index 61523a430..83126fce8 100644 --- a/media-libs/ftgl/ftgl-2.1.3.bep +++ b/media-libs/ftgl/ftgl-2.1.3.bep @@ -1,5 +1,5 @@ -DESCRIPTION="FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to simplify rendering fonts in OpenGL applications" -HOMEPAGE="http://sourceforge.net/projects/ftgl" +DESCRIPTION="FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to simplify rendering fonts in OpenGL applications" +HOMEPAGE="http://sourceforge.net/projects/ftgl" SRC_URI="http://downloads.sourceforge.net/project/ftgl/FTGL%20Source/2.1.3%7Erc5/ftgl-2.1.3-rc5.tar.gz" CHECKSUM_MD5="fcf4d0567b7de9875d4e99a9f7423633" REVISION="3" @@ -8,16 +8,13 @@ DEPEND="pkgconfig >= 0.23" BUILD { cd ftgl-2.1.3~rc5 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.in" libtoolize --copy --force --install - aclocal -I m4 + aclocal --install -I m4 ./autogen.sh - ./configure --prefix=/boot/common + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=$COMMON_DOCS/doc/ftgl make } diff --git a/media-libs/giflib/giflib-4.1.6.bep b/media-libs/giflib/giflib-4.1.6.bep index ea60b5a13..886c54f3f 100644 --- a/media-libs/giflib/giflib-4.1.6.bep +++ b/media-libs/giflib/giflib-4.1.6.bep @@ -1,16 +1,18 @@ DESCRIPTION="giflib - A library for processing GIFs" HOMEPAGE="http://sourceforge.net/projects/giflib/" -SRC_URI="http://sourceforge.net/projects/giflib/files/giflib%204.x/giflib-4.1.6/giflib-4.1.6.tar.bz2/download" -CHECKSUM_MD5="7125644155ae6ad33dbc9fc15a14735f" -REVISION="1" +SRC_URI="http://freefr.dl.sourceforge.net/project/giflib/giflib-4.x/giflib-4.1.6/giflib-4.1.6.tar.gz" +CHECKSUM_MD5="4ff2ecec336b9724c5190f06e8a40f9e" +REVISION="3" STATUS_HAIKU="stable" DEPEND="" BUILD { cd giflib-4.1.6 + sed -i 's#gl/gl.h#GL/gl.h#' configure.ac + sed -i 's#gl.gl.h#GL/gl.h#' lib/dev2gif.c libtoolize --force --copy --install ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/guilib/guilib-1.2.1.bep b/media-libs/guilib/guilib-1.2.1.bep index d4cef349f..c04395032 100644 --- a/media-libs/guilib/guilib-1.2.1.bep +++ b/media-libs/guilib/guilib-1.2.1.bep @@ -10,18 +10,12 @@ BUILD { rm aclocal.m4 rm acinclude.m4 echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - cp /boot/common/share/aclocal/libtool.m4 acinclude - cp /boot/common/share/aclocal/ltoptions.m4 acinclude - cp /boot/common/share/aclocal/ltversion.m4 acinclude - cp /boot/common/share/aclocal/ltsugar.m4 acinclude - cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude + libtoolize -fci + aclocal --install -I m4 ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } @@ -29,4 +23,5 @@ INSTALL { cd GUIlib-1.2.1 make install } -LICENSE="Public Domain" + +#LICENSE="Public Domain" diff --git a/media-libs/ilmbase/ilmbase-1.0.1.bep b/media-libs/ilmbase/ilmbase-1.0.1.bep index 9cd591226..72cc3fdff 100644 --- a/media-libs/ilmbase/ilmbase-1.0.1.bep +++ b/media-libs/ilmbase/ilmbase-1.0.1.bep @@ -9,7 +9,7 @@ BUILD { cd ilmbase-1.0.1 libtoolize --copy --force --install ./bootstrap - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/ilmbase/ilmbase-1.0.2.bep b/media-libs/ilmbase/ilmbase-1.0.2.bep index 26ab2ea1c..23c6197f2 100644 --- a/media-libs/ilmbase/ilmbase-1.0.2.bep +++ b/media-libs/ilmbase/ilmbase-1.0.2.bep @@ -10,7 +10,7 @@ BUILD { cd ilmbase-1.0.2 libtoolize --copy --force --install ./bootstrap - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/jasper/jasper-1.900.1.bep b/media-libs/jasper/jasper-1.900.1.bep index cef9ac0a6..9c8c58270 100644 --- a/media-libs/jasper/jasper-1.900.1.bep +++ b/media-libs/jasper/jasper-1.900.1.bep @@ -12,7 +12,7 @@ BUILD { autoconf automake chmod 777 configure - ./configure --prefix=/boot/common --enable-shared + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared make } @@ -20,5 +20,5 @@ INSTALL { cd jasper-1.900.1 make install } -LICENSE="JasPer2.0" +LICENSE="JasPer v2" COPYRIGHT="1999-2007 Michael D. Adams" diff --git a/media-libs/jasper/licenses/JasPer v2 b/media-libs/jasper/licenses/JasPer v2 new file mode 100644 index 000000000..f817ef43a --- /dev/null +++ b/media-libs/jasper/licenses/JasPer v2 @@ -0,0 +1,51 @@ +JasPer License Version 2.0 + +Copyright (c) 2001-2006 Michael David Adams +Copyright (c) 1999-2000 Image Power, Inc. +Copyright (c) 1999-2000 The University of British Columbia + +All rights reserved. + +Permission is hereby granted, free of charge, to any person (the +"User") obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, and/or sell copies of the Software, and to permit +persons to whom the Software is furnished to do so, subject to the +following conditions: + +1. The above copyright notices and this permission notice (which +includes the disclaimer below) shall be included in all copies or +substantial portions of the Software. + +2. The name of a copyright holder shall not be used to endorse or +promote products derived from the Software without specific prior +written permission. + +THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS +LICENSE. NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER +THIS DISCLAIMER. THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS +"AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING +BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO +EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. NO ASSURANCES ARE +PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE +THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY. +EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS +BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL +PROPERTY RIGHTS OR OTHERWISE. AS A CONDITION TO EXERCISING THE RIGHTS +GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE +ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY. THE SOFTWARE +IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL +SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES, +AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL +SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH +THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH, +PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH +RISK ACTIVITIES"). THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY +EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES. + diff --git a/media-libs/jbig2dec/jbig2dec-0.11.bep b/media-libs/jbig2dec/jbig2dec-0.11.bep new file mode 100644 index 000000000..96224f0ff --- /dev/null +++ b/media-libs/jbig2dec/jbig2dec-0.11.bep @@ -0,0 +1,24 @@ +DESCRIPTION="jbig2dec is a decoder implementation of the JBIG2 image compression format" +HOMEPAGE="http://jbig2dec.sourceforge.net/" +SRC_URI="http://sourceforge.net/projects/jbig2dec/files/jbig2dec/0.11/jbig2dec-0.11.tar.gz" +CHECKSUM_MD5="1f61e144852c86563fee6e5ddced63f1" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd jbig2dec-0.11 + libtoolize --force --copy --install + aclocal + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd jbig2dec-0.11 + make install +} + +LICENSE="GNU GPL v3" +COPYRIGHT="2001-2009 Artifex Software, Inc." diff --git a/media-libs/jgmod/jgmod-0.99.bep b/media-libs/jgmod/jgmod-0.99.bep index 102e2a658..07dedc4f6 100644 --- a/media-libs/jgmod/jgmod-0.99.bep +++ b/media-libs/jgmod/jgmod-0.99.bep @@ -2,12 +2,11 @@ DESCRIPTION="jgmod is a MOD music playing add-on library for Allegro" HOMEPAGE="http://guan.is-a-geek.com/jgmod/jgmod.html" COPYRIGHT="1997-2002 Guan Foo Wah" LICENSE="JGMOD" - SRC_URI="http://guan.is-a-geek.com/jgmod/jgmod.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="media-libs/allegro >= 4.4" -CHECKSUM_MD5="ecc08a8200df6a6f6073635bb092c03b" +CHECKSUM_MD5="0e6e540ffadced9283251a7f86c106fe" BUILD { cd jgmod diff --git a/media-libs/jpeg/jpeg-7.bep b/media-libs/jpeg/jpeg-7.bep index 59a31efe7..119a1b211 100644 --- a/media-libs/jpeg/jpeg-7.bep +++ b/media-libs/jpeg/jpeg-7.bep @@ -11,7 +11,7 @@ BUILD { libtoolize --force --copy --install automake --add-missing autoconf - ./configure --prefix=/boot/common --enable-shared + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared make } diff --git a/media-libs/jpeg/jpeg-8b.bep b/media-libs/jpeg/jpeg-8b.bep index 351313e8c..d25212bf5 100644 --- a/media-libs/jpeg/jpeg-8b.bep +++ b/media-libs/jpeg/jpeg-8b.bep @@ -11,7 +11,7 @@ BUILD { libtoolize --force --copy --install automake --add-missing autoconf - ./configure --prefix=/boot/common --enable-shared + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared make } diff --git a/media-libs/jpeg/jpeg-8c.bep b/media-libs/jpeg/jpeg-8c.bep index 2ac7d0f51..95a9958ce 100644 --- a/media-libs/jpeg/jpeg-8c.bep +++ b/media-libs/jpeg/jpeg-8c.bep @@ -2,7 +2,7 @@ DESCRIPTION="jpeg" HOMEPAGE="http://www.ijg.org" SRC_URI="http://www.ijg.org/files/jpegsrc.v8c.tar.gz" CHECKSUM_MD5="a2c10c04f396a9ce72894beb18b4e1f9" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" BUILD { @@ -11,7 +11,9 @@ BUILD { libtoolize --force --copy --install automake --add-missing autoconf - ./configure --prefix=/boot/common --enable-shared + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --enable-shared make } diff --git a/media-libs/jpeg/jpeg-8d.bep b/media-libs/jpeg/jpeg-8d.bep new file mode 100644 index 000000000..5a6db9b8a --- /dev/null +++ b/media-libs/jpeg/jpeg-8d.bep @@ -0,0 +1,27 @@ +DESCRIPTION="jpeg" +HOMEPAGE="http://www.ijg.org" +SRC_URI="http://www.ijg.org/files/jpegsrc.v8d.tar.gz" +CHECKSUM_MD5="52654eb3b2e60c35731ea8fc87f1bd29" +REVISION="2" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd jpeg-8d + aclocal + libtoolize --force --copy --install + automake --add-missing + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --enable-shared + make +} + +INSTALL { + cd jpeg-8d + make install +} + +LICENSE="JPEG" +COPYRIGHT="1991-2011, Thomas G. Lane, Guido Vollbeding. All Rights Reserved" + diff --git a/media-libs/jpeg/patches/jpeg-8d.patch b/media-libs/jpeg/patches/jpeg-8d.patch new file mode 100644 index 000000000..a7080547d --- /dev/null +++ b/media-libs/jpeg/patches/jpeg-8d.patch @@ -0,0 +1,24 @@ +diff -ru jpeg-8d/jpeglib.h jpeg-8d/jpeglib.h +--- jpeg-8d/jpeglib.h 2012-08-23 22:37:22.000000000 +0200 ++++ jpeg-8d/jpeglib.h 2012-01-04 23:58:28.723311670 +0100 +@@ -26,6 +26,9 @@ + #endif + #include "jmorecfg.h" /* seldom changed options */ + ++#ifdef __HAIKU__ ++#include ++#endif + + #ifdef __cplusplus + #ifndef DONT_USE_EXTERN_C +@@ -732,6 +733,10 @@ + const char * const * addon_message_table; /* Non-library errors */ + int first_addon_message; /* code for first string in addon table */ + int last_addon_message; /* code for last string in addon table */ ++ ++#ifdef __HAIKU__ ++ jmp_buf long_jump_buffer; ++#endif + }; + + diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13.bep b/media-libs/ladspa-sdk/ladspa-sdk-1.13.bep new file mode 100644 index 000000000..196f9d5ba --- /dev/null +++ b/media-libs/ladspa-sdk/ladspa-sdk-1.13.bep @@ -0,0 +1,16 @@ +DESCRIPTION="Linux Audio Developer's Simple Plugin API" +HOMEPAGE="http://www.ladspa.org/" +SRC_URI="http://www.ladspa.org/download/ladspa_sdk_1.13.tgz" +STATUS_HAIKU="stable" +COPYRIGHT="Copyright (C) 2000-2002 Richard W.E. Furse, Paul Barton-Davis, Stefan Westerfeld." +LICENSE="GNU LGPL v2.1" +REVISION="1" +CHECKSUM_MD5="671be3e1021d0722cadc7fb27054628e" +BUILD { + cd ladspa_sdk/src + make +} +INSTALL { + cd ladspa_sdk/src + make install +} diff --git a/media-libs/ladspa-sdk/patches/ladspa-sdk-1.13.patch b/media-libs/ladspa-sdk/patches/ladspa-sdk-1.13.patch new file mode 100644 index 000000000..2cb5fcf3d --- /dev/null +++ b/media-libs/ladspa-sdk/patches/ladspa-sdk-1.13.patch @@ -0,0 +1,50 @@ +diff -Naur ladspa_sdk-1.13/src/makefile ladspa_sdk-1.13-haiku/src/makefile +--- ladspa_sdk/src/makefile 2007-11-06 10:42:45.008388608 +0000 ++++ ladspa_sdk-haiku/src/makefile 2012-12-17 19:04:36.860094464 +0000 +@@ -4,9 +4,9 @@ + # + # Change these if you want to install somewhere else. + +-INSTALL_PLUGINS_DIR = /usr/lib/ladspa/ +-INSTALL_INCLUDE_DIR = /usr/include/ +-INSTALL_BINARY_DIR = /usr/bin/ ++INSTALL_PLUGINS_DIR = ${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY` ++INSTALL_INCLUDE_DIR = ${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` ++INSTALL_BINARY_DIR = ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` + + ############################################################################### + # +@@ -14,7 +14,6 @@ + # + + INCLUDES = -I. +-LIBRARIES = -ldl -lm + CFLAGS = $(INCLUDES) -Wall -Werror -O3 -fPIC + CXXFLAGS = $(CFLAGS) + PLUGINS = ../plugins/amp.so \ +@@ -46,22 +45,10 @@ + # TARGETS + # + +-test: /tmp/test.wav ../snd/noise.wav always +- @echo --------------------------------------------- +- @echo First listen to the white noise input signal: +- @echo --------------------------------------------- +- -sndfile-play ../snd/noise.wav +- @echo ------------------------- +- @echo Compare to plugin output. +- @echo ------------------------- +- @echo Should be a noise band around 6000Hz, repeated quietly after 1s. +- -sndfile-play /tmp/test.wav +- @echo Test complete. +- + install: targets +- -mkdirhier $(INSTALL_PLUGINS_DIR) +- -mkdirhier $(INSTALL_INCLUDE_DIR) +- -mkdirhier $(INSTALL_BINARY_DIR) ++ mkdir -p $(INSTALL_PLUGINS_DIR) ++ mkdir -p $(INSTALL_INCLUDE_DIR) ++ mkdir -p $(INSTALL_BINARY_DIR) + cp ../plugins/* $(INSTALL_PLUGINS_DIR) + cp ladspa.h $(INSTALL_INCLUDE_DIR) + cp ../bin/* $(INSTALL_BINARY_DIR) diff --git a/media-libs/lcms/lcms-1.18a.bep b/media-libs/lcms/lcms-1.18a.bep index c69d55306..00157df16 100644 --- a/media-libs/lcms/lcms-1.18a.bep +++ b/media-libs/lcms/lcms-1.18a.bep @@ -11,7 +11,7 @@ BUILD { aclocal automake autoconf - ./configure --prefix=/boot/common CFLAGS=-O0 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` CFLAGS=-O0 make } diff --git a/media-libs/lcms/lcms-1.19.bep b/media-libs/lcms/lcms-1.19.bep index c3b120250..3b1a1421e 100644 --- a/media-libs/lcms/lcms-1.19.bep +++ b/media-libs/lcms/lcms-1.19.bep @@ -11,7 +11,7 @@ BUILD { aclocal automake autoconf - ./configure --prefix=/boot/common CFLAGS=-O0 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` CFLAGS=-O0 make } diff --git a/media-libs/leptonica/leptonica-1.68.bep b/media-libs/leptonica/leptonica-1.68.bep new file mode 100644 index 000000000..979d047af --- /dev/null +++ b/media-libs/leptonica/leptonica-1.68.bep @@ -0,0 +1,31 @@ +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/libao/libao-1.0.0.bep b/media-libs/libao/libao-1.0.0.bep index 2e52ba1e3..65c91b962 100644 --- a/media-libs/libao/libao-1.0.0.bep +++ b/media-libs/libao/libao-1.0.0.bep @@ -11,11 +11,13 @@ BUILD { aclocal autoconf automake - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ - --mandir=$MANDIR + --datarootdir=$COMMON_DOCS \ + --mandir=$COMMON_DOCS/man make } diff --git a/media-libs/libass/libass-0.10.1.bep b/media-libs/libass/libass-0.10.1.bep new file mode 100644 index 000000000..99767580b --- /dev/null +++ b/media-libs/libass/libass-0.10.1.bep @@ -0,0 +1,24 @@ +DESCRIPTION="Library for SSA/ASS subtitles rendering" +HOMEPAGE="http://code.google.com/p/libass/" +SRC_URI="http://libass.googlecode.com/files/libass-0.10.1.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +CHECKSUM_MD5="6cace482a013a3c4bf3b31a68ac66026" +DEPEND="pkgconfig >= 0.23 + freetype >= 2.0" + +BUILD { + cd libass-0.10.1 + configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd libass-0.10.1 + make install +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="2006 Evgeniy Stepanov + 2009 Grigori Goronzy" diff --git a/media-libs/libass/libass-0.9.11.bep b/media-libs/libass/libass-0.9.11.bep new file mode 100644 index 000000000..f86497901 --- /dev/null +++ b/media-libs/libass/libass-0.9.11.bep @@ -0,0 +1,24 @@ +DESCRIPTION="Library for SSA/ASS subtitles rendering" +HOMEPAGE="http://code.google.com/p/libass/" +SRC_URI="http://libass.googlecode.com/files/libass-0.9.11.tar.bz2" +REVISION="1" +STATUS_HAIKU="stable" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +CHECKSUM_MD5="f9042884397002ba40aa89dc7d34f59f" +DEPEND="pkgconfig >= 0.23 + freetype >= 2.0" + +BUILD { + cd libass-0.9.11 + configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd libass-0.9.11 + make install +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="2006 Evgeniy Stepanov + 2009 Grigori Goronzy" diff --git a/media-libs/libbluray/libbluray-0.2.2.bep b/media-libs/libbluray/libbluray-0.2.2.bep new file mode 100644 index 000000000..2484d3694 --- /dev/null +++ b/media-libs/libbluray/libbluray-0.2.2.bep @@ -0,0 +1,25 @@ +DESCRIPTION="libbluray" +HOMEPAGE="http://www.videolan.org/developers/libbluray.html" +SRC_URI="ftp://ftp.videolan.org/pub/videolan/libbluray/0.2.2/libbluray-0.2.2.tar.bz2" +CHECKSUM_MD5="cb3254de43276861ea6b07c603f4651c" +REVISION="1" +STATUS_HAIKU="stable" +MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building." +DEPEND="" +BUILD { + cd libbluray-0.2.2 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd libbluray-0.2.2 + make install +} +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2010, hpi1 + 2010, fraxinas + 2010, John Stebbins + 2010, Joakim + 2010, Obliter0n + 2010, William Hahne" diff --git a/media-libs/libcddb/libcddb-1.3.2.bep b/media-libs/libcddb/libcddb-1.3.2.bep index 2ffef668d..43eb3b6db 100644 --- a/media-libs/libcddb/libcddb-1.3.2.bep +++ b/media-libs/libcddb/libcddb-1.3.2.bep @@ -3,7 +3,7 @@ HOMEPAGE="http://libcddb.sourceforge.net" SRC_URI="http://prdownloads.sourceforge.net/libcddb/libcddb-1.3.2.tar.bz2" REVISION="1" STATUS_HAIKU="stable" -DEPEND="" +DEPEND="gettext >= 0.18.1.1-dev" CHECKSUM_MD5="8bb4a6f542197e8e9648ae597cd6bc8a" BUILD { cd libcddb-1.3.2 diff --git a/media-libs/libcoverart/libcoverart-1.0.0.bep b/media-libs/libcoverart/libcoverart-1.0.0.bep new file mode 100644 index 000000000..6fce1e477 --- /dev/null +++ b/media-libs/libcoverart/libcoverart-1.0.0.bep @@ -0,0 +1,28 @@ +DESCRIPTION="Development library geared towards developers who wish to add cover art capabilites to their applications." +HOMEPAGE="http://" +SRC_URI="https://github.com/downloads/metabrainz/libcoverart/libcoverart-1.0.0.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/jansson >= 2.4 + net-misc/neon >= 0.29.6" +CHECKSUM_MD5="6380056bb4bc1a69790e706b4d506f50" +BUILD { + cd libcoverart-{PROJECT_VERSION} + cmake . + make +} + +INSTALL { + cd libcoverart-{PROJECT_VERSION} + make install +} + +TEST { + cd libcoverart-{PROJECT_VERSION} + make test + cd tests + ./test +} + +LICENSE="GNU LGPL v2" +COPYRIGHT="2012 Andrew Hawkins" diff --git a/media-libs/libdca/libdca-0.0.5.bep b/media-libs/libdca/libdca-0.0.5.bep index aeec2a94b..e76da1d66 100644 --- a/media-libs/libdca/libdca-0.0.5.bep +++ b/media-libs/libdca/libdca-0.0.5.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd libdca-0.0.5 ./bootstrap - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } @@ -16,3 +16,8 @@ INSTALL { cd libdca-0.0.5 make install } + +LICENSE="GNU GPL v2" +COPYRIGHT="2004 Gildas Bazin + 2000-2003 Michel Lespinasse + 1999-2000 Aaron Holtzman " diff --git a/media-libs/libdiscid/libdiscid-0.3.0.bep b/media-libs/libdiscid/libdiscid-0.3.0.bep new file mode 100644 index 000000000..8c64d1bed --- /dev/null +++ b/media-libs/libdiscid/libdiscid-0.3.0.bep @@ -0,0 +1,27 @@ +DESCRIPTION="Client library to create MusicBrainz enabled tagging applications" +HOMEPAGE="http://musicbrainz.org/doc/libdiscid" +SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/libdiscid-0.3.0.tar.gz" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="" +CHECKSUM_MD5="17e51260062b7583e5981c82cf618127" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." + +BUILD { + cd libdiscid-0.3.0 + cmake . + make +} + +INSTALL { + cd libdiscid-0.3.0 + make install +} + +TEST { + cd libdiscid-0.3.0 + make test +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2012 Andrew Hawkins" diff --git a/media-libs/libdvdcss/libdvdcss-1.2.10.bep b/media-libs/libdvdcss/libdvdcss-1.2.10.bep index 509ccc51d..fe0d6ef85 100644 --- a/media-libs/libdvdcss/libdvdcss-1.2.10.bep +++ b/media-libs/libdvdcss/libdvdcss-1.2.10.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libdvdcss/libdvdcss-1.2.12.bep b/media-libs/libdvdcss/libdvdcss-1.2.12.bep new file mode 100644 index 000000000..2b69402a5 --- /dev/null +++ b/media-libs/libdvdcss/libdvdcss-1.2.12.bep @@ -0,0 +1,21 @@ +DESCRIPTION="libdvdcss" +HOMEPAGE="http://www.videolan.org/developers/libdvdcss.html" +SRC_URI="http://download.videolan.org/pub/libdvdcss/1.2.12/libdvdcss-1.2.12.tar.bz2" +CHECKSUM_MD5="2218a193900e3203aa10dc24cdf54275" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libdvdcss-1.2.12 + libtoolize --force --copy --install + aclocal + autoconf + automake + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd libdvdcss-1.2.12 + make install +} diff --git a/media-libs/libdvdcss/patches/libdvdcss-1.2.12.patch b/media-libs/libdvdcss/patches/libdvdcss-1.2.12.patch new file mode 100644 index 000000000..ecfdd28be --- /dev/null +++ b/media-libs/libdvdcss/patches/libdvdcss-1.2.12.patch @@ -0,0 +1,12 @@ +diff -Naur libdvdcss-1.2.12/configure.ac libdvdcss-1.2.12-haiku/configure.ac +--- libdvdcss-1.2.12/configure.ac 2012-03-11 23:07:47.053739520 +0000 ++++ libdvdcss-1.2.12-haiku/configure.ac 2012-12-15 02:07:39.623378432 +0000 +@@ -35,7 +35,7 @@ + AC_DEFINE(SYS_CYGWIN, 1, Have a Cygwin system.)) + AC_DEFINE(WIN32, 1, Using Win32.) + ;; +- xbeos*) ++ xbeos*|xhaiku*) + AC_DEFINE(SYS_BEOS, 1, Have a BeOS system.) + ;; + xos2*) diff --git a/media-libs/libdvdnav/libdvdnav-4.1.3.bep b/media-libs/libdvdnav/libdvdnav-4.1.3.bep index d6932c896..ec98982b9 100644 --- a/media-libs/libdvdnav/libdvdnav-4.1.3.bep +++ b/media-libs/libdvdnav/libdvdnav-4.1.3.bep @@ -10,7 +10,7 @@ BUILD { cd libdvdnav-4.1.3 ./autogen.sh CFLAGS="-I/boot/common/include -DHAVE_DVDCSS_DVDCSS_H " \ - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.bep b/media-libs/libdvdnav/libdvdnav-4.2.0.bep new file mode 100644 index 000000000..99a06b297 --- /dev/null +++ b/media-libs/libdvdnav/libdvdnav-4.2.0.bep @@ -0,0 +1,25 @@ +DESCRIPTION="libdvdnav" +HOMEPAGE="http://www.mplayerhq.hu/design7/news.html" +SRC_URI="http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.0.tar.bz2" +CHECKSUM_MD5="53be8903f9802e101929a3451203bbf6" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/libdvdcss >= 1.20.10 + media-libs/libdvdread >= 4.2.0" +BUILD { + cd libdvdnav-4.2.0 + ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --enable-shared --enable-static + make +} + +INSTALL { + cd libdvdnav-4.2.0 + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2000 Rich Wareham + 2001-2004 the dvdnav project" diff --git a/media-libs/libdvdnav/patches/libdvdnav-4.2.0.patch b/media-libs/libdvdnav/patches/libdvdnav-4.2.0.patch new file mode 100644 index 000000000..cbe9021c4 --- /dev/null +++ b/media-libs/libdvdnav/patches/libdvdnav-4.2.0.patch @@ -0,0 +1,20 @@ +--- libdvdnav-4.2.0/configure.ac 2011-10-07 20:20:59.001572864 +0000 ++++ libdvdnav-4.2.0-haiku/configure.ac 2012-04-09 16:41:25.801112064 +0000 +@@ -143,7 +143,7 @@ + THREAD_CFLAGS="-I/usr/local/include -D_THREAD_SAFE" + CFLAGS="$THREAD_CFLAGS $CFLAGS" + ;; +- *mingw32* | *cygwin*) ++ *mingw32* | *cygwin* | *haiku*) + ;; + *) + AC_CHECK_LIB(pthread, pthread_create, +@@ -168,6 +168,8 @@ + *os2*) + LDFLAGS="-no-undefined -Zbin-files $LDFLAGS" + ;; ++ *haiku*) ++ ;; + *) + AC_CHECK_LIB(c, dlopen, + DYNAMIC_LD_LIBS="", diff --git a/media-libs/libdvdread/libdvdread-4.1.3.bep b/media-libs/libdvdread/libdvdread-4.1.3.bep index b2d8d2e2f..44e410dff 100644 --- a/media-libs/libdvdread/libdvdread-4.1.3.bep +++ b/media-libs/libdvdread/libdvdread-4.1.3.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd libdvdread-4.1.3 ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libdvdread/libdvdread-4.2.0.bep b/media-libs/libdvdread/libdvdread-4.2.0.bep new file mode 100644 index 000000000..20479a269 --- /dev/null +++ b/media-libs/libdvdread/libdvdread-4.2.0.bep @@ -0,0 +1,25 @@ +DESCRIPTION="libdvdread" +HOMEPAGE="http://www.mplayerhq.hu/design7/news.html" +SRC_URI="http://dvdnav.mplayerhq.hu/releases/libdvdread-4.2.0.tar.bz2" +CHECKSUM_MD5="ab7a19d3ab1a437ae754ef477d6231a4" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libdvdread-4.2.0 + ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --enable-shared --enable-static + make +} + +INSTALL { + cd libdvdread-4.2.0 + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="1998-1999 Eric Smith + 2000-2002 Björn Englund + 2000-2003 Håkan Hjort, et al." diff --git a/media-libs/libdvdread/libdvdread-svn1168.bep b/media-libs/libdvdread/libdvdread-svn1168.bep index 79c12aa0e..01b1a3b6c 100644 --- a/media-libs/libdvdread/libdvdread-svn1168.bep +++ b/media-libs/libdvdread/libdvdread-svn1168.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libdvdread/libdvdread-svn1226.bep b/media-libs/libdvdread/libdvdread-svn1226.bep new file mode 100644 index 000000000..3315cd103 --- /dev/null +++ b/media-libs/libdvdread/libdvdread-svn1226.bep @@ -0,0 +1,23 @@ +DESCRIPTION="libdvdread is a library for DVD navigation tools" +HOMEPAGE="http://mplayerhq.hu" +SRC_URI="http://download.m0k.org/handbrake/contrib/libdvdread-svn1168.tar.gz" +CHECKSUM_MD5="39cb0b27cc6b05e4f5c849dececf1f7a" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libdvdread + svn up -r 1226 + libtoolize --force --copy --install + aclocal + autoconf + ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` + make +} + +INSTALL { + cd libdvdread + make install +} diff --git a/media-libs/libdvdread/patches/libdvdread-4.2.0.patch b/media-libs/libdvdread/patches/libdvdread-4.2.0.patch new file mode 100644 index 000000000..7ca237fcc --- /dev/null +++ b/media-libs/libdvdread/patches/libdvdread-4.2.0.patch @@ -0,0 +1,22 @@ +--- libdvdread-4.2.0/configure.ac 2011-10-07 20:20:59.008912896 +0000 ++++ libdvdread-4.2.0-haiku/configure.ac 2012-04-09 16:22:42.155713536 +0000 +@@ -148,6 +148,8 @@ + *os2*) + LDFLAGS="-no-undefined -Zbin-files $LDFLAGS" + ;; ++ *haiku*) ++ ;; + *) + AC_CHECK_LIB(c, dlopen, + DYNAMIC_LD_LIBS="", +--- libdvdread-4.2.0/src/bswap.h 2008-10-09 22:04:24.005242880 +0000 ++++ libdvdread-4.2.0-haiku/src/bswap.h 2012-04-09 16:24:41.829947904 +0000 +@@ -73,7 +73,7 @@ + * functionality! + */ + +-#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__) ++#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__)|| defined(__HAIKU__) + #define B2N_16(x) \ + x = ((((x) & 0xff00) >> 8) | \ + (((x) & 0x00ff) << 8)) diff --git a/media-libs/libdvdread/patches/libdvdread-svn1168.patch b/media-libs/libdvdread/patches/libdvdread-svn1168.patch new file mode 100644 index 000000000..f92ea62f7 --- /dev/null +++ b/media-libs/libdvdread/patches/libdvdread-svn1168.patch @@ -0,0 +1,26 @@ +Index: libdvdread/src/bswap.h +=================================================================== +--- libdvdread/src/bswap.h (revision 1168) ++++ libdvdread/src/bswap.h (working copy) +@@ -73,7 +73,7 @@ + * functionality! + */ + +-#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__) ++#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__HAIKU__) || defined(__OS2__) + #define B2N_16(x) \ + x = ((((x) & 0xff00) >> 8) | \ + (((x) & 0x00ff) << 8)) +Index: configure.ac +=================================================================== +--- libdvdread/configure.ac (revision 1168) ++++ libdvdread/configure.ac (working copy) +@@ -148,6 +148,8 @@ + *os2*) + LDFLAGS="-no-undefined -Zbin-files $LDFLAGS" + ;; ++ *haiku*) ++ ;; + *) + AC_CHECK_LIB(c, dlopen, + DYNAMIC_LD_LIBS="", diff --git a/media-libs/libdvdread/patches/libdvdread-svn1226.patch b/media-libs/libdvdread/patches/libdvdread-svn1226.patch new file mode 100644 index 000000000..345fb9cea --- /dev/null +++ b/media-libs/libdvdread/patches/libdvdread-svn1226.patch @@ -0,0 +1,26 @@ +Index: libdvdread/src/bswap.h +=================================================================== +--- libdvdread/src/bswap.h (revision 1226) ++++ libdvdread/src/bswap.h (working copy) +@@ -73,7 +73,7 @@ + * functionality! + */ + +-#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__) ++#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__HAIKU__) || defined(__OS2__) + #define B2N_16(x) \ + x = ((((x) & 0xff00) >> 8) | \ + (((x) & 0x00ff) << 8)) +Index: configure.ac +=================================================================== +--- libdvdread/configure.ac (revision 1226) ++++ libdvdread/configure.ac (working copy) +@@ -148,6 +148,8 @@ + *os2*) + LDFLAGS="-no-undefined -Zbin-files $LDFLAGS" + ;; ++ *haiku*) ++ ;; + *) + AC_CHECK_LIB(c, dlopen, + DYNAMIC_LD_LIBS="", diff --git a/media-libs/liblo/liblo-0.26.bep b/media-libs/liblo/liblo-0.26.bep new file mode 100644 index 000000000..7463fae96 --- /dev/null +++ b/media-libs/liblo/liblo-0.26.bep @@ -0,0 +1,27 @@ +DESCRIPTION="Lightweight OSC (Open Sound Control) Implementation" +HOMEPAGE="http://liblo.sourceforge.net/" +SRC_URI="http://downloads.sourceforge.net/liblo/liblo-0.26.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +CHECKSUM_MD5="5351de14262560e15e7f23865293b16f" +BUILD { + cd liblo-0.26 + libtoolize --force --copy --install + aclocal + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd liblo-0.26 + make install DESTDIR="${DESTDIR}" +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2008-2009 Stephen Sinclair + 2008 Kentaro Fukuchi + 2005-2008 Nicholas Humfrey + 2005 Martin Habets + 2005-2006 Steve Harris" + diff --git a/media-libs/liblo/patch/liblo-0.26.patch b/media-libs/liblo/patch/liblo-0.26.patch new file mode 100644 index 000000000..1adad275e --- /dev/null +++ b/media-libs/liblo/patch/liblo-0.26.patch @@ -0,0 +1,105 @@ +diff -aur liblo-0.26/liblo.pc.in liblo-0.26_Haiku/liblo.pc.in +--- liblo-0.26/liblo.pc.in 2008-06-02 19:10:42.012845056 -0700 ++++ liblo-0.26_Haiku/liblo.pc.in 2012-05-15 16:42:17.135528448 -0700 +@@ -6,5 +6,5 @@ + Name: liblo + Version: @PACKAGE_VERSION@ + Description: A lightweight OSC server/client library +-Libs: -L${libdir} -llo -lpthread ++Libs: -L${libdir} -llo + Cflags: -I${includedir} +diff -aur liblo-0.26/src/Makefile.am liblo-0.26_Haiku/src/Makefile.am +--- liblo-0.26/src/Makefile.am 2009-03-07 09:09:52.017825792 -0800 ++++ liblo-0.26_Haiku/src/Makefile.am 2012-05-15 16:35:36.973340672 -0700 +@@ -13,7 +13,7 @@ + + liblo_la_CFLAGS = -Wall -I$(top_srcdir) + liblo_la_SOURCES = $(SOURCE_FILES) +-liblo_la_LIBADD = -lpthread ++liblo_la_LIBADD = + liblo_la_LDFLAGS = -export-dynamic -version-info @LO_SO_VERSION@ + + noinst_PROGRAMS = testlo subtest +diff -aur liblo-0.26/src/server.c liblo-0.26_Haiku/src/server.c +--- liblo-0.26/src/server.c 2009-03-05 23:09:26.018087936 -0800 ++++ liblo-0.26_Haiku/src/server.c 2012-05-15 16:31:29.817627136 -0700 +@@ -958,44 +960,44 @@ + + //inet_ntop(s->addr.ss_family, &s->addr.padding, hostname, sizeof(hostname)); + if (s->protocol == LO_UDP && s->addr_len>0) { +- err = getnameinfo((struct sockaddr *)&s->addr, sizeof(s->addr), +- hostname, sizeof(hostname), portname, sizeof(portname), +- NI_NUMERICHOST | NI_NUMERICSERV); +- if (err) { +- switch (err) { +- case EAI_AGAIN: +- lo_throw(s, err, "Try again", path); +- break; +- case EAI_BADFLAGS: +- lo_throw(s, err, "Bad flags", path); +- break; +- case EAI_FAIL: +- lo_throw(s, err, "Failed", path); +- break; +- case EAI_FAMILY: +- lo_throw(s, err, "Cannot resolve address family", path); +- break; +- case EAI_MEMORY: +- lo_throw(s, err, "Out of memory", path); +- break; +- case EAI_NONAME: +- lo_throw(s, err, "Cannot resolve", path); +- break; ++ err = getnameinfo((struct sockaddr *)&s->addr, sizeof(struct sockaddr), ++ hostname, sizeof(hostname), portname, sizeof(portname), ++ NI_NUMERICHOST | NI_NUMERICSERV); ++ if (err) { ++ switch (err) { ++ case EAI_AGAIN: ++ lo_throw(s, err, "Try again", path); ++ break; ++ case EAI_BADFLAGS: ++ lo_throw(s, err, "Bad flags", path); ++ break; ++ case EAI_FAIL: ++ lo_throw(s, err, "Failed", path); ++ break; ++ case EAI_FAMILY: ++ lo_throw(s, err, "Cannot resolve address family", path); ++ break; ++ case EAI_MEMORY: ++ lo_throw(s, err, "Out of memory", path); ++ break; ++ case EAI_NONAME: ++ lo_throw(s, err, "Cannot resolve", path); ++ break; + #ifndef WIN32 +- case EAI_SYSTEM: +- lo_throw(s, err, strerror(err), path); +- break; +-#endif +- default: +- lo_throw(s, err, "Unknown error", path); +- break; +- } ++ case EAI_SYSTEM: ++ lo_throw(s, err, strerror(err), path); ++ break; ++#endif ++ default: ++ lo_throw(s, err, "Unknown error", path); ++ break; ++ } + +- return; +- } ++ return; ++ } + } else { +- hostname[0] = '\0'; +- portname[0] = '\0'; ++ hostname[0] = '\0'; ++ portname[0] = '\0'; + } + + diff --git a/media-libs/libmad/libmad-0.15.1.bep b/media-libs/libmad/libmad-0.15.1b.bep similarity index 91% rename from media-libs/libmad/libmad-0.15.1.bep rename to media-libs/libmad/libmad-0.15.1b.bep index 37c6a0c5b..ce4468e5c 100644 --- a/media-libs/libmad/libmad-0.15.1.bep +++ b/media-libs/libmad/libmad-0.15.1b.bep @@ -9,6 +9,7 @@ BUILD { cd libmad-0.15.1b libtoolize --force --copy --install aclocal + sed -i 's/$optimize -fforce-mem/$optimize/g' configure.ac autoconf MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` diff --git a/media-libs/libmikmod/libmikmod-3.1.11.bep b/media-libs/libmikmod/libmikmod-3.1.11.bep index 75b125d28..086377bf7 100644 --- a/media-libs/libmikmod/libmikmod-3.1.11.bep +++ b/media-libs/libmikmod/libmikmod-3.1.11.bep @@ -10,17 +10,16 @@ BUILD { rm aclocal.m4 echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in libtoolize --force --copy --install - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 - aclocal -I m4 + aclocal --install -I m4 autoconf automake --add-missing + DATADIR=`finddir B_COMMON_DATA_DIRECTORY` + INFODIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=$DATADIR \ + --infodir=$INFODIR \ --libdir=$LIBDIR \ --mandir=$MANDIR make @@ -30,5 +29,6 @@ INSTALL { cd libmikmod-3.1.11 make install } + LICENSE="GNU LGPL v2.1" COPYRIGHT="1998-2004 Jean-Paul Mikkers, Jake Stine, Frank Loemker, Steve McIntyre, Peter Amstutz, and Miodrag Vallat." diff --git a/media-libs/libmms/libmms-0.5.bep b/media-libs/libmms/libmms-0.5.bep index 1da705060..9b8ec7c26 100644 --- a/media-libs/libmms/libmms-0.5.bep +++ b/media-libs/libmms/libmms-0.5.bep @@ -9,7 +9,7 @@ DEPEND="dev-libs/glib >= 2.0" BUILD { cd libmms-0.5 ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libmng/libmng-1.0.10.bep b/media-libs/libmng/libmng-1.0.10.bep index 2efcd067e..1b61ed321 100644 --- a/media-libs/libmng/libmng-1.0.10.bep +++ b/media-libs/libmng/libmng-1.0.10.bep @@ -13,7 +13,7 @@ BUILD { libtoolize --force --copy --install aclocal ./autogen.sh -# ./configure --prefix=/boot/common \ +# ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ # LDFLAGS=-L/boot/common/lib \ # CPPFLAGS=-I/boot/common/include MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man diff --git a/media-libs/libmodplug/libmodplug-0.8.8.4.bep b/media-libs/libmodplug/libmodplug-0.8.8.4.bep new file mode 100644 index 000000000..183c2df62 --- /dev/null +++ b/media-libs/libmodplug/libmodplug-0.8.8.4.bep @@ -0,0 +1,29 @@ +DESCRIPTION="libmodplug is a lib for playing mod files" +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libmodplug-0.8.8.4 + libtoolize --force --copy --install + aclocal + autoconf + automake + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR \ + --enable-static + make +} + +INSTALL { + cd libmodplug-0.8.8.4 + make install +} + +LICENSE="Public Domain" +#COPYRIGHT="" diff --git a/media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.bep b/media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.bep new file mode 100644 index 000000000..21da355c1 --- /dev/null +++ b/media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.bep @@ -0,0 +1,19 @@ +DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats" +HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/" +SRC_URI="git://git.netsurf-browser.org/libnsbmp.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/buildsystem >= 0" + +BUILD { + cd libnsbmp-0.0.3-HEAD + make PREFIX=/boot/common +} + +INSTALL { + cd libnsbmp-0.0.3-HEAD + make install PREFIX=/boot/common +} + +LICENSE="MIT" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/media-libs/libnsbmp/libnsbmp-0.0.3.bep b/media-libs/libnsbmp/libnsbmp-0.0.3.bep new file mode 100644 index 000000000..dea51e029 --- /dev/null +++ b/media-libs/libnsbmp/libnsbmp-0.0.3.bep @@ -0,0 +1,18 @@ +DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats" +HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/" +SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-0.0.3-src.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" + +BUILD { + cd libnsbmp-0.0.3 + make +} + +INSTALL { + cd libnsbmp-0.0.3 + make install +} + +LICENSE="MIT" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/media-libs/libnsgif/libnsgif-0.0.3.bep b/media-libs/libnsgif/libnsgif-0.0.3.bep new file mode 100644 index 000000000..e5598c573 --- /dev/null +++ b/media-libs/libnsgif/libnsgif-0.0.3.bep @@ -0,0 +1,18 @@ +DESCRIPTION="Libnsgif is a decoding library for the GIF image file format" +HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/" +SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-0.0.3-src.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" + +BUILD { + cd libnsgif-0.0.3 + make +} + +INSTALL { + cd libnsgif-0.0.3 + make install +} + +LICENSE="MIT" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/media-libs/libogg/libogg-1.1.4.bep b/media-libs/libogg/libogg-1.1.4.bep index 61194c661..2859a806d 100644 --- a/media-libs/libogg/libogg-1.1.4.bep +++ b/media-libs/libogg/libogg-1.1.4.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libogg/libogg-1.2.0.bep b/media-libs/libogg/libogg-1.2.0.bep index e60cca9a4..b82d6c503 100644 --- a/media-libs/libogg/libogg-1.2.0.bep +++ b/media-libs/libogg/libogg-1.2.0.bep @@ -9,13 +9,11 @@ BUILD { cd libogg-1.2.0 rm aclocal.m4 mkdir -p m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 libtoolize --force --copy --install echo 'AC_CONFIG_MACRO_DIR([m4]) >> configure.in' - libtoolize --force --copy --install - aclocal -I m4 + aclocal --install -I m4 autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } @@ -23,5 +21,6 @@ INSTALL { cd libogg-1.2.0 make install } + LICENSE="BSD (3-clause)" COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libogg/libogg-1.2.2.bep b/media-libs/libogg/libogg-1.2.2.bep index 182564880..f1828f98e 100644 --- a/media-libs/libogg/libogg-1.2.2.bep +++ b/media-libs/libogg/libogg-1.2.2.bep @@ -9,13 +9,17 @@ BUILD { cd libogg-1.2.2 rm aclocal.m4 mkdir -p m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - libtoolize --force --copy --install + cp `aclocal --print-ac-dir`/ltversion.m4 m4 + libtoolize -fci echo 'AC_CONFIG_MACRO_DIR([m4]) >> configure.in' - libtoolize --force --copy --install - aclocal -I m4 + libtoolize -fci + aclocal --install -I m4 autoconf - ./configure --prefix=/boot/common + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' Make* + sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' src/Make* + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=$COMMON_DOCS make } @@ -23,5 +27,6 @@ INSTALL { cd libogg-1.2.2 make install } + LICENSE="BSD (3-clause)" COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libogg/libogg-1.3.0.bep b/media-libs/libogg/libogg-1.3.0.bep new file mode 100644 index 000000000..ed2ac6726 --- /dev/null +++ b/media-libs/libogg/libogg-1.3.0.bep @@ -0,0 +1,22 @@ +DESCRIPTION="libogg" +HOMEPAGE="http://www.xiph.org" +SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.gz" +CHECKSUM_MD5="0a7eb40b86ac050db3a789ab65fe21c2" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libogg-1.3.0 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=$COMMON_DOCS + make +} + +INSTALL { + cd libogg-1.3.0 + make install +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="1994-2011 Xiph.Org Foundation" diff --git a/media-libs/libpng/libpng-1.2.29.bep b/media-libs/libpng/libpng-1.2.29.bep index 753198c7f..3115d3d32 100644 --- a/media-libs/libpng/libpng-1.2.29.bep +++ b/media-libs/libpng/libpng-1.2.29.bep @@ -7,7 +7,7 @@ DEPEND="" BUILD { cd libpng-1.2.29 ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libpng/libpng-1.2.30.bep b/media-libs/libpng/libpng-1.2.30.bep index fcd7678f9..bed0800f5 100644 --- a/media-libs/libpng/libpng-1.2.30.bep +++ b/media-libs/libpng/libpng-1.2.30.bep @@ -10,7 +10,7 @@ BUILD { cp /boot/common/share/libtool/config.sub libtoolize --force --copy ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libpng/libpng-1.2.40.bep b/media-libs/libpng/libpng-1.2.40.bep index b8068c8c4..e43975616 100644 --- a/media-libs/libpng/libpng-1.2.40.bep +++ b/media-libs/libpng/libpng-1.2.40.bep @@ -9,7 +9,7 @@ BUILD { cd libpng-1.2.40 libtoolize --force --copy ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libpng/libpng-1.2.41.bep b/media-libs/libpng/libpng-1.2.41.bep index c234b6bd3..f18fd1c07 100644 --- a/media-libs/libpng/libpng-1.2.41.bep +++ b/media-libs/libpng/libpng-1.2.41.bep @@ -9,7 +9,7 @@ BUILD { cd libpng-1.2.41 libtoolize --force --copy ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libpng/libpng-1.2.43.bep b/media-libs/libpng/libpng-1.2.43.bep index b1799be79..869e467ce 100644 --- a/media-libs/libpng/libpng-1.2.43.bep +++ b/media-libs/libpng/libpng-1.2.43.bep @@ -9,7 +9,7 @@ BUILD { cd libpng-1.2.43 libtoolize --force --copy ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libpng/libpng-1.2.44.bep b/media-libs/libpng/libpng-1.2.44.bep index fc7140bb6..2a9d84070 100644 --- a/media-libs/libpng/libpng-1.2.44.bep +++ b/media-libs/libpng/libpng-1.2.44.bep @@ -9,7 +9,7 @@ BUILD { cd libpng-1.2.44 libtoolize --force --copy ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libpng/libpng-1.2.46.bep b/media-libs/libpng/libpng-1.2.46.bep new file mode 100644 index 000000000..9917b9c14 --- /dev/null +++ b/media-libs/libpng/libpng-1.2.46.bep @@ -0,0 +1,23 @@ +DESCRIPTION="libpng" +HOMEPAGE="http://www.libpng.org" +SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.2.46.tar.gz?download" +CHECKSUM_MD5="03ddfc17ad321db93f984581e9415d22" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libpng-1.2.46 + libtoolize --force --copy + ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd libpng-1.2.46 + make install +} +LICENSE="LibPNG" +COPYRIGHT="1998-2011 Glenn Randers-Pehrson + 1996-1997 Andreas Dilger + 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.4.1.bep b/media-libs/libpng/libpng-1.4.1.bep index bbda2e3ac..d5c4a7bc7 100644 --- a/media-libs/libpng/libpng-1.4.1.bep +++ b/media-libs/libpng/libpng-1.4.1.bep @@ -9,7 +9,7 @@ BUILD { cd libpng-1.4.1 libtoolize --force --copy ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libpng/libpng-1.4.2.bep b/media-libs/libpng/libpng-1.4.2.bep index 259663fed..72bb98aae 100644 --- a/media-libs/libpng/libpng-1.4.2.bep +++ b/media-libs/libpng/libpng-1.4.2.bep @@ -14,7 +14,7 @@ BUILD { cd libpng-1.4.2 libtoolize --force --copy ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libpng/libpng-1.4.3.bep b/media-libs/libpng/libpng-1.4.3.bep index 64b28e178..dd7d1af3f 100644 --- a/media-libs/libpng/libpng-1.4.3.bep +++ b/media-libs/libpng/libpng-1.4.3.bep @@ -14,7 +14,7 @@ BUILD { cd libpng-1.4.3 libtoolize --force --copy ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libpng/libpng-1.4.4.bep b/media-libs/libpng/libpng-1.4.4.bep index aef563ec2..7950fef2c 100644 --- a/media-libs/libpng/libpng-1.4.4.bep +++ b/media-libs/libpng/libpng-1.4.4.bep @@ -14,7 +14,7 @@ BUILD { cd libpng-1.4.4 libtoolize --force --copy ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libpng/libpng-1.5.0.bep b/media-libs/libpng/libpng-1.5.0.bep index 1067a1923..e8a1f7ac7 100644 --- a/media-libs/libpng/libpng-1.5.0.bep +++ b/media-libs/libpng/libpng-1.5.0.bep @@ -14,7 +14,8 @@ BUILD { cd libpng-1.5.0 libtoolize --force --copy ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } diff --git a/media-libs/libpng/libpng-1.5.12.bep b/media-libs/libpng/libpng-1.5.12.bep new file mode 100644 index 000000000..6afaf8263 --- /dev/null +++ b/media-libs/libpng/libpng-1.5.12.bep @@ -0,0 +1,25 @@ +DESCRIPTION="libpng" +HOMEPAGE="http://www.libpng.org" +COPYRIGHT="1998-2011 Glenn Randers-Pehrson + 1996-1997 Andreas Dilger + 1995-1996 Guy Eric Schalnat, Group 42, Inc." +LICENSE="LibPNG" + +SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.12.tar.gz?download" +CHECKSUM_MD5="8ea7f60347a306c5faf70b977fa80e28" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libpng-1.5.12 + libtoolize --force --copy + ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd libpng-1.5.12 + make install +} diff --git a/media-libs/libpng/libpng-1.5.13.bep b/media-libs/libpng/libpng-1.5.13.bep new file mode 100644 index 000000000..89333093c --- /dev/null +++ b/media-libs/libpng/libpng-1.5.13.bep @@ -0,0 +1,30 @@ +DESCRIPTION="Portable Network Graghpics library" +HOMEPAGE="http://www.libpng.org" +SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.13.tar.gz?download" +CHECKSUM_MD5="9c5a584d4eb5fe40d0f1bc2090112c65" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libpng-1.5.13 + libtoolize --force --copy + ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd libpng-1.5.13 + make install +} + +TEST { + cd libpng-1.5.13 + make test +} + +COPYRIGHT="1998-2012 Glenn Randers-Pehrson + 1996-1997 Andreas Dilger + 1995-1996 Guy Eric Schalnat, Group 42, Inc." +LICENSE="LibPNG" diff --git a/media-libs/libpng/libpng-1.5.2.bep b/media-libs/libpng/libpng-1.5.2.bep new file mode 100644 index 000000000..ceba7bf1a --- /dev/null +++ b/media-libs/libpng/libpng-1.5.2.bep @@ -0,0 +1,25 @@ +DESCRIPTION="libpng" +HOMEPAGE="http://www.libpng.org" +COPYRIGHT="1998-2011 Glenn Randers-Pehrson + 1996-1997 Andreas Dilger + 1995-1996 Guy Eric Schalnat, Group 42, Inc." +LICENSE="LibPNG" + +SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.2.tar.gz?download" +CHECKSUM_MD5="31d448eb93a1646359a23f1b23434ab3" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libpng-1.5.2 + libtoolize --force --copy + ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd libpng-1.5.2 + make install +} diff --git a/media-libs/libpng/libpng-1.5.4.bep b/media-libs/libpng/libpng-1.5.4.bep new file mode 100644 index 000000000..3cec3fe68 --- /dev/null +++ b/media-libs/libpng/libpng-1.5.4.bep @@ -0,0 +1,25 @@ +DESCRIPTION="libpng" +HOMEPAGE="http://www.libpng.org" +COPYRIGHT="1998-2011 Glenn Randers-Pehrson + 1996-1997 Andreas Dilger + 1995-1996 Guy Eric Schalnat, Group 42, Inc." +LICENSE="LibPNG" + +SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.4.tar.gz?download" +CHECKSUM_MD5="dea4d1fd671160424923e92ff0cdda78" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libpng-1.5.4 + libtoolize --force --copy + ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd libpng-1.5.4 + make install +} diff --git a/media-libs/libpng/libpng-1.5.7.bep b/media-libs/libpng/libpng-1.5.7.bep new file mode 100644 index 000000000..5c86a6209 --- /dev/null +++ b/media-libs/libpng/libpng-1.5.7.bep @@ -0,0 +1,25 @@ +DESCRIPTION="libpng" +HOMEPAGE="http://www.libpng.org" +COPYRIGHT="1998-2011 Glenn Randers-Pehrson + 1996-1997 Andreas Dilger + 1995-1996 Guy Eric Schalnat, Group 42, Inc." +LICENSE="LibPNG" + +SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.7.tar.gz?download" +CHECKSUM_MD5="944b56a84b65d94054cc73d7ff965de8" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libpng-1.5.7 + libtoolize --force --copy + ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd libpng-1.5.7 + make install +} diff --git a/media-libs/libsamplerate/libsamplerate-0.1.8.bep b/media-libs/libsamplerate/libsamplerate-0.1.8.bep new file mode 100644 index 000000000..fb08c551e --- /dev/null +++ b/media-libs/libsamplerate/libsamplerate-0.1.8.bep @@ -0,0 +1,21 @@ +DESCRIPTION="libsamplerate" +HOMEPAGE="http://www.mega-nerd.com/SRC/" +COPYRIGHT="Copyright (C) 2002-2011 Erik de Castro Lopo " +LICENSE="GNU GPL v2" + +SRC_URI="http://www.mega-nerd.com/SRC/libsamplerate-0.1.8.tar.gz" +CHECKSUM_MD5="1c7fb25191b4e6e3628d198a66a84f47" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libsamplerate-0.1.8 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd libsamplerate-0.1.8 + make install +} diff --git a/media-libs/libsdl/libsdl-1.2-hg.bep b/media-libs/libsdl/libsdl-1.2-hg.bep index d2148dd3d..217a36dae 100644 --- a/media-libs/libsdl/libsdl-1.2-hg.bep +++ b/media-libs/libsdl/libsdl-1.2-hg.bep @@ -7,28 +7,26 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd libsdl-1.2-hg - ./autogen.sh - rm aclocal.m4 - echo "AC_CONFIG_MACRO_DIR([acinclude])" >> configure.in - libtoolize --force --copy --install - aclocal -I acinclude + cp `aclocal --print-ac-dir`/libtool.m4 acinclude ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR + cp /boot/common/bin/libtool . make } INSTALL { cd libsdl-1.2-hg make install + cp ../../sdl-config `which sdl-config` } TEST { cd libsdl-1.2-hg/test - autogen.sh ./configure make echo testvidoinfo diff --git a/media-libs/libsdl/libsdl-1.2.14.bep b/media-libs/libsdl/libsdl-1.2.14.bep index 308e19e8c..68e0ae7dd 100644 --- a/media-libs/libsdl/libsdl-1.2.14.bep +++ b/media-libs/libsdl/libsdl-1.2.14.bep @@ -10,16 +10,19 @@ BUILD { ./autogen.sh rm aclocal.m4 echo "AC_CONFIG_MACRO_DIR([acinclude])" >> configure.in - libtoolize --force --copy --install + libtoolize -fci aclocal -I acinclude ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } INSTALL { cd SDL-1.2.14 make install + } LICENSE="GNU LGPL v2.1" COPYRIGHT="1997-2009 Sam Lantinga" diff --git a/media-libs/libsdl/libsdl-1.2.15.bep b/media-libs/libsdl/libsdl-1.2.15.bep new file mode 100644 index 000000000..7618b080a --- /dev/null +++ b/media-libs/libsdl/libsdl-1.2.15.bep @@ -0,0 +1,101 @@ +DESCRIPTION="Simple Direct Media Layer" +HOMEPAGE="http://www.libsdl.org/" +SRC_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz" +CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd SDL-1.2.15 + ./autogen.sh + rm aclocal.m4 + echo "AC_CONFIG_MACRO_DIR([acinclude])" >> configure.in + libtoolize -fci + aclocal -I acinclude + ./autogen.sh + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR + make +} + +INSTALL { + cd SDL-1.2.15 + make install +} + +TEST { + cd SDL-1.2.15/test + ./configure + make + echo testvidoinfo + testvidinfo + echo testgl + testgl + echo testwm + testwm + echo testhread + testhread + echo testsprite + testsprite + echo testdyngl + testdyngl + echo testoverlay + testoverlay + echo testoverlay2 + testoverlay2 + echo threadwin + threadwin + echo testalpha + testalpha + echo testiconv + testiconv + echo testtimer + testtimer + echo graywin + graywin + echo testerror + testerror + echo torturethread + torturethread + echo testbitmap + testbitmap + echo testjoystick + testjoystick + echo testver + testver + echo testfile + testfile + echo testpalette + testpalette + echo loopwave + loopwave + echo testblitspeed + testblitspeed + echo testkeys + testkeys + echo testcursor + testcursor + echo checkkeys + checkkeys + echo testgamma + testgamma + echo testplatform + testplatform + echo testcdrom + testcdrom + echo testloadso + testloadso + echo testwim + testwin + echo testsem + testsem + echo testlock + testlock +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/libsdl/libsdl-1.3-gsoc.bep b/media-libs/libsdl/libsdl-1.3-gsoc.bep new file mode 100644 index 000000000..7d5af823c --- /dev/null +++ b/media-libs/libsdl/libsdl-1.3-gsoc.bep @@ -0,0 +1,33 @@ +DESCRIPTION="Simple Direct Media Layer" +HOMEPAGE="http://www.libsdl.org/" +SRC_URI="hg+http://bitbucket.org/antifinidictor/haiku-sdl-1.3" +#CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4" +REVISION="1" +STATUS_HAIKU="broken" +MESSAGE="This is a work in progress and not ready for release." +DEPEND="" +BUILD { + cd libsdl-1.3-gsoc + ./autogen.sh + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR + make +} + +INSTALL { + cd libsdl-1.3-gsoc + make install +} + +TEST { + cd libsdl-1.3-gsoc/test + ./autogen + ./configure + make +} + +LICENSE="Zlib" +COPYRIGHT="1997-2011 Sam Lantinga" diff --git a/media-libs/libsdl/libsdl-1.3-hg.bep b/media-libs/libsdl/libsdl-1.3-hg.bep deleted file mode 100644 index 37763a8ee..000000000 --- a/media-libs/libsdl/libsdl-1.3-hg.bep +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org/" -SRC_URI="hg+http://hg.libsdl.org/SDL" -#CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4" -REVISION="1" -STATUS_HAIKU="broken" -MESSAGE="bwindow support does not yet exist for libsdl-1.3, patches welcome" -DEPEND="" -BUILD { - cd libsdl-1.3-hg - ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make -} - -INSTALL { - cd libsdl-1.3-hg - make install -} -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1997-2010 Sam Lantinga" diff --git a/media-libs/libsdl/libsdl-2.0-hg-cmake.bep b/media-libs/libsdl/libsdl-2.0-hg-cmake.bep new file mode 100644 index 000000000..5ff197a01 --- /dev/null +++ b/media-libs/libsdl/libsdl-2.0-hg-cmake.bep @@ -0,0 +1,28 @@ +DESCRIPTION="Simple Direct Media Layer" +HOMEPAGE="http://www.libsdl.org/" +SRC_URI="hg+http://hg.libsdl.org/SDL" +#CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4" +REVISION="1" +STATUS_HAIKU="unstable" +DEPEND="" +BUILD { + cd libsdl-2.0-hg-cmake +# MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man +# LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` +# DATADIR=`finddir B_COMMON_DATA_DIRECTORY` +# mkdir build_haiku +# cd build_haiku +# ../configure --prefix=`finddir B_COMMON_DIRECTORY` \ +# --libdir=$LIBDIR \ +# --mandir=$MANDIR \ +# --datadir=$DATADIR + cmake . + make +} + +INSTALL { + cd libsdl-2.0-hg-cmake + make install +} +LICENSE="Zlib" +COPYRIGHT="1997-2013 Sam Lantinga" diff --git a/media-libs/libsdl/libsdl-2.0-hg.bep b/media-libs/libsdl/libsdl-2.0-hg.bep new file mode 100644 index 000000000..502f3163f --- /dev/null +++ b/media-libs/libsdl/libsdl-2.0-hg.bep @@ -0,0 +1,27 @@ +DESCRIPTION="Simple Direct Media Layer" +HOMEPAGE="http://www.libsdl.org/" +SRC_URI="hg+http://hg.libsdl.org/SDL" +#CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4" +REVISION="1" +STATUS_HAIKU="unstable" +DEPEND="" +BUILD { + cd libsdl-2.0-hg + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + DATADIR=`finddir B_COMMON_DATA_DIRECTORY` + mkdir build_haiku + cd build_haiku + ../configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR \ + --datadir=$DATADIR + make +} + +INSTALL { + cd libsdl-2.0-hg/build_haiku + make install +} +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/libsdl/patches/libsdl-1.2-hg.patch b/media-libs/libsdl/patches/libsdl-1.2-hg.patch index 9cd66e8a5..acc475381 100644 --- a/media-libs/libsdl/patches/libsdl-1.2-hg.patch +++ b/media-libs/libsdl/patches/libsdl-1.2-hg.patch @@ -1,38 +1,51 @@ -diff -r 930614179450 libsdl-1.2-hg/src/video/bwindow/SDL_BWin.h ---- libsdl-1.2-hg/src/video/bwindow/SDL_BWin.h Fri Dec 03 16:55:25 2010 -0800 -+++ libsdl-1.2-hg-haiku/src/video/bwindow/SDL_BWin.h Thu Dec 23 09:38:48 2010 +0000 -@@ -113,7 +113,9 @@ - SDL_GLView = new BGLView(Bounds(), "SDL GLView", - B_FOLLOW_ALL_SIDES, (B_WILL_DRAW|B_FRAME_EVENTS), - gl_flags); -- SDL_GLView->EnableDirectMode(true); -+ //TODO: Figure out why directmode isn't working -+ //SDL_GLView->EnableDirectMode(true); -+ SDL_GLView->EnableDirectMode(false); - } - if ( the_view != SDL_GLView ) { - if ( the_view ) { -@@ -133,17 +135,17 @@ - } - if ( the_view != SDL_View ) { - if ( the_view ) { --#if SDL_VIDEO_OPENGL -- if ( the_view == SDL_GLView ) { -- SDL_GLView->UnlockGL(); -- } --#endif - RemoveChild(the_view); - } - AddChild(SDL_View); - the_view = SDL_View; - } - } -+#if SDL_VIDEO_OPENGL -+ if ( the_view == SDL_GLView ) { -+ SDL_GLView->UnlockGL(); -+ } -+#endif - Unlock(); - return(retval); - } - +--- libsdl-1.2-hg/src/audio/baudio/SDL_beaudio.cc dim. nov. 04 19:07:49 2012 +0100 ++++ b/src/audio/baudio/SDL_beaudio.cc mar. janv. 01 22:41:22 2013 +0100 +@@ -199,11 +199,11 @@ + return (-1); + } + +- format.buffer_size = spec->samples; +- + /* Calculate the final parameters for this audio specification */ + SDL_CalculateAudioSpec(spec); + ++ format.buffer_size = spec->size; ++ + /* Subscribe to the audio stream (creates a new thread) */ + { sigset_t omask; + SDL_MaskSignals(&omask); + return (-1); + } +diff -r 9cff1c7c0fff src/video/bwindow/SDL_sysvideo.cc +--- libsdl-1.2-hg/src/video/bwindow/SDL_sysvideo.cc dim. juin 03 05:03:45 2012 -0400 ++++ b/src/video/bwindow/SDL_sysvideo.cc sam. juin 09 11:01:28 2012 +0200 +@@ -456,14 +456,6 @@ + // printf("Going windowed\n"); + SDL_Win->SetFullScreen(fullscreen); + +- // Calculate offsets for centering the window (in window mode) and for +- // dentering the bitmap (in full screen mode). +- BRect bounds = bscreen.Frame(); +- bounds.PrintToStream(); +- int32 cx = (bounds.IntegerWidth() - width)/2; +- int32 cy = (bounds.IntegerHeight() - height)/2; +- +- // printf ("cx = %d, cy = %d\n", cx, cy); + if (!SDL_Win->IsFullScreen()) { + // printf("Doing not fullscreen stuff.\n"); + // We are not in full screen mode, so we want to change the window +@@ -471,9 +463,13 @@ + SDL_Win->ResizeTo(width, height); + + // And also center the window and reset the drawing offset. +- SDL_Win->MoveTo(cx, cy); + SDL_Win->SetXYOffset(0, 0); + } else { ++ // Calculate offsets for centering the bitmap ++ BRect bounds = bscreen.Frame(); ++ int32 cx = (bounds.IntegerWidth() - width)/2; ++ int32 cy = (bounds.IntegerHeight() - height)/2; ++ + // printf("Doing fullscreen stuff."); + // Center the bitmap whenever we are in full screen mode. + SDL_Win->SetXYOffset(cx, cy); diff --git a/media-libs/libsdl/sdl-config b/media-libs/libsdl/sdl-config new file mode 100644 index 000000000..7e19ca3a8 --- /dev/null +++ b/media-libs/libsdl/sdl-config @@ -0,0 +1,77 @@ +#!/bin/sh + +libDir=`finddir B_SYSTEM_LIB_DIRECTORY` + +# Determine which GCC we're running +if [ -f "$libDir"/libsupc++.so ] ; then + HAIKU_GCC_VERSION=4 +else + HAIKU_GCC_VERSION=2 +fi + +SETGCC_OUTPUT=`setgcc` +CURRENT_COMPILER=${SETGCC_OUTPUT: -1:1} + +if [ $CURRENT_COMPILER == $HAIKU_GCC_VERSION ] ; then + libdir=`finddir B_COMMON_LIB_DIRECTORY` +else + libdir=`finddir B_COMMON_LIB_DIRECTORY`/gcc$CURRENT_COMPILER +fi + +prefix=/boot/common +exec_prefix=${prefix} +exec_prefix_set=no + +#usage="\ +#Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" +usage="\ +Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]" + +if test $# -eq 0; then + echo "${usage}" 1>&2 + exit 1 +fi + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | LC_ALL="C" sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + if test $exec_prefix_set = no ; then + exec_prefix=$optarg + fi + ;; + --prefix) + echo $prefix + ;; + --exec-prefix=*) + exec_prefix=$optarg + exec_prefix_set=yes + ;; + --exec-prefix) + echo $exec_prefix + ;; + --version) + echo 1.2.15 + ;; + --cflags) + echo -I${prefix}/include/SDL -D_GNU_SOURCE=1 + ;; +# --libs) +# echo -L$libdir -lSDL +# ;; +# --static-libs) + --libs|--static-libs) + echo -L$libdir -lSDL -liconv -lGL -lroot -lbe -lmedia -lgame -ldevice -ltextencoding + ;; + *) + echo "${usage}" 1>&2 + exit 1 + ;; + esac + shift +done diff --git a/media-libs/libsndfile/libsndfile-1.0.21.bep b/media-libs/libsndfile/libsndfile-1.0.21.bep index 0cb0eae0a..9558dd293 100644 --- a/media-libs/libsndfile/libsndfile-1.0.21.bep +++ b/media-libs/libsndfile/libsndfile-1.0.21.bep @@ -1,6 +1,6 @@ DESCRIPTION="Libsndfile is a C library for reading and writing files containing sampled sound" HOMEPAGE="http://www.mega-nerd.com/libsndfile" -SRC_URI="http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.21.tar.gz" +SRC_URI="http://ports-space.haiku-files.org/source/libsndfile_1.0.21.orig.tar.gz" CHECKSUM_MD5="880a40ec636ab2185b97f8927299b292" REVISION="1" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." @@ -13,18 +13,17 @@ DEPEND="media-libs/flac >= 1.2.1 BUILD { cd libsndfile-1.0.21 rm aclocal.m4 - cp /boot/common/share/aclocal/libtool.m4 M4 - cp /boot/common/share/aclocal/ltoptions.m4 M4 - cp /boot/common/share/aclocal/ltversion.m4 M4 - cp /boot/common/share/aclocal/ltsugar.m4 M4 - cp /boot/common/share/aclocal/lt~obsolete.m4 M4 echo "AC_CONFIG_MACRO_DIR([M4]) >> configure.in" libtoolize --force --copy --install - aclocal -I M4 + aclocal --install -I M4 + sed -i 's/htmldocdir=$prefix\/share\/doc\/libsndfile1-dev\/html/htmldocdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/doc\/libsndfile1-dev\/html/' configure.ac autoconf autoheader automake - ./configure --prefix=/boot/common + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + export htmldocdir=$COMMON_DOCS/doc/libsndfile-dev/html + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=$COMMON_DOCS/man make } diff --git a/media-libs/libsvgtiny/libsvgtiny-0-HEAD.bep b/media-libs/libsvgtiny/libsvgtiny-0-HEAD.bep new file mode 100644 index 000000000..341c1439c --- /dev/null +++ b/media-libs/libsvgtiny/libsvgtiny-0-HEAD.bep @@ -0,0 +1,22 @@ +DESCRIPTION="Libsvgtiny is an implementation of SVG Tiny written in C" +HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny" +SRC_URI="git://git.netsurf-browser.org/libsvgtiny.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libxml2 >= 2.7.7 + dev-util/gperf >= 3.0.4 + dev-util/buildsystem >= 0 + dev-libs/libwapcaplet >= 0.1.1-HEAD + net-libs/libdom >= 0" +#CHECKSUM_MD5="" +BUILD { + cd libsvgtiny-0-HEAD + make PREFIX=/boot/common +} + +INSTALL { + cd libsvgtiny-0-HEAD + make install PREFIX=/boot/common +} +LICENSE="MIT" +COPYRIGHT="2003-2012 The NetSurf Developers" diff --git a/media-libs/libtheora/libtheora-1.1.1.bep b/media-libs/libtheora/libtheora-1.1.1.bep index bd849b7f1..922a87a52 100644 --- a/media-libs/libtheora/libtheora-1.1.1.bep +++ b/media-libs/libtheora/libtheora-1.1.1.bep @@ -3,18 +3,17 @@ HOMEPAGE="http://www.theora.org/" SRC_URI="http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2" REVISION="1" STATUS_HAIKU="stable" -DEPEND="" +DEPEND="media-libs/libogg >= 1.2.0 + media-libs/libvorbis >= 1.3.0" CHECKSUM_MD5="292ab65cedd5021d6b7ddd117e07cd8e" BUILD { cd libtheora-1.1.1 libtoolize --force --copy --install aclocal -I m4 autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ + --datarootdir=$COMMON_DOCS \ --disable-asm make } diff --git a/media-libs/libvorbis/libvorbis-1.2.3.bep b/media-libs/libvorbis/libvorbis-1.2.3.bep index 8673e98af..cf406657e 100644 --- a/media-libs/libvorbis/libvorbis-1.2.3.bep +++ b/media-libs/libvorbis/libvorbis-1.2.3.bep @@ -9,15 +9,10 @@ BUILD { cd libvorbis-1.2.3 libtoolize --force --copy --install mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 - aclocal -I m4 + aclocal --install -I m4 autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } @@ -25,5 +20,6 @@ INSTALL { cd libvorbis-1.2.3 make install } + LICENSE="BSD (3-clause)" COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libvorbis/libvorbis-1.3.1.bep b/media-libs/libvorbis/libvorbis-1.3.1.bep index 9be00e826..b618fa7a6 100644 --- a/media-libs/libvorbis/libvorbis-1.3.1.bep +++ b/media-libs/libvorbis/libvorbis-1.3.1.bep @@ -10,15 +10,10 @@ BUILD { cd libvorbis-1.3.1 libtoolize --force --copy --install mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 - aclocal -I m4 + aclocal --install -I m4 autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/libvorbis/libvorbis-1.3.2.bep b/media-libs/libvorbis/libvorbis-1.3.2.bep index 4bef031cb..b2c084782 100644 --- a/media-libs/libvorbis/libvorbis-1.3.2.bep +++ b/media-libs/libvorbis/libvorbis-1.3.2.bep @@ -8,17 +8,15 @@ DEPEND="dev-util/pkgconfig >= 0.23 media-libs/libogg >= 1.2.0" BUILD { cd libvorbis-1.3.2 - libtoolize --force --copy --install + libtoolize -fci mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 - aclocal -I m4 + aclocal --install -I m4 autoconf automake - ./configure --prefix=/boot/common + sed -i 's/-lvorbis -lm/-lvorbis/' vorbis.pc.in + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=$COMMON_DOCS make } diff --git a/media-libs/libvpx/libvpx-0.9.2-git.bep b/media-libs/libvpx/libvpx-0.9.2-git.bep index d18144221..9eb7d31d4 100644 --- a/media-libs/libvpx/libvpx-0.9.2-git.bep +++ b/media-libs/libvpx/libvpx-0.9.2-git.bep @@ -6,7 +6,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd libvpx-0.9.2-git - ./configure --prefix=/boot/common \ + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --enable-pic \ --enable-vp8 make diff --git a/media-libs/libvpx/libvpx-1.0.0.bep b/media-libs/libvpx/libvpx-1.0.0.bep new file mode 100644 index 000000000..ce97faebd --- /dev/null +++ b/media-libs/libvpx/libvpx-1.0.0.bep @@ -0,0 +1,24 @@ +DESCRIPTION="libvpx - WebM VP8 Codec SDK" +HOMEPAGE="http://www.webmproject.org" +SRC_URI="http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2" +CHECKSUM_MD5="d987b5140412edd37d2c6b10c29ad484" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libvpx-v1.0.0 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-pic \ + --enable-vp8 + make +} + +INSTALL { + cd libvpx-v1.0.0 + make install +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="2009-2012 Google Inc., + The Mozilla Foundation and + The Xiph.Org Foundation" diff --git a/media-libs/libvpx/patches/libvpx-1.0.0.patch b/media-libs/libvpx/patches/libvpx-1.0.0.patch new file mode 100644 index 000000000..da04b72ff --- /dev/null +++ b/media-libs/libvpx/patches/libvpx-1.0.0.patch @@ -0,0 +1,66 @@ +diff -ruN libvpx-v1.0.0/build/make/configure.sh libvpx-v1.0.0-haiku/build/make/configure.sh +--- libvpx-v1.0.0/build/make/configure.sh 2012-01-27 18:36:39.038535168 +0000 ++++ libvpx-v1.0.0-haiku/build/make/configure.sh 2012-03-14 00:47:54.780926976 +0000 +@@ -579,6 +579,9 @@ + *solaris2.10) + tgt_os=solaris + ;; ++ *haiku*) ++ tgt_os=haiku ++ ;; + esac + + if [ -n "$tgt_isa" ] && [ -n "$tgt_os" ]; then +@@ -909,8 +912,8 @@ + esac + ;; + gcc*) +- add_cflags -m${bits} +- add_ldflags -m${bits} ++ enabled haiku || add_cflags -m${bits} ++ enabled haiku || add_ldflags -m${bits} + link_with_cc=gcc + tune_cflags="-march=" + setup_gnu_toolchain +@@ -939,7 +942,7 @@ + add_asflags -f x64 + enabled debug && add_asflags -g cv8 + ;; +- linux*|solaris*) ++ linux*|solaris*|haiku*) + add_asflags -f elf${bits} + enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2 + enabled debug && [ "${AS}" = nasm ] && add_asflags -g +@@ -1019,6 +1022,7 @@ + case ${toolchain} in + *-win*);; + *-android-gcc);; ++ *-haiku*);; + *) check_header pthread.h && add_extralibs -lpthread + esac + fi +diff -ruN libvpx-v1.0.0/configure libvpx-v1.0.0-haiku/configure +--- libvpx-v1.0.0/configure 2012-01-27 18:36:39.039583744 +0000 ++++ libvpx-v1.0.0-haiku/configure 2012-03-14 00:46:37.182976512 +0000 +@@ -107,6 +107,7 @@ + all_platforms="${all_platforms} x86-darwin9-gcc" + all_platforms="${all_platforms} x86-darwin9-icc" + all_platforms="${all_platforms} x86-darwin10-gcc" ++all_platforms="${all_platforms} x86-haiku-gcc" + all_platforms="${all_platforms} x86-linux-gcc" + all_platforms="${all_platforms} x86-linux-icc" + all_platforms="${all_platforms} x86-solaris-gcc" +diff -ruN libvpx-v1.0.0/examples.mk libvpx-v1.0.0-haiku/examples.mk +--- libvpx-v1.0.0/examples.mk 2012-01-27 18:36:39.040108032 +0000 ++++ libvpx-v1.0.0-haiku/examples.mk 2012-03-14 00:46:37.187432960 +0000 +@@ -113,7 +113,9 @@ + # We should not link to math library (libm) on RVCT + # when building for bare-metal targets + ifeq ($(CONFIG_OS_SUPPORT), yes) +-CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m ++ ifneq ($(TOOLCHAIN),x86-haiku-gcc) ++ CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m ++ endif + else + ifeq ($(CONFIG_GCC), yes) + CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m diff --git a/media-libs/libwebp/libwebp-0.1.2-git.bep b/media-libs/libwebp/libwebp-0.1.2-git.bep new file mode 100644 index 000000000..7ee89fb3a --- /dev/null +++ b/media-libs/libwebp/libwebp-0.1.2-git.bep @@ -0,0 +1,21 @@ +DESCRIPTION="library for encoding and decoding WebP image files" +HOMEPAGE="http://code.google.com/p/webp" +SRC_URI="git+git://review.webmproject.org/libwebp.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libwebp-0.1.2-git + ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd libwebp-0.1.2-git + make install +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="2011 Google Inc." diff --git a/media-libs/libwebp/libwebp-0.1.3.bep b/media-libs/libwebp/libwebp-0.1.3.bep new file mode 100644 index 000000000..061e805d0 --- /dev/null +++ b/media-libs/libwebp/libwebp-0.1.3.bep @@ -0,0 +1,22 @@ +DESCRIPTION="library for encoding and decoding WebP image files" +HOMEPAGE="http://code.google.com/p/webp" +SRC_URI="http://webp.googlecode.com/files/libwebp-0.1.3.tar.gz" +CHECKSUM_MD5="254d4670e14e9ed881f0536b006ab336" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libwebp-0.1.3 + ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd libwebp-0.1.3 + make install +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="2011 Google Inc." diff --git a/media-libs/lv2/lv2-1.2.0.bep b/media-libs/lv2/lv2-1.2.0.bep new file mode 100644 index 000000000..d422249be --- /dev/null +++ b/media-libs/lv2/lv2-1.2.0.bep @@ -0,0 +1,29 @@ +DESCRIPTION="portable plugin standard for audio systems" +MESSAGE="Graphviz must be installed before installation of doxygen." +HOMEPAGE="http://lv2plug.in" +SRC_URI="http://lv2plug.in/spec/lv2-1.2.0.tar.bz2" +CHECKSUM_MD5="323b851563b4da1ad2c0faf5c76f0e3a" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="app-doc/doxygen>=1.6.1 + media-gfx/graphviz>=2.24 + media-libs/libsndfile>=1.0.21 + dev-python/rdflib>=3.2.0 + dev-python/pyxml>=0.8.4" +BUILD { + cd lv2-1.2.0 + sed -e '1,2s:/usr/bin/env:/bin/env:g' waf > waf2 + cp waf2 waf + rm waf2 + ./waf configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc + ./waf build +} + +INSTALL { + cd lv2-1.2.0 + ./waf install +} +LICENSE="Public Domain" +COPYRIGHT="2006-2012 Steve Harris, David Robillard" diff --git a/media-libs/mediainfo/mediainfo-0.7.61.bep b/media-libs/mediainfo/mediainfo-0.7.61.bep new file mode 100644 index 000000000..ba77d79b4 --- /dev/null +++ b/media-libs/mediainfo/mediainfo-0.7.61.bep @@ -0,0 +1,24 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +DEPEND="" +BUILD { + cd MediaInfo_CLI_GNU_FromSource + + cp `finddir B_COMMON_DATA_DIRECTORY`/libtool/config/config.* ZenLib/Project/GNU/Library + cp `finddir B_COMMON_DATA_DIRECTORY`/libtool/config/config.* MediaInfoLib/Project/GNU/Library + cp `finddir B_COMMON_DATA_DIRECTORY`/libtool/config/config.* MediaInfo/Project/GNU/CLI + + ./CLI_Compile.sh +} + +INSTALL { + cd MediaInfo_CLI_GNU_FromSource/MediaInfo/Project/GNU/CLI + make install prefix=`finddir B_COMMON_DIRECTORY` +} +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2002-2012 MediaArea.net SARL. All rights reserved." diff --git a/media-libs/mediainfo/patches/mediainfo-0.7.61.patch b/media-libs/mediainfo/patches/mediainfo-0.7.61.patch new file mode 100644 index 000000000..49b839ab0 --- /dev/null +++ b/media-libs/mediainfo/patches/mediainfo-0.7.61.patch @@ -0,0 +1,91 @@ +diff -Naur MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in MediaInfo_CLI_GNU_FromSource-haiku/MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in +--- MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in 2012-10-21 21:32:39.055050240 +0000 ++++ MediaInfo_CLI_GNU_FromSource-haiku/MediaInfoLib/Project/GNU/Library/libmediainfo.pc.in 2012-12-03 20:00:08.240123904 +0000 +@@ -3,11 +3,11 @@ + libdir=@libdir@ + includedir=@includedir@ + Unicode=@MediaInfoLib_Unicode@ +-Libs_Static=@libdir@/lib@MediaInfoLib_LibName@.a ${libdir}/libzen.a -lpthread -lz ++Libs_Static=@libdir@/lib@MediaInfoLib_LibName@.a ${libdir}/libzen.a -lz + la_name=lib@MediaInfoLib_LibName@.la + + Name: libmediainfo + Version: @PACKAGE_VERSION@ + Description: MediaInfoLib +-Libs: -L@libdir@ -l@MediaInfoLib_LibName@ -lzen -lz -lpthread ++Libs: -L@libdir@ -l@MediaInfoLib_LibName@ -lzen -lz + Cflags: -I@includedir@ @MediaInfoLib_CXXFLAGS@ +diff -Naur MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library/configure MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Project/GNU/Library/configure +--- MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library/configure 2012-10-21 21:32:46.003670016 +0000 ++++ MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Project/GNU/Library/configure 2012-12-03 20:00:08.639893504 +0000 +@@ -19110,8 +19110,8 @@ + fi + + +-ZenLib_LIBS="-L$(pwd) -lzen -lpthread -lstdc++ $ZenLib_LIBS" +-ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread -lstdc++ $ZenLib_LIBS_Static" ++ZenLib_LIBS="-L$(pwd) -lzen -lstdc++ $ZenLib_LIBS" ++ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lstdc++ $ZenLib_LIBS_Static" + + + if test "$enable_wstring_missing" = "yes"; then +@@ -19288,7 +19288,7 @@ + fi + fi + +-LDFLAGS="$LDFLAGS -lpthread -lstdc++" ++LDFLAGS="$LDFLAGS -lstdc++" + + + +diff -Naur MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library/configure.ac MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Project/GNU/Library/configure.ac +--- MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library/configure.ac 2012-10-21 21:32:46.002359296 +0000 ++++ MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Project/GNU/Library/configure.ac 2012-12-03 20:00:08.646184960 +0000 +@@ -122,8 +122,8 @@ + dnl ------------------------------------------------------------------------- + dnl Common + dnl +-ZenLib_LIBS="-L$(pwd) -lzen -lpthread -lstdc++ $ZenLib_LIBS" +-ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread -lstdc++ $ZenLib_LIBS_Static" ++ZenLib_LIBS="-L$(pwd) -lzen -lstdc++ $ZenLib_LIBS" ++ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lstdc++ $ZenLib_LIBS_Static" + + dnl ######################################################################### + dnl ### C/C++ compiler options used to compile +@@ -221,7 +221,7 @@ + dnl ------------------------------------------------------------------------- + dnl External libs + dnl +-LDFLAGS="$LDFLAGS -lpthread -lstdc++" ++LDFLAGS="$LDFLAGS -lstdc++" + + dnl ######################################################################### + dnl ### Output +diff -Naur MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library/libzen.pc.in MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Project/GNU/Library/libzen.pc.in +--- MediaInfo_CLI_GNU_FromSource/ZenLib/Project/GNU/Library/libzen.pc.in 2012-10-21 21:32:46.003932160 +0000 ++++ MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Project/GNU/Library/libzen.pc.in 2012-12-03 20:00:08.653262848 +0000 +@@ -4,10 +4,10 @@ + includedir=@includedir@ + Unicode=@ZenLib_Unicode@ + WstringMissing=@ZenLib_wstring_missing@ +-Libs_Static=@libdir@/libzen.a -lpthread ++Libs_Static=@libdir@/libzen.a + + Name: libzen + Version: @PACKAGE_VERSION@ + Description: ZenLib +-Libs: -L@libdir@ -lzen -lpthread -lstdc++ ++Libs: -L@libdir@ -lzen -lstdc++ + Cflags: -I${includedir} @ZenLib_CXXFLAGS@ +diff -Naur MediaInfo_CLI_GNU_FromSource/ZenLib/Source/ZenLib/Conf.h MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Source/ZenLib/Conf.h +--- MediaInfo_CLI_GNU_FromSource/ZenLib/Source/ZenLib/Conf.h 2012-10-21 21:32:46.000262144 +0000 ++++ MediaInfo_CLI_GNU_FromSource-haiku/ZenLib/Source/ZenLib/Conf.h 2012-12-03 20:29:36.678428672 +0000 +@@ -80,7 +80,7 @@ + || defined(__unix) || defined(__unix__) \ + || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) \ + || defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) \ +- || defined(__EMX__) || defined(__VMS) || defined(__BEOS__) ++ || defined(__EMX__) || defined(__VMS) || defined(__BEOS__) || defined(__HAIKU__) + #ifndef UNIX + #define UNIX + #endif diff --git a/media-libs/musicbrainz/musicbrainz-5.0.1.bep b/media-libs/musicbrainz/musicbrainz-5.0.1.bep new file mode 100644 index 000000000..3f00634d5 --- /dev/null +++ b/media-libs/musicbrainz/musicbrainz-5.0.1.bep @@ -0,0 +1,27 @@ +DESCRIPTION="The MusicBrainz Client Library (for accessing the latest XML based web service" +HOMEPAGE="http://musicbrainz.org/doc/libmusicbrainz" +SRC_URI="https://github.com/downloads/metabrainz/libmusicbrainz/libmusicbrainz-5.0.1.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="a0406b94c341c2b52ec0fe98f57cadf3" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." + +BUILD { + cd libmusicbrainz-5.0.1 + cmake . + make +} + +INSTALL { + cd libmusicbrainz-5.0.1 + make install +} + +TEST { + cd libmusicbrainz-5.0.1 + make test +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2012 Andrew Hawkins" diff --git a/media-libs/openal/openal-1.13.bep b/media-libs/openal/openal-1.13.bep new file mode 100644 index 000000000..466527faa --- /dev/null +++ b/media-libs/openal/openal-1.13.bep @@ -0,0 +1,23 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/cmake >= 2.8.0" + +BUILD { + cd openal-soft-1.13 + cmake . + make +} + +INSTALL { + cd openal-soft-1.13 + make install +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1999-2000 Loki Software + 2005-2011 OpenAL Soft team" + diff --git a/media-libs/openal/patches/openal-1.13.patch b/media-libs/openal/patches/openal-1.13.patch new file mode 100644 index 000000000..634d011b9 --- /dev/null +++ b/media-libs/openal/patches/openal-1.13.patch @@ -0,0 +1,315 @@ +diff -Naur openal-soft-1.13/Alc/ALc.c openal-soft-1.13-haiku/Alc/ALc.c +--- openal-soft-1.13/Alc/ALc.c 2011-02-09 17:52:19.006291456 -0200 ++++ openal-soft-1.13-haiku/Alc/ALc.c 2011-05-02 01:08:32.000000000 -0300 +@@ -60,6 +60,9 @@ + #ifdef HAVE_SOLARIS + { "solaris", alc_solaris_init, alc_solaris_deinit, alc_solaris_probe, EmptyFuncs }, + #endif ++#ifdef HAVE_HAIKU ++ { "haiku", alc_haiku_init, alc_haiku_deinit, alc_haiku_probe, EmptyFuncs }, ++#endif + #ifdef HAVE_DSOUND + { "dsound", alcDSoundInit, alcDSoundDeinit, alcDSoundProbe, EmptyFuncs }, + #endif +diff -Naur openal-soft-1.13/Alc/haiku.cpp openal-soft-1.13-haiku/Alc/haiku.cpp +--- openal-soft-1.13/Alc/haiku.cpp 1969-12-31 21:00:00.000000000 -0300 ++++ openal-soft-1.13-haiku/Alc/haiku.cpp 2011-05-02 01:06:54.000000000 -0300 +@@ -0,0 +1,214 @@ ++/** ++ * OpenAL cross platform audio library ++ * Copyright (C) 1999-2010 by authors. ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ ++ * This library 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 ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ * Or go to http://www.gnu.org/copyleft/lgpl.html ++ */ ++ ++#include "config.h" ++#include ++#include ++#include ++ ++#include "alMain.h" ++#include "AL/al.h" ++#include "AL/alc.h" ++ ++#include ++ ++void alc_haiku_init(BackendFuncs *func_list); ++void alc_haiku_deinit(); ++void alc_haiku_probe(int type); ++ ++static const ALCchar haiku_device[] = "Haiku Software"; ++ ++void alc_haiku_init(BackendFuncs *func_list) ++{ ++ ++ ALCboolean HaikuOpenPlayback(ALCdevice *dev, const ALCchar *devName); ++ void HaikuPlayBufferCb(void *dev /* void *cookie */, void *buffer, size_t buf_sz, const media_raw_audio_format &fmt); ++ void HaikuClosePlayback(ALCdevice *dev); ++ ALCboolean HaikuResetPlayback(ALCdevice *dev); ++ void HaikuStopPlayback(ALCdevice *dev); ++ ++ ALCboolean HaikuOpenCapture(ALCdevice *dev, const ALCchar *devName); ++ void HaikuCloseCapture(ALCdevice *dev); ++ void HaikuStartCapture(ALCdevice *dev); ++ void HaikuStopCapture(ALCdevice *dev); ++ ALCuint HaikuAvailableSamples(ALCdevice *Dev); ++ void HaikuCaptureSamples(ALCdevice *dev, ALCvoid *pBuf, ALCuint lSamples); ++ ++ static BackendFuncs HaikuFuncs = { ++ HaikuOpenPlayback, ++ HaikuClosePlayback, ++ HaikuResetPlayback, ++ HaikuStopPlayback, ++ HaikuOpenCapture, ++ HaikuCloseCapture, ++ HaikuStartCapture, ++ HaikuStopCapture, ++ HaikuCaptureSamples, ++ HaikuAvailableSamples ++ }; ++ ++ ++ *func_list = HaikuFuncs; ++} ++ ++void alc_haiku_deinit() ++{ ++} ++ ++void alc_haiku_probe(int type) ++{ ++#ifdef HAVE_STAT ++ struct stat buf; ++ if(stat(GetConfigValue("haiku", "device", "/dev/audio"), &buf) != 0) ++ return; ++#endif ++ ++ if(type == DEVICE_PROBE) ++ AppendDeviceList(haiku_device); ++ else if(type == ALL_DEVICE_PROBE) ++ AppendAllDeviceList(haiku_device); ++} ++ ++typedef struct { ++ BSoundPlayer *pl; ++ ALCdevice *device; ++ ALuint frameSize; ++} HaikuData; ++ ++ALCboolean HaikuOpenPlayback(ALCdevice *dev, const ALCchar *devName) ++{ ++ void HaikuPlayBufferCb(void *dev /* void *cookie */, void *buffer, size_t buf_sz, const media_raw_audio_format &fmt); ++ ++ if (!devName) ++ devName = haiku_device; ++ else if (strcmp(devName, haiku_device) != 0) ++ return ALC_FALSE; ++ ++ HaikuData *data = new HaikuData; ++ data = (HaikuData*)calloc(1, sizeof(HaikuData)); ++ data->device = dev; ++ dev->szDeviceName = strdup(devName); ++ dev->ExtraData = data; ++ ++ media_raw_audio_format fmt; ++ fmt.frame_rate = dev->Frequency; ++ fmt.channel_count = ChannelsFromDevFmt(dev->FmtChans); ++ switch (dev->FmtType) { ++ case DevFmtByte: fmt.format = fmt.B_AUDIO_CHAR; break; ++ case DevFmtUByte: fmt.format = fmt.B_AUDIO_UCHAR; break; ++ case DevFmtShort: fmt.format = fmt.B_AUDIO_SHORT; break; ++ case DevFmtUShort: ++ delete data; dev->ExtraData = 0; ++ return ALC_FALSE; ++ case DevFmtFloat: fmt.format = fmt.B_AUDIO_FLOAT; break; ++ } ++ { ++ union { ++ char bytes[2]; ++ short data; ++ } test; ++ test.data = 10; ++ if (test.bytes[0] == 10) ++ fmt.byte_order = B_MEDIA_LITTLE_ENDIAN; ++ else ++ fmt.byte_order = B_MEDIA_BIG_ENDIAN; ++ } ++ fmt.buffer_size = 4096; ++ ++ data->pl = new BSoundPlayer(&fmt, "OpenAL sound player", HaikuPlayBufferCb, NULL, dev); ++ if (data->pl->InitCheck() != B_OK) { ++ delete data->pl; ++ delete data; ++ dev->ExtraData = 0; ++ return ALC_FALSE; ++ } ++ data->frameSize = FrameSizeFromDevFmt(dev->FmtChans, dev->FmtType); ++ return ALC_TRUE; ++} ++void HaikuPlayBufferCb(void *cookie, void *buffer, size_t buf_sz, const media_raw_audio_format &fmt) ++{ ++ (void)fmt; ++ ALCdevice *dev = (ALCdevice*)cookie; ++ HaikuData *data = (HaikuData*)dev->ExtraData; ++ aluMixData(dev, buffer, buf_sz / data->frameSize); ++} ++ ++void HaikuClosePlayback(ALCdevice *dev) { ++ HaikuData *data = (HaikuData*)dev->ExtraData; ++ data->pl->Stop(true, true); ++ delete data->pl; ++ delete data; dev->ExtraData = 0; ++} ++ ++ALCboolean HaikuResetPlayback(ALCdevice *dev) ++{ ++ HaikuData *data = (HaikuData*)dev->ExtraData; ++ data->pl->Stop(true, true); ++ ++ ALuint64 bufSize = dev->UpdateSize; ++ bufSize = bufSize / data->frameSize + (bufSize % data->frameSize > 0) ? 1 : 0; // Divide with round up ++ bufSize *= bufSize; ++ dev->UpdateSize = bufSize; ++ ++ data->pl->Start(); ++ return ALC_TRUE; ++} ++ ++void HaikuStopPlayback(ALCdevice *dev) { ++ HaikuData *data = (HaikuData*)dev->ExtraData; ++ data->pl->Stop(true, true); ++ return; ++} ++ ++ALCboolean HaikuOpenCapture(ALCdevice *dev, const ALCchar *devName) ++{ ++ (void)dev; ++ (void)devName; ++ return ALC_FALSE; ++} ++ ++void HaikuCloseCapture(ALCdevice *dev) ++{ ++ (void)dev; ++} ++ ++void HaikuStartCapture(ALCdevice *dev) ++{ ++ (void)dev; ++} ++ ++void HaikuStopCapture(ALCdevice *dev) ++{ ++ (void)dev; ++} ++ ++ALCuint HaikuAvailableSamples(ALCdevice *Dev) ++{ ++ (void)Dev; ++ return 0; ++} ++ ++void HaikuCaptureSamples(ALCdevice *dev, ALCvoid *pBuf, ALCuint lSamples) ++{ ++ (void)dev; ++ (void)pBuf; ++ (void)lSamples; ++} ++ +diff -Naur openal-soft-1.13/CMakeLists.txt openal-soft-1.13-haiku/CMakeLists.txt +--- openal-soft-1.13/CMakeLists.txt 2011-02-15 18:05:40.000000000 -0200 ++++ openal-soft-1.13-haiku/CMakeLists.txt 2011-05-02 01:08:32.000000000 -0300 +@@ -16,10 +16,12 @@ + INCLUDE(CheckSymbolExists) + INCLUDE(CheckCCompilerFlag) + INCLUDE(CheckCSourceCompiles) ++INCLUDE(CheckCXXCompilerFlag) ++INCLUDE(CheckCXXSourceCompiles) + INCLUDE(CheckTypeSize) + + +-PROJECT(OpenAL C) ++PROJECT(OpenAL C CXX) + + + SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE) +@@ -28,6 +30,7 @@ + OPTION(ALSA "Check for ALSA backend" ON) + OPTION(OSS "Check for OSS backend" ON) + OPTION(SOLARIS "Check for Solaris backend" ON) ++OPTION(HAIKU "Check for Haiku backend" ON) + OPTION(DSOUND "Check for DirectSound backend" ON) + OPTION(WINMM "Check for Windows Multimedia backend" ON) + OPTION(PORTAUDIO "Check for PortAudio backend" ON) +@@ -334,6 +337,7 @@ + SET(HAVE_ALSA 0) + SET(HAVE_OSS 0) + SET(HAVE_SOLARIS 0) ++SET(HAVE_HAIKU 0) + SET(HAVE_DSOUND 0) + SET(HAVE_WINMM 0) + SET(HAVE_PORTAUDIO 0) +@@ -378,6 +382,24 @@ + ENDIF() + ENDIF() + ++# Check Haiku backend ++IF(HAIKU) ++ CHECK_CXX_SOURCE_COMPILES("#include ++ int main(void) ++ { ++ BSoundPlayer *player; ++ return 0; ++ } ++ " HAVE_SOUND_PLAYER_H) ++ IF(HAVE_SOUND_PLAYER_H) ++ SET(HAVE_HAIKU 1) ++ SET(ALC_OBJS ${ALC_OBJS} Alc/haiku.cpp) ++ SET(BACKENDS "${BACKENDS} Haiku,") ++ SET(EXTRA_LIBS be ${EXTRA_LIBS}) ++ SET(EXTRA_LIBS media ${EXTRA_LIBS}) ++ ENDIF() ++ENDIF() ++ + # Check DSound/MMSystem backend + IF(DSOUND) + CHECK_INCLUDE_FILE(dsound.h HAVE_DSOUND_H) +diff -Naur openal-soft-1.13/OpenAL32/Include/alMain.h openal-soft-1.13-haiku/OpenAL32/Include/alMain.h +--- openal-soft-1.13/OpenAL32/Include/alMain.h 2011-02-09 17:50:49.001835008 -0200 ++++ openal-soft-1.13-haiku/OpenAL32/Include/alMain.h 2011-05-02 01:08:32.000000000 -0300 +@@ -276,6 +276,9 @@ + void alc_solaris_init(BackendFuncs *func_list); + void alc_solaris_deinit(void); + void alc_solaris_probe(int type); ++void alc_haiku_init(BackendFuncs *func_list); ++void alc_haiku_deinit(void); ++void alc_haiku_probe(int type); + void alcDSoundInit(BackendFuncs *func_list); + void alcDSoundDeinit(void); + void alcDSoundProbe(int type); +diff -Naur openal-soft-1.13/config.h.in openal-soft-1.13-haiku/config.h.in +--- openal-soft-1.13/config.h.in 2010-06-08 05:56:28.066846720 -0300 ++++ openal-soft-1.13-haiku/config.h.in 2011-05-02 01:08:32.000000000 -0300 +@@ -13,6 +13,9 @@ + /* Define if we have the Solaris backend */ + #cmakedefine HAVE_SOLARIS + ++/* Define if we have the Haiku backend */ ++#cmakedefine HAVE_HAIKU ++ + /* Define if we have the DSound backend */ + #cmakedefine HAVE_DSOUND + diff --git a/media-libs/openjpeg/openjpeg-1.3.bep b/media-libs/openjpeg/openjpeg-1.3.bep deleted file mode 100644 index a82c46f45..000000000 --- a/media-libs/openjpeg/openjpeg-1.3.bep +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION="OpenJPEG library is an open-source JPEG 2000 codec written in C language" -HOMEPAGE="http://www.openjpeg.org/" -SRC_URI="http://openjpeg.googlecode.com/files/openjpeg_v1_3.tar.gz" -CHECKSUM_MD5="f9a3ccfa91ac34b589e9bf7577ce8ff9" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd OpenJPEG_v1_3 - ./configure --build=i586-pc-beos --prefix=/boot/common - make -} - -INSTALL { - cd OpenJPEG_v1_3 - make install -} diff --git a/media-libs/openjpeg/openjpeg-1.5.0.bep b/media-libs/openjpeg/openjpeg-1.5.0.bep new file mode 100644 index 000000000..63604c945 --- /dev/null +++ b/media-libs/openjpeg/openjpeg-1.5.0.bep @@ -0,0 +1,36 @@ +DESCRIPTION="OpenJPEG is an Open-source C-Library for JPEG 2000" +HOMEPAGE="http://www.openjpeg.org/" +SRC_URI="http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz" +CHECKSUM_MD5="e5d66193ddfa59a87da1eb08ea86293b" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd openjpeg-1.5.0 + ./bootstrap.sh + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` + COMMON_DIR=`finddir B_COMMON_DIRECTORY` + ./configure \ + --prefix=$COMMON_DIR \ + --mandir=$COMMON_DOCS/man \ + --docdir=$COMMON_DOCS/doc/openjpeg \ + --enable-mj2 \ + --enable-jpwl \ + --enable-jpip + make +} + +INSTALL { + cd openjpeg-1.5.0 + make install +} + +LICENSE="BSD (2-clause)" +COPYRIGHT="2002-2012, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium + 2002-2012 Professor Benoit Macq + 2003-2012 Antonin Descampe + 2003-2009 Francois-Olivier Devaux + 2005 Herve Drolon, FreeImage Team + 2002-2003 Yannick Verschueren + 2001-2003 David Janssens" diff --git a/media-libs/openjpeg/patches/openjpeg-1.3.patch b/media-libs/openjpeg/patches/openjpeg-1.3.patch deleted file mode 100644 index 16dc3018a..000000000 --- a/media-libs/openjpeg/patches/openjpeg-1.3.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur OpenJPEG_v1_3/Makefile OpenJPEG_v1_3-haiku/Makefile ---- OpenJPEG_v1_3/Makefile 2007-12-21 10:39:41.000000000 +0000 -+++ OpenJPEG_v1_3-haiku/Makefile 2009-11-03 21:15:52.000000000 +0000 -@@ -11,7 +11,7 @@ - CC = gcc - AR = ar - --PREFIX = /usr -+PREFIX = /boot/common - INSTALL_LIBDIR = $(PREFIX)/lib - INSTALL_INCLUDE = $(PREFIX)/include - -@@ -58,11 +58,11 @@ - - install: OpenJPEG - install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)' -- install -m 644 -o root -g root $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' -+ install -m 644 -o baron -g users $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' - ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)' -- install -m 755 -o root -g root $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' -+ install -m 755 -o baron -g users $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' - ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)' -- install -m 644 -o root -g root libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)' -+ install -m 644 -o baron -g users libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)' - -ldconfig - - clean: diff --git a/media-libs/plib/plib-1.8.5.bep b/media-libs/plib/plib-1.8.5.bep index cf223871e..460ce966e 100644 --- a/media-libs/plib/plib-1.8.5.bep +++ b/media-libs/plib/plib-1.8.5.bep @@ -10,7 +10,7 @@ BUILD { cd plib-1.8.5 libtoolize --force --copy --install ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/schroedinger/patches/schroedinger-1.0.11.patch b/media-libs/schroedinger/patches/schroedinger-1.0.11.patch new file mode 100644 index 000000000..c495e9017 --- /dev/null +++ b/media-libs/schroedinger/patches/schroedinger-1.0.11.patch @@ -0,0 +1,13 @@ +--- schroedinger-1.0.11/configure.ac 2012-01-23 01:32:45.012320768 +0000 ++++ schroedinger-1.0.11-haiku/configure.ac 2012-04-09 11:35:40.101187584 +0000 +@@ -85,6 +85,10 @@ + PTHREAD_CFLAGS= + PTHREAD_LIBS=-pthread + ;; ++ haiku*) ++ PTHREAD_CFLAGS= ++ PTHREAD_LIBS= ++ ;; + *) + PTHREAD_CFLAGS= + PTHREAD_LIBS=-lpthread diff --git a/media-libs/schroedinger/schroedinger-1.0.11.bep b/media-libs/schroedinger/schroedinger-1.0.11.bep new file mode 100644 index 000000000..94cee4162 --- /dev/null +++ b/media-libs/schroedinger/schroedinger-1.0.11.bep @@ -0,0 +1,25 @@ +DESCRIPTION="Schroedinger Dirac Video codec" +HOMEPAGE="http://www.diracvideo.org" +SRC_URI="http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/pkg-config >= 0.23 + dev-lang/orc >= 0.4.16" +CHECKSUM_MD5="da6af08e564ca1157348fb8d92efc891" +BUILD { + cd schroedinger-1.0.11 + autoconf + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd schroedinger-1.0.11 + make install +} + +LICENSE="MIT" +COPYRIGHT="2006 BBC and Fluendo" diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.23.bep b/media-libs/sdl-gfx/sdl-gfx-2.0.23.bep new file mode 100644 index 000000000..44752b346 --- /dev/null +++ b/media-libs/sdl-gfx/sdl-gfx-2.0.23.bep @@ -0,0 +1,27 @@ +DESCRIPTION="SDL_gfx - SDL graphics drawing primitives and other support functions" +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.23.tar.gz" +CHECKSUM_MD5="fcc3c4f2d1b4943409bf7e67dd65d03a" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/libsdl >= 1.2.14" +BUILD { + cd SDL_gfx-2.0.23 + libtoolize --force --copy --install + aclocal + autoconf + automake + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR + make +} + +INSTALL { + cd SDL_gfx-2.0.23 + make install +} +LICENSE="Zlib" +COPYRIGHT="1999-2011 A. Schiffler" diff --git a/media-libs/sdl-image/sdl-image-1.2-hg.bep b/media-libs/sdl-image/sdl-image-1.2-hg.bep new file mode 100644 index 000000000..5ab8e0d40 --- /dev/null +++ b/media-libs/sdl-image/sdl-image-1.2-hg.bep @@ -0,0 +1,35 @@ +DESCRIPTION="Simple Direct Media Layer Image Library" +HOMEPAGE="http://www.libsdl.org/projects/SDL_image" +SRC_URI="hg+http://hg.libsdl.org/SDL_image#SDL-1.2" +#CHECKSUM_MD5="6c06584b31559e2b59f2b982d0d1f628" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/libsdl >= 1.2.14 + media-libs/jpeg >= 8b + media-libs/libpng >= 1.2.44 < 1.4.0 + media-libs/tiff >= 3.8.2 + media-libs/giflib >= 4.1.6 + media-libs/libwebp >= 0.1.3" +BUILD { + cd sdl-image-1.2-hg + libtoolize --force --copy --install + aclocal --install -I acinclude + ./autogen.sh + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-bmp --enable-lbm --enable-pcx \ + --enable-pnm --enable-tga --enable-xcf --enable-xpm --enable-xv \ + --enable-gif --enable-jpg --disable-jpg-shared \ + --libdir=$LIBDIR \ + --mandir=$MANDIR + make +} + +INSTALL { + cd sdl-image-1.2-hg + make install +} + +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/sdl-image/sdl-image-1.2.10.bep b/media-libs/sdl-image/sdl-image-1.2.10.bep index 8c6f80750..49613d96e 100644 --- a/media-libs/sdl-image/sdl-image-1.2.10.bep +++ b/media-libs/sdl-image/sdl-image-1.2.10.bep @@ -10,13 +10,8 @@ DEPEND="media-libs/jpeg >= 8b media-libs/giflib >= 4.1.6" BUILD { cd SDL_image-1.2.10 - cp /boot/common/share/aclocal/libtool.m4 acinclude - cp /boot/common/share/aclocal/ltoptions.m4 acinclude - cp /boot/common/share/aclocal/ltversion.m4 acinclude - cp /boot/common/share/aclocal/ltsugar.m4 acinclude - cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude libtoolize --force --copy --install - aclocal -I acinclude + aclocal --install -I acinclude ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` @@ -33,3 +28,6 @@ INSTALL { cd SDL_image-1.2.10 make install } + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1997-2011 Sam Lantinga" diff --git a/media-libs/sdl-image/sdl-image-1.2.12.bep b/media-libs/sdl-image/sdl-image-1.2.12.bep new file mode 100644 index 000000000..8641128f6 --- /dev/null +++ b/media-libs/sdl-image/sdl-image-1.2.12.bep @@ -0,0 +1,35 @@ +DESCRIPTION="Simple Direct Media Layer Image Library" +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/libsdl >= 1.2.14 + media-libs/jpeg >= 8b + media-libs/libpng >= 1.2.46 + media-libs/tiff >= 3.8.2 + media-libs/giflib >= 4.1.6 + media-libs/libwebp >= 0.1.3" +BUILD { + cd SDL_image-1.2.12 + libtoolize --force --copy --install + aclocal --install -I acinclude + ./autogen.sh + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-bmp --enable-lbm --enable-pcx \ + --enable-pnm --enable-tga --enable-xcf --enable-xpm --enable-xv \ + --enable-gif --enable-jpg --disable-jpg-shared \ + --libdir=$LIBDIR \ + --mandir=$MANDIR + make +} + +INSTALL { + cd SDL_image-1.2.12 + make install +} + +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/sdl-image/sdl-image-1.2.6.bep b/media-libs/sdl-image/sdl-image-1.2.6.bep index cf1a78ace..d52989c78 100644 --- a/media-libs/sdl-image/sdl-image-1.2.6.bep +++ b/media-libs/sdl-image/sdl-image-1.2.6.bep @@ -14,7 +14,7 @@ BUILD { aclocal autoconf ./autogen.sh - ./configure --prefix=/boot/common LDFLAGS=-L/boot/common/lib CPPFLAGS=-I/boot/common/include + ./configure --prefix=`finddir B_COMMON_DIRECTORY` LDFLAGS=-L/boot/common/lib CPPFLAGS=-I/boot/common/include make } diff --git a/media-libs/sdl-image/sdl-image-1.2.8.bep b/media-libs/sdl-image/sdl-image-1.2.8.bep index 95808196b..3f0fd1054 100644 --- a/media-libs/sdl-image/sdl-image-1.2.8.bep +++ b/media-libs/sdl-image/sdl-image-1.2.8.bep @@ -7,15 +7,10 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd SDL_image-1.2.8 - cp /boot/common/share/aclocal/libtool.m4 acinclude - cp /boot/common/share/aclocal/ltoptions.m4 acinclude - cp /boot/common/share/aclocal/ltversion.m4 acinclude - cp /boot/common/share/aclocal/ltsugar.m4 acinclude - cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude libtoolize --force --copy --install - aclocal -I acinclude + aclocal --install -I acinclude ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/sdl-image/sdl-image-1.2.9.bep b/media-libs/sdl-image/sdl-image-1.2.9.bep index b036e73b4..3318cb3db 100644 --- a/media-libs/sdl-image/sdl-image-1.2.9.bep +++ b/media-libs/sdl-image/sdl-image-1.2.9.bep @@ -7,15 +7,10 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd SDL_image-1.2.9 - cp /boot/common/share/aclocal/libtool.m4 acinclude - cp /boot/common/share/aclocal/ltoptions.m4 acinclude - cp /boot/common/share/aclocal/ltversion.m4 acinclude - cp /boot/common/share/aclocal/ltsugar.m4 acinclude - cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude libtoolize --force --copy --install - aclocal -I acinclude + aclocal --install -I acinclude ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep b/media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep new file mode 100644 index 000000000..c25d1478c --- /dev/null +++ b/media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep @@ -0,0 +1,32 @@ +DESCRIPTION="Simple Direct Layer Mixer Library" +HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/" +SRC_URI="hg+http://hg.libsdl.org/SDL_mixer/#SDL-1.2" +#CHECKSUM_MD5="" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="libsdl >= 1.2.14 + media-libs/flac >= 1.2.1 + media-libs/libmad >= 0.15.1 + media-libs/libvorbis >= 1.3.1 + media-libs/libmikmod >= 3.1.11 + media-libs/libogg >= 1.2.0 + media-libs/smpeg >= 0.4.5" + +BUILD { + cd sdl-mixer-1.2-hg + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR \ + --enable-music-midi + make +} + +INSTALL { + cd sdl-mixer-1.2-hg + make install +} + +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.10.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.10.bep index a4014acc5..930a94ac7 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.10.bep +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.10.bep @@ -9,13 +9,9 @@ BUILD { cd SDL_mixer-1.2.10 libtoolize --force --copy --install cp ltmain.sh build-scripts/ltmain.sh - cp /boot/common/share/aclocal/libtool.m4 acinclude - cp /boot/common/share/aclocal/ltoptions.m4 acinclude - cp /boot/common/share/aclocal/ltversion.m4 acinclude - cp /boot/common/share/aclocal/ltsugar.m4 acinclude - cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude + aclocal --install -I acinclude ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } @@ -23,5 +19,6 @@ INSTALL { cd SDL_mixer-1.2.10 make install } + LICENSE="GNU LGPL v2.1" COPYRIGHT="1997-2009 Sam Lantinga" diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep index ae4d98c06..964492470 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep @@ -15,11 +15,7 @@ BUILD { cd SDL_mixer-1.2.11 libtoolize --force --copy --install cp ltmain.sh build-scripts/ltmain.sh - cp /boot/common/share/aclocal/libtool.m4 acinclude - cp /boot/common/share/aclocal/ltoptions.m4 acinclude - cp /boot/common/share/aclocal/ltversion.m4 acinclude - cp /boot/common/share/aclocal/ltsugar.m4 acinclude - cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude + aclocal --install -I acinclude ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.12.bep new file mode 100644 index 000000000..a884056b7 --- /dev/null +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12.bep @@ -0,0 +1,34 @@ +DESCRIPTION="Simple Direct Layer Mixer Library" +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="libsdl >= 1.2.14 + media-libs/flac >= 1.2.1 + media-libs/libmad >= 0.15.1 + media-libs/libvorbis >= 1.3.1 + media-libs/libmikmod >= 3.1.11 + media-libs/libogg >= 1.2.0 + media-libs/smpeg >= 0.4.5" + +BUILD { + cd SDL_mixer-1.2.12 + libtoolize --force --copy --install + aclocal --install -I acinclude + ./autogen.sh + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR \ + --enable-music-midi + make +} + +INSTALL { + cd SDL_mixer-1.2.12 + make install +} +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.9.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.9.bep index a7fe10083..c9bf5b91b 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.9.bep +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.9.bep @@ -9,13 +9,9 @@ BUILD { cd SDL_mixer-1.2.9 libtoolize --force --copy --install cp ltmain.sh build-scripts/ltmain.sh - cp /boot/common/share/aclocal/libtool.m4 acinclude - cp /boot/common/share/aclocal/ltoptions.m4 acinclude - cp /boot/common/share/aclocal/ltversion.m4 acinclude - cp /boot/common/share/aclocal/ltsugar.m4 acinclude - cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude + aclocal --install -I acinclude ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/sdl-net/patches/sdl-net-1.2.8.patch b/media-libs/sdl-net/patches/sdl-net-1.2.8.patch new file mode 100644 index 000000000..d51642a8e --- /dev/null +++ b/media-libs/sdl-net/patches/sdl-net-1.2.8.patch @@ -0,0 +1,13 @@ +diff -urN SDL_net-1.2.8/chat.cpp SDL_net-1.2.8-haiku/chat.cpp +--- SDL_net-1.2.8/chat.cpp 2012-01-15 16:20:10.063963136 +0000 ++++ SDL_net-1.2.8-haiku/chat.cpp 2012-02-29 23:58:48.552861696 +0000 +@@ -18,9 +18,6 @@ + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + */ +- Pleasanton, CA 94588 (USA) +- slouken@devolution.com +-*/ + + /* Note that this isn't necessarily the way to run a chat system. + This is designed to excercise the network code more than be really diff --git a/media-libs/sdl-net/sdl-net-1.2-hg.bep b/media-libs/sdl-net/sdl-net-1.2-hg.bep new file mode 100644 index 000000000..30f868251 --- /dev/null +++ b/media-libs/sdl-net/sdl-net-1.2-hg.bep @@ -0,0 +1,27 @@ +DESCRIPTION="Simple Direct Media Layer Net Library" +HOMEPAGE="http://www.libsdl.org/projects/SDL_net" +SRC_URI="hg+http://hg.libsdl.org/SDL_net" +#CHECKSUM_MD5="6bd4662d1423810f3140d4da21b6d912" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd sdl-net-1.2-hg + aclocal --force --install -I acinclude + libtoolize -fci + ./autogen.sh + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR + make +} + +INSTALL { + cd sdl-net-1.2-hg + make install +} + +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/sdl-net/sdl-net-1.2.7.bep b/media-libs/sdl-net/sdl-net-1.2.7.bep index 3e3f0e124..fbc4fe049 100644 --- a/media-libs/sdl-net/sdl-net-1.2.7.bep +++ b/media-libs/sdl-net/sdl-net-1.2.7.bep @@ -7,8 +7,8 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd SDL_net-1.2.7 - cp /boot/common/share/aclocal/libtool.m4 acinclude/libtool.m4 - libtoolize --copy --force --install + aclocal --force --install -I acinclude + libtoolize -fci ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` @@ -22,5 +22,6 @@ INSTALL { cd SDL_net-1.2.7 make install } + LICENSE="GNU LGPL v2.1" COPYRIGHT="1997-2009 Sam Lantinga" diff --git a/media-libs/sdl-net/sdl-net-1.2.8.bep b/media-libs/sdl-net/sdl-net-1.2.8.bep new file mode 100644 index 000000000..7a5dfd4a8 --- /dev/null +++ b/media-libs/sdl-net/sdl-net-1.2.8.bep @@ -0,0 +1,27 @@ +DESCRIPTION="Simple Direct Media Layer Net Library" +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd SDL_net-1.2.8 + aclocal --force --install -I acinclude + libtoolize -fci + ./autogen.sh + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR + make +} + +INSTALL { + cd SDL_net-1.2.8 + make install +} + +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep b/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep index ce482c217..9b81a0285 100644 --- a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep +++ b/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep @@ -10,14 +10,9 @@ BUILD { rm aclocal.m4 rm acinclude.m4 mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.in" libtoolize --copy --force --install - aclocal -I m4 + aclocal --install -I m4 ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` @@ -31,5 +26,6 @@ INSTALL { cd SDL_rtf-0.1.0 make install } + LICENSE="GNU LGPL v2" COPYRIGHT="2003-2009 Sam Lantinga" diff --git a/media-libs/sdl-sound/sdl-sound-1.0-hg.bep b/media-libs/sdl-sound/sdl-sound-1.0-hg.bep new file mode 100644 index 000000000..275fb2fca --- /dev/null +++ b/media-libs/sdl-sound/sdl-sound-1.0-hg.bep @@ -0,0 +1,24 @@ +DESCRIPTION="sdl-sound" +HOMEPAGE="http://www.icculus.org/SDL_sound" +SRC_URI="hg+http://hg.icculus.org/icculus/SDL_sound" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/libogg >= 1.1.4" +BUILD { + cd sdl-sound-1.0-hg + libtoolize --copy --force --install + ./bootstrap + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR + make +} + +INSTALL { + cd sdl-sound-1.0-hg + make install +} +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2001-2011 Ryan C. Gordon" diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0-hg.bep b/media-libs/sdl-ttf/sdl-ttf-2.0-hg.bep new file mode 100644 index 000000000..df5fda109 --- /dev/null +++ b/media-libs/sdl-ttf/sdl-ttf-2.0-hg.bep @@ -0,0 +1,30 @@ +DESCRIPTION="Simple Direct Media Layer Image Library" +HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" +SRC_URI="hg+http://hg.libsdl.org/SDL_ttf" +#CHECKSUM_MD5="814e6e17e8879254208d23b3b7e0354b" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/libsdl >= 1.2.12 + dev-util/pkgconfig >= 0.9" +BUILD { + cd sdl-ttf-2.0-hg + rm -f acinclude.m4 + libtoolize --copy --force --install + aclocal --install -I acinclude + echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" + ./autogen.sh + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR + make +} + +INSTALL { + cd sdl-ttf-2.0-hg + make install +} + +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep b/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep index 004216101..15cd7c98e 100644 --- a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep +++ b/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep @@ -10,11 +10,7 @@ BUILD { cd SDL_ttf-2.0.10 rm -f acinclude.m4 libtoolize --copy --force --install - cp /boot/common/share/aclocal/libtool.m4 acinclude - cp /boot/common/share/aclocal/ltoptions.m4 acinclude - cp /boot/common/share/aclocal/ltversion.m4 acinclude - cp /boot/common/share/aclocal/ltsugar.m4 acinclude - cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude + aclocal --install -I acinclude echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man @@ -29,5 +25,6 @@ INSTALL { cd SDL_ttf-2.0.10 make install } + LICENSE="GNU LGPL v2.1" COPYRIGHT="1997-2010 Sam Lantinga" diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11.bep b/media-libs/sdl-ttf/sdl-ttf-2.0.11.bep new file mode 100644 index 000000000..28f407403 --- /dev/null +++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11.bep @@ -0,0 +1,31 @@ +DESCRIPTION="Simple Direct Media Layer Image Library" +HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" +SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz" +CHECKSUM_MD5="61e29bd9da8d245bc2471d1b2ce591aa" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/libsdl >= 1.2.12 + dev-util/pkgconfig >= 0.9" +BUILD { + cd SDL_ttf-2.0.11 + rm -f acinclude.m4 + libtoolize --copy --force --install + aclocal --install -I acinclude + echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" + ./autogen.sh + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR + make +} + +INSTALL { + cd SDL_ttf-2.0.11 + make install +} + +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" + diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.9.bep b/media-libs/sdl-ttf/sdl-ttf-2.0.9.bep index 6235541fc..18f5cb80d 100644 --- a/media-libs/sdl-ttf/sdl-ttf-2.0.9.bep +++ b/media-libs/sdl-ttf/sdl-ttf-2.0.9.bep @@ -14,7 +14,7 @@ BUILD { touch NEWS AUTHORS ChangeLog automake --add-missing --force-missing --warnings=none autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/smjpeg/smjpeg-0.2.1.bep b/media-libs/smjpeg/smjpeg-0.2.1.bep index 04d65bbaa..2208d923a 100644 --- a/media-libs/smjpeg/smjpeg-0.2.1.bep +++ b/media-libs/smjpeg/smjpeg-0.2.1.bep @@ -10,13 +10,8 @@ BUILD { rm -f aclocal.m4 echo "AC_CONFIG_MACRO_DIR([m4]) > configure.in" mkdir m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 libtoolize --copy --force --install - aclocal -I m4 + aclocal --install -I m4 automake --foreign --add-missing autoconf MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man @@ -31,5 +26,6 @@ INSTALL { cd smjpeg-0.2.1 make install } + LICENSE="GNU LGPL v2" COPYRIGHT="1999-2004 Sam Lantinga, Joe Tennies." diff --git a/media-libs/smpeg/smpeg-0.4.5.bep b/media-libs/smpeg/smpeg-0.4.5.bep index 836d52a80..76a86a1ff 100644 --- a/media-libs/smpeg/smpeg-0.4.5.bep +++ b/media-libs/smpeg/smpeg-0.4.5.bep @@ -9,20 +9,16 @@ BUILD { rm -f acinclude.m4 rm -f aclocal.m4 echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" - cp /boot/common/share/aclocal/libtool.m4 acinclude - cp /boot/common/share/aclocal/ltoptions.m4 acinclude - cp /boot/common/share/aclocal/ltversion.m4 acinclude - cp /boot/common/share/aclocal/ltsugar.m4 acinclude - cp /boot/common/share/aclocal/lt~obsolete.m4 acinclude libtoolize --copy --force --install - aclocal -I acinclude + aclocal --install -I acinclude automake --foreign --add-missing autoconf MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ - --mandir=$MANDIR + --mandir=$MANDIR \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` make } @@ -30,5 +26,6 @@ INSTALL { cd smpeg-0.4.5 make install } + LICENSE="GNU LGPL v2" COPYRIGHT="1999-2004 Sam Lantinga, Joe Tennies." diff --git a/media-libs/speex/speex-1.2-git.bep b/media-libs/speex/speex-1.2-git.bep index 2dc5e5938..320e8878a 100644 --- a/media-libs/speex/speex-1.2-git.bep +++ b/media-libs/speex/speex-1.2-git.bep @@ -10,11 +10,12 @@ BUILD { libtoolize --copy --force --install echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac autogen.sh --prefix=`finddir B_COMMON_DIRECTORY` - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR + --datarootdir=$COMMON_DOCS \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --mandir=$COMMON_DIR/man make } diff --git a/media-libs/speex/speex-1.2rc1.bep b/media-libs/speex/speex-1.2rc1.bep index 6b26f3293..e8d06c9ed 100644 --- a/media-libs/speex/speex-1.2rc1.bep +++ b/media-libs/speex/speex-1.2rc1.bep @@ -2,20 +2,26 @@ DESCRIPTION="Speex" HOMEPAGE="http://www.speex.org" SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz" CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" -DEPEND="" +DEPEND="pkgconfig >= 0.25 + libogg > 1.3.0" BUILD { cd speex-1.2rc1 libtoolize --copy --force --install aclocal automake autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --docdir=$COMMON_DOCS/doc/speex \ + --mandir=$COMMON_DOCS/man make } INSTALL { + cd speex-1.2rc1 make install } LICENSE="Speex" diff --git a/media-libs/taglib/patches/taglib-1.7.1.patch b/media-libs/taglib/patches/taglib-1.7.1.patch new file mode 100644 index 000000000..ed6c8556e --- /dev/null +++ b/media-libs/taglib/patches/taglib-1.7.1.patch @@ -0,0 +1,96 @@ +diff -urN taglib-1.7.1/taglib/ape/apefooter.cpp taglib-1.7.1-haiku/taglib/ape/apefooter.cpp +--- taglib-1.7.1/taglib/ape/apefooter.cpp 2011-03-11 13:15:38.020709376 +0000 ++++ taglib-1.7.1-haiku/taglib/ape/apefooter.cpp 2011-04-11 03:16:26.167772160 +0000 +@@ -24,7 +24,7 @@ + * http://www.mozilla.org/MPL/ * + ***************************************************************************/ + +-#include ++#include + #include + + #include +diff -urN taglib-1.7.1/taglib/mpeg/id3v2/id3v2header.cpp taglib-1.7.1-haiku/taglib/mpeg/id3v2/id3v2header.cpp +--- taglib-1.7.1/taglib/mpeg/id3v2/id3v2header.cpp 2011-03-11 13:15:38.031719424 +0000 ++++ taglib-1.7.1-haiku/taglib/mpeg/id3v2/id3v2header.cpp 2011-04-11 02:24:30.000000000 +0000 +@@ -23,7 +23,7 @@ + * http://www.mozilla.org/MPL/ * + ***************************************************************************/ + +-#include ++#include + #include + + #include +diff -urN taglib-1.7.1/taglib/mpeg/id3v2/id3v2synchdata.cpp taglib-1.7.1-haiku/taglib/mpeg/id3v2/id3v2synchdata.cpp +--- taglib-1.7.1/taglib/mpeg/id3v2/id3v2synchdata.cpp 2011-03-11 13:15:38.031981568 +0000 ++++ taglib-1.7.1-haiku/taglib/mpeg/id3v2/id3v2synchdata.cpp 2011-04-11 02:23:58.000000000 +0000 +@@ -23,7 +23,7 @@ + * http://www.mozilla.org/MPL/ * + ***************************************************************************/ + +-#include ++#include + + #include "id3v2synchdata.h" + +diff -urN taglib-1.7.1/taglib/toolkit/tbytevector.cpp taglib-1.7.1-haiku/taglib/toolkit/tbytevector.cpp +--- taglib-1.7.1/taglib/toolkit/tbytevector.cpp 2011-03-11 13:15:38.038797312 +0000 ++++ taglib-1.7.1-haiku/taglib/toolkit/tbytevector.cpp 2011-04-11 02:26:04.000000000 +0000 +@@ -23,7 +23,7 @@ + * http://www.mozilla.org/MPL/ * + ***************************************************************************/ + +-#include ++#include + + #include + #include +diff -urN taglib-1.7.1/taglib/toolkit/tbytevector.h taglib-1.7.1-haiku/taglib/toolkit/tbytevector.h +--- taglib-1.7.1/taglib/toolkit/tbytevector.h 2011-03-11 13:15:38.038797312 +0000 ++++ taglib-1.7.1-haiku/taglib/toolkit/tbytevector.h 2011-04-11 02:22:38.000000000 +0000 +@@ -30,7 +30,7 @@ + #include "taglib_export.h" + + #include +-#include ++#include + + namespace TagLib { + +diff -urN taglib-1.7.1/taglib/toolkit/tstring.cpp taglib-1.7.1-haiku/taglib/toolkit/tstring.cpp +--- taglib-1.7.1/taglib/toolkit/tstring.cpp 2011-03-11 13:15:38.040108032 +0000 ++++ taglib-1.7.1-haiku/taglib/toolkit/tstring.cpp 2011-04-11 02:25:40.000000000 +0000 +@@ -27,7 +27,7 @@ + #include "unicode.h" + #include "tdebug.h" + +-#include ++#include + + #include + +diff -urN taglib-1.7.1/taglib/toolkit/tstring.h taglib-1.7.1-haiku/taglib/toolkit/tstring.h +--- taglib-1.7.1/taglib/toolkit/tstring.h 2011-03-11 13:15:38.040108032 +0000 ++++ taglib-1.7.1-haiku/taglib/toolkit/tstring.h 2011-04-11 02:23:07.000000000 +0000 +@@ -31,7 +31,7 @@ + #include "tbytevector.h" + + #include +-#include ++#include + + /*! + * \relates TagLib::String +diff -urN taglib-1.7.1/taglib/toolkit/tstringlist.h taglib-1.7.1-haiku/taglib/toolkit/tstringlist.h +--- taglib-1.7.1/taglib/toolkit/tstringlist.h 2011-03-11 13:15:38.040370176 +0000 ++++ taglib-1.7.1-haiku/taglib/toolkit/tstringlist.h 2011-04-11 02:23:30.000000000 +0000 +@@ -31,7 +31,7 @@ + #include "tbytevectorlist.h" + #include "taglib_export.h" + +-#include ++#include + + namespace TagLib { + diff --git a/media-libs/taglib/patches/taglib-1.7.patch b/media-libs/taglib/patches/taglib-1.7.patch new file mode 100644 index 000000000..2ce32dfb7 --- /dev/null +++ b/media-libs/taglib/patches/taglib-1.7.patch @@ -0,0 +1,96 @@ +diff -urN taglib-1.7/taglib/ape/apefooter.cpp taglib-1.7-haiku/taglib/ape/apefooter.cpp +--- taglib-1.7/taglib/ape/apefooter.cpp 2011-03-11 13:15:38.020709376 +0000 ++++ taglib-1.7-haiku/taglib/ape/apefooter.cpp 2011-04-11 03:16:26.167772160 +0000 +@@ -24,7 +24,7 @@ + * http://www.mozilla.org/MPL/ * + ***************************************************************************/ + +-#include ++#include + #include + + #include +diff -urN taglib-1.7/taglib/mpeg/id3v2/id3v2header.cpp taglib-1.7-haiku/taglib/mpeg/id3v2/id3v2header.cpp +--- taglib-1.7/taglib/mpeg/id3v2/id3v2header.cpp 2011-03-11 13:15:38.031719424 +0000 ++++ taglib-1.7-haiku/taglib/mpeg/id3v2/id3v2header.cpp 2011-04-11 02:24:30.000000000 +0000 +@@ -23,7 +23,7 @@ + * http://www.mozilla.org/MPL/ * + ***************************************************************************/ + +-#include ++#include + #include + + #include +diff -urN taglib-1.7/taglib/mpeg/id3v2/id3v2synchdata.cpp taglib-1.7-haiku/taglib/mpeg/id3v2/id3v2synchdata.cpp +--- taglib-1.7/taglib/mpeg/id3v2/id3v2synchdata.cpp 2011-03-11 13:15:38.031981568 +0000 ++++ taglib-1.7-haiku/taglib/mpeg/id3v2/id3v2synchdata.cpp 2011-04-11 02:23:58.000000000 +0000 +@@ -23,7 +23,7 @@ + * http://www.mozilla.org/MPL/ * + ***************************************************************************/ + +-#include ++#include + + #include "id3v2synchdata.h" + +diff -urN taglib-1.7/taglib/toolkit/tbytevector.cpp taglib-1.7-haiku/taglib/toolkit/tbytevector.cpp +--- taglib-1.7/taglib/toolkit/tbytevector.cpp 2011-03-11 13:15:38.038797312 +0000 ++++ taglib-1.7-haiku/taglib/toolkit/tbytevector.cpp 2011-04-11 02:26:04.000000000 +0000 +@@ -23,7 +23,7 @@ + * http://www.mozilla.org/MPL/ * + ***************************************************************************/ + +-#include ++#include + + #include + #include +diff -urN taglib-1.7/taglib/toolkit/tbytevector.h taglib-1.7-haiku/taglib/toolkit/tbytevector.h +--- taglib-1.7/taglib/toolkit/tbytevector.h 2011-03-11 13:15:38.038797312 +0000 ++++ taglib-1.7-haiku/taglib/toolkit/tbytevector.h 2011-04-11 02:22:38.000000000 +0000 +@@ -30,7 +30,7 @@ + #include "taglib_export.h" + + #include +-#include ++#include + + namespace TagLib { + +diff -urN taglib-1.7/taglib/toolkit/tstring.cpp taglib-1.7-haiku/taglib/toolkit/tstring.cpp +--- taglib-1.7/taglib/toolkit/tstring.cpp 2011-03-11 13:15:38.040108032 +0000 ++++ taglib-1.7-haiku/taglib/toolkit/tstring.cpp 2011-04-11 02:25:40.000000000 +0000 +@@ -27,7 +27,7 @@ + #include "unicode.h" + #include "tdebug.h" + +-#include ++#include + + #include + +diff -urN taglib-1.7/taglib/toolkit/tstring.h taglib-1.7-haiku/taglib/toolkit/tstring.h +--- taglib-1.7/taglib/toolkit/tstring.h 2011-03-11 13:15:38.040108032 +0000 ++++ taglib-1.7-haiku/taglib/toolkit/tstring.h 2011-04-11 02:23:07.000000000 +0000 +@@ -31,7 +31,7 @@ + #include "tbytevector.h" + + #include +-#include ++#include + + /*! + * \relates TagLib::String +diff -urN taglib-1.7/taglib/toolkit/tstringlist.h taglib-1.7-haiku/taglib/toolkit/tstringlist.h +--- taglib-1.7/taglib/toolkit/tstringlist.h 2011-03-11 13:15:38.040370176 +0000 ++++ taglib-1.7-haiku/taglib/toolkit/tstringlist.h 2011-04-11 02:23:30.000000000 +0000 +@@ -31,7 +31,7 @@ + #include "tbytevectorlist.h" + #include "taglib_export.h" + +-#include ++#include + + namespace TagLib { + diff --git a/media-libs/taglib/taglib-1.7.1.bep b/media-libs/taglib/taglib-1.7.1.bep new file mode 100644 index 000000000..d8a160ffd --- /dev/null +++ b/media-libs/taglib/taglib-1.7.1.bep @@ -0,0 +1,21 @@ +DESCRIPTION="TagLib Audio Meta-Data Library" +HOMEPAGE="http://github.com/taglib" +SRC_URI="http://github.com/downloads/taglib/taglib/taglib-1.7.1.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="aa0f7e2d9700bbb78c5f990ed2f5d9b6" +BUILD { + cd taglib-1.7.1 + cmake . + make +} + +INSTALL { + cd taglib-1.7.1 + make install +} + +LICENSE="GNU LGPL v2 + MPL v1.1" +COPYRIGHT="2002-2012 Scott Wheeler" diff --git a/media-libs/taglib/taglib-1.7.2.bep b/media-libs/taglib/taglib-1.7.2.bep new file mode 100644 index 000000000..d8aba64fd --- /dev/null +++ b/media-libs/taglib/taglib-1.7.2.bep @@ -0,0 +1,21 @@ +DESCRIPTION="TagLib Audio Meta-Data Library" +HOMEPAGE="http://github.com/taglib" +SRC_URI="http://github.com/downloads/taglib/taglib/taglib-1.7.2.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="cmake" +CHECKSUM_MD5="b0a9e797d3833fb933c7c3176de3d720" +BUILD { + cd taglib-1.7.2 + cmake . + make +} + +INSTALL { + cd taglib-1.7.2 + make install +} + +LICENSE="GNU LGPL v2 + MPL v1.1" +COPYRIGHT="2002-2012 Scott Wheeler" diff --git a/media-libs/taglib/taglib-1.7.bep b/media-libs/taglib/taglib-1.7.bep new file mode 100644 index 000000000..0716bb487 --- /dev/null +++ b/media-libs/taglib/taglib-1.7.bep @@ -0,0 +1,21 @@ +DESCRIPTION="TagLib Audio Meta-Data Library" +HOMEPAGE="http://developer.kde.org/~wheeler/taglib.html" +SRC_URI="http://developer.kde.org/~wheeler/files/src/taglib-1.7.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="6a7e312668f153fa905a81714aebc257" +BUILD { + cd taglib-1.7 + cmake . + make +} + +INSTALL { + cd taglib-1.7 + make install +} + +LICENSE="GNU LGPL v2 + MPL v1.1" +COPYRIGHT="2002-2011 Scott Wheeler" diff --git a/media-libs/taglib/taglib-1.8.bep b/media-libs/taglib/taglib-1.8.bep new file mode 100644 index 000000000..a7abbd2ff --- /dev/null +++ b/media-libs/taglib/taglib-1.8.bep @@ -0,0 +1,21 @@ +DESCRIPTION="TagLib Audio Meta-Data Library" +HOMEPAGE="http://github.com/taglib" +SRC_URI="http://github.com/downloads/taglib/taglib/taglib-1.8.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="dcb8bd1b756f2843e18b1fdf3aaeee15" +BUILD { + cd taglib-1.8 + cmake . + make +} + +INSTALL { + cd taglib-1.8 + make install +} + +LICENSE="GNU LGPL v2 + MPL v1.1" +COPYRIGHT="2002-2012 Scott Wheeler" diff --git a/media-libs/tiff/tiff-3.8.2.bep b/media-libs/tiff/tiff-3.8.2.bep index d5d586ac8..4a2338e42 100644 --- a/media-libs/tiff/tiff-3.8.2.bep +++ b/media-libs/tiff/tiff-3.8.2.bep @@ -16,7 +16,7 @@ BUILD { autoconf autoheader automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/tiff/tiff-3.9.1.bep b/media-libs/tiff/tiff-3.9.1.bep index 8d36999e2..d0aa4e446 100644 --- a/media-libs/tiff/tiff-3.9.1.bep +++ b/media-libs/tiff/tiff-3.9.1.bep @@ -12,7 +12,7 @@ BUILD { autoconf autoheader automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/tiff/tiff-3.9.4.bep b/media-libs/tiff/tiff-3.9.4.bep index 2207c254e..4718a9b5f 100644 --- a/media-libs/tiff/tiff-3.9.4.bep +++ b/media-libs/tiff/tiff-3.9.4.bep @@ -12,7 +12,7 @@ BUILD { autoconf autoheader automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-libs/tiff/tiff-3.9.6.bep b/media-libs/tiff/tiff-3.9.6.bep new file mode 100644 index 000000000..a8fc84aaa --- /dev/null +++ b/media-libs/tiff/tiff-3.9.6.bep @@ -0,0 +1,22 @@ +DESCRIPTION="Tiff library" +HOMEPAGE="http://www.libtiff.org" +SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.6.tar.gz" +CHECKSUM_MD5="6920f3bf628d791d49f268b83612ed23" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd tiff-3.9.6 + libtoolize --force --copy --install + aclocal -I m4 + autoconf + autoheader + automake + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd tiff-3.9.6 + make install +} diff --git a/media-libs/tiff/tiff-4.0.2.bep b/media-libs/tiff/tiff-4.0.2.bep new file mode 100644 index 000000000..c94a19245 --- /dev/null +++ b/media-libs/tiff/tiff-4.0.2.bep @@ -0,0 +1,22 @@ +DESCRIPTION="Tiff library" +HOMEPAGE="http://www.libtiff.org" +SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.2.tar.gz" +CHECKSUM_MD5="04a08fa1e07e696e820a0c3f32465a13" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd tiff-4.0.2 + libtoolize --force --copy --install + aclocal -I m4 + autoconf + autoheader + automake + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd tiff-4.0.2 + make install +} diff --git a/media-libs/vigra/vigra-1.8.0.bep b/media-libs/vigra/vigra-1.8.0.bep new file mode 100644 index 000000000..dee691ec6 --- /dev/null +++ b/media-libs/vigra/vigra-1.8.0.bep @@ -0,0 +1,21 @@ +DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures. " +HOMEPAGE="http://hci.iwr.uni-heidelberg.de/vigra/" +SRC_URI="http://hci.iwr.uni-heidelberg.de/vigra/vigra-1.8.0-src.tar.gz" +CHECKSUM_MD5="15c5544448e529ee60020758ab6be264" +REVISION="1" +STATUS_HAIKU="stable" +MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building." +DEPEND="cmake" +BUILD { + cd vigra-1.8.0 + cmake CMakelists.txt + make +} + +INSTALL { + cd vigra-1.8.0 + make install +} + +LICENSE="MIT" +COPYRIGHT="1998-2010 by Ullrich Koethe" diff --git a/media-libs/waave/waave-1.01.bep b/media-libs/waave/waave-1.01.bep new file mode 100644 index 000000000..2c42eff3f --- /dev/null +++ b/media-libs/waave/waave-1.01.bep @@ -0,0 +1,26 @@ +DESCRIPTION="The audio/video engine - Why Another Audio Video Engine" +HOMEPAGE="http://waave.sourceforge.net" +SRC_URI="http://sourceforge.net/projects/waave/files/waave-1.01.tar.gz/download" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="media-libs/libsdl >= 1.2.15 + media-video/ffmeg >= 0.10.2" +CHECKSUM_MD5="7f168d3122a3889ee6da3a380cfe1c99" +BUILD { + cd waave-1.01 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd waave-1.01 + make install +} + +TEST { + cd waave-1.01/test + make +} + +LICENSE="GNU GPL v3" +COPYRIGHT="2012 Baptiste Pellegrin" diff --git a/media-libs/x264/patches/x264-20120803.patch b/media-libs/x264/patches/x264-20120803.patch new file mode 100644 index 000000000..6e48d2cc2 --- /dev/null +++ b/media-libs/x264/patches/x264-20120803.patch @@ -0,0 +1,12 @@ +--- x264-snapshot-20120803-2245.orig/configure 2012-08-03 20:45:03.065273856 +0000 ++++ x264-snapshot-20120803-2245/configure 2012-08-04 12:56:56.527171584 +0000 +@@ -520,6 +520,9 @@ + fi + HAVE_GETOPT_LONG=0 + ;; ++ *haiku*) ++ SYS="haiku" ++ ;; + *) + die "Unknown system $host, edit the configure" + ;; diff --git a/media-libs/x264/x264-20120803.bep b/media-libs/x264/x264-20120803.bep new file mode 100644 index 000000000..21aed8d29 --- /dev/null +++ b/media-libs/x264/x264-20120803.bep @@ -0,0 +1,20 @@ +DESCRIPTION="x264 h.264/AVC encoder" +HOMEPAGE="http://www.videolan.org/developers/x264.html" +SRC_URI="ftp://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20120803-2245.tar.bz2" +CHECKSUM_MD5="0ce9048809a447b89aaecd7c8c8b2e0d" +REVISION="1" +MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building." +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd x264-snapshot-20120803-2245 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd x264-snapshot-20120803-2245 + make install-lib-static +} +LICENSE="GNU GPL v2" +COPYRIGHT="2003-2012 http://www.videolan.org/developers/x264.html" diff --git a/media-sound/bladeenc/bladeenc-0.94.2.bep b/media-sound/bladeenc/bladeenc-0.94.2.bep index 370691c87..dd03383d4 100644 --- a/media-sound/bladeenc/bladeenc-0.94.2.bep +++ b/media-sound/bladeenc/bladeenc-0.94.2.bep @@ -11,7 +11,7 @@ BUILD { aclocal automake --add-missing autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep b/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep new file mode 100644 index 000000000..093c96677 --- /dev/null +++ b/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep @@ -0,0 +1,24 @@ +DESCRIPTION="A branch for adding a new function to the FluidSynth API, fluid_player_add_mem." +HOMEPAGE="https://code.launchpad.net/~mgiuca/fluidsynth/midi-buffer" +SRC_URI="bzr+lp:~mgiuca/fluidsynth/midi-buffer" +#CHECKSUM_MD5="" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/glib >= 2.24.1 + media-libs/libsndfile >= 1.0.18" + +BUILD { + cd fluidsynth-1.1-midi-buffer + cd fluidsynth + cmake . + make +} + +INSTALL { + cd fluidsynth-1.1-midi-buffer + cd fluidsynth + make install +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2007-2011 Matt Giuca, Josh Green, Pedro Lopez-Cabanillas, David Henningsson" diff --git a/media-sound/fluidsynth/fluidsynth-1.1.3.bep b/media-sound/fluidsynth/fluidsynth-1.1.3.bep new file mode 100644 index 000000000..d4792455e --- /dev/null +++ b/media-sound/fluidsynth/fluidsynth-1.1.3.bep @@ -0,0 +1,22 @@ +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.3/fluidsynth-1.1.3.tar.bz2/download" +CHECKSUM_MD5="6e35225b088eae0c2af0b78097941655" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/glib >= 2.24.1 + media-libs/libsndfile >= 1.0.18" + +BUILD { + cd fluidsynth-1.1.3 + cmake . + make +} + +INSTALL { + cd fluidsynth-1.1.3 + make install +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2007-2010 Josh Green, Pedro Lopez-Cabanillas, David Henningsson" diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.bep b/media-sound/fluidsynth/fluidsynth-1.1.6.bep new file mode 100644 index 000000000..86ea54247 --- /dev/null +++ b/media-sound/fluidsynth/fluidsynth-1.1.6.bep @@ -0,0 +1,23 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/glib >= 2.26.1 + media-libs/libsndfile >= 1.0.21 + sys-libs/readline >= 6.0" + +BUILD { + cd fluidsynth-1.1.6 + cmake . + make +} + +INSTALL { + cd fluidsynth-1.1.6 + make install prefix=`finddir B_COMMON_DIRECTORY` +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2007-2012 Josh Green, Pedro Lopez-Cabanillas, David Henningsson" diff --git a/media-sound/fluidsynth/patches/fluidsynth-1.1-midi-buffer.patch b/media-sound/fluidsynth/patches/fluidsynth-1.1-midi-buffer.patch new file mode 100644 index 000000000..e21a1f21f --- /dev/null +++ b/media-sound/fluidsynth/patches/fluidsynth-1.1-midi-buffer.patch @@ -0,0 +1,38 @@ +diff -Naur fluidsynth-1.1-midi-buffer/fluidsynth/CMakeLists.txt fluidsynth-1.1-midi-buffer-haiku/fluidsynth/CMakeLists.txt +--- fluidsynth-1.1-midi-buffer/fluidsynth/CMakeLists.txt 2011-04-24 20:59:42.047710208 -0300 ++++ fluidsynth-1.1-midi-buffer-haiku/fluidsynth/CMakeLists.txt 2011-04-24 21:01:20.278134784 -0300 +@@ -166,10 +166,18 @@ + add_definitions ( -mms-bitfields ) + endif ( MINGW ) + else ( WIN32 ) +-# Check PThreads, but not in Windows +- find_package ( Pthreads REQUIRED ) +- set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} ) +- set ( LIBFLUID_LIBS "m" ) ++ ++if (UNIX AND NOT BEOS) ++# Check PThreads, but not in Windows ++ find_package ( Pthreads REQUIRED ) ++ set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} ) ++ set ( LIBFLUID_LIBS "m" ) ++endif (UNIX AND NOT BEOS) ++ ++if (BEOS) ++set ( LIBFLUID_LIBS "network") ++endif (BEOS) ++ + endif ( WIN32 ) + + # IBM OS/2 +diff -Naur fluidsynth-1.1-midi-buffer/fluidsynth/src/utils/fluid_sys.h fluidsynth-1.1-midi-buffer-haiku/fluidsynth/src/utils/fluid_sys.h +--- fluidsynth-1.1-midi-buffer/fluidsynth/src/utils/fluid_sys.h 2011-04-24 20:59:42.047710208 -0300 ++++ fluidsynth-1.1-midi-buffer-haiku/fluidsynth/src/utils/fluid_sys.h 2011-04-24 21:02:01.829685760 -0300 +@@ -335,7 +335,7 @@ + sample data. + */ + +-#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) ++#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) && !defined(__HAIKU__) + #define fluid_mlock(_p,_n) mlock(_p, _n) + #define fluid_munlock(_p,_n) munlock(_p,_n) + #else diff --git a/media-sound/fluidsynth/patches/fluidsynth-1.1.3.patch b/media-sound/fluidsynth/patches/fluidsynth-1.1.3.patch new file mode 100644 index 000000000..a43b39386 --- /dev/null +++ b/media-sound/fluidsynth/patches/fluidsynth-1.1.3.patch @@ -0,0 +1,34 @@ +diff -Naur fluidsynth-1.1.3/CMakeLists.txt fluidsynth-1.1.3-haiku/CMakeLists.txt +--- fluidsynth-1.1.3/CMakeLists.txt 2010-10-10 22:16:30.031457280 -0300 ++++ fluidsynth-1.1.3-haiku/CMakeLists.txt 2011-04-24 14:21:01.000000000 -0300 +@@ -152,9 +152,18 @@ + endif ( MINGW ) + else ( WIN32 ) + # Check PThreads, but not in Windows ++ ++if (UNIX AND NOT BEOS) ++# Check PThreads, but not in Windows + find_package ( Pthreads REQUIRED ) + set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} ) + set ( LIBFLUID_LIBS "m" ) ++endif (UNIX AND NOT BEOS) ++ ++if (BEOS) ++set ( LIBFLUID_LIBS "network") ++endif (BEOS) ++ + endif ( WIN32 ) + + # IBM OS/2 +diff -Naur fluidsynth-1.1.3/src/utils/fluid_sys.h fluidsynth-1.1.3-haiku/src/utils/fluid_sys.h +--- fluidsynth-1.1.3/src/utils/fluid_sys.h 2010-10-10 22:16:30.022806528 -0300 ++++ fluidsynth-1.1.3-haiku/src/utils/fluid_sys.h 2011-04-24 14:17:52.000000000 -0300 +@@ -335,7 +335,7 @@ + sample data. + */ + +-#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) ++#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) && !defined(__HAIKU__) + #define fluid_mlock(_p,_n) mlock(_p, _n) + #define fluid_munlock(_p,_n) munlock(_p,_n) + #else diff --git a/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch b/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch new file mode 100644 index 000000000..d37506392 --- /dev/null +++ b/media-sound/fluidsynth/patches/fluidsynth-1.1.6.patch @@ -0,0 +1,35 @@ +diff -urN fluidsynth-1.1.6/CMakeLists.txt fluidsynth-1.1.6-haiku/CMakeLists.txt +--- fluidsynth-1.1.6/CMakeLists.txt ++++ fluidsynth-1.1.6/haiku/CMakeLists.txt +@@ -168,9 +168,16 @@ + endif ( MINGW ) + else ( WIN32 ) + # Check PThreads, but not in Windows +- find_package ( Pthreads REQUIRED ) +- set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} ) +- set ( LIBFLUID_LIBS "m" ) ++if (UNIX AND NOT HAIKU) ++# Check PThreads, but not in Windows ++ find_package ( Pthreads REQUIRED ) ++ set ( HAVE_LIBPTHREAD ${PTHREADS_FOUND} ) ++ set ( LIBFLUID_LIBS "m" ) ++endif (UNIX AND NOT HAIKU) ++ ++if (HAIKU) ++set ( LIBFLUID_LIBS "network") ++endif (HAIKU) + endif ( WIN32 ) + + # IBM OS/2 +diff -Naur fluidsynth-1.1.6/src/utils/fluid_sys.h fluidsynth-1.1.3-haiku/src/utils/fluid_sys.h +--- fluidsynth-1.1.6/src/utils/fluid_sys.h ++++ fluidsynth-1.1.6-haiku/src/utils/fluid_sys.h +@@ -335,7 +335,7 @@ + sample data. + */ + +-#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) ++#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) && !defined(__HAIKU__) + #define fluid_mlock(_p,_n) mlock(_p, _n) + #define fluid_munlock(_p,_n) munlock(_p,_n) + #else diff --git a/media-sound/gogo-no-coda/gogo-no-coda-3.13.bep b/media-sound/gogo-no-coda/gogo-no-coda-3.13.bep new file mode 100644 index 000000000..a69303f3f --- /dev/null +++ b/media-sound/gogo-no-coda/gogo-no-coda-3.13.bep @@ -0,0 +1,21 @@ +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="b60ae82f7fc70cbefd2e4003b9e13c8f" +REVISION="1" +STATUS_HAIKU="stable" +MESSAGE="This port only builds with gcc2. Use 'setgcc gcc2' before building." +DEPEND="dev-lang/nasm" + +BUILD { + cd gogo-no-coda-master/linux + make +} + +INSTALL { + cd gogo-no-coda-master/linux + make install prefix=`finddir B_COMMON_DIRECTORY` +} + +LICENSE="GNU LGPL v2" +COPYRIGHT="2001-2003 Respective gogo-no-coda creators" diff --git a/media-sound/gogo-no-coda/patches/gogo-no-coda-3.13.patch b/media-sound/gogo-no-coda/patches/gogo-no-coda-3.13.patch new file mode 100644 index 000000000..09dd4e49e --- /dev/null +++ b/media-sound/gogo-no-coda/patches/gogo-no-coda-3.13.patch @@ -0,0 +1,117 @@ +diff -Naur gogo-no-coda-master/engine/i386/cpu.c gogo-no-coda-master-haiku/engine/i386/cpu.c +--- gogo-no-coda-master/engine/i386/cpu.c 2011-05-17 09:51:26.045350912 +0000 ++++ gogo-no-coda-master-haiku/engine/i386/cpu.c 2012-12-30 16:42:53.811073536 +0000 +@@ -162,7 +162,7 @@ + } + return nCPU; + +-#elif defined(BeOS) ++#elif defined(BeOS) || defined(__HAIKU__) + + system_info udtsystem_info; + get_system_info(&udtsystem_info); +diff -Naur gogo-no-coda-master/engine/i386/fftsse.nas gogo-no-coda-master-haiku/engine/i386/fftsse.nas +--- gogo-no-coda-master/engine/i386/fftsse.nas 2011-05-17 09:51:26.045613056 +0000 ++++ gogo-no-coda-master-haiku/engine/i386/fftsse.nas 2012-12-30 16:42:53.823656448 +0000 +@@ -23,14 +23,14 @@ + Q_SQRT2 dd 1.41421356237, 1.41421356237, 1.41421356237, 1.41421356237 + + Q_1 dd 1.0, 1.0, 1.0, 1.0 +-costab dd 9.238795325112867e-01F, 9.238795325112867e-01F, 9.238795325112867e-01F, 9.238795325112867e-01F +- dd 3.826834323650898e-01F, 3.826834323650898e-01F, 3.826834323650898e-01F, 3.826834323650898e-01F +- dd 9.951847266721969e-01F, 9.951847266721969e-01F, 9.951847266721969e-01F, 9.951847266721969e-01F +- dd 9.801714032956060e-02F, 9.801714032956060e-02F, 9.801714032956060e-02F, 9.801714032956060e-02F +- dd 9.996988186962042e-01F, 9.996988186962042e-01F, 9.996988186962042e-01F, 9.996988186962042e-01F +- dd 2.454122852291229e-02F, 2.454122852291229e-02F, 2.454122852291229e-02F, 2.454122852291229e-02F +- dd 9.999811752826011e-01F, 9.999811752826011e-01F, 9.999811752826011e-01F, 9.999811752826011e-01F +- dd 6.135884649154475e-03F, 6.135884649154475e-03F, 6.135884649154475e-03F, 6.135884649154475e-03F ++costab dd 9.238795325112867e-01, 9.238795325112867e-01, 9.238795325112867e-01, 9.238795325112867e-01 ++ dd 3.826834323650898e-01, 3.826834323650898e-01, 3.826834323650898e-01, 3.826834323650898e-01 ++ dd 9.951847266721969e-01, 9.951847266721969e-01, 9.951847266721969e-01, 9.951847266721969e-01 ++ dd 9.801714032956060e-02, 9.801714032956060e-02, 9.801714032956060e-02, 9.801714032956060e-02 ++ dd 9.996988186962042e-01, 9.996988186962042e-01, 9.996988186962042e-01, 9.996988186962042e-01 ++ dd 2.454122852291229e-02, 2.454122852291229e-02, 2.454122852291229e-02, 2.454122852291229e-02 ++ dd 9.999811752826011e-01, 9.999811752826011e-01, 9.999811752826011e-01, 9.999811752826011e-01 ++ dd 6.135884649154475e-03, 6.135884649154475e-03, 6.135884649154475e-03, 6.135884649154475e-03 + + align 32 + revLongInit db 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 +diff -Naur gogo-no-coda-master/engine/i386/makecfg.c gogo-no-coda-master-haiku/engine/i386/makecfg.c +--- gogo-no-coda-master/engine/i386/makecfg.c 2011-05-17 09:51:26.045875200 +0000 ++++ gogo-no-coda-master-haiku/engine/i386/makecfg.c 2012-12-30 16:42:53.837812224 +0000 +@@ -18,7 +18,7 @@ + RW_t RW; + RO_t RO; + +-#if (defined(WIN32) || defined(__linux__) || defined(__os2__)) && !defined(__BORLANDC__) && !defined(__MINGW32_VERSION) ++#if (defined(WIN32) || defined(__linux__) || defined(__os2__) || defined(__HAIKU__)) && !defined(__BORLANDC__) && !defined(__MINGW32_VERSION) + #define USE_BSS + #endif + +diff -Naur gogo-no-coda-master/linux/Makefile gogo-no-coda-master-haiku/linux/Makefile +--- gogo-no-coda-master/linux/Makefile 2011-05-17 09:51:26.057147392 +0000 ++++ gogo-no-coda-master-haiku/linux/Makefile 2012-12-30 16:44:48.008912896 +0000 +@@ -8,6 +8,8 @@ + ####################################################### + + TARGET = gogo ++prefix = ++BINDIR = $(prefix)/bin + + ####################################################### + +@@ -16,12 +18,11 @@ + AS = nasm -i../engine/i386/ + LD = gcc + MAKECFG = makecfg +-LIBS = -lm + VPATH = ../engine:../engine/i386:../file_io + + LDFLAGS = $(PROF) + AFLAGS = -f elf -D__unix__ $(E3DN) +-CFLAGS = -Wall $(PROF) -DNDEBUG ++CFLAGS = -Wall $(PROF) -D__unix__ + #CFLAGS += -Wpointer-arith -Wshadow -Wwrite-strings -Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs + + CFLAGS += -DHAVE_CONFIG_H -DLAMEPARSE -DLAMESNDFILE +@@ -97,7 +98,6 @@ + #COBJS += $(LIBSNDCOBJS) + + # if FreeBSD then change -lc_r +-LIBS += -lpthread + CFLAGS += -DUSE_PTHREAD + COBJS += thread.o + +@@ -105,9 +105,10 @@ + + all: $(TARGET) + +-install : $(TARGET) +- cp $(TARGET) /usr/local/bin +- strip /usr/local/bin/$(TARGET) ++install : $(TARGET) $(BINDIR) ++ mkdir -p $(DESTDIR)$(BINDIR) ++ install -m 0755 $(TARGET) $(DESTDIR)$(BINDIR) ++ strip $(DESTDIR)$(BINDIR)/$(TARGET) + + $(TARGET): $(COBJS) $(AOBJS) + $(LD) $(COBJS) $(AOBJS) $(LDFLAGS) -o $(TARGET) $(LIBS) +diff -Naur gogo-no-coda-master/main.c gogo-no-coda-master-haiku/main.c +--- gogo-no-coda-master/main.c 2011-05-17 09:51:26.057409536 +0000 ++++ gogo-no-coda-master-haiku/main.c 2012-12-30 16:42:53.853803008 +0000 +@@ -5,13 +5,13 @@ + * Copyright(C) 2001,2002,2003 gogo-developer + */ + +-#if defined(__linux__) || defined(__ppc__) || defined(__FreeBSD__) ++#if defined(__linux__) || defined(__ppc__) || defined(__FreeBSD__) || defined(__HAIKU__) + #define USE_ITIMER + #include + #include + #include + #endif +-#if defined(__linux__) || defined(__os2__) || defined(__ppc__) || defined(__CYGWIN32__) || defined(__FreeBSD__) ++#if defined(__linux__) || defined(__os2__) || defined(__ppc__) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__HAIKU__) + # define min(x,y) (((x)<(y))?(x):(y)) + # define max(x,y) (((x)>(y))?(x):(y)) + #endif diff --git a/media-sound/jack2/jack2-1.9.8.bep b/media-sound/jack2/jack2-1.9.8.bep new file mode 100644 index 000000000..9f83969e5 --- /dev/null +++ b/media-sound/jack2/jack2-1.9.8.bep @@ -0,0 +1,23 @@ +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" +STATUS_HAIKU="unstable" +DEPEND="media-libs/libsamplerate >= 0.1.8 + media-libs/libsndfile >= 1.0.21" +#CHECKSUM_MD5="" +MESSAGE="This port only builds with gcc4." +BUILD { + cd jack2-1.9.8 + python ./waf configure --prefix=/boot/common/ + python ./waf build +} + +INSTALL { + cd jack2-1.9.8 + python ./waf build install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2001-2011 Paul Davis." + diff --git a/media-sound/lame/lame-3.98.4.bep b/media-sound/lame/lame-3.98.4.bep index b7d6b7dba..d5f82fbe4 100644 --- a/media-sound/lame/lame-3.98.4.bep +++ b/media-sound/lame/lame-3.98.4.bep @@ -14,7 +14,7 @@ BUILD { libtoolize --force --copy --install aclocal -I m4 autoconf --warnings=none - ./configure --prefix=/boot/common --without-gtk + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --without-gtk make } diff --git a/media-sound/lame/lame-3.99.bep b/media-sound/lame/lame-3.99.bep new file mode 100644 index 000000000..79a54d80d --- /dev/null +++ b/media-sound/lame/lame-3.99.bep @@ -0,0 +1,26 @@ +DESCRIPTION="LAME Ain't an MP3 Encoder" +HOMEPAGE="http://lame.sourceforge.net/" +SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.tar.gz" +CHECKSUM_MD5="7abacd1d0a65a63733335786015626db" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd lame-3.99 + mkdir -p m4 +# configure checks for gtk, but they didn't include the gtk.m4 so we need to. + cp ../../patches/gtk.m4 m4 + echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in + libtoolize --force --copy --install + aclocal -I m4 + autoconf --warnings=none + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --without-gtk + make +} + +INSTALL { + cd lame-3.99 + make install +} +LICENSE="GNU LGPL v2" +COPYRIGHT="1998-2011 Mike Cheng et al." diff --git a/media-sound/lame/lame-398-2.bep b/media-sound/lame/lame-398-2.bep index 3d47050eb..35b0cb71b 100644 --- a/media-sound/lame/lame-398-2.bep +++ b/media-sound/lame/lame-398-2.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-sound/lame/patches/lame-3.99.patch b/media-sound/lame/patches/lame-3.99.patch new file mode 100644 index 000000000..5769c5d69 --- /dev/null +++ b/media-sound/lame/patches/lame-3.99.patch @@ -0,0 +1,13 @@ +diff -urN lame-3.99/configure.in lame-3.99-haiku/configure.in +--- lame-3.99/configure.in 2010-06-21 14:16:05.000000000 +0000 ++++ lame-3.99-haiku/configure.in 2010-06-21 15:12:31.000000000 +0000 +@@ -343,6 +343,9 @@ + *solaris*) + LIBS="$LIBS -lnsl" + ;; ++ *haiku*) ++ LIBS="$LIBS -lnetwork" ++ ;; + esac + fi + fi diff --git a/media-sound/milkytracker/milkytracker-0.90.85.bep b/media-sound/milkytracker/milkytracker-0.90.85.bep new file mode 100644 index 000000000..6a8dd7a64 --- /dev/null +++ b/media-sound/milkytracker/milkytracker-0.90.85.bep @@ -0,0 +1,29 @@ +DESCRIPTION="Fasttracker 2 inspired music tracker" +HOMEPAGE="www.orangejua.de/milkytracker.shtml" +SRC_URI="http://www.orangejua.de/archives/MilkyTracker-0.90.85-haiku-2-source.zip" +CHECKSUM_MD5="9d844e81527aa397aa06d648099af2f4" +STATUS_HAIKU="stable" +REVISION="1" +DEPEND="media-libs/libsdl >= 1.2 + sys-libs/zlib >= 1.2.5" + +BUILD { + cd 'MilkyTracker Source Code'/platforms/haiku + bash ./Add_Jamfiles.sh + cd ../.. + jam +} + +INSTALL { + cd 'MilkyTracker Source Code'/src/tracker + APPDIR=`finddir B_APPS_DIRECTORY`/MilkyTracker + APPSETTINGSDIR=`finddir B_USER_SETTINGS_DIRECTORY`/MilkyTracker/ + mkdir -p ${DESTDIR}/${APPSETTINGSDIR} + mkdir -p ${DESTDIR}/${APPDIR} + cp -af MilkyTracker ${DESTDIR}/${APPDIR} + cd haiku/MilkySettings + cp -af MilkySettings ${DESTDIR}/${APPSETTINGSDIR} +} + +LICENSE="GNU GPL v3" +COPYRIGHT="1994-2006 Peter Barth, Christopher O'Neill, Antti S. Lankila, Varthall, Andrew Simper, David Ross, Stuart Caie, Claudio Matsuoka" diff --git a/media-sound/mpg123/mpg123-1.12.1.bep b/media-sound/mpg123/mpg123-1.12.1.bep index 6164581a5..361107799 100644 --- a/media-sound/mpg123/mpg123-1.12.1.bep +++ b/media-sound/mpg123/mpg123-1.12.1.bep @@ -10,7 +10,7 @@ BUILD { libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=/boot/common --disable-aligncheck + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-aligncheck make } diff --git a/media-sound/naspro/naspro-0.2.9-hg.bep b/media-sound/naspro/naspro-0.2.9-hg.bep index bf56aa1da..7129d2e0f 100644 --- a/media-sound/naspro/naspro-0.2.9-hg.bep +++ b/media-sound/naspro/naspro-0.2.9-hg.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd naspro-0.2.9-hg/naspro-core ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-sound/ocp/ocp-0.1.21-git.bep b/media-sound/ocp/ocp-0.1.21-git.bep new file mode 100644 index 000000000..f300ccc3b --- /dev/null +++ b/media-sound/ocp/ocp-0.1.21-git.bep @@ -0,0 +1,26 @@ +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" +STATUS_HAIKU="stable" +DEPEND="media-libs/libvorbis >= 1.3.1 + media-libs/libogg >= 1.2.2 + sys-devel/gettext >= 0.18.1.1 + media-libs/libsdl >= 1.2.14" +# media-libs/flac >= 1.2.1" +# ncurses zlib ... cf. ocp.spec +MESSAGE="This port requires gcc4" +BUILD { + cd code + autoconf + CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd code + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others" diff --git a/media-sound/ocp/ocp-snapshot20110319.bep b/media-sound/ocp/ocp-snapshot20110319.bep new file mode 100644 index 000000000..1998800f0 --- /dev/null +++ b/media-sound/ocp/ocp-snapshot20110319.bep @@ -0,0 +1,27 @@ +DESCRIPTION="ocp - Open Cubic Player, a music player ported from DOS" +HOMEPAGE="http://stian.cubic.org/project-ocp.php" +SRC_URI="http://stian.cubic.org/ocp/ocp-snapshot-20110319.tar.bz2" +CHECKSUM_MD5="4adb34d39053e06bca00aa6b4ec8dd93" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/libvorbis >= 1.3.1 + media-libs/libogg >= 1.2.2 + sys-devel/gettext >= 0.18.1.1 + media-libs/libsdl >= 1.2.14" +# media-libs/flac >= 1.2.1" +# ncurses zlib ... cf. ocp.spec +MESSAGE="This port requires gcc4" +BUILD { + cd ocp-snapshot-20110319 + autoconf + CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd ocp-snapshot-20110319 + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="1994-2011 Niklas Beisert, Stian Skjelstad and others" diff --git a/media-sound/ocp/ocp-snapshot20110320.bep b/media-sound/ocp/ocp-snapshot20110320.bep new file mode 100644 index 000000000..0df6d4339 --- /dev/null +++ b/media-sound/ocp/ocp-snapshot20110320.bep @@ -0,0 +1,27 @@ +DESCRIPTION="ocp - Open Cubic Player, a music player ported from DOS" +HOMEPAGE="http://stian.cubic.org/project-ocp.php" +SRC_URI="http://stian.cubic.org/ocp/ocp-snapshot-20110320.tar.bz2" +CHECKSUM_MD5="febb786fc6c1450a404578369a1f2adc" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/libvorbis >= 1.3.1 + media-libs/libogg >= 1.2.2 + sys-devel/gettext >= 0.18.1.1 + media-libs/libsdl >= 1.2.14" +# media-libs/flac >= 1.2.1" +# ncurses zlib ... cf. ocp.spec +MESSAGE="This port requires gcc4" +BUILD { + cd ocp-snapshot-20110320 + autoconf + CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd ocp-snapshot-20110320 + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="1994-2011 Niklas Beisert, Stian Skjelstad and others" diff --git a/media-sound/ocp/patches/ocp-snapshot20110319.patch b/media-sound/ocp/patches/ocp-snapshot20110319.patch new file mode 100644 index 000000000..dfb3e8d8d --- /dev/null +++ b/media-sound/ocp/patches/ocp-snapshot20110319.patch @@ -0,0 +1,504 @@ +diff -ur ../ocp-snapshot-20110319.org/Makefile.in ./Makefile.in +--- ../ocp-snapshot-20110319.org/Makefile.in 2011-03-19 01:04:33.008650752 +0100 ++++ ocp-snapshot-20110319/Makefile.in 2011-03-19 02:03:20.319291392 +0100 +@@ -165,7 +165,7 @@ + $(MAKE) -C doc TOPDIR="../$(TOPDIR)" + + ocp: boot/kickload.o +- $(CC) $(LDFLAGS) -o $@ $^ -pthread @DL_LIBS@ @EFENCE_LIBS@ @DUMA_LIBS@ ++ $(CC) $(LDFLAGS) -o $@ $^ @PTHREAD_LIBS@ @DL_LIBS@ @EFENCE_LIBS@ @DUMA_LIBS@ + + ocp.hlp: doc/opencp.dox goodies/helpc/ocphhc + goodies/helpc/ocphhc doc/opencp.dox $@ +@@ -207,7 +207,7 @@ + rm -Rf config.h autom4te.cache Rules.make config.log config.status Makefile ocp.ini desktop/opencubicplayer.desktop doc/texi/faq.texi doc/texi/install.texi doc/texi/ocp.texi goodies/pack/Makefile goodies/helpc/Makefile + + fstypes$(LIB_SUFFIX): dirs $(fstypes_so) +- $(CC) $(SHARED_FLAGS) $(ICONV_LIBS) -o $@ $(fstypes_so) ++ $(CC) $(SHARED_FLAGS) $(ICONV_LIBS) $(LDFLAGS) -o $@ $(fstypes_so) + + libocp$(LIB_SUFFIX): $(libocp_so) + $(CC) $(SHARED_FLAGS) $(STATIC_LIBS) -o $@ $(libocp_so) +diff -ur ../ocp-snapshot-20110319.org/boot/kickload.c ./boot/kickload.c +--- ../ocp-snapshot-20110319.org/boot/kickload.c 2011-03-19 01:04:33.044826624 +0100 ++++ ocp-snapshot-20110319/boot/kickload.c 2011-03-19 02:03:20.439091200 +0100 +@@ -601,6 +601,8 @@ + + #ifdef __linux + dir=get_current_dir_name(); ++#elif defined(HAVE_GETCWD) ++ dir=getcwd(malloc(PATH_MAX), PATH_MAX); + #else /* BSD */ + dir=getwd(malloc(PATH_MAX)); + #endif +diff -ur ../ocp-snapshot-20110319.org/boot/pmain.c ./boot/pmain.c +--- ../ocp-snapshot-20110319.org/boot/pmain.c 2011-03-19 01:04:33.045350912 +0100 ++++ ocp-snapshot-20110319/boot/pmain.c 2011-03-19 15:09:03.064749568 +0100 +@@ -110,7 +110,7 @@ + printf(" curses : ncurses driver\n"); + printf(" x11 : x11 driver\n"); + printf(" vcsa : vcsa/fb linux console driver\n"); +- printf(" sdl : SDL video driverr\n"); ++ printf(" sdl : SDL video driver\n"); + printf("\nExample : ocp -fl0,r1 -vp75,f2 -spdevpdisk -sr48000 ftstar.xm\n"); + printf(" (for nice HD rendering of modules)\n"); + return errHelpPrinted; +diff -ur ../ocp-snapshot-20110319.org/config.h.in ./config.h.in +--- ../ocp-snapshot-20110319.org/config.h.in 2011-03-19 01:04:33.066060288 +0100 ++++ ocp-snapshot-20110319/config.h.in 2011-03-19 02:05:09.172490752 +0100 +@@ -190,6 +190,8 @@ + + #undef DLLVERSION + ++#undef HAVE_GETCWD ++ + #undef HAVE_MEMMEM + + #undef HAVE_QSORT +diff -ur ../ocp-snapshot-20110319.org/configure.ac ./configure.ac +--- ../ocp-snapshot-20110319.org/configure.ac 2011-03-19 01:04:33.051642368 +0100 ++++ ocp-snapshot-20110319/configure.ac 2011-03-19 02:44:49.498860032 +0100 +@@ -29,6 +29,7 @@ + AC_C_BIGENDIAN + + AC_SUBST(SHARED_FLAGS) ++AC_SUBST(PTHREAD_LIBS) + AC_SUBST(LIB_SUFFIX) + target=`gcc -dumpmachine` + case "$target" in +@@ -36,10 +37,18 @@ + SHARED_FLAGS="-dynamiclib -flat_namespace -undefined suppress" + CFLAGS="$CFLAGS -fno-common" + CXXFLAGS="$CXXFLAGS -fno-common" ++ PTHREAD_LIBS=-pthread + LIB_SUFFIX=.dylib + ;; ++ *-haiku*) ++ SHARED_FLAGS=-shared ++ LIB_SUFFIX=.so ++ PTHREAD_LIBS= ++ with_desktop_file_install=no ++ ;; + *) + SHARED_FLAGS=-shared ++ PTHREAD_LIBS=-pthread + LIB_SUFFIX=.so + ;; + esac +@@ -172,6 +181,7 @@ + ]) + ) + ++AC_CHECK_FUNCS(getcwd) + AC_CHECK_FUNCS(memmem) + AC_CHECK_FUNCS(qsort) + AC_CHECK_FUNCS(sysconf) +diff -ur ../ocp-snapshot-20110319.org/stuff/compat.c ./stuff/compat.c +--- ../ocp-snapshot-20110319.org/stuff/compat.c 2011-03-19 01:04:33.053739520 +0100 ++++ ocp-snapshot-20110319/stuff/compat.c 2011-03-19 02:10:17.354418688 +0100 +@@ -204,7 +204,7 @@ + *src=toupper(*src); + src++; + } +- return src; ++ return retval; + } + + #endif +diff -ur ../ocp-snapshot-20110319.org/devp/Makefile ./devp/Makefile +--- ../ocp-snapshot-20110319.org/devp/Makefile 2011-03-19 01:04:33.048234496 +0100 ++++ ocp-snapshot-20110319/devp/Makefile 2011-03-19 03:37:27.953679872 +0100 +@@ -13,7 +13,11 @@ + COREAUDIO_SO=devpcoreaudio$(LIB_SUFFIX) + endif + +-all: devpnone$(LIB_SUFFIX) devpdisk$(LIB_SUFFIX) $(OSS_SO) $(ALSA_SO) $(COREAUDIO_SO) ++ifeq ($(HAVE_SDL),1) ++SDL_SO=devpsdl$(LIB_SUFFIX) ++endif ++ ++all: devpnone$(LIB_SUFFIX) devpdisk$(LIB_SUFFIX) $(OSS_SO) $(ALSA_SO) $(COREAUDIO_SO) $(SDL_SO) + + devpnone_so=devpnone.o + devpnone$(LIB_SUFFIX): $(devpnone_so) +@@ -35,6 +39,10 @@ + devpcoreaudio$(LIB_SUFFIX):$(devpcoreaudio_so) + $(CC) $(SHARED_FLAGS) -o $@ $^ $(COREAUDIO_LIBS) + ++devpsdl_so=devpsdl.o ++devpsdl$(LIB_SUFFIX):$(devpsdl_so) ++ $(CC) $(SHARED_FLAGS) -o $@ $^ $(SDL_LIBS) ++ + clean: + rm -f *.o *$(LIB_SUFFIX) + +@@ -49,6 +57,9 @@ + ifeq ($(HAVE_COREAUDIO),1) + $(CP) $(COREAUDIO_SO) "$(DESTDIR)$(LIBDIR)" + endif ++ifeq ($(HAVE_SDL),1) ++ $(CP) $(SDL_SO) "$(DESTDIR)$(LIBDIR)" ++endif + + uninstall: + rm -f "$(DESTDIR)$(LIBDIR)/devpnone$(LIB_SUFFIX)" "$(DESTDIR)$(LIBDIR)/devpdisk$(LIB_SUFFIX)" +@@ -61,6 +72,9 @@ + ifeq ($(HAVE_COREAUDIO),1) + rm -f "$(DESTDIR)$(LIBDIR)/$(COREAUDIO_SO)" + endif ++ifeq ($(HAVE_SDL),1) ++ rm -f "$(DESTDIR)$(LIBDIR)/$(SDL_SO)" ++endif + + devposs.o: devposs.c \ + ../config.h \ +@@ -120,3 +134,12 @@ + ../dev/player.h \ + ../stuff/imsrtns.h + $(CC) devpcoreaudio.c -o $@ -c $(DEVPCOREAUDIO_CFLAGS) ++ ++devpsdl.o: devpsdl.c \ ++ ../config.h \ ++ ../types.h \ ++ ../boot/plinkman.h \ ++ ../dev/imsdev.h \ ++ ../dev/player.h \ ++ ../stuff/imsrtns.h ++ $(CC) devpsdl.c -o $@ -c $(SDL_CFLAGS) $(DEVPSDL_CFLAGS) +diff -ur ../ocp-snapshot-20110319.org/ocp.ini.in ./ocp.ini.in +--- ../ocp-snapshot-20110319.org/ocp.ini.in 2011-03-19 01:04:33.065798144 +0100 ++++ ocp-snapshot-20110319/ocp.ini.in 2011-03-20 15:56:58.479199232 +0100 +@@ -136,6 +136,9 @@ + path=/dev/dsp + mixer=/dev/mixer + ++[devpSDL] ++ link=devpsdl ++ + [devpDisk] + link=devpdisk + +--- /dev/null 2011-03-20 15:34:50.648381000 +0100 ++++ ocp-snapshot-20110319/devp/devpsdl.c 2011-03-20 21:05:30.579862528 +0100 +@@ -0,0 +1,321 @@ ++/* OpenCP Module Player ++ * copyright (c) '11 François Revol ++ * ++ * SDL Player device ++ * ++ * derived from the CoreAudio Player device ++ * copyright (c) '06-'10 Stian Skjelstad ++ * ++ * This program 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 ++ * (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. ++ * ++ * 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., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ * revision history: (please note changes here) ++ * -fr110319 François Revol ++ * -copied from devpcoreaudio ++ */ ++ ++#include "config.h" ++#include ++#include ++#include ++#include ++#include ++#include ++#include "types.h" ++#include "boot/plinkman.h" ++#include "dev/imsdev.h" ++#include "dev/player.h" ++#include "stuff/timer.h" ++#include "stuff/imsrtns.h" ++ ++/*#define PRINT(a) fprintf(stderr, a)*/ ++#define PRINT(a) do {} while(0) ++ ++extern struct sounddevice plrSDL; ++ ++/*static SDL_AudioSpec sdlSpec;*/ ++ ++/* stolen from devpcoreaudio.c */ ++ ++static void *playbuf=0; ++static int buflen; ++volatile static int kernpos, cachepos, bufpos; /* in bytes */ ++/* kernpos = kernel write header ++ * bufpos = the write header given out of this driver */ ++ ++/* playbuf kernpos cachepos bufpos buflen ++ * | | kernlen | | | ++ * | | cachelen | | ++ * ++ * on flush, we update all variables> * on getbufpos we return kernpos-(1 sample) as safe point to buffer up to ++ * on getplaypos we use last known kernpos if locked, else update kernpos ++ */ ++ ++ ++volatile static int cachelen, kernlen; /* to make life easier */ ++ ++volatile static uint32_t playpos; /* how many samples have we done totally */ ++ ++/* Avoid deadlocks due to signals catched when in the critical section */ ++#define SDL_LockAudio() \ ++ sigset_t _orgmask; \ ++ sigset_t _mask; \ ++ sigemptyset(&_mask); \ ++ sigaddset(&_mask, SIGALRM); \ ++ sigprocmask(SIG_BLOCK, &_mask, &_orgmask); \ ++ SDL_LockAudio() ++ ++#define SDL_UnlockAudio() \ ++ SDL_UnlockAudio(); \ ++ sigprocmask(SIG_SETMASK, &_orgmask, NULL) ++ ++ ++void theRenderProc(void *userdata, Uint8 *stream, int len) ++{ ++ int i, i2; ++ int done = 0; ++ ++#ifdef SDL_DEBUG ++ PRINT(("%s(,,%d)\n", __FUNCTION__, len)); ++#endif ++ ++ memset(stream, 0, len); ++ ++ SDL_LockAudio(); ++ ++ i = cachelen;/* >>2 *stereo + 16it */ ++ if (i > len) ++ i = len; ++ ++ kernlen = done = i; ++ cachelen -= i; ++ cachepos = kernpos; ++ ++ if ((i+kernpos)>buflen) ++ { ++ i2 = ( i + kernpos ) % buflen; ++ i = i - i2; ++ } else { ++ i2 = 0; ++ } ++ ++ memcpy(stream, playbuf+kernpos, i); ++ if (i2) ++ memcpy(stream+i, playbuf, i2); ++ ++ kernpos = (kernpos+i+i2)%buflen; ++ ++ SDL_UnlockAudio(); ++ ++ if (done < len) ++ fprintf(stderr, "%s: got %d of %d\n", __FUNCTION__, done, len); ++ /*PRINT(("%s: got %d of %d\n", __FUNCTION__, done, len));*/ ++} ++ ++ ++/* stolen from devposs */ ++static int sdlGetBufPos(void) ++{ ++ int retval; ++ PRINT(("%s()\n", __FUNCTION__)); ++ ++ /* this thing is utterly broken */ ++ ++ SDL_LockAudio(); ++ if (kernpos==bufpos) ++ { ++ if (cachelen|kernlen) ++ { ++ retval=kernpos; ++ SDL_UnlockAudio(); ++ return retval; ++ } ++ } ++ retval=(kernpos+buflen-4 /* 1 sample = 4 bytes*/)%buflen; ++ SDL_UnlockAudio(); ++ return retval; ++} ++ ++static int sdlGetPlayPos(void) ++{ ++ int retval; ++ PRINT(("%s()\n", __FUNCTION__)); ++ ++ SDL_LockAudio(); ++ retval=cachepos; ++ SDL_UnlockAudio(); ++ return retval; ++} ++ ++static void sdlIdle(void) ++{ ++ PRINT(("%s()\n", __FUNCTION__)); ++} ++ ++static void sdlAdvanceTo(unsigned int pos) ++{ ++ PRINT(("%s(%u)\n", __FUNCTION__, pos)); ++ SDL_LockAudio(); ++ ++ cachelen+=(pos-bufpos+buflen)%buflen; ++ bufpos=pos; ++ ++ SDL_UnlockAudio(); ++} ++ ++static uint32_t sdlGetTimer(void) ++{ ++ long retval; ++ PRINT(("%s()\n", __FUNCTION__)); ++ ++ SDL_LockAudio(); ++ ++ retval=playpos-kernlen; ++ ++ SDL_UnlockAudio(); ++ ++ return imuldiv(retval, 65536>>(2/*stereo+bit16*/), plrRate); ++} ++ ++static void sdlStop(void) ++{ ++ PRINT(("%s()\n", __FUNCTION__)); ++ /* TODO, forceflush */ ++ ++ SDL_PauseAudio(1); ++ ++ if (playbuf) ++ { ++ free(playbuf); ++ playbuf=0; ++ } ++ ++ plrGetBufPos=0; ++ plrGetPlayPos=0; ++ plrIdle=0; ++ plrAdvanceTo=0; ++ plrGetTimer=0; ++ ++ SDL_CloseAudio(); ++} ++ ++static int sdlPlay(void **buf, unsigned int *len) ++{ ++ SDL_AudioSpec desired; ++ int status; ++ PRINT(("%s(,&%d)\n", __FUNCTION__, *len)); ++ ++ if ((*len)<(plrRate&~3)) ++ *len=plrRate&~3; ++ if ((*len)>(plrRate*4)) ++ *len=plrRate*4; ++ playbuf=*buf=malloc(*len); ++ ++ memset(*buf, 0x80008000, (*len)>>2); ++ buflen = *len; ++ ++ cachepos=0; ++ kernpos=0; ++ bufpos=0; ++ cachelen=0; ++ kernlen=0; ++ ++ playpos=0; ++ ++ plrGetBufPos=sdlGetBufPos; ++ plrGetPlayPos=sdlGetPlayPos; ++ plrIdle=sdlIdle; ++ plrAdvanceTo=sdlAdvanceTo; ++ plrGetTimer=sdlGetTimer; ++ ++ ++ desired.freq = plrRate; ++ desired.format = AUDIO_S16SYS; ++ desired.channels = 2; ++ desired.samples = *len; ++ desired.callback = theRenderProc; ++ desired.userdata = NULL; ++ ++ status=SDL_OpenAudio(&desired, NULL); ++ if (status < 0) ++ { ++ fprintf(stderr, "[SDL] SDL_OpenAudio returned %d (%s)\n", (int)status, SDL_GetError()); ++ free(*buf); ++ *buf = playbuf = 0; ++ plrGetBufPos = 0; ++ plrGetPlayPos = 0; ++ plrIdle = 0; ++ plrAdvanceTo = 0; ++ plrGetTimer = 0; ++ return 0; ++ } ++ /*plrRate = sdlSpec.freq;*/ ++ SDL_PauseAudio(0); ++ return 1; ++} ++ ++static void sdlSetOptions(unsigned int rate, int opt) ++{ ++ PRINT(("%s(%u, %d)\n", __FUNCTION__, rate, opt)); ++ plrRate=rate; /* fixed */ ++ plrOpt=PLR_STEREO|PLR_16BIT|PLR_SIGNEDOUT; /* fixed fixed fixed */ ++} ++ ++static int sdlInit(const struct deviceinfo *c) ++{ ++ char drivername[FILENAME_MAX]; ++ int status; ++ PRINT(("%s()\n", __FUNCTION__)); ++ status = SDL_InitSubSystem(SDL_INIT_AUDIO); ++ if (status == 0) ++ { ++ fprintf(stderr, "[SDL] Using driver %s\n", SDL_AudioDriverName(drivername, sizeof(drivername))); ++ plrSetOptions=sdlSetOptions; ++ plrPlay=sdlPlay; ++ plrStop=sdlStop; ++ return 1; ++ } ++ fprintf(stderr, "[SDL] SDL_InitSubSystem returned %d (%s)\n", (int)status, SDL_GetError()); ++ return 0; ++} ++ ++static void sdlClose(void) ++{ ++ PRINT(("%s()\n", __FUNCTION__)); ++ SDL_QuitSubSystem(SDL_INIT_AUDIO); ++ plrSetOptions=0; ++ plrPlay=0; ++ plrStop=0; ++} ++ ++static int sdlDetect(struct deviceinfo *card) ++{ ++ PRINT(("%s()\n", __FUNCTION__)); ++ ++ /* ao is now created, the above is needed only ONCE */ ++ card->devtype=&plrSDL; ++ card->port=0; ++ card->port2=0; ++ card->subtype=-1; ++ card->mem=0; ++ card->chan=2; ++ ++ return 1; ++} ++ ++ ++struct sounddevice plrSDL={SS_PLAYER, 0, "SDL Player", sdlDetect, sdlInit, sdlClose, 0}; ++ ++char *dllinfo="driver plrSDL"; ++struct linkinfostruct dllextinfo = {"devpsdl", "OpenCP Player Device: None (c) 1994-09 Niklas Beisert, Tammo Hinrichs", DLLVERSION, 0 LINKINFOSTRUCT_NOEVENTS}; diff --git a/media-sound/schismtracker/schismtracker-20100713.bep b/media-sound/schismtracker/schismtracker-20100713.bep index c6989404e..d1c10a5d2 100644 --- a/media-sound/schismtracker/schismtracker-20100713.bep +++ b/media-sound/schismtracker/schismtracker-20100713.bep @@ -13,7 +13,7 @@ BUILD { autoconf autoheader automake --add-missing - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-sound/twolame/twolame-0.3.13.bep b/media-sound/twolame/twolame-0.3.13.bep new file mode 100644 index 000000000..4fc7b7d54 --- /dev/null +++ b/media-sound/twolame/twolame-0.3.13.bep @@ -0,0 +1,24 @@ +DESCRIPTION="TwoLAME MPEG Audio Layer 2 encoder" +HOMEPAGE="http://www.twolame.org" +SRC_URI="http://downloads.sourceforge.net/twolame/twolame-0.3.13.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="4113d8aa80194459b45b83d4dbde8ddb" +BUILD { + cd twolame-0.3.13 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --docdir=$COMMON_DOCS/doc/twolame \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd twolame-0.3.13 + make install +} + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2004-2006 The TwoLAME Project" diff --git a/media-sound/vorbis-tools/vorbis-tools-1.2.0.bep b/media-sound/vorbis-tools/vorbis-tools-1.2.0.bep index b3dcd6efb..6e314d7c3 100644 --- a/media-sound/vorbis-tools/vorbis-tools-1.2.0.bep +++ b/media-sound/vorbis-tools/vorbis-tools-1.2.0.bep @@ -11,7 +11,7 @@ BUILD { aclocal -I m4 automake autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0.bep b/media-sound/vorbis-tools/vorbis-tools-1.4.0.bep index 891733d53..9ee4fdad5 100644 --- a/media-sound/vorbis-tools/vorbis-tools-1.4.0.bep +++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0.bep @@ -14,7 +14,10 @@ BUILD { aclocal -I m4 automake autoconf - ./configure --prefix=/boot/common + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=$COMMON_DOCS/man make } diff --git a/media-video/ffmpeg/ffmpeg-0.10.2-vlc.bep b/media-video/ffmpeg/ffmpeg-0.10.2-vlc.bep new file mode 100644 index 000000000..9d69e0e65 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-0.10.2-vlc.bep @@ -0,0 +1,27 @@ +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.10.2.tar.bz2" +CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/libogg >= 1.3.0 + media-libs/speex >= 1.2rc1 + media-libs/libtheora >= 1.1.0 + media-libs/libvorbis >= 1.3.2 + media-libs/libvpx >= 1.0.0" +BUILD { + cd ffmpeg-0.10.2 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ + --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \ + --enable-gpl --datadir=`finddir B_COMMON_DATA_DIRECTORY` + make +} + +INSTALL { + cd ffmpeg-0.10.2 + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2000-2003 Fabrice Bellard + 2003-2012 the FFmpeg developers" diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.bep b/media-video/ffmpeg/ffmpeg-0.10.2.bep new file mode 100644 index 000000000..30b0122b7 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-0.10.2.bep @@ -0,0 +1,28 @@ +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.10.2.tar.bz2" +CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/libogg >= 1.3.0 + media-libs/speex >= 1.2rc1 + media-libs/libtheora >= 1.1.0 + media-libs/libvorbis >= 1.3.2 + media-libs/libvpx >= 1.0.0" +BUILD { + cd ffmpeg-0.10.2 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ + --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` + make +} + +INSTALL { + cd ffmpeg-0.10.2 + make install +} + +LICENSE="GNU LGPL v2.1 + GNU GPL v2" +COPYRIGHT="2000-2003 Fabrice Bellard + 2003-2012 the FFmpeg developers" diff --git a/media-video/ffmpeg/ffmpeg-0.10.bep b/media-video/ffmpeg/ffmpeg-0.10.bep new file mode 100644 index 000000000..0df10e0e6 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-0.10.bep @@ -0,0 +1,27 @@ +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.10.tar.bz2" +CHECKSUM_MD5="dc665cc599a739e3c5262ccdac13d129" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/libogg >= 1.3.0 + media-libs/speex >= 1.2rc1 + media-libs/libtheora >= 1.1.0 + media-libs/libvorbis >= 1.3.2 + media-libs/libvpx >= 1.0.0" +BUILD { + cd ffmpeg-0.10 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ + --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx + make +} + +INSTALL { + cd ffmpeg-0.10 + make install +} + +LICENSE="GNU LGPL v2.1 + GNU GPL v2" +COPYRIGHT="2000-2003 Fabrice Bellard + 2003-2012 the FFmpeg developers" diff --git a/media-video/ffmpeg/ffmpeg-0.11.1.bep b/media-video/ffmpeg/ffmpeg-0.11.1.bep new file mode 100644 index 000000000..d1921cc63 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-0.11.1.bep @@ -0,0 +1,28 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/libogg >= 1.3.0 + media-libs/speex >= 1.2rc1 + media-libs/libtheora >= 1.1.0 + media-libs/libvorbis >= 1.3.2 + media-libs/libvpx >= 1.0.0" +BUILD { + cd ffmpeg-0.11.1 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ + --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` + make +} + +INSTALL { + cd ffmpeg-0.11.1 + make install +} + +LICENSE="GNU LGPL v2.1 + GNU GPL v2" +COPYRIGHT="2000-2003 Fabrice Bellard + 2003-2012 the FFmpeg developers" diff --git a/media-video/ffmpeg/ffmpeg-0.5.bep b/media-video/ffmpeg/ffmpeg-0.5.bep index 35bb5a1b3..8cd65dcd9 100644 --- a/media-video/ffmpeg/ffmpeg-0.5.bep +++ b/media-video/ffmpeg/ffmpeg-0.5.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd ffmpeg-0.5 - ./configure --prefix=/boot/common --disable-debug --disable-mmx --enable-shared + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared make } diff --git a/media-video/ffmpeg/ffmpeg-0.6.bep b/media-video/ffmpeg/ffmpeg-0.6.bep index 3a0f1fc15..861154286 100644 --- a/media-video/ffmpeg/ffmpeg-0.6.bep +++ b/media-video/ffmpeg/ffmpeg-0.6.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd ffmpeg-0.6 - ./configure --prefix=/boot/common --disable-debug --disable-mmx --enable-shared + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared make } diff --git a/media-video/ffmpeg/ffmpeg-23081.bep b/media-video/ffmpeg/ffmpeg-23081.bep index 3b6a4cf9e..6a0cbb238 100644 --- a/media-video/ffmpeg/ffmpeg-23081.bep +++ b/media-video/ffmpeg/ffmpeg-23081.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd ffmpeg-23081 chmod 777 configure - ./configure --prefix=/boot/common --disable-debug --disable-mmx --enable-shared --enable-gpl + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared --enable-gpl make } diff --git a/media-video/ffmpeg/ffmpeg-7407.bep b/media-video/ffmpeg/ffmpeg-7407.bep index e8e842956..2f2d3e0d2 100644 --- a/media-video/ffmpeg/ffmpeg-7407.bep +++ b/media-video/ffmpeg/ffmpeg-7407.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd ffmpeg-7407 chmod 777 configure - ./configure --prefix=/boot/common --disable-debug --disable-mmx --enable-shared --enable-gpl --enable-pp + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared --enable-gpl --enable-pp make } diff --git a/media-video/ffmpeg/patches/ffmpeg-0.10-gcc2.patch b/media-video/ffmpeg/patches/ffmpeg-0.10-gcc2.patch new file mode 100644 index 000000000..935cd7276 --- /dev/null +++ b/media-video/ffmpeg/patches/ffmpeg-0.10-gcc2.patch @@ -0,0 +1,268 @@ +diff --git a/cmdutils.c b/cmdutils.c +index 386db3d..f918600 100644 +--- ffmpeg-0.10/cmdutils.c ++++ ffmpeg-0.10/cmdutils.c +@@ -89,7 +89,7 @@ static void log_callback_report(void *ptr, int level, const char *fmt, va_list v + char line[1024]; + static int print_prefix = 1; + +- va_copy(vl2, vl); ++ __va_copy(vl2, vl); + av_log_default_callback(ptr, level, fmt, vl); + av_log_format_line(ptr, level, fmt, vl2, line, sizeof(line), &print_prefix); + va_end(vl2); +diff --git a/ffmpeg.c b/ffmpeg.c +index 463e1f4..245e8b5 100644 +--- ffmpeg-0.10/ffmpeg.c ++++ ffmpeg-0.10/ffmpeg.c +@@ -1247,9 +1247,11 @@ need_realloc: + av_fifo_size(ost->fifo) / (enc->channels * osize); // FIXME wrong + + if (ost->audio_resample) { ++ uint8_t *buftmp2[] = { buftmp }; ++ const uint8_t *buf2[] = { buf }; + buftmp = audio_buf; +- size_out = swr_convert(ost->swr, ( uint8_t*[]){buftmp}, audio_buf_size / (enc->channels * osize), +- (const uint8_t*[]){buf }, size / (dec->channels * isize)); ++ size_out = swr_convert(ost->swr, buftmp2, audio_buf_size / (enc->channels * osize), ++ buf2, size / (dec->channels * isize)); + size_out = size_out * enc->channels * osize; + } else { + buftmp = buf; +diff --git a/ffprobe.c b/ffprobe.c +index ca6133e..43f9d39 100644 +--- ffmpeg-0.10/ffprobe.c ++++ ffmpeg-0.10/ffprobe.c +@@ -293,7 +293,9 @@ static void writer_print_time(WriterContext *wctx, const char *key, + writer_print_string(wctx, key, "N/A", 1); + } else { + double d = ts * av_q2d(*time_base); +- value_string(buf, sizeof(buf), (struct unit_value){.val.d=d, .unit=unit_second_str}); ++ struct unit_value value2 = {.unit=unit_second_str}; ++ value2.val.d = d; ++ value_string(buf, sizeof(buf), value2); + writer_print_string(wctx, key, buf, 0); + } + } +@@ -1249,8 +1251,8 @@ static void writer_register_all(void) + #define print_str_opt(k, v) writer_print_string(w, k, v, 1) + #define print_time(k, v, tb) writer_print_time(w, k, v, tb) + #define print_ts(k, v) writer_print_ts(w, k, v) +-#define print_val(k, v, u) writer_print_string(w, k, \ +- value_string(val_str, sizeof(val_str), (struct unit_value){.val.i = v, .unit=u}), 0) ++#define print_val(k, v, u) value2.val.i = v; value2.unit=u; writer_print_string(w, k, \ ++ value_string(val_str, sizeof(val_str), value2), 0); + #define print_section_header(s) writer_print_section_header(w, s) + #define print_section_footer(s) writer_print_section_footer(w, s) + #define show_tags(metadata) writer_show_tags(w, metadata) +@@ -1261,6 +1263,7 @@ static void show_packet(WriterContext *w, AVFormatContext *fmt_ctx, AVPacket *pk + AVStream *st = fmt_ctx->streams[pkt->stream_index]; + struct print_buf pbuf = {.s = NULL}; + const char *s; ++ struct unit_value value2; + + print_section_header("packet"); + s = av_get_media_type_string(st->codec->codec_type); +@@ -1404,6 +1407,7 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i + const char *s; + AVRational display_aspect_ratio; + struct print_buf pbuf = {.s = NULL}; ++ struct unit_value value2; + + print_section_header("stream"); + +@@ -1516,6 +1520,7 @@ static void show_format(WriterContext *w, AVFormatContext *fmt_ctx) + { + char val_str[128]; + int64_t size = fmt_ctx->pb ? avio_size(fmt_ctx->pb) : -1; ++ struct unit_value value2; + + print_section_header("format"); + print_str("filename", fmt_ctx->filename); +@@ -1524,9 +1529,9 @@ static void show_format(WriterContext *w, AVFormatContext *fmt_ctx) + print_str("format_long_name", fmt_ctx->iformat->long_name); + print_time("start_time", fmt_ctx->start_time, &AV_TIME_BASE_Q); + print_time("duration", fmt_ctx->duration, &AV_TIME_BASE_Q); +- if (size >= 0) print_val ("size", size, unit_byte_str); ++ if (size >= 0) { print_val ("size", size, unit_byte_str); } + else print_str_opt("size", "N/A"); +- if (fmt_ctx->bit_rate > 0) print_val ("bit_rate", fmt_ctx->bit_rate, unit_bit_per_second_str); ++ if (fmt_ctx->bit_rate > 0) { print_val ("bit_rate", fmt_ctx->bit_rate, unit_bit_per_second_str); } + else print_str_opt("bit_rate", "N/A"); + show_tags(fmt_ctx->metadata); + print_section_footer("format"); +diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c +index 55f0286..35d5f1a 100644 +--- ffmpeg-0.10/libavcodec/aacenc.c ++++ ffmpeg-0.10/libavcodec/aacenc.c +@@ -223,8 +223,9 @@ WINDOW_FUNC(eight_short) + const float *pwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128; + const float *in = audio + 448; + float *out = sce->ret; ++ int w; + +- for (int w = 0; w < 8; w++) { ++ for (w = 0; w < 8; w++) { + dsp->vector_fmul (out, in, w ? pwindow : swindow, 128); + out += 128; + in += 128; +@@ -686,11 +687,12 @@ static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s) + + static av_cold int alloc_buffers(AVCodecContext *avctx, AACEncContext *s) + { ++ int ch; + FF_ALLOCZ_OR_GOTO(avctx, s->buffer.samples, 3 * 1024 * s->channels * sizeof(s->buffer.samples[0]), alloc_fail); + FF_ALLOCZ_OR_GOTO(avctx, s->cpe, sizeof(ChannelElement) * s->chan_map[0], alloc_fail); + FF_ALLOCZ_OR_GOTO(avctx, avctx->extradata, 5 + FF_INPUT_BUFFER_PADDING_SIZE, alloc_fail); + +- for(int ch = 0; ch < s->channels; ch++) ++ for(ch = 0; ch < s->channels; ch++) + s->planar_samples[ch] = s->buffer.samples + 3 * 1024 * ch; + + return 0; +diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c +index e73fbfe..3cde56c 100644 +--- ffmpeg-0.10/libavutil/pixdesc.c ++++ ffmpeg-0.10/libavutil/pixdesc.c +@@ -1096,12 +1096,6 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { + .log2_chroma_h = 1, + .flags = PIX_FMT_HWACCEL, + }, +- [PIX_FMT_VDA_VLD] = { +- .name = "vda_vld", +- .log2_chroma_w = 1, +- .log2_chroma_h = 1, +- .flags = PIX_FMT_HWACCEL, +- }, + [PIX_FMT_GRAY8A] = { + .name = "gray8a", + .nb_components = 2, +@@ -1110,16 +1104,6 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { + { 0, 1, 2, 0, 7 }, /* A */ + }, + }, +- [PIX_FMT_GBR24P] = { +- .name = "gbr24p", +- .nb_components= 3, +- .comp = { +- { 1, 0, 1, 0, 7 }, /* B */ +- { 0, 0, 1, 0, 7 }, /* G */ +- { 2, 0, 1, 0, 7 }, /* R */ +- }, +- .flags = PIX_FMT_PLANAR | PIX_FMT_RGB, +- }, + [PIX_FMT_GBRP] = { + .name = "gbrp", + .nb_components = 3, +diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c +index e1ba799..3820056 100644 +--- ffmpeg-0.10/libswscale/swscale_unscaled.c ++++ ffmpeg-0.10/libswscale/swscale_unscaled.c +@@ -370,30 +370,38 @@ static int planarRgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStr + } + + switch (c->dstFormat) { +- case PIX_FMT_BGR24: +- gbr24ptopacked24((const uint8_t* []) {src[1], src[0], src[2]}, (int []) {srcStride[1], srcStride[0], srcStride[2]}, ++ case PIX_FMT_BGR24: { ++ const uint8_t* src2[] = {src[1], src[0], src[2]}; ++ int srcStride2[] = {srcStride[1], srcStride[0], srcStride[2]}; ++ gbr24ptopacked24(src2, srcStride2, + dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, c->srcW); + break; +- +- case PIX_FMT_RGB24: +- gbr24ptopacked24((const uint8_t* []) {src[2], src[0], src[1]}, (int []) {srcStride[2], srcStride[0], srcStride[1]}, ++ } ++ case PIX_FMT_RGB24: { ++ const uint8_t* src2[] = {src[2], src[0], src[1]}; ++ int srcStride2[] = {srcStride[2], srcStride[0], srcStride[1]}; ++ gbr24ptopacked24(src2, srcStride2, + dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, c->srcW); + break; +- ++ } + case PIX_FMT_ARGB: + alpha_first = 1; +- case PIX_FMT_RGBA: +- gbr24ptopacked32((const uint8_t* []) {src[2], src[0], src[1]}, (int []) {srcStride[2], srcStride[0], srcStride[1]}, ++ case PIX_FMT_RGBA: { ++ const uint8_t* src2[] = {src[2], src[0], src[1]}; ++ int srcStride2[] = {srcStride[2], srcStride[0], srcStride[1]}; ++ gbr24ptopacked32(src2, srcStride2, + dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, alpha_first, c->srcW); + break; +- ++ } + case PIX_FMT_ABGR: + alpha_first = 1; +- case PIX_FMT_BGRA: +- gbr24ptopacked32((const uint8_t* []) {src[1], src[0], src[2]}, (int []) {srcStride[1], srcStride[0], srcStride[2]}, ++ case PIX_FMT_BGRA: { ++ const uint8_t* src2[] = {src[1], src[0], src[2]}; ++ int srcStride2[] = {srcStride[1], srcStride[0], srcStride[2]}; ++ gbr24ptopacked32(src2, srcStride2, + dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, alpha_first, c->srcW); + break; +- ++ } + default: + av_log(c, AV_LOG_ERROR, "unsupported planar RGB conversion %s -> %s\n", + av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat)); +diff --git a/configure b/configure +--- ffmpeg-0.10/configure 2012-01-26 22:15:59.047710208 +0000 ++++ ffmpeg-0.10-haiku/configure 2012-03-28 22:30:34.330563584 +0000 +@@ -1359,7 +1359,6 @@ + + aligned_stack_if_any="ppc x86" + fast_64bit_if_any="alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64" +-fast_clz_if_any="alpha armv5te avr32 mips ppc x86" + fast_unaligned_if_any="armv6 ppc x86" + + inline_asm_deps="!tms470" +@@ -1866,7 +1865,7 @@ + CC_O='-o $@' + CXX_O='-o $@' + +-host_cflags='-D_ISOC99_SOURCE -O3 -g' ++host_cflags='-D_ISOC99_SOURCE -O2 -g' + host_libs='-lm' + + target_path='$(CURDIR)' +@@ -1948,6 +1947,7 @@ + done + + enable $ARCH_EXT_LIST $ALL_TESTS ++disable sse + + die_unknown(){ + echo "Unknown option \"$1\"." +@@ -2144,7 +2144,7 @@ + CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' + AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' + fi +- speed_cflags='-O3' ++ speed_cflags='-O2' + size_cflags='-Os' + elif $cc --version 2>/dev/null | grep -q Intel; then + cc_type=icc +@@ -2831,10 +2831,6 @@ + struct { int x; } __attribute__((packed)) x; + EOF + +-check_cc <fifo) / (enc->channels * osize); // FIXME wrong + + if (ost->audio_resample) { ++ uint8_t *buftmp2[] = { buftmp }; ++ const uint8_t *buf2[] = { buf }; + buftmp = audio_buf; +- size_out = swr_convert(ost->swr, ( uint8_t*[]){buftmp}, audio_buf_size / (enc->channels * osize), +- (const uint8_t*[]){buf }, size / (dec->channels * isize)); ++ size_out = swr_convert(ost->swr, buftmp2, audio_buf_size / (enc->channels * osize), ++ buf2, size / (dec->channels * isize)); + size_out = size_out * enc->channels * osize; + } else { + buftmp = buf; +diff --git a/ffprobe.c b/ffprobe.c +index ca6133e..43f9d39 100644 +--- ffmpeg-0.10.2/ffprobe.c ++++ ffmpeg-0.10.2/ffprobe.c +@@ -293,7 +293,9 @@ static void writer_print_time(WriterContext *wctx, const char *key, + writer_print_string(wctx, key, "N/A", 1); + } else { + double d = ts * av_q2d(*time_base); +- value_string(buf, sizeof(buf), (struct unit_value){.val.d=d, .unit=unit_second_str}); ++ struct unit_value value2 = {.unit=unit_second_str}; ++ value2.val.d = d; ++ value_string(buf, sizeof(buf), value2); + writer_print_string(wctx, key, buf, 0); + } + } +@@ -1249,8 +1251,8 @@ static void writer_register_all(void) + #define print_str_opt(k, v) writer_print_string(w, k, v, 1) + #define print_time(k, v, tb) writer_print_time(w, k, v, tb) + #define print_ts(k, v) writer_print_ts(w, k, v) +-#define print_val(k, v, u) writer_print_string(w, k, \ +- value_string(val_str, sizeof(val_str), (struct unit_value){.val.i = v, .unit=u}), 0) ++#define print_val(k, v, u) value2.val.i = v; value2.unit=u; writer_print_string(w, k, \ ++ value_string(val_str, sizeof(val_str), value2), 0); + #define print_section_header(s) writer_print_section_header(w, s) + #define print_section_footer(s) writer_print_section_footer(w, s) + #define show_tags(metadata) writer_show_tags(w, metadata) +@@ -1261,6 +1263,7 @@ static void show_packet(WriterContext *w, AVFormatContext *fmt_ctx, AVPacket *pk + AVStream *st = fmt_ctx->streams[pkt->stream_index]; + struct print_buf pbuf = {.s = NULL}; + const char *s; ++ struct unit_value value2; + + print_section_header("packet"); + s = av_get_media_type_string(st->codec->codec_type); +@@ -1404,6 +1407,7 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i + const char *s; + AVRational display_aspect_ratio; + struct print_buf pbuf = {.s = NULL}; ++ struct unit_value value2; + + print_section_header("stream"); + +@@ -1516,6 +1520,7 @@ static void show_format(WriterContext *w, AVFormatContext *fmt_ctx) + { + char val_str[128]; + int64_t size = fmt_ctx->pb ? avio_size(fmt_ctx->pb) : -1; ++ struct unit_value value2; + + print_section_header("format"); + print_str("filename", fmt_ctx->filename); +@@ -1524,9 +1529,9 @@ static void show_format(WriterContext *w, AVFormatContext *fmt_ctx) + print_str("format_long_name", fmt_ctx->iformat->long_name); + print_time("start_time", fmt_ctx->start_time, &AV_TIME_BASE_Q); + print_time("duration", fmt_ctx->duration, &AV_TIME_BASE_Q); +- if (size >= 0) print_val ("size", size, unit_byte_str); ++ if (size >= 0) { print_val ("size", size, unit_byte_str); } + else print_str_opt("size", "N/A"); +- if (fmt_ctx->bit_rate > 0) print_val ("bit_rate", fmt_ctx->bit_rate, unit_bit_per_second_str); ++ if (fmt_ctx->bit_rate > 0) { print_val ("bit_rate", fmt_ctx->bit_rate, unit_bit_per_second_str); } + else print_str_opt("bit_rate", "N/A"); + show_tags(fmt_ctx->metadata); + print_section_footer("format"); +diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c +index 55f0286..35d5f1a 100644 +--- ffmpeg-0.10.2/libavcodec/aacenc.c ++++ ffmpeg-0.10.2/libavcodec/aacenc.c +@@ -223,8 +223,9 @@ WINDOW_FUNC(eight_short) + const float *pwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128; + const float *in = audio + 448; + float *out = sce->ret; ++ int w; + +- for (int w = 0; w < 8; w++) { ++ for (w = 0; w < 8; w++) { + dsp->vector_fmul (out, in, w ? pwindow : swindow, 128); + out += 128; + in += 128; +@@ -686,11 +687,12 @@ static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s) + + static av_cold int alloc_buffers(AVCodecContext *avctx, AACEncContext *s) + { ++ int ch; + FF_ALLOCZ_OR_GOTO(avctx, s->buffer.samples, 3 * 1024 * s->channels * sizeof(s->buffer.samples[0]), alloc_fail); + FF_ALLOCZ_OR_GOTO(avctx, s->cpe, sizeof(ChannelElement) * s->chan_map[0], alloc_fail); + FF_ALLOCZ_OR_GOTO(avctx, avctx->extradata, 5 + FF_INPUT_BUFFER_PADDING_SIZE, alloc_fail); + +- for(int ch = 0; ch < s->channels; ch++) ++ for(ch = 0; ch < s->channels; ch++) + s->planar_samples[ch] = s->buffer.samples + 3 * 1024 * ch; + + return 0; +diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c +index e73fbfe..3cde56c 100644 +--- ffmpeg-0.10.2/libavutil/pixdesc.c ++++ ffmpeg-0.10.2/libavutil/pixdesc.c +@@ -1096,12 +1096,6 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { + .log2_chroma_h = 1, + .flags = PIX_FMT_HWACCEL, + }, +- [PIX_FMT_VDA_VLD] = { +- .name = "vda_vld", +- .log2_chroma_w = 1, +- .log2_chroma_h = 1, +- .flags = PIX_FMT_HWACCEL, +- }, + [PIX_FMT_GRAY8A] = { + .name = "gray8a", + .nb_components = 2, +@@ -1110,16 +1104,6 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { + { 0, 1, 2, 0, 7 }, /* A */ + }, + }, +- [PIX_FMT_GBR24P] = { +- .name = "gbr24p", +- .nb_components= 3, +- .comp = { +- { 1, 0, 1, 0, 7 }, /* B */ +- { 0, 0, 1, 0, 7 }, /* G */ +- { 2, 0, 1, 0, 7 }, /* R */ +- }, +- .flags = PIX_FMT_PLANAR | PIX_FMT_RGB, +- }, + [PIX_FMT_GBRP] = { + .name = "gbrp", + .nb_components = 3, +diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c +index e1ba799..3820056 100644 +--- ffmpeg-0.10.2/libswscale/swscale_unscaled.c ++++ ffmpeg-0.10.2/libswscale/swscale_unscaled.c +@@ -370,30 +370,38 @@ static int planarRgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStr + } + + switch (c->dstFormat) { +- case PIX_FMT_BGR24: +- gbr24ptopacked24((const uint8_t* []) {src[1], src[0], src[2]}, (int []) {srcStride[1], srcStride[0], srcStride[2]}, ++ case PIX_FMT_BGR24: { ++ const uint8_t* src2[] = {src[1], src[0], src[2]}; ++ int srcStride2[] = {srcStride[1], srcStride[0], srcStride[2]}; ++ gbr24ptopacked24(src2, srcStride2, + dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, c->srcW); + break; +- +- case PIX_FMT_RGB24: +- gbr24ptopacked24((const uint8_t* []) {src[2], src[0], src[1]}, (int []) {srcStride[2], srcStride[0], srcStride[1]}, ++ } ++ case PIX_FMT_RGB24: { ++ const uint8_t* src2[] = {src[2], src[0], src[1]}; ++ int srcStride2[] = {srcStride[2], srcStride[0], srcStride[1]}; ++ gbr24ptopacked24(src2, srcStride2, + dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, c->srcW); + break; +- ++ } + case PIX_FMT_ARGB: + alpha_first = 1; +- case PIX_FMT_RGBA: +- gbr24ptopacked32((const uint8_t* []) {src[2], src[0], src[1]}, (int []) {srcStride[2], srcStride[0], srcStride[1]}, ++ case PIX_FMT_RGBA: { ++ const uint8_t* src2[] = {src[2], src[0], src[1]}; ++ int srcStride2[] = {srcStride[2], srcStride[0], srcStride[1]}; ++ gbr24ptopacked32(src2, srcStride2, + dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, alpha_first, c->srcW); + break; +- ++ } + case PIX_FMT_ABGR: + alpha_first = 1; +- case PIX_FMT_BGRA: +- gbr24ptopacked32((const uint8_t* []) {src[1], src[0], src[2]}, (int []) {srcStride[1], srcStride[0], srcStride[2]}, ++ case PIX_FMT_BGRA: { ++ const uint8_t* src2[] = {src[1], src[0], src[2]}; ++ int srcStride2[] = {srcStride[1], srcStride[0], srcStride[2]}; ++ gbr24ptopacked32(src2, srcStride2, + dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, alpha_first, c->srcW); + break; +- ++ } + default: + av_log(c, AV_LOG_ERROR, "unsupported planar RGB conversion %s -> %s\n", + av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat)); +diff --git a/configure b/configure +--- ffmpeg-0.10.2/configure 2012-01-26 22:15:59.047710208 +0000 ++++ ffmpeg-0.10-haiku/configure 2012-03-28 22:30:34.330563584 +0000 +@@ -1359,7 +1359,6 @@ + + aligned_stack_if_any="ppc x86" + fast_64bit_if_any="alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64" +-fast_clz_if_any="alpha armv5te avr32 mips ppc x86" + fast_unaligned_if_any="armv6 ppc x86" + + inline_asm_deps="!tms470" +@@ -1866,7 +1865,7 @@ + CC_O='-o $@' + CXX_O='-o $@' + +-host_cflags='-D_ISOC99_SOURCE -O3 -g' ++host_cflags='-D_ISOC99_SOURCE -O2 -g' + host_libs='-lm' + + target_path='$(CURDIR)' +@@ -1948,6 +1947,7 @@ + done + + enable $ARCH_EXT_LIST $ALL_TESTS ++disable sse + + die_unknown(){ + echo "Unknown option \"$1\"." +@@ -2144,7 +2144,7 @@ + CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' + AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' + fi +- speed_cflags='-O3' ++ speed_cflags='-O2' + size_cflags='-Os' + elif $cc --version 2>/dev/null | grep -q Intel; then + cc_type=icc +@@ -2831,10 +2831,6 @@ + struct { int x; } __attribute__((packed)) x; + EOF + +-check_cc <streams[pkt->stream_index]; + struct print_buf pbuf = {.s = NULL}; + const char *s; ++ struct unit_value value2; + + print_section_header("packet"); + s = av_get_media_type_string(st->codec->codec_type); +@@ -1516,6 +1520,7 @@ static void show_format(WriterContext *w, AVFormatContext *fmt_ctx) + { + char val_str[128]; + int64_t size = fmt_ctx->pb ? avio_size(fmt_ctx->pb) : -1; ++ struct unit_value value2; + + print_section_header("format"); + print_str("filename", fmt_ctx->filename); +@@ -1524,9 +1529,9 @@ static void show_format(WriterContext *w, AVFormatContext *fmt_ctx) + print_str("format_long_name", fmt_ctx->iformat->long_name); + print_time("start_time", fmt_ctx->start_time, &AV_TIME_BASE_Q); + print_time("duration", fmt_ctx->duration, &AV_TIME_BASE_Q); +- if (size >= 0) print_val ("size", size, unit_byte_str); ++ if (size >= 0) { print_val ("size", size, unit_byte_str); } + else print_str_opt("size", "N/A"); +- if (fmt_ctx->bit_rate > 0) print_val ("bit_rate", fmt_ctx->bit_rate, unit_bit_per_second_str); ++ if (fmt_ctx->bit_rate > 0) { print_val ("bit_rate", fmt_ctx->bit_rate, unit_bit_per_second_str); } + else print_str_opt("bit_rate", "N/A"); + show_tags(fmt_ctx->metadata); + print_section_footer("format"); +diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c +index e73fbfe..3cde56c 100644 +--- ffmpeg-0.11.1/libavutil/pixdesc.c ++++ ffmpeg-0.11.1/libavutil/pixdesc.c +@@ -1096,12 +1096,6 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { + .log2_chroma_h = 1, + .flags = PIX_FMT_HWACCEL, + }, +- [PIX_FMT_VDA_VLD] = { +- .name = "vda_vld", +- .log2_chroma_w = 1, +- .log2_chroma_h = 1, +- .flags = PIX_FMT_HWACCEL, +- }, + [PIX_FMT_GRAY8A] = { + .name = "gray8a", + .nb_components = 2, + +diff --git a/configure b/configure +--- ffmpeg-0.11.1/configure 2012-01-26 22:15:59.047710208 +0000 ++++ ffmpeg-0.10-haiku/configure 2012-03-28 22:30:34.330563584 +0000 +@@ -1359,7 +1359,6 @@ + + aligned_stack_if_any="ppc x86" + fast_64bit_if_any="alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64" +-fast_clz_if_any="alpha armv5te avr32 mips ppc x86" + fast_unaligned_if_any="armv6 ppc x86" + + inline_asm_deps="!tms470" +@@ -1866,7 +1865,7 @@ + CC_O='-o $@' + CXX_O='-o $@' + +-host_cflags='-D_ISOC99_SOURCE -O3 -g' ++host_cflags='-D_ISOC99_SOURCE -O2 -g' + host_libs='-lm' + + target_path='$(CURDIR)' +@@ -1948,6 +1947,7 @@ + done + + enable $ARCH_EXT_LIST $ALL_TESTS ++disable sse + + die_unknown(){ + echo "Unknown option \"$1\"." +@@ -2144,7 +2144,7 @@ + CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' + AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' + fi +- speed_cflags='-O3' ++ speed_cflags='-O2' + size_cflags='-Os' + elif $cc --version 2>/dev/null | grep -q Intel; then + cc_type=icc +@@ -2831,10 +2831,6 @@ + struct { int x; } __attribute__((packed)) x; + EOF + +-check_cc <out_channel_layouts); + + if(out_rate > 0) { +- out_samplerates = avfilter_make_format_list((int[]){ out_rate, -1 }); ++ int rate_tmp[] = { out_rate, -1 }; ++ out_samplerates = avfilter_make_format_list(rate_tmp); + } else { + out_samplerates = ff_all_samplerates(); + } + avfilter_formats_ref(out_samplerates, &outlink->in_samplerates); + + if(out_format != AV_SAMPLE_FMT_NONE) { +- out_formats = avfilter_make_format_list((int[]){ out_format, -1 }); ++ int format_tmp[] = { out_format, -1 }; ++ out_formats = avfilter_make_format_list(format_tmp); + } else + out_formats = avfilter_make_all_formats(AVMEDIA_TYPE_AUDIO); + avfilter_formats_ref(out_formats, &outlink->in_formats); + + if(out_layout) { +- out_layouts = avfilter_make_format64_list((int64_t[]){ out_layout, -1 }); ++ int64_t layout_tmp[] = { out_layout, -1 }; ++ out_layouts = avfilter_make_format64_list(layout_tmp); + } else + out_layouts = ff_all_channel_layouts(); + ff_channel_layouts_ref(out_layouts, &outlink->in_channel_layouts); +diff a/libswresample/x86/swresample_x86.c b/libswresample/x86/swresample_x86.c +--- ffmpeg-0.11.1/libswresample/x86/swresample_x86.c 2012-08-06 22:49:12.765984768 +0000 ++++ ffmpeg-0.11.1/libswresample/x86/swresample_x86.c 2012-08-06 22:57:04.826015744 +0000 +@@ -25,7 +25,7 @@ + #define PROTO2(pre, out, cap) PROTO(pre, int16, out, cap) PROTO(pre, int32, out, cap) PROTO(pre, float, out, cap) + #define PROTO3(pre, cap) PROTO2(pre, int16, cap) PROTO2(pre, int32, cap) PROTO2(pre, float, cap) + #define PROTO4(pre) PROTO3(pre, mmx) PROTO3(pre, sse) PROTO3(pre, sse2) PROTO3(pre, ssse3) PROTO3(pre, sse4) PROTO3(pre, avx) +-PROTO4() ++PROTO4( ) + PROTO4(_pack_2ch) + PROTO4(_pack_6ch) + PROTO4(_unpack_2ch) +diff -u a/libavcodec/pngenc.c b/libavcodec/pngenc.c +--- ffmpeg-0.11.1/libavcodec/pngenc.c 2012-08-06 22:49:04.337117184 +0000 ++++ ffmpeg-0.11.1/libavcodec/pngenc.c 2012-08-06 23:04:38.048758784 +0000 +@@ -55,8 +55,9 @@ + int x, mask, dst_x, j, b, bpp; + uint8_t *d; + const uint8_t *s; ++ int mask_tmp[] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff}; + +- mask = (int[]){0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff}[pass]; ++ mask = mask_tmp[pass]; + switch(bits_per_pixel) { + case 1: + memset(dst, 0, row_size); +diff -u a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c +--- ffmpeg-0.11.1/libswscale/swscale_unscaled.c 2012-08-06 22:49:12.936902656 +0000 ++++ ffmpeg-0.11.1/libswscale/swscale_unscaled.c 2012-08-06 23:18:25.574095360 +0000 +@@ -472,38 +472,40 @@ + } + + switch (c->dstFormat) { +- case PIX_FMT_BGR24: +- gbr24ptopacked24((const uint8_t *[]) { src[1], src[0], src[2] }, +- (int []) { srcStride[1], srcStride[0], srcStride[2] }, +- dst[0] + srcSliceY * dstStride[0], dstStride[0], ++ case PIX_FMT_BGR24: { ++ const uint8_t* src2[] = {src[1], src[0], src[2]}; ++ int srcStride2[] = {srcStride[1], srcStride[0], srcStride[2]}; ++ gbr24ptopacked24(src2, srcStride2, dst[0] + srcSliceY * dstStride[0], dstStride[0], + srcSliceH, c->srcW); + break; +- +- case PIX_FMT_RGB24: +- gbr24ptopacked24((const uint8_t *[]) { src[2], src[0], src[1] }, +- (int []) { srcStride[2], srcStride[0], srcStride[1] }, +- dst[0] + srcSliceY * dstStride[0], dstStride[0], ++ } ++ case PIX_FMT_RGB24: { ++ const uint8_t* src2[] = {src[2], src[0], src[1]}; ++ int srcStride2[] = {srcStride[2], srcStride[0], srcStride[1]}; ++ gbr24ptopacked24(src2, srcStride2, dst[0] + srcSliceY * dstStride[0], dstStride[0], + srcSliceH, c->srcW); + break; +- ++ } + case PIX_FMT_ARGB: + alpha_first = 1; +- case PIX_FMT_RGBA: +- gbr24ptopacked32((const uint8_t *[]) { src[2], src[0], src[1] }, +- (int []) { srcStride[2], srcStride[0], srcStride[1] }, ++ case PIX_FMT_RGBA: { ++ const uint8_t* src2[] = {src[2], src[0], src[1]}; ++ int srcStride2[] = {srcStride[2], srcStride[0], srcStride[1]}; ++ gbr24ptopacked32(src2, srcStride2, + dst[0] + srcSliceY * dstStride[0], dstStride[0], + srcSliceH, alpha_first, c->srcW); + break; +- ++ } + case PIX_FMT_ABGR: + alpha_first = 1; +- case PIX_FMT_BGRA: +- gbr24ptopacked32((const uint8_t *[]) { src[1], src[0], src[2] }, +- (int []) { srcStride[1], srcStride[0], srcStride[2] }, ++ case PIX_FMT_BGRA: { ++ const uint8_t* src2[] = {src[1], src[0], src[2]}; ++ int srcStride2[] = {srcStride[1], srcStride[0], srcStride[2]}; ++ gbr24ptopacked32(src2, srcStride2, + dst[0] + srcSliceY * dstStride[0], dstStride[0], + srcSliceH, alpha_first, c->srcW); + break; +- ++ } + default: + av_log(c, AV_LOG_ERROR, + "unsupported planar RGB conversion %s -> %s\n", +diff -u a/ffprobe.c b/ffprobe.c +--- ffmpeg-0.11.1/ffprobe.c 2012-08-06 22:49:00.930873344 +0000 ++++ ffmpeg-0.11.1/ffprobe.c 2012-08-06 23:26:28.951844864 +0000 +@@ -312,7 +312,9 @@ + writer_print_string(wctx, key, "N/A", 1); + } else { + double d = ts * av_q2d(*time_base); +- value_string(buf, sizeof(buf), (struct unit_value){.val.d=d, .unit=unit_second_str}); ++ struct unit_value value2 = {.unit=unit_second_str}; ++ value2.val.d = d; ++ value_string(buf, sizeof(buf), value2); + writer_print_string(wctx, key, buf, 0); + } + } +@@ -1188,7 +1190,7 @@ + #define print_time(k, v, tb) writer_print_time(w, k, v, tb) + #define print_ts(k, v) writer_print_ts(w, k, v) + #define print_val(k, v, u) value2.val.i = v; value2.unit=u; writer_print_string(w, k, \ +- value_string(val_str, sizeof(val_str), value2), 0); ++ value_string(val_str, sizeof(val_str), value2), 0); + #define print_section_header(s) writer_print_section_header(w, s) + #define print_section_footer(s) writer_print_section_footer(w, s) + #define show_tags(metadata) writer_show_tags(w, metadata) +@@ -1357,6 +1359,7 @@ + const char *s; + AVRational display_aspect_ratio; + AVBPrint pbuf; ++ struct unit_value value2; + + av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED); + +@@ -1447,7 +1450,7 @@ + print_fmt("time_base", "%d/%d", stream->time_base.num, stream->time_base.den); + print_time("start_time", stream->start_time, &stream->time_base); + print_time("duration", stream->duration, &stream->time_base); +- if (dec_ctx->bit_rate > 0) print_val ("bit_rate", dec_ctx->bit_rate, unit_bit_per_second_str); ++ if (dec_ctx->bit_rate > 0) { print_val ("bit_rate", dec_ctx->bit_rate, unit_bit_per_second_str); } + else print_str_opt("bit_rate", "N/A"); + if (stream->nb_frames) print_fmt ("nb_frames", "%"PRId64, stream->nb_frames); + else print_str_opt("nb_frames", "N/A"); diff --git a/media-video/handbrake/handbrake-0.9.5.bep b/media-video/handbrake/handbrake-0.9.5.bep index 80addcb24..ba4f05613 100644 --- a/media-video/handbrake/handbrake-0.9.5.bep +++ b/media-video/handbrake/handbrake-0.9.5.bep @@ -3,7 +3,7 @@ HOMEPAGE="http://www.handbrake.fr" SRC_URI="http://handbrake.fr/rotation.php?file=HandBrake-0.9.5.tar.bz2" CHECKSUM_MD5="e17d3663fc36a985fe43e188695e3196" REVISION="1" -STATUS_HAIKU="stable" +STATUS_HAIKU="broken" DEPEND="dev-libs/libxml2 >= 2.7.7 media-libs/lame >= 3.98 media-libs/faac >= 1.28 @@ -30,7 +30,7 @@ BUILD { sed -i 's/MODULES += contrib\/libass/ /' make/include/main.defs sed -i 's/MODULES += contrib\/dvdread/ /' make/include/main.defs - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` cd build make } diff --git a/media-video/vlc/patches/vlc-2.0.5.patch b/media-video/vlc/patches/vlc-2.0.5.patch new file mode 100644 index 000000000..349f686b4 --- /dev/null +++ b/media-video/vlc/patches/vlc-2.0.5.patch @@ -0,0 +1,552 @@ +--- vlc-2.0.5-orig/configure.ac 2012-10-22 09:03:51.049545216 +0000 ++++ vlc-2.0.5/configure.ac 2012-12-25 23:08:34.519045120 +0000 +@@ -279,11 +279,18 @@ + SYS=os2 + LDFLAGS_save="${LDFLAGS_save} -Zomf -Zbin-files -Zargs-wild"; LDFLAGS="${LDFLAGS_save}" + ;; ++ *haiku*) ++ SYS=haiku ++ VLC_ADD_LIBS([libvlccore libvlc vlc],[-lnetwork -lbe]) ++ VLC_ADD_PLUGIN([haiku_aout]) ++ VLC_ADD_LIBS([haiku_aout],[-lmedia]) ++ ;; + *) + SYS="${host_os}" + ;; + esac + AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin") ++AM_CONDITIONAL(HAVE_HAIKU, test "${SYS}" = "haiku") + AM_CONDITIONAL(HAVE_LINUX, test "${SYS}" = "linux") + AM_CONDITIONAL(HAVE_OS2, test "${SYS}" = "os2") + AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") +@@ -513,10 +520,13 @@ + dnl Check for system libs needed + need_libc=false + ++#this fails to detect that we have if_nameindex and if_nametoindex on haiku ++#and then it dails to detect that we don't have tdestroy... ++ + dnl Check for usual libc functions + AC_CHECK_DECLS([nanosleep],,,[#include ]) + AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale]) +-AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy]) ++AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab]) + AC_CHECK_FUNCS(fdatasync,, + [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) + ]) +@@ -578,6 +588,9 @@ + AS_IF([test "${SYS}" = "mingwce"], [ + SOCKET_LIBS="-lws2" + ]) ++ AS_IF([test "${SYS}" = "haiku"], [ ++ SOCKET_LIBS="-lnetwork" ++ ]) + ]) + LIBS="$LIBS_save" + AS_IF([test -n "$SOCKET_LIBS"], [ +@@ -3110,7 +3123,7 @@ + if test "${SYS}" != "darwin"; then + VLC_ADD_PLUGIN([vout_sdl]) + fi +- if test "${SYS}" != "mingw32" -a "${SYS}" != "os2"; then ++ if test "${SYS}" != "mingw32" -a "${SYS}" != "haiku"; then + VLC_ADD_LIBS([vout_sdl],[${X_LIBS} ${X_PRE_LIBS} -lX11]) + fi + VLC_ADD_CFLAGS([vout_sdl],[${SDL_CFLAGS}]) +@@ -4155,7 +4168,7 @@ + dnl Stuff used by the program + dnl + VERSION_MESSAGE="${VERSION} ${CODENAME}" +-COPYRIGHT_MESSAGE="Copyright © ${COPYRIGHT_YEARS} VLC authors and VideoLAN" ++COPYRIGHT_MESSAGE="Copyright (C) ${COPYRIGHT_YEARS} VLC authors and VideoLAN" + AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION_MESSAGE}", [Simple version string]) + AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "${COPYRIGHT_MESSAGE}", [Copyright string]) + AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years]) + +--- vlc-2.0.3-orig/src/modules/bank.c 2011-12-08 18:00:28.032243712 +0000 ++++ vlc-2.0.5/src/modules/bank.c 2012-07-30 22:00:12.285736960 +0000 +@@ -71,28 +71,30 @@ + modules.head = module; + } + +-#ifdef __ELF__ +-# ifdef __GNUC__ +-__attribute__((weak)) +-# else +-# pragma weak vlc_static_modules +-# endif +-extern vlc_plugin_cb vlc_static_modules[]; +- +-static void module_InitStaticModules(void) +-{ +- if (!vlc_static_modules) +- return; +- +- for (unsigned i = 0; vlc_static_modules[i]; i++) { +- module_t *module = module_InitStatic (vlc_static_modules[i]); +- if (likely(module != NULL)) +- module_StoreBank (module); +- } +-} +-#else ++//Haiku bug #8288 ++//#ifdef __ELF__ ++//# ifdef __GNUC__ ++//__attribute__((weak)) ++//# else ++//# pragma weak vlc_static_modules ++//# endif ++//extern vlc_plugin_cb vlc_static_modules[]; ++// ++//static void module_InitStaticModules(void) ++//{ ++// if (!vlc_static_modules) ++// return; ++// ++// for (unsigned i = 0; vlc_static_modules[i]; i++) { ++// module_t *module = module_InitStatic (vlc_static_modules[i]); ++// if (likely(module != NULL)) ++// module_StoreBank (module); ++// } ++//} ++//#else + static void module_InitStaticModules(void) { } +-#endif ++//#endif ++ + + /** + * Init bank +--- vlc-2.0.3-orig/include/vlc_threads.h 2012-01-27 23:03:32.051904512 +0000 ++++ vlc-2.0.5/include/vlc_threads.h 2012-07-30 22:08:53.845414400 +0000 +@@ -124,7 +124,13 @@ + typedef pthread_cond_t vlc_cond_t; + #define VLC_STATIC_COND PTHREAD_COND_INITIALIZER + typedef pthread_rwlock_t vlc_rwlock_t; ++// Haiku bug #8798 ++#ifdef __HAIKU__ ++#define VLC_STATIC_RWLOCK \ ++ { VLC_STATIC_MUTEX, VLC_STATIC_COND, 0, 0, 0 } ++#else + #define VLC_STATIC_RWLOCK PTHREAD_RWLOCK_INITIALIZER ++#endif + typedef pthread_key_t vlc_threadvar_t; + typedef struct vlc_timer *vlc_timer_t; + +--- vlc-2.0.3-orig/include/vlc_fixups.h 2012-01-30 21:37:14.052428800 +0000 ++++ vlc-2.0.5/include/vlc_fixups.h 2012-07-30 22:21:46.086245376 +0000 +@@ -246,10 +246,13 @@ + #endif + + /* Socket stuff */ ++// configure doesn't detect these, likely not linking to -lnetwork, must investigate ++#ifndef __HAIKU__ + #ifndef HAVE_INET_PTON + int inet_pton(int, const char *, void *); + const char *inet_ntop(int, const void *, char *, int); + #endif ++#endif + + #ifndef HAVE_STRUCT_POLLFD + enum +@@ -276,6 +279,8 @@ + # define poll(a, b, c) vlc_poll(a, b, c) + #endif + ++// or these ++#ifndef __HAIKU__ + #ifndef HAVE_IF_NAMEINDEX + #include + struct if_nameindex +@@ -289,6 +294,7 @@ + # define if_nameindex() (errno = ENOBUFS, NULL) + # define if_freenameindex(list) (void)0 + #endif ++#endif + + /* search.h */ + #ifndef HAVE_SEARCH_H +--- vlc-2.0.3-orig/bin/override.c 2011-12-08 18:00:25.033554432 +0000 ++++ vlc-2.0.5/bin/override.c 2012-07-31 20:19:54.136314880 +0000 +@@ -124,6 +124,8 @@ + * + * Some evil libraries modify the environment. We currently ignore the calls as + * they could crash the process. This may cause funny behaviour though. */ ++#ifndef __HAIKU__ ++//not working + int putenv (char *str) + { + if (override) +@@ -133,7 +135,7 @@ + } + return CALL(putenv, str); + } +- ++#endif + int setenv (const char *name, const char *value, int overwrite) + { + if (override) +--- vlc-2.0.3-orig/modules/text_renderer/freetype.c 2012-06-20 18:07:49.059244544 +0000 ++++ vlc-2.0.5/modules/text_renderer/freetype.c 2012-08-04 15:22:01.509870080 +0000 +@@ -58,6 +58,9 @@ + #elif defined( HAVE_MAEMO ) + # define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf" + # define DEFAULT_FAMILY "Nokia Sans Bold" ++#elif defined(__HAIKU__) ++# define DEFAULT_FONT_FILE "/boot/system/data/fonts/ttfonts/DejaVuSans.ttf" ++# define DEFAULT_FAMILY "DejaVu Sans" + #else + # define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf" + # define DEFAULT_FAMILY "Serif Bold" +--- vlc-2.0.3-orig/modules/audio_output/haiku.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ vlc-2.0.5/modules/audio_output/haiku.cpp 2012-08-06 23:15:46.251396096 +0000 +@@ -0,0 +1,197 @@ ++/***************************************************************************** ++ * Haiku.cpp - Haiku Media Kit audio output ++ ***************************************************************************** ++ * Copyright (C) 1999, 2000, 2001, 2012 the VideoLAN team ++ * ++ * Authors: Jean-Marc Dressler ++ * Samuel Hocevar ++ * Eric Petit ++ * Cian Duffy ++ * ++ * This program 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 ++ * (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. ++ * ++ * 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. ++ *****************************************************************************/ ++ ++/***************************************************************************** ++ * Preamble ++ *****************************************************************************/ ++#include ++#include /* malloc(), free() */ ++#include ++#include ++ ++#include ++#include ++using namespace std; ++ ++#include ++#include ++ ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif ++ ++#include ++#include ++#include ++ ++/***************************************************************************** ++ * aout_sys_t: BeOS audio output method descriptor ++ *****************************************************************************/ ++ ++queue a_queue; ++ ++struct aout_sys_t ++{ ++ BSoundPlayer * p_player; ++ mtime_t latency; ++ media_raw_audio_format * p_format; ++}; ++ ++/***************************************************************************** ++ * Local prototypes. ++ *****************************************************************************/ ++static void Close ( vlc_object_t * ); ++static void Pause (audio_output_t *, bool, mtime_t); ++static void Play (audio_output_t *, block_t *); ++ ++static void Flush (audio_output_t *, bool);static int Open ( vlc_object_t * ); ++static void BufferProc ( void * p_aout, void * p_buffer, size_t size, ++ const media_raw_audio_format & format ); ++ ++/***************************************************************************** ++ * Module descriptor ++ *****************************************************************************/ ++vlc_module_begin () ++ set_shortname( "haiku_aout" ) ++ set_description( N_("Haiku Media Kit audio output") ) ++ set_capability( "audio output", 100 ) ++ set_category( CAT_AUDIO ) ++ set_subcategory( SUBCAT_AUDIO_AOUT ) ++ set_callbacks( Open, Close ) ++vlc_module_end () ++/***************************************************************************** ++ * OpenAudio ++ *****************************************************************************/ ++static int Open( vlc_object_t * p_this ) ++{ ++ audio_output_t *p_aout = (audio_output_t *)p_this; ++ p_aout->sys = (aout_sys_t*)malloc( sizeof( aout_sys_t ) ); ++ if( p_aout->sys == NULL ) ++ { ++ return VLC_ENOMEM; ++ } ++ ++ aout_sys_t * p_sys = p_aout->sys; ++ ++ audio_format_t format = p_aout->format; ++ ++ int i_nb_channels = aout_FormatNbChannels( &format ); ++ ++// media_raw_audio_format must be passed to BSoundPlayer ++ p_sys->p_format = (media_raw_audio_format*) ++ malloc( sizeof( media_raw_audio_format ) ); ++ ++ p_aout->format.i_format = VLC_CODEC_FI32; ++ p_aout->format.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; ++ p_aout->format.i_rate = 44100; ++ ++ p_sys->p_format->channel_count = i_nb_channels; ++ p_sys->p_format->frame_rate = p_aout->format.i_rate; ++ p_sys->p_format->format = media_raw_audio_format::B_AUDIO_INT; ++ p_sys->p_format->byte_order = B_MEDIA_LITTLE_ENDIAN; ++ // 'magic' number obtained from checking what size the buffers being ++ // passed by the callback were ++ // in theory, any buffer size should work ++ p_sys->p_format->buffer_size = 9216; ++ ++ aout_VolumeSoftInit( p_aout ); ++ ++ //BSoundPlayer init - format, name, buffer producer, notifier, cookie ++ ++ p_sys->p_player = new BSoundPlayer( p_sys->p_format, "player", BufferProc, NULL, NULL ); ++ if( p_sys->p_player->InitCheck() != B_OK ) ++ { ++ msg_Err( p_aout, "BSoundPlayer InitCheck failed" ); ++ delete p_sys->p_player; ++ free( p_sys ); ++ } ++ p_sys->latency = p_sys->p_player->Latency(); ++ ++ p_aout->pf_play = Play; ++ p_aout->pf_pause = Pause; ++ p_aout->pf_flush = Flush; ++ ++ return VLC_SUCCESS; ++ ++} ++ ++/***************************************************************************** ++ * BufferProc- buffer producer function ++ *****************************************************************************/ ++static void BufferProc( void * _p_aout, void * _p_buffer, size_t i_size, ++ const media_raw_audio_format &format ) ++{ ++// Load buffer ++ for (size_t i = 0; i < i_size; i++) ++ { ++ uint8 data = a_queue.front(); ++ vlc_memset(_p_buffer + i, data, 1); ++ a_queue.pop(); ++ } ++ ++} ++/***************************************************************************** ++ * CloseAudio ++ *****************************************************************************/ ++static void Close( vlc_object_t * p_this ) ++{ ++ printf("Close Called"); ++ audio_output_t *p_aout = (audio_output_t *)p_this; ++ struct aout_sys_t *p_sys; ++ p_aout->sys = p_sys; ++ ++ /* Clean up */ ++ p_sys->p_player->Stop(); ++ delete p_sys->p_player; ++ free( p_sys ); ++} ++ ++ ++static void Play (audio_output_t *aout, block_t *block) ++{ ++ aout_sys_t * p_sys = aout->sys; ++ ++// load buffer to STL queue, sample by sample ++ for (size_t i = 0; i < block->i_buffer; i++) ++ { ++ a_queue.push(block->p_buffer[i]); ++ } ++ ++ p_sys->p_player->Start(); ++ p_sys->p_player->SetHasData( true ); ++// release buffer ++ block_Release (block); ++} ++ ++ ++static void Pause (audio_output_t *aout, bool pause, mtime_t date) ++{ ++} ++ ++ ++static void Flush (audio_output_t *aout, bool wait) ++{ ++} ++ +--- vlc-2.0.3-orig/modules/audio_output/Modules.am 2011-12-08 18:00:26.046923776 +0000 ++++ vlc-2.0.5/modules/audio_output/Modules.am 2012-08-04 15:40:24.463208448 +0000 +@@ -6,6 +6,7 @@ + SOURCES_jack = jack.c + SOURCES_audioqueue = audioqueue.c + SOURCES_opensles_android = opensles_android.c ++SOURCES_haiku_aout = haiku.cpp + + libadummy_plugin_la_SOURCES = adummy.c + libadummy_plugin_la_CFLAGS = $(AM_CFLAGS) +--- vlc-2.0.3-orig/src/haiku/specific.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ vlc-2.0.5/src/haiku/specific.cpp 2012-08-05 12:18:40.333185024 +0000 +@@ -0,0 +1,57 @@ ++/***************************************************************************** ++ * specific.c: stubs for POSIX OS-specific initialization ++ ***************************************************************************** ++ * Copyright © 2008 Rémi Denis-Courmont ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU Lesser General Public License as published by ++ * the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser 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. ++ *****************************************************************************/ ++ ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif ++ ++#include ++ ++ ++#include ++extern "C" ++{ ++#include "../libvlc.h" ++#include ++ ++ ++static void set_libvlc_path (void) ++{ ++ psz_vlcpath = (char *)PKGLIBDIR; ++} ++ ++void system_Init (void) ++{ ++ BApplication app("application/x-vnd.videolan"); ++ pthread_once_t once = PTHREAD_ONCE_INIT; ++ ++ pthread_once (&once, set_libvlc_path); ++} ++ ++void system_Configure (libvlc_int_t *libvlc, ++ int argc, const char *const argv[]) ++{ ++ (void)libvlc; (void)argc; (void)argv; ++} ++ ++void system_End (void) ++{ ++} ++} +--- vlc-2.0.3-orig/src/Makefile.am 2012-05-15 12:41:19.024641536 +0000 ++++ vlc-2.0.5/src/Makefile.am 2012-08-05 01:50:39.982253568 +0000 +@@ -221,6 +221,9 @@ + if HAVE_OS2 + libvlccore_la_SOURCES += $(SOURCES_libvlc_os2) + else ++if HAVE_HAIKU ++libvlccore_la_SOURCES += $(SOURCES_libvlc_haiku) ++else + libvlccore_la_SOURCES += $(SOURCES_libvlc_other) + endif + endif +@@ -228,6 +231,7 @@ + endif + endif + endif ++endif + if BUILD_HTTPD + libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd) + endif +@@ -287,6 +291,16 @@ + os2/specific.c \ + $(NULL) + ++SOURCES_libvlc_haiku = \ ++ posix/dirs.c \ ++ misc/atomic.c \ ++ posix/filesystem.c \ ++ network/poll.c \ ++ posix/thread.c \ ++ posix/plugin.c \ ++ haiku/specific.cpp \ ++ $(NULL) ++ + SOURCES_libvlc_other = \ + posix/dirs.c \ + misc/atomic.c \ + +--- vlc-2.0.3-orig/modules/gui/qt4/qt4.cpp 2012-07-02 00:47:23.031457280 +0000 ++++ vlc-2.0.5/modules/gui/qt4/qt4.cpp 2012-12-11 21:52:28.551288832 +0000 +@@ -628,7 +628,7 @@ + if( !p_wnd->handle.hwnd ) + return VLC_EGENERIC; + +-#elif defined (Q_WS_MAC) ++#elif defined (Q_WS_MAC) || defined(Q_WS_HAIKU) + p_wnd->handle.nsobject = (void *)p_mi->getVideo( &i_x, &i_y, &i_width, &i_height ); + if( !p_wnd->handle.nsobject ) + return VLC_EGENERIC; + +--- vlc-2.0.3-orig/src/network/io.c 2012-04-27 17:14:57.020709376 +0000 ++++ vlc-2.0.5/src/network/io.c 2012-12-11 21:34:34.143392768 +0000 +@@ -215,7 +215,9 @@ + switch (ptr->ai_socktype) + { + case SOCK_STREAM: ++#ifdef SOCK_RDM + case SOCK_RDM: ++#endif + case SOCK_SEQPACKET: + #ifdef SOCK_DCCP + case SOCK_DCCP: +--- vlc-2.0.5-orig/modules/video_output/sdl.c 2011-12-08 18:00:27.022282240 +0000 ++++ vlc-2.0.5/modules/video_output/sdl.c 2012-12-20 21:47:16.280494080 +0000 +@@ -40,7 +40,7 @@ + + #include + +-#if !defined(WIN32) && !defined(__OS2__) ++#if !defined(WIN32) && !defined(__OS2__) && !defined(__HAIKU__) + # ifdef X_DISPLAY_MISSING + # error Xlib required due to XInitThreads + # endif +@@ -116,7 +116,7 @@ + vout_display_t *vd = (vout_display_t *)object; + vout_display_sys_t *sys; + +-#if !defined(WIN32) && !defined(__OS2__) ++#if !defined(WIN32) && !defined(__OS2__) && !defined(__HAIKU__) + if (!vlc_xlib_init (object)) + return VLC_EGENERIC; + #endif diff --git a/media-video/vlc/vlc-0.8.6i.bep b/media-video/vlc/vlc-0.8.6i.bep index b863b4a49..0cc7f3333 100644 --- a/media-video/vlc/vlc-0.8.6i.bep +++ b/media-video/vlc/vlc-0.8.6i.bep @@ -15,7 +15,7 @@ CHECKSUM_MD5="fd852166d1705573cd7768a06117ed51" BUILD { cd vlc-0.8.6i libtoolize --force --copy --install - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/media-video/vlc/vlc-1.1.5-20101107.bep b/media-video/vlc/vlc-1.1.5-20101107.bep index 10b092218..53aca8ef8 100644 --- a/media-video/vlc/vlc-1.1.5-20101107.bep +++ b/media-video/vlc/vlc-1.1.5-20101107.bep @@ -19,7 +19,7 @@ CHECKSUM_MD5="9ab7d8218ff37e362f996fd7d8879dbc" BUILD { cd vlc-1.1.5 ./bootstrap - ./configure --prefix=/boot/common --disable-postproc --disable-xcb --disable-skins2 --disable-qt4 --disable-libgcrypt --disable-remoteosd + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-postproc --disable-xcb --disable-skins2 --disable-qt4 --disable-libgcrypt --disable-remoteosd make } diff --git a/media-video/vlc/vlc-2.0.5.bep b/media-video/vlc/vlc-2.0.5.bep new file mode 100644 index 000000000..8fc3003ea --- /dev/null +++ b/media-video/vlc/vlc-2.0.5.bep @@ -0,0 +1,40 @@ +DESCRIPTION="vlc - media player" +HOMEPAGE="http://www.videolan.org/vlc/" +SRC_URI="http://download.videolan.org/pub/videolan/vlc/2.0.5/vlc-2.0.5.tar.xz" +REVISION="1" +STATUS_HAIKU="unstable" +MESSAGE="This port only builds on gcc4 systems" +DEPEND="faad2, + libdca, + libdvdnav >= 4.2.0, + libmatroska, + libmad, + a52dec, + schroedinger, + twolame, + lua >= 5.1.4, + taglib >= 1.7, + libbluray, + lame >= 3.98.4, + libgcrypt, + libcddb, + x264, + flac, + ffmpeg = 0.10.2-vlc + libsdl + sdl-image" +CHECKSUM_MD5="4f959c0766ada8cea5a72c65fce94ebe" +BUILD { + cd vlc-2.0.5 + bootstrap + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-kde-solid=no --disable-xcb --enable-run-as-root --enable-static + make +} + +INSTALL { + cd vlc-2.0.5 + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="1998-2012" diff --git a/net-ftp/tnftp/tnftp-20091122.bep b/net-ftp/tnftp/tnftp-20091122.bep index f118ab3b4..44df64778 100644 --- a/net-ftp/tnftp/tnftp-20091122.bep +++ b/net-ftp/tnftp/tnftp-20091122.bep @@ -12,7 +12,7 @@ BUILD { autoconf automake autoheader - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-irc/irssi/irssi-0.8.15.bep b/net-irc/irssi/irssi-0.8.15.bep new file mode 100644 index 000000000..6399e319a --- /dev/null +++ b/net-irc/irssi/irssi-0.8.15.bep @@ -0,0 +1,28 @@ +DESCRIPTION="Irssi is a command line irc client" +HOMEPAGE="http://www.irssi.org/" +SRC_URI="http://www.irssi.org/files/irssi-0.8.15.tar.gz" +CHECKSUM_MD5="870db8e319f640c2bf446c30d0c24ef6" +REVISION="1" + +STATUS_HAIKU="untested" +DEPEND="sys-devel/gettext >= 0.18.1 + dev-util/pkgconfig >= 0.25 + dev-libs/glib >= 2.24.2" + +BUILD { + cd irssi-0.8.15 + libtoolize --force --copy --install + autoreconf -i + sed -i.bak 's/\$withval\/include\/ncurses.h/\/boot\/develop\/headers\/3rdparty\/ncurses.h/g' configure + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ncurses=`finddir B_COMMON_DIRECTORY` + make + +} + +INSTALL { + cd irssi-0.8.15 + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="1999-2012 Timo Sirainen" diff --git a/net-irc/rhapsody-irc/patches/rhapsody-irc-0.28b.patch b/net-irc/rhapsody-irc/patches/rhapsody-irc-0.28b.patch new file mode 100644 index 000000000..82a32bbd2 --- /dev/null +++ b/net-irc/rhapsody-irc/patches/rhapsody-irc-0.28b.patch @@ -0,0 +1,38 @@ +diff -ur rhapsody-0.28b.org/configure rhapsody-0.28b/configure +--- rhapsody-0.28b.org/configure 2006-02-24 07:46:19.017301504 +0100 ++++ rhapsody-0.28b/configure 2012-11-22 20:29:15.727973888 +0100 +@@ -168,6 +168,25 @@ + + STDDOCSPATH="/usr/share/doc/rhapsody" + ++elif [ "$OS" = "Haiku" ] ; then ++ CCPATH="/boot/develop/tools/gnupro/bin /boot/develop/bin" ++ CURSESPATH="/boot/develop/headers/3rdparty /boot/develop/headers /boot/develop/headers/gnu" ++ ++ GCCBASELIBS="-lncurses -lnetwork" ++ GCCBASELIBPATHS="" ++ GCCBASEINCPATHS="" ++ GCCBASEFLAGS="-g -Wall -Wno-unused" ++ ++ CCBASELIBS="" ++ CCBASELIBPATHS="" ++ CCBASEINCPATHS="" ++ CCBASEFLAGS="" ++ ++ STDDOCSPATH="`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/rhapsody" ++ if [ -z "$INSTALLPATH" ] ; then ++ INSTALLPATH="`finddir B_COMMON_BIN_DIRECTORY`" ++ fi ++ + elif [ "$OS" = "HP-UX" ] ; then + CCPATH="/bin /usr/bin /usr/local/bin" + CURSESPATH="/usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses" +@@ -235,7 +254,7 @@ + # Set install, docs, header and lib path if not provided # + ########################################################### + +-if [ $USER = "root" ] ; then ++if [ $USER = "root" -o "$UID" = "0" ] ; then + echo "Running as root." + + if [ -z "$INSTALLPATH" ] ; then diff --git a/net-irc/rhapsody-irc/rhapsody-irc-0.28b.bep b/net-irc/rhapsody-irc/rhapsody-irc-0.28b.bep new file mode 100644 index 000000000..922b8640b --- /dev/null +++ b/net-irc/rhapsody-irc/rhapsody-irc-0.28b.bep @@ -0,0 +1,21 @@ +DESCRIPTION="Text console IRC client" +HOMEPAGE="http://rhapsody.sourceforge.net/" +SRC_URI="http://downloads.sourceforge.net/project/rhapsody/rhapsody/Rhapsody%20IRC%200.28b/rhapsody_0.28b.tgz" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="" +CHECKSUM_MD5="0792de636a2625a826491e387fcb1305" + +BUILD { + cd rhapsody-0.28b + ./configure + make +} + +INSTALL { + cd rhapsody-0.28b + make install +} + +COPYRIGHT="2006 Adrian Gonera" +LICENSE="GNU GPL v2" diff --git a/net-libs/enet/patches/enet-1.2.2.patch b/net-libs/enet/patches/enet-1.2.2.patch new file mode 100644 index 000000000..86802132d --- /dev/null +++ b/net-libs/enet/patches/enet-1.2.2.patch @@ -0,0 +1,12 @@ +diff -Naur enet-1.2.2/configure.ac enet-1.2.2-haiku/configure.ac +--- enet-1.2.2/configure.ac 2010-05-20 13:55:27.056623104 -0300 ++++ enet-1.2.2-haiku/configure.ac 2011-04-24 01:31:41.000000000 -0300 +@@ -16,6 +16,8 @@ + + AC_CHECK_MEMBER(struct msghdr.msg_flags, [AC_DEFINE(HAS_MSGHDR_FLAGS)], , [#include ]) + ++AC_CHECK_LIB(network, connect) ++ + AC_CHECK_TYPE(socklen_t, [AC_DEFINE(HAS_SOCKLEN_T)], , + #include + #include diff --git a/net-libs/gnutls/gnutls-2.8.6.bep b/net-libs/gnutls/gnutls-2.8.6.bep index c4a7d7797..274b38205 100644 --- a/net-libs/gnutls/gnutls-2.8.6.bep +++ b/net-libs/gnutls/gnutls-2.8.6.bep @@ -22,7 +22,7 @@ BUILD { libtoolize --force --copy --install autoreconf cd .. - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } INSTALL { diff --git a/net-libs/hubbub/hubbub-0.1.2-HEAD.bep b/net-libs/hubbub/hubbub-0.1.2-HEAD.bep new file mode 100644 index 000000000..f39828ea1 --- /dev/null +++ b/net-libs/hubbub/hubbub-0.1.2-HEAD.bep @@ -0,0 +1,20 @@ +DESCRIPTION="Hubbub is an HTML5 compliant parsing library" +HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" +SRC_URI="git://git.netsurf-browser.org/libhubbub.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/buildsystem >= 0 + dev-libs/libparserutils >= 0.1.1" + +BUILD { + cd hubbub-0.1.2-HEAD + make PREFIX=/boot/common +} + +INSTALL { + cd hubbub-0.1.2-HEAD + make install PREFIX=/boot/common +} + +LICENSE="MIT" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/net-libs/hubbub/hubbub-0.1.2.bep b/net-libs/hubbub/hubbub-0.1.2.bep new file mode 100644 index 000000000..18e4c6314 --- /dev/null +++ b/net-libs/hubbub/hubbub-0.1.2.bep @@ -0,0 +1,19 @@ +DESCRIPTION="Hubbub is an HTML5 compliant parsing library" +HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" +SRC_URI="http://download.netsurf-browser.org/libs/releases/hubbub-0.1.2-src.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" + +BUILD { + cd hubbub-0.1.2 + make +} + +INSTALL { + cd hubbub-0.1.2 + make install +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/net-libs/libdom/libdom-0.bep b/net-libs/libdom/libdom-0.bep new file mode 100644 index 000000000..a7992f9d9 --- /dev/null +++ b/net-libs/libdom/libdom-0.bep @@ -0,0 +1,20 @@ +DESCRIPTION="LibDOM is an implementation of the W3C DOM" +HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/" +SRC_URI="git://git.netsurf-browser.org/libdom.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-lib/hubbub >= 0.1.2-HEAD" + +BUILD { + cd libdom-0 + make PREFIX=/boot/common +} + +INSTALL { + cd libdom-0 + make install PREFIX=/boot/common +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/net-libs/libs3/libs3-2.0.bep b/net-libs/libs3/libs3-2.0.bep new file mode 100644 index 000000000..7d2683e9c --- /dev/null +++ b/net-libs/libs3/libs3-2.0.bep @@ -0,0 +1,20 @@ +DESCRIPTION="C Library API for Amazon S3" +HOMEPAGE="http://libs3.ischo.com.s3.amazonaws.com/index.html" +SRC_URI="http://libs3.ischo.com.s3.amazonaws.com/libs3-2.0.tar.gz" +CHECKSUM_MD5="e52da69ddc11019e98cf8246fc55b4e1" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libxml2>=2.7.3 + net-misc/curl>=7.18.2" + +BUILD { + cd libs3-2.0 + make DESTDIR=${DESTDIR}/`finddir B_COMMON_DIRECTORY` +} + +INSTALL { + cd libs3-2.0 + make install DESTDIR=${DESTDIR}/`finddir B_COMMON_DIRECTORY` +} +LICENSE="GNU GPL v3" +COPYRIGHT="2008 Bryan Ischo" diff --git a/net-libs/libs3/patches/libs3-2.0.patch b/net-libs/libs3/patches/libs3-2.0.patch new file mode 100644 index 000000000..33e5aacad --- /dev/null +++ b/net-libs/libs3/patches/libs3-2.0.patch @@ -0,0 +1,36 @@ +diff -Naur libs3-2.0/GNUmakefile libs3-2.0-haiku/GNUmakefile +--- libs3-2.0/GNUmakefile 2011-09-28 08:16:09.000000000 +0000 ++++ libs3-2.0-haiku/GNUmakefile 2012-12-12 16:19:46.457965568 +0000 +@@ -134,7 +134,7 @@ + -D_ISOC99_SOURCE \ + -D_POSIX_C_SOURCE=200112L + +-LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) -lpthread ++LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) + + + # -------------------------------------------------------------------------- +diff -Naur libs3-2.0/src/request_context.c libs3-2.0-haiku/src/request_context.c +--- libs3-2.0/src/request_context.c 2011-09-28 08:16:09.000000000 +0000 ++++ libs3-2.0-haiku/src/request_context.c 2012-12-12 14:04:42.375652352 +0000 +@@ -29,6 +29,8 @@ + #include + #include "request.h" + #include "request_context.h" ++#include /* memset */ ++#include /* close */ + + + S3Status S3_create_request_context(S3RequestContext **requestContextReturn) +diff -Naur libs3-2.0/src/s3.c libs3-2.0-haiku/src/s3.c +--- libs3-2.0/src/s3.c 2011-09-28 08:16:09.000000000 +0000 ++++ libs3-2.0-haiku/src/s3.c 2012-12-12 14:31:37.335020032 +0000 +@@ -52,7 +52,7 @@ + #endif + + // Also needed for Windows, because somehow MinGW doesn't define this +-extern int putenv(char *); ++//extern int putenv(char *); + + + // Command-line options, saved as globals ------------------------------------ diff --git a/net-libs/libtorrent/libtorrent-0.12.5.bep b/net-libs/libtorrent/libtorrent-0.12.5.bep index 7f08558ef..cb29cf3cb 100644 --- a/net-libs/libtorrent/libtorrent-0.12.5.bep +++ b/net-libs/libtorrent/libtorrent-0.12.5.bep @@ -13,7 +13,7 @@ DEPEND="dev-util/pkgconfig >= 0.23 BUILD { cd libtorrent-0.12.5 autoreconf -vfi - ./configure --prefix=/boot/common --disable-mincore + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-mincore make } diff --git a/net-libs/libyahoo2/libyahoo2-1.0.1.bep b/net-libs/libyahoo2/libyahoo2-1.0.1.bep new file mode 100644 index 000000000..73e0b396a --- /dev/null +++ b/net-libs/libyahoo2/libyahoo2-1.0.1.bep @@ -0,0 +1,22 @@ +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" +REVISION="1" +CHECKSUM_MD5="e62dd7bc2dd77622cc0987a4dbf9b38c" +BUILD { + cd libyahoo2-1.0.1 + libtoolize --force --copy --install + aclocal + autoconf + automake + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd libyahoo2-1.0.1 + make install +} +LICENSE="GNU GPL v2" +COPYRIGHT="Copyright 2002-2010 The libyahoo2 Project Authors and Contributors" diff --git a/net-libs/libyahoo2/patches/libyahoo2-1.0.1.patch b/net-libs/libyahoo2/patches/libyahoo2-1.0.1.patch new file mode 100644 index 000000000..d767c4fea --- /dev/null +++ b/net-libs/libyahoo2/patches/libyahoo2-1.0.1.patch @@ -0,0 +1,15 @@ +--- libyahoo2-1.0.1-haiku/configure.ac 2010-07-27 01:13:13.015466496 +0000 ++++ libyahoo2-1.0.1/configure.ac 2012-12-11 17:26:38.095682560 +0000 +@@ -43,9 +43,9 @@ + + # Checks for libraries. + enable_sample_client="yes" +-AC_SEARCH_LIBS(socket, socket, , +- [AC_SEARCH_LIBS(socket, socket, LIBS="$LIBS -lnsl", +- enable_sample_client="no", -lnsl)]) ++AC_SEARCH_LIBS(socket, socket network) ++AC_SEARCH_LIBS(gethostbyname2, bind nsl resolv) ++AC_CHECK_LIB(rt, clock_gettime) + + # Checks for header files. + AC_HEADER_STDC diff --git a/net-misc/axel/axel-2.4.bep b/net-misc/axel/axel-2.4.bep index 5f5fcf432..f8a7e1722 100644 --- a/net-misc/axel/axel-2.4.bep +++ b/net-misc/axel/axel-2.4.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd axel-2.4 - ./configure --prefix=/boot/common --i18n=0 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --i18n=0 make } diff --git a/net-misc/curl/curl-7.18.2.bep b/net-misc/curl/curl-7.18.2.bep index c9ec2b81e..2dfa3a06c 100644 --- a/net-misc/curl/curl-7.18.2.bep +++ b/net-misc/curl/curl-7.18.2.bep @@ -11,7 +11,7 @@ BUILD { aclocal automake autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-misc/curl/curl-7.19.1.bep b/net-misc/curl/curl-7.19.1.bep index 0a0d28bf1..2aa33457c 100644 --- a/net-misc/curl/curl-7.19.1.bep +++ b/net-misc/curl/curl-7.19.1.bep @@ -11,7 +11,7 @@ BUILD { aclocal automake autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-misc/curl/curl-7.19.2.bep b/net-misc/curl/curl-7.19.2.bep index 532e9551b..a5aec318b 100644 --- a/net-misc/curl/curl-7.19.2.bep +++ b/net-misc/curl/curl-7.19.2.bep @@ -11,7 +11,7 @@ BUILD { aclocal automake autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-misc/curl/curl-7.19.5.bep b/net-misc/curl/curl-7.19.5.bep index b6752dd0f..00a363fbe 100644 --- a/net-misc/curl/curl-7.19.5.bep +++ b/net-misc/curl/curl-7.19.5.bep @@ -11,7 +11,7 @@ BUILD { aclocal automake autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-misc/curl/curl-7.19.7.bep b/net-misc/curl/curl-7.19.7.bep index b54985dd2..8f1b9aab4 100644 --- a/net-misc/curl/curl-7.19.7.bep +++ b/net-misc/curl/curl-7.19.7.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd curl-7.19.7 - cmake -DCMAKE_INSTALL_PREFIX=/boot/common -DCURL_DISABLE_LDAP=ON . + cmake -DCMAKE_INSTALL_PREFIX=`finddir B_COMMON_DIRECTORY` -DCURL_DISABLE_LDAP=ON . make } diff --git a/net-misc/curl/curl-7.20.0.bep b/net-misc/curl/curl-7.20.0.bep index 20f959de8..904bc0e74 100644 --- a/net-misc/curl/curl-7.20.0.bep +++ b/net-misc/curl/curl-7.20.0.bep @@ -9,7 +9,7 @@ BUILD { cd curl-7.20.0 libtoolize --force --copy --install autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-misc/curl/curl-7.20.1.bep b/net-misc/curl/curl-7.20.1.bep index cc1cd220c..56a82aeb8 100644 --- a/net-misc/curl/curl-7.20.1.bep +++ b/net-misc/curl/curl-7.20.1.bep @@ -9,7 +9,7 @@ BUILD { cd curl-7.20.1 libtoolize --force --copy --install autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-misc/curl/curl-7.21.1.bep b/net-misc/curl/curl-7.21.1.bep index 40456a4cd..eb7349259 100644 --- a/net-misc/curl/curl-7.21.1.bep +++ b/net-misc/curl/curl-7.21.1.bep @@ -9,7 +9,7 @@ BUILD { cd curl-7.21.1 libtoolize --force --copy --install autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-misc/curl/curl-7.21.2.bep b/net-misc/curl/curl-7.21.2.bep index 2156fa05e..1a0e915f9 100644 --- a/net-misc/curl/curl-7.21.2.bep +++ b/net-misc/curl/curl-7.21.2.bep @@ -9,7 +9,7 @@ BUILD { cd curl-7.21.2 libtoolize --force --copy --install autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-misc/curl/curl-7.21.3.bep b/net-misc/curl/curl-7.21.3.bep index cac99c075..8d4c718da 100644 --- a/net-misc/curl/curl-7.21.3.bep +++ b/net-misc/curl/curl-7.21.3.bep @@ -9,7 +9,7 @@ BUILD { cd curl-7.21.3 libtoolize --force --copy --install autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-misc/curl/curl-7.21.6.bep b/net-misc/curl/curl-7.21.6.bep new file mode 100644 index 000000000..117f23860 --- /dev/null +++ b/net-misc/curl/curl-7.21.6.bep @@ -0,0 +1,29 @@ +DESCRIPTION="curl and libcurl" +HOMEPAGE="http://curl.haxx.se" +SRC_URI="http://curl.haxx.se/download/curl-7.21.6.tar.bz2" +CHECKSUM_MD5="6611989a81ebd7b03a35adc3001ddee0" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd curl-7.21.6 + libtoolize --force --copy --install + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-ipv6 \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd curl-7.21.6 + make install +} + +TEST { + cd curl-7.21.6 + make check +} + +LICENSE="Curl" +COPYRIGHT="1996-2011, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.21.7.bep b/net-misc/curl/curl-7.21.7.bep new file mode 100644 index 000000000..a06380a11 --- /dev/null +++ b/net-misc/curl/curl-7.21.7.bep @@ -0,0 +1,30 @@ +DESCRIPTION="curl and libcurl" +HOMEPAGE="http://curl.haxx.se" +SRC_URI="http://curl.haxx.se/download/curl-7.21.7.tar.bz2" +CHECKSUM_MD5="5f6d50c4d4ee38c57fe37e3cff75adbd" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd curl-7.21.7 + libtoolize --force --copy --install + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-ipv6 \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem + make +} + +INSTALL { + cd curl-7.21.7 + make install +} + +TEST { + cd curl-7.21.7 + make check +} + +LICENSE="Curl" +COPYRIGHT="1996-2011, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.22.0.bep b/net-misc/curl/curl-7.22.0.bep new file mode 100644 index 000000000..50d927213 --- /dev/null +++ b/net-misc/curl/curl-7.22.0.bep @@ -0,0 +1,30 @@ +DESCRIPTION="curl and libcurl" +HOMEPAGE="http://curl.haxx.se" +SRC_URI="http://curl.haxx.se/download/curl-7.22.0.tar.bz2" +CHECKSUM_MD5="bdb5c226d37c4a6082c70e7ef6f63060" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd curl-7.22.0 + libtoolize --force --copy --install + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-ipv6 \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem + make +} + +INSTALL { + cd curl-7.22.0 + make install +} + +TEST { + cd curl-7.22.0 + make check +} + +LICENSE="Curl" +COPYRIGHT="1996-2011, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.24.0.bep b/net-misc/curl/curl-7.24.0.bep new file mode 100644 index 000000000..2510ae640 --- /dev/null +++ b/net-misc/curl/curl-7.24.0.bep @@ -0,0 +1,30 @@ +DESCRIPTION="curl and libcurl" +HOMEPAGE="http://curl.haxx.se" +SRC_URI="http://curl.haxx.se/download/curl-7.24.0.tar.bz2" +CHECKSUM_MD5="f912221d75eb8d8fe08900eaf011b023" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd curl-7.24.0 + libtoolize --force --copy --install + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-ipv6 \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem + make +} + +INSTALL { + cd curl-7.24.0 + make install +} + +TEST { + cd curl-7.24.0 + make check +} + +LICENSE="Curl" +COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.25.0.bep b/net-misc/curl/curl-7.25.0.bep new file mode 100644 index 000000000..63d578dd4 --- /dev/null +++ b/net-misc/curl/curl-7.25.0.bep @@ -0,0 +1,30 @@ +DESCRIPTION="curl and libcurl" +HOMEPAGE="http://curl.haxx.se" +SRC_URI="http://curl.haxx.se/download/curl-7.25.0.tar.bz2" +CHECKSUM_MD5="f0303d47d9d3e6e4f08c2863c6504823" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd curl-7.25.0 + libtoolize --force --copy --install + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-ipv6 \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem + make +} + +INSTALL { + cd curl-7.25.0 + make install +} + +TEST { + cd curl-7.25.0 + make check +} + +LICENSE="Curl" +COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.26.0.bep b/net-misc/curl/curl-7.26.0.bep new file mode 100644 index 000000000..6159dc157 --- /dev/null +++ b/net-misc/curl/curl-7.26.0.bep @@ -0,0 +1,30 @@ +DESCRIPTION="curl and libcurl" +HOMEPAGE="http://curl.haxx.se" +SRC_URI="http://curl.haxx.se/download/curl-7.26.0.tar.bz2" +CHECKSUM_MD5="bfa80f01b3d300359cfb4d409b6136a3" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd curl-7.26.0 + libtoolize --force --copy --install + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-ipv6 \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem + make +} + +INSTALL { + cd curl-7.26.0 + make install +} + +TEST { + cd curl-7.26.0 + make check +} + +LICENSE="Curl" +COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.28.1.bep b/net-misc/curl/curl-7.28.1.bep new file mode 100644 index 000000000..db5cc8c17 --- /dev/null +++ b/net-misc/curl/curl-7.28.1.bep @@ -0,0 +1,30 @@ +DESCRIPTION="curl and libcurl" +HOMEPAGE="http://curl.haxx.se" +SRC_URI="http://curl.haxx.se/download/curl-7.28.1.tar.bz2" +CHECKSUM_MD5="26eb081c999b0e203770869427e9a93d" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd curl-7.28.1 + libtoolize --force --copy --install + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-ipv6 \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem + make +} + +INSTALL { + cd curl-7.28.1 + make install +} + +TEST { + cd curl-7.28.1 + make check +} + +LICENSE="Curl" +COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/patches/curl-7.22.0.patch b/net-misc/curl/patches/curl-7.22.0.patch new file mode 100644 index 000000000..3ec7d21f3 --- /dev/null +++ b/net-misc/curl/patches/curl-7.22.0.patch @@ -0,0 +1,15 @@ +--- curl-7.22.0/m4/curl-openssl.m4 2011-06-13 21:09:52.046137344 +0000 ++++ curl-7.22.0-haiku/m4/curl-openssl.m4 2011-09-14 22:16:54.307232768 +0000 +@@ -61,6 +61,12 @@ + tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 7` + tst_api=0x$tst_vermaj$tst_vermin$tst_verfix + ;; ++ x12) ++ tst_vermaj=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 3` ++ tst_vermin=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` ++ tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 8` ++ tst_api=0x$tst_vermaj$tst_vermin$tst_verfix ++ ;; + *) + tst_api="unknown" + ;; diff --git a/net-misc/curl/patches/curl-7.25.0.patch b/net-misc/curl/patches/curl-7.25.0.patch new file mode 100644 index 000000000..661357c4e --- /dev/null +++ b/net-misc/curl/patches/curl-7.25.0.patch @@ -0,0 +1,12 @@ +diff -urN curl-7.25.0/m4/curl-openssl.m4 curl-7.25.0-haiku/m4/curl-openssl.m4 +--- curl-7.25.0/m4/curl-openssl.m4 2012-03-08 11:35:25.043515904 -0800 ++++ curl-7.25.0-haiku/m4/curl-openssl.m4 2012-04-01 21:44:11.908066816 -0700 +@@ -55,7 +55,7 @@ + tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` + tst_api=0x$tst_vermaj$tst_vermin$tst_verfix + ;; +- x11|x10) ++ x12|x11|x10) + tst_vermaj=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 3` + tst_vermin=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` + tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 7` diff --git a/net-misc/curl/patches/curl-7.26.0.patch b/net-misc/curl/patches/curl-7.26.0.patch new file mode 100644 index 000000000..4d29699bd --- /dev/null +++ b/net-misc/curl/patches/curl-7.26.0.patch @@ -0,0 +1,12 @@ +diff -urN curl-7.26.0/m4/curl-openssl.m4 curl-7.26.0-haiku/m4/curl-openssl.m4 +--- curl-7.26.0/m4/curl-openssl.m4 2012-03-08 11:35:25.043515904 -0800 ++++ curl-7.26.0-haiku/m4/curl-openssl.m4 2012-04-01 21:44:11.908066816 -0700 +@@ -55,7 +55,7 @@ + tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` + tst_api=0x$tst_vermaj$tst_vermin$tst_verfix + ;; +- x11|x10) ++ x12|x11|x10) + tst_vermaj=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 3` + tst_vermin=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` + tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 7` diff --git a/net-misc/mediatomb/mediatomb-0.12.1.bep b/net-misc/mediatomb/mediatomb-0.12.1.bep index a69c2a5e5..4fcad94e2 100644 --- a/net-misc/mediatomb/mediatomb-0.12.1.bep +++ b/net-misc/mediatomb/mediatomb-0.12.1.bep @@ -24,12 +24,7 @@ INSTALL { make install } -TEST { - cd generic-1.2.3 -# make test -# make check -} - -LICENSE="2005 Gena Batyan, Sergey 'Jin' Bostandzhyan +LICENSE="GNU GPL v2" +COPYRIGHT="2005 Gena Batyan, Sergey 'Jin' Bostandzhyan 2006-2010 Gena Batyan, Sergey 'Jin' Bostandzhyan, Leonhard Wimmer" -COPYRIGHT="GNU GPL v2" + diff --git a/net-misc/minidlna/minidlna-1.0.21.bep b/net-misc/minidlna/minidlna-1.0.21.bep new file mode 100644 index 000000000..03bf74f5f --- /dev/null +++ b/net-misc/minidlna/minidlna-1.0.21.bep @@ -0,0 +1,28 @@ +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" +STATUS_HAIKU="broken" +DEPEND="dev-db/sqlite >= 3.0 + media-libs/jpeg >= 6b + media-libs/libogg >= 1.2.0 + media-libs/ffmpeg >= 0.6 + media-libs/flac >= 1.2.1 + media-libs/libvorbis >= 1.3.1 + media-lib/libid3tag >= 0.15.1b" + +CHECKSUM_MD5="a53e0008ad225843a1782e4af6e5bf0b" +BUILD { + cd minidlna-1.0.21 + make +} + +INSTALL { + cd minidlna-1.0.21 + make install +} + +LICENSE="GNU GPL v2 + BSD (3-clause)" +COPYRIGHT="2008-2009 Justin Maggard + 2008-2009 Justin Maggard (portions of MiniUPnP project)" diff --git a/net-misc/neon/neon-0.29.1.bep b/net-misc/neon/neon-0.29.1.bep index 355e356b5..1736b67db 100644 --- a/net-misc/neon/neon-0.29.1.bep +++ b/net-misc/neon/neon-0.29.1.bep @@ -9,7 +9,7 @@ CHECKSUM_MD5="eb4eac0499cb6fced6e3b11e4b720ebb" BUILD { cd neon-0.29.1 autogen.sh - ./configure --prefix=/boot/common --with-ssl --with-libxml2 --enable-shared + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared make } diff --git a/net-misc/neon/neon-0.29.3.bep b/net-misc/neon/neon-0.29.3.bep index 4723aa2fa..074fcef9e 100644 --- a/net-misc/neon/neon-0.29.3.bep +++ b/net-misc/neon/neon-0.29.3.bep @@ -9,7 +9,7 @@ CHECKSUM_MD5="ba1015b59c112d44d7797b62fe7bee51" BUILD { cd neon-0.29.3 autogen.sh - ./configure --prefix=/boot/common --with-ssl --with-libxml2 --enable-shared + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared make } diff --git a/net-misc/neon/neon-0.29.4.bep b/net-misc/neon/neon-0.29.4.bep index 606d28616..8634d568f 100644 --- a/net-misc/neon/neon-0.29.4.bep +++ b/net-misc/neon/neon-0.29.4.bep @@ -9,7 +9,7 @@ CHECKSUM_MD5="29438dbdaee84db2d7fbc73248a92d93" BUILD { cd neon-0.29.4 autogen.sh - ./configure --prefix=/boot/common --with-ssl --with-libxml2 --enable-shared + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared make } diff --git a/net-misc/openssh/openssh-5.4p1.bep b/net-misc/openssh/openssh-5.4p1.bep index a4c08ee35..50854a365 100644 --- a/net-misc/openssh/openssh-5.4p1.bep +++ b/net-misc/openssh/openssh-5.4p1.bep @@ -9,14 +9,9 @@ BUILD { cp ../patches/pathnames-haiku.h openssh-5.4p1/pathnames.h cd openssh-5.4p1 mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac libtoolize --force --copy - aclocal -I m4 + aclocal --install -I m4 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ diff --git a/net-misc/openssh/openssh-5.5p1.bep b/net-misc/openssh/openssh-5.5p1.bep index 1fd0ca7b6..c07b09b58 100644 --- a/net-misc/openssh/openssh-5.5p1.bep +++ b/net-misc/openssh/openssh-5.5p1.bep @@ -10,14 +10,9 @@ BUILD { cd openssh-5.5p1 autoconf mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac libtoolize --force --copy - aclocal -I m4 + aclocal --install -I m4 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ diff --git a/net-misc/openssh/openssh-5.6p1.bep b/net-misc/openssh/openssh-5.6p1.bep index c571ad810..e2691ddfe 100644 --- a/net-misc/openssh/openssh-5.6p1.bep +++ b/net-misc/openssh/openssh-5.6p1.bep @@ -10,14 +10,9 @@ BUILD { cd openssh-5.6p1 autoconf mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac libtoolize --force --copy - aclocal -I m4 + aclocal --install -I m4 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ diff --git a/net-misc/openssh/openssh-5.7p1.bep b/net-misc/openssh/openssh-5.7p1.bep index 252fb3e06..6763b784f 100644 --- a/net-misc/openssh/openssh-5.7p1.bep +++ b/net-misc/openssh/openssh-5.7p1.bep @@ -11,14 +11,9 @@ BUILD { cd openssh-5.7p1 autoconf mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac libtoolize --force --copy - aclocal -I m4 + aclocal --install -I m4 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ diff --git a/net-misc/openssh/openssh-5.8p1.bep b/net-misc/openssh/openssh-5.8p1.bep index c429a702f..07b4d6461 100644 --- a/net-misc/openssh/openssh-5.8p1.bep +++ b/net-misc/openssh/openssh-5.8p1.bep @@ -11,11 +11,7 @@ BUILD { cd openssh-5.8p1 autoconf mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 + aclocal --install -I m4 echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac libtoolize --force --copy aclocal -I m4 @@ -29,7 +25,7 @@ BUILD { --includedir=`finddir B_COMMON_DIRECTORY`/include \ --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ + --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc \ --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ --with-default-path=${PATH} \ --with-md5-passwords \ diff --git a/net-misc/openssh/openssh-5.8p2.bep b/net-misc/openssh/openssh-5.8p2.bep new file mode 100644 index 000000000..d5d99c515 --- /dev/null +++ b/net-misc/openssh/openssh-5.8p2.bep @@ -0,0 +1,52 @@ +DESCRIPTION="OpenSSH" +HOMEPAGE="http://www.openssh.com/" +SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz + http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz" +REVISION="3" +STATUS_HAIKU="stable" +DEPEND="dev-libs/openssl >= 1.0.0 + dev-libs/libedit >= 20090923" +CHECKSUM_MD5="0541579adf9d55abb15ef927048d372e" +BUILD { + cd openssh-5.8p2 + autoconf + mkdir -p m4 + aclocal --install -I m4 + echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac + libtoolize --force --copy + aclocal -I m4 + autoconf + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` + COMMON_DIR=`finddir B_COMMON_DIRECTORY` + ./configure --prefix=$COMMON_DIR \ + --sbindir=$COMMON_BIN \ + --bindir=$COMMON_BIN \ + --libexecdir=$COMMON_BIN \ + --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --includedir=$COMMON_DIR/include \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=$COMMON_DOCS/man \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ + --with-default-path=${PATH} \ + --with-md5-passwords \ + --disable-utmpx \ + --with-libedit + make +} + +INSTALL { + cd openssh-5.8p2 + make install DESTDIR="${DESTDIR}" + mkdir -p ${DESTDIR}/boot/common/boot/post_install + cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install +} + +TEST { + cd openssh-5.8p2 + make tests +} + +LICENSE="OpenSSH" +COPYRIGHT="2005-2011 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-5.9p1.bep b/net-misc/openssh/openssh-5.9p1.bep new file mode 100644 index 000000000..b99bf3fd4 --- /dev/null +++ b/net-misc/openssh/openssh-5.9p1.bep @@ -0,0 +1,52 @@ +DESCRIPTION="OpenSSH" +HOMEPAGE="http://www.openssh.com/" +SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.9p1.tar.gz + http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.9p1.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/openssl >= 1.0.0 + dev-libs/libedit >= 20090923" +CHECKSUM_MD5="afe17eee7e98d3b8550cc349834a85d0" +BUILD { + cd openssh-5.9p1 + autoconf + mkdir -p m4 + aclocal --install -I m4 + echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac + libtoolize --force --copy + aclocal -I m4 + autoconf + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` + COMMON_DIR=`finddir B_COMMON_DIRECTORY` + ./configure --prefix=$COMMON_DIR \ + --sbindir=$COMMON_BIN \ + --bindir=$COMMON_BIN \ + --libexecdir=$COMMON_BIN \ + --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --includedir=$COMMON_DIR/include \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=$COMMON_DOCS/man \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ + --with-default-path=${PATH} \ + --with-md5-passwords \ + --disable-utmpx \ + --with-libedit + make +} + +INSTALL { + cd openssh-5.9p1 + make install DESTDIR="${DESTDIR}" + mkdir -p ${DESTDIR}/boot/common/boot/post_install + cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install +} + +TEST { + cd openssh-5.9p1 + make tests +} + +LICENSE="OpenSSH" +COPYRIGHT="2005-2011 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-6.0p1.bep b/net-misc/openssh/openssh-6.0p1.bep new file mode 100644 index 000000000..dfc6c758d --- /dev/null +++ b/net-misc/openssh/openssh-6.0p1.bep @@ -0,0 +1,51 @@ +DESCRIPTION="OpenSSH" +HOMEPAGE="http://www.openssh.com/" +SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/openssl >= 1.0.0 + dev-libs/libedit >= 20090923" +CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b" +BUILD { + cd openssh-6.0p1 + autoconf + mkdir -p m4 + aclocal --install -I m4 + echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac + libtoolize --force --copy + aclocal -I m4 + autoconf + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` + COMMON_DIR=`finddir B_COMMON_DIRECTORY` + ./configure --prefix=$COMMON_DIR \ + --sbindir=$COMMON_BIN \ + --bindir=$COMMON_BIN \ + --libexecdir=$COMMON_BIN \ + --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --includedir=$COMMON_DIR/include \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=$COMMON_DOCS/man \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ + --with-default-path=${PATH} \ + --with-md5-passwords \ + --disable-utmpx \ + --with-libedit + make +} + +INSTALL { + cd openssh-6.0p1 + make install DESTDIR="${DESTDIR}" + mkdir -p ${DESTDIR}/boot/common/boot/post_install + cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install +} + +TEST { + cd openssh + make tests +} + +LICENSE="OpenSSH" +COPYRIGHT="2005-2012 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-6.1p1.bep b/net-misc/openssh/openssh-6.1p1.bep new file mode 100644 index 000000000..774fd80b5 --- /dev/null +++ b/net-misc/openssh/openssh-6.1p1.bep @@ -0,0 +1,52 @@ +DESCRIPTION="OpenSSH" +HOMEPAGE="http://www.openssh.com/" +SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.1p1.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/openssl >= 1.0.0 + dev-libs/libedit >= 20090923" +CHECKSUM_MD5="3345cbf4efe90ffb06a78670ab2d05d5" +BUILD { + cd openssh-6.1p1 + autoconf + mkdir -p m4 + aclocal --install -I m4 + echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac + libtoolize --force --copy + aclocal -I m4 + autoconf + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` + COMMON_DIR=`finddir B_COMMON_DIRECTORY` + ./configure --prefix=$COMMON_DIR \ + --sbindir=$COMMON_BIN \ + --bindir=$COMMON_BIN \ + --libexecdir=$COMMON_BIN \ + --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --includedir=$COMMON_DIR/include \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=$COMMON_DOCS/man \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ + --with-default-path=${PATH} \ + --with-md5-passwords \ + --disable-utmpx \ + --with-libedit + make +} + +INSTALL { + cd openssh-6.1p1 + make install DESTDIR="${DESTDIR}" + mkdir -p ${DESTDIR}/boot/common/boot/post_install + cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install +} + +TEST { + cd openssh-6.1p1 + + make tests +} + +LICENSE="OpenSSH" +COPYRIGHT="2005-2012 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-6.2p1.bep b/net-misc/openssh/openssh-6.2p1.bep new file mode 100644 index 000000000..478b6ea04 --- /dev/null +++ b/net-misc/openssh/openssh-6.2p1.bep @@ -0,0 +1,53 @@ +DESCRIPTION="OpenSSH" +HOMEPAGE="http://www.openssh.com/" +SRC_URI="http://ftp5.usa.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.2p1.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/openssl >= 1.0.0 + dev-libs/libedit >= 20090923" +CHECKSUM_MD5="7b2d9dd75b5cf267ea1737ec75500316" +BUILD { + cd openssh-6.2p1 +# sed -i 's/"\$(PRIVSEP_PATH)\\" \\/\"$(PRIVSEP_PATH)\"/g' +#Makefile.in + autoconf + mkdir -p m4 + aclocal --install -I m4 + echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac + libtoolize --force --copy + aclocal -I m4 + autoconf + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` + COMMON_DIR=`finddir B_COMMON_DIRECTORY` + ./configure --prefix=$COMMON_DIR \ + --sbindir=$COMMON_BIN \ + --bindir=$COMMON_BIN \ + --libexecdir=$COMMON_BIN \ + --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --includedir=$COMMON_DIR/include \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=$COMMON_DOCS/man \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ + --with-default-path=${PATH} \ + --with-md5-passwords \ + --disable-utmpx \ + --with-libedit + make +} + +INSTALL { + cd openssh-6.2p1 + make install DESTDIR="${DESTDIR}" + mkdir -p ${DESTDIR}/boot/common/boot/post_install + cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install +} + +TEST { + cd openssh-6.2p1 + make tests +} + +LICENSE="OpenSSH" +COPYRIGHT="2005-2013 Tatu Ylonen et al." diff --git a/net-misc/openssh/patches/openssh-5.8p2.patch b/net-misc/openssh/patches/openssh-5.8p2.patch new file mode 100644 index 000000000..4ac3769eb --- /dev/null +++ b/net-misc/openssh/patches/openssh-5.8p2.patch @@ -0,0 +1,140 @@ +diff -urN openssh-5.8p2/configure.ac openssh-5.8p2-haiku/configure.ac +--- openssh-5.8p2/configure.ac 2011-02-04 00:42:14.007077888 +0000 ++++ openssh-5.8p2-haiku/configure.ac 2011-05-04 16:01:02.093585408 +0000 +@@ -1345,7 +1345,7 @@ + LIBEDIT=`$PKGCONFIG --libs-only-l libedit` + CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" + else +- LIBEDIT="-ledit -lcurses" ++ AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) + fi + OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` + AC_CHECK_LIB(edit, el_init, +diff -urN openssh-5.8p2/pathnames.h openssh-5.8p2-haiku/pathnames.h +--- openssh-5.8p2/pathnames.h 2010-08-31 12:41:14.016252928 +0000 ++++ openssh-5.8p2-haiku/pathnames.h 2011-05-04 16:01:02.127139840 +0000 +@@ -12,7 +12,14 @@ + * called by a name other than "ssh" or "Secure Shell". + */ + +-#define ETCDIR "/etc" ++#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" ++#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" ++#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" ++#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" ++#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" ++ ++ ++#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY + + #ifndef SSHDIR + #define SSHDIR ETCDIR "/ssh" +@@ -45,7 +53,7 @@ + #define _PATH_DH_PRIMES SSHDIR "/primes" + + #ifndef _PATH_SSH_PROGRAM +-#define _PATH_SSH_PROGRAM "/usr/bin/ssh" ++#define _PATH_SSH_PROGRAM B_COMMON_BIN_DIRECTORY + #endif + + /* +@@ -58,25 +66,25 @@ + * The directory in user's home directory in which the files reside. The + * directory should be world-readable (though not all files are). + */ +-#define _PATH_SSH_USER_DIR ".ssh" ++#define _PATH_SSH_USER_DIR "config/settings/ssh" + + /* + * Per-user file containing host keys of known hosts. This file need not be + * readable by anyone except the user him/herself, though this does not + * contain anything particularly secret. + */ +-#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" ++#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" + /* backward compat for protocol 2 */ +-#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" ++#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" + + /* + * Name of the default file containing client-side authentication key. This + * file should only be readable by the user him/herself. + */ +-#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" +-#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" +-#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa" +-#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" ++#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" ++#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" ++#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa" ++#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" + + /* + * Configuration file in user's home directory. This file need not be +@@ -84,7 +92,7 @@ + * particularly secret. If the user's home directory resides on an NFS + * volume where root is mapped to nobody, this may need to be world-readable. + */ +-#define _PATH_SSH_USER_CONFFILE ".ssh/config" ++#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" + + /* + * File containing a list of those rsa keys that permit logging in as this +@@ -94,10 +102,10 @@ + * may need to be world-readable. (This file is read by the daemon which is + * running as root.) + */ +-#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" ++#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" + + /* backward compat for protocol v2 */ +-#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" ++#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" + + /* + * Per-user and system-wide ssh "rc" files. These files are executed with +@@ -105,7 +113,7 @@ + * passed "proto cookie" as arguments if X11 forwarding with spoofing is in + * use. xauth will be run if neither of these exists. + */ +-#define _PATH_SSH_USER_RC ".ssh/rc" ++#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" + #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" + + /* +@@ -149,17 +157,16 @@ + + /* for sftp */ + #ifndef _PATH_SFTP_SERVER +-#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" ++#define _PATH_SFTP_SERVER HAIKU_COMMON_BIN_DIRECTORY"/sftp-server" + #endif + + /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ + #ifndef _PATH_PRIVSEP_CHROOT_DIR +-#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" ++#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" + #endif +- + /* for passwd change */ + #ifndef _PATH_PASSWD_PROG +-#define _PATH_PASSWD_PROG "/usr/bin/passwd" ++#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" + #endif + + #ifndef _PATH_LS +@@ -171,11 +178,11 @@ + # ifdef LOGIN_PROGRAM_FALLBACK + # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK + # else +-# define LOGIN_PROGRAM "/usr/bin/login" ++# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" + # endif + #endif /* LOGIN_PROGRAM */ + + /* Askpass program define */ + #ifndef ASKPASS_PROGRAM +-#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" ++#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" + #endif /* ASKPASS_PROGRAM */ + diff --git a/net-misc/openssh/patches/openssh-5.9p1.patch b/net-misc/openssh/patches/openssh-5.9p1.patch new file mode 100644 index 000000000..8e7d7d818 --- /dev/null +++ b/net-misc/openssh/patches/openssh-5.9p1.patch @@ -0,0 +1,140 @@ +diff -urN openssh-5.9p1/configure.ac openssh-5.9p1-haiku/configure.ac +--- openssh-5.9p1/configure.ac 2011-02-04 00:42:14.007077888 +0000 ++++ openssh-5.9p1-haiku/configure.ac 2011-05-04 16:01:02.093585408 +0000 +@@ -1345,7 +1345,7 @@ + LIBEDIT=`$PKGCONFIG --libs-only-l libedit` + CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" + else +- LIBEDIT="-ledit -lcurses" ++ AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) + fi + OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` + AC_CHECK_LIB(edit, el_init, +diff -urN openssh-5.9p1/pathnames.h openssh-5.9p1-haiku/pathnames.h +--- openssh-5.9p1/pathnames.h 2010-08-31 12:41:14.016252928 +0000 ++++ openssh-5.9p1-haiku/pathnames.h 2011-05-04 16:01:02.127139840 +0000 +@@ -12,7 +12,14 @@ + * called by a name other than "ssh" or "Secure Shell". + */ + +-#define ETCDIR "/etc" ++#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" ++#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" ++#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" ++#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" ++#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" ++ ++ ++#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY + + #ifndef SSHDIR + #define SSHDIR ETCDIR "/ssh" +@@ -45,7 +53,7 @@ + #define _PATH_DH_PRIMES SSHDIR "/primes" + + #ifndef _PATH_SSH_PROGRAM +-#define _PATH_SSH_PROGRAM "/usr/bin/ssh" ++#define _PATH_SSH_PROGRAM B_COMMON_BIN_DIRECTORY + #endif + + /* +@@ -58,25 +66,25 @@ + * The directory in user's home directory in which the files reside. The + * directory should be world-readable (though not all files are). + */ +-#define _PATH_SSH_USER_DIR ".ssh" ++#define _PATH_SSH_USER_DIR "config/settings/ssh" + + /* + * Per-user file containing host keys of known hosts. This file need not be + * readable by anyone except the user him/herself, though this does not + * contain anything particularly secret. + */ +-#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" ++#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" + /* backward compat for protocol 2 */ +-#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" ++#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" + + /* + * Name of the default file containing client-side authentication key. This + * file should only be readable by the user him/herself. + */ +-#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" +-#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" +-#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa" +-#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" ++#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" ++#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" ++#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa" ++#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" + + /* + * Configuration file in user's home directory. This file need not be +@@ -84,7 +92,7 @@ + * particularly secret. If the user's home directory resides on an NFS + * volume where root is mapped to nobody, this may need to be world-readable. + */ +-#define _PATH_SSH_USER_CONFFILE ".ssh/config" ++#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" + + /* + * File containing a list of those rsa keys that permit logging in as this +@@ -94,10 +102,10 @@ + * may need to be world-readable. (This file is read by the daemon which is + * running as root.) + */ +-#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" ++#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" + + /* backward compat for protocol v2 */ +-#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" ++#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" + + /* + * Per-user and system-wide ssh "rc" files. These files are executed with +@@ -105,7 +113,7 @@ + * passed "proto cookie" as arguments if X11 forwarding with spoofing is in + * use. xauth will be run if neither of these exists. + */ +-#define _PATH_SSH_USER_RC ".ssh/rc" ++#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" + #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" + + /* +@@ -149,17 +157,16 @@ + + /* for sftp */ + #ifndef _PATH_SFTP_SERVER +-#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" ++#define _PATH_SFTP_SERVER HAIKU_COMMON_BIN_DIRECTORY"/sftp-server" + #endif + + /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ + #ifndef _PATH_PRIVSEP_CHROOT_DIR +-#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" ++#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" + #endif +- + /* for passwd change */ + #ifndef _PATH_PASSWD_PROG +-#define _PATH_PASSWD_PROG "/usr/bin/passwd" ++#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" + #endif + + #ifndef _PATH_LS +@@ -171,11 +178,11 @@ + # ifdef LOGIN_PROGRAM_FALLBACK + # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK + # else +-# define LOGIN_PROGRAM "/usr/bin/login" ++# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" + # endif + #endif /* LOGIN_PROGRAM */ + + /* Askpass program define */ + #ifndef ASKPASS_PROGRAM +-#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" ++#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" + #endif /* ASKPASS_PROGRAM */ + diff --git a/net-misc/openssh/patches/openssh-6.0p1.patch b/net-misc/openssh/patches/openssh-6.0p1.patch new file mode 100644 index 000000000..a61ef0c9e --- /dev/null +++ b/net-misc/openssh/patches/openssh-6.0p1.patch @@ -0,0 +1,139 @@ +diff -urN openssh-6.0p1/configure.ac openssh-6.0p1-haiku/configure.ac +--- openssh-6.0p1/configure.ac 2012-04-19 11:46:38.030408704 +0000 ++++ openssh-6.0p1-haiku/configure.ac 2012-09-24 16:55:13.139198464 +0000 +@@ -1432,7 +1432,7 @@ + LIBEDIT=`$PKGCONFIG --libs-only-l libedit` + CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" + else +- LIBEDIT="-ledit -lcurses" ++ AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) + fi + OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` + AC_CHECK_LIB([edit], [el_init], +diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-haiku/pathnames.h +--- openssh-6.0p1/pathnames.h 2011-05-29 11:39:38.039583744 +0000 ++++ openssh-6.0p1-haiku/pathnames.h 2012-09-24 16:55:13.148373504 +0000 +@@ -12,7 +12,14 @@ + * called by a name other than "ssh" or "Secure Shell". + */ + +-#define ETCDIR "/etc" ++#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" ++#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" ++#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" ++#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" ++#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" ++ ++ ++#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY + + #ifndef SSHDIR + #define SSHDIR ETCDIR "/ssh" +@@ -45,7 +52,7 @@ + #define _PATH_DH_PRIMES SSHDIR "/primes" + + #ifndef _PATH_SSH_PROGRAM +-#define _PATH_SSH_PROGRAM "/usr/bin/ssh" ++#define _PATH_SSH_PROGRAM HAIKU_COMMON_BIN_DIRECTORY + #endif + + /* +@@ -58,25 +65,25 @@ + * The directory in user's home directory in which the files reside. The + * directory should be world-readable (though not all files are). + */ +-#define _PATH_SSH_USER_DIR ".ssh" ++#define _PATH_SSH_USER_DIR "config/settings/ssh" + + /* + * Per-user file containing host keys of known hosts. This file need not be + * readable by anyone except the user him/herself, though this does not + * contain anything particularly secret. + */ +-#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" ++#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" + /* backward compat for protocol 2 */ +-#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" ++#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" + + /* + * Name of the default file containing client-side authentication key. This + * file should only be readable by the user him/herself. + */ +-#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" +-#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" +-#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa" +-#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" ++#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" ++#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" ++#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa" ++#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" + + /* + * Configuration file in user's home directory. This file need not be +@@ -84,7 +91,7 @@ + * particularly secret. If the user's home directory resides on an NFS + * volume where root is mapped to nobody, this may need to be world-readable. + */ +-#define _PATH_SSH_USER_CONFFILE ".ssh/config" ++#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" + + /* + * File containing a list of those rsa keys that permit logging in as this +@@ -94,10 +101,10 @@ + * may need to be world-readable. (This file is read by the daemon which is + * running as root.) + */ +-#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" ++#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" + + /* backward compat for protocol v2 */ +-#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" ++#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" + + /* + * Per-user and system-wide ssh "rc" files. These files are executed with +@@ -105,7 +112,7 @@ + * passed "proto cookie" as arguments if X11 forwarding with spoofing is in + * use. xauth will be run if neither of these exists. + */ +-#define _PATH_SSH_USER_RC ".ssh/rc" ++#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" + #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" + + /* +@@ -149,17 +156,16 @@ + + /* for sftp */ + #ifndef _PATH_SFTP_SERVER +-#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" ++#define _PATH_SFTP_SERVER HAIKU_COMMON_BIN_DIRECTORY"/sftp-server" + #endif + + /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ + #ifndef _PATH_PRIVSEP_CHROOT_DIR +-#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" ++#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" + #endif +- + /* for passwd change */ + #ifndef _PATH_PASSWD_PROG +-#define _PATH_PASSWD_PROG "/usr/bin/passwd" ++#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" + #endif + + #ifndef _PATH_LS +@@ -171,11 +177,11 @@ + # ifdef LOGIN_PROGRAM_FALLBACK + # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK + # else +-# define LOGIN_PROGRAM "/usr/bin/login" ++# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" + # endif + #endif /* LOGIN_PROGRAM */ + + /* Askpass program define */ + #ifndef ASKPASS_PROGRAM +-#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" ++#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" + #endif /* ASKPASS_PROGRAM */ diff --git a/net-misc/openssh/patches/openssh-6.1p1.patch b/net-misc/openssh/patches/openssh-6.1p1.patch new file mode 100644 index 000000000..fb88db8d5 --- /dev/null +++ b/net-misc/openssh/patches/openssh-6.1p1.patch @@ -0,0 +1,140 @@ +diff -urN openssh-6.1p1/configure.ac openssh-6.1p1-haiku/configure.ac +--- openssh-6.1p1/configure.ac 2011-02-04 00:42:14.007077888 +0000 ++++ openssh-6.1p1-haiku/configure.ac 2011-05-04 16:01:02.093585408 +0000 +@@ -1432,7 +1432,7 @@ + LIBEDIT=`$PKGCONFIG --libs-only-l libedit` + CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" + else +- LIBEDIT="-ledit -lcurses" ++ AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) + fi + OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` + AC_CHECK_LIB(edit, el_init, +diff -urN openssh-6.1p1/pathnames.h openssh-6.1p1-haiku/pathnames.h +--- openssh-6.1p1/pathnames.h 2010-08-31 12:41:14.016252928 +0000 ++++ openssh-6.1p1-haiku/pathnames.h 2011-05-04 16:01:02.127139840 +0000 +@@ -12,7 +12,14 @@ + * called by a name other than "ssh" or "Secure Shell". + */ + +-#define ETCDIR "/etc" ++#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" ++#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" ++#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" ++#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" ++#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" ++ ++ ++#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY + + #ifndef SSHDIR + #define SSHDIR ETCDIR "/ssh" +@@ -45,7 +53,7 @@ + #define _PATH_DH_PRIMES SSHDIR "/primes" + + #ifndef _PATH_SSH_PROGRAM +-#define _PATH_SSH_PROGRAM "/usr/bin/ssh" ++#define _PATH_SSH_PROGRAM HAIKU_COMMON_BIN_DIRECTORY + #endif + + /* +@@ -58,25 +66,25 @@ + * The directory in user's home directory in which the files reside. The + * directory should be world-readable (though not all files are). + */ +-#define _PATH_SSH_USER_DIR ".ssh" ++#define _PATH_SSH_USER_DIR "config/settings/ssh" + + /* + * Per-user file containing host keys of known hosts. This file need not be + * readable by anyone except the user him/herself, though this does not + * contain anything particularly secret. + */ +-#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" ++#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" + /* backward compat for protocol 2 */ +-#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" ++#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" + + /* + * Name of the default file containing client-side authentication key. This + * file should only be readable by the user him/herself. + */ +-#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" +-#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" +-#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa" +-#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" ++#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" ++#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" ++#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa" ++#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" + + /* + * Configuration file in user's home directory. This file need not be +@@ -84,7 +92,7 @@ + * particularly secret. If the user's home directory resides on an NFS + * volume where root is mapped to nobody, this may need to be world-readable. + */ +-#define _PATH_SSH_USER_CONFFILE ".ssh/config" ++#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" + + /* + * File containing a list of those rsa keys that permit logging in as this +@@ -94,10 +102,10 @@ + * may need to be world-readable. (This file is read by the daemon which is + * running as root.) + */ +-#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" ++#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" + + /* backward compat for protocol v2 */ +-#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" ++#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" + + /* + * Per-user and system-wide ssh "rc" files. These files are executed with +@@ -105,7 +113,7 @@ + * passed "proto cookie" as arguments if X11 forwarding with spoofing is in + * use. xauth will be run if neither of these exists. + */ +-#define _PATH_SSH_USER_RC ".ssh/rc" ++#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" + #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" + + /* +@@ -149,17 +157,16 @@ + + /* for sftp */ + #ifndef _PATH_SFTP_SERVER +-#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" ++#define _PATH_SFTP_SERVER HAIKU_COMMON_BIN_DIRECTORY"/sftp-server" + #endif + + /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ + #ifndef _PATH_PRIVSEP_CHROOT_DIR +-#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" ++#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" + #endif +- + /* for passwd change */ + #ifndef _PATH_PASSWD_PROG +-#define _PATH_PASSWD_PROG "/usr/bin/passwd" ++#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" + #endif + + #ifndef _PATH_LS +@@ -171,11 +178,11 @@ + # ifdef LOGIN_PROGRAM_FALLBACK + # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK + # else +-# define LOGIN_PROGRAM "/usr/bin/login" ++# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" + # endif + #endif /* LOGIN_PROGRAM */ + + /* Askpass program define */ + #ifndef ASKPASS_PROGRAM +-#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" ++#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" + #endif /* ASKPASS_PROGRAM */ + diff --git a/net-misc/openssh/patches/openssh-6.2p1.patch b/net-misc/openssh/patches/openssh-6.2p1.patch new file mode 100644 index 000000000..9b07a81f7 --- /dev/null +++ b/net-misc/openssh/patches/openssh-6.2p1.patch @@ -0,0 +1,140 @@ +diff -urN openssh-6.2p1/configure.ac openssh-6.2p1-haiku/configure.ac +--- openssh-6.2p1/configure.ac ++++ openssh-6.2p1-haiku/configure.ac +@@ -1426,7 +1426,7 @@ + LIBEDIT=`$PKGCONFIG --libs-only-l libedit` + CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" + else +- LIBEDIT="-ledit -lcurses" ++ AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) + fi + OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` + AC_CHECK_LIB(edit, el_init, +diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h +--- openssh-6.2p1/pathnames.h ++++ openssh-6.2p1-haiku/pathnames.h +@@ -12,7 +12,14 @@ + * called by a name other than "ssh" or "Secure Shell". + */ + +-#define ETCDIR "/etc" ++#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" ++#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" ++#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" ++#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" ++#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" ++ ++ ++#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY + + #ifndef SSHDIR + #define SSHDIR ETCDIR "/ssh" +@@ -45,7 +53,7 @@ + #define _PATH_DH_PRIMES SSHDIR "/primes" + + #ifndef _PATH_SSH_PROGRAM +-#define _PATH_SSH_PROGRAM "/usr/bin/ssh" ++#define _PATH_SSH_PROGRAM HAIKU_COMMON_BIN_DIRECTORY + #endif + + /* +@@ -58,25 +66,25 @@ + * The directory in user's home directory in which the files reside. The + * directory should be world-readable (though not all files are). + */ +-#define _PATH_SSH_USER_DIR ".ssh" ++#define _PATH_SSH_USER_DIR "config/settings/ssh" + + /* + * Per-user file containing host keys of known hosts. This file need not be + * readable by anyone except the user him/herself, though this does not + * contain anything particularly secret. + */ +-#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" ++#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" + /* backward compat for protocol 2 */ +-#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" ++#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" + + /* + * Name of the default file containing client-side authentication key. This + * file should only be readable by the user him/herself. + */ +-#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" +-#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" +-#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa" +-#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" ++#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" ++#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" ++#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa" ++#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" + + /* + * Configuration file in user's home directory. This file need not be +@@ -84,7 +92,7 @@ + * particularly secret. If the user's home directory resides on an NFS + * volume where root is mapped to nobody, this may need to be world-readable. + */ +-#define _PATH_SSH_USER_CONFFILE ".ssh/config" ++#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" + + /* + * File containing a list of those rsa keys that permit logging in as this +@@ -94,10 +102,10 @@ + * may need to be world-readable. (This file is read by the daemon which is + * running as root.) + */ +-#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" ++#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" + + /* backward compat for protocol v2 */ +-#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" ++#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" + + /* + * Per-user and system-wide ssh "rc" files. These files are executed with +@@ -105,7 +113,7 @@ + * passed "proto cookie" as arguments if X11 forwarding with spoofing is in + * use. xauth will be run if neither of these exists. + */ +-#define _PATH_SSH_USER_RC ".ssh/rc" ++#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" + #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" + + /* +@@ -149,17 +157,16 @@ + + /* for sftp */ + #ifndef _PATH_SFTP_SERVER +-#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" ++#define _PATH_SFTP_SERVER HAIKU_COMMON_BIN_DIRECTORY"/sftp-server" + #endif + + /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ + #ifndef _PATH_PRIVSEP_CHROOT_DIR +-#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" ++#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" + #endif +- + /* for passwd change */ + #ifndef _PATH_PASSWD_PROG +-#define _PATH_PASSWD_PROG "/usr/bin/passwd" ++#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" + #endif + + #ifndef _PATH_LS +@@ -171,11 +178,11 @@ + # ifdef LOGIN_PROGRAM_FALLBACK + # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK + # else +-# define LOGIN_PROGRAM "/usr/bin/login" ++# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" + # endif + #endif /* LOGIN_PROGRAM */ + + /* Askpass program define */ + #ifndef ASKPASS_PROGRAM +-#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" ++#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" + #endif /* ASKPASS_PROGRAM */ + diff --git a/net-misc/openssh/sshd_keymaker.sh b/net-misc/openssh/sshd_keymaker.sh index ec3ed83a6..0952fa460 100755 --- a/net-misc/openssh/sshd_keymaker.sh +++ b/net-misc/openssh/sshd_keymaker.sh @@ -1,7 +1,7 @@ #!/bin/sh _progress () { - notify --type progress --app ssh-keygen \ + notify --type progress --group ssh-keygen \ --icon /boot/system/kernel_x86 \ --messageID $0_$$ \ --title "Generating ssh keys..." \ diff --git a/net-misc/rsync/rsync-3.0.6.bep b/net-misc/rsync/rsync-3.0.6.bep index 1fcac9e1f..05957249e 100644 --- a/net-misc/rsync/rsync-3.0.6.bep +++ b/net-misc/rsync/rsync-3.0.6.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd rsync-3.0.6 libtoolize --force --copy --install - ./configure --prefix=/boot/common --disable-ipv6 --disable-locale --disable-debug + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-ipv6 --disable-locale --disable-debug make reconfigure make } diff --git a/net-misc/rsync/rsync-3.0.7.bep b/net-misc/rsync/rsync-3.0.7.bep index 95b2b5f07..8870b43cc 100644 --- a/net-misc/rsync/rsync-3.0.7.bep +++ b/net-misc/rsync/rsync-3.0.7.bep @@ -10,7 +10,13 @@ BUILD { libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=/boot/common --enable-xattr-support --disable-iconv --disable-iconv-open --disable-ipv6 --disable-locale --disable-debug + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --enable-xattr-support \ + --disable-iconv \ + --disable-iconv-open \ + --disable-locale \ + --disable-debug make reconfigure make } @@ -18,7 +24,12 @@ BUILD { INSTALL { cd rsync-3.0.7 make install -# make test } + +TEST { + cd rsync-3.0.7 + make test +} + LICENSE="GNU GPL v3" COPYRIGHT="1996-2009 by Andrew Tridgell, Wayne Davison, and others." diff --git a/net-misc/tor/patches/tor-0.2.2.35.patch b/net-misc/tor/patches/tor-0.2.2.35.patch new file mode 100644 index 000000000..ca348e840 --- /dev/null +++ b/net-misc/tor/patches/tor-0.2.2.35.patch @@ -0,0 +1,78 @@ +diff -Naur tor-0.2.2.35/configure.in tor-0.2.2.35-haiku/configure.in +--- tor-0.2.2.35/configure.in 2011-12-15 18:00:33.013893632 +0100 ++++ tor-0.2.2.35-haiku/configure.in 2011-12-18 01:13:44.216268800 +0100 +@@ -215,7 +215,7 @@ + + AC_C_BIGENDIAN + +-AC_SEARCH_LIBS(socket, [socket]) ++AC_SEARCH_LIBS(socket, [socket network]) + AC_SEARCH_LIBS(gethostbyname, [nsl]) + AC_SEARCH_LIBS(dlopen, [dl]) + AC_SEARCH_LIBS(inet_aton, [resolv]) +@@ -340,6 +340,19 @@ + fi + AC_SUBST(TOR_LIBEVENT_LIBS) + ++dnl ------------------------------------------------------ ++dnl Where do you live, libm? ++ ++dnl On some platforms (Haiku/BeOS) the math library is ++dnl part of libroot. In which case don't link against lm ++TOR_LIB_MATH="" ++save_LIBS="$LIBS" ++AC_SEARCH_LIBS(cos, [m], , AC_MSG_ERROR([Could not find libm and libcore does not provide the functions.])) ++if test "$ac_cv_search_cos" != "none required"; then ++ TOR_LIB_MATH="$ac_cv_search_cos" ++fi ++LIBS="$save_LIBS" ++AC_SUBST(TOR_LIB_MATH) + + dnl ------------------------------------------------------ + dnl Where do you live, openssl? And how do we call you? +diff -Naur tor-0.2.2.35/src/or/Makefile.am tor-0.2.2.35-haiku/src/or/Makefile.am +--- tor-0.2.2.35/src/or/Makefile.am 2011-12-15 17:28:37.048758784 +0100 ++++ tor-0.2.2.35-haiku/src/or/Makefile.am 2011-12-18 00:53:00.718536704 +0100 +@@ -43,7 +43,7 @@ + tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ + tor_LDADD = ./libtor.a ../common/libor.a ../common/libor-crypto.a \ + ../common/libor-event.a \ +- @TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ ++ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ + + noinst_HEADERS = buffers.h circuitbuild.h circuitlist.h circuituse.h \ + command.h config.h connection_edge.h connection.h connection_or.h \ +diff -Naur tor-0.2.2.35/src/test/Makefile.am tor-0.2.2.35-haiku/src/test/Makefile.am +--- tor-0.2.2.35/src/test/Makefile.am 2011-12-15 17:28:37.022806528 +0100 ++++ tor-0.2.2.35-haiku/src/test/Makefile.am 2011-12-18 00:53:47.138412032 +0100 +@@ -25,6 +25,6 @@ + @TOR_LDFLAGS_libevent@ + test_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \ + ../common/libor-event.a \ +- @TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ ++ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ + + noinst_HEADERS = tinytest.h tinytest_macros.h test.h +diff -Naur tor-0.2.2.35/src/tools/Makefile.am tor-0.2.2.35-haiku/src/tools/Makefile.am +--- tor-0.2.2.35/src/tools/Makefile.am 2011-12-15 17:28:37.020971520 +0100 ++++ tor-0.2.2.35-haiku/src/tools/Makefile.am 2011-12-18 00:54:15.212336640 +0100 +@@ -3,16 +3,16 @@ + + tor_resolve_SOURCES = tor-resolve.c + tor_resolve_LDFLAGS = @TOR_LDFLAGS_libevent@ +-tor_resolve_LDADD = ../common/libor.a -lm @TOR_LIBEVENT_LIBS@ @TOR_LIB_WS32@ ++tor_resolve_LDADD = ../common/libor.a @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_LIB_WS32@ + + tor_gencert_SOURCES = tor-gencert.c + tor_gencert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ + @TOR_LDFLAGS_libevent@ + tor_gencert_LDADD = ../common/libor.a ../common/libor-crypto.a \ +- -lm @TOR_ZLIB_LIBS@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ ++ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ + + tor_checkkey_SOURCES = tor-checkkey.c + tor_checkkey_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ + @TOR_LDFLAGS_libevent@ + tor_checkkey_LDADD = ../common/libor.a ../common/libor-crypto.a \ +- -lm @TOR_ZLIB_LIBS@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ ++ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ diff --git a/net-misc/tor/tor-0.2.2.35.bep b/net-misc/tor/tor-0.2.2.35.bep new file mode 100644 index 000000000..d55bb8c24 --- /dev/null +++ b/net-misc/tor/tor-0.2.2.35.bep @@ -0,0 +1,29 @@ +DESCRIPTION="Anonymizing overlay network for TCP" +HOMEPAGE="http://www.torproject.org/" +SRC_URI="https://www.torproject.org/dist/tor-0.2.2.35.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/openssl >= 0.9.8 + dev-libs/libevent >= 2.0.10" +CHECKSUM_MD5="dcecf699c4b929319d5f1ce0358d4835" +BUILD { + cd tor-0.2.2.35 + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd tor-0.2.2.35 + make install +} + +TEST { + cd tor-0.2.2.35 + make test +} + +LICENSE="Zlib" +COPYRIGHT="2001-2004, Roger Dingledine + 2004-2006, Roger Dingledine, Nick Mathewson + 2007-2011, The Tor Project, Inc." diff --git a/net-misc/tor/tor-0.2.3.25.bep b/net-misc/tor/tor-0.2.3.25.bep new file mode 100644 index 000000000..e94e06d86 --- /dev/null +++ b/net-misc/tor/tor-0.2.3.25.bep @@ -0,0 +1,34 @@ +DESCRIPTION="Anonymizing overlay network for TCP" +HOMEPAGE="http://www.torproject.org/" +SRC_URI="https://www.torproject.org/dist/tor-0.2.3.25.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/openssl >= 0.9.8 + dev-libs/libevent >= 2.0.10" +CHECKSUM_MD5="a1c364189a9a66ed9daa8e6436489daf" + +BUILD { + cd tor-0.2.3.25 + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --disable-asciidoc + make +} + +INSTALL { + cd tor-0.2.3.25 + make install +} + +TEST { + cd tor-0.2.3.25 + make test +} + +LICENSE="Zlib" +COPYRIGHT="2001-2004 Roger Dingledine + 2004-2006 Roger Dingledine, Nick Mathewson + 2007-2011 The Tor Project, Inc." diff --git a/net-misc/wget/patches/wget-1.13.4.patch b/net-misc/wget/patches/wget-1.13.4.patch new file mode 100644 index 000000000..3145d84af --- /dev/null +++ b/net-misc/wget/patches/wget-1.13.4.patch @@ -0,0 +1,71 @@ +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/wget-1.13.4.bep b/net-misc/wget/wget-1.13.4.bep new file mode 100644 index 000000000..673ebc9ea --- /dev/null +++ b/net-misc/wget/wget-1.13.4.bep @@ -0,0 +1,20 @@ +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/wput/wput-0.6.1.bep b/net-misc/wput/wput-0.6.1.bep index 2bf494ee7..063e55f5b 100644 --- a/net-misc/wput/wput-0.6.1.bep +++ b/net-misc/wput/wput-0.6.1.bep @@ -12,7 +12,7 @@ BUILD { libtoolize --force --copy --install aclocal -I m4 --warnings=none --force autoconf --warnings=none - ./configure --prefix=/boot/common --enable-shared --disable-nls + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared --disable-nls make } diff --git a/net-p2p/rtorrent/rtorrent-0.8.5.bep b/net-p2p/rtorrent/rtorrent-0.8.5.bep index f817a6633..b5f3f8eee 100644 --- a/net-p2p/rtorrent/rtorrent-0.8.5.bep +++ b/net-p2p/rtorrent/rtorrent-0.8.5.bep @@ -14,7 +14,7 @@ DEPEND="pkgconfig >= 0.23 BUILD { cd rtorrent-0.8.5 autoreconf -vfi - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-p2p/seeks/licenses/GNU AGPL v3 b/net-p2p/seeks/licenses/GNU AGPL v3 new file mode 100644 index 000000000..dba13ed2d --- /dev/null +++ b/net-p2p/seeks/licenses/GNU AGPL v3 @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/net-p2p/seeks/seeks-0.x-git.bep b/net-p2p/seeks/seeks-0.x-git.bep new file mode 100644 index 000000000..0b074c7a6 --- /dev/null +++ b/net-p2p/seeks/seeks-0.x-git.bep @@ -0,0 +1,23 @@ +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" +#CHECKSUM_MD5="" +STATUS_HAIKU="untested" +#MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +# pkgconfig is only a build dependency +DEPEND="pkgconfig >= 0.25" + +BUILD { + cd seeks-0.x-git + ./autogen.sh + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd seeks-0.x-git + make install +} +LICENSE="GNU AGPL v3" +COPYRIGHT="2006, 2009, 2010 Emmanuel Benazera, Camille Harang, Mehdi Abaakouk, Pablo Joubert, Laurent Peuch" diff --git a/net-p2p/transmission/patches/transmission-2.73.patch b/net-p2p/transmission/patches/transmission-2.73.patch new file mode 100644 index 000000000..b719e158a --- /dev/null +++ b/net-p2p/transmission/patches/transmission-2.73.patch @@ -0,0 +1,69 @@ +diff -Naur ./transmission-2.73/third-party/miniupnp/connecthostport.c ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/connecthostport.c +--- ./transmission-2.73/third-party/miniupnp/connecthostport.c 2012-10-24 13:01:10.429654016 +0000 ++++ ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/connecthostport.c 2012-12-08 17:06:33.040632320 +0000 +@@ -24,6 +24,7 @@ + #else /* #ifdef _WIN32 */ + #include + #include ++#include + #include + #define closesocket close + #include +diff -Naur ./transmission-2.73/third-party/miniupnp/miniupnpc.c ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/miniupnpc.c +--- ./transmission-2.73/third-party/miniupnp/miniupnpc.c 2012-10-24 13:01:10.457703424 +0000 ++++ ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/miniupnpc.c 2012-12-08 17:09:12.018087936 +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 -Naur ./transmission-2.73/third-party/miniupnp/portlistingparse.c ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/portlistingparse.c +--- ./transmission-2.73/third-party/miniupnp/portlistingparse.c 2012-10-24 13:01:10.221511680 +0000 ++++ ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 +@@ -28,7 +28,7 @@ + + /* Helper function */ + static UNSIGNED_INTEGER +-atoui(const char * p, int l) ++_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)_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)_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)_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 = _atoui(data, l); + break; + default: + break; diff --git a/net-p2p/transmission/patches/transmission-2.75.patch b/net-p2p/transmission/patches/transmission-2.75.patch new file mode 100644 index 000000000..074c85751 --- /dev/null +++ b/net-p2p/transmission/patches/transmission-2.75.patch @@ -0,0 +1,69 @@ +diff -Naur ./transmission-2.75/third-party/miniupnp/connecthostport.c ./transmission-2.75-haiku/transmission-2.75/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 +@@ -24,6 +24,7 @@ + #else /* #ifdef _WIN32 */ + #include + #include ++#include + #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 +--- ./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 +@@ -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 -Naur ./transmission-2.75/third-party/miniupnp/portlistingparse.c ./transmission-2.75-haiku/transmission-2.75/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 +@@ -28,7 +28,7 @@ + + /* Helper function */ + static UNSIGNED_INTEGER +-atoui(const char * p, int l) ++_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)_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)_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)_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 = _atoui(data, l); + break; + default: + break; diff --git a/net-p2p/transmission/transmission-1.72.bep b/net-p2p/transmission/transmission-1.72.bep index 5ced713ec..7bad2285c 100644 --- a/net-p2p/transmission/transmission-1.72.bep +++ b/net-p2p/transmission/transmission-1.72.bep @@ -13,7 +13,7 @@ DEPEND="dev-util/pkgconfig >= 0.23 BUILD { cd transmission-1.72 autoreconf -vfi - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-p2p/transmission/transmission-1.73.bep b/net-p2p/transmission/transmission-1.73.bep index 460083399..1b0aef828 100644 --- a/net-p2p/transmission/transmission-1.73.bep +++ b/net-p2p/transmission/transmission-1.73.bep @@ -13,7 +13,7 @@ DEPEND="dev-util/pkgconfig >= 0.23 BUILD { cd transmission-1.73 autoreconf -vfi - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-p2p/transmission/transmission-1.93.bep b/net-p2p/transmission/transmission-1.93.bep index 2b6c78703..1c00284ba 100644 --- a/net-p2p/transmission/transmission-1.93.bep +++ b/net-p2p/transmission/transmission-1.93.bep @@ -15,7 +15,7 @@ DEPEND="dev-util/pkgconfig >= 0.23 BUILD { cd transmission-1.93 autoreconf -vfi - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-p2p/transmission/transmission-2.01.bep b/net-p2p/transmission/transmission-2.01.bep index 20c052b3b..432836baf 100644 --- a/net-p2p/transmission/transmission-2.01.bep +++ b/net-p2p/transmission/transmission-2.01.bep @@ -15,7 +15,7 @@ DEPEND="dev-util/pkgconfig >= 0.23 BUILD { cd transmission-2.01 autoreconf -vfi - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-p2p/transmission/transmission-2.12.bep b/net-p2p/transmission/transmission-2.12.bep index 280fa11bc..125121a95 100644 --- a/net-p2p/transmission/transmission-2.12.bep +++ b/net-p2p/transmission/transmission-2.12.bep @@ -15,7 +15,7 @@ DEPEND="dev-util/pkgconfig >= 0.23 BUILD { cd transmission-2.12 autoreconf -vfi - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/net-p2p/transmission/transmission-2.21.bep b/net-p2p/transmission/transmission-2.21.bep index f910f8bb0..5609c0d99 100644 --- a/net-p2p/transmission/transmission-2.21.bep +++ b/net-p2p/transmission/transmission-2.21.bep @@ -14,7 +14,15 @@ DEPEND="dev-util/pkgconfig >= 0.23 BUILD { cd transmission-2.21 autoreconf -vfi - ./configure --prefix=/boot/common + +# Transmission doesn't think it's a bug, so we will have to remove this + sed -i 's/IT_PROG_INTLTOOL(0.35.0,no-xml)/ /' configure + + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --disable-nls \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ + --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` make } diff --git a/net-p2p/transmission/transmission-2.73.bep b/net-p2p/transmission/transmission-2.73.bep new file mode 100644 index 000000000..6033b9893 --- /dev/null +++ b/net-p2p/transmission/transmission-2.73.bep @@ -0,0 +1,35 @@ +DESCRIPTION="Transmission" +HOMEPAGE="http://www.transmissionbt.com/" +SRC_URI="http://download.transmissionbt.com/files/transmission-2.73.tar.bz2" +CHECKSUM_MD5="03927018656c4b54a92156ab59a8de74" +REVISION="1" +STATUS_HAIKU="stable" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." + +# pkgconfig is only a build dependency +# note: intlool, XML-Parser, & gettext are now required +DEPEND="dev-util/pkgconfig >= 0.23 + net-misc/curl >= 7.16.3 + dev-libs/libevent >= 2.0.10 + dev-libs/openssl >= 0.9.8" + +BUILD { + cd transmission-2.73 + + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --disable-nls \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ + --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + make +} + +INSTALL { + cd transmission-2.73 + make install +} +LICENSE="Transmission + MIT + GNU GPL v2" +COPYRIGHT="2005-2011. All code is copyrighted by the respective authors." + diff --git a/net-p2p/transmission/transmission-2.75.bep b/net-p2p/transmission/transmission-2.75.bep new file mode 100644 index 000000000..7252e2e99 --- /dev/null +++ b/net-p2p/transmission/transmission-2.75.bep @@ -0,0 +1,35 @@ +DESCRIPTION="Transmission" +HOMEPAGE="http://www.transmissionbt.com/" +SRC_URI="http://download.transmissionbt.com/files/transmission-2.75.tar.bz2" +CHECKSUM_MD5="ae3a3e7532560c16324e6c8a6386ad22" +REVISION="1" +STATUS_HAIKU="stable" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." + +# pkgconfig is only a build dependency +# note: intlool, XML-Parser, & gettext are now required +DEPEND="dev-util/pkgconfig >= 0.23 + net-misc/curl >= 7.16.3 + dev-libs/libevent >= 2.0.10 + dev-libs/openssl >= 0.9.8" + +BUILD { + cd transmission-2.75 + + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --disable-nls \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ + --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + make +} + +INSTALL { + cd transmission-2.75 + make install +} +LICENSE="Transmission + MIT + GNU GPL v2" +COPYRIGHT="2005-2013. All code is copyrighted by the respective authors." + diff --git a/net-proxy/privoxy/patches/privoxy-3.0.19.patch b/net-proxy/privoxy/patches/privoxy-3.0.19.patch new file mode 100644 index 000000000..1be72de1c --- /dev/null +++ b/net-proxy/privoxy/patches/privoxy-3.0.19.patch @@ -0,0 +1,72 @@ +diff -Naur privoxy-3.0.19-stable/configure.in privoxy-3.0.19-stable-haiku/configure.in +--- privoxy-3.0.19-stable/configure.in 2012-09-12 20:00:37.292814848 -0400 ++++ privoxy-3.0.19-stable-haiku/configure.in 2012-09-12 22:21:25.287309824 -0400 +@@ -160,7 +160,7 @@ + dnl ================================================================= + + +-if test "$EMXOS2" = yes; then ++if test "$EMXOS2" = yes || test "$host_os" = haiku; then + echo "Skipping user and group validity stuff."; + + else +@@ -677,6 +677,26 @@ + AC_SUBST(AMIGAOS_ONLY) + + dnl ================================================================= ++dnl Haiku specific ++dnl ================================================================= ++ ++if test "$host_os" = haiku; then ++ # Omit the "-pthread" flag to gcc, even when building with gcc 2.95 ++ SPECIAL_CFLAGS= ++ ++ # Haiku's pthreads implementation exists in its system library, ++ # libroot, not in a separate pthreads library ++ PTHREAD_LIB= ++ ++ # Networking code exists in libnetwork ++ SOCKET_LIB=-lnetwork ++ ++ # Search Haiku's common-library folder to find its pcre and ++ # pcreposix libraries ++ LIBS="-L/boot/common/lib $LIBS" ++fi ++ ++dnl ================================================================= + dnl Check for standard compiler stuff + dnl ================================================================= + +diff -Naur privoxy-3.0.19-stable/filters.c privoxy-3.0.19-stable-haiku/filters.c +--- privoxy-3.0.19-stable/filters.c 2012-09-12 20:00:37.720371712 -0400 ++++ privoxy-3.0.19-stable-haiku/filters.c 2012-09-12 22:21:28.150470656 -0400 +@@ -1095,6 +1095,11 @@ + char *new_url = NULL; + char *tmp; + ++ char *url_segment = NULL; ++ char **url_segments; ++ size_t max_segments; ++ int segments; ++ + assert(subject); + assert(redirect_mode); + +@@ -1117,14 +1122,13 @@ + * and look for a URL in the decoded result. + * Stop the search after the first match. + */ +- char *url_segment = NULL; ++ + /* + * XXX: This estimate is guaranteed to be high enough as we + * let ssplit() ignore empty fields, but also a bit wasteful. + */ +- size_t max_segments = strlen(subject) / 2; +- char **url_segments = malloc(max_segments * sizeof(char *)); +- int segments; ++ max_segments = strlen(subject) / 2; ++ url_segments = malloc(max_segments * sizeof(char *)); + + if (NULL == url_segments) + { diff --git a/net-proxy/privoxy/privoxy-3.0.19.bep b/net-proxy/privoxy/privoxy-3.0.19.bep new file mode 100644 index 000000000..d7dc1ebac --- /dev/null +++ b/net-proxy/privoxy/privoxy-3.0.19.bep @@ -0,0 +1,29 @@ +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" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="57acc79059565cc42eda67982842785d" + +BUILD { + cd privoxy-3.0.19-stable + autoheader + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --sysconfdir=`finddir B_COMMON_ETC_DIRECTORY`/privoxy \ + --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ + --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd privoxy-3.0.19-stable + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2001-2011 Privoxy Developers" diff --git a/net-wireless/b43-fwcutter/b43-fwcutter-012.bep b/net-wireless/b43-fwcutter/b43-fwcutter-012.bep index ee5531fe4..3f5bf8b68 100644 --- a/net-wireless/b43-fwcutter/b43-fwcutter-012.bep +++ b/net-wireless/b43-fwcutter/b43-fwcutter-012.bep @@ -1,21 +1,21 @@ 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://bu3sch.de/b43/fwcutter/b43-fwcutter-012.tar.bz2" +SRC_URI="http://bues.ch/b43/fwcutter/b43-fwcutter-012.tar.bz2" CHECKSUM_MD5="69eadf67b459f313a8d6b37aaabef96c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" BUILD { cd b43-fwcutter-012 - svn export http://svn.haiku-os.org/haiku/haiku/trunk/src/system/libroot/posix/glibc/string/byteswap.h + wget http://cgit.haiku-os.org/haiku/plain/src/system/libroot/posix/glibc/string/byteswap.h mkdir bits - svn export http://svn.haiku-os.org/haiku/haiku/trunk/src/system/libroot/posix/glibc/include/arch/x86/bits/byteswap.h bits/byteswap.h - make PREFIX=/boot/common CFLAGS="-I. -Wall -D_BSD_SOURCE" + wget http://cgit.haiku-os.org/haiku/plain/src/system/libroot/posix/glibc/include/arch/x86/bits/byteswap.h -O bits/byteswap.h + make PREFIX=`finddir B_COMMON_DIRECTORY` CFLAGS="-I. -Wall -D_BSD_SOURCE" } INSTALL { cd b43-fwcutter-012 - make PREFIX=/boot/common install + make PREFIX=$DESTDIR/`finddir B_COMMON_DIRECTORY` install } LICENSE="GNU GPL v2" COPYRIGHT="2005 Martin Langer diff --git a/net-wireless/b43-fwcutter/patches/b43-fwcutter-012.patch b/net-wireless/b43-fwcutter/patches/b43-fwcutter-012.patch new file mode 100644 index 000000000..575dd4e3e --- /dev/null +++ b/net-wireless/b43-fwcutter/patches/b43-fwcutter-012.patch @@ -0,0 +1,14 @@ +diff -up b43-fwcutter-012/Makefile.orig b43-fwcutter-012/Makefile +--- b43-fwcutter-012/Makefile.orig 2009-06-02 09:52:55.058982400 -0600 ++++ b43-fwcutter-012/Makefile 2012-06-16 16:13:04.182452224 -0600 +@@ -24,8 +24,8 @@ $(BIN): $(OBJECTS) + install: all + -install -d -o 0 -g 0 -m 755 $(PREFIX)/bin/ + -install -o 0 -g 0 -m 755 $(BIN) $(PREFIX)/bin/ +- -install -d -o 0 -g 0 -m 755 $(PREFIX)/man/man1/ +- -install -o 0 -g 0 -m 644 $(BIN).1 $(PREFIX)/man/man1/ ++ -install -d -o 0 -g 0 -m 755 $(PREFIX)/documentation/man/man1/ ++ -install -o 0 -g 0 -m 644 $(BIN).1 $(PREFIX)/documentation/man/man1/ + + clean: + -rm -f *.o $(BIN) diff --git a/net-wireless/wpa_supplicant/patches/wpa_supplicant-0.7.3.patch b/net-wireless/wpa_supplicant/patches/wpa_supplicant-0.7.3.patch new file mode 100644 index 000000000..3e318adb4 --- /dev/null +++ b/net-wireless/wpa_supplicant/patches/wpa_supplicant-0.7.3.patch @@ -0,0 +1,2156 @@ +diff -urN wpa_supplicant-0.7.3/src/crypto/aes-internal-dec.c wpa_supplicant-0.7.3-haiku/src/crypto/aes-internal-dec.c +--- wpa_supplicant-0.7.3/src/crypto/aes-internal-dec.c 2010-09-07 17:43:39.064749568 +0200 ++++ wpa_supplicant-0.7.3-haiku/src/crypto/aes-internal-dec.c 2011-07-01 17:41:33.033292288 +0200 +@@ -32,7 +32,7 @@ + * + * @return the number of rounds for the given cipher key size. + */ +-void rijndaelKeySetupDec(u32 rk[/*44*/], const u8 cipherKey[]) ++static void rijndaelKeySetupDec(u32 rk[/*44*/], const u8 cipherKey[]) + { + int Nr = 10, i, j; + u32 temp; +diff -urN wpa_supplicant-0.7.3/src/crypto/aes-internal-enc.c wpa_supplicant-0.7.3-haiku/src/crypto/aes-internal-enc.c +--- wpa_supplicant-0.7.3/src/crypto/aes-internal-enc.c 2010-09-07 17:43:39.065536000 +0200 ++++ wpa_supplicant-0.7.3-haiku/src/crypto/aes-internal-enc.c 2011-07-01 17:42:10.033292288 +0200 +@@ -27,7 +27,7 @@ + #include "crypto.h" + #include "aes_i.h" + +-void rijndaelEncrypt(const u32 rk[/*44*/], const u8 pt[16], u8 ct[16]) ++static void rijndaelEncrypt(const u32 rk[/*44*/], const u8 pt[16], u8 ct[16]) + { + u32 s0, s1, s2, s3, t0, t1, t2, t3; + const int Nr = 10; +diff -urN wpa_supplicant-0.7.3/src/drivers/driver_bsd.c wpa_supplicant-0.7.3-haiku/src/drivers/driver_bsd.c +--- wpa_supplicant-0.7.3/src/drivers/driver_bsd.c 2010-09-07 17:43:39.009699328 +0200 ++++ wpa_supplicant-0.7.3-haiku/src/drivers/driver_bsd.c 2011-09-27 18:32:01.953679872 +0200 +@@ -48,9 +48,28 @@ + #if __NetBSD__ + #include + #endif ++#ifdef __HAIKU__ ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include "net80211/ieee80211.h" ++#include "net80211/ieee80211_ioctl.h" ++#include "net80211/ieee80211_crypto.h" ++#endif /* __HAIKU__ */ + + #include "l2_packet/l2_packet.h" + ++ ++#ifdef __HAIKU__ ++void haiku_unregister_events(void *drv); ++int haiku_register_events(void *ctx, void *drv, const char *ifname, ++ void **events, void (*callback)(void *ctx, void *drv, int opcode)); ++#endif ++ + struct bsd_driver_data { + struct hostapd_data *hapd; /* back pointer */ + +@@ -65,6 +84,9 @@ + int prev_roaming; /* roaming state to restore on deinit */ + int prev_privacy; /* privacy state to restore on deinit */ + int prev_wpa; /* wpa state to restore on deinit */ ++#ifdef __HAIKU__ ++ void *events; ++#endif + }; + + /* Generic functions for hostapd and wpa_supplicant */ +@@ -82,7 +104,7 @@ + ireq.i_data = (void *) arg; + ireq.i_len = arg_len; + +- if (ioctl(drv->sock, SIOCS80211, &ireq) < 0) { ++ if (ioctl(drv->sock, SIOCS80211, &ireq, sizeof(ireq)) < 0) { + wpa_printf(MSG_ERROR, "ioctl[SIOCS80211, op=%u, val=%u, " + "arg_len=%u]: %s", op, val, arg_len, + strerror(errno)); +@@ -103,8 +125,8 @@ + ireq->i_len = arg_len; + ireq->i_data = arg; + +- if (ioctl(drv->sock, SIOCG80211, ireq) < 0) { +- wpa_printf(MSG_ERROR, "ioctl[SIOCS80211, op=%u, " ++ if (ioctl(drv->sock, SIOCG80211, ireq, sizeof(*ireq)) < 0) { ++ wpa_printf(MSG_ERROR, "ioctl[SIOCG80211, op=%u, " + "arg_len=%u]: %s", op, arg_len, strerror(errno)); + return -1; + } +@@ -144,7 +166,7 @@ + os_memset(&ifr, 0, sizeof(ifr)); + os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name)); + ifr.ifr_data = (void *)&nwid; +- if (ioctl(drv->sock, SIOCG80211NWID, &ifr) < 0 || ++ if (ioctl(drv->sock, SIOCG80211NWID, &ifr, sizeof(ifr)) < 0 || + nwid.i_len > IEEE80211_NWID_LEN) + return -1; + os_memcpy(ssid, nwid.i_nwid, nwid.i_len); +@@ -167,7 +189,7 @@ + os_memset(&ifr, 0, sizeof(ifr)); + os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name)); + ifr.ifr_data = (void *)&nwid; +- return ioctl(drv->sock, SIOCS80211NWID, &ifr); ++ return ioctl(drv->sock, SIOCS80211NWID, &ifr, sizeof(ifr)); + #else + return set80211var(drv, IEEE80211_IOC_SSID, ssid, ssid_len); + #endif +@@ -182,7 +204,7 @@ + os_memset(&ifmr, 0, sizeof(ifmr)); + os_strlcpy(ifmr.ifm_name, drv->ifname, sizeof(ifmr.ifm_name)); + +- if (ioctl(drv->sock, SIOCGIFMEDIA, &ifmr) < 0) { ++ if (ioctl(drv->sock, SIOCGIFMEDIA, &ifmr, sizeof(ifmr)) < 0) { + wpa_printf(MSG_ERROR, "%s: SIOCGIFMEDIA %s", __func__, + strerror(errno)); + return -1; +@@ -201,7 +223,7 @@ + os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name)); + ifr.ifr_media = media; + +- if (ioctl(drv->sock, SIOCSIFMEDIA, &ifr) < 0) { ++ if (ioctl(drv->sock, SIOCSIFMEDIA, &ifr, sizeof(ifr)) < 0) { + wpa_printf(MSG_ERROR, "%s: SIOCSIFMEDIA %s", __func__, + strerror(errno)); + return -1; +@@ -258,13 +280,14 @@ + static int + bsd_ctrl_iface(void *priv, int enable) + { ++#ifndef __HAIKU__ + struct bsd_driver_data *drv = priv; + struct ifreq ifr; + + os_memset(&ifr, 0, sizeof(ifr)); + os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name)); + +- if (ioctl(drv->sock, SIOCGIFFLAGS, &ifr) < 0) { ++ if (ioctl(drv->sock, SIOCGIFFLAGS, &ifr, sizeof(ifr)) < 0) { + perror("ioctl[SIOCGIFFLAGS]"); + return -1; + } +@@ -274,10 +297,11 @@ + else + ifr.ifr_flags &= ~IFF_UP; + +- if (ioctl(drv->sock, SIOCSIFFLAGS, &ifr) < 0) { ++ if (ioctl(drv->sock, SIOCSIFFLAGS, &ifr, sizeof(ifr)) < 0) { + perror("ioctl[SIOCSIFFLAGS]"); + return -1; + } ++#endif + + return 0; + } +@@ -487,6 +511,7 @@ + IEEE80211_MLME_UNAUTHORIZE, 0, addr); + } + ++#ifndef __HAIKU__ + static void + bsd_new_sta(void *priv, void *ctx, u8 addr[IEEE80211_ADDR_LEN]) + { +@@ -513,6 +538,7 @@ + no_ie: + drv_event_assoc(ctx, addr, iebuf, ielen); + } ++#endif // !__HAIKU__ + + static int + bsd_send_eapol(void *priv, const u8 *addr, const u8 *data, size_t data_len, +@@ -551,7 +577,7 @@ + os_memset(&creq, 0, sizeof(creq)); + os_strlcpy(creq.i_name, drv->ifname, sizeof(creq.i_name)); + creq.i_channel = channel; +- return ioctl(drv->sock, SIOCS80211CHANNEL, &creq); ++ return ioctl(drv->sock, SIOCS80211CHANNEL, &creq, sizeof(creq)); + #else /* SIOCS80211CHANNEL */ + return set80211param(priv, IEEE80211_IOC_CHANNEL, channel); + #endif /* SIOCS80211CHANNEL */ +@@ -644,7 +670,7 @@ + } + + +-static int ++static int + bsd_flush(void *priv) + { + u8 allsta[IEEE80211_ADDR_LEN]; +@@ -859,7 +885,7 @@ + struct ieee80211_bssid bs; + + os_strlcpy(bs.i_name, drv->ifname, sizeof(bs.i_name)); +- if (ioctl(drv->sock, SIOCG80211BSSID, &bs) < 0) ++ if (ioctl(drv->sock, SIOCG80211BSSID, &bs, sizeof(bs)) < 0) + return -1; + os_memcpy(bssid, bs.i_bssid, sizeof(bs.i_bssid)); + return 0; +@@ -979,7 +1005,7 @@ + wpa_printf(MSG_DEBUG, + "%s: ssid '%.*s' wpa ie len %u pairwise %u group %u key mgmt %u" + , __func__ +- , (unsigned int) params->ssid_len, params->ssid ++ , (int) params->ssid_len, params->ssid + , (unsigned int) params->wpa_ie_len + , params->pairwise_suite + , params->group_suite +@@ -1130,6 +1156,23 @@ + #endif /* IEEE80211_IOC_SCAN_MAX_SSID */ + } + ++#ifdef __HAIKU__ ++static void ++wpa_driver_haiku_event(void *ctx, void *drv, int opcode) ++{ ++ switch (opcode) { ++ case B_NETWORK_WLAN_JOINED: ++ wpa_supplicant_event(ctx, EVENT_ASSOC, NULL); ++ break; ++ case B_NETWORK_WLAN_LEFT: ++ wpa_supplicant_event(ctx, EVENT_DISASSOC, NULL); ++ break; ++ case B_NETWORK_WLAN_SCANNED: ++ wpa_supplicant_event(ctx, EVENT_SCAN_RESULTS, NULL); ++ break; ++ } ++} ++#else // !__HAIKU__ + static void + wpa_driver_bsd_event_receive(int sock, void *ctx, void *sock_ctx) + { +@@ -1242,6 +1285,7 @@ + break; + } + } ++#endif // !__HAIKU__ + + static void + wpa_driver_bsd_add_scan_entry(struct wpa_scan_results *res, +@@ -1260,7 +1304,11 @@ + if (result == NULL) + return; + os_memcpy(result->bssid, sr->isr_bssid, ETH_ALEN); ++#ifdef __HAIKU__ ++ result->freq = sr->isr_chan.ic_freq; ++#else + result->freq = sr->isr_freq; ++#endif + result->beacon_int = sr->isr_intval; + result->caps = sr->isr_capinfo; + result->qual = sr->isr_rssi; +@@ -1319,7 +1367,7 @@ + + pos = buf; + rest = len; +- while (rest >= sizeof(struct ieee80211req_scan_result)) { ++ while (rest >= (int) sizeof(struct ieee80211req_scan_result)) { + sr = (struct ieee80211req_scan_result *)pos; + wpa_driver_bsd_add_scan_entry(res, sr); + pos += sr->isr_len; +@@ -1431,11 +1479,18 @@ + drv->sock = socket(PF_INET, SOCK_DGRAM, 0); + if (drv->sock < 0) + goto fail1; ++#ifndef __HAIKU__ + drv->route = socket(PF_ROUTE, SOCK_RAW, 0); + if (drv->route < 0) + goto fail; + eloop_register_read_sock(drv->route, + wpa_driver_bsd_event_receive, ctx, drv); ++#else ++ if (haiku_register_events(ctx, drv, ifname, &drv->events, ++ wpa_driver_haiku_event) != 0) { ++ goto fail; ++ } ++#endif + + drv->ctx = ctx; + os_strlcpy(drv->ifname, ifname, sizeof(drv->ifname)); +@@ -1478,7 +1533,11 @@ + struct bsd_driver_data *drv = priv; + + wpa_driver_bsd_set_wpa(drv, 0); ++#ifndef __HAIKU__ + eloop_unregister_read_sock(drv->route); ++#else ++ haiku_unregister_events(drv->events); ++#endif + + /* NB: mark interface down */ + bsd_ctrl_iface(drv, 0); +diff -urN wpa_supplicant-0.7.3/src/drivers/driver_haiku_events.cpp wpa_supplicant-0.7.3-haiku/src/drivers/driver_haiku_events.cpp +--- wpa_supplicant-0.7.3/src/drivers/driver_haiku_events.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ wpa_supplicant-0.7.3-haiku/src/drivers/driver_haiku_events.cpp 2011-09-27 18:54:15.247726080 +0200 +@@ -0,0 +1,103 @@ ++/* ++ * WPA Supplicant - Haiku event handling routines ++ * Copyright (c) 2010, Axel Dörfler, axeld@pinc-software.de. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Alternatively, this software may be distributed under the terms of BSD ++ * license. ++ * ++ * See README and COPYING for more details. ++ * ++ * This file can be used as a starting point for layer2 packet implementation. ++ */ ++ ++#include ++#include ++#include ++ ++#include ++ ++#include ++ ++ ++class EventLooper : public BLooper { ++public: ++ EventLooper(void *context, void *driverData, const char *interfaceName, ++ void (*callback)(void *, void *, int)) ++ : ++ fContext(context), ++ fDriverData(driverData), ++ fInterfaceName(interfaceName), ++ fCallback(callback), ++ fQuitting(false) ++ { ++ start_watching_network(B_WATCH_NETWORK_WLAN_CHANGES, this); ++ } ++ ++ virtual ~EventLooper() ++ { ++ fQuitting = true; ++ stop_watching_network(this); ++ } ++ ++protected: ++ virtual void MessageReceived(BMessage *message) ++ { ++ if (message->what != B_NETWORK_MONITOR) { ++ BLooper::MessageReceived(message); ++ return; ++ } ++ ++ if (fQuitting) ++ return; ++ ++ BString interfaceName; ++ if (message->FindString("interface", &interfaceName) != B_OK) ++ return; ++ ++ if (fInterfaceName.FindFirst(interfaceName) < 0) { ++ // The notification is for some other interface ++ return; ++ } ++ ++ message->AddPointer("callback", (void *)fCallback); ++ message->AddPointer("context", fContext); ++ message->AddPointer("data", fDriverData); ++ be_app->PostMessage(message); ++ } ++ ++private: ++ void *fContext; ++ void *fDriverData; ++ BString fInterfaceName; ++ void (*fCallback)(void *, void *, int); ++ bool fQuitting; ++}; ++ ++ ++extern "C" void ++haiku_unregister_events(void *events) ++{ ++ EventLooper *eventLooper = (EventLooper *)events; ++ if (eventLooper->Lock()) ++ eventLooper->Quit(); ++} ++ ++ ++extern "C" int ++haiku_register_events(void *ctx, void *drv, const char *ifname, void **events, ++ void (*callback)(void *ctx, void *drv, int opcode)) ++{ ++ EventLooper *eventLooper = new(std::nothrow) EventLooper(ctx, drv, ifname, ++ callback); ++ if (eventLooper == NULL) ++ return B_NO_MEMORY; ++ ++ eventLooper->Run(); ++ ++ *events = eventLooper; ++ return 0; ++} +diff -urN wpa_supplicant-0.7.3/src/drivers/drivers.mak wpa_supplicant-0.7.3-haiku/src/drivers/drivers.mak +--- wpa_supplicant-0.7.3/src/drivers/drivers.mak 2010-09-07 17:43:39.012058624 +0200 ++++ wpa_supplicant-0.7.3-haiku/src/drivers/drivers.mak 2011-09-27 17:40:51.542638080 +0200 +@@ -45,9 +45,15 @@ + endif + DRV_CFLAGS += -DCONFIG_DRIVER_BSD + DRV_OBJS += ../src/drivers/driver_bsd.o ++ifneq ($(CONFIG_L2_PACKET), haiku) + CONFIG_L2_FREEBSD=y + CONFIG_DNET_PCAP=y + endif ++endif ++ ++ifeq ($(CONFIG_L2_PACKET), haiku) ++DRV_OBJS += ../src/drivers/driver_haiku_events.o ++endif + + ifdef CONFIG_DRIVER_TEST + DRV_CFLAGS += -DCONFIG_DRIVER_TEST +diff -urN wpa_supplicant-0.7.3/src/l2_packet/l2_packet_haiku.c wpa_supplicant-0.7.3-haiku/src/l2_packet/l2_packet_haiku.c +--- wpa_supplicant-0.7.3/src/l2_packet/l2_packet_haiku.c 1970-01-01 01:00:00.000000000 +0100 ++++ wpa_supplicant-0.7.3-haiku/src/l2_packet/l2_packet_haiku.c 2011-09-27 18:49:59.729284608 +0200 +@@ -0,0 +1,235 @@ ++/* ++ * WPA Supplicant - Layer2 packet handling for Haiku ++ * Copyright (c) 2010, Axel Dörfler, axeld@pinc-software.de. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Alternatively, this software may be distributed under the terms of BSD ++ * license. ++ * ++ * See README and COPYING for more details. ++ * ++ * This file can be used as a starting point for layer2 packet implementation. ++ */ ++ ++#include "includes.h" ++ ++#include "common.h" ++#include "eloop.h" ++#include "l2_packet.h" ++ ++#include ++#include ++#include ++ ++ ++struct l2_packet_data { ++ char ifname[IF_NAMESIZE]; ++ union { ++ struct sockaddr_dl link_address; ++ struct sockaddr_storage link_storage; ++ }; ++ void (*rx_callback)(void *ctx, const u8 *src_addr, ++ const u8 *buf, size_t len); ++ void *rx_callback_ctx; ++ int l2_hdr; /* whether to include layer 2 (Ethernet) header data ++ * buffers */ ++ int rx_fd; ++ int tx_fd; ++}; ++ ++ ++int l2_packet_get_own_addr(struct l2_packet_data *l2, u8 *addr) ++{ ++ os_memcpy(addr, LLADDR(&l2->link_address), ETH_ALEN); ++ return 0; ++} ++ ++ ++#if 0 ++static void ++dump_block(const u8* buffer, int size, const char* prefix) ++{ ++ const int DUMPED_BLOCK_SIZE = 16; ++ int i; ++ ++ for (i = 0; i < size;) { ++ int start = i; ++ ++ printf("%s%04x ", prefix, i); ++ for (; i < start + DUMPED_BLOCK_SIZE; i++) { ++ if (!(i % 4)) ++ printf(" "); ++ ++ if (i >= size) ++ printf(" "); ++ else ++ printf("%02x", *(unsigned char*)(buffer + i)); ++ } ++ printf(" "); ++ ++ for (i = start; i < start + DUMPED_BLOCK_SIZE; i++) { ++ if (i < size) { ++ char c = buffer[i]; ++ ++ if (c < 30) ++ printf("."); ++ else ++ printf("%c", c); ++ } else ++ break; ++ } ++ printf("\n"); ++ } ++} ++#endif ++ ++ ++int l2_packet_send(struct l2_packet_data *l2, const u8 *dst_addr, u16 proto, ++ const u8 *buf, size_t len) ++{ ++ int result = -1; ++ struct sockaddr_dl to; ++ ++ if (l2 == NULL) ++ return -1; ++ ++ if (l2->l2_hdr) { ++ int result = send(l2->tx_fd, buf, len, 0); ++ if (result < 0) ++ printf("l2_packet_send failed to send: %s", strerror(errno)); ++ return result; ++ } ++ ++ memset(&to, 0, sizeof(struct sockaddr_dl)); ++ to.sdl_len = sizeof(struct sockaddr_dl); ++ to.sdl_family = AF_LINK; ++ to.sdl_e_type = htons(proto); ++ to.sdl_alen = ETHER_ADDR_LEN; ++ memcpy(LLADDR(&to), dst_addr, ETHER_ADDR_LEN); ++ ++ result = sendto(l2->tx_fd, buf, len, 0, (struct sockaddr*)&to, ++ sizeof(struct sockaddr_dl)); ++ if (result < 0) ++ printf("l2_packet_send failed to send: %s", strerror(errno)); ++ ++ return result; ++} ++ ++ ++static void l2_packet_receive(int sock, void *eloop_ctx, void *sock_ctx) ++{ ++ struct l2_packet_data *l2 = eloop_ctx; ++ struct sockaddr_dl from; ++ socklen_t fromLength = sizeof(struct sockaddr_dl); ++ ssize_t bytesReceived; ++ u8 buffer[2300]; ++ ++ bytesReceived = recvfrom(l2->rx_fd, buffer, sizeof(buffer), MSG_TRUNC, ++ (struct sockaddr*)&from, &fromLength); ++ ++ if (bytesReceived <= 0) ++ return; ++ ++ l2->rx_callback(l2->rx_callback_ctx, LLADDR(&from), buffer, bytesReceived); ++} ++ ++ ++struct l2_packet_data * l2_packet_init( ++ const char *ifname, const u8 *own_addr, unsigned short protocol, ++ void (*rx_callback)(void *ctx, const u8 *src_addr, ++ const u8 *buf, size_t len), ++ void *rx_callback_ctx, int l2_hdr) ++{ ++ struct l2_packet_data *l2; ++ struct ifreq request; ++ ++ /* check if the interface exists */ ++ if (if_nametoindex(ifname) == 0) ++ return NULL; ++ ++ l2 = os_zalloc(sizeof(struct l2_packet_data)); ++ if (l2 == NULL) ++ return NULL; ++ os_strlcpy(l2->ifname, ifname, sizeof(l2->ifname)); ++ l2->rx_callback = rx_callback; ++ l2->rx_callback_ctx = rx_callback_ctx; ++ l2->l2_hdr = l2_hdr; ++ ++ /* open connection for sending and receiving frames */ ++ l2->tx_fd = socket(AF_LINK, SOCK_DGRAM, 0); ++ if (l2->tx_fd < 0) ++ goto err1; ++ ++ /* retrieve link address */ ++ strlcpy(request.ifr_name, ifname, IF_NAMESIZE); ++ if (ioctl(l2->tx_fd, SIOCGIFADDR, &request, sizeof(struct ifreq)) < 0) ++ goto err2; ++ ++ memcpy(&l2->link_address, &request.ifr_addr, request.ifr_addr.sa_len); ++ ++ if (l2_hdr) { ++ /* we need to preserve the L2 header - this is only ++ possible by using a dedicated socket. ++ */ ++ ++ /* open connection for monitoring frames */ ++ l2->rx_fd = socket(AF_LINK, SOCK_DGRAM, 0); ++ if (l2->rx_fd < 0) ++ goto err2; ++ ++ /* start monitoring */ ++ if (ioctl(l2->rx_fd, SIOCSPACKETCAP, &request, ++ sizeof(struct ifreq)) < 0) ++ goto err2; ++ } else { ++ /* bind to protocol */ ++ l2->link_address.sdl_e_type = htons(protocol); ++ ++ if (bind(l2->tx_fd, (struct sockaddr *)&l2->link_address, ++ ((struct sockaddr *)&l2->link_address)->sa_len) < 0) ++ goto err2; ++ ++ /* we can use the same socket to receive our packets */ ++ l2->rx_fd = l2->tx_fd; ++ } ++ ++ eloop_register_read_sock(l2->rx_fd, l2_packet_receive, l2, NULL); ++ ++ return l2; ++ ++err2: ++ close(l2->tx_fd); ++err1: ++ os_free(l2); ++ return NULL; ++} ++ ++ ++void l2_packet_deinit(struct l2_packet_data *l2) ++{ ++ if (l2 == NULL) ++ return; ++ ++ if (l2->rx_fd >= 0) { ++ eloop_unregister_read_sock(l2->rx_fd); ++ /* TODO: close connection */ ++ } ++ ++ os_free(l2); ++} ++ ++ ++int l2_packet_get_ip_addr(struct l2_packet_data *l2, char *buf, size_t len) ++{ ++ /* TODO: get interface IP address */ ++ return -1; ++} ++ ++ ++void l2_packet_notify_auth_start(struct l2_packet_data *l2) ++{ ++ /* This function can be left empty */ ++} +diff -urN wpa_supplicant-0.7.3/src/utils/common.h wpa_supplicant-0.7.3-haiku/src/utils/common.h +--- wpa_supplicant-0.7.3/src/utils/common.h 2010-09-07 17:43:39.048234496 +0200 ++++ wpa_supplicant-0.7.3-haiku/src/utils/common.h 2011-07-01 17:39:20.061079552 +0200 +@@ -59,6 +59,14 @@ + } + #endif /* __APPLE__ */ + ++#if defined(__HAIKU__) ++#include ++#include ++#define bswap_16 __swap_int16 ++#define bswap_32 __swap_int32 ++#define bswap_64 __swap_int64 ++#endif /* __HAIKU__ */ ++ + #ifdef CONFIG_TI_COMPILER + #define __BIG_ENDIAN 4321 + #define __LITTLE_ENDIAN 1234 +diff -urN wpa_supplicant-0.7.3/src/utils/os_unix.c wpa_supplicant-0.7.3-haiku/src/utils/os_unix.c +--- wpa_supplicant-0.7.3/src/utils/os_unix.c 2010-09-07 17:43:39.048496640 +0200 ++++ wpa_supplicant-0.7.3-haiku/src/utils/os_unix.c 2011-07-02 18:19:53.552599552 +0200 +@@ -135,9 +135,9 @@ + + int os_daemonize(const char *pid_file) + { +-#ifdef __uClinux__ ++#if defined(__uClinux__) || defined(__HAIKU__) + return -1; +-#else /* __uClinux__ */ ++#else /* __uClinux__ || __HAIKU__ */ + if (os_daemon(0, 0)) { + perror("daemon"); + return -1; +@@ -152,7 +152,7 @@ + } + + return -0; +-#endif /* __uClinux__ */ ++#endif /* __uClinux__ || __HAIKU__ */ + } + + +diff -urN wpa_supplicant-0.7.3/src/utils/wpa_debug.h wpa_supplicant-0.7.3-haiku/src/utils/wpa_debug.h +--- wpa_supplicant-0.7.3/src/utils/wpa_debug.h 2010-09-07 17:43:39.047448064 +0200 ++++ wpa_supplicant-0.7.3-haiku/src/utils/wpa_debug.h 2011-07-02 18:17:43.390332416 +0200 +@@ -79,7 +79,7 @@ + static inline void wpa_hexdump_buf(int level, const char *title, + const struct wpabuf *buf) + { +- wpa_hexdump(level, title, wpabuf_head(buf), wpabuf_len(buf)); ++ wpa_hexdump(level, title, (u8 *)wpabuf_head(buf), wpabuf_len(buf)); + } + + /** +@@ -100,7 +100,7 @@ + static inline void wpa_hexdump_buf_key(int level, const char *title, + const struct wpabuf *buf) + { +- wpa_hexdump_key(level, title, wpabuf_head(buf), wpabuf_len(buf)); ++ wpa_hexdump_key(level, title, (u8 *)wpabuf_head(buf), wpabuf_len(buf)); + } + + /** +diff -urN wpa_supplicant-0.7.3/src/utils/wpabuf.h wpa_supplicant-0.7.3-haiku/src/utils/wpabuf.h +--- wpa_supplicant-0.7.3/src/utils/wpabuf.h 2010-09-07 17:43:39.048496640 +0200 ++++ wpa_supplicant-0.7.3-haiku/src/utils/wpabuf.h 2011-07-02 18:16:39.086769664 +0200 +@@ -85,7 +85,7 @@ + + static inline const u8 * wpabuf_head_u8(const struct wpabuf *buf) + { +- return wpabuf_head(buf); ++ return (u8 *)wpabuf_head(buf); + } + + /** +@@ -102,36 +102,36 @@ + + static inline u8 * wpabuf_mhead_u8(struct wpabuf *buf) + { +- return wpabuf_mhead(buf); ++ return (u8 *)wpabuf_mhead(buf); + } + + static inline void wpabuf_put_u8(struct wpabuf *buf, u8 data) + { +- u8 *pos = wpabuf_put(buf, 1); ++ u8 *pos = (u8 *)wpabuf_put(buf, 1); + *pos = data; + } + + static inline void wpabuf_put_le16(struct wpabuf *buf, u16 data) + { +- u8 *pos = wpabuf_put(buf, 2); ++ u8 *pos = (u8 *)wpabuf_put(buf, 2); + WPA_PUT_LE16(pos, data); + } + + static inline void wpabuf_put_be16(struct wpabuf *buf, u16 data) + { +- u8 *pos = wpabuf_put(buf, 2); ++ u8 *pos = (u8 *)wpabuf_put(buf, 2); + WPA_PUT_BE16(pos, data); + } + + static inline void wpabuf_put_be24(struct wpabuf *buf, u32 data) + { +- u8 *pos = wpabuf_put(buf, 3); ++ u8 *pos = (u8 *)wpabuf_put(buf, 3); + WPA_PUT_BE24(pos, data); + } + + static inline void wpabuf_put_be32(struct wpabuf *buf, u32 data) + { +- u8 *pos = wpabuf_put(buf, 4); ++ u8 *pos = (u8 *)wpabuf_put(buf, 4); + WPA_PUT_BE32(pos, data); + } + +diff -urN wpa_supplicant-0.7.3/wpa_supplicant/.config wpa_supplicant-0.7.3-haiku/wpa_supplicant/.config +--- wpa_supplicant-0.7.3/wpa_supplicant/.config 1970-01-01 01:00:00.000000000 +0100 ++++ wpa_supplicant-0.7.3-haiku/wpa_supplicant/.config 2011-09-27 19:04:17.648019968 +0200 +@@ -0,0 +1,120 @@ ++# for OpenSSL ++CFLAGS += -I/boot/common/include ++LIBS += -L/boot/common/lib ++ ++# for private Haiku headers ++CFLAGS += -I/Source/Haiku/trunk/src/libs/compat/freebsd_network/compat ++CFLAGS += -I/Source/Haiku/trunk/src/libs/compat/freebsd_wlan ++CFLAGS += -I/Source/Haiku/trunk/headers/private/net ++CFLAGS += -Wno-multichar ++ ++# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) ++CONFIG_DRIVER_BSD=y ++ ++# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is ++# included) ++#CONFIG_IEEE8021X_EAPOL=y ++ ++# EAP-MD5 ++#CONFIG_EAP_MD5=y ++ ++# EAP-MSCHAPv2 ++#CONFIG_EAP_MSCHAPV2=y ++ ++# EAP-TLS ++#CONFIG_EAP_TLS=y ++ ++# EAL-PEAP ++#CONFIG_EAP_PEAP=y ++ ++# EAP-TTLS ++#CONFIG_EAP_TTLS=y ++ ++# EAP-GTC ++#CONFIG_EAP_GTC=y ++ ++# EAP-OTP ++#CONFIG_EAP_OTP=y ++ ++# LEAP ++#CONFIG_EAP_LEAP=y ++ ++# Wi-Fi Protected Setup (WPS) ++#CONFIG_WPS=y ++ ++# EAP-IKEv2 ++#CONFIG_EAP_IKEV2=y ++ ++# PKCS#12 (PFX) support (used to read private key and certificate file from ++# a file that usually has extension .p12 or .pfx) ++#CONFIG_PKCS12=y ++ ++# Smartcard support (i.e., private key on a smartcard), e.g., with openssl ++# engine. ++#CONFIG_SMARTCARD=y ++ ++# Select control interface backend for external programs, e.g, wpa_cli: ++# unix = UNIX domain sockets (default for Linux/*BSD) ++# udp = UDP sockets using localhost (127.0.0.1) ++# named_pipe = Windows Named Pipe (default for Windows) ++# y = use default (backwards compatibility) ++# If this option is commented out, control interface is not included in the ++# build. ++#CONFIG_CTRL_IFACE=y ++ ++# Remove debugging code that is printing out debug message to stdout. ++# This can be used to reduce the size of the wpa_supplicant considerably ++# if debugging code is not needed. The size reduction can be around 35% ++# (e.g., 90 kB). ++#CONFIG_NO_STDOUT_DEBUG=y ++ ++# Select configuration backend: ++# file = text file (e.g., wpa_supplicant.conf; note: the configuration file ++# path is given on command line, not here; this option is just used to ++# select the backend that allows configuration files to be used) ++# winreg = Windows registry (see win_example.reg for an example) ++CONFIG_BACKEND=none ++ ++# Remove configuration write functionality (i.e., to allow the configuration ++# file to be updated based on runtime configuration changes). The runtime ++# configuration can still be changed, the changes are just not going to be ++# persistent over restarts. This option can be used to reduce code size by ++# about 3.5 kB. ++CONFIG_NO_CONFIG_WRITE=y ++ ++# Remove support for configuration blobs to reduce code size by about 1.5 kB. ++CONFIG_NO_CONFIG_BLOBS=y ++ ++# Select program entry point implementation: ++# main = UNIX/POSIX like main() function (default) ++# main_winsvc = Windows service (read parameters from registry) ++# main_none = Very basic example (development use only) ++CONFIG_MAIN=main_haiku ++ ++# Select wrapper for operatins system and C library specific functions ++# unix = UNIX/POSIX like systems (default) ++# win32 = Windows systems ++# none = Empty template ++#CONFIG_OS=haiku ++ ++# Select event loop implementation ++# eloop = select() loop (default) ++# eloop_win = Windows events and WaitForMultipleObject() loop ++# eloop_none = Empty template ++#CONFIG_ELOOP=eloop ++ ++# Select layer 2 packet implementation ++# linux = Linux packet socket (default) ++# pcap = libpcap/libdnet/WinPcap ++# freebsd = FreeBSD libpcap ++# winpcap = WinPcap with receive thread ++# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) ++# none = Empty template ++CONFIG_L2_PACKET=haiku ++ ++# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) ++CONFIG_PEERKEY=y ++ ++# Enable mitigation against certain attacks against TKIP by delaying Michael ++# MIC error reports by a random amount of time between 0 and 60 seconds ++#CONFIG_DELAYED_MIC_ERROR_REPORT=y +diff -urN wpa_supplicant-0.7.3/wpa_supplicant/Makefile wpa_supplicant-0.7.3-haiku/wpa_supplicant/Makefile +--- wpa_supplicant-0.7.3/wpa_supplicant/Makefile 2010-09-07 17:43:39.014417920 +0200 ++++ wpa_supplicant-0.7.3-haiku/wpa_supplicant/Makefile 2011-10-05 21:46:19.671088640 +0200 +@@ -579,9 +579,11 @@ + NEED_EAP_COMMON=y + ifdef CONFIG_DYNAMIC_EAP_METHODS + CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS ++ifneq ($(CONFIG_L2_PACKET), haiku) + LIBS += -ldl -rdynamic + endif + endif ++endif + + ifdef CONFIG_AP + NEED_80211_COMMON=y +@@ -898,11 +900,23 @@ + ifdef CONFIG_SMARTCARD + ifndef CONFIG_NATIVE_WINDOWS + ifneq ($(CONFIG_L2_PACKET), freebsd) ++ifneq ($(CONFIG_L2_PACKET), haiku) + LIBS += -ldl + endif + endif + endif + endif ++endif ++ ++ifeq ($(CONFIG_L2_PACKET), haiku) ++OBJS += WirelessConfigDialog.o ++OBJS += notify_haiku.o ++LIBS += -lnetwork -lbe ++LIBS_c += -lnetwork ++ifeq ($(shell $(CC) -dumpversion | cut -d. -f1), 4) ++LIBS += -lstdc++ ++endif ++endif + + ifndef TLS_FUNCS + OBJS += ../src/crypto/tls_none.o +@@ -1270,13 +1284,21 @@ + wpa_priv: $(BCHECK) $(OBJS_priv) + $(LDO) $(LDFLAGS) -o wpa_priv $(OBJS_priv) $(LIBS) + ++ifneq ($(CONFIG_L2_PACKET), haiku) + wpa_supplicant: .config $(BCHECK) $(OBJS) $(EXTRA_progs) + $(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS) ++else ++wpa_supplicant: .config $(BCHECK) $(OBJS) $(EXTRA_progs) ++ $(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS) ++ rc -o wpa_supplicant.rsrc wpa_supplicant.rdef ++ xres -o wpa_supplicant wpa_supplicant.rsrc ++ mimeset -F wpa_supplicant ++endif + + eapol_test: .config $(OBJS_t) + $(LDO) $(LDFLAGS) -o eapol_test $(OBJS_t) $(LIBS) + +-preauth_test: .config $(OBJS_t2) ++preauth_test: .config $(OBJS_t2) + $(LDO) $(LDFLAGS) -o preauth_test $(OBJS_t2) $(LIBS) + + wpa_passphrase: $(OBJS_p) +@@ -1329,6 +1351,10 @@ + $(Q)$(CC) -c -o $@ $(CFLAGS) $< + @$(E) " CC " $< + ++%.o: %.cpp ++ $(Q)$(CC) -c -o $@ $(CFLAGS) $< ++ @$(E) " CPP " $< ++ + wpa_supplicant.exe: wpa_supplicant + mv -f $< $@ + wpa_cli.exe: wpa_cli +@@ -1346,13 +1372,13 @@ + $(STRIP) $(WINALL) + + wpa_gui/Makefile: +- qmake -o wpa_gui/Makefile wpa_gui/wpa_gui.pro ++ qmake -o wpa_gui/Makefile wpa_gui/wpa_gui.pro + + wpa_gui: wpa_gui/Makefile + $(MAKE) -C wpa_gui + + wpa_gui-qt4/Makefile: +- qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro ++ qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro + + wpa_gui-qt4/lang/wpa_gui_de.qm: wpa_gui-qt4/lang/wpa_gui_de.ts + lrelease wpa_gui-qt4/wpa_gui.pro +@@ -1375,6 +1401,6 @@ + $(MAKE) -C ../src clean + $(MAKE) -C dbus clean + rm -f core *~ *.o *.d eap_*.so $(ALL) $(WINALL) eapol_test preauth_test +- rm -f wpa_priv ++ rm -f wpa_priv *.rsrc + + -include $(OBJS:%.o=%.d) +diff -urN wpa_supplicant-0.7.3/wpa_supplicant/WirelessConfigDialog.cpp wpa_supplicant-0.7.3-haiku/wpa_supplicant/WirelessConfigDialog.cpp +--- wpa_supplicant-0.7.3/wpa_supplicant/WirelessConfigDialog.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ wpa_supplicant-0.7.3-haiku/wpa_supplicant/WirelessConfigDialog.cpp 2011-09-27 18:52:47.483131392 +0200 +@@ -0,0 +1,255 @@ ++/* ++ * WPA Supplicant - Wireless Config Dialog ++ * Copyright (c) 2011, Michael Lotz ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Alternatively, this software may be distributed under the terms of BSD ++ * license. ++ * ++ * See README and COPYING for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++static const uint32 kMessageCancel = 'btcl'; ++static const uint32 kMessageOk = 'btok'; ++ ++ ++class WirelessConfigView : public BView { ++public: ++ WirelessConfigView() ++ : ++ BView("WirelessConfigView", B_WILL_DRAW), ++ fPassword(NULL) ++ { ++ SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); ++ ++ BGroupLayout* rootLayout = new(std::nothrow) BGroupLayout(B_VERTICAL); ++ if (rootLayout == NULL) ++ return; ++ ++ SetLayout(rootLayout); ++ ++ BGridView* controls = new(std::nothrow) BGridView(); ++ if (controls == NULL) ++ return; ++ ++ BGridLayout* layout = controls->GridLayout(); ++ ++ float inset = ceilf(be_plain_font->Size() * 0.7); ++ rootLayout->SetInsets(inset, inset, inset, inset); ++ rootLayout->SetSpacing(inset); ++ layout->SetSpacing(inset, inset); ++ ++ fNetworkName = new(std::nothrow) BTextControl("Network Name:", "", ++ NULL); ++ if (fNetworkName == NULL) ++ return; ++ ++ layout->AddItem(fNetworkName->CreateLabelLayoutItem(), 0, 0); ++ layout->AddItem(fNetworkName->CreateTextViewLayoutItem(), 1, 0); ++ ++ BPopUpMenu* authMenu = new(std::nothrow) BPopUpMenu("authMode"); ++ if (authMenu == NULL) ++ return; ++ ++ fAuthOpen = new(std::nothrow) BMenuItem("Open", NULL); ++ authMenu->AddItem(fAuthOpen); ++ fAuthWEP = new(std::nothrow) BMenuItem("WEP", NULL); ++ authMenu->AddItem(fAuthWEP); ++ fAuthWPA = new(std::nothrow) BMenuItem("WPA/WPA2", NULL); ++ authMenu->AddItem(fAuthWPA); ++ ++ BMenuField* authMenuField = new(std::nothrow) BMenuField( ++ "Authentication:", authMenu); ++ if (authMenuField == NULL) ++ return; ++ ++ layout->AddItem(authMenuField->CreateLabelLayoutItem(), 0, 1); ++ layout->AddItem(authMenuField->CreateMenuBarLayoutItem(), 1, 1); ++ ++ fPassword = new(std::nothrow) BTextControl("Password:", "", NULL); ++ if (fPassword == NULL) ++ return; ++ ++ BLayoutItem* layoutItem = fPassword->CreateTextViewLayoutItem(); ++ layoutItem->SetExplicitMinSize(BSize(fPassword->StringWidth( ++ "0123456789012345678901234567890123456789") + inset, ++ B_SIZE_UNSET)); ++ ++ layout->AddItem(fPassword->CreateLabelLayoutItem(), 0, 2); ++ layout->AddItem(layoutItem, 1, 2); ++ ++ BGroupView* buttons = new(std::nothrow) BGroupView(B_HORIZONTAL); ++ if (buttons == NULL) ++ return; ++ ++ fCancelButton = new(std::nothrow) BButton("Cancel", ++ new BMessage(kMessageCancel)); ++ buttons->GroupLayout()->AddView(fCancelButton); ++ ++ buttons->GroupLayout()->AddItem(BSpaceLayoutItem::CreateGlue()); ++ ++ fOkButton = new(std::nothrow) BButton("OK", new BMessage(kMessageOk)); ++ buttons->GroupLayout()->AddView(fOkButton); ++ ++ rootLayout->AddView(controls); ++ rootLayout->AddView(buttons); ++ } ++ ++ virtual void ++ AttachedToWindow() ++ { ++ fCancelButton->SetTarget(Window()); ++ fOkButton->SetTarget(Window()); ++ } ++ ++ void ++ SetUp(BString& networkName, uint32 authMode, BString& password) ++ { ++ fNetworkName->SetText(networkName); ++ ++ switch (authMode) { ++ default: ++ case B_NETWORK_AUTHENTICATION_NONE: ++ fAuthOpen->SetMarked(true); ++ break; ++ case B_NETWORK_AUTHENTICATION_WEP: ++ fAuthWEP->SetMarked(true); ++ break; ++ case B_NETWORK_AUTHENTICATION_WPA: ++ case B_NETWORK_AUTHENTICATION_WPA2: ++ fAuthWPA->SetMarked(true); ++ break; ++ } ++ ++ fPassword->SetText(password); ++ } ++ ++ void ++ Complete(BString& networkName, uint32& authMode, BString& password) ++ { ++ networkName = fNetworkName->Text(); ++ ++ authMode = B_NETWORK_AUTHENTICATION_NONE; ++ if (fAuthWEP->IsMarked()) ++ authMode = B_NETWORK_AUTHENTICATION_WEP; ++ else if (fAuthWPA->IsMarked()) ++ authMode = B_NETWORK_AUTHENTICATION_WPA; ++ ++ password = fPassword->Text(); ++ } ++ ++private: ++ BTextControl* fNetworkName; ++ BMenuItem* fAuthOpen; ++ BMenuItem* fAuthWEP; ++ BMenuItem* fAuthWPA; ++ BTextControl* fPassword; ++ BButton* fCancelButton; ++ BButton* fOkButton; ++}; ++ ++ ++class WirelessConfigWindow : public BWindow { ++public: ++ WirelessConfigWindow(BRect frame) ++ : ++ BWindow(BRect(50, 50, 269, 302), "Connect Wireless Network", ++ B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS ++ | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS), ++ fConfigView(NULL), ++ fDoneSem(-1), ++ fResult(B_ERROR) ++ { ++ fDoneSem = create_sem(0, "wireless config done"); ++ if (fDoneSem < 0) ++ return; ++ ++ BLayout* layout = new(std::nothrow) BGroupLayout(B_HORIZONTAL); ++ if (layout == NULL) ++ return; ++ ++ SetLayout(layout); ++ ++ fConfigView = new(std::nothrow) WirelessConfigView(); ++ if (fConfigView == NULL) ++ return; ++ ++ layout->AddView(fConfigView); ++ } ++ ++ virtual ++ ~WirelessConfigWindow() ++ { ++ if (fDoneSem >= 0) ++ delete_sem(fDoneSem); ++ } ++ ++ virtual void ++ MessageReceived(BMessage* message) ++ { ++ switch (message->what) { ++ case kMessageCancel: ++ case kMessageOk: ++ fResult = message->what == kMessageCancel ? B_CANCELED : B_OK; ++ release_sem(fDoneSem); ++ return; ++ } ++ ++ BWindow::MessageReceived(message); ++ } ++ ++ status_t ++ WaitForDialog(BString& networkName, uint32& authMode, BString& password) ++ { ++ fConfigView->SetUp(networkName, authMode, password); ++ ++ CenterOnScreen(); ++ Show(); ++ ++ while (acquire_sem(fDoneSem) == B_INTERRUPTED); ++ ++ status_t result = fResult; ++ fConfigView->Complete(networkName, authMode, password); ++ ++ LockLooper(); ++ Quit(); ++ return result; ++ } ++ ++private: ++ WirelessConfigView* fConfigView; ++ sem_id fDoneSem; ++ status_t fResult; ++}; ++ ++ ++status_t ++wireless_config_dialog(BString& networkName, uint32& authMode, ++ BString& password) ++{ ++ WirelessConfigWindow* configWindow ++ = new(std::nothrow) WirelessConfigWindow(BRect(100, 100, 200, 200)); ++ if (configWindow == NULL) ++ return B_NO_MEMORY; ++ ++ return configWindow->WaitForDialog(networkName, authMode, password); ++} +diff -urN wpa_supplicant-0.7.3/wpa_supplicant/WirelessConfigDialog.h wpa_supplicant-0.7.3-haiku/wpa_supplicant/WirelessConfigDialog.h +--- wpa_supplicant-0.7.3/wpa_supplicant/WirelessConfigDialog.h 1970-01-01 01:00:00.000000000 +0100 ++++ wpa_supplicant-0.7.3-haiku/wpa_supplicant/WirelessConfigDialog.h 2011-09-27 02:07:06.396099584 +0200 +@@ -0,0 +1,2 @@ ++status_t wireless_config_dialog(BString& networkName, uint32& authMode, ++ BString& password); +diff -urN wpa_supplicant-0.7.3/wpa_supplicant/bss.c wpa_supplicant-0.7.3-haiku/wpa_supplicant/bss.c +--- wpa_supplicant-0.7.3/wpa_supplicant/bss.c 2010-09-07 17:43:39.017563648 +0200 ++++ wpa_supplicant-0.7.3-haiku/wpa_supplicant/bss.c 2011-07-02 18:17:31.991166464 +0200 +@@ -147,7 +147,7 @@ + static int are_ies_equal(const struct wpa_bss *old, + const struct wpa_scan_res *new, u32 ie) + { +- const u8 *old_ie, *new_ie; ++ const u8 *old_ie = NULL, *new_ie = NULL; + struct wpabuf *old_ie_buff = NULL; + struct wpabuf *new_ie_buff = NULL; + int new_ie_len, old_ie_len, ret, is_multi; +diff -urN wpa_supplicant-0.7.3/wpa_supplicant/config.c wpa_supplicant-0.7.3-haiku/wpa_supplicant/config.c +--- wpa_supplicant-0.7.3/wpa_supplicant/config.c 2010-09-07 17:43:39.025690112 +0200 ++++ wpa_supplicant-0.7.3-haiku/wpa_supplicant/config.c 2011-09-27 19:01:24.422838272 +0200 +@@ -1876,6 +1876,7 @@ + } + + ++#ifndef NO_CONFIG_WRITE + /** + * wpa_config_get_all - Get all options from network configuration + * @ssid: Pointer to network configuration data +@@ -1935,7 +1936,6 @@ + } + + +-#ifndef NO_CONFIG_WRITE + /** + * wpa_config_get - Get a variable in network configuration + * @ssid: Pointer to network configuration data +diff -urN wpa_supplicant-0.7.3/wpa_supplicant/main_haiku.cpp wpa_supplicant-0.7.3-haiku/wpa_supplicant/main_haiku.cpp +--- wpa_supplicant-0.7.3/wpa_supplicant/main_haiku.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ wpa_supplicant-0.7.3-haiku/wpa_supplicant/main_haiku.cpp 2011-10-06 11:48:00.422051840 +0200 +@@ -0,0 +1,750 @@ ++/* ++ * WPA Supplicant / Haiku entrypoint ++ * Copyright (c) 2011, Michael Lotz ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Alternatively, this software may be distributed under the terms of BSD ++ * license. ++ * ++ * See README and COPYING for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include "WirelessConfigDialog.h" ++#include "WPASupplicant.h" // private header currently inside Haiku ++ ++#include ++ ++extern "C" { ++#include "utils/includes.h" ++#include "utils/common.h" ++#include "utils/eloop.h" ++#include "common/defs.h" ++ ++#include "config.h" ++#include "notify.h" ++#include "notify_haiku.h" ++#include "wpa_supplicant_i.h" ++} ++ ++extern "C" { ++#include ++#include ++#include ++} ++ ++ ++static const uint32 kMsgJoinTimeout = 'jnto'; ++ ++ ++typedef bool (*StateChangeCallback)(const wpa_supplicant *interface, ++ BMessage *message, void *data); ++ ++ ++class StateChangeWatchingEntry { ++public: ++ StateChangeWatchingEntry( ++ const wpa_supplicant *interface, ++ StateChangeCallback callback, ++ void *data); ++ ++ bool Match(const wpa_supplicant *interface, ++ StateChangeCallback callback, ++ void *data); ++ ++ bool MessageReceived( ++ const wpa_supplicant *interface, ++ BMessage *message); ++ ++private: ++ const wpa_supplicant * fInterface; ++ StateChangeCallback fCallback; ++ void * fData; ++}; ++ ++ ++StateChangeWatchingEntry::StateChangeWatchingEntry( ++ const wpa_supplicant *interface, StateChangeCallback callback, void *data) ++ : ++ fInterface(interface), ++ fCallback(callback), ++ fData(data) ++{ ++} ++ ++ ++bool ++StateChangeWatchingEntry::Match(const wpa_supplicant *interface, ++ StateChangeCallback callback, void *data) ++{ ++ return fInterface == interface && fCallback == callback && fData == data; ++} ++ ++ ++bool ++StateChangeWatchingEntry::MessageReceived(const wpa_supplicant *interface, ++ BMessage *message) ++{ ++ if (interface != fInterface) ++ return false; ++ ++ return fCallback(interface, message, fData); ++} ++ ++ ++class WPASupplicantApp : public BApplication { ++public: ++ WPASupplicantApp(); ++virtual ~WPASupplicantApp(); ++ ++ status_t InitCheck(); ++ ++virtual void ReadyToRun(); ++virtual void MessageReceived(BMessage *message); ++ ++ status_t RunSupplicantInMainThread(); ++ ++private: ++static int32 _SupplicantThread(void *data); ++static void _EventLoopProcessEvents(int sock, ++ void *eventLoopContext, void *data); ++ ++ status_t _EnqueueAndNotify(BMessage *message); ++ status_t _NotifyEventLoop(); ++ ++ status_t _JoinNetwork(BMessage *message); ++ status_t _LeaveNetwork(BMessage *message); ++ ++ status_t _NotifyNetworkEvent(BMessage *message); ++ ++static bool _InterfaceStateChangeCallback( ++ const wpa_supplicant *interface, ++ BMessage *message, void *data); ++ ++ status_t _StartWatchingInterfaceChanges( ++ const wpa_supplicant *interface, ++ StateChangeCallback callback, void *data); ++ status_t _StopWatchingInterfaceChanges( ++ const wpa_supplicant *interface, ++ StateChangeCallback callback, void *data); ++ void _NotifyInterfaceStateChanged(BMessage *message); ++ ++ status_t fInitStatus; ++ thread_id fSupplicantThread; ++ BMessageQueue fEventQueue; ++ ++ int fNotifySockets[2]; ++ ++ BObjectList ++ fWatchingEntryList; ++ BLocker fWatchingEntryListLocker; ++ ++ wpa_global * fWPAGlobal; ++ wpa_params fWPAParameters; ++}; ++ ++ ++WPASupplicantApp::WPASupplicantApp() ++ : ++ BApplication(kWPASupplicantSignature), ++ fInitStatus(B_NO_INIT), ++ fSupplicantThread(-1), ++ fWPAGlobal(NULL) ++{ ++ fNotifySockets[0] = fNotifySockets[1] = -1; ++ ++ fInitStatus = BApplication::InitCheck(); ++ if (fInitStatus != B_OK) ++ return; ++ ++ memset(&fWPAParameters, 0, sizeof(fWPAParameters)); ++ //fWPAParameters.wpa_debug_level = MSG_DEBUG; ++ ++ fWPAGlobal = wpa_supplicant_init(&fWPAParameters); ++ if (fWPAGlobal == NULL) { ++ fInitStatus = B_ERROR; ++ return; ++ } ++ ++ if (socketpair(AF_LOCAL, SOCK_STREAM, 0, fNotifySockets) != 0) { ++ fInitStatus = errno; ++ return; ++ } ++} ++ ++ ++WPASupplicantApp::~WPASupplicantApp() ++{ ++ if (fWPAGlobal == NULL) ++ return; ++ ++ wpa_supplicant_terminate_proc(fWPAGlobal); ++ ++ // Wake the event loop up so it'll process the quit request and exit. ++ _NotifyEventLoop(); ++ ++ int32 result; ++ wait_for_thread(fSupplicantThread, &result); ++ ++ wpa_supplicant_deinit(fWPAGlobal); ++ ++ close(fNotifySockets[0]); ++ close(fNotifySockets[1]); ++} ++ ++ ++status_t ++WPASupplicantApp::InitCheck() ++{ ++ return fInitStatus; ++} ++ ++ ++void ++WPASupplicantApp::ReadyToRun() ++{ ++ fSupplicantThread = spawn_thread(_SupplicantThread, ++ "wpa_supplicant thread", B_NORMAL_PRIORITY, this); ++ if (fSupplicantThread < 0 || resume_thread(fSupplicantThread)) ++ PostMessage(B_QUIT_REQUESTED); ++} ++ ++ ++void ++WPASupplicantApp::MessageReceived(BMessage *message) ++{ ++ switch (message->what) { ++ case kMsgWPAJoinNetwork: ++ { ++ uint32 authMode = B_NETWORK_AUTHENTICATION_NONE; ++ status_t status = message->FindUInt32("authentication", &authMode); ++ if (status != B_OK || !message->HasString("name") ++ || (authMode > B_NETWORK_AUTHENTICATION_NONE ++ && !message->HasString("password"))) { ++ ++ BString password = message->FindString("password"); ++ BString networkName = message->FindString("name"); ++ ++ status = wireless_config_dialog(networkName, authMode, ++ password); ++ if (status != B_OK) { ++ BMessage reply; ++ reply.AddInt32("status", status); ++ message->SendReply(&reply); ++ return; ++ } ++ ++ message->RemoveName("authentication"); ++ message->AddUInt32("authentication", authMode); ++ message->RemoveName("password"); ++ message->AddString("password", password); ++ message->RemoveName("name"); ++ message->AddString("name", networkName); ++ } ++ ++ _EnqueueAndNotify(DetachCurrentMessage()); ++ // The event processing code will send the reply. ++ return; ++ } ++ ++ case kMsgWPALeaveNetwork: ++ { ++ _EnqueueAndNotify(DetachCurrentMessage()); ++ // The event processing code will send the reply. ++ return; ++ } ++ ++ case B_NETWORK_MONITOR: ++ { ++ _EnqueueAndNotify(DetachCurrentMessage()); ++ return; ++ } ++ ++ case kMsgSupplicantStateChanged: ++ { ++ _NotifyInterfaceStateChanged(message); ++ return; ++ } ++ ++ case kMsgJoinTimeout: ++ { ++ const wpa_supplicant *interface; ++ if (message->FindPointer("interface", (void **)&interface) != B_OK) ++ return; ++ ++ StateChangeCallback callback; ++ if (message->FindPointer("callback", (void **)&callback) != B_OK) ++ return; ++ ++ void *data; ++ if (message->FindPointer("data", (void **)&data) != B_OK) ++ return; ++ ++ if (_StopWatchingInterfaceChanges(interface, callback, data) ++ == B_OK) { ++ // The watch entry was still there, so no reply has been sent ++ // yet. We do that now by calling the callback with the timeout ++ // message. ++ callback(interface, message, data); ++ } ++ ++ return; ++ } ++ } ++ ++ BApplication::MessageReceived(message); ++} ++ ++ ++int32 ++WPASupplicantApp::_SupplicantThread(void *data) ++{ ++ WPASupplicantApp *app = (WPASupplicantApp *)data; ++ ++ // Register our notify socket with the polling event loop. ++ if (eloop_register_read_sock(app->fNotifySockets[0], ++ _EventLoopProcessEvents, app->fWPAGlobal, app) != 0) { ++ return B_ERROR; ++ } ++ ++ wpa_supplicant_run(app->fWPAGlobal); ++ ++ eloop_unregister_read_sock(app->fNotifySockets[0]); ++ ++ // There are two reasons why the supplicant thread quit: ++ // 1. The event loop was terminated because of a signal or error and the ++ // application is still there and running. ++ // 2. The app has quit and stopped the event loop. ++ // ++ // In case of 2. we're done, but in case of 1. we need to quit the still ++ // running application. We use the app messenger to reach the app if it is ++ // still running. If it already quit the SendMessage() will simply fail. ++ ++ be_app_messenger.SendMessage(B_QUIT_REQUESTED); ++ return B_OK; ++} ++ ++ ++status_t ++WPASupplicantApp::_EnqueueAndNotify(BMessage *message) ++{ ++ if (!fEventQueue.Lock()) ++ return B_ERROR; ++ ++ fEventQueue.AddMessage(message); ++ fEventQueue.Unlock(); ++ ++ return _NotifyEventLoop(); ++} ++ ++ ++status_t ++WPASupplicantApp::_NotifyEventLoop() ++{ ++ // This will interrupt the event loop and cause the message queue to be ++ // processed through the installed handler. ++ uint8 byte = 0; ++ ssize_t written = write(fNotifySockets[1], &byte, sizeof(byte)); ++ if (written < 0) ++ return written; ++ ++ return written == sizeof(byte) ? B_OK : B_ERROR; ++} ++ ++ ++void ++WPASupplicantApp::_EventLoopProcessEvents(int sock, void *eventLoopContext, ++ void *data) ++{ ++ // This function is called from the event loop only. ++ ++ WPASupplicantApp *app = (WPASupplicantApp *)data; ++ ++ uint8 bytes[25]; ++ read(app->fNotifySockets[0], bytes, sizeof(bytes)); ++ // discard them, they are just here to wake the event loop ++ ++ BMessageQueue &queue = app->fEventQueue; ++ if (!queue.Lock()) ++ return; ++ ++ while (true) { ++ BMessage *message = queue.FindMessage((int32)0); ++ if (message == NULL) ++ break; ++ ++ queue.RemoveMessage(message); ++ ++ bool needsReply = false; ++ bool deleteMessage = true; ++ status_t status = B_MESSAGE_NOT_UNDERSTOOD; ++ switch (message->what) { ++ case kMsgWPAJoinNetwork: ++ status = app->_JoinNetwork(message); ++ needsReply = status != B_OK; ++ deleteMessage = needsReply; ++ break; ++ ++ case kMsgWPALeaveNetwork: ++ status = app->_LeaveNetwork(message); ++ needsReply = status != B_OK; ++ deleteMessage = needsReply; ++ break; ++ ++ case B_NETWORK_MONITOR: ++ app->_NotifyNetworkEvent(message); ++ break; ++ } ++ ++ if (needsReply) { ++ BMessage reply; ++ reply.AddInt32("status", status); ++ message->SendReply(&reply); ++ } ++ ++ if (deleteMessage) ++ delete message; ++ } ++ ++ queue.Unlock(); ++} ++ ++ ++status_t ++WPASupplicantApp::_JoinNetwork(BMessage *message) ++{ ++ const char *interfaceName = NULL; ++ status_t status = message->FindString("device", &interfaceName); ++ if (status != B_OK) ++ return status; ++ ++ // Check if we already registered this interface. ++ wpa_supplicant *interface = wpa_supplicant_get_iface(fWPAGlobal, ++ interfaceName); ++ if (interface == NULL) { ++ wpa_interface interfaceOptions; ++ memset(&interfaceOptions, 0, sizeof(wpa_interface)); ++ ++ interfaceOptions.ifname = interfaceName; ++ ++ interface = wpa_supplicant_add_iface(fWPAGlobal, &interfaceOptions); ++ if (interface == NULL) ++ return B_NO_MEMORY; ++ } else { ++ // Disable everything ++ wpa_supplicant_disable_network(interface, NULL); ++ ++ // Try to remove any previous network ++ wpa_ssid *network = wpa_config_get_network(interface->conf, 0); ++ if (network != NULL) { ++ wpas_notify_network_removed(interface, network); ++ wpa_config_remove_network(interface->conf, network->id); ++ } ++ } ++ ++ const char *networkName = NULL; ++ status = message->FindString("name", &networkName); ++ if (status != B_OK) ++ return status; ++ ++ uint32 authMode = B_NETWORK_AUTHENTICATION_NONE; ++ status = message->FindUInt32("authentication", &authMode); ++ if (status != B_OK) ++ return status; ++ ++ const char *password = NULL; ++ if (authMode > B_NETWORK_AUTHENTICATION_NONE) { ++ status = message->FindString("password", &password); ++ if (status != B_OK) ++ return status; ++ } ++ ++ wpa_ssid *network = wpa_config_add_network(interface->conf); ++ if (network == NULL) ++ return B_NO_MEMORY; ++ ++ wpas_notify_network_added(interface, network); ++ ++ network->disabled = 1; ++ wpa_config_set_network_defaults(network); ++ ++ // Fill in the info from the join request ++ ++ // The format includes the quotes ++ BString value; ++ value = "\""; ++ value += networkName; ++ value += "\""; ++ int result = wpa_config_set(network, "ssid", value.String(), 0); ++ ++ if (result == 0) ++ result = wpa_config_set(network, "scan_ssid", "1", 1); ++ ++ if (authMode >= B_NETWORK_AUTHENTICATION_WPA) { ++ if (result == 0) ++ result = wpa_config_set(network, "proto", "WPA RSN", 2); ++ if (result == 0) ++ result = wpa_config_set(network, "key_mgmt", "WPA-PSK", 3); ++ if (result == 0) ++ result = wpa_config_set(network, "pairwise", "CCMP TKIP NONE", 4); ++ if (result == 0) { ++ result = wpa_config_set(network, "group", ++ "CCMP TKIP WEP104 WEP40", 5); ++ } ++ } else { ++ // Open or WEP. ++ if (result == 0) ++ result = wpa_config_set(network, "key_mgmt", "NONE", 6); ++ } ++ ++ if (result == 0) { ++ if (authMode == B_NETWORK_AUTHENTICATION_WEP) { ++ if (strncmp("0x", password, 2) == 0) { ++ // interpret as hex key ++ // TODO: make this non-ambiguous ++ result = wpa_config_set(network, "wep_key0", password + 2, 7); ++ } else { ++ value = "\""; ++ value += password; ++ value += "\""; ++ result = wpa_config_set(network, "wep_key0", value.String(), 8); ++ } ++ ++ if (result == 0) ++ result = wpa_config_set(network, "wep_tx_keyidx", "0", 9); ++ } else if (authMode >= B_NETWORK_AUTHENTICATION_WPA) { ++ // WPA/WPA2 ++ value = "\""; ++ value += password; ++ value += "\""; ++ result = wpa_config_set(network, "psk", value.String(), 10); ++ ++ if (result == 0) { ++ // We need to actually "apply" the PSK ++ wpa_config_update_psk(network); ++ } ++ } ++ } ++ ++ if (result != 0) { ++ wpas_notify_network_removed(interface, network); ++ wpa_config_remove_network(interface->conf, network->id); ++ return B_ERROR; ++ } ++ ++ // Set up watching for the completion event ++ _StartWatchingInterfaceChanges(interface, _InterfaceStateChangeCallback, ++ message); ++ ++ // Now attempt to connect ++ wpa_supplicant_select_network(interface, network); ++ ++ // Use a message runner to return a timeout and stop watching after a while ++ BMessage timeout(kMsgJoinTimeout); ++ timeout.AddPointer("interface", interface); ++ timeout.AddPointer("callback", (void *)_InterfaceStateChangeCallback); ++ timeout.AddPointer("data", message); ++ ++ BMessageRunner::StartSending(be_app_messenger, &timeout, ++ 15 * 1000 * 1000, 1); ++ ++ return B_OK; ++} ++ ++ ++status_t ++WPASupplicantApp::_LeaveNetwork(BMessage *message) ++{ ++ const char *interfaceName = NULL; ++ status_t status = message->FindString("device", &interfaceName); ++ if (status != B_OK) ++ return status; ++ ++ wpa_supplicant *interface = wpa_supplicant_get_iface(fWPAGlobal, ++ interfaceName); ++ if (interface == NULL) ++ return B_ENTRY_NOT_FOUND; ++ ++ if (wpa_supplicant_remove_iface(fWPAGlobal, interface) != 0) ++ return B_ERROR; ++ ++ return B_OK; ++} ++ ++ ++status_t ++WPASupplicantApp::_NotifyNetworkEvent(BMessage *message) ++{ ++ // Verify that the interface is still there. ++ BString interfaceName; ++ if (message->FindString("interface", &interfaceName) != B_OK) ++ return B_ERROR; ++ ++ interfaceName.Prepend("/dev/"); ++ wpa_supplicant *interface = wpa_supplicant_get_iface(fWPAGlobal, ++ interfaceName.String()); ++ if (interface == NULL) ++ return B_ENTRY_NOT_FOUND; ++ ++ void (*callback)(void *context, void *data, int opcode) = NULL; ++ status_t result = message->FindPointer("callback", (void **)&callback); ++ if (result != B_OK) ++ return result; ++ ++ void *context = NULL; ++ result = message->FindPointer("context", &context); ++ if (result != B_OK) ++ return result; ++ ++ void *data = NULL; ++ message->FindPointer("data", &data); ++ ++ callback(context, data, message->FindInt32("opcode")); ++ return B_OK; ++} ++ ++ ++bool ++WPASupplicantApp::_InterfaceStateChangeCallback(const wpa_supplicant *interface, ++ BMessage *message, void *data) ++{ ++ // We wait for the completion state notification ++ // TODO: We should also use the disconnect as an error case when joining, ++ // but due to the event queue being serialized any disconnect happening ++ // due to a new connect attempt would trigger that state. Either we need ++ // to have the disconnect happen synchronously before joining again or ++ // we need a way to discern one disconnect from the other, for example if ++ // there was a way to tell from which network we disconnected. ++ ++ BMessage *originalMessage = (BMessage *)data; ++ ++ int32 newState; ++ status_t result = B_ERROR; ++ if (message->what == kMsgJoinTimeout) ++ result = B_TIMED_OUT; ++ else if (message->FindInt32("newState", &newState) == B_OK) { ++ switch (newState) { ++ case WPA_COMPLETED: ++ { ++ if (originalMessage->what != kMsgWPAJoinNetwork) ++ return false; ++ ++ result = B_OK; ++ break; ++ } ++ ++ case WPA_DISCONNECTED: ++ { ++ if (originalMessage->what != kMsgWPALeaveNetwork) ++ return false; ++ ++ result = B_OK; ++ break; ++ } ++ ++ default: ++ return false; ++ } ++ } ++ ++ BMessage reply; ++ reply.AddInt32("status", result); ++ originalMessage->SendReply(&reply); ++ delete originalMessage; ++ return true; ++} ++ ++ ++status_t ++WPASupplicantApp::_StartWatchingInterfaceChanges( ++ const wpa_supplicant *interface, StateChangeCallback callback, void *data) ++{ ++ StateChangeWatchingEntry *entry ++ = new(std::nothrow) StateChangeWatchingEntry(interface, callback, data); ++ if (entry == NULL) ++ return B_NO_MEMORY; ++ ++ if (!fWatchingEntryListLocker.Lock()) { ++ delete entry; ++ return B_ERROR; ++ } ++ ++ status_t result = B_OK; ++ if (!fWatchingEntryList.AddItem(entry)) { ++ result = B_ERROR; ++ delete entry; ++ } ++ ++ fWatchingEntryListLocker.Unlock(); ++ return result; ++} ++ ++ ++status_t ++WPASupplicantApp::_StopWatchingInterfaceChanges( ++ const wpa_supplicant *interface, StateChangeCallback callback, void *data) ++{ ++ if (!fWatchingEntryListLocker.Lock()) ++ return B_ERROR; ++ ++ bool found = false; ++ for (int32 i = 0; i < fWatchingEntryList.CountItems(); i++) { ++ if (fWatchingEntryList.ItemAt(i)->Match(interface, callback, data)) { ++ delete fWatchingEntryList.RemoveItemAt(i); ++ found = true; ++ i--; ++ } ++ } ++ ++ fWatchingEntryListLocker.Unlock(); ++ return found ? B_OK : B_ENTRY_NOT_FOUND; ++} ++ ++ ++void ++WPASupplicantApp::_NotifyInterfaceStateChanged(BMessage *message) ++{ ++ const wpa_supplicant *interface; ++ if (message->FindPointer("interface", (void **)&interface) != B_OK) ++ return; ++ ++ if (!fWatchingEntryListLocker.Lock()) ++ return; ++ ++ for (int32 i = 0; i < fWatchingEntryList.CountItems(); i++) { ++ StateChangeWatchingEntry *entry = fWatchingEntryList.ItemAt(i); ++ if (entry->MessageReceived(interface, message)) { ++ delete fWatchingEntryList.RemoveItemAt(i); ++ i--; ++ } ++ } ++ ++ fWatchingEntryListLocker.Unlock(); ++} ++ ++ ++int ++main(int argc, char *argv[]) ++{ ++ WPASupplicantApp *app = new(std::nothrow) WPASupplicantApp(); ++ if (app == NULL) ++ return B_NO_MEMORY; ++ if (app->InitCheck() != B_OK) ++ return app->InitCheck(); ++ ++ app->Run(); ++ delete app; ++ return 0; ++} +diff -urN wpa_supplicant-0.7.3/wpa_supplicant/notify.c wpa_supplicant-0.7.3-haiku/wpa_supplicant/notify.c +--- wpa_supplicant-0.7.3/wpa_supplicant/notify.c 2010-09-07 17:43:39.032768000 +0200 ++++ wpa_supplicant-0.7.3-haiku/wpa_supplicant/notify.c 2011-10-05 21:46:35.427032576 +0200 +@@ -26,6 +26,10 @@ + #include "scan.h" + #include "notify.h" + ++#ifdef __HAIKU__ ++#include "notify_haiku.h" ++#endif ++ + int wpas_notify_supplicant_initialized(struct wpa_global *global) + { + #ifdef CONFIG_DBUS +@@ -81,6 +85,10 @@ + + /* notify the new DBus API */ + wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_STATE); ++ ++#ifdef __HAIKU__ ++ wpa_supplicant_haiku_notify_state_change(wpa_s, new_state, old_state); ++#endif + } + + +diff -urN wpa_supplicant-0.7.3/wpa_supplicant/notify_haiku.cpp wpa_supplicant-0.7.3-haiku/wpa_supplicant/notify_haiku.cpp +--- wpa_supplicant-0.7.3/wpa_supplicant/notify_haiku.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ wpa_supplicant-0.7.3-haiku/wpa_supplicant/notify_haiku.cpp 2011-10-06 00:35:25.644874240 +0200 +@@ -0,0 +1,37 @@ ++/* ++ * WPA Supplicant / Haiku notification functions ++ * Copyright (c) 2011, Michael Lotz ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Alternatively, this software may be distributed under the terms of BSD ++ * license. ++ * ++ * See README and COPYING for more details. ++ */ ++ ++extern "C" { ++#include "utils/includes.h" ++#include "utils/common.h" ++#include "common/defs.h" ++#include "config.h" ++ ++#include "notify_haiku.h" ++} ++ ++#include ++#include ++ ++ ++void ++wpa_supplicant_haiku_notify_state_change(struct wpa_supplicant *wpa_s, ++ enum wpa_states new_state, enum wpa_states old_state) ++{ ++ BMessage message(kMsgSupplicantStateChanged); ++ message.AddPointer("interface", wpa_s); ++ message.AddInt32("oldState", old_state); ++ message.AddInt32("newState", new_state); ++ be_app->PostMessage(&message); ++} +diff -urN wpa_supplicant-0.7.3/wpa_supplicant/notify_haiku.h wpa_supplicant-0.7.3-haiku/wpa_supplicant/notify_haiku.h +--- wpa_supplicant-0.7.3/wpa_supplicant/notify_haiku.h 1970-01-01 01:00:00.000000000 +0100 ++++ wpa_supplicant-0.7.3-haiku/wpa_supplicant/notify_haiku.h 2011-10-06 00:43:14.880541696 +0200 +@@ -0,0 +1,26 @@ ++/* ++ * WPA Supplicant / Haiku notification functions ++ * Copyright (c) 2011, Michael Lotz ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Alternatively, this software may be distributed under the terms of BSD ++ * license. ++ * ++ * See README and COPYING for more details. ++ */ ++ ++#ifndef NOTIFY_HAIKU_H ++#define NOTIFY_HAIKU_H ++ ++static const uint32_t kMsgSupplicantStateChanged = 'stch'; ++ ++struct wpa_supplicant; ++enum wpa_states; ++ ++void wpa_supplicant_haiku_notify_state_change(struct wpa_supplicant *wpa_s, ++ enum wpa_states new_state, enum wpa_states old_state); ++ ++#endif +diff -urN wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.rdef wpa_supplicant-0.7.3-haiku/wpa_supplicant/wpa_supplicant.rdef +--- wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.rdef 1970-01-01 01:00:00.000000000 +0100 ++++ wpa_supplicant-0.7.3-haiku/wpa_supplicant/wpa_supplicant.rdef 2011-07-02 23:08:16.688652288 +0200 +@@ -0,0 +1,15 @@ ++resource app_signature "application/x-vnd.malinen-wpa_supplicant"; ++ ++resource app_flags B_EXCLUSIVE_LAUNCH | B_BACKGROUND_APP; ++ ++resource app_version { ++ major = 0, ++ middle = 7, ++ minor = 3, ++ ++ variety = B_APPV_DEVELOPMENT, ++ internal = 0, ++ ++ short_info = "wpa_supplicant", ++ long_info = "wpa_supplicant © 2003-2010, Jouni Malinen " ++}; diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.bep b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.bep new file mode 100644 index 000000000..ac9dcb041 --- /dev/null +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.bep @@ -0,0 +1,19 @@ +DESCRIPTION="A WPA Supplicant with support for WPA and WPA2." +HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" +SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-0.7.3.tar.gz" +CHECKSUM_MD5="f516f191384a9a546e3f5145c08addda" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd wpa_supplicant-0.7.3/wpa_supplicant + CFLAGS="-MMD -O2 -Wall" make wpa_supplicant +} +INSTALL { + cd wpa_supplicant-0.7.3/wpa_supplicant + mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` + cp -v wpa_supplicant ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/ +} +LICENSE="BSD (2-clause) + GNU GPL v2" +COPYRIGHT="2003-2010 Jouni Malinen" diff --git a/packs/libpak/libpak-0.9.4-gcc2.bep b/packs/libpak/libpak-0.9.4-gcc2.bep new file mode 100644 index 000000000..d105198fa --- /dev/null +++ b/packs/libpak/libpak-0.9.4-gcc2.bep @@ -0,0 +1,138 @@ +DESCRIPTION="Libpak is a set of commonly used libraries." +HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" +SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libedit >= 20100424 + dev-util/cmake >= 2.6 + dev-util/gperf >= 3.0.4 + dev-vcs/git >= 1.7.1 + dev-vcs/mercurial >= 1.6 + sys-devel/gettext >= 0.17" + +CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" +BUILD { + HPLOC=`haikuporter -t` + mkdir -p ../zips + mkdir -p ../sources + export HAIKUVERSION="r1a3" + cd libpak-0.9.4 + +## these are needed for building package in the libpak + haikuporter -i -d -y dos2unix + mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips + haikuporter -i -d -y pkgconfig-0.25 + mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips +## + haikuporter -y -d -i readline-6.2 + mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i lua-5.1.4-3 + mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i fribidi-0.19.2 + mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libpaper-1.1.24 + mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -c -d -i flac-1.2.1 + mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips + +#b haikuporter -y -c -d -i speex-1.2-git +#b mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmng-1.0.10 + mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libart_lgpl-2.3.21 + mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i lcms-2.1 + mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmad-0.15.1b + mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libao-1.0.0 + mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmodplug-0.8.8.1 + mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmikmod-3.1.11 + mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libogg-1.2.2 + mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libtheora-1.1.1 + mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libvorbis-1.3.2 + mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i vorbis-tools-1.4.0 + mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i physfs-2.0.1 + mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libevent-1.4.13 + mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libsdl-1.2.14 + mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-gfx-2.0.22 + mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-ttf-2.0.10 + mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-image-1.2.10 + mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sge-030809 + mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i smjpeg-0.2.1 + mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i smpeg-0.4.5 + mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i guilib-1.2.1 + mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-net-1.2.7 + mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-mixer-1.2.11 + mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-sound-1.0.3 + mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i allegro-4.4.1.1 + mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i dumb-0.9.3 + mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips + +#b haikuporter -y -d -i jgmod-0.99 +#b mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips +} + +INSTALL { + cd libpak-0.9.4 + cd . + echo "Done. Zipped files are in the zips directory." + echo "GPL/LGPL sources are in the source directory." + #No need to install these, + #just put all the zips into the zips directory for uploading + #For GPL/LGPL software also create the patches sources .xz archives +} + +#LICENSE="" +#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.4-gcc4.bep b/packs/libpak/libpak-0.9.4-gcc4.bep new file mode 100644 index 000000000..c6d34055c --- /dev/null +++ b/packs/libpak/libpak-0.9.4-gcc4.bep @@ -0,0 +1,145 @@ +DESCRIPTION="Libpak is a set of commonly used libraries." +HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" +SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libedit >= 20100424 + dev-util/cmake >= 2.6 + dev-util/gperf >= 3.0.4 + dev-vcs/git >= 1.7.1 + dev-vcs/mercurial >= 1.6 + sys-devel/gettext >= 0.17" + +CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" +BUILD { + HPLOC=`haikuporter -t` + mkdir -p ../zips + mkdir -p ../sources + export HAIKUVERSION="r1a3" + cd libpak-0.9.4 + +## these are needed for building package in the libpak + haikuporter -i -d -y dos2unix + mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips + haikuporter -i -d -y pkgconfig-0.25 + mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips +## + haikuporter -y -d -i readline-6.2 + mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i lua-5.1.4-3 + mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i fribidi-0.19.2 + mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libpaper-1.1.24 + mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -c -d -i flac-1.2.1 + mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips + +#b haikuporter -y -c -d -i speex-1.2rc1 +#b mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmng-1.0.10 + mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libart_lgpl-2.3.21 + mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i lcms-2.1 + mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmad-0.15.1b + mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libao-1.0.0 + mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmodplug-0.8.8.1 + mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmikmod-3.1.11 + mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libogg-1.2.2 + mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libtheora-1.1.1 + mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libvorbis-1.3.2 + mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i vorbis-tools-1.4.0 + mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips + +#b haikuporter -y -c -d -i physfs-2.0.1 +#b mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libevent-2.0.10 + mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libsdl-1.2.14 + mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-gfx-2.0.22 + mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-ttf-2.0.10 + mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-image-1.2.10 + mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sge-030809 + mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i smjpeg-0.2.1 + mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i smpeg-0.4.5 + mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i guilib-1.2.1 + mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-net-1.2.7 + mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-mixer-1.2.11 + mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-sound-1.0.3 + mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i allegro-4.4.1.1 + mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i dumb-0.9.3 + mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i jgmod-0.99 + mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -c -y -d -i box2d-2.1.2 + mv ${HPLOC}/dev-games/box2d/*.zip ${HPLOC}/packs/libpak/zips + +## these don't build correctly yet +## haikuporter -y -d -i fblend-0.4 +## mv ${HPLOC}/media-libs/fblend/*.zip ${HPLOC}/packs/libpak/zips +} + +INSTALL { + cd libpak-0.9.4 + cd . + echo "Done. Zipped files are in the zips directory." + echo "GPL/LGPL sources are in the source directory." + #No need to install these, + #just put all the zips into the zips directory for uploading + #For GPL/LGPL software also create the patches sources .xz archives +} + +#LICENSE="" +#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.5-gcc2.bep b/packs/libpak/libpak-0.9.5-gcc2.bep new file mode 100644 index 000000000..a6c22aa88 --- /dev/null +++ b/packs/libpak/libpak-0.9.5-gcc2.bep @@ -0,0 +1,141 @@ +DESCRIPTION="Libpak is a set of commonly used libraries." +HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" +SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libedit >= 20100424 + dev-util/cmake >= 2.6 + dev-util/gperf >= 3.0.4 + dev-vcs/git >= 1.7.1 + dev-vcs/mercurial >= 1.6 + sys-devel/gettext >= 0.17" + +CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" +BUILD { + HPLOC=`haikuporter -t` + mkdir -p ../zips + mkdir -p ../sources + export HAIKUVERSION="r1a4" + cd libpak-0.9.5 + +## these are needed for building package in the libpak + haikuporter -i -d -y dos2unix + mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips + haikuporter -i -d -y pkgconfig-0.25 + mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips +## + haikuporter -y -d -i readline-6.2 + mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i lua-5.1.4-3 + mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i fribidi-0.19.2 + mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libpaper-1.1.24 + mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -c -d -i flac-1.2.1 + mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -c -d -i speex-1.2rc1 + mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmng-1.0.10 + mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libart_lgpl-2.3.21 + mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i lcms-2.1 + mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmad-0.15.1b + mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libao-1.0.0 + mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmodplug-0.8.8.1 + mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmikmod-3.1.11 + mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -c -d -i libogg-1.3.0 + mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -c -d -i libvorbis-1.3.2 + mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -c -d -i libtheora-1.1.1 + mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i vorbis-tools-1.4.0 + mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i physfs-2.0.1 + mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libevent-1.4.13 + mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libsdl-1.2.14 + mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-gfx-2.0.22 + mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-ttf-2.0.10 + mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-image-1.2.10 + mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sge-030809 + mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i smjpeg-0.2.1 + mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i smpeg-0.4.5 + mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i guilib-1.2.1 + mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-net-1.2.7 + mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-mixer-1.2.11 + mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-sound-1.0.3 + mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i allegro-4.4.1.1 + mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i dumb-0.9.3 + mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips + +#b haikuporter -y -d -i jgmod-0.99 +#b mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -c -d -i ffmpeg-0.10 + mv ${HPLOC}/media-video/ffmpeg/*.zip ${HPLOC}/packs/libpak/zips +} + +INSTALL { + cd libpak-0.9.5 + cd . + echo "Done. Zipped files are in the zips directory." + echo "GPL/LGPL sources are in the source directory." + #No need to install these, + #just put all the zips into the zips directory for uploading + #For GPL/LGPL software also create the patches sources .xz archives +} + +#LICENSE="" +#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.6-gcc2.bep b/packs/libpak/libpak-0.9.6-gcc2.bep new file mode 100644 index 000000000..4355acd4e --- /dev/null +++ b/packs/libpak/libpak-0.9.6-gcc2.bep @@ -0,0 +1,150 @@ +DESCRIPTION="Libpak is a set of commonly used libraries." +HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" +SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libedit >= 20100424 + dev-util/cmake >= 2.6 + dev-util/gperf >= 3.0.4 + dev-vcs/git >= 1.7.1 + dev-vcs/mercurial >= 1.6 + sys-devel/gettext >= 0.17" + +CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" +BUILD { + HPLOC=`haikuporter -t` + mkdir -p ../zips + mkdir -p ../sources + export HAIKUVERSION="r1a4" + +## these are needed for building package in the libpak + haikuporter -i -d -y dos2unix + mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips + haikuporter -i -d -y pkgconfig-0.25 + mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips +## + haikuporter -y -d -i readline-6.2 + mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i jpeg-8d + mv ${HPLOC}/media-libs/jpeg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libpng-1.5.12 + mv ${HPLOC}/media-libs/libpng/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i lua-5.1.4-3 + mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i fribidi-0.19.2 + mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libpaper-1.1.24 + mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -c -d -i flac-1.2.1 + mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -c -d -i speex-1.2rc1 + mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmng-1.0.10 + mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libart_lgpl-2.3.21 + mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i lcms-2.1 + mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmad-0.15.1b + mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libao-1.0.0 + mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmodplug-0.8.8.4 + mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmikmod-3.1.11 + mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libogg-1.3.0 + mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libvorbis-1.3.2 + mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libtheora-1.1.1 + mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i vorbis-tools-1.4.0 + mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i physfs-2.0.1 + mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libevent-2.0.10 + mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i freetype-2.4.9 + mv ${HPLOC}/media-libs/freetype/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libsdl-1.2.15 + mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-gfx-2.0.23 + mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-ttf-2.0.11 + mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-image-1.2.12 + mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sge-030809 + mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i smjpeg-0.2.1 + mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i smpeg-0.4.5 + mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i guilib-1.2.1 + mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-net-1.2.8 + mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-mixer-1.2.11 + mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-sound-1.0.3 + mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips + +#b haikuporter -y -d -i allegro-4.4.1.1 +#b mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i dumb-0.9.3 + mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips + +#b haikuporter -y -d -i jgmod-0.99 +#b mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libvpx-1.0.0 + mv ${HPLOC}/media-libs/libvpx/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -c -d -i ffmpeg-0.10.2 + mv ${HPLOC}/media-video/ffmpeg/*.zip ${HPLOC}/packs/libpak/zips +} + +INSTALL { + echo "Done. Zipped files are in the zips directory." + echo "GPL/LGPL sources are in the source directory." + #No need to install these, + #just put all the zips into the zips directory for uploading + #For GPL/LGPL software also create the patches sources .xz archives +} + +#LICENSE="" +#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.6-gcc4.bep b/packs/libpak/libpak-0.9.6-gcc4.bep new file mode 100644 index 000000000..508433dc2 --- /dev/null +++ b/packs/libpak/libpak-0.9.6-gcc4.bep @@ -0,0 +1,157 @@ +DESCRIPTION="Libpak is a set of commonly used libraries." +HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" +SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libedit >= 20100424 + dev-util/cmake >= 2.6 + dev-util/gperf >= 3.0.4 + dev-vcs/git >= 1.7.1 + dev-vcs/mercurial >= 1.6 + sys-devel/gettext >= 0.17" + +CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" +BUILD { + HPLOC=`haikuporter -t` + mkdir -p ../zips + mkdir -p ../sources + export HAIKUVERSION="r1a4" + +## these are needed for building package in the libpak + haikuporter -i -d -y dos2unix + mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips + haikuporter -i -d -y pkgconfig-0.25 + mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips +## + haikuporter -y -d -i readline-6.2 + mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i jpeg-8d + mv ${HPLOC}/media-libs/jpeg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libpng-1.5.12 + mv ${HPLOC}/media-libs/libpng/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i lua-5.1.4-3 + mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i fribidi-0.19.2 + mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libpaper-1.1.24 + mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -c -d -i flac-1.2.1 + mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -c -d -i speex-1.2rc1 + mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmng-1.0.10 + mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libart_lgpl-2.3.21 + mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i lcms-2.1 + mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmad-0.15.1b + mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libao-1.0.0 + mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmodplug-0.8.8.4 + mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libmikmod-3.1.11 + mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libogg-1.3.0 + mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libvorbis-1.3.2 + mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libtheora-1.1.1 + mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i vorbis-tools-1.4.0 + mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips + +#b haikuporter -y -c -d -i physfs-2.0.1 +#b mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libevent-2.0.10 + mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i freetype-2.4.9 + mv ${HPLOC}/media-libs/freetype/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libsdl-1.2.15 + mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-gfx-2.0.23 + mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-ttf-2.0.11 + mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-image-1.2.12 + mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sge-030809 + mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i smjpeg-0.2.1 + mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i smpeg-0.4.5 + mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i guilib-1.2.1 + mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-net-1.2.8 + mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-mixer-1.2.11 + mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i sdl-sound-1.0.3 + mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips + +#b haikuporter -y -d -i allegro-4.4.1.1 +#b mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i dumb-0.9.3 + mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips + +#b haikuporter -y -d -i jgmod-0.99 +#b mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips + +#b haikuporter -c -y -d -i box2d-2.1.2 +#b mv ${HPLOC}/dev-games/box2d/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -d -i libvpx-1.0.0 + mv ${HPLOC}/media-libs/libvpx/*.zip ${HPLOC}/packs/libpak/zips + + haikuporter -y -c -d -i ffmpeg-0.10.2 + mv ${HPLOC}/media-video/ffmpeg/*.zip ${HPLOC}/packs/libpak/zips + +## these don't build correctly yet +## haikuporter -y -d -i fblend-0.4 +## mv ${HPLOC}/media-libs/fblend/*.zip ${HPLOC}/packs/libpak/zips +} + +INSTALL { + echo "Done. Zipped files are in the zips directory." + echo "GPL/LGPL sources are in the source directory." + #No need to install these, + #just put all the zips into the zips directory for uploading + #For GPL/LGPL software also create the patches sources .xz archives +} + +#LICENSE="" +#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.6-gcc2.bep b/packs/optionalpackages/optionalpackages-0.6-gcc2.bep new file mode 100644 index 000000000..946bdc58c --- /dev/null +++ b/packs/optionalpackages/optionalpackages-0.6-gcc2.bep @@ -0,0 +1,177 @@ +DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." +HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" +SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="gcc-2.95.3 + gcc-4.4.4" + +CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" +BUILD { + HPLOC=`haikuporter -t` + mkdir -p ../zips + mkdir -p ../sources + cd optionalpackages-0.5 + export HAIKUVERSION="r1a3" +## + +#w = works +#b = currently broken +#3 = 3rd party optional package, probably needs a .bep file + + setgcc gcc2 + +## Group 1 + haikuporter -i readline-6.2 + haikuporter -i libedit-20100424 + haikuporter -y -d -i autoconf-2.68 + mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i automake-1.11.1 + mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libtool-2.4 + mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i bison-2.4.3 + mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i m4-1.4.16 + mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i flex-2.5.35 + mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i jam-2.5 + mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i mkdepend-1.7 + mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i make-3.82 + mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i openssl-1.0.0d + mv ${HPLOC}/dev-libs/openssl/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d perl-5.10.1 + mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i cmake-2.8.4 + mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i yasm-1.1.0 + mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips + +## Group 2 + + haikuporter -y -d -i sed-4.2.1 + mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -c -d droid-113 + mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -c -d wqy-microhei-0.2.0-beta + mv ${HPLOC}/media-fonts/wqy-microhei/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -c -d -i mercurial-1.8.3 + mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i ABI-compliance-checker-1.12 + haikuporter -y -d -i apr-1.4.2 + mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i apr-util-1.3.10 + mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i sqlite-3.7.5 + mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d bzr-2.2.2 + mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i beae-22 + mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i Beam-1.2alpha +#3 haikuporter -y -d -i bebook_20081026 +#3 haikuporter -y -d -i BeHappy-1.0.6 +#3 haikuporter -y -d -i BePDF-1.1.1b3 +#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre + haikuporter -y -d -i burnitnow-39 + mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i bzip2-1.0.6 + mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i ccache-3.0.1 + mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i cdrtools-3.01a01 + mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libpcre-8.12 + mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i clockwerk-78 + mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i curl-7.21.6 + mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i cvs-1.12.13.1 + mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i subversion-1.6.15 + mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i texinfo-4.13a + mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i expat-2.0.1 + mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i fastdep-0.16 + mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i friss-0.5pre7 + haikuporter -y -d -i gettext-0.18.1.1 + mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i git-1.7.5 + mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i gperf-3.0.4 + mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i groff-1.20.1 + mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 + haikuporter -y -d -i libevent-2.0.10 + mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libiconv-1.13.1 + mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i liblayout-1.4.0 + haikuporter -y -d -i libmng-1.0.10 + mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libxml2-2.7.8 + mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libxslt-1.1.26 + mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i links + haikuporter -y -d -i man-1.6f + mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i nano-2.2.6 + mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i neon-0.29.6 + mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips +#b haikuporter -y -d -i netsurf-2.6 +#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i ocaml-3.11.1 +#3 haikuporter -y -d -i camlp5-5.12 +#b haikuporter -y -d -i opensound-4.2 +#b mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i openssh-5.8p2 + mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i p7zip-9.13 + mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i paladin-1.3 + mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i pe-2.4.3-600 + mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips +#b haikuporter -y -d python-2.7.1 +#b mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i rsync-3.0.7 + mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i ruby-1.9.1 + mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i tar-1.25 + mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i TimGMSoundFont +#3 haikuporter -y -d -i TrackerNewTemplates +#b haikuporter -y -d -i vim-7.3 +#b mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i vision-908 + mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips + +#3 haikuporter -y -d -i WonderBrush-2.1.2 + + +} + +INSTALL { + cd . + echo "Done. Zipped files are in the zips directory." + echo "GPL/LGPL sources are in the source directory." + #No need to install these, + #just put all the zips into the zips directory for uploading + #For GPL/LGPL software also create the patches sources .xz archives +} + +#LICENSE="" +#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.6-gcc4.bep b/packs/optionalpackages/optionalpackages-0.6-gcc4.bep new file mode 100644 index 000000000..4a7196378 --- /dev/null +++ b/packs/optionalpackages/optionalpackages-0.6-gcc4.bep @@ -0,0 +1,177 @@ +DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." +HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" +SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="sys-devel/gcc >= 4.4.4" + +CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" +BUILD { + HPLOC=`haikuporter -t` + mkdir -p ../zips + mkdir -p ../sources + cd optionalpackages-0.5 + export HAIKUVERSION="r1a3" +## + +#w = works +#b = currently broken +#3 = 3rd party optional package, probably needs a .bep file + + + haikuporter -i readline-6.2 + haikuporter -y -d -i libedit-20100424 + haikuporter -y -d -i autoconf-2.68 + mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i automake-1.11.1 + mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libtool-2.4 + mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i bison-2.4.3 + mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i m4-1.4.16 + mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i flex-2.5.35 + mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i jam-2.5 + mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i mkdepend-1.7 + mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i make-3.82 + mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i cmake-2.8.4 + mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libxml2-2.7.8 + mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libxslt-1.1.26 + mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips + + haikuporter -y -d -i yasm-1.1.0 + mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i xz-utils-5.0.1 + mv ${HPLOC}/app-arch/xz-utils/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i openssl-1.0.0d + mv ${HPLOC}/dev-libs/openssl/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i curl-7.21.6 + mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i neon-0.29.6 + mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i cvs-1.12.13.1 + mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i subversion-1.6.15 + mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i git-1.7.5 + mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i openssh-5.8p2 + mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -c -d -i mercurial-1.8.3 + mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips + + + haikuporter -y -c -d droid-113 + mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i apr-1.4.2 + mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i apr-util-1.3.10 + mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i sqlite-3.7.5 + mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d bzr-2.2.2 + mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i beae-22 + mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i burnitnow-39 + mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i bzip2-1.0.6 + mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i ccache-3.0.1 + mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i cdrtools-3.01a01 + mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i texinfo-4.13a + mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i expat-2.0.1 + mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i fastdep-0.16 + mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i gettext-0.18.1.1 + mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i gperf-3.0.4 + mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i groff-1.20.1 + mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libevent-2.0.10 + mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libiconv-1.13.1 + mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i man-1.6f + mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i nano-2.2.6 + mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i p7zip-9.13 + mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i paladin-1.3 + mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libpcre-8.12 + mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d perl-5.10.1 + mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i rsync-3.0.7 + mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i ruby-1.9.1 + mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i sed-4.2.1 + mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i vision-908 + mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i vim-7.3 + mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -c -d -i transmission-2.21 + mv ${HPLOC}/net-p2p/transmission/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -c -d -i pe-2.4.3-600 + mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips +#b haikuporter -y -d -i opensound-4.2 +#b mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips +#b haikuporter -y -d python-2.7.1 +#b mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i tar-1.25 + mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips +#b haikuporter -y -d -i netsurf-2.6 +#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips +#b haikuporter -y -d -i clockwerk-78 +#b mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips + +#3 haikuporter -y -d -i ABI-compliance-checker-1.12 +#3 haikuporter -y -d -i Beam-1.2alpha +#3 haikuporter -y -d -i bebook_20081026 +#3 haikuporter -y -d -i BeHappy-1.0.6 +#3 haikuporter -y -d -i BePDF-1.1.1b3 +#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre +#3 haikuporter -y -d -i friss-0.5pre7 +#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 +#3 haikuporter -y -d -i liblayout-1.4.0 +#3 haikuporter -y -d -i links +#3 haikuporter -y -d -i ocaml-3.11.1 +#3 haikuporter -y -d -i camlp5-5.12 +#3 haikuporter -y -d -i TimGMSoundFont +#3 haikuporter -y -d -i TrackerNewTemplates +#3 haikuporter -y -d -i WonderBrush-2.1.2 +#3 haikuporter -y -c -d -i WebPositive +#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 +#3 haikuporter -y -d -i clucene-0.9.21 +#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre + +} + +INSTALL { + cd . + echo "Done. Zipped files are in the zips directory." + echo "GPL/LGPL sources are in the source directory." + #No need to install these, + #just put all the zips into the zips directory for uploading + #For GPL/LGPL software also create the patches sources .xz archives +} + +#LICENSE="" +#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.7-gcc2.bep b/packs/optionalpackages/optionalpackages-0.7-gcc2.bep new file mode 100644 index 000000000..e024c32dc --- /dev/null +++ b/packs/optionalpackages/optionalpackages-0.7-gcc2.bep @@ -0,0 +1,182 @@ +DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." +HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" +SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" +REVISION="3" +STATUS_HAIKU="stable" +DEPEND="gcc == 2.95.3 + liblayout == 1.4.0 + dev-util/cmake >= 2.8.4" + +CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" +BUILD { + HPLOC=`haikuporter -t` + mkdir -p ../zips + mkdir -p ../sources + cd optionalpackages-0.5 + export HAIKUVERSION="r1a4" +## + +#w = works +#b = currently broken +#3 = 3rd party optional package, probably needs a .bep file + +## Group 1 + haikuporter -i readline-6.2 + haikuporter -i libedit-20120601-3.0 + haikuporter -y -d -i autoconf-2.68 + mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i automake-1.11.1 + mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libtool-2.4 + mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i bison-2.4.3 + mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i m4-1.4.16 + mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i flex-2.5.35 + mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i jam-2.5 + mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i mkdepend-1.7 + mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i make-3.82 + mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i openssl-1.0.0j + mv ${HPLOC}/dev-libs/openssl/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d perl-5.10.1 + mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i cmake-2.8.5 + mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i yasm-1.2.0 + mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i freetype-2.4.9 + mv ${HPLOC}/media-libs/freetype/*.zip ${HPLOC}/packs/optionalpackages/zips + +## Group 2 + + haikuporter -y -d -i sed-4.2.1 + mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -c -d droid-113 + mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -c -d wqy-microhei-0.2.0-beta + mv ${HPLOC}/media-fonts/wqy-microhei/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -c -d -i mercurial-2.2.2 + mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i ABI-compliance-checker-1.12 + haikuporter -y -d -i apr-1.4.6 + mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i apr-util-1.4.1 + mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i sqlite-3.7.13 + mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d bzr-2.5.1 + mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i beae-22 + mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i beam-1.2alpha + mv ${HPLOC}/haiku-apps/beam/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i bebook_20081026 +#3 haikuporter -y -d -i BeHappy-1.0.6 +#3 haikuporter -y -d -i BePDF-1.1.1b3 +#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre + haikuporter -y -d -i burnitnow-39 + mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i bzip2-1.0.6 + mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i ccache-3.0.1 + mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i cdrtools-3.01a07 + mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libpcre-8.21 + mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i clockwerk-80 + mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i curl-7.26.0 + mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i cvs-1.12.13.1 + mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i subversion-1.6.18 + mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i texinfo-4.13a + mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i expat-2.0.1 + mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i fastdep-0.16 + mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i friss-29 + mv ${HPLOC}/haiku-apps/friss/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i gettext-0.18.1.1 + mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i gitdoc-1.7.10.2 + mv ${HPLOC}/dev-vcs/gitdoc/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i git-1.7.10.2 + mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i gperf-3.0.4 + mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i groff-1.20.1 + mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 + haikuporter -y -d -i libevent-2.0.10 + mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libiconv-1.13.1 + mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i liblayout-1.4.0 + haikuporter -y -d -i libmng-1.0.10 + mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libxml2-2.8.0 + mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libxslt-1.1.26 + mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i links + haikuporter -y -d -i man-1.6g + mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i nano-2.2.6 + mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i neon-0.29.6 + mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips +#b haikuporter -y -d -i netsurf-2.6 +#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i ocaml-3.11.1 +#3 haikuporter -y -d -i camlp5-5.12 +#b haikuporter -y -d -i opensound-4.2 +#b mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i openssh-6.0p1 + mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i p7zip-9.20.1 + mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i paladin-1.3 + mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i pe-2.4.3-600 + mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips +#b haikuporter -y -d python-2.7.1 +#b mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i rsync-3.0.7 + mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i ruby-1.9.1 + mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i tar-1.26 + mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i TimGMSoundFont +#3 haikuporter -y -d -i TrackerNewTemplates +#b haikuporter -y -d -i vim-7.3 +#b mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i vision-908 + mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips + +#3 haikuporter -y -d -i WonderBrush-2.1.2 + + +} + +INSTALL { + cd . + echo "Done. Zipped files are in the zips directory." + echo "GPL/LGPL sources are in the source directory." + #No need to install these, + #just put all the zips into the zips directory for uploading + #For GPL/LGPL software also create the patches sources .xz archives +} + +#LICENSE="" +#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.7-gcc4.bep b/packs/optionalpackages/optionalpackages-0.7-gcc4.bep new file mode 100644 index 000000000..2661a45e2 --- /dev/null +++ b/packs/optionalpackages/optionalpackages-0.7-gcc4.bep @@ -0,0 +1,176 @@ +DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." +HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" +SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="sys-devel/gcc >= 4.6.2" + +CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" +BUILD { + HPLOC=`haikuporter -t` + mkdir -p ../zips + mkdir -p ../sources + cd optionalpackages-0.5 + export HAIKUVERSION="r1a4" +## + +#w = works +#b = currently broken +#3 = 3rd party optional package, probably needs a .bep file + + + haikuporter -i readline-6.2 + haikuporter -y -d -i libedit-20120601-3.0 + haikuporter -y -d -i autoconf-2.68 + mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i automake-1.11.1 + mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libtool-2.4 + mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i bison-2.4.3 + mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i m4-1.4.16 + mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i flex-2.5.35 + mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i jam-2.5 + mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i mkdepend-1.7 + mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i make-3.82 + mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i cmake-2.8.5 + mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libxml2-2.8.0 + mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libxslt-1.1.26 + mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips + + haikuporter -y -d -i yasm-1.2.0 + mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i xz-utils-5.0.1 + mv ${HPLOC}/app-arch/xz-utils/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i openssl-1.0.0j + mv ${HPLOC}/dev-libs/openssl/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i curl-7.26.0 + mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i neon-0.29.6 + mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i cvs-1.12.13.1 + mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i subversion-1.6.18 + mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i git-1.7.10.2 + mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i openssh-6.0p1 + mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -c -d -i mercurial-2.2.2 + mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips + + + haikuporter -y -c -d droid-113 + mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i apr-1.4.6 + mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i apr-util-1.4.1 + mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i sqlite-3.7.13 + mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d bzr-2.6b1 + mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i beae-22 + mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i burnitnow-39 + mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i bzip2-1.0.6 + mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i ccache-3.0.1 + mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i cdrtools-3.01a07 + mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i texinfo-4.13a + mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i expat-2.0.1 + mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i fastdep-0.16 + mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i gettext-0.18.1.1 + mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i gperf-3.0.4 + mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i groff-1.20.1 + mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libevent-2.0.10 + mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libiconv-1.13.1 + mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i man-1.6g + mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i nano-2.2.6 + mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i p7zip-9.20.1 + mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i paladin-1.3 + mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i libpcre-8.12 + mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d perl-5.10.1 + mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i rsync-3.0.7 + mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i ruby-1.9.1 + mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i sed-4.2.1 + mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i vision-908 + mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i vim-7.3 + mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -c -d -i transmission-2.21 + mv ${HPLOC}/net-p2p/transmission/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -c -d -i pe-2.4.3-600 + mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips +#b haikuporter -y -d -i opensound-4.2 +#b mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips +#b haikuporter -y -d python-2.7.1 +#b mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips + haikuporter -y -d -i tar-1.26 + mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips +#b haikuporter -y -d -i netsurf-2.6 +#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips +#b haikuporter -y -d -i clockwerk-78 +#b mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips + +#3 haikuporter -y -d -i ABI-compliance-checker-1.12 +#3 haikuporter -y -d -i Beam-1.2alpha +#3 haikuporter -y -d -i bebook_20081026 +#3 haikuporter -y -d -i BeHappy-1.0.6 +#3 haikuporter -y -d -i BePDF-1.1.1b3 +#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips +#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre +#3 haikuporter -y -d -i friss-0.5pre7 +#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 +#3 haikuporter -y -d -i links +#3 haikuporter -y -d -i ocaml-3.11.1 +#3 haikuporter -y -d -i camlp5-5.12 +#3 haikuporter -y -d -i TimGMSoundFont +#3 haikuporter -y -d -i TrackerNewTemplates +#3 haikuporter -y -d -i WonderBrush-2.1.2 +#3 haikuporter -y -c -d -i WebPositive +#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 +#3 haikuporter -y -d -i clucene-0.9.21 +#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre + +} + +INSTALL { + cd . + echo "Done. Zipped files are in the zips directory." + echo "GPL/LGPL sources are in the source directory." + #No need to install these, + #just put all the zips into the zips directory for uploading + #For GPL/LGPL software also create the patches sources .xz archives +} + +#LICENSE="" +#COPYRIGHT="" diff --git a/sci-libs/cln/cln-1.3.2.bep b/sci-libs/cln/cln-1.3.2.bep new file mode 100644 index 000000000..f1cd7d57a --- /dev/null +++ b/sci-libs/cln/cln-1.3.2.bep @@ -0,0 +1,25 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +MESSAGE="This port only builds with gcc4." +BUILD { + cd cln-1.3.2 + autoreconf -i + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + make +} + +INSTALL { + cd cln-1.3.2 + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="Bruno Haible 1988-2008 + Alexei Sheplyakov 2008 + Richard Kreckel 2000-2009" diff --git a/sci-libs/cln/patches/cln-1.3.2.patch b/sci-libs/cln/patches/cln-1.3.2.patch new file mode 100644 index 000000000..7790747ed --- /dev/null +++ b/sci-libs/cln/patches/cln-1.3.2.patch @@ -0,0 +1,21 @@ +diff -Naur cln-1.3.2/src/base/random/cl_random_from.cc cln-1.3.2-haiku/src/base/random/cl_random_from.cc +--- cln-1.3.2/src/base/random/cl_random_from.cc 2009-05-10 22:32:30.056360960 +0200 ++++ cln-1.3.2-haiku/src/base/random/cl_random_from.cc 2012-06-14 20:16:49.920387584 +0200 +@@ -18,7 +18,7 @@ + #include "base/cl_low.h" + #include // declares rand() + +-#if defined(unix) || defined(__unix) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(_AIX) || defined(sinix) || (defined(__MACH__) && defined(__APPLE__)) || (defined(__CYGWIN__) && defined(__GNUC__)) || defined(__BEOS__) ++#if defined(unix) || defined(__unix) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(_AIX) || defined(sinix) || (defined(__MACH__) && defined(__APPLE__)) || (defined(__CYGWIN__) && defined(__GNUC__)) || defined(__BEOS__) || defined(__HAIKU__) + + #include + #include // declares getpid() +@@ -86,7 +86,7 @@ + { + var uint32 seed_hi; + var uint32 seed_lo; +-#if defined(unix) || defined(__unix) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(_AIX) || defined(sinix) || (defined(__MACH__) && defined(__APPLE__)) || (defined(__CYGWIN__) && defined(__GNUC__)) || defined(__BEOS__) ++#if defined(unix) || defined(__unix) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(_AIX) || defined(sinix) || (defined(__MACH__) && defined(__APPLE__)) || (defined(__CYGWIN__) && defined(__GNUC__)) || defined(__BEOS__) || defined(__HAIKU__) + seed_lo = get_seed(); + seed_hi = (rand() // zufällige 31 Bit (bei UNIX_BSD) bzw. 16 Bit (bei UNIX_SYSV) + << 8) ^ (uintL)(getpid()); // ca. 8 Bit von der Process ID diff --git a/sci-libs/fftw/fftw-3.2.2.bep b/sci-libs/fftw/fftw-3.2.2.bep index bc9f2bd5e..abd185311 100644 --- a/sci-libs/fftw/fftw-3.2.2.bep +++ b/sci-libs/fftw/fftw-3.2.2.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="untested" DEPEND="" BUILD { cd fftw-3.2.2 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sci-libs/gdal/gdal-1.7.2.bep b/sci-libs/gdal/gdal-1.7.2.bep index 3f4198de2..5e0bbc0c8 100644 --- a/sci-libs/gdal/gdal-1.7.2.bep +++ b/sci-libs/gdal/gdal-1.7.2.bep @@ -10,7 +10,7 @@ BUILD { cd gdal-1.7.2 libtoolize --force --copy --install ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sci-libs/gsl/gsl-1.13.bep b/sci-libs/gsl/gsl-1.13.bep index 8c3a834e7..c388c8e58 100644 --- a/sci-libs/gsl/gsl-1.13.bep +++ b/sci-libs/gsl/gsl-1.13.bep @@ -11,7 +11,7 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sci-libs/gsl/gsl-1.14.bep b/sci-libs/gsl/gsl-1.14.bep index 079cd9924..93efa709b 100644 --- a/sci-libs/gsl/gsl-1.14.bep +++ b/sci-libs/gsl/gsl-1.14.bep @@ -11,7 +11,10 @@ BUILD { aclocal autoconf automake - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } @@ -19,3 +22,6 @@ INSTALL { cd gsl-1.14 make install } + +LICENSE="GNU GPL v3" +COPYRIGHT="1996-2000, 2007 Brian Gough, Gerard Jungman, Mark Galassi, James Theiler, Reid Priedhorsky, Jim Davies and others. diff --git a/sci-physics/bullet/bullet-2.78.bep b/sci-physics/bullet/bullet-2.78.bep new file mode 100644 index 000000000..b49bedd4f --- /dev/null +++ b/sci-physics/bullet/bullet-2.78.bep @@ -0,0 +1,21 @@ +DESCRIPTION="Continuous Collision Detection and Physics Library" +HOMEPAGE="http://www.bulletphysics.com/" +SRC_URI="http://bullet.googlecode.com/files/bullet-2.78-r2387.tgz" +CHECKSUM_MD5="3611456232f1c01dea8094213382d0b3" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/cmake >= 2.8.3" + +BUILD { + cd bullet-2.78 + cmake -DBUILD_DEMOS=ON . + make +} + +INSTALL { + cd bullet-2.78 + make install +} + +LICENSE="Zlib" +COPYRIGHT="2003-2008 Erwin Coumans" diff --git a/sci-physics/bullet/patches/bullet-2.78.patch b/sci-physics/bullet/patches/bullet-2.78.patch new file mode 100644 index 000000000..0e6ef5389 --- /dev/null +++ b/sci-physics/bullet/patches/bullet-2.78.patch @@ -0,0 +1,45 @@ +diff -Nbaur bullet-2.78/Demos/MultiThreadedDemo/CMakeLists.txt bullet-2.78-haiku/Demos/MultiThreadedDemo/CMakeLists.txt +--- bullet-2.78/Demos/MultiThreadedDemo/CMakeLists.txt 2010-07-08 14:02:38.033554432 -0300 ++++ bullet-2.78-haiku/Demos/MultiThreadedDemo/CMakeLists.txt 2011-04-25 19:30:57.000000000 -0300 +@@ -25,9 +25,9 @@ + MultiThreadedDemo.cpp + MultiThreadedDemo.h + ) +-IF (UNIX) ++IF (UNIX AND NOT BEOS) + TARGET_LINK_LIBRARIES(AppMultiThreadedDemo pthread) +-ENDIF(UNIX) ++ENDIF(UNIX AND NOT BEOS) + + IF(WIN32) + IF (CMAKE_CL_64) +diff -Nbaur bullet-2.78/Demos/OpenCLClothDemo/MiniCL/CMakeLists.txt bullet-2.78-haiku/Demos/OpenCLClothDemo/MiniCL/CMakeLists.txt +--- bullet-2.78/Demos/OpenCLClothDemo/MiniCL/CMakeLists.txt 2010-09-21 20:09:18.033292288 -0300 ++++ bullet-2.78-haiku/Demos/OpenCLClothDemo/MiniCL/CMakeLists.txt 2011-04-25 19:33:03.000000000 -0300 +@@ -81,9 +81,9 @@ + COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenCLClothDemo/atiFlag.bmp ${CMAKE_CURRENT_BINARY_DIR} + ) + ENDIF() +-IF (UNIX) ++IF (UNIX AND NOT BEOS) + TARGET_LINK_LIBRARIES(AppOpenCLClothDemo_Mini pthread) +-ENDIF(UNIX) ++ENDIF(UNIX AND NOT BEOS) + + + IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) +diff -Nbaur bullet-2.78/Demos/ThreadingDemo/CMakeLists.txt bullet-2.78-haiku/Demos/ThreadingDemo/CMakeLists.txt +--- bullet-2.78/Demos/ThreadingDemo/CMakeLists.txt 2010-10-06 20:07:00.014155776 -0300 ++++ bullet-2.78-haiku/Demos/ThreadingDemo/CMakeLists.txt 2011-04-25 19:32:00.000000000 -0300 +@@ -34,9 +34,9 @@ + ) + ENDIF() + +-IF (UNIX) ++IF (UNIX AND NOT BEOS) + TARGET_LINK_LIBRARIES(AppThreadingDemo pthread) +-ENDIF(UNIX) ++ENDIF(UNIX AND NOT BEOS) + + IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) + SET_TARGET_PROPERTIES(AppThreadingDemo PROPERTIES DEBUG_POSTFIX "_Debug") diff --git a/sys-apps/coreutils/coreutils-8.5.bep b/sys-apps/coreutils/coreutils-8.5.bep index 4ab1b3322..b01781390 100644 --- a/sys-apps/coreutils/coreutils-8.5.bep +++ b/sys-apps/coreutils/coreutils-8.5.bep @@ -9,7 +9,9 @@ BUILD { cd coreutils-8.5 MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=${MANDIR} + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=`finddir B_COMMON_DOCUMENTATION`/info \ + --mandir=`finddir B_COMMON_DOCUMENTATION`/man make } diff --git a/sys-apps/dbus/dbus-1.6.8.bep b/sys-apps/dbus/dbus-1.6.8.bep new file mode 100644 index 000000000..6eafcc6a8 --- /dev/null +++ b/sys-apps/dbus/dbus-1.6.8.bep @@ -0,0 +1,29 @@ +DESCRIPTION="dbus message bus system" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/dbus" +SRC_URI="http://dbus.freedesktop.org/releases/dbus/dbus-1.6.8.tar.gz" +CHECKSUM_MD5="3bf059c7dd5eda5f539a1b7cfe7a14a2" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." + +BUILD { + cd dbus-1.6.8 + ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ + --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ + --mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" + make +} + +INSTALL { + cd dbus-1.6.8 + make install +} + +TEST { + cd dbus-1.6.8 + make check +} + +LICENSE="GNU GPL v2" + diff --git a/sys-apps/dbus/patches/dbus-1.6.8.patch b/sys-apps/dbus/patches/dbus-1.6.8.patch new file mode 100644 index 000000000..d63b40a1b --- /dev/null +++ b/sys-apps/dbus/patches/dbus-1.6.8.patch @@ -0,0 +1,11 @@ +--- dbus-1.6.8/dbus/sd-daemon.c 2011-07-13 20:42:21.040108032 +0000 ++++ dbus-1.6.8-haiku/dbus/sd-daemon.c 2013-02-12 18:57:28.067108864 +0000 +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/sys-apps/diffutils/diffutils-2.9.bep b/sys-apps/diffutils/diffutils-2.9.bep index 7d655c9b4..bf83c0540 100644 --- a/sys-apps/diffutils/diffutils-2.9.bep +++ b/sys-apps/diffutils/diffutils-2.9.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd diffutils-2.9 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-apps/diffutils/diffutils-3.2.bep b/sys-apps/diffutils/diffutils-3.2.bep new file mode 100644 index 000000000..9e9e9c088 --- /dev/null +++ b/sys-apps/diffutils/diffutils-3.2.bep @@ -0,0 +1,28 @@ +DESCRIPTION="Tools to make diffs and compare files." +HOMEPAGE="http://www.gnu.org/software/diffutils/" +SRC_URI="http://ftp.gnu.org/pub/gnu/diffutils/diffutils-3.2.tar.gz" +CHECKSUM_MD5="22e4deef5d8949a727b159d6bc65c1cc" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd diffutils-3.2 + ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ + --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ + --mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \ + --infodir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/info" + make +} + +INSTALL { + cd diffutils-3.2 + make install +} + +TEST { + cd diffutils-3.2 + make check +} + +LICENSE="GNU GPL v3" +COPYRIGHT="1992-2011 Free Software Foundation, Inc." diff --git a/sys-apps/diffutils/patches/diffutils-3.2.patch b/sys-apps/diffutils/patches/diffutils-3.2.patch new file mode 100644 index 000000000..e56750b82 --- /dev/null +++ b/sys-apps/diffutils/patches/diffutils-3.2.patch @@ -0,0 +1,58 @@ +diff -urN diffutils-3.2/src/dir.c diffutils-3.2-c89/src/dir.c +--- diffutils-3.2/src/dir.c 2011-08-14 15:58:59.020709376 +0000 ++++ diffutils-3.2-c89/src/dir.c 2012-09-14 16:59:18.000000000 +0000 +@@ -202,6 +202,7 @@ + struct dirdata dirdata[2]; + int volatile val = EXIT_SUCCESS; + int i; ++ int v1; + + if ((cmp->file[0].desc == -1 || dir_loop (cmp, 0)) + && (cmp->file[1].desc == -1 || dir_loop (cmp, 1))) +@@ -254,6 +255,7 @@ + pretend the "next name" in that dir is very large. */ + int nameorder = (!*names[0] ? 1 : !*names[1] ? -1 + : compare_names (*names[0], *names[1])); ++ int v1; + + /* Prefer a file_name_cmp match if available. This algorithm is + O(N**2), where N is the number of names in a directory +@@ -289,7 +291,7 @@ + } + } + +- int v1 = (*handle_file) (cmp, ++ v1 = (*handle_file) (cmp, + 0 < nameorder ? 0 : *names[0]++, + nameorder < 0 ? 0 : *names[1]++); + if (val < v1) +@@ -342,7 +344,8 @@ + match = file; /* longjmp may mess up MATCH. */ + else + { +- for (char const **p = dirdata.names; *p; p++) ++ char const **p; ++ for (p = dirdata.names; *p; p++) + if (compare_names (*p, file) == 0) + { + if (file_name_cmp (*p, file) == 0) +diff -urN diffutils-3.2/src/io.c diffutils-3.2-c89/src/io.c +--- diffutils-3.2/src/io.c 2011-08-15 05:24:38.019136512 +0000 ++++ diffutils-3.2-c89/src/io.c 2012-09-14 17:02:59.000000000 +0000 +@@ -258,6 +258,7 @@ + case IGNORE_TRAILING_SPACE: + { + size_t column = 0; ++ size_t repetitions = 1; + while ((c = *p++) != '\n') + { + if (ig_white_space & IGNORE_TRAILING_SPACE +@@ -274,8 +275,6 @@ + while (isspace (c1)); + } + +- size_t repetitions = 1; +- + if (ig_white_space & IGNORE_TAB_EXPANSION) + switch (c) + { diff --git a/sys-apps/dmidecode/dmidecode-2.11.bep b/sys-apps/dmidecode/dmidecode-2.11.bep new file mode 100644 index 000000000..1810d2489 --- /dev/null +++ b/sys-apps/dmidecode/dmidecode-2.11.bep @@ -0,0 +1,23 @@ +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.11.tar.gz" +CHECKSUM_MD5="9fddbbc3e330bee5950b8b5d424a57cb" +REVISION="2" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd dmidecode-2.11 + make +} + +INSTALL { + cd dmidecode-2.11 + make install prefix=`finddir B_COMMON_DIRECTORY` \ + sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + DESTDIR="$DESTDIR" \ + mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/dmidecode +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2000-2002 Alan Cox, 2002-2010 Jean Delvare" diff --git a/sys-apps/dtc/dtc-1.3.0-git.bep b/sys-apps/dtc/dtc-1.3.0-git.bep new file mode 100644 index 000000000..08edd3315 --- /dev/null +++ b/sys-apps/dtc/dtc-1.3.0-git.bep @@ -0,0 +1,27 @@ +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" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="sys-devel/bison >= 2.5" +# TODO: test gcc2 build +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +#CHECKSUM_MD5="" +BUILD { + cd dtc-1.3.0-git + make PREFIX=`finddir B_COMMON_DIRECTORY` +} + +INSTALL { + cd dtc-1.3.0-git + make install PREFIX=`finddir B_COMMON_DIRECTORY` +} + +TEST { + cd dtc-1.3.0-git + make tests +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2005 David Gibson, IBM Corporation" + diff --git a/sys-apps/dtc/patches/dtc-1.3.0-git.patch b/sys-apps/dtc/patches/dtc-1.3.0-git.patch new file mode 100644 index 000000000..64b4229f5 --- /dev/null +++ b/sys-apps/dtc/patches/dtc-1.3.0-git.patch @@ -0,0 +1,66 @@ +diff --git a/Makefile dtc-1.3.0-git/Makefile +index 1169e6c..60077a5 100644 +--- a/Makefile ++++ dtc-1.3.0-git/Makefile +@@ -41,6 +41,15 @@ SHAREDLIB_EXT=so + SHAREDLIB_LINK_OPTIONS=-shared -Wl,--version-script=$(LIBFDT_version) -Wl,-soname, + endif + ++ifeq ($(HOSTOS),haiku) ++INSTALL = /bin/install ++endif ++ ++ifneq ($(HOSTOS),haiku) ++LIBDL = -ldl ++endif ++ ++ + # + # Overall rules + # +diff --git a/tests/Makefile.tests dtc-1.3.0-git/tests/Makefile.tests +index 1795466..97b6131 100644 +--- a/tests/Makefile.tests ++++ dtc-1.3.0-git/tests/Makefile.tests +@@ -50,7 +50,7 @@ $(LIB_TESTS): %: $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive) + + $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o util.o $(LIBFDT_archive) + @$(VECHO) LD [libdl] $@ +- $(LINK.c) -o $@ $^ -ldl ++ $(LINK.c) -o $@ $^ $(LIBDL) + + $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o \ + util.o $(LIBFDT_archive) +diff --git a/tests/testutils.c dtc-1.3.0-git/tests/testutils.c +index f185133..66b34df 100644 +--- a/tests/testutils.c ++++ dtc-1.3.0-git/tests/testutils.c +@@ -45,16 +45,15 @@ static void sigint_handler(int signum, siginfo_t *si, void *uc) + { + cleanup(); + fprintf(stderr, "%s: %s (pid=%d)\n", test_name, +- strsignal(signum), getpid()); ++ strsignal(signum), (int)getpid()); + exit(RC_BUG); + } + + void test_init(int argc, char *argv[]) + { + int err; +- struct sigaction sa_int = { +- .sa_sigaction = sigint_handler, +- }; ++ struct sigaction sa_int = { }; ++ sa_int.sa_sigaction = sigint_handler; + + test_name = argv[0]; + +@@ -66,7 +65,7 @@ void test_init(int argc, char *argv[]) + verbose_test = 0; + + verbose_printf("Starting testcase \"%s\", pid %d\n", +- test_name, getpid()); ++ test_name, (int)getpid()); + } + + void check_mem_rsv(void *fdt, int n, uint64_t addr, uint64_t size) diff --git a/sys-apps/ed/ed-1.4.bep b/sys-apps/ed/ed-1.4.bep index 33ae0aff0..5284c8e06 100644 --- a/sys-apps/ed/ed-1.4.bep +++ b/sys-apps/ed/ed-1.4.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd ed-1.4 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-apps/file/file-5.04.bep b/sys-apps/file/file-5.04.bep index ec95c8be7..ebeca7087 100644 --- a/sys-apps/file/file-5.04.bep +++ b/sys-apps/file/file-5.04.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd file-5.04 autoreconf -fvi - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-apps/file/file-5.11.bep b/sys-apps/file/file-5.11.bep new file mode 100644 index 000000000..d2af82c38 --- /dev/null +++ b/sys-apps/file/file-5.11.bep @@ -0,0 +1,22 @@ +DESCRIPTION="Identify a file's format by scanning binary data for patterns" +HOMEPAGE="ftp://ftp.astron.com/pub/file/" +SRC_URI="ftp://ftp.astron.com/pub/file/file-5.11.tar.gz" +CHECKSUM_MD5="16a407bd66d6c7a832f3a5c0d609c27b" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd file-5.11 + autoreconf -fvi + ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ + --mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \ + --datadir="$(finddir B_COMMON_DATA_DIRECTORY)" + make +} + +INSTALL { + cd file-5.11 + make install +} +LICENSE="BSD (2-clause)" +COPYRIGHT="1986-1999 Ian F. Darwin" diff --git a/sys-apps/file/patches/file-5.11.patch b/sys-apps/file/patches/file-5.11.patch new file mode 100644 index 000000000..99a60b72f --- /dev/null +++ b/sys-apps/file/patches/file-5.11.patch @@ -0,0 +1,20 @@ +diff -up file-5.11/configure.ac.orig file-5.11/configure.ac +--- file-5.11/configure.ac.orig 2012-02-21 12:16:29.015728640 -0700 ++++ file-5.11/configure.ac 2012-05-02 22:53:14.077594624 -0600 +@@ -142,14 +142,14 @@ else + WARNINGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \ + -Wmissing-declarations -Wredundant-decls -Wnested-externs \ + -Wsign-compare -Wreturn-type -Wswitch -Wshadow \ +- -Wcast-qual -Wwrite-strings -Wextra -Wunused-parameter -Wformat=2" ++ -Wcast-qual -Wwrite-strings" + fi], [ + if test "$GCC" = yes; then + AC_MSG_RESULT(yes) + WARNINGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \ + -Wmissing-declarations -Wredundant-decls -Wnested-externs \ + -Wsign-compare -Wreturn-type -Wswitch -Wshadow \ +- -Wcast-qual -Wwrite-strings -Wextra -Wunused-parameter -Wformat=2" ++ -Wcast-qual -Wwrite-strings" + else + WARNINGS= + AC_MSG_RESULT(no) diff --git a/sys-apps/gawk/gawk-3.1.8.bep b/sys-apps/gawk/gawk-3.1.8.bep index a79cd3030..b3c8cdc4e 100644 --- a/sys-apps/gawk/gawk-3.1.8.bep +++ b/sys-apps/gawk/gawk-3.1.8.bep @@ -8,10 +8,10 @@ CHECKSUM_MD5="52b41c6c4418b3226dfb8f82076193bb" BUILD { cd gawk-3.1.8 libtoolize --force --copy --install - - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=${MANDIR} + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } diff --git a/sys-apps/gawk/gawk-4.0.1.bep b/sys-apps/gawk/gawk-4.0.1.bep new file mode 100644 index 000000000..798af1565 --- /dev/null +++ b/sys-apps/gawk/gawk-4.0.1.bep @@ -0,0 +1,23 @@ +DESCRIPTION="GNU awk" +HOMEPAGE="http://www.gnu.org/software/coreutils" +SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-4.0.1.tar.gz" +CHECKSUM_MD5="bab2bda483e9f32be65b43b8dab39fa5" +STATUS_HAIKU="stable" +REVISION="1" +BUILD { + cd gawk-4.0.1 + libtoolize --force --copy --install + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --libexecdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd gawk-4.0.1 + make install +} + +LICENSE="GNU GPL v3" +COPYRIGHT="2012 Free Software Foundation, Inc." \ No newline at end of file diff --git a/sys-apps/grep/grep-2.12.bep b/sys-apps/grep/grep-2.12.bep new file mode 100644 index 000000000..15fa46273 --- /dev/null +++ b/sys-apps/grep/grep-2.12.bep @@ -0,0 +1,32 @@ +DESCRIPTION="GNU regular expression matcher" +HOMEPAGE="http://www.gnu.org/software/grep/" +SRC_URI="http://ftpmirror.gnu.org/grep/grep-2.12.tar.xz" +CHECKSUM_MD5="8d2f0346d08b13c18afb81f0e8aa1e2f" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="sys-devel/gettext >= 0.17 + sys-devel/libiconv >= 1.13.1" +BUILD { + cd grep-2.12 + libtoolize --force --copy --install + aclocal -I m4 + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd grep-2.12 + make install +} + +TEST { + cd grep-2.12 + make check +} + +LICENSE="GNU GPL v3" +COPYRIGHT="1992-2012 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.14-bz2.bep b/sys-apps/grep/grep-2.14-bz2.bep new file mode 100644 index 000000000..fafecfa4a --- /dev/null +++ b/sys-apps/grep/grep-2.14-bz2.bep @@ -0,0 +1,27 @@ +DESCRIPTION="GNU regular expression matcher" +HOMEPAGE="http://www.gnu.org/software/grep/" +SRC_URI="http://ports-space.haiku-files.org/source/grep-2.14.tar.bz2" +CHECKSUM_MD5="db55b9fc67d8c0895f3c73e94e2aebe3" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="sys-devel/gettext >= 0.17 + sys-devel/libiconv >= 1.13.1" +BUILD { + cd grep-2.14 + + libtoolize --force --copy --install + aclocal -I m4 + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd grep-2.14 + make install +} +LICENSE="GNU GPL v3" +COPYRIGHT="1992-2012 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.14.bep b/sys-apps/grep/grep-2.14.bep new file mode 100644 index 000000000..cde4042d8 --- /dev/null +++ b/sys-apps/grep/grep-2.14.bep @@ -0,0 +1,34 @@ +DESCRIPTION="GNU regular expression matcher" +HOMEPAGE="http://www.gnu.org/software/grep/" +SRC_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz" +CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="sys-devel/gettext >= 0.17 + sys-devel/libiconv >= 1.13.1" + +BUILD { + cd grep-2.14 + libtoolize --force --copy --install + aclocal -I m4 + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --disable-perl-regexp + make +} + +INSTALL { + cd grep-2.14 + make install +} + +TEST { + cd grep-2.14 + make check +} + +LICENSE="GNU GPL v3" +COPYRIGHT="1992-2012 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.5.4.bep b/sys-apps/grep/grep-2.5.4.bep index 5032656dc..6b60cb53b 100644 --- a/sys-apps/grep/grep-2.5.4.bep +++ b/sys-apps/grep/grep-2.5.4.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd grep-2.5.4 libtoolize --force --copy --install - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } @@ -16,5 +16,11 @@ INSTALL { cd grep-2.5.4 make install } + +TEST { + cd grep-2.5.4 + make check +} + LICENSE="GNU GPL v3" COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.6.1.bep b/sys-apps/grep/grep-2.6.1.bep new file mode 100644 index 000000000..ec6be1fb0 --- /dev/null +++ b/sys-apps/grep/grep-2.6.1.bep @@ -0,0 +1,26 @@ +DESCRIPTION="GNU regular expression matcher" +HOMEPAGE="http://www.gnu.org/software/grep/" +SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.6.1.tar.gz" +CHECKSUM_MD5="8d1496da11029112a4d0986cbf09e26f" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd grep-2.6.1 + libtoolize --force --copy --install + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd grep-2.6.1 + make install +} + +TEST { + cd grep-2.6.1 + make check +} + +LICENSE="GNU GPL v3" +COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.6.3.bep b/sys-apps/grep/grep-2.6.3.bep new file mode 100644 index 000000000..dfbd623d2 --- /dev/null +++ b/sys-apps/grep/grep-2.6.3.bep @@ -0,0 +1,26 @@ +DESCRIPTION="GNU regular expression matcher" +HOMEPAGE="http://www.gnu.org/software/grep/" +SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.6.3.tar.gz" +CHECKSUM_MD5="3095b57837b312f087c0680559de7f13" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd grep-2.6.3 + libtoolize --force --copy --install + ./configure --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd grep-2.6.3 + make install +} + +TEST { + cd grep-2.6.3 + make check +} + +LICENSE="GNU GPL v3" +COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.7.bep b/sys-apps/grep/grep-2.7.bep index cdefe4da3..b3db2cf09 100644 --- a/sys-apps/grep/grep-2.7.bep +++ b/sys-apps/grep/grep-2.7.bep @@ -4,13 +4,17 @@ SRC_URI="ftp://mirrors.kernel.org/gnu/grep/grep-2.7.tar.gz" CHECKSUM_MD5="e848f07e3e79aa7899345d17c7e4115e" REVISION="1" STATUS_HAIKU="stable" -DEPEND="" +DEPEND="sys-devel/gettext >= 0.17 + sys-devel/libiconv >= 1.13.1" BUILD { cd grep-2.7 libtoolize --force --copy --install aclocal -I m4 autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } @@ -18,5 +22,11 @@ INSTALL { cd grep-2.7 make install } + +TEST { + cd grep-2.7 + make check +} + LICENSE="GNU GPL v3" COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-apps/grep/patches/grep-2.12.patch b/sys-apps/grep/patches/grep-2.12.patch new file mode 100644 index 000000000..d0f9ce918 --- /dev/null +++ b/sys-apps/grep/patches/grep-2.12.patch @@ -0,0 +1,14 @@ +diff -up grep-2.12/src/kwsearch.c.orig grep-2.12/src/kwsearch.c +--- grep-2.12/src/kwsearch.c.orig 2012-02-27 02:35:19.015204352 -0700 ++++ grep-2.12/src/kwsearch.c 2012-05-02 22:46:36.262668288 -0600 +@@ -106,8 +106,9 @@ Fexecute (char const *buf, size_t size, + /* The match was a part of multibyte character, advance at least + one byte to ensure no infinite loop happens. */ + mbstate_t s; ++ size_t mb_len; + memset (&s, 0, sizeof s); +- size_t mb_len = mbrlen (mb_start, (buf + size) - (beg + offset), &s); ++ mb_len = mbrlen (mb_start, (buf + size) - (beg + offset), &s); + if (mb_len == (size_t) -2) + goto failure; + beg = mb_start; diff --git a/sys-apps/grep/patches/grep-2.14-gcc2.patch b/sys-apps/grep/patches/grep-2.14-gcc2.patch new file mode 100644 index 000000000..c59075af6 --- /dev/null +++ b/sys-apps/grep/patches/grep-2.14-gcc2.patch @@ -0,0 +1,162 @@ +diff -Naur ./grep-2.14-original/lib/fts.c ./grep-2.14/lib/fts.c +--- ./grep-2.14-original/lib/fts.c 2012-02-26 14:01:23.001310720 +0000 ++++ ./grep-2.14/lib/fts.c 2012-12-26 19:30:29.630718464 +0000 +@@ -1278,6 +1278,7 @@ + nlink_t nlinks; + bool nostat; + size_t len, maxlen, new_len; ++ size_t max_entries; + char *cp; + int dir_fd; + FTSENT *cur = sp->fts_cur; +@@ -1343,8 +1344,8 @@ + function. But when no such function is specified, we can read + entries in batches that are large enough to help us with inode- + sorting, yet not so large that we risk exhausting memory. */ +- size_t max_entries = (sp->fts_compar == NULL +- ? FTS_MAX_READDIR_ENTRIES : SIZE_MAX); ++ max_entries = (sp->fts_compar == NULL ++ ? FTS_MAX_READDIR_ENTRIES : SIZE_MAX); + + /* + * Nlinks is the number of possible entries of type directory in the +diff -Naur ./grep-2.14-original/lib/regcomp.c ./grep-2.14/lib/regcomp.c +--- ./grep-2.14-original/lib/regcomp.c 2012-07-03 12:54:55.058982400 +0000 ++++ ./grep-2.14/lib/regcomp.c 2012-12-26 19:31:31.972029952 +0000 +@@ -952,10 +952,10 @@ + 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 -Naur ./grep-2.14-original/src/dfasearch.c ./grep-2.14/src/dfasearch.c +--- ./grep-2.14-original/src/dfasearch.c 2012-08-07 15:01:53.033030144 +0000 ++++ ./grep-2.14/src/dfasearch.c 2012-12-26 19:33:56.699138048 +0000 +@@ -216,6 +216,7 @@ + int backref; + regoff_t start; + size_t len, best_len; ++ size_t off; + struct kwsmatch kwsm; + size_t i, ret_val; + mb_len_map_t *map = NULL; +@@ -418,7 +419,7 @@ + success: + len = end - beg; + success_in_len:; +- size_t off = beg - buf; ++ off = beg - buf; + mb_case_map_apply (map, &off, &len); + *match_size = len; + ret_val = off; +diff -Naur ./grep-2.14-original/src/kwsearch.c ./grep-2.14/src/kwsearch.c +--- ./grep-2.14-original/src/kwsearch.c 2012-06-16 17:08:38.034078720 +0000 ++++ ./grep-2.14/src/kwsearch.c 2012-12-26 19:36:28.265814016 +0000 +@@ -39,9 +39,9 @@ + ? mbtolower (pattern, &psize, &map) + : pattern); + +- kwsinit (&kwset); +- + char const *beg = pat; ++ ++ kwsinit (&kwset); + do + { + char const *lim; +@@ -81,6 +81,7 @@ + { + char const *beg, *try, *end, *mb_start; + size_t len; ++ size_t off; + char eol = eolbyte; + struct kwsmatch kwsmatch; + size_t ret_val; +@@ -100,6 +101,7 @@ + for (mb_start = beg = start_ptr ? start_ptr : buf; beg <= buf + size; beg++) + { + size_t offset = kwsexec (kwset, beg, buf + size - beg, &kwsmatch); ++ size_t mb_len; + if (offset == (size_t) -1) + goto failure; + len = kwsmatch.size[0]; +@@ -110,7 +112,7 @@ + one byte to ensure no infinite loop happens. */ + mbstate_t s; + memset (&s, 0, sizeof s); +- size_t mb_len = mbrlen (mb_start, (buf + size) - (beg + offset), &s); ++ mb_len = mbrlen (mb_start, (buf + size) - (beg + offset), &s); + if (mb_len == (size_t) -2) + goto failure; + beg = mb_start; +@@ -166,7 +168,7 @@ + --beg; + len = end - beg; + success_in_beg_and_len:; +- size_t off = beg - buf; ++ off = beg - buf; + mb_case_map_apply (map, &off, &len); + + *match_size = len; +diff -Naur ./grep-2.14-original/src/main.c ./grep-2.14/src/main.c +--- ./grep-2.14-original/src/main.c 2012-08-06 11:38:32.032768000 +0000 ++++ ./grep-2.14/src/main.c 2012-12-26 19:39:22.737411072 +0000 +@@ -460,6 +460,7 @@ + if (SEEK_HOLE != SEEK_END && usable_st_size (st)) + { + off_t cur = bufsize; ++ off_t hole_start; + if (O_BINARY || fd == STDIN_FILENO) + { + cur = lseek (fd, 0, SEEK_CUR); +@@ -468,7 +469,7 @@ + } + + /* Look for a hole after the current location. */ +- off_t hole_start = lseek (fd, cur, SEEK_HOLE); ++ hole_start = lseek (fd, cur, SEEK_HOLE); + if (0 <= hole_start) + { + if (lseek (fd, cur, SEEK_SET) < 0) +@@ -1860,6 +1861,7 @@ + size_t keycc, oldcc, keyalloc; + int with_filenames; + size_t cc; ++ struct stat tmp_stat; + int opt, status, prepended; + int prev_optind, last_recursive; + intmax_t default_context; +@@ -2223,7 +2225,6 @@ + if (show_help) + usage (EXIT_SUCCESS); + +- struct stat tmp_stat; + if (fstat (STDOUT_FILENO, &tmp_stat) == 0 && S_ISREG (tmp_stat.st_mode)) + out_stat = tmp_stat; + +diff -Naur ./grep-2.14-original/src/searchutils.c ./grep-2.14/src/searchutils.c +--- ./grep-2.14-original/src/searchutils.c 2012-06-16 17:08:38.034340864 +0000 ++++ ./grep-2.14/src/searchutils.c 2012-12-26 19:32:59.044826624 +0000 +@@ -80,6 +80,7 @@ + static mb_len_map_t *len_map; + static size_t outalloc; + size_t outlen, mb_cur_max; ++ size_t ombclen; + mbstate_t is, os; + const char *end; + char *p; +@@ -133,7 +134,7 @@ + else + { + beg += mbclen; +- size_t ombclen = wcrtomb (p, towlower ((wint_t) wc), &os); ++ ombclen = wcrtomb (p, towlower ((wint_t) wc), &os); + *m = mbclen - ombclen; + memset (m + 1, 0, ombclen - 1); + m += ombclen; diff --git a/sys-apps/grep/patches/grep-2.6.1.patch b/sys-apps/grep/patches/grep-2.6.1.patch new file mode 100644 index 000000000..8a08c6439 --- /dev/null +++ b/sys-apps/grep/patches/grep-2.6.1.patch @@ -0,0 +1,20 @@ +diff -urN grep-2.6.1/src/dfa.c grep-2.6.1-haiku/src/dfa.c +--- grep-2.6.1/src/dfa.c 2010-03-25 06:28:54.056098816 -0700 ++++ grep-2.6.1-haiku/src/dfa.c 2013-02-17 13:32:51.217055232 -0800 +@@ -2775,6 +2775,7 @@ + unsigned char eol = eolbyte; /* Likewise for eolbyte. */ + static int sbit[NOTCHAR]; /* Table for anding with d->success. */ + static int sbit_init; ++ unsigned char saved_end; + + if (! sbit_init) + { +@@ -2792,7 +2793,7 @@ + s = s1 = 0; + p = (unsigned char const *) begin; + trans = d->trans; +- unsigned char saved_end = *(unsigned char *) end; ++ saved_end = *(unsigned char *) end; + *end = eol; + + #ifdef MBS_SUPPORT diff --git a/sys-apps/groff/groff-1.20.1.bep b/sys-apps/groff/groff-1.20.1.bep index 4358a7ac1..fb330f71b 100644 --- a/sys-apps/groff/groff-1.20.1.bep +++ b/sys-apps/groff/groff-1.20.1.bep @@ -7,11 +7,15 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd groff-1.20.1 + libtoolize --force --copy --install + aclocal -I m4 + autoconf + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + sed -i 's/docdir=$(datadir)\/doc\/groff\//docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/doc\/groff/g' Ma* ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + --infodir=$COMMON_DOCS/info \ + --mandir=$COMMON_DOCS/man make } @@ -20,5 +24,10 @@ INSTALL { make install } +TEST { + cd groff-1.20.1 + make check +} + LICENSE="GNU GPL v3" COPYRIGHT="2003-2009 Free Software Foundation, Inc." diff --git a/sys-apps/hgrep/hgrep b/sys-apps/hgrep/hgrep new file mode 100755 index 000000000..356dec164 --- /dev/null +++ b/sys-apps/hgrep/hgrep @@ -0,0 +1,10 @@ +#!/bin/sh + +# +# Copyright 2011, Haiku, Inc. All Rights Reserved. +# Distributed under the terms of the MIT License. +# + +find $(finddir B_COMMON_DEVELOP_DIRECTORY)/headers -type f -print0 | xargs -0 egrep "$@" + +# TODO add other header directories to search? diff --git a/sys-apps/hgrep/hgrep-1.0.1.bep b/sys-apps/hgrep/hgrep-1.0.1.bep new file mode 100644 index 000000000..5e94a7b5a --- /dev/null +++ b/sys-apps/hgrep/hgrep-1.0.1.bep @@ -0,0 +1,20 @@ +DESCRIPTION="header grep" +HOMEPAGE="http://www.ports.haiku-files.org/" +SRC_URI="http://www.ports.haiku-files.org/export/1970/haikuports/trunk/sys-apps/hgrep/hgrep-1.0.1.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="1c11724bc9fedd058fde03b5a9f242c2" +BUILD { + cd hgrep-1.0.1 +} + +INSTALL { + cd hgrep-1.0.1 + BINDIR=`finddir B_COMMON_BIN_DIRECTORY` + mkdir -p $DESTDIR/$BINDIR + cp hgrep $DESTDIR/$BINDIR +} + +LICENSE="MIT" +COPYRIGHT="2011 Haiku, Inc." diff --git a/sys-apps/hgrep/hgrep-1.0.1.zip b/sys-apps/hgrep/hgrep-1.0.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..510a28806c39c02daa00fa9a216c779e4635b69f GIT binary patch literal 848 zcmWIWW@h1H0D;&|-yOgVD8a)Z%8-#>lv`_$-sQ^EN{S7AP%iy0V@jt zY8PQ(V&DL4fA1)}=@L-<9}o*N#4#dk2eYx7;gssi=*9%p!ojdoaQXMriTnKy8wecJ z*Zs1eB_}7v&8dU4lk?KDhACz%c!hfMUYUg{$4}X@q{oKInE${LYlBZ=1%_;@&i=n1 zoqoSBV*cZn`5ZePF7U^0ZJvGc!=>TAfFe6K-uk^YcE>`PMnf^AgmiICx%ICR`JH z@cCZ`J%0AcmYr*F=rBht2+=Nj9e*N4B9ZI;l{THHUgiFgGm>PookL!2PG5OL?TAFM z;`D?<$wzx$bak~p`KI$UXX@Wsg$qATQ8h^{+L`9P?tM|uq~^!JE_Xlpc&_#0+l;Kd z&8vU7%~dlL7OG=V?LVCb3^~{Dzq)Q)bc;>8@sj^bqI6cr>Li~9+K(fWy-lW`@zCS_ z@_6-@)ep}-J(DQt@uHQT+hG!$z%7=es-?C}K zi>XcBX~*pQS1eStFnb~>WAoMK1^Y+t0B=SnaRFTElNX!>85jf@-a3Mq$jL1df1_zMh0B=?{kWMBboCBoifs!x-05WAy A;{X5v literal 0 HcmV?d00001 diff --git a/sys-apps/hgrep/hgrep-1.0.bep b/sys-apps/hgrep/hgrep-1.0.bep new file mode 100644 index 000000000..c4cf23569 --- /dev/null +++ b/sys-apps/hgrep/hgrep-1.0.bep @@ -0,0 +1,20 @@ +DESCRIPTION="header grep" +HOMEPAGE="http://www.ports.haiku-files.org/" +SRC_URI="http://www.ports.haiku-files.org/export/1966/haikuports/trunk/sys-apps/hgrep/hgrep-1.0.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="e909cea8f7ae7f6c73fe75a691b0440f" +BUILD { + cd hgrep-1.0 +} + +INSTALL { + cd hgrep-1.0 + BINDIR=`finddir B_COMMON_BIN_DIRECTORY` + mkdir -p $DESTDIR/$BINDIR + cp hgrep $DESTDIR/$BINDIR +} + +LICENSE="MIT" +COPYRIGHT="2011 Haiku, Inc." diff --git a/sys-apps/hgrep/hgrep-1.0.zip b/sys-apps/hgrep/hgrep-1.0.zip new file mode 100644 index 0000000000000000000000000000000000000000..02d9d17853b2d18d02e48c35214b91f4d969b637 GIT binary patch literal 370 zcmWIWW@Zs#U}E54n6dD?!}DXJOcxj!82$h;KZ7VkMtV_dfv%yRfj*cO8p6rI?6841 zAOwg*D_DT47#LLhPiGxA5ODqetLwH!x89^1FZsVDN++#Yo#dmay*MH{+GOGx4?W&5 zk5_M5{qWq=Gl`RSe@V%CrLHJ6QK9_v)Uy_>HYvaVvazSyP3P6R{r*FZ-Qu04a=ev~ z^e^r15IM$fwp?|>u_RN&LoOUg#QDwtwC>9Km{qlDo|58`gf+*0{WIH=xTj?2n(Uv~ zM4!5A-rv0_>(rj9XAS3i9Br1nT`-rEd7H7cw9%gj(H|wgOJ=0Z+8AZO_7QtVs^Y>e zZQXIl?E5tq+F6)A5tOmfe7D^FBX@u|Ba^rQt}x*R` + #endif + ++#ifdef __HAIKU__ ++#include ++#include ++#endif ++ + #if MSDOS_COMPILER==WIN32C || OS2 + #include + #endif +diff -urN less-451/lesskey.c less-451-haiku/lesskey.c +--- less-451/lesskey.c 2012-07-21 20:39:59.049020928 +0000 ++++ less-451-haiku/lesskey.c 2012-09-06 18:18:06.898891776 +0000 +@@ -245,8 +245,19 @@ + char *p; + char *pathname; + ++#ifdef __HAIKU__ ++ char path[B_PATH_NAME_LENGTH+B_FILE_NAME_LENGTH]; ++ dev_t volume = dev_for_path("/boot"); ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, volume, true, path, sizeof(path)) != B_OK) ++ return (NULL); ++ ++ pathname = mkpathname(&path, filename); ++ if (pathname != NULL) ++ return (pathname); ++#else + if ((p = getenv("HOME")) != NULL && *p != '\0') + pathname = mkpathname(p, filename); ++#endif + #if OS2 + else if ((p = getenv("INIT")) != NULL && *p != '\0') + pathname = mkpathname(p, filename); diff --git a/sys-apps/lgrep/lgrep b/sys-apps/lgrep/lgrep new file mode 100755 index 000000000..aa9a00c41 --- /dev/null +++ b/sys-apps/lgrep/lgrep @@ -0,0 +1,50 @@ +#!/bin/sh + +# +# Copyright 2011, Haiku, Inc. All Rights Reserved. +# Distributed under the terms of the MIT License. +# + +usage() { + echo `basename $0` \[-V\] \ + echo \- list files containing \ + echo " -V lists also directories searched" + echo "" + echo `basename $0` -h + echo \- Show this help + exit 0 +} + +if [ "$1" == "-V" ]; then + VERBOSE=1 + shift +else + VERBOSE=0 +fi + +if [ "$1" == "-h" ]; then + usage +fi + +if [ "x$1" == "x" ]; then + usage +fi + +LPATH=`echo $LIBRARY_PATH|sed "s|%A/lib:||"` +[ -d ./lib ] && LPATH="./lib:$LPATH" || true +LPATH=`echo $LPATH|sed "s/:/ /g"` +TEMPFILE=/boot/var/tmp/`basename $0`.$PPID +for libdir in `echo $LPATH`; do + if [ "$VERBOSE" == "1" ]; then + echo Searching in \"$libdir\"... + fi + for lib in $libdir/*.so ; do + echo "[ $lib ]" > $TEMPFILE + (nm -D $lib 2>/dev/null)|grep $1 >> $TEMPFILE + LINES=`wc -l $TEMPFILE | awk '{ print $1; }'` + if [ "$LINES" != "1" ]; then + cat $TEMPFILE + fi + done +done +rm -f $TEMPFILE diff --git a/sys-apps/lgrep/lgrep-1.0.bep b/sys-apps/lgrep/lgrep-1.0.bep new file mode 100644 index 000000000..1abb6f3fe --- /dev/null +++ b/sys-apps/lgrep/lgrep-1.0.bep @@ -0,0 +1,20 @@ +DESCRIPTION="library grep" +HOMEPAGE="http://www.ports.haiku-files.org/" +SRC_URI="http://www.ports.haiku-files.org/export/1966/haikuports/trunk/sys-apps/lgrep/lgrep-1.0.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="2a699321a362a64d0999bf883be21452" +BUILD { + cd lgrep-1.0 +} + +INSTALL { + cd lgrep-1.0 + BINDIR=`finddir B_COMMON_BIN_DIRECTORY` + mkdir -p $DESTDIR/$BINDIR + cp lgrep $DESTDIR/$BINDIR +} + +LICENSE="MIT" +COPYRIGHT="2011 Haiku, Inc." diff --git a/sys-apps/lgrep/lgrep-1.0.zip b/sys-apps/lgrep/lgrep-1.0.zip new file mode 100644 index 0000000000000000000000000000000000000000..eeb5ba0e6aaae9bfea5b96b3fe1930fa539f6a11 GIT binary patch literal 697 zcmWIWW@Zs#U}E54U|R6qVfHso25}|^hNH|34EzkD3_0mVsRg=*dItJnR%i$(1GCFo z-hewm99qG`00Ox|xASf}h}3+mJDT$N&Z--2Hf>EVQmYguiZME^GFX+Ly{9X3@m*E% zqd&i|>s{sg6q$YwEp0lymY0$>y}8wE;`MKCZJk+;QATBTb|wCv->B zbMXpQvF^=Gjv`uWhfJIAay`(WvvYsT|Jc227At+P<~?0LVRocPxIpq zDN^vvG*a4#+&r|8(`e#zQpWHb7 zH!^I!Epk_Hh4J!;GOg215uXn}dG@{JLawlPs?F7wr(LyEqE(*G|8jHQKD$eDFMrPc z`bRa>yiQ!S^_!gY%a>n|SzD~g?mvDwdXm^B z7U7u=2Ux$&W|LK6-8ie;B>k3U-h0b?tww8|*BmmBt;u>H_3KJ$Y|_l)h_iFJ@*LjJ z&i>bOcY@ka*WN_Wi_L%Y4lQ_|#QVIAJ?`tC7Tc<%+0VtFdTru;V^-Dv=i-O!3AcFX zC0YDrZxDKTnfYAY#)&Z*i(fx@t7GuzShDV73#$T-=EGgiwFV0}O%Z9D_)Gb0)l0d5 z`~lvKOyUB#k`^yG=`aGxw~ZhsMnYqSB(%^928IA{RyL3tMj-S8(viRf%D?~sAw4T{ literal 0 HcmV?d00001 diff --git a/sys-apps/man/man-1.6f.bep b/sys-apps/man/man-1.6f.bep index 8b8790262..3f91d74ee 100644 --- a/sys-apps/man/man-1.6f.bep +++ b/sys-apps/man/man-1.6f.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="sys-apps/groff >= 1.20.1" BUILD { cd man-1.6f - ./configure -prefix=/boot/common -sbindir=/boot/common/bin -confdir=`finddir B_COMMON_SETTINGS_DIRECTORY` + ./configure -prefix=`finddir B_COMMON_DIRECTORY` -sbindir=`finddir B_COMMON_BIN_DIRECTORY` -confdir=`finddir B_COMMON_SETTINGS_DIRECTORY` make } diff --git a/sys-apps/man/man-1.6g.bep b/sys-apps/man/man-1.6g.bep new file mode 100644 index 000000000..593d7f308 --- /dev/null +++ b/sys-apps/man/man-1.6g.bep @@ -0,0 +1,21 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="sys-apps/groff >= 1.20.1" +BUILD { + cd man-1.6g + ./configure -prefix=`finddir B_COMMON_DIRECTORY` \ + -sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + -confdir=`finddir B_COMMON_SETTINGS_DIRECTORY` + make +} + +INSTALL { + cd man-1.6g + make install +} +LICENSE="GNU GPL v2" +COPYRIGHT="1989-2012 Free Software Foundation, Inc." diff --git a/sys-apps/man/patches/man-1.6g.patch b/sys-apps/man/patches/man-1.6g.patch new file mode 100644 index 000000000..e3171b3ca --- /dev/null +++ b/sys-apps/man/patches/man-1.6g.patch @@ -0,0 +1,82 @@ +diff -up man-1.6g/configure.orig man-1.6g/configure +--- man-1.6g/configure.orig 2010-12-31 13:28:46.006291456 -0700 ++++ man-1.6g/configure 2012-05-02 21:57:49.683147264 -0600 +@@ -287,6 +287,12 @@ if test -f /xenix; then + esac + fi + ++echo checking for Haiku ++if test `uname` = "Haiku"; then ++ LIBS="$LIBS -L/boot/system/lib -llocale" ++ mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man ++fi ++ + echo checking how to get alloca + echo ' + #ifdef __GNUC__ +diff -up man-1.6g/man2html/Makefile.in.orig man-1.6g/man2html/Makefile.in +--- man-1.6g/man2html/Makefile.in.orig 2010-12-31 13:28:46.010747904 -0700 ++++ man-1.6g/man2html/Makefile.in 2012-05-02 21:58:50.621805568 -0600 +@@ -2,7 +2,7 @@ CC = @CC@ + CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes + OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o + EXEEXT = @EXEEXT@ +-bindir = $(DESTDIR)$(PREFIX)/usr/bin ++bindir = $(DESTDIR)$(PREFIX)/bin + mandir = $(DESTDIR)$(PREFIX)@mandir@ + vardir = $(DESTDIR)$(PREFIX)/var + httpdir = $(DESTDIR)$(PREFIX)/home/httpd +diff -up man-1.6g/src/Makefile.in.orig man-1.6g/src/Makefile.in +--- man-1.6g/src/Makefile.in.orig 2010-12-31 13:28:46.006815744 -0700 ++++ man-1.6g/src/Makefile.in 2012-05-02 21:59:22.845938688 -0600 +@@ -30,6 +30,8 @@ LDFLAGS ?= -s + + LIBOBJS = @LIBOBJS@ + ++LIBS = @LIBS@ ++ + all: man$(EXEEXT) man.conf apropos whatis makewhatis + + MANOBJS = man.o manfile.o manpath.o man-config.o man-getopt.o \ +diff -up man-1.6g/src/man.conf.in.orig man-1.6g/src/man.conf.in +--- man-1.6g/src/man.conf.in.orig 2010-10-25 18:22:24.008388608 -0600 ++++ man-1.6g/src/man.conf.in 2012-05-02 21:57:49.699400192 -0600 +@@ -36,11 +36,14 @@ + # + # Every automatically generated MANPATH includes these fields + # +-MANPATH /usr/man +-MANPATH /usr/share/man +-MANPATH /usr/local/man +-MANPATH /usr/local/share/man +-MANPATH /usr/X11R6/man ++MANPATH /boot/common/man ++MANPATH /boot/common/share/man ++MANPATH /boot/home/config/man ++MANPATH /boot/home/config/share/man ++MANPATH /boot/common/*/man ++MANPATH /boot/common/*/share/man ++MANPATH /boot/home/config/*/man ++MANPATH /boot/home/config/*/share/man + # + # Uncomment if you want to include one of these by default + # +@@ -58,15 +61,9 @@ MANPATH /usr/X11R6/man + # in the mandatory manpath already, but will keep man from statting + # lots of other nearby files and directories. + # +-MANPATH_MAP /bin /usr/share/man +-MANPATH_MAP /sbin /usr/share/man +-MANPATH_MAP /usr/bin /usr/share/man +-MANPATH_MAP /usr/sbin /usr/share/man +-MANPATH_MAP /usr/local/bin /usr/local/share/man +-MANPATH_MAP /usr/local/sbin /usr/local/share/man +-MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man +-MANPATH_MAP /usr/bin/X11 /usr/X11R6/man +-MANPATH_MAP /usr/bin/mh /usr/share/man ++MANPATH_MAP /bin /boot/common/share/man ++MANPATH_MAP /boot/common/bin /boot/common/share/man ++MANPATH_MAP /boot/home/config/bin /boot/home/config/share/man + # + # NOAUTOPATH keeps man from automatically adding directories that look like + # manual page directories to the path. diff --git a/sys-apps/xinetd/xinetd-2.3.14.bep b/sys-apps/xinetd/xinetd-2.3.14.bep index 1e4318b45..4957efced 100644 --- a/sys-apps/xinetd/xinetd-2.3.14.bep +++ b/sys-apps/xinetd/xinetd-2.3.14.bep @@ -21,18 +21,18 @@ BUILD { libtoolize --force --copy --install aclocal autoconf - mkdir -p ${DESTDIR}/`finddir B_COMMON_SERVERS_DIRECTORY` + mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` mkdir -p ${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man5 mkdir -p ${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man8 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_SERVERS_DIRECTORY` \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } INSTALL { cd xinetd-2.3.14 - mkdir -p ${DESTDIR}/`finddir B_COMMON_SERVERS_DIRECTORY` + mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` mkdir -p ${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man5 mkdir -p ${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man8 make install DESTDIR=${DESTDIR} diff --git a/sys-devel/autoconf/autoconf-2.65.bep b/sys-devel/autoconf/autoconf-2.65.bep index 86f450e97..17def4b3b 100644 --- a/sys-devel/autoconf/autoconf-2.65.bep +++ b/sys-devel/autoconf/autoconf-2.65.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd autoconf-2.65 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-devel/autoconf/autoconf-2.66.bep b/sys-devel/autoconf/autoconf-2.66.bep index d70cdb3b3..fafe8e8c8 100644 --- a/sys-devel/autoconf/autoconf-2.66.bep +++ b/sys-devel/autoconf/autoconf-2.66.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd autoconf-2.66 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-devel/autoconf/autoconf-2.67.bep b/sys-devel/autoconf/autoconf-2.67.bep index 4aae990ad..8930dea1b 100644 --- a/sys-devel/autoconf/autoconf-2.67.bep +++ b/sys-devel/autoconf/autoconf-2.67.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd autoconf-2.67 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-devel/autoconf/autoconf-2.67xz.bep b/sys-devel/autoconf/autoconf-2.67xz.bep index bc22f6ec7..a2bda5564 100644 --- a/sys-devel/autoconf/autoconf-2.67xz.bep +++ b/sys-devel/autoconf/autoconf-2.67xz.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd autoconf-2.67 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-devel/autoconf/autoconf-2.69.bep b/sys-devel/autoconf/autoconf-2.69.bep new file mode 100644 index 000000000..73321003d --- /dev/null +++ b/sys-devel/autoconf/autoconf-2.69.bep @@ -0,0 +1,30 @@ +DESCRIPTION="autoconf - Used to create autoconfiguration files" +HOMEPAGE="http://www.gnu.org/software/autoconf/" +SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz" +CHECKSUM_MD5="50f97f4159805e374639a73e2636f22e" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd autoconf-2.69 + libtoolize --force --copy --install + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` + make +} + +INSTALL { + cd autoconf-2.69 + make install +} + +TEST { + cd autoconf-2.69 + make check +} + +LICENSE="GNU GPL v2 + GNU GPL v3" +COPYRIGHT="1992-2012 Free Software Foundation, Inc." diff --git a/sys-devel/automake/automake-1.10.3.bep b/sys-devel/automake/automake-1.10.3.bep index d2dab1e67..fbf875cae 100644 --- a/sys-devel/automake/automake-1.10.3.bep +++ b/sys-devel/automake/automake-1.10.3.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd automake-1.10.3 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-devel/automake/automake-1.12.2.bep b/sys-devel/automake/automake-1.12.2.bep new file mode 100644 index 000000000..491853e4b --- /dev/null +++ b/sys-devel/automake/automake-1.12.2.bep @@ -0,0 +1,31 @@ +DESCRIPTION="automake - Used to generate Makefile.in from Makefile.am" +HOMEPAGE="http://www.gnu.org/software/automake/" +SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.12.2.tar.gz" +CHECKSUM_MD5="e620cb9e0259159341c0e0d6b712b67a" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd automake-1.12.2 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=$COMMON_DATA \ + --docdir=$COMMON_DOCS/doc/automake \ + --infodir=$COMMON_DOCS/info \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd automake-1.12.2 + make install +} + +TEST { + cd automake-1.12.2 + make check +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2012 Free Software Foundation, Inc." diff --git a/sys-devel/automake/automake-1.12.5.bep b/sys-devel/automake/automake-1.12.5.bep new file mode 100644 index 000000000..2d8fc54b8 --- /dev/null +++ b/sys-devel/automake/automake-1.12.5.bep @@ -0,0 +1,31 @@ +DESCRIPTION="automake - Used to generate Makefile.in from Makefile.am" +HOMEPAGE="http://www.gnu.org/software/automake/" +SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.12.5.tar.gz" +CHECKSUM_MD5="674f6d28f8723e0f478cb03de30f36f1" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd automake-1.12.5 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=$COMMON_DATA \ + --docdir=$COMMON_DOCS/doc/automake \ + --infodir=$COMMON_DOCS/info \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd automake-1.12.5 + make install +} + +TEST { + cd automake-1.12.5 + make check +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2012 Free Software Foundation, Inc." diff --git a/sys-devel/automake/automake-1.13.1.bep b/sys-devel/automake/automake-1.13.1.bep new file mode 100644 index 000000000..e59db8f10 --- /dev/null +++ b/sys-devel/automake/automake-1.13.1.bep @@ -0,0 +1,32 @@ +DESCRIPTION="automake - Used to generate Makefile.in from Makefile.am" +HOMEPAGE="http://www.gnu.org/software/automake/" +SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz" +CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd automake-1.13.1 + libtoolize --force --copy --install + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=$COMMON_DATA \ + --docdir=$COMMON_DOCS/doc/automake \ + --infodir=$COMMON_DOCS/info \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd automake-1.13.1 + make install +} + +TEST { + cd automake-1.13.1 + make check +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2013 Free Software Foundation, Inc." diff --git a/sys-devel/automake/automake-1.13.bep b/sys-devel/automake/automake-1.13.bep new file mode 100644 index 000000000..d31d5c63c --- /dev/null +++ b/sys-devel/automake/automake-1.13.bep @@ -0,0 +1,31 @@ +DESCRIPTION="automake - Used to generate Makefile.in from Makefile.am" +HOMEPAGE="http://www.gnu.org/software/automake/" +SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.tar.gz" +CHECKSUM_MD5="255661c7729d04ef2f8f58d076c89ecc" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd automake-1.13 + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=$COMMON_DATA \ + --docdir=$COMMON_DOCS/doc/automake \ + --infodir=$COMMON_DOCS/info \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd automake-1.13 + make install +} + +TEST { + cd automake-1.13 + make check +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2012 Free Software Foundation, Inc." diff --git a/sys-devel/automake/patches/automake-1.10.1.diff b/sys-devel/automake/patches/automake-1.10.1.diff deleted file mode 100644 index cbbbd8df8..000000000 --- a/sys-devel/automake/patches/automake-1.10.1.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff -ur automake-1.10.1-orig/lib/config.guess automake-1.10.1/lib/config.guess ---- automake-1.10.1-orig/lib/config.guess 2008-01-19 09:54:57.000000000 +0000 -+++ automake-1.10.1/lib/config.guess 2008-03-20 23:52:43.000000000 +0000 -@@ -1216,6 +1216,12 @@ - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ BeMac:Haiku:*:*) -+ echo powerpc-apple-haiku -+ exit ;; -+ BePC:Haiku:*:*) -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -Only in automake-1.10.1/lib: config.guess~ diff --git a/sys-devel/bc/bc-1.06.bep b/sys-devel/bc/bc-1.06.bep index ad7e51c46..67808119b 100644 --- a/sys-devel/bc/bc-1.06.bep +++ b/sys-devel/bc/bc-1.06.bep @@ -7,7 +7,9 @@ DEPEND="" CHECKSUM_MD5="d44b5dddebd8a7a7309aea6c36fda117" BUILD { cd bc-1.06 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } diff --git a/sys-devel/bison/bison-2.4.1.bep b/sys-devel/bison/bison-2.4.1.bep index ce04eeeb4..a537c49e8 100644 --- a/sys-devel/bison/bison-2.4.1.bep +++ b/sys-devel/bison/bison-2.4.1.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd bison-2.4.1 - ./configure --prefix=/boot/common --disable-nls + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-nls make } diff --git a/sys-devel/bison/bison-2.4.bep b/sys-devel/bison/bison-2.4.bep index 20d3115b2..5e6b68cc2 100644 --- a/sys-devel/bison/bison-2.4.bep +++ b/sys-devel/bison/bison-2.4.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd bison-2.4 - ./configure --prefix=/boot/common --disable-nls + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-nls make } diff --git a/sys-devel/bison/bison-2.5.bep b/sys-devel/bison/bison-2.5.bep new file mode 100644 index 000000000..002b5e015 --- /dev/null +++ b/sys-devel/bison/bison-2.5.bep @@ -0,0 +1,30 @@ +DESCRIPTION="bison - A yacc-compatible parser generator" +HOMEPAGE="http://www.gnu.org/software/bison/bison.html" +SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.5.tar.gz" +CHECKSUM_MD5="687e1dcd29452789d34eaeea4c25abe4" +REVISION="1" +STATUS_HAIKU="stable" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +DEPEND="" +BUILD { + cd bison-2.5 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --disable-nls + make +} + +INSTALL { + cd bison-2.5 + make install +} + +TEST { + cd bison-2.5 + make check +} + +LICENSE="GNU GPL v3" +COPYRIGHT="1992-2011 Free Software Foundation, Inc." diff --git a/sys-devel/bison/bison-2.6.2.bep b/sys-devel/bison/bison-2.6.2.bep new file mode 100644 index 000000000..be4759628 --- /dev/null +++ b/sys-devel/bison/bison-2.6.2.bep @@ -0,0 +1,30 @@ +DESCRIPTION="bison - A yacc-compatible parser generator" +HOMEPAGE="http://www.gnu.org/software/bison/bison.html" +SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.6.2.tar.gz" +CHECKSUM_MD5="8b8e458d4ce0cc184f1a58af93663647" +REVISION="15" +STATUS_HAIKU="stable" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +DEPEND="" +BUILD { + cd bison-2.6.2 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --disable-nls + make +} + +INSTALL { + cd bison-2.6.2 + make install +} + +TEST { + cd bison-2.6.2 + make check +} + +LICENSE="GNU GPL v3" +COPYRIGHT="1992-2011 Free Software Foundation, Inc." diff --git a/sys-devel/bison/patches/bison-2.5-c89.diff b/sys-devel/bison/patches/bison-2.5-c89.diff new file mode 100644 index 000000000..7be2c780d --- /dev/null +++ b/sys-devel/bison/patches/bison-2.5-c89.diff @@ -0,0 +1,29 @@ +diff -urN bison-2.5/src/AnnotationList.c bison-2.5-haiku/src/AnnotationList.c +--- bison-2.5/src/AnnotationList.c 2011-03-06 16:47:12.043515904 -0800 ++++ bison-2.5-haiku/src/AnnotationList.c 2012-08-26 09:54:44.000000000 -0700 +@@ -233,9 +233,10 @@ + AnnotationList *annotation_node = + AnnotationList__alloc_on_obstack ( + self->inadequacyNode->contributionCount, annotations_obstackp); +- annotation_node->inadequacyNode = self->inadequacyNode; + bool potential_contribution = false; + bitset *lookaheads = NULL; ++ annotation_node->inadequacyNode = self->inadequacyNode; ++ + { + ContributionIndex ci; + for (ci = 0; ci < self->inadequacyNode->contributionCount; ++ci) +diff -urN bison-2.5/src/ielr.c bison-2.5-haiku/src/ielr.c +--- bison-2.5/src/ielr.c 2011-03-06 16:47:12.044564480 -0800 ++++ bison-2.5-haiku/src/ielr.c 2012-08-26 10:05:25.000000000 -0700 +@@ -1032,9 +1032,9 @@ + lookahead sets. */ + if (!annotation_lists) + { ++ state_list *node; + timevar_push (TV_IELR_PHASE4); + initialize_LA (); +- state_list *node; + for (node = first_state; node; node = node->next) + if (!node->state->consistent) + { diff --git a/sys-devel/bison/patches/bison-2.5.patch b/sys-devel/bison/patches/bison-2.5.patch new file mode 100644 index 000000000..cf4f0c08e --- /dev/null +++ b/sys-devel/bison/patches/bison-2.5.patch @@ -0,0 +1,29 @@ +diff -urN bison-2.5/src/location.c bison-2.5-haiku/src/location.c +--- bison-2.5/src/location.c 2011-05-01 22:17:32.046137344 +0000 ++++ bison-2.5-haiku/src/location.c 2012-06-01 18:19:15.538443776 +0000 +@@ -144,11 +144,11 @@ + /* Must search in reverse since the file name field may + * contain `.' or `:'. */ + char *delim = mbsrchr (loc_str, '.'); +- aver (delim); ++ aver (delim != NULL); + *delim = '\0'; + bound->column = atoi (delim+1); + delim = mbsrchr (loc_str, ':'); +- aver (delim); ++ aver (delim != NULL); + *delim = '\0'; + bound->line = atoi (delim+1); + bound->file = uniqstr_new (loc_str); +diff -urN bison-2.5/src/muscle-tab.c bison-2.5-haiku/src/muscle-tab.c +--- bison-2.5/src/muscle-tab.c 2011-05-14 22:17:12.043253760 +0000 ++++ bison-2.5-haiku/src/muscle-tab.c 2012-06-01 18:16:05.827326464 +0000 +@@ -336,7 +336,7 @@ + { + location loc; + char const *value = muscle_find_const (key); +- aver (value); ++ aver (value != NULL); + aver (*value == '['); + aver (*++value == '['); + while (*++value) diff --git a/sys-devel/bison/patches/bison-2.6.2.patch b/sys-devel/bison/patches/bison-2.6.2.patch new file mode 100644 index 000000000..308e3e88b --- /dev/null +++ b/sys-devel/bison/patches/bison-2.6.2.patch @@ -0,0 +1,81 @@ +diff -urN bison-2.6.2/src/AnnotationList.c bison-2.6.2-haiku/src/AnnotationList.c +--- bison-2.6.2/src/AnnotationList.c 2012-03-30 05:39:19.030146560 -0700 ++++ bison-2.6.2-haiku/src/AnnotationList.c 2012-09-30 11:25:40.750518272 -0700 +@@ -230,12 +230,13 @@ + state **predecessor; + for (predecessor = predecessors[s->number]; *predecessor; ++predecessor) + { ++ bool potential_contribution = false; ++ bitset *lookaheads = NULL; + AnnotationList *annotation_node = + AnnotationList__alloc_on_obstack ( + self->inadequacyNode->contributionCount, annotations_obstackp); + annotation_node->inadequacyNode = self->inadequacyNode; +- bool potential_contribution = false; +- bitset *lookaheads = NULL; ++ + { + ContributionIndex ci; + for (ci = 0; ci < self->inadequacyNode->contributionCount; ++ci) +diff -urN bison-2.6.2/src/ielr.c bison-2.6.2-haiku/src/ielr.c +--- bison-2.6.2/src/ielr.c 2012-03-30 05:39:19.032243712 -0700 ++++ bison-2.6.2-haiku/src/ielr.c 2012-09-30 11:28:10.713555968 -0700 +@@ -1032,9 +1032,9 @@ + lookahead sets. */ + if (!annotation_lists) + { ++ state_list *node; + timevar_push (TV_IELR_PHASE4); + initialize_LA (); +- state_list *node; + for (node = first_state; node; node = node->next) + if (!node->state->consistent) + { +diff -urN bison-2.6.2/src/location.c bison-2.6.2-haiku/src/location.c +--- bison-2.6.2/src/location.c 2012-03-30 05:39:19.033030144 -0700 ++++ bison-2.6.2-haiku/src/location.c 2012-09-30 10:32:52.147587072 -0700 +@@ -144,11 +144,11 @@ + /* Must search in reverse since the file name field may + * contain `.' or `:'. */ + char *delim = mbsrchr (loc_str, '.'); +- aver (delim); ++ aver (delim != NULL); + *delim = '\0'; + bound->column = atoi (delim+1); + delim = mbsrchr (loc_str, ':'); +- aver (delim); ++ aver (delim != NULL); + *delim = '\0'; + bound->line = atoi (delim+1); + bound->file = uniqstr_new (loc_str); +diff -urN bison-2.6.2/src/muscle-tab.c bison-2.6.2-haiku/src/muscle-tab.c +--- bison-2.6.2/src/muscle-tab.c 2012-07-30 09:06:21.033816576 -0700 ++++ bison-2.6.2-haiku/src/muscle-tab.c 2012-09-30 10:32:52.255852544 -0700 +@@ -344,7 +344,7 @@ + { + location loc; + char const *value = muscle_find_const (key); +- aver (value); ++ aver (value != NULL); + aver (*value == '['); + aver (*++value == '['); + while (*++value) +diff -urN bison-2.6.2/src/scan-code.l bison-2.6.2-haiku/src/scan-code.l +--- bison-2.6.2/src/scan-code.l 2012-07-30 09:06:21.009437184 -0700 ++++ bison-2.6.2-haiku/src/scan-code.l2 2012-09-30 19:52:46.294912000 -0700 +@@ -611,12 +611,12 @@ + indent += SUB_INDENT; + if (len == 0) + { +- location sym_loc = text_loc; +- sym_loc.start.column += 1; +- sym_loc.end = sym_loc.start; + const char *format = + _("syntax error after '%c', expecting integer, letter," + " '_', '[', or '$'"); ++ location sym_loc = text_loc; ++ sym_loc.start.column += 1; ++ sym_loc.end = sym_loc.start; + complain_at_indent (sym_loc, &indent, format, dollar_or_at); + } + else if (midrule_rhs_index) diff --git a/sys-devel/clang/clang-3.0.bep b/sys-devel/clang/clang-3.0.bep new file mode 100644 index 000000000..1b9813895 --- /dev/null +++ b/sys-devel/clang/clang-3.0.bep @@ -0,0 +1,26 @@ +DESCRIPTION="clang: an llvm front end compiler for C and C++" +HOMEPAGE="http://www.llvm.org/" +SRC_URI="http://llvm.org/releases/3.0/llvm-3.0.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="groff" +CHECKSUM_MD5="a8e5f5f1c1adebae7b4a654c376a6005" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +BUILD { + cd llvm-3.0.src/tools + wget "http://llvm.org/releases/3.0/clang-3.0.tar.gz" + echo "Extracting clang llvm tool..." + tar xzf clang-3.0.tar.gz + mv clang-3.0.src clang + cd .. + ./configure --enable-optimized --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd llvm-3.0.src + make install +} + +LICENSE="UIUC" +COPYRIGHT="2003-2010 University of Illinois at Urbana-Champaign" diff --git a/sys-devel/clang/clang-3.2.bep b/sys-devel/clang/clang-3.2.bep new file mode 100644 index 000000000..56f007d2d --- /dev/null +++ b/sys-devel/clang/clang-3.2.bep @@ -0,0 +1,36 @@ +DESCRIPTION="clang: an llvm front end compiler for C and C++" +HOMEPAGE="http://www.llvm.org/" +SRC_URI="http://llvm.org/releases/3.2/llvm-3.2.src.tar.gz" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="groff" +CHECKSUM_MD5="71610289bbc819e3e15fdd562809a2d7" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +BUILD { + if [ ! -L /usr ]; then + ln -s /boot/system/ /usr + fi + cd llvm-3.2.src/tools + wget "http://llvm.org/releases/3.2/clang-3.2.src.tar.gz" + echo "Extracting clang llvm tool..." + tar xzf clang-3.2.src.tar.gz + mv clang-3.2.src clang + cd .. + cp -r /boot/common/data/libtool/config/. autoconf/ + cp -r /boot/common/data/libtool/config/. projects/sample/autoconf/ + ./configure --enable-optimized --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd llvm-3.2.src + make install +} + +TEST { + cd llvm-3.2.src + make check +} + +LICENSE="UIUC" +COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign" diff --git a/sys-devel/clang/licenses/UIUC b/sys-devel/clang/licenses/UIUC new file mode 100644 index 000000000..1b1047ca3 --- /dev/null +++ b/sys-devel/clang/licenses/UIUC @@ -0,0 +1,69 @@ +============================================================================== +LLVM Release License +============================================================================== +University of Illinois/NCSA +Open Source License + +Copyright (c) 2003-2011 University of Illinois at Urbana-Champaign. +All rights reserved. + +Developed by: + + LLVM Team + + University of Illinois at Urbana-Champaign + + http://llvm.org + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal with +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimers. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimers in the + documentation and/or other materials provided with the distribution. + + * Neither the names of the LLVM Team, University of Illinois at + Urbana-Champaign, nor the names of its contributors may be used to + endorse or promote products derived from this Software without specific + prior written permission. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE +SOFTWARE. + +============================================================================== +Copyrights and Licenses for Third Party Software Distributed with LLVM: +============================================================================== +The LLVM software contains code written by third parties. Such software will +have its own individual LICENSE.TXT file in the directory in which it appears. +This file will describe the copyrights, license, and restrictions which apply +to that code. + +The disclaimer of warranty in the University of Illinois Open Source License +applies to all code in the LLVM Distribution, and nothing in any of the +other licenses gives permission to use the names of the LLVM Team or the +University of Illinois to endorse or promote products derived from this +Software. + +The following pieces of software have additional or alternate copyrights, +licenses, and/or restrictions: + +Program Directory +------- --------- +Autoconf llvm/autoconf + llvm/projects/ModuleMaker/autoconf + llvm/projects/sample/autoconf +CellSPU backend llvm/lib/Target/CellSPU/README.txt +Google Test llvm/utils/unittest/googletest +OpenBSD regex llvm/lib/Support/{reg*, COPYRIGHT.regex} diff --git a/sys-devel/distcc/distcc-3.1-1.build b/sys-devel/distcc/distcc-3.1-1.build new file mode 100644 index 000000000..0a84ee52d --- /dev/null +++ b/sys-devel/distcc/distcc-3.1-1.build @@ -0,0 +1,5 @@ +cd distcc-3.1 +libtoolize --force --copy --install +./autogen.sh +./configure LDFLAGS=-L/boot/common/lib/python2.6/config --prefix=`finddir B_COMMON_DIRECTORY` +make diff --git a/sys-devel/distcc/distcc-3.1-1.install b/sys-devel/distcc/distcc-3.1-1.install new file mode 100644 index 000000000..4d4fb9d59 --- /dev/null +++ b/sys-devel/distcc/distcc-3.1-1.install @@ -0,0 +1,2 @@ +cd distcc-3.1 +make install diff --git a/sys-devel/distcc/distcc-3.1-1.patch b/sys-devel/distcc/distcc-3.1-1.patch new file mode 100644 index 000000000..465069fcf --- /dev/null +++ b/sys-devel/distcc/distcc-3.1-1.patch @@ -0,0 +1,100 @@ +diff -Naur distcc-3.1/Makefile.in distcc-3.1-haiku/Makefile.in +--- distcc-3.1/Makefile.in 2008-12-02 21:50:31.066060288 +0000 ++++ distcc-3.1-haiku/Makefile.in 2011-05-21 01:10:21.995098624 +0000 +@@ -554,7 +554,7 @@ + + # The include-server is a python app, so we use Python's build system. We pass + # the distcc version, the source location, the CPP flags (for location of the +-# includes), and the build location. ++# includes), LD flags and the build location. + include-server: + if test -z "$(INCLUDESERVER_PYTHON)"; then \ + echo "Not building $@: No suitable python found"; \ +@@ -564,6 +564,7 @@ + SRCDIR="$(srcdir)" \ + CFLAGS="$(CFLAGS) $(PYTHON_CFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" \ ++ LDFLAGS="$(LDFLAGS)" \ + $(INCLUDESERVER_PYTHON) "$(srcdir)/include_server/setup.py" \ + build \ + --build-base="$(include_server_builddir)" \ +diff -Naur distcc-3.1/configure.ac distcc-3.1-haiku/configure.ac +--- distcc-3.1/configure.ac 2008-12-02 21:50:31.066846720 +0000 ++++ distcc-3.1-haiku/configure.ac 2011-05-21 01:10:34.207618048 +0000 +@@ -329,9 +329,12 @@ + # only looks in /etc/hosts), so we only look for -lsocket if we need + # it. + AC_SEARCH_LIBS(gethostent, [nsl]) +-AC_SEARCH_LIBS(setsockopt, [socket]) ++AC_SEARCH_LIBS(setsockopt, [socket network]) + AC_SEARCH_LIBS(hstrerror, [resolv]) + AC_SEARCH_LIBS(inet_aton, [resolv]) ++AC_SEARCH_LIBS(strsep, [bsd]) ++AC_SEARCH_LIBS(wait3, [bsd]) ++AC_SEARCH_LIBS(wait4, [bsd]) + + if test x"$with_included_popt" != x"yes" && test x"$with_included_popt" != xno + then +@@ -379,6 +382,7 @@ + AC_CHECK_FUNCS([getrusage strsignal gettimeofday]) + AC_CHECK_FUNCS([getaddrinfo getnameinfo inet_ntop inet_ntoa]) + AC_CHECK_FUNCS([strndup strsep mmap strlcpy]) ++AC_CHECK_FUNCS([nice]) + + AC_CHECK_FUNCS([getloadavg]) + +@@ -471,6 +475,8 @@ + AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [define if you have struct sockaddr_storage]),, + [#include ]) + ++AC_CHECK_MEMBERS([struct rusage.ru_minflt, struct rusage.ru_majflt]) ++ + AC_ARG_WITH(avahi, + AC_HELP_STRING([--without-avahi], [build without avahi])) + +diff -Naur distcc-3.1/src/daemon.c distcc-3.1-haiku/src/daemon.c +--- distcc-3.1/src/daemon.c 2008-12-02 21:50:25.053739520 +0000 ++++ distcc-3.1-haiku/src/daemon.c 2011-05-21 01:11:07.709361664 +0000 +@@ -172,15 +172,19 @@ + if ((ret = dcc_set_lifetime()) != 0) + dcc_exit(ret); + ++#ifdef HAVE_NICE + /* do this before giving away root */ + if (nice(opt_niceness) == -1) { + rs_log_warning("nice %d failed: %s", opt_niceness, + strerror(errno)); + /* continue anyhow */ + } ++#endif + ++#ifndef __HAIKU__ + if ((ret = dcc_discard_root()) != 0) + dcc_exit(ret); ++#endif + + /* Discard privileges before opening log so that if it's created, it has + * the right ownership. */ +diff -Naur distcc-3.1/src/exec.c distcc-3.1-haiku/src/exec.c +--- distcc-3.1/src/exec.c 2008-12-02 21:50:24.054263808 +0000 ++++ distcc-3.1-haiku/src/exec.c 2011-05-21 01:10:57.257687552 +0000 +@@ -488,12 +488,19 @@ + * critique_status(). */ + rs_trace("%s child %ld terminated with status %#x", + what, (long) ret_pid, *wait_status); ++#if defined HAVE_RUSAGE_RU_MINFLT && defined HAVE_RUSAGE_RU_MAJFLT + rs_log_info("%s times: user %ld.%06lds, system %ld.%06lds, " + "%ld minflt, %ld majflt", + what, + ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec, + ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec, + ru.ru_minflt, ru.ru_majflt); ++#else ++ rs_log_info("%s times: user %ld.%06lds, system %ld.%06lds", ++ what, ++ ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec, ++ ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec); ++#endif + + return 0; + } diff --git a/sys-devel/distcc/distcc-3.1-1.test b/sys-devel/distcc/distcc-3.1-1.test new file mode 100644 index 000000000..6bd69d58d --- /dev/null +++ b/sys-devel/distcc/distcc-3.1-1.test @@ -0,0 +1,2 @@ +cd distcc-3.1 +make check diff --git a/sys-devel/gettext/gettext-0.18.1.1-dev.bep b/sys-devel/gettext/gettext-0.18.1.1-dev.bep index cdc1bb475..dc485e35a 100644 --- a/sys-devel/gettext/gettext-0.18.1.1-dev.bep +++ b/sys-devel/gettext/gettext-0.18.1.1-dev.bep @@ -1,50 +1,22 @@ -DESCRIPTION="gettext" +DESCRIPTION="gettext-dev - full tools included" HOMEPAGE="http://www.gnu.org/software/gettext/" SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz" CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="dev-libs/gnulib = 9999" +REVISION="2" +STATUS_HAIKU="stable" +DEPEND="" BUILD { cd gettext-0.18.1.1 - - if [ ! -e `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999 ] ; then - echo "gnulib not found, so updating it now..." - haikuporter -i gnulib - fi - echo "Copying gnulib to gettext work directory..." - cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/binary* gettext-tools/gnulib-lib/ - cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/fseek* gettext-tools/gnulib-lib/ - cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/iswblank* gettext-tools/gnulib-lib/ - cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/fcntl* gettext-tools/gnulib-lib/ - - cp -a build-aux gettext-tools/ - cd gettext-tools - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac libtoolize --force --copy --install - cd .. - libtoolize --force --copy --install - sed -i 's/AC_INIT/AC_INIT([gettext],[0.18.1.1])/' configure.ac ./autogen.sh --quick --skip-gnulib - cd gettext-runtime - sed -i 's/AC_INIT/AC_INIT([gettext-runtime],[0.18.1.1])/' configure.ac - sed -i 's/gl_INIT_PACKAGE/dnl gl_INIT_PACKAGE was here/' configure.ac - sed -i 's/gl_WOE32_DLL/dnl gl_WOE32_DLL was here/' configure.ac - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac - libtoolize --force --copy --install - autoconf -Wnone - aclocal -I m4 -I gnulib-m4 --install --force - libtoolize --force --copy --install - autoconf -Wnone - export EXTRA_CONF="--disable-java" - cd ../ ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --disable-java --without-git \ --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc \ + --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/gettext \ --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make + make } INSTALL { @@ -53,9 +25,7 @@ INSTALL { } TEST { - cd gettext-0.18.1.1/gettext-tools - make check - cd ../gettext-0.18.1.1/gettext-runtime + cd gettext-0.18.1.1/gettext-runtime/tests make check } diff --git a/sys-devel/gettext/gettext-0.18.1.1.bep b/sys-devel/gettext/gettext-0.18.1.1.bep index efab1299d..9254ac9b2 100644 --- a/sys-devel/gettext/gettext-0.18.1.1.bep +++ b/sys-devel/gettext/gettext-0.18.1.1.bep @@ -2,7 +2,7 @@ DESCRIPTION="gettext" HOMEPAGE="http://www.gnu.org/software/gettext/" SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz" CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" BUILD { @@ -24,7 +24,7 @@ BUILD { # export LDFLAGS="-lnetwork -liconv" ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc \ + --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/gettext \ --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man diff --git a/sys-devel/gettext/patches/gettext-0.18.1.1-dev.patch b/sys-devel/gettext/patches/gettext-0.18.1.1-dev.patch new file mode 100644 index 000000000..0250765dc --- /dev/null +++ b/sys-devel/gettext/patches/gettext-0.18.1.1-dev.patch @@ -0,0 +1,11 @@ +--- gettext-0.18.1.1-orig/gettext-tools/gnulib-lib/binary-io.h 2010-05-24 09:42:36.028573696 +0000 ++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h 2012-08-03 20:17:21.155189248 +0000 +@@ -31,7 +31,7 @@ + # define O_BINARY _O_BINARY + # define O_TEXT _O_TEXT + #endif +-#if defined __BEOS__ || defined __HAIKU__ ++#if defined __BEOS__ + /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */ + # undef O_BINARY + # undef O_TEXT 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 8ff3a0f51..a96aa8646 100644 --- a/sys-devel/gettext/patches/gettext-0.18.1.1.patch +++ b/sys-devel/gettext/patches/gettext-0.18.1.1.patch @@ -1,7 +1,7 @@ -diff -urN gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac gettext-0.18.1.1-haiku/gettext-runtime/libasprintf/configure.ac ---- gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac 2010-06-06 12:49:57.044040192 +0000 -+++ gettext-0.18.1.1-haiku/gettext-runtime/libasprintf/configure.ac 2011-01-14 15:54:38.003670016 +0000 -@@ -44,7 +44,7 @@ +diff -up gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac.orig gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac +--- gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac.orig 2010-06-06 06:49:57.058720256 -0600 ++++ gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac 2012-05-04 20:40:00.847511552 -0600 +@@ -44,7 +44,7 @@ LT_INIT([win32-dll]) case "$host_os" in # On Cygwin, without -no-undefined, a warning is emitted and only a static # library is built. @@ -10,10 +10,10 @@ diff -urN gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac gettext-0.18 *) LTNOUNDEF='' ;; esac AC_SUBST([LTNOUNDEF]) -diff -urN gettext-0.18.1.1/gettext-tools/configure.ac gettext-0.18.1.1-haiku/gettext-tools/configure.ac ---- gettext-0.18.1.1/gettext-tools/configure.ac 2010-06-06 20:04:04.061079552 +0000 -+++ gettext-0.18.1.1-haiku/gettext-tools/configure.ac 2011-01-14 15:54:53.031981568 +0000 -@@ -100,7 +100,7 @@ +diff -up gettext-0.18.1.1/gettext-tools/configure.ac.orig gettext-0.18.1.1/gettext-tools/configure.ac +--- gettext-0.18.1.1/gettext-tools/configure.ac.orig 2010-06-06 14:04:04.007602176 -0600 ++++ gettext-0.18.1.1/gettext-tools/configure.ac 2012-05-04 20:40:00.860880896 -0600 +@@ -100,7 +100,7 @@ LT_LANG([Windows Resource]) case "$host_os" in # On Cygwin, without -no-undefined, a warning is emitted and only a static # library is built. @@ -22,3 +22,19 @@ diff -urN gettext-0.18.1.1/gettext-tools/configure.ac gettext-0.18.1.1-haiku/get *) LTNOUNDEF='' ;; esac AC_SUBST([LTNOUNDEF]) +diff -up gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h.orig gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h +--- gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h.orig 2012-05-04 21:23:18.533200896 -0600 ++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h 2012-05-04 21:23:54.882900992 -0600 +@@ -31,11 +31,6 @@ + # define O_BINARY _O_BINARY + # define O_TEXT _O_TEXT + #endif +-#if defined __BEOS__ || defined __HAIKU__ +- /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */ +-# undef O_BINARY +-# undef O_TEXT +-#endif + + /* SET_BINARY (fd); + changes the file descriptor fd to perform binary I/O. */ +diff -up gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe2.c.orig gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe2.c diff --git a/sys-devel/jam/jam-2.5.bep b/sys-devel/jam/jam-2.5.bep index ccb7453df..42d0b0c75 100644 --- a/sys-devel/jam/jam-2.5.bep +++ b/sys-devel/jam/jam-2.5.bep @@ -1,19 +1,19 @@ -DESCRIPTION="jam" -HOMEPAGE="http://www.perforce.com/jam/jam.html" -SRC_URI="svn://svn.berlios.de/haiku/buildtools/trunk/jam" +DESCRIPTION="jam" +HOMEPAGE="http://www.perforce.com/jam/jam.html" +SRC_URI="git://git.haiku-os.org/buildtools" REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" BUILD { - cd jam-2.5 - jam + cd jam-2.5/jam + make } INSTALL { - cd jam-2.5 - mkdir -p ${DESTDIR}/boot/common/bin - cp -a bin.haikux86/jam ${DESTDIR}/boot/common/bin/jam + cd jam-2.5/jam + mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` + cp -a bin.haikux86/jam ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/jam } LICENSE="Jam" COPYRIGHT="1993-2003 Christopher Seiwald" diff --git a/sys-devel/libtool/libtool-2.2.10.bep b/sys-devel/libtool/libtool-2.2.10.bep index e298ca2d0..186945748 100644 --- a/sys-devel/libtool/libtool-2.2.10.bep +++ b/sys-devel/libtool/libtool-2.2.10.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd libtool-2.2.10 ./bootstrap - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-devel/libtool/libtool-2.2.6.bep b/sys-devel/libtool/libtool-2.2.6.bep index a0135c4b0..edfbbcdae 100644 --- a/sys-devel/libtool/libtool-2.2.6.bep +++ b/sys-devel/libtool/libtool-2.2.6.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd libtool-2.2.6 ./bootstrap - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-devel/libtool/libtool-2.2.6b.bep b/sys-devel/libtool/libtool-2.2.6b.bep index d2625a7ba..20e87fecc 100644 --- a/sys-devel/libtool/libtool-2.2.6b.bep +++ b/sys-devel/libtool/libtool-2.2.6b.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd libtool-2.2.6b ./bootstrap - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-devel/libtool/libtool-2.2.7b.bep b/sys-devel/libtool/libtool-2.2.7b.bep index 73b77ca94..bbc0f7af6 100644 --- a/sys-devel/libtool/libtool-2.2.7b.bep +++ b/sys-devel/libtool/libtool-2.2.7b.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd libtool-2.2.7b ./bootstrap - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-devel/libtool/libtool-2.2.8.bep b/sys-devel/libtool/libtool-2.2.8.bep index 9ef7d80cb..58dadb83a 100644 --- a/sys-devel/libtool/libtool-2.2.8.bep +++ b/sys-devel/libtool/libtool-2.2.8.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd libtool-2.2.8 ./bootstrap - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-devel/libtool/libtool-2.2.x.bep b/sys-devel/libtool/libtool-2.2.x.bep index c4c27b294..6ba36a6ad 100644 --- a/sys-devel/libtool/libtool-2.2.x.bep +++ b/sys-devel/libtool/libtool-2.2.x.bep @@ -9,7 +9,7 @@ DEPEND="" BUILD { cd libtool-2.2.x ./bootstrap - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-devel/libtool/libtool-2.4.2.bep b/sys-devel/libtool/libtool-2.4.2.bep new file mode 100644 index 000000000..ffb7ebf6b --- /dev/null +++ b/sys-devel/libtool/libtool-2.4.2.bep @@ -0,0 +1,29 @@ +DESCRIPTION="libtool - a generic library support script" +HOMEPAGE="http://www.gnu.org/software/libtool" +SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz" +CHECKSUM_MD5="d2f3b7d4627e69e13514a40e72a24d50" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd libtool-2.4.2 + ./bootstrap + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd libtool-2.4.2 + make install +} + +TEST { + cd libtool-2.4.2 + make check +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2004-2011 Free Software Foundation, Inc." diff --git a/sys-devel/libtool/patches/libtool-2.4.2.patch b/sys-devel/libtool/patches/libtool-2.4.2.patch new file mode 100644 index 000000000..c644ca09d --- /dev/null +++ b/sys-devel/libtool/patches/libtool-2.4.2.patch @@ -0,0 +1,12 @@ +diff -urN libtool-2.4.2/libltdl/m4/libtool.m4 libtool-2.4.2-haiku/libltdl/m4/libtool.m4 +--- libtool-2.4.2/libltdl/m4/libtool.m4 2010-09-22 01:41:19.046923776 -0700 ++++ libtool-2.4.2-haiku/libltdl/m4/libtool.m4 2011-07-26 09:06:47.362807296 -0700 +@@ -2472,7 +2472,7 @@ + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH +- shlibpath_overrides_runpath=yes ++ shlibpath_overrides_runpath=no + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; diff --git a/sys-devel/llvm/licenses/UIUC b/sys-devel/llvm/licenses/UIUC new file mode 100644 index 000000000..1b1047ca3 --- /dev/null +++ b/sys-devel/llvm/licenses/UIUC @@ -0,0 +1,69 @@ +============================================================================== +LLVM Release License +============================================================================== +University of Illinois/NCSA +Open Source License + +Copyright (c) 2003-2011 University of Illinois at Urbana-Champaign. +All rights reserved. + +Developed by: + + LLVM Team + + University of Illinois at Urbana-Champaign + + http://llvm.org + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal with +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimers. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimers in the + documentation and/or other materials provided with the distribution. + + * Neither the names of the LLVM Team, University of Illinois at + Urbana-Champaign, nor the names of its contributors may be used to + endorse or promote products derived from this Software without specific + prior written permission. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE +SOFTWARE. + +============================================================================== +Copyrights and Licenses for Third Party Software Distributed with LLVM: +============================================================================== +The LLVM software contains code written by third parties. Such software will +have its own individual LICENSE.TXT file in the directory in which it appears. +This file will describe the copyrights, license, and restrictions which apply +to that code. + +The disclaimer of warranty in the University of Illinois Open Source License +applies to all code in the LLVM Distribution, and nothing in any of the +other licenses gives permission to use the names of the LLVM Team or the +University of Illinois to endorse or promote products derived from this +Software. + +The following pieces of software have additional or alternate copyrights, +licenses, and/or restrictions: + +Program Directory +------- --------- +Autoconf llvm/autoconf + llvm/projects/ModuleMaker/autoconf + llvm/projects/sample/autoconf +CellSPU backend llvm/lib/Target/CellSPU/README.txt +Google Test llvm/utils/unittest/googletest +OpenBSD regex llvm/lib/Support/{reg*, COPYRIGHT.regex} diff --git a/sys-devel/llvm/llvm-3.0.bep b/sys-devel/llvm/llvm-3.0.bep new file mode 100644 index 000000000..63e4b04b7 --- /dev/null +++ b/sys-devel/llvm/llvm-3.0.bep @@ -0,0 +1,21 @@ +DESCRIPTION="LLVM is a collection of modular and reuseable compiler and toolchain technologies." +HOMEPAGE="http://www.llvm.org/" +SRC_URI="http://llvm.org/releases/3.0/llvm-3.0.tar.gz" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="" +CHECKSUM_MD5="a8e5f5f1c1adebae7b4a654c376a6005" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +BUILD { + cd llvm-3.0.src + ./configure --enable-optimized --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd llvm-3.0.src + make install +} + +LICENSE="UIUC" +COPYRIGHT="2003-2011 University of Illinois at Urbana-Champaign" diff --git a/sys-devel/llvm/llvm-3.2.bep b/sys-devel/llvm/llvm-3.2.bep new file mode 100644 index 000000000..1fdabddd4 --- /dev/null +++ b/sys-devel/llvm/llvm-3.2.bep @@ -0,0 +1,26 @@ +DESCRIPTION="LLVM is a collection of modular and reuseable compiler and toolchain technologies." +HOMEPAGE="http://www.llvm.org/" +SRC_URI="http://llvm.org/releases/3.2/llvm-3.2.src.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="71610289bbc819e3e15fdd562809a2d7" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +BUILD { + if [ ! -L /usr ]; then + ln -s /boot/system/ /usr + fi + cd llvm-3.2.src + cp -r /boot/common/data/libtool/config/. autoconf/ + cp -r /boot/common/data/libtool/config/. projects/sample/autoconf/ + ./configure --enable-optimized --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd llvm-3.2.src + make install +} + +LICENSE="UIUC" +COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign" diff --git a/sys-devel/patch/patch-2.7.1.bep b/sys-devel/patch/patch-2.7.1.bep new file mode 100644 index 000000000..ce005d780 --- /dev/null +++ b/sys-devel/patch/patch-2.7.1.bep @@ -0,0 +1,20 @@ +DESCRIPTION="Utility to apply diffs to files" +HOMEPAGE="http://www.gnu.org/software/patch/" +SRC_URI="http://ftp.gnu.org/pub/gnu/patch/patch-2.7.1.tar.bz2" +CHECKSUM_MD5="0881a7c6477862fc395f373ada0ec6b6" +STATUS_HAIKU="stable" +REVISION="1" +BUILD { + cd patch-2.7.1 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd patch-2.7.1 + make install +} + +LICENSE="GNU GPL v3" +COPYRIGHT="2012 Free Software Foundation, Inc." \ No newline at end of file diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43-git.bep b/sys-fs/e2fsprogs/e2fsprogs-1.43-git.bep new file mode 100644 index 000000000..cc5b02d07 --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43-git.bep @@ -0,0 +1,28 @@ +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="" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="" + +BUILD { + cd e2fsprogs + autoconf + libdir=`finddir B_COMMON_LIB_DIRECTORY` + ./configure \ + --enable-symlink-build \ + --enable-symlink-install \ + --disable-tls --enable-quota=no \ + --disable-fsck \ + --enable-elf-shlibs + make +} + +INSTALL { + cd e2fsprogs + make install-libs +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2004-2012 Free Software Foundation, Inc." diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.bep b/sys-fs/e2fsprogs/e2fsprogs-1.43.bep new file mode 100644 index 000000000..298212606 --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.bep @@ -0,0 +1,28 @@ +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" +REVISION="1" +STATUS_HAIKU="broken" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +DEPEND="" + +BUILD { + cd e2fsprogs-1.43 + autoconf + libdir=`finddir B_COMMON_LIB_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + USE=-loop-aes --enable-symlink-build \ + --enable-symlink-install --disable-tls \ + --enable-quota=no --disable-fsck \ + --enable-elf-shlibs + make +} + +INSTALL { + cd e2fsprogs-1.43 + make install-libs +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2004-2012 Free Software Foundation, Inc." diff --git a/sys-fs/e2fsprogs/patches/e2fsprogs-1.43-git.patch b/sys-fs/e2fsprogs/patches/e2fsprogs-1.43-git.patch new file mode 100644 index 000000000..64306c456 --- /dev/null +++ b/sys-fs/e2fsprogs/patches/e2fsprogs-1.43-git.patch @@ -0,0 +1,476 @@ +diff --git a/configure.in b/configure.in +index ac3cd92..296021a 100644 +--- a/configure.in ++++ b/configure.in +@@ -96,8 +96,11 @@ AC_MSG_ERROR([--with-ldopts no longer supported; use LDFLAGS= instead])) + dnl + AC_PROG_CC + if test "$GCC" = yes; then +- RDYNAMIC="-rdynamic" +- AC_SUBST(RDYNAMIC) ++ case "$host_os" in ++ haiku*) RDYNAMIC="-Wl,-export-dynamic" ;; ++ *) RDYNAMIC="-rdynamic" ;; ++ esac ++ AC_SUBST(RDYNAMIC) + fi + AC_PROG_CPP + dnl +@@ -1051,6 +1054,7 @@ AC_CHECK_FUNCS(m4_flatten([ + backtrace + blkid_probe_get_topology + chflags ++ daemon + fallocate + fallocate64 + fchown +@@ -1094,9 +1098,10 @@ AC_CHECK_FUNCS(m4_flatten([ + dnl + dnl Check to see if -lsocket is required (solaris) to make something + dnl that uses socket() to compile; this is needed for the UUID library ++dnl Haiku needs -lnetwork to get socket(). + dnl + SOCKET_LIB='' +-AC_CHECK_LIB(socket, socket, [SOCKET_LIB=-lsocket]) ++AC_CHECK_LIB(socket, socket, [SOCKET_LIB=-lsocket],[AC_CHECK_LIB(network, socket, [SOCKET_LIB=-lnetwork])]) + AC_SUBST(SOCKET_LIB) + dnl + dnl See if optreset exists +@@ -1187,6 +1192,16 @@ linux* | gnu* | k*bsd*-gnu) + fi + fi + ;; ++haiku*) ++ if test "$prefix" = NONE ; then ++ prefix="`finddir B_COMMON_DIRECTORY`"; ++ AC_MSG_RESULT([On $host_os systems, prefix defaults to `finddir B_COMMON_DIRECTORY`]) ++ if test "$sbindir" = '${exec_prefix}/sbin' ; then ++ AC_MSG_RESULT([...and sbindir defaults to `finddir B_COMMON_DIRECTORY`/bin]) ++ mandir="`finddir B_COMMON_DIRECTORY`/bin" ++ fi ++ fi ++;; + esac + if test "$root_prefix" = NONE ; then + if test "$prefix" = NONE ; then +diff --git a/contrib/spd_readdir.c b/contrib/spd_readdir.c +index 8345fa1..b5984e9 100644 +--- a/contrib/spd_readdir.c ++++ b/contrib/spd_readdir.c +@@ -254,7 +254,7 @@ DIR *opendir(const char *name) + dirstruct = alloc_dirstruct(dir); + if (!dirstruct) { + (*real_closedir)(dir); +- errno = -ENOMEM; ++ errno = ENOMEM; + return NULL; + } + +@@ -287,7 +287,7 @@ DIR *fdopendir(int fd) + dirstruct = alloc_dirstruct(dir); + if (!dirstruct) { + (*real_closedir)(dir); +- errno = -ENOMEM; ++ errno = ENOMEM; + return NULL; + } + +diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h +index 09a9d08..6cb3746 100644 +--- a/e2fsck/e2fsck.h ++++ b/e2fsck/e2fsck.h +@@ -67,7 +67,9 @@ + #define E2FSCK_ATTR(x) + #endif + ++#ifdef CONFIG_QUOTA + #include "quota/mkquota.h" ++#endif + + /* + * Exit codes used by fsck-type programs +@@ -320,7 +322,9 @@ struct e2fsck_struct { + /* + * Ext4 quota support + */ ++#ifdef CONFIG_QUOTA + quota_ctx_t qctx; ++#endif + #ifdef RESOURCE_TRACK + /* + * For timing purposes +diff --git a/e2fsck/logfile.c b/e2fsck/logfile.c +index c48b8eb..ec45dd3 100644 +--- a/e2fsck/logfile.c ++++ b/e2fsck/logfile.c +@@ -233,10 +233,14 @@ static FILE *save_output(const char *s0, const char *s1, const char *s2) + } + + if (pid == 0) { ++#ifdef HAVE_DAEMON + if (daemon(0, 0) < 0) { + perror("daemon"); + exit(1); + } ++#else ++#warning daemon() not present ++#endif + /* + * Grab the output from our parent + */ +diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c +index a20b57b..253a681 100644 +--- a/e2fsck/pass1.c ++++ b/e2fsck/pass1.c +@@ -2206,11 +2206,13 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx, + } + } + ++#ifdef CONFIG_QUOTA + if (ino == EXT2_ROOT_INO || ino >= EXT2_FIRST_INODE(ctx->fs->super)) { + quota_data_add(ctx->qctx, inode, ino, + pb.num_blocks * fs->blocksize); + quota_data_inodes(ctx->qctx, inode, ino, +1); + } ++#endif + + if (!(fs->super->s_feature_ro_compat & + EXT4_FEATURE_RO_COMPAT_HUGE_FILE) || +diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c +index 05cbd10..a4bae9e 100644 +--- a/e2fsck/pass1b.c ++++ b/e2fsck/pass1b.c +@@ -644,8 +644,10 @@ static void delete_file(e2fsck_t ctx, ext2_ino_t ino, + if (ctx->inode_bad_map) + ext2fs_unmark_inode_bitmap2(ctx->inode_bad_map, ino); + ext2fs_inode_alloc_stats2(fs, ino, -1, LINUX_S_ISDIR(inode.i_mode)); ++#ifdef CONFIG_QUOTA + quota_data_sub(ctx->qctx, &inode, ino, pb.dup_blocks * fs->blocksize); + quota_data_inodes(ctx->qctx, &inode, ino, -1); ++#endif + + /* Inode may have changed by block_iterate, so reread it */ + e2fsck_read_inode(ctx, ino, &inode, "delete_file"); +@@ -677,7 +679,9 @@ static void delete_file(e2fsck_t ctx, ext2_ino_t ino, + delete_file_block(fs, &blk, + BLOCK_COUNT_EXTATTR, 0, 0, &pb); + ext2fs_file_acl_block_set(fs, &inode, blk); ++#ifdef CONFIG_QUOTA + quota_data_sub(ctx->qctx, &inode, ino, fs->blocksize); ++#endif + } + } + } +diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c +index a379e9b..0d3af58 100644 +--- a/e2fsck/pass3.c ++++ b/e2fsck/pass3.c +@@ -491,8 +491,10 @@ ext2_ino_t e2fsck_get_lost_and_found(e2fsck_t ctx, int fix) + ext2fs_icount_store(ctx->inode_count, ino, 2); + ext2fs_icount_store(ctx->inode_link_info, ino, 2); + ctx->lost_and_found = ino; ++#ifdef CONFIG_QUOTA + quota_data_add(ctx->qctx, &inode, ino, fs->blocksize); + quota_data_inodes(ctx->qctx, &inode, ino, +1); ++#endif + #if 0 + printf("/lost+found created; inode #%lu\n", ino); + #endif +@@ -802,7 +804,9 @@ errcode_t e2fsck_expand_directory(e2fsck_t ctx, ext2_ino_t dir, + + inode.i_size = (es.last_block + 1) * fs->blocksize; + ext2fs_iblk_add_blocks(fs, &inode, es.newblocks); ++#ifdef CONFIG_QUOTA + quota_data_add(ctx->qctx, &inode, dir, es.newblocks * fs->blocksize); ++#endif + + e2fsck_write_inode(ctx, dir, &inode, "expand_directory"); + +diff --git a/e2fsck/pass4.c b/e2fsck/pass4.c +index 2d55180..c5ca971 100644 +--- a/e2fsck/pass4.c ++++ b/e2fsck/pass4.c +@@ -64,7 +64,9 @@ static int disconnect_inode(e2fsck_t ctx, ext2_ino_t i, + e2fsck_read_bitmaps(ctx); + ext2fs_inode_alloc_stats2(fs, i, -1, + LINUX_S_ISDIR(inode->i_mode)); ++#ifdef CONFIG_QUOTA + quota_data_inodes(ctx->qctx, inode, i, -1); ++#endif + return 0; + } + } +diff --git a/e2fsck/quota.c b/e2fsck/quota.c +index 7a1476e..2dc01ff 100644 +--- a/e2fsck/quota.c ++++ b/e2fsck/quota.c +@@ -21,6 +21,7 @@ + static void move_quota_inode(ext2_filsys fs, ext2_ino_t from_ino, + ext2_ino_t to_ino, int qtype) + { ++#ifdef CONFIG_QUOTA + struct ext2_inode inode; + char qf_name[QUOTA_NAME_LEN]; + +@@ -46,10 +47,12 @@ static void move_quota_inode(ext2_filsys fs, ext2_ino_t from_ino, + /* Clear out the original inode in the inode-table block. */ + memset(&inode, 0, sizeof(struct ext2_inode)); + ext2fs_write_inode(fs, from_ino, &inode); ++#endif + } + + void e2fsck_hide_quota(e2fsck_t ctx) + { ++#ifdef CONFIG_QUOTA + struct ext2_super_block *sb = ctx->fs->super; + struct problem_context pctx; + ext2_filsys fs = ctx->fs; +@@ -79,4 +82,5 @@ void e2fsck_hide_quota(e2fsck_t ctx) + } + + return; ++#endif + } +diff --git a/e2fsck/unix.c b/e2fsck/unix.c +index 5b705ed..93e270e 100644 +--- a/e2fsck/unix.c ++++ b/e2fsck/unix.c +@@ -1616,6 +1616,7 @@ print_unsupp_features: + journal_size = -1; + + if (sb->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_QUOTA) { ++#ifdef CONFIG_QUOTA + /* Quotas were enabled. Do quota accounting during fsck. */ + if ((sb->s_usr_quota_inum && sb->s_grp_quota_inum) || + (!sb->s_usr_quota_inum && !sb->s_grp_quota_inum)) +@@ -1624,6 +1625,11 @@ print_unsupp_features: + qtype = sb->s_usr_quota_inum ? USRQUOTA : GRPQUOTA; + + quota_init_context(&ctx->qctx, ctx->fs, qtype); ++#else ++ log_err(ctx, _("%s: e2fsck not compiled with QUOTA support,\n\t" ++ "but filesystem %s has QUOTA enabled.\n"), ++ ctx->program_name, ctx->device_name); ++#endif + } + + run_result = e2fsck_run(ctx); +@@ -1658,6 +1664,7 @@ print_unsupp_features: + } + no_journal: + ++#ifdef CONFIG_QUOTA + if (ctx->qctx) { + int i, needs_writeout; + for (i = 0; i < MAXQUOTAS; i++) { +@@ -1673,6 +1680,7 @@ no_journal: + } + quota_release_context(&ctx->qctx); + } ++#endif + + if (run_result == E2F_FLAG_RESTART) { + log_out(ctx, _("Restarting e2fsck from the beginning...\n")); +diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c +index a6673c1..c2ea2f7 100644 +--- a/lib/blkid/devname.c ++++ b/lib/blkid/devname.c +@@ -40,6 +40,10 @@ + + #include "blkidP.h" + ++#ifndef makedev ++#define makedev(major,minor) (-1) ++#endif ++ + /* + * Find a dev struct in the cache by device name, if available. + * +diff --git a/lib/ext2fs/bmap64.h b/lib/ext2fs/bmap64.h +index c5384c9..4573fc6 100644 +--- a/lib/ext2fs/bmap64.h ++++ b/lib/ext2fs/bmap64.h +@@ -9,6 +9,8 @@ + * %End-Header% + */ + ++#include ++ + struct ext2_bmap_statistics { + int type; + struct timeval created; +diff --git a/lib/ext2fs/csum.c b/lib/ext2fs/csum.c +index ebd544f..f72525b 100644 +--- a/lib/ext2fs/csum.c ++++ b/lib/ext2fs/csum.c +@@ -722,6 +722,7 @@ __u16 ext2fs_group_desc_csum(ext2_filsys fs, dgrp_t group) + __u16 crc = 0; + struct ext2_group_desc *desc; + size_t size; ++ size_t offset; + + size = fs->super->s_desc_size; + if (size < EXT2_MIN_DESC_SIZE) +@@ -764,7 +765,7 @@ __u16 ext2fs_group_desc_csum(ext2_filsys fs, dgrp_t group) + } + + /* old crc16 code */ +- size_t offset = offsetof(struct ext2_group_desc, bg_checksum); ++ offset = offsetof(struct ext2_group_desc, bg_checksum); + crc = ext2fs_crc16(~0, fs->super->s_uuid, + sizeof(fs->super->s_uuid)); + crc = ext2fs_crc16(crc, &group, sizeof(group)); +diff --git a/lib/ext2fs/dblist.c b/lib/ext2fs/dblist.c +index 3503615..3236c6a 100644 +--- a/lib/ext2fs/dblist.c ++++ b/lib/ext2fs/dblist.c +@@ -365,9 +365,9 @@ int ext2fs_dblist_count(ext2_dblist dblist) + errcode_t ext2fs_dblist_get_last(ext2_dblist dblist, + struct ext2_db_entry **entry) + { +- EXT2_CHECK_MAGIC(dblist, EXT2_ET_MAGIC_DBLIST); + static struct ext2_db_entry ret_entry; + struct ext2_db_entry2 *last; ++ EXT2_CHECK_MAGIC(dblist, EXT2_ET_MAGIC_DBLIST); + + if (dblist->count == 0) + return EXT2_ET_DBLIST_EMPTY; +diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c +index 19be630..d556594 100644 +--- a/lib/ext2fs/unix_io.c ++++ b/lib/ext2fs/unix_io.c +@@ -24,6 +24,9 @@ + #include "config.h" + #include + #include ++#if HAVE_STDINT_H ++#include ++#endif + #if HAVE_UNISTD_H + #include + #endif +diff --git a/lib/quota/common.h b/lib/quota/common.h +index 7f3f4b9..fee81b1 100644 +--- a/lib/quota/common.h ++++ b/lib/quota/common.h +@@ -13,9 +13,15 @@ + # endif + #endif + ++# if !defined __GNUC__ || __GNUC__ > 2 + #define log_err(format, arg ...) \ + fprintf(stderr, "[ERROR] %s:%d:%s:: " format "\n", \ + __FILE__, __LINE__, __func__, ## arg) ++#else ++#define log_err(format, arg...) \ ++ fprintf(stderr, "[ERROR] %s:%d:%s:: " format "\n", \ ++ __FILE__, __LINE__, __func__ , ## arg) ++#endif + + #ifdef DEBUG_QUOTA + # define log_debug(format, arg ...) \ +diff --git a/lib/quota/quotaio_tree.h b/lib/quota/quotaio_tree.h +index 6ee54c9..4c22c21 100644 +--- a/lib/quota/quotaio_tree.h ++++ b/lib/quota/quotaio_tree.h +@@ -6,6 +6,7 @@ + #define _LINUX_QUOTA_TREE_H + + #include ++#include + + typedef u_int32_t qid_t; /* Type in which we store ids in memory */ + +diff --git a/misc/mke2fs.c b/misc/mke2fs.c +index bbf477a..40ae31c 100644 +--- a/misc/mke2fs.c ++++ b/misc/mke2fs.c +@@ -2334,6 +2334,7 @@ static void fix_cluster_bg_counts(ext2_filsys fs) + ext2fs_free_blocks_count_set(fs->super, EXT2FS_C2B(fs, tot_free)); + } + ++#ifdef CONFIG_QUOTA + static int create_quota_inodes(ext2_filsys fs) + { + quota_ctx_t qctx; +@@ -2345,6 +2346,7 @@ static int create_quota_inodes(ext2_filsys fs) + + return 0; + } ++#endif + + int main (int argc, char *argv[]) + { +@@ -2729,9 +2731,11 @@ no_journal: + if (EXT2_HAS_RO_COMPAT_FEATURE(&fs_param, + EXT4_FEATURE_RO_COMPAT_BIGALLOC)) + fix_cluster_bg_counts(fs); ++#ifdef CONFIG_QUOTA + if (EXT2_HAS_RO_COMPAT_FEATURE(&fs_param, + EXT4_FEATURE_RO_COMPAT_QUOTA)) + create_quota_inodes(fs); ++#endif + + if (!quiet) + printf(_("Writing superblocks and " +diff --git a/misc/tune2fs.c b/misc/tune2fs.c +index c1ecae8..267b672 100644 +--- a/misc/tune2fs.c ++++ b/misc/tune2fs.c +@@ -56,7 +56,9 @@ extern int optind; + #include "jfs_user.h" + #include "util.h" + #include "blkid/blkid.h" ++#ifdef CONFIG_QUOTA + #include "quota/mkquota.h" ++#endif + + #include "../version.h" + #include "nls-enable.h" +@@ -477,6 +479,7 @@ static int rewrite_dir_block(ext2_filsys fs, + dcl->limit = ext2fs_cpu_to_le16(max_entries); + } + } else { ++ int max_entries; + /* If htree block is full then rebuild the dir */ + if (ext2fs_le16_to_cpu(dcl->count) == + ext2fs_le16_to_cpu(dcl->limit)) { +@@ -487,7 +490,7 @@ static int rewrite_dir_block(ext2_filsys fs, + * Ensure dcl->limit is small enough to leave room for + * the checksum tail. + */ +- int max_entries = (fs->blocksize - (dcl_offset + ++ max_entries = (fs->blocksize - (dcl_offset + + sizeof(struct ext2_dx_tail))) / + sizeof(struct ext2_dx_entry); + if (ext2fs_le16_to_cpu(dcl->limit) != max_entries) +@@ -1127,6 +1130,7 @@ err: + return 1; + } + ++#ifdef CONFIG_QUOTA + void handle_quota_options(ext2_filsys fs) + { + quota_ctx_t qctx; +@@ -1176,6 +1180,7 @@ void handle_quota_options(ext2_filsys fs) + + return; + } ++#endif + + void parse_quota_opts(const char *opts) + { +@@ -2547,7 +2552,13 @@ retry_open: + rc = 1; + goto closefs; + } ++#ifdef CONFIG_QUOTA + handle_quota_options(fs); ++#else ++ fputs(_("The quota feature is disabled.\n"), stderr); ++ rc = 1; ++ goto closefs; ++#endif + } + + if (U_flag) { diff --git a/sys-fs/e2fsprogs/patches/e2fsprogs-1.43.patch b/sys-fs/e2fsprogs/patches/e2fsprogs-1.43.patch new file mode 100644 index 000000000..932fe5c8e --- /dev/null +++ b/sys-fs/e2fsprogs/patches/e2fsprogs-1.43.patch @@ -0,0 +1,25 @@ +diff -urN e2fsprogs-1.43/configure.in e2fsprogs-1.43-haiku/configure.in +--- e2fsprogs-1.43/configure.in 2013-03-18 01:46:29.019922944 -0700 ++++ e2fsprogs-1.43-haiku/configure.in 2013-03-18 02:02:17.526123008 -0700 +@@ -96,8 +96,11 @@ + dnl + AC_PROG_CC + if test "$GCC" = yes; then +- RDYNAMIC="-rdynamic" +- AC_SUBST(RDYNAMIC) ++ case "$host_os" in ++ haiku*) RDYNAMIC="-Wl,-export-dynamic" ;; ++ *) RDYNAMIC="-rdynamic" ;; ++ esac ++ AC_SUBST(RDYNAMIC) + fi + AC_PROG_CPP + dnl +@@ -1097,6 +1100,7 @@ + dnl + SOCKET_LIB='' + AC_CHECK_LIB(socket, socket, [SOCKET_LIB=-lsocket]) ++AC_CHECK_LIB(network, socket, [SOCKET_LIB=-lnetwork]) + AC_SUBST(SOCKET_LIB) + dnl + dnl See if optreset exists diff --git a/sys-libs/e2fsprogs/patches/e2fsprogs-1.43-git.patch b/sys-libs/e2fsprogs/patches/e2fsprogs-1.43-git.patch new file mode 100644 index 000000000..59235accd --- /dev/null +++ b/sys-libs/e2fsprogs/patches/e2fsprogs-1.43-git.patch @@ -0,0 +1,1508 @@ +diff --git a/configure b/configure +index d47cef7..9d6fcbe 100755 +--- a/configure ++++ b/configure +@@ -1,9 +1,11 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.69. ++# Generated by GNU Autoconf 2.68. + # + # +-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software ++# Foundation, Inc. + # + # + # This configure script is free software; the Free Software Foundation +@@ -132,31 +134,6 @@ 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 +@@ -190,8 +167,7 @@ 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 / || exit 1" ++test x\$exitcode = x0 || 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'\" && +@@ -236,25 +212,21 @@ IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : +- 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 ++ # 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 ++ export CONFIG_SHELL ++ 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+"$@"} + fi + + if test x$as_have_required = xno; then : +@@ -356,14 +328,6 @@ $as_echo X"$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 +@@ -485,10 +449,6 @@ 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). +@@ -523,16 +483,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 -pR'. ++ # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -pR' ++ as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else +- as_ln_s='cp -pR' ++ as_ln_s='cp -p' + fi + else +- as_ln_s='cp -pR' ++ as_ln_s='cp -p' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null +@@ -544,8 +504,28 @@ else + as_mkdir_p=false + fi + +-as_test_x='test -x' +-as_executable_p=as_fn_executable_p ++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 + + # 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'" +@@ -1325,6 +1305,8 @@ 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 +@@ -1498,7 +1480,7 @@ Optional Features: + --disable-testio-debug disable the use of the test I/O manager for debugging + --disable-libuuid do not build private uuid library + --disable-libblkid do not build private blkid library +- --enable-libquota enable quota support ++ --disable-quota disable quota support + --disable-debugfs disable support of debugfs program + --disable-imager disable support of e2image program + --disable-resizer disable support of e2resize program +@@ -1607,9 +1589,9 @@ test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF + configure +-generated by GNU Autoconf 2.69 ++generated by GNU Autoconf 2.68 + +-Copyright (C) 2012 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF +@@ -1685,7 +1667,7 @@ $as_echo "$ac_try_echo"; } >&5 + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || +- test -x conftest$ac_exeext ++ $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 + else +@@ -2039,8 +2021,7 @@ int + main () + { + static int test_array [1 - 2 * !(($2) >= 0)]; +-test_array [0] = 0; +-return test_array [0]; ++test_array [0] = 0 + + ; + return 0; +@@ -2056,8 +2037,7 @@ int + main () + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +-test_array [0] = 0; +-return test_array [0]; ++test_array [0] = 0 + + ; + return 0; +@@ -2083,8 +2063,7 @@ int + main () + { + static int test_array [1 - 2 * !(($2) < 0)]; +-test_array [0] = 0; +-return test_array [0]; ++test_array [0] = 0 + + ; + return 0; +@@ -2100,8 +2079,7 @@ int + main () + { + static int test_array [1 - 2 * !(($2) >= $ac_mid)]; +-test_array [0] = 0; +-return test_array [0]; ++test_array [0] = 0 + + ; + return 0; +@@ -2135,8 +2113,7 @@ int + main () + { + static int test_array [1 - 2 * !(($2) <= $ac_mid)]; +-test_array [0] = 0; +-return test_array [0]; ++test_array [0] = 0 + + ; + return 0; +@@ -2312,7 +2289,7 @@ This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by $as_me, which was +-generated by GNU Autoconf 2.69. Invocation command line was ++generated by GNU Autoconf 2.68. Invocation command line was + + $ $0 $@ + +@@ -2849,7 +2826,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -2889,7 +2866,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -2942,7 +2919,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -2983,7 +2960,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -3041,7 +3018,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -3085,7 +3062,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -3531,7 +3508,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +-struct stat; ++#include ++#include + /* 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); +@@ -3710,7 +3688,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -3750,7 +3728,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -3803,7 +3781,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -3844,7 +3822,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -3902,7 +3880,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -3946,7 +3924,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -4142,7 +4120,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include +-struct stat; ++#include ++#include + /* 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); +@@ -4228,7 +4207,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ + ac_compiler_gnu=$ac_cv_c_compiler_gnu + + if test "$GCC" = yes; then +- RDYNAMIC="-rdynamic" ++ case "$host_os" in ++ haiku*) RDYNAMIC="-Wl,-export-dynamic" ;; ++ *) RDYNAMIC="-rdynamic" ;; ++ esac + + fi + ac_ext=c +@@ -4791,7 +4773,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_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 +@@ -4834,7 +4816,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_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 +@@ -4998,7 +4980,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_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 +@@ -5041,7 +5023,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_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 +@@ -5188,6 +5170,7 @@ fi + + + ++QUOTA_CMT= + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then +@@ -5210,7 +5193,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_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 +@@ -5253,7 +5236,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_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 +@@ -5311,19 +5294,25 @@ if test "${enable_quota+set}" = set; then : + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling quota support" >&5 + $as_echo "Disabling quota support" >&6; } ++ QUOTA_CMT=# + else + $as_echo "#define CONFIG_QUOTA 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling quota support" >&5 + $as_echo "Enabling quota support" >&6; } ++ LIBQUOTA='$(LIB)/libquota'$LIB_EXT ++ DEPLIBQUOTA=$LIBQUOTA ++ STATIC_LIBQUOTA='$(LIB)/libquota'$STATIC_LIB_EXT ++ DEPSTATIC_LIBQUOTA=$STATIC_LIBQUOTA ++ PROFILED_LIBQUOTA='$(LIB)/libquota'$PROFILED_LIB_EXT ++ DEPPROFILED_LIBQUOTA=$PROFILED_LIBQUOTA + fi + + else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling quota support by default" >&5 +-$as_echo "Disabling quota support by default" >&6; } +- +-fi ++ $as_echo "#define CONFIG_QUOTA 1" >>confdefs.h + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Enabling quota support by default" >&5 ++$as_echo "Enabling quota support by default" >&6; } + LIBQUOTA='$(LIB)/libquota'$LIB_EXT + DEPLIBQUOTA=$LIBQUOTA + STATIC_LIBQUOTA='$(LIB)/libquota'$STATIC_LIB_EXT +@@ -5331,6 +5320,9 @@ DEPSTATIC_LIBQUOTA=$STATIC_LIBQUOTA + PROFILED_LIBQUOTA='$(LIB)/libquota'$PROFILED_LIB_EXT + DEPPROFILED_LIBQUOTA=$PROFILED_LIBQUOTA + ++fi ++ ++ + + + +@@ -5739,7 +5731,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 as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$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. +@@ -5912,7 +5904,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GMSGFMT="$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 +@@ -6120,7 +6112,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -6160,7 +6152,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -6255,7 +6247,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" +- as_fn_executable_p "$ac_path_GREP" || continue ++ { test -f "$ac_path_GREP" && $as_test_x "$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 +@@ -6321,7 +6313,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" +- as_fn_executable_p "$ac_path_EGREP" || continue ++ { test -f "$ac_path_EGREP" && $as_test_x "$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 +@@ -6492,11 +6484,11 @@ else + int + main () + { +- ++/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus +- /* Ultrix mips cc rejects this sort of thing. */ ++ /* Ultrix mips cc rejects this. */ + typedef int charset[2]; +- const charset cs = { 0, 0 }; ++ const charset cs; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *pcpcc; + char **ppc; +@@ -6513,9 +6505,8 @@ main () + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; +- { /* SCO 3.2v4 cc rejects this sort of thing. */ +- char tx; +- char *t = &tx; ++ { /* SCO 3.2v4 cc rejects this. */ ++ char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; +@@ -6531,10 +6522,10 @@ main () + iptr p = 0; + ++p; + } +- { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying ++ { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ +- struct s { int j; const int *ap[3]; } bx; +- struct s *b = &bx; b->j = 5; ++ struct s { int j; const int *ap[3]; }; ++ struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; +@@ -7144,20 +7135,23 @@ else + /* end confdefs.h. */ + $ac_includes_default + int +-find_stack_direction (int *addr, int depth) ++find_stack_direction () + { +- int dir, dummy = 0; +- if (! addr) +- addr = &dummy; +- *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1; +- dir = depth ? find_stack_direction (addr, depth - 1) : 0; +- return dir + dummy; ++ static char *addr = 0; ++ auto char dummy; ++ if (addr == 0) ++ { ++ addr = &dummy; ++ return find_stack_direction (); ++ } ++ else ++ return (&dummy > addr) ? 1 : -1; + } + + int +-main (int argc, char **argv) ++main () + { +- return find_stack_direction (0, argc + !argv + 20) < 0; ++ return find_stack_direction () < 0; + } + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : +@@ -8803,7 +8797,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_INTLBISON="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -9608,7 +9602,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_LN="$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 +@@ -9660,7 +9654,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_MV="$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 +@@ -9701,7 +9695,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_CP="$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 +@@ -9742,7 +9736,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_RM="$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 +@@ -9783,7 +9777,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_CHMOD="$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 +@@ -9824,7 +9818,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -9867,7 +9861,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" +- as_fn_executable_p "$ac_path_EGREP" || continue ++ { test -f "$ac_path_EGREP" && $as_test_x "$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 +@@ -9933,7 +9927,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_SED="$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 +@@ -9974,7 +9968,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PERL="$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 +@@ -10015,7 +10009,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_LDCONFIG="$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 +@@ -10055,7 +10049,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AR="${ac_tool_prefix}ar" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -10095,7 +10089,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AR="ar" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -10147,7 +10141,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -10187,7 +10181,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -10239,7 +10233,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -10279,7 +10273,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 +@@ -10330,7 +10324,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MAKEINFO="makeinfo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -10390,7 +10384,7 @@ do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_BUILD_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 +@@ -11051,7 +11045,7 @@ if test "$ac_res" != no; then : + fi + + fi +-for ac_func in __secure_getenv backtrace blkid_probe_get_topology chflags fallocate fallocate64 fchown fdatasync fstat64 ftruncate64 getdtablesize getmntinfo getpwuid_r getrlimit getrusage jrand48 llseek lseek64 mallinfo mbstowcs memalign mmap msync nanosleep open64 pathconf posix_fadvise posix_memalign prctl setmntent setresgid setresuid srandom strcasecmp strdup strnlen strptime strtoull sync_file_range sysconf usleep utime valloc ++for ac_func in __secure_getenv backtrace blkid_probe_get_topology chflags daemon fallocate fallocate64 fchown fdatasync fstat64 ftruncate64 getdtablesize getmntinfo getpwuid_r getrlimit getrusage jrand48 llseek lseek64 mallinfo mbstowcs memalign mmap msync nanosleep open64 pathconf posix_fadvise posix_memalign prctl setmntent setresgid setresuid srandom strcasecmp strdup strnlen strptime strtoull sync_file_range sysconf usleep utime valloc + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +@@ -11102,6 +11096,47 @@ fi + $as_echo "$ac_cv_lib_socket_socket" >&6; } + if test "x$ac_cv_lib_socket_socket" = xyes; then : + SOCKET_LIB=-lsocket ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5 ++$as_echo_n "checking for socket in -lnetwork... " >&6; } ++if ${ac_cv_lib_network_socket+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lnetwork $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char socket (); ++int ++main () ++{ ++return socket (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_network_socket=yes ++else ++ ac_cv_lib_network_socket=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5 ++$as_echo "$ac_cv_lib_network_socket" >&6; } ++if test "x$ac_cv_lib_network_socket" = xyes; then : ++ SOCKET_LIB=-lnetwork ++fi ++ + fi + + +@@ -11321,6 +11356,18 @@ $as_echo "...and mandir defaults to /usr/share/man" >&6; } + fi + fi + ;; ++haiku*) ++ if test "$prefix" = NONE ; then ++ prefix="`finddir B_COMMON_DIRECTORY`"; ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: On $host_os systems, prefix defaults to \`finddir B_COMMON_DIRECTORY\`" >&5 ++$as_echo "On $host_os systems, prefix defaults to \`finddir B_COMMON_DIRECTORY\`" >&6; } ++ if test "$sbindir" = '${exec_prefix}/sbin' ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ...and sbindir defaults to \`finddir B_COMMON_DIRECTORY\`/bin" >&5 ++$as_echo "...and sbindir defaults to \`finddir B_COMMON_DIRECTORY\`/bin" >&6; } ++ mandir="`finddir B_COMMON_DIRECTORY`/bin" ++ fi ++ fi ++;; + esac + if test "$root_prefix" = NONE ; then + if test "$prefix" = NONE ; then +@@ -11875,16 +11922,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 -pR'. ++ # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +- as_ln_s='cp -pR' ++ as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else +- as_ln_s='cp -pR' ++ as_ln_s='cp -p' + fi + else +- as_ln_s='cp -pR' ++ as_ln_s='cp -p' + fi + rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file + rmdir conf$$.dir 2>/dev/null +@@ -11944,16 +11991,28 @@ else + as_mkdir_p=false + fi + +- +-# 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 ++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 + + # 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'" +@@ -11975,7 +12034,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # values after options handling. + ac_log=" + This file was extended by $as_me, which was +-generated by GNU Autoconf 2.69. Invocation command line was ++generated by GNU Autoconf 2.68. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -12041,10 +12100,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + config.status +-configured by $0, generated by GNU Autoconf 2.69, ++configured by $0, generated by GNU Autoconf 2.68, + with options \\"\$ac_cs_config\\" + +-Copyright (C) 2012 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + +@@ -12134,7 +12193,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' +diff --git a/configure.in b/configure.in +index 0b96b8d..cece319 100644 +--- a/configure.in ++++ b/configure.in +@@ -96,7 +96,10 @@ AC_MSG_ERROR([--with-ldopts no longer supported; use LDFLAGS= instead])) + dnl + AC_PROG_CC + if test "$GCC" = yes; then +- RDYNAMIC="-rdynamic" ++ case "$host_os" in ++ haiku*) RDYNAMIC="-Wl,-export-dynamic" ;; ++ *) RDYNAMIC="-rdynamic" ;; ++ esac + AC_SUBST(RDYNAMIC) + fi + AC_PROG_CPP +@@ -565,20 +568,28 @@ AC_SUBST(BLKID_CMT) + dnl + dnl handle --enable-quota + dnl ++QUOTA_CMT= + PKG_PROG_PKG_CONFIG + AH_TEMPLATE([CONFIG_QUOTA], [Define to 1 to enable quota support]) + AC_ARG_ENABLE([quota], +-[ --enable-libquota enable quota support], ++[ --disable-quota disable quota support], + if test "$enableval" = "no" + then + AC_MSG_RESULT([Disabling quota support]) ++ QUOTA_CMT=# + else + AC_DEFINE(CONFIG_QUOTA, 1) + AC_MSG_RESULT([Enabling quota support]) ++ LIBQUOTA='$(LIB)/libquota'$LIB_EXT ++ DEPLIBQUOTA=$LIBQUOTA ++ STATIC_LIBQUOTA='$(LIB)/libquota'$STATIC_LIB_EXT ++ DEPSTATIC_LIBQUOTA=$STATIC_LIBQUOTA ++ PROFILED_LIBQUOTA='$(LIB)/libquota'$PROFILED_LIB_EXT ++ DEPPROFILED_LIBQUOTA=$PROFILED_LIBQUOTA + fi + , +-AC_MSG_RESULT([Disabling quota support by default]) +-) ++AC_DEFINE(CONFIG_QUOTA, 1) ++AC_MSG_RESULT([Enabling quota support by default]) + dnl + dnl Define stuff expected for quota library + dnl +@@ -588,6 +599,7 @@ STATIC_LIBQUOTA='$(LIB)/libquota'$STATIC_LIB_EXT + DEPSTATIC_LIBQUOTA=$STATIC_LIBQUOTA + PROFILED_LIBQUOTA='$(LIB)/libquota'$PROFILED_LIB_EXT + DEPPROFILED_LIBQUOTA=$PROFILED_LIBQUOTA ++) + AC_SUBST(LIBQUOTA) + AC_SUBST(DEPLIBQUOTA) + AC_SUBST(STATIC_LIBQUOTA) +@@ -1051,6 +1063,7 @@ AC_CHECK_FUNCS(m4_flatten([ + backtrace + blkid_probe_get_topology + chflags ++ daemon + fallocate + fallocate64 + fchown +@@ -1094,9 +1107,10 @@ AC_CHECK_FUNCS(m4_flatten([ + dnl + dnl Check to see if -lsocket is required (solaris) to make something + dnl that uses socket() to compile; this is needed for the UUID library ++dnl Haiku needs -lnetwork to get socket(). + dnl + SOCKET_LIB='' +-AC_CHECK_LIB(socket, socket, [SOCKET_LIB=-lsocket]) ++AC_CHECK_LIB(socket, socket, [SOCKET_LIB=-lsocket],[AC_CHECK_LIB(network, socket, [SOCKET_LIB=-lnetwork])]) + AC_SUBST(SOCKET_LIB) + dnl + dnl See if optreset exists +@@ -1187,6 +1201,16 @@ linux* | gnu* | k*bsd*-gnu) + fi + fi + ;; ++haiku*) ++ if test "$prefix" = NONE ; then ++ prefix="`finddir B_COMMON_DIRECTORY`"; ++ AC_MSG_RESULT([On $host_os systems, prefix defaults to `finddir B_COMMON_DIRECTORY`]) ++ if test "$sbindir" = '${exec_prefix}/sbin' ; then ++ AC_MSG_RESULT([...and sbindir defaults to `finddir B_COMMON_DIRECTORY`/bin]) ++ mandir="`finddir B_COMMON_DIRECTORY`/bin" ++ fi ++ fi ++;; + esac + if test "$root_prefix" = NONE ; then + if test "$prefix" = NONE ; then +diff --git a/contrib/spd_readdir.c b/contrib/spd_readdir.c +index f89832c..8d571de 100644 +--- a/contrib/spd_readdir.c ++++ b/contrib/spd_readdir.c +@@ -213,7 +213,7 @@ DIR *opendir(const char *name) + dirstruct = alloc_dirstruct(dir); + if (!dirstruct) { + (*real_closedir)(dir); +- errno = -ENOMEM; ++ errno = ENOMEM; + return NULL; + } + +@@ -246,7 +246,7 @@ DIR *fdopendir(int fd) + dirstruct = alloc_dirstruct(dir); + if (!dirstruct) { + (*real_closedir)(dir); +- errno = -ENOMEM; ++ errno = ENOMEM; + return NULL; + } + +diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h +index 09a9d08..6cb3746 100644 +--- a/e2fsck/e2fsck.h ++++ b/e2fsck/e2fsck.h +@@ -67,7 +67,9 @@ + #define E2FSCK_ATTR(x) + #endif + ++#ifdef CONFIG_QUOTA + #include "quota/mkquota.h" ++#endif + + /* + * Exit codes used by fsck-type programs +@@ -320,7 +322,9 @@ struct e2fsck_struct { + /* + * Ext4 quota support + */ ++#ifdef CONFIG_QUOTA + quota_ctx_t qctx; ++#endif + #ifdef RESOURCE_TRACK + /* + * For timing purposes +diff --git a/e2fsck/logfile.c b/e2fsck/logfile.c +index 9229fbf..5a44dcb 100644 +--- a/e2fsck/logfile.c ++++ b/e2fsck/logfile.c +@@ -227,10 +227,14 @@ static FILE *save_output(const char *s0, const char *s1, const char *s2) + } + + if (pid == 0) { ++#ifdef HAVE_DAEMON + if (daemon(0, 0) < 0) { + perror("daemon"); + exit(1); + } ++#else ++#warning daemon() not present ++#endif + /* + * Grab the output from our parent + */ +diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c +index a4bd956..088e922 100644 +--- a/e2fsck/pass1.c ++++ b/e2fsck/pass1.c +@@ -2177,11 +2177,13 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx, + } + } + ++#ifdef CONFIG_QUOTA + if (ino == EXT2_ROOT_INO || ino >= EXT2_FIRST_INODE(ctx->fs->super)) { + quota_data_add(ctx->qctx, inode, ino, + pb.num_blocks * fs->blocksize); + quota_data_inodes(ctx->qctx, inode, ino, +1); + } ++#endif + + if (!(fs->super->s_feature_ro_compat & + EXT4_FEATURE_RO_COMPAT_HUGE_FILE) || +diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c +index 05cbd10..a4bae9e 100644 +--- a/e2fsck/pass1b.c ++++ b/e2fsck/pass1b.c +@@ -644,8 +644,10 @@ static void delete_file(e2fsck_t ctx, ext2_ino_t ino, + if (ctx->inode_bad_map) + ext2fs_unmark_inode_bitmap2(ctx->inode_bad_map, ino); + ext2fs_inode_alloc_stats2(fs, ino, -1, LINUX_S_ISDIR(inode.i_mode)); ++#ifdef CONFIG_QUOTA + quota_data_sub(ctx->qctx, &inode, ino, pb.dup_blocks * fs->blocksize); + quota_data_inodes(ctx->qctx, &inode, ino, -1); ++#endif + + /* Inode may have changed by block_iterate, so reread it */ + e2fsck_read_inode(ctx, ino, &inode, "delete_file"); +@@ -677,7 +679,9 @@ static void delete_file(e2fsck_t ctx, ext2_ino_t ino, + delete_file_block(fs, &blk, + BLOCK_COUNT_EXTATTR, 0, 0, &pb); + ext2fs_file_acl_block_set(fs, &inode, blk); ++#ifdef CONFIG_QUOTA + quota_data_sub(ctx->qctx, &inode, ino, fs->blocksize); ++#endif + } + } + } +diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c +index a379e9b..0d3af58 100644 +--- a/e2fsck/pass3.c ++++ b/e2fsck/pass3.c +@@ -491,8 +491,10 @@ ext2_ino_t e2fsck_get_lost_and_found(e2fsck_t ctx, int fix) + ext2fs_icount_store(ctx->inode_count, ino, 2); + ext2fs_icount_store(ctx->inode_link_info, ino, 2); + ctx->lost_and_found = ino; ++#ifdef CONFIG_QUOTA + quota_data_add(ctx->qctx, &inode, ino, fs->blocksize); + quota_data_inodes(ctx->qctx, &inode, ino, +1); ++#endif + #if 0 + printf("/lost+found created; inode #%lu\n", ino); + #endif +@@ -802,7 +804,9 @@ errcode_t e2fsck_expand_directory(e2fsck_t ctx, ext2_ino_t dir, + + inode.i_size = (es.last_block + 1) * fs->blocksize; + ext2fs_iblk_add_blocks(fs, &inode, es.newblocks); ++#ifdef CONFIG_QUOTA + quota_data_add(ctx->qctx, &inode, dir, es.newblocks * fs->blocksize); ++#endif + + e2fsck_write_inode(ctx, dir, &inode, "expand_directory"); + +diff --git a/e2fsck/pass4.c b/e2fsck/pass4.c +index 2d55180..c5ca971 100644 +--- a/e2fsck/pass4.c ++++ b/e2fsck/pass4.c +@@ -64,7 +64,9 @@ static int disconnect_inode(e2fsck_t ctx, ext2_ino_t i, + e2fsck_read_bitmaps(ctx); + ext2fs_inode_alloc_stats2(fs, i, -1, + LINUX_S_ISDIR(inode->i_mode)); ++#ifdef CONFIG_QUOTA + quota_data_inodes(ctx->qctx, inode, i, -1); ++#endif + return 0; + } + } +diff --git a/e2fsck/quota.c b/e2fsck/quota.c +index 7a1476e..2dc01ff 100644 +--- a/e2fsck/quota.c ++++ b/e2fsck/quota.c +@@ -21,6 +21,7 @@ + static void move_quota_inode(ext2_filsys fs, ext2_ino_t from_ino, + ext2_ino_t to_ino, int qtype) + { ++#ifdef CONFIG_QUOTA + struct ext2_inode inode; + char qf_name[QUOTA_NAME_LEN]; + +@@ -46,10 +47,12 @@ static void move_quota_inode(ext2_filsys fs, ext2_ino_t from_ino, + /* Clear out the original inode in the inode-table block. */ + memset(&inode, 0, sizeof(struct ext2_inode)); + ext2fs_write_inode(fs, from_ino, &inode); ++#endif + } + + void e2fsck_hide_quota(e2fsck_t ctx) + { ++#ifdef CONFIG_QUOTA + struct ext2_super_block *sb = ctx->fs->super; + struct problem_context pctx; + ext2_filsys fs = ctx->fs; +@@ -79,4 +82,5 @@ void e2fsck_hide_quota(e2fsck_t ctx) + } + + return; ++#endif + } +diff --git a/e2fsck/unix.c b/e2fsck/unix.c +index d2b1bbd..e63a846 100644 +--- a/e2fsck/unix.c ++++ b/e2fsck/unix.c +@@ -1618,6 +1618,7 @@ print_unsupp_features: + journal_size = -1; + + if (sb->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_QUOTA) { ++#ifdef CONFIG_QUOTA + /* Quotas were enabled. Do quota accounting during fsck. */ + if ((sb->s_usr_quota_inum && sb->s_grp_quota_inum) || + (!sb->s_usr_quota_inum && !sb->s_grp_quota_inum)) +@@ -1626,6 +1627,11 @@ print_unsupp_features: + qtype = sb->s_usr_quota_inum ? USRQUOTA : GRPQUOTA; + + quota_init_context(&ctx->qctx, ctx->fs, qtype); ++#else ++ log_err(ctx, _("%s: e2fsck not compiled with QUOTA support,\n\t" ++ "but filesystem %s has QUOTA enabled.\n"), ++ ctx->program_name, ctx->device_name); ++#endif + } + + run_result = e2fsck_run(ctx); +@@ -1660,6 +1666,7 @@ print_unsupp_features: + } + no_journal: + ++#ifdef CONFIG_QUOTA + if (ctx->qctx) { + int i, needs_writeout; + for (i = 0; i < MAXQUOTAS; i++) { +@@ -1675,6 +1682,7 @@ no_journal: + } + quota_release_context(&ctx->qctx); + } ++#endif + + if (run_result == E2F_FLAG_RESTART) { + log_out(ctx, _("Restarting e2fsck from the beginning...\n")); +diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c +index a6673c1..c2ea2f7 100644 +--- a/lib/blkid/devname.c ++++ b/lib/blkid/devname.c +@@ -40,6 +40,10 @@ + + #include "blkidP.h" + ++#ifndef makedev ++#define makedev(major,minor) (-1) ++#endif ++ + /* + * Find a dev struct in the cache by device name, if available. + * +diff --git a/lib/ext2fs/bmap64.h b/lib/ext2fs/bmap64.h +index c5384c9..4573fc6 100644 +--- a/lib/ext2fs/bmap64.h ++++ b/lib/ext2fs/bmap64.h +@@ -9,6 +9,8 @@ + * %End-Header% + */ + ++#include ++ + struct ext2_bmap_statistics { + int type; + struct timeval created; +diff --git a/lib/ext2fs/csum.c b/lib/ext2fs/csum.c +index 6c2e562..c9b9f24 100644 +--- a/lib/ext2fs/csum.c ++++ b/lib/ext2fs/csum.c +@@ -724,6 +724,7 @@ __u16 ext2fs_group_desc_csum(ext2_filsys fs, dgrp_t group) + __u16 crc = 0; + struct ext2_group_desc *desc; + size_t size; ++ size_t offset; + + size = fs->super->s_desc_size; + if (size < EXT2_MIN_DESC_SIZE) +@@ -766,7 +767,7 @@ __u16 ext2fs_group_desc_csum(ext2_filsys fs, dgrp_t group) + } + + /* old crc16 code */ +- size_t offset = offsetof(struct ext2_group_desc, bg_checksum); ++ offset = offsetof(struct ext2_group_desc, bg_checksum); + crc = ext2fs_crc16(~0, fs->super->s_uuid, + sizeof(fs->super->s_uuid)); + crc = ext2fs_crc16(crc, &group, sizeof(group)); +diff --git a/lib/ext2fs/dblist.c b/lib/ext2fs/dblist.c +index ceaae8f..3d4b1a1 100644 +--- a/lib/ext2fs/dblist.c ++++ b/lib/ext2fs/dblist.c +@@ -365,9 +365,9 @@ int ext2fs_dblist_count(ext2_dblist dblist) + errcode_t ext2fs_dblist_get_last(ext2_dblist dblist, + struct ext2_db_entry **entry) + { +- EXT2_CHECK_MAGIC(dblist, EXT2_ET_MAGIC_DBLIST); + static struct ext2_db_entry ret_entry; + struct ext2_db_entry2 *last; ++ EXT2_CHECK_MAGIC(dblist, EXT2_ET_MAGIC_DBLIST); + + if (dblist->count == 0) + return EXT2_ET_DBLIST_EMPTY; +diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c +index 02570f0..c20ce36 100644 +--- a/lib/ext2fs/unix_io.c ++++ b/lib/ext2fs/unix_io.c +@@ -24,6 +24,9 @@ + #include "config.h" + #include + #include ++#if HAVE_STDINT_H ++#include ++#endif + #if HAVE_UNISTD_H + #include + #endif +@@ -914,7 +917,7 @@ static errcode_t unix_discard(io_channel channel, unsigned long long block, + unsigned long long count) + { + struct unix_private_data *data; +- __uint64_t range[2]; ++ uint64_t range[2]; + int ret; + + EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL); +diff --git a/lib/quota/quotaio_tree.h b/lib/quota/quotaio_tree.h +index 6ee54c9..4c22c21 100644 +--- a/lib/quota/quotaio_tree.h ++++ b/lib/quota/quotaio_tree.h +@@ -6,6 +6,7 @@ + #define _LINUX_QUOTA_TREE_H + + #include ++#include + + typedef u_int32_t qid_t; /* Type in which we store ids in memory */ + +diff --git a/misc/mke2fs.c b/misc/mke2fs.c +index a288147..1af26ee 100644 +--- a/misc/mke2fs.c ++++ b/misc/mke2fs.c +@@ -2282,6 +2282,7 @@ static void fix_cluster_bg_counts(ext2_filsys fs) + ext2fs_free_blocks_count_set(fs->super, EXT2FS_C2B(fs, tot_free)); + } + ++#ifdef CONFIG_QUOTA + static int create_quota_inodes(ext2_filsys fs) + { + quota_ctx_t qctx; +@@ -2293,6 +2294,7 @@ static int create_quota_inodes(ext2_filsys fs) + + return 0; + } ++#endif + + int main (int argc, char *argv[]) + { +@@ -2677,9 +2679,11 @@ no_journal: + if (EXT2_HAS_RO_COMPAT_FEATURE(&fs_param, + EXT4_FEATURE_RO_COMPAT_BIGALLOC)) + fix_cluster_bg_counts(fs); ++#ifdef CONFIG_QUOTA + if (EXT2_HAS_RO_COMPAT_FEATURE(&fs_param, + EXT4_FEATURE_RO_COMPAT_QUOTA)) + create_quota_inodes(fs); ++#endif + + if (!quiet) + printf(_("Writing superblocks and " +diff --git a/misc/tune2fs.c b/misc/tune2fs.c +index b290c46..b24b8c1 100644 +--- a/misc/tune2fs.c ++++ b/misc/tune2fs.c +@@ -56,7 +56,9 @@ extern int optind; + #include "jfs_user.h" + #include "util.h" + #include "blkid/blkid.h" ++#ifdef CONFIG_QUOTA + #include "quota/mkquota.h" ++#endif + + #include "../version.h" + #include "nls-enable.h" +@@ -145,7 +147,9 @@ static __u32 ok_features[3] = { + EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| + EXT4_FEATURE_RO_COMPAT_GDT_CSUM | + EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER | ++#ifdef CONFIG_QUOTA + EXT4_FEATURE_RO_COMPAT_QUOTA | ++#endif + EXT4_FEATURE_RO_COMPAT_METADATA_CSUM + }; + +@@ -164,7 +168,9 @@ static __u32 clear_ok_features[3] = { + EXT4_FEATURE_RO_COMPAT_DIR_NLINK| + EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| + EXT4_FEATURE_RO_COMPAT_GDT_CSUM | ++#ifdef CONFIG_QUOTA + EXT4_FEATURE_RO_COMPAT_QUOTA | ++#endif + EXT4_FEATURE_RO_COMPAT_METADATA_CSUM + }; + +@@ -473,6 +479,7 @@ static int rewrite_dir_block(ext2_filsys fs, + dcl->limit = ext2fs_cpu_to_le16(max_entries); + } + } else { ++ int max_entries; + /* If htree block is full then rebuild the dir */ + if (ext2fs_le16_to_cpu(dcl->count) == + ext2fs_le16_to_cpu(dcl->limit)) { +@@ -483,7 +490,7 @@ static int rewrite_dir_block(ext2_filsys fs, + * Ensure dcl->limit is small enough to leave room for + * the checksum tail. + */ +- int max_entries = (fs->blocksize - (dcl_offset + ++ max_entries = (fs->blocksize - (dcl_offset + + sizeof(struct ext2_dx_tail))) / + sizeof(struct ext2_dx_entry); + if (ext2fs_le16_to_cpu(dcl->limit) != max_entries) +@@ -1124,6 +1131,7 @@ err: + return 1; + } + ++#ifdef CONFIG_QUOTA + void handle_quota_options(ext2_filsys fs) + { + quota_ctx_t qctx; +@@ -1169,6 +1177,7 @@ void handle_quota_options(ext2_filsys fs) + + return; + } ++#endif + + void parse_quota_opts(const char *opts) + { +@@ -2540,7 +2549,13 @@ retry_open: + rc = 1; + goto closefs; + } ++#ifdef CONFIG_QUOTA + handle_quota_options(fs); ++#else ++ fputs(_("The quota feature is disabled.\n"), stderr); ++ rc = 1; ++ goto closefs; ++#endif + } + + if (U_flag) { diff --git a/sys-libs/glu/glu-9.0.bep b/sys-libs/glu/glu-9.0.bep new file mode 100644 index 000000000..1f6601b29 --- /dev/null +++ b/sys-libs/glu/glu-9.0.bep @@ -0,0 +1,23 @@ +DESCRIPTION="glu" +HOMEPAGE="http://freedesktop.org" +SRC_URI="ftp://freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.gz" +CHECKSUM_MD5="bbc57d4fe3bd3fb095bdbef6fcb977c4" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd glu-9.0.0 + ./configure --prefix=`finddir B_SYSTEM_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY`/ \ + --includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY`/os/opengl \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make +} + +INSTALL { + cd glu-9.0.0 + make install DESTDIR="${DESTDIR}" +} + +LICENSE="MIT" +COPYRIGHT="Copyright (C) 1999-2012 Brian Paul and others. All Rights Reserved." diff --git a/sys-libs/mesa/buildpackage.sh b/sys-libs/mesa/buildpackage.sh new file mode 100644 index 000000000..6fc82c244 --- /dev/null +++ b/sys-libs/mesa/buildpackage.sh @@ -0,0 +1,79 @@ +#!/bin/bash +# Mesa-O-Matic +# Copyright 2011-2012, Alexander von Gluck IV +# Released under the terms of the MIT license + +# This script creates an optional package containing the +# the headers and binary code needed by the opengl kit +# to link libGL.so + +# This script is run against a *COMPILED* Mesa source tree + +echo " Welcome to Mesa-O-Matic!" +echo "-=-=-=-=-=-=-=-=-=-=-=-=-=" +echo "" + +if [[ $DEBUG -eq 1 ]]; then + echo "Debugging: enabled" +else + echo "Debugging: disabled" +fi + +####################################################################### +# END CONFIG DATA, Dragons below! +####################################################################### + +if [[ $( uname ) != "Haiku" ]]; then + echo "*************************************" + echo " I need to be run on a Haiku system!!" + echo "*************************************" + exit 1 +fi + +if [[ -z $1 ]]; then + echo "" + echo "Usage: $0 " + echo "" + exit 1 +fi + +MESA_VER="$1" +MESA_TOP="$2" +GCC_VER=`gcc -v 2>&1 | tail -1 | awk '{print $3}' | cut -d. -f1` +DATESTAMP=`date +"%Y-%m-%d"` + +echo "Bundling gcc$GCC_VER build of Mesa $MESA_VER..." + +cd $MESA_TOP + +####################################################################### +# Create Mesa optional pacakge +ZIP_HEADERS="" +echo "Collecting Mesa headers..." +for i in $(find . -name "*.h") +do + ZIP_HEADERS="$ZIP_HEADERS $i" +done + +echo "Collecting required Mesa libraries..." +rm -rf lib.haiku +mkdir -p lib.haiku +for i in $( find . -name "*.a" ) +do + cp $i lib.haiku/ +done + +if [[ $DEBUG -eq 0 ]]; then +echo "Stripping debug symbols from Mesa libraries..." +find lib.haiku -exec strip --strip-debug {} \; ; +MESADBG="" +else +MESADBG="dbg" +fi + +echo "Creating Mesa OptionalPackage..." +PLATFORM=$( uname -m ) +ZIP_FILENAME="/boot/home/mesa-${MESA_VER}-x86${MESADBG}-gcc${GCC_VER}-${DATESTAMP}.zip" +zip -r -9 $ZIP_FILENAME $ZIP_HEADERS ./lib.haiku/* + +echo "Great Success! $ZIP_FILENAME created." diff --git a/sys-libs/mesa/mesa-7.8.2.bep b/sys-libs/mesa/mesa-7.8.2.bep new file mode 100644 index 000000000..0fbc12615 --- /dev/null +++ b/sys-libs/mesa/mesa-7.8.2.bep @@ -0,0 +1,25 @@ +############################################################### +# THIS IS NOT FOR GENERAL USE! +# This builds a buildpackage for the Haiku build system to link +# the OpenGL kit!! +############################################################### + +DESCRIPTION="Mesa3D is a multi-platform GL implementation" +HOMEPAGE="http://www.freedesktop.org/" +SRC_URI="ftp://freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="6be2d343a0089bfd395ce02aaf8adb57" +MESSAGE="This port only builds with gcc2. Not for general use." +BUILD { + export DEBUG=0 + cd Mesa-7.8.2 + make + cd .. + sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 7.8.2 ./Mesa-7.8.2 + echo "There should be a Mesa OptionalBuild package in your home if everything went well!" +} + +LICENSE="MIT" +COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/mesa-9.0.1.bep b/sys-libs/mesa/mesa-9.0.1.bep new file mode 100644 index 000000000..d03000d46 --- /dev/null +++ b/sys-libs/mesa/mesa-9.0.1.bep @@ -0,0 +1,25 @@ +############################################################### +# THIS IS NOT FOR GENERAL USE! +# This builds a buildpackage for the Haiku build system to link +# the OpenGL kit!! +############################################################### + +DESCRIPTION="Mesa3D is a multi-platform GL implementation" +HOMEPAGE="http://www.freedesktop.org/" +SRC_URI="ftp://freedesktop.org/pub/mesa/9.0.1/MesaLib-9.0.1.tar.bz2" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="scons" +CHECKSUM_MD5="97d6554c05ea7449398afe3a0ede7018" +MESSAGE="This port only builds with gcc4. Not for general use." +BUILD { + export DEBUG=0 + cd Mesa-9.0.1 + scons debug=$DEBUG + cd .. + sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0.1 ./Mesa-9.0.1 + echo "There should be a Mesa OptionalBuild package in your home if everything went well!" +} + +LICENSE="MIT" +COPYRIGHT="Copyright (C) 1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/mesa-9.0.2.bep b/sys-libs/mesa/mesa-9.0.2.bep new file mode 100644 index 000000000..6bc915411 --- /dev/null +++ b/sys-libs/mesa/mesa-9.0.2.bep @@ -0,0 +1,28 @@ +############################################################### +# THIS IS NOT FOR GENERAL USE! +# This builds a buildpackage for the Haiku build system to link +# the OpenGL kit!! +############################################################### + +DESCRIPTION="Mesa3D is a multi-platform GL implementation" +HOMEPAGE="http://www.freedesktop.org/" +SRC_URI="ftp://freedesktop.org/pub/mesa/9.0.2/MesaLib-9.0.2.tar.bz2" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="scons, llvm >= 3.2" +CHECKSUM_MD5="dc45d1192203e418163e0017640e1cfc" +MESSAGE="This port only builds with gcc4. Not for general use." +BUILD { + export DEBUG=0 + echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" + echo "This generates a Mesa3D build package for Haiku... not for general use" + echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" + cd Mesa-9.0.2 + scons debug=$DEBUG + cd .. + sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0.2 ./Mesa-9.0.2 + echo "There should be a Mesa OptionalBuild package in your home if everything went well!" +} + +LICENSE="MIT" +COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/mesa-9.0.bep b/sys-libs/mesa/mesa-9.0.bep new file mode 100644 index 000000000..768707c1e --- /dev/null +++ b/sys-libs/mesa/mesa-9.0.bep @@ -0,0 +1,25 @@ +############################################################### +# THIS IS NOT FOR GENERAL USE! +# This builds a buildpackage for the Haiku build system to link +# the OpenGL kit!! +############################################################### + +DESCRIPTION="Mesa3D is a multi-platform GL implementation" +HOMEPAGE="http://www.freedesktop.org/" +SRC_URI="ftp://freedesktop.org/pub/mesa/9.0/MesaLib-9.0.tar.bz2" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="scons" +CHECKSUM_MD5="60e557ce407be3732711da484ab3db6c" +MESSAGE="This port only builds with gcc4. Not for general use." +BUILD { + export DEBUG=0 + cd Mesa-9.0 + scons debug=$DEBUG + cd .. + sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0 ./Mesa-9.0 + echo "There should be a Mesa OptionalBuild package in your home if everything went well!" +} + +LICENSE="MIT" +COPYRIGHT="Copyright (C) 1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/mesa-9.1.0.bep b/sys-libs/mesa/mesa-9.1.0.bep new file mode 100644 index 000000000..e35967ffc --- /dev/null +++ b/sys-libs/mesa/mesa-9.1.0.bep @@ -0,0 +1,28 @@ +############################################################### +# THIS IS NOT FOR GENERAL USE! +# This builds a buildpackage for the Haiku build system to link +# the OpenGL kit!! +############################################################### + +DESCRIPTION="Mesa3D is a multi-platform GL implementation" +HOMEPAGE="http://www.freedesktop.org/" +SRC_URI="ftp://freedesktop.org/pub/mesa/9.1/MesaLib-9.1.tar.bz2" +REVISION="1" +STATUS_HAIKU="unstable" +DEPEND="scons, llvm >= 3.2" +CHECKSUM_MD5="d3891e02215422e120271d976ff1947e" +MESSAGE="This port only builds with gcc4. Not for general use." +BUILD { + export DEBUG=0 + echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" + echo "This generates a Mesa3D build package for Haiku... not for general use" + echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" + cd Mesa-9.1 + scons debug=$DEBUG + cd .. + sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.1.0 ./Mesa-9.1 + echo "There should be a Mesa OptionalBuild package in your home if everything went well!" +} + +LICENSE="MIT" +COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/mesa-9.1.1.bep b/sys-libs/mesa/mesa-9.1.1.bep new file mode 100644 index 000000000..573804871 --- /dev/null +++ b/sys-libs/mesa/mesa-9.1.1.bep @@ -0,0 +1,28 @@ +############################################################### +# THIS IS NOT FOR GENERAL USE! +# This builds a buildpackage for the Haiku build system to link +# the OpenGL kit!! +############################################################### + +DESCRIPTION="Mesa3D is a multi-platform GL implementation" +HOMEPAGE="http://www.freedesktop.org/" +SRC_URI="ftp://freedesktop.org/pub/mesa/9.1.1/MesaLib-9.1.1.tar.bz2" +REVISION="1" +STATUS_HAIKU="unstable" +DEPEND="scons, llvm >= 3.2" +CHECKSUM_MD5="6ea2bdc3b7ecfb4257b39814b4182580" +MESSAGE="This port only builds with gcc4. Not for general use." +BUILD { + export DEBUG=1 + echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" + echo "This generates a Mesa3D build package for Haiku... not for general use" + echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" + cd Mesa-9.1.1 + scons debug=$DEBUG + cd .. + sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.1.1 ./Mesa-9.1.1 + echo "There should be a Mesa OptionalBuild package in your home if everything went well!" +} + +LICENSE="MIT" +COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/patches/mesa-7.8.2.patch b/sys-libs/mesa/patches/mesa-7.8.2.patch new file mode 100644 index 000000000..a01fc9d20 --- /dev/null +++ b/sys-libs/mesa/patches/mesa-7.8.2.patch @@ -0,0 +1,470 @@ +diff -Naur Mesa-7.8.2/bin/mklib Mesa-7.8.2-haiku/bin/mklib +--- Mesa-7.8.2/bin/mklib 2010-06-15 17:43:41.034865152 +0000 ++++ Mesa-7.8.2-haiku/bin/mklib 2013-02-17 22:26:13.017301504 +0000 +@@ -260,7 +260,7 @@ + NEWOBJECTS="" + for OBJ in $OBJECTS ; do + case $OBJ in +- -Wl,*) ++ -Wl,*|-L*|-l*) + echo "mklib: warning: ignoring $OBJ for static library" + ;; + *) +@@ -307,7 +307,7 @@ + # + case $ARCH in + +- 'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/*) ++ 'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/* | 'NetBSD') + # we assume gcc + + if [ "x$LINK" = "x" ] ; then +@@ -494,13 +494,16 @@ + OPTS="${OPTS} -Wl,-Mmapfile.scope" + fi + +- # Check if objects are SPARC v9 ++ # Check if objects are 64-bit + # file says: ELF 64-bit MSB relocatable SPARCV9 Version 1 + set ${OBJECTS} + if [ ${LINK} = "cc" -o ${LINK} = "CC" ] ; then +- SPARCV9=`file $1 | grep SPARCV9` +- if [ "${SPARCV9}" ] ; then +- OPTS="${OPTS} -xarch=v9" ++ ABI64=`file $1 | grep "ELF 64-bit"` ++ if [ "${ABI64}" ] ; then ++ case `uname -p` in ++ sparc) OPTS="${OPTS} -xarch=v9" ;; ++ i386) OPTS="${OPTS} -xarch=amd64" ;; ++ esac + fi + fi + if [ "${ALTOPTS}" ] ; then +@@ -571,20 +574,6 @@ + fi + ;; + +- 'NetBSD') +- if [ $STATIC = 1 ] ; then +- LIBNAME="lib${LIBNAME}_pic.a" +- echo "mklib: Making NetBSD PIC static library: " ${LIBNAME} +- FINAL_LIBS=`make_ar_static_lib cq 1 ${LIBNAME} ${OBJECTS}` +- else +- LIBNAME="lib${LIBNAME}.so.${MAJOR}.${MINOR}" +- echo "mklib: Making NetBSD PIC shared library: " ${LIBNAME} +- rm -f ${LIBNAME} +- ld -x -Bshareable -Bforcearchive -o ${LIBNAME} ${OBJECTS} +- FINAL_LIBS=${LIBNAME} +- fi +- ;; +- + 'IRIX' | 'IRIX64') + if [ $STATIC = 1 ] ; then + LIBNAME="lib${LIBNAME}.a" +@@ -778,9 +767,8 @@ + OPTS="${OPTS} -exported_symbols_list ${EXPORTS}" + fi + +- LINKNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" +- LINKNAME2="lib${LIBNAME}.${LIBSUFFIX}" +- LIBNAME="lib${LIBNAME}.${MAJOR}.${MINOR}.${LIBSUFFIX}" ++ LINKNAME="lib${LIBNAME}.${LIBSUFFIX}" ++ LIBNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" + + # examine first object to determine ABI + set ${OBJECTS} +@@ -793,9 +781,6 @@ + OPTS=${ALTOPTS} + fi + +- # XXX can we always add -isysroot /Developer/SDKs/MacOSX10.4u.sdk +- # to OPTS here? +- + # determine linker + if [ $CPLUSPLUS = 1 ] ; then + LINK="g++" +@@ -807,8 +792,7 @@ + + ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS} + ln -s ${LIBNAME} ${LINKNAME} +- ln -s ${LIBNAME} ${LINKNAME2} +- FINAL_LIBS="${LIBNAME} ${LINKNAME} ${LINKNAME2}" ++ FINAL_LIBS="${LIBNAME} ${LINKNAME}" + fi + ;; + +@@ -818,22 +802,6 @@ + FINAL_LIBS=`make_ar_static_lib -ru 0 ${LIBNAME} ${OBJECTS}` + ;; + +- 'BeOS') +- if [ $STATIC = 1 ] ; then +- LIBNAME="lib${LIBNAME}.a" +- echo "mklib: Making BeOS static library: " ${LIBNAME} +- FINAL_LIBS=`make_ar_static_lib -cru 0 ${LIBNAME} ${OBJECTS}` +- else +- LIBNAME="lib${LIBNAME}.so" +- echo "mklib: Making BeOS shared library: " ${LIBNAME} +- gcc -nostart -Xlinker "-soname=${LIBNAME}" -L/Be/develop/lib/x86 -lbe ${DEPS} ${OBJECTS} -o "${LIBNAME}" +- mimeset -f "${LIBNAME}" +- # XXX remove the Mesa3D stuff here since mklib isn't mesa-specific. +- setversion "${LIBNAME}" -app ${MAJOR} ${MINOR} ${PATCH} -short "Powered by Mesa3D!" -long "Powered by Mesa3D!" +- fi +- FINAL_LIBS=${LIBNAME} +- ;; +- + 'QNX') + LIBNAME="lib${LIBNAME}.a" + echo "mklib: Making QNX library: " ${LIBNAME} +@@ -927,6 +895,16 @@ + + CYGWIN*) + # GCC-based environment ++ ++ if [ "x$LINK" = "x" ] ; then ++ # -linker was not specified so set default link command now ++ if [ $CPLUSPLUS = 1 ] ; then ++ LINK=g++ ++ else ++ LINK=gcc ++ fi ++ fi ++ + if [ $NOPREFIX = 1 ] ; then + # No "lib" or ".so" part + echo "mklib: Making CYGWIN shared library: " ${LIBNAME} +@@ -935,7 +913,7 @@ + OPTS=${ALTOPTS} + fi + rm -f ${LIBNAME} +- ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS} ++ ${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS} || exit $? + FINAL_LIBS=${LIBNAME} + else + CYGNAME="cyg${LIBNAME}" # prefix with "cyg" +@@ -943,7 +921,7 @@ + + if [ $STATIC = 1 ] ; then + LIBNAME=${LIBNAME}.a +- echo "mklib: Making" $ARCH "static library: " ${LIBNAME} ++ echo "mklib: Making CYGWIN static library: " ${LIBNAME} + OPTS="-ru" + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} +@@ -961,13 +939,7 @@ + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} + fi +- echo "mklib: Making" $ARCH "shared library: " ${CYGNAME}-${MAJOR}.dll +- +- if [ $CPLUSPLUS = 1 ] ; then +- LINK="g++" +- else +- LINK="gcc" +- fi ++ echo "mklib: Making CYGWIN shared library: " ${CYGNAME}-${MAJOR}.dll + + # rm any old libs + rm -f ${CYGNAME}-${MAJOR}.dll +@@ -976,12 +948,7 @@ + rm -f ${LIBNAME}.a + + # make lib +- ${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS} +- # make build fail if link failed +- es=$? +- if [ "$es" -ne "0" ]; then +- exit $es +- fi ++ ${LINK} ${OPTS} ${LDFLAGS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS} || exit $? + # make usual symlinks + ln -s ${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a + # finish up +@@ -992,6 +959,43 @@ + fi + ;; + ++ 'Haiku') ++ if [ $STATIC = 1 ] ; then ++ LIBNAME="lib${LIBNAME}.a" ++ if [ "x$LINK" = "x" ] ; then ++ # -linker was not specified so set default link command now ++ if [ $CPLUSPLUS = 1 ] ; then ++ LINK=g++ ++ else ++ LINK=gcc ++ fi ++ fi ++ ++ OPTS="-ru" ++ if [ "${ALTOPTS}" ] ; then ++ OPTS=${ALTOPTS} ++ fi ++ ++ echo "mklib: Making static library for Haiku: " ${LIBNAME} ++ ++ # expand .a into .o files ++ NEW_OBJECTS=`expand_archives ${LIBNAME}.obj $OBJECTS` ++ ++ # make static lib ++ FINAL_LIBS=`make_ar_static_lib ${OPTS} 1 ${LIBNAME} ${NEW_OBJECTS}` ++ ++ # remove temporary extracted .o files ++ rm -rf ${LIBNAME}.obj ++ else ++ LIBNAME="lib${LIBNAME}.so" # prefix with "lib", suffix with ".so" ++ OPTS="-shared" ++ ++ echo "mklib: Making shared library for Haiku: " ${LIBNAME} ++ ${LINK} ${OPTS} ${LDFLAGS} ${OBJECTS} ${DEPS} -o ${LIBNAME} ++ FINAL_LIBS="${LIBNAME}" ++ fi ++ ;; ++ + 'example') + # If you're adding support for a new architecture, you can + # start with this: +@@ -1021,4 +1025,9 @@ + echo "mklib: Installing" ${FINAL_LIBS} "in" ${INSTALLDIR} + test -d ${INSTALLDIR} || mkdir -p ${INSTALLDIR} + mv ${FINAL_LIBS} ${INSTALLDIR}/ ++ ++ if [ "x${FINAL_BINS}" != "x" ] ; then ++ echo "mklib: Installing" ${FINAL_BINS} "in" ${INSTALLDIR} ++ mv ${FINAL_BINS} ${INSTALLDIR}/ ++ fi + fi +diff -Naur Mesa-7.8.2/configs/current Mesa-7.8.2-haiku/configs/current +--- Mesa-7.8.2/configs/current 1970-01-01 00:00:00.000000000 +0000 ++++ Mesa-7.8.2-haiku/configs/current 2013-02-17 22:26:13.021495808 +0000 +@@ -0,0 +1,63 @@ ++# Configuration for Haiku ++# Written by Alexander von Gluck IV ++# ++# Based on the BeOS config ++# written by Philippe Houdoin ++ ++include $(TOP)/configs/default ++ ++CONFIG_NAME = haiku ++ ++# Haiku settings ++ ++DEFINES = \ ++ -DBEOS_THREADS \ ++ -DGNU_ASSEMBLER \ ++ -DUSE_X86_ASM \ ++ -DUSE_MMX_ASM \ ++ -DUSE_3DNOW_ASM \ ++ -DUSE_SSE_ASM ++ ++MESA_ASM_SOURCES = $(X86_SOURCES) ++GLAPI_ASM_SOURCES = $(X86_API) ++ ++CC = gcc ++CXX = g++ ++LD = gcc ++ ++CFLAGS = -Wall -Wno-multichar $(DEFINES) ++CXXFLAGS = $(CFLAGS) ++LDFLAGS += ++ ++# Work around aliasing bugs - developers should comment this out ++CFLAGS += -fno-strict-aliasing ++#CFLAGS += -std=c99 ++CXXFLAGS += -fno-strict-aliasing ++ ++# No makedepend on Haiku, this will solve it ++MKDEP = true ++ ++# Debug defines ++ifdef DEBUG ++ CFLAGS += -g -O0 ++ LDFLAGS += -g ++ DEFINES += -DDEBUG ++else ++ CFLAGS += -O3 ++endif ++ ++# GLU settings ++GLU_LIB_NAME = libglu.a ++GLU_LIB = glu ++ ++# Directories ++SRC_DIRS = glsl mesa/x86 mapi/glapi mesa glu ++GLU_DIRS = sgi ++DRIVER_DIRS = ++PROGRAM_DIRS = ++ ++# Library/program dependencies ++GL_LIB_DEPS = ++OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) ++GLU_LIB_DEPS = ++APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB) +diff -Naur Mesa-7.8.2/configs/haiku Mesa-7.8.2-haiku/configs/haiku +--- Mesa-7.8.2/configs/haiku 1970-01-01 00:00:00.000000000 +0000 ++++ Mesa-7.8.2-haiku/configs/haiku 2013-02-17 22:26:13.031195136 +0000 +@@ -0,0 +1,63 @@ ++# Configuration for Haiku ++# Written by Alexander von Gluck IV ++# ++# Based on the BeOS config ++# written by Philippe Houdoin ++ ++include $(TOP)/configs/default ++ ++CONFIG_NAME = haiku ++ ++# Haiku settings ++ ++DEFINES = \ ++ -DBEOS_THREADS \ ++ -DGNU_ASSEMBLER \ ++ -DUSE_X86_ASM \ ++ -DUSE_MMX_ASM \ ++ -DUSE_3DNOW_ASM \ ++ -DUSE_SSE_ASM ++ ++MESA_ASM_SOURCES = $(X86_SOURCES) ++GLAPI_ASM_SOURCES = $(X86_API) ++ ++CC = gcc ++CXX = g++ ++LD = gcc ++ ++CFLAGS = -Wall -Wno-multichar $(DEFINES) ++CXXFLAGS = $(CFLAGS) ++LDFLAGS += ++ ++# Work around aliasing bugs - developers should comment this out ++CFLAGS += -fno-strict-aliasing ++#CFLAGS += -std=c99 ++CXXFLAGS += -fno-strict-aliasing ++ ++# No makedepend on Haiku, this will solve it ++MKDEP = true ++ ++# Debug defines ++ifdef DEBUG ++ CFLAGS += -g -O0 ++ LDFLAGS += -g ++ DEFINES += -DDEBUG ++else ++ CFLAGS += -O3 ++endif ++ ++# GLU settings ++GLU_LIB_NAME = libglu.a ++GLU_LIB = glu ++ ++# Directories ++SRC_DIRS = glsl mesa/x86 mapi/glapi mesa glu ++GLU_DIRS = sgi ++DRIVER_DIRS = ++PROGRAM_DIRS = ++ ++# Library/program dependencies ++GL_LIB_DEPS = ++OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) ++GLU_LIB_DEPS = ++APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB) +diff -Naur Mesa-7.8.2/include/GL/gl.h Mesa-7.8.2-haiku/include/GL/gl.h +--- Mesa-7.8.2/include/GL/gl.h 2010-04-27 21:41:21.060555264 +0000 ++++ Mesa-7.8.2-haiku/include/GL/gl.h 2013-02-17 22:30:31.274989056 +0000 +@@ -67,7 +67,8 @@ + #elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */ + # define GLAPI extern + # define GLAPIENTRY __stdcall +-#elif defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) ++#elif (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) && \ ++ defined(__ELF__)) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) + # define GLAPI __attribute__((visibility("default"))) + # define GLAPIENTRY + #endif /* WIN32 && !CYGWIN */ +diff -Naur Mesa-7.8.2/Makefile Mesa-7.8.2-haiku/Makefile +--- Mesa-7.8.2/Makefile 2010-06-16 21:22:57.033292288 +0000 ++++ Mesa-7.8.2-haiku/Makefile 2013-02-17 22:26:13.034340864 +0000 +@@ -84,6 +84,7 @@ + freebsd-dri \ + freebsd-dri-amd64 \ + freebsd-dri-x86 \ ++haiku \ + hpux10 \ + hpux10-gcc \ + hpux10-static \ +diff -Naur Mesa-7.8.2/src/gallium/auxiliary/draw/draw_private.h Mesa-7.8.2-haiku/src/gallium/auxiliary/draw/draw_private.h +--- Mesa-7.8.2/src/gallium/auxiliary/draw/draw_private.h 2010-06-15 17:43:42.046661632 +0000 ++++ Mesa-7.8.2-haiku/src/gallium/auxiliary/draw/draw_private.h 2013-02-17 22:26:13.037486592 +0000 +@@ -70,7 +70,7 @@ + + /* This will probably become float (*data)[4] soon: + */ +- float data[][4]; ++ float (*data)[4]; + }; + + /* NOTE: It should match vertex_id size above */ +diff -Naur Mesa-7.8.2/src/gallium/auxiliary/os/os_thread.h Mesa-7.8.2-haiku/src/gallium/auxiliary/os/os_thread.h +--- Mesa-7.8.2/src/gallium/auxiliary/os/os_thread.h 2010-06-15 17:43:42.056623104 +0000 ++++ Mesa-7.8.2-haiku/src/gallium/auxiliary/os/os_thread.h 2013-02-17 22:26:13.040370176 +0000 +@@ -257,7 +257,7 @@ + * pipe_barrier + */ + +-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HAIKU) ++#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) + + typedef pthread_barrier_t pipe_barrier; + +diff -Naur Mesa-7.8.2/src/gallium/auxiliary/util/u_debug.h Mesa-7.8.2-haiku/src/gallium/auxiliary/util/u_debug.h +--- Mesa-7.8.2/src/gallium/auxiliary/util/u_debug.h 2010-06-15 17:43:42.000000000 +0000 ++++ Mesa-7.8.2-haiku/src/gallium/auxiliary/util/u_debug.h 2013-02-17 22:26:13.046923776 +0000 +@@ -91,8 +91,10 @@ + (void) format; /* silence warning */ + #endif + } +- +-#endif /* !PIPE_OS_HAIKU */ ++#else /* is Haiku */ ++/* Haiku provides debug_printf in libroot with OS.h */ ++#include ++#endif + + /* + * ... isn't portable so we need to pass arguments in parentheses. +diff -Naur Mesa-7.8.2/src/glu/sgi/Makefile Mesa-7.8.2-haiku/src/glu/sgi/Makefile +--- Mesa-7.8.2/src/glu/sgi/Makefile 2010-02-05 00:10:40.064487424 +0000 ++++ Mesa-7.8.2-haiku/src/glu/sgi/Makefile 2013-02-17 22:26:13.049545216 +0000 +@@ -135,13 +135,19 @@ + -mkdir $(TOP)/$(LIB_DIR) + + # Make the library: +-$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) ++$(TOP)/$(LIB_DIR)/lib$(GLU_LIB).so: $(OBJECTS) + $(MKLIB) -o $(GLU_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ + -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \ + -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ + -exports glu.exports -id $(INSTALL_LIB_DIR)/lib$(GLU_LIB).$(GLU_MAJOR).dylib \ + $(GLU_LIB_DEPS) $(OBJECTS) + ++$(TOP)/$(LIB_DIR)/lib$(GLU_LIB).a: $(OBJECTS) ++ $(MKLIB) -o $(GLU_LIB) -static -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ ++ -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \ ++ -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ ++ -exports glu.exports -id $(INSTALL_LIB_DIR)/lib$(GLU_LIB).$(GLU_MAJOR).dylib \ ++ $(GLU_LIB_DEPS) $(OBJECTS) + + clean: + -rm -f *.o */*.o */*/*.o +diff -Naur Mesa-7.8.2/src/mesa/glapi/glapi.h Mesa-7.8.2-haiku/src/mesa/glapi/glapi.h +--- Mesa-7.8.2/src/mesa/glapi/glapi.h 2010-06-15 17:43:43.026476544 +0000 ++++ Mesa-7.8.2-haiku/src/mesa/glapi/glapi.h 2013-02-17 22:26:13.052428800 +0000 +@@ -62,7 +62,7 @@ + #endif + + +-#if defined(__GNUC__) ++#if defined(__GNUC__) && __GNUC__ > 2 + # define likely(x) __builtin_expect(!!(x), 1) + # define unlikely(x) __builtin_expect(!!(x), 0) + #else diff --git a/sys-libs/mesa/patches/mesa-9.0.1.patch b/sys-libs/mesa/patches/mesa-9.0.1.patch new file mode 100644 index 000000000..457c1ce1b --- /dev/null +++ b/sys-libs/mesa/patches/mesa-9.0.1.patch @@ -0,0 +1,52 @@ +diff -Naur Mesa-9.0.1/scons/gallium.py Mesa-9.0.1-haiku/scons/gallium.py +--- Mesa-9.0.1/scons/gallium.py 2012-11-09 12:16:31.041680896 -0600 ++++ Mesa-9.0.1-haiku/scons/gallium.py 2012-12-19 16:03:56.564658176 -0600 +@@ -361,8 +361,7 @@ + ccflags += [ + '-mstackrealign', # ensure stack is aligned + '-march=i586', # Haiku target is Pentium +- '-mtune=i686', # use i686 where we can +- '-mmmx' # use mmx math where we can ++ '-mtune=i686' # use i686 where we can + ] + if env['machine'] == 'x86_64': + ccflags += ['-m64'] +diff -Naur Mesa-9.0.1/scons/llvm.py Mesa-9.0.1-haiku/scons/llvm.py +--- Mesa-9.0.1/scons/llvm.py 2012-08-31 18:33:41.041680896 -0500 ++++ Mesa-9.0.1-haiku/scons/llvm.py 2012-12-18 23:05:50.677642240 -0600 +@@ -183,6 +183,9 @@ + if llvm_version >= distutils.version.LooseVersion('3.1'): + components.append('mcjit') + ++ if llvm_version >= distutils.version.LooseVersion('3.2'): ++ env.Append(CXXFLAGS = ('-fno-rtti',)) ++ + env.ParseConfig('llvm-config --libs ' + ' '.join(components)) + env.ParseConfig('llvm-config --ldflags') + except OSError: +diff -Naur Mesa-9.0.1/src/gallium/auxiliary/Makefile Mesa-9.0.1-haiku/src/gallium/auxiliary/Makefile +--- Mesa-9.0.1/src/gallium/auxiliary/Makefile 2012-08-31 18:33:41.050331648 -0500 ++++ Mesa-9.0.1-haiku/src/gallium/auxiliary/Makefile 2012-12-18 23:06:31.179306496 -0600 +@@ -15,6 +15,10 @@ + $(GALLIVM_CPP_SOURCES) + endif + ++# LLVM >= 3.2 requires -fno-rtti ++ifeq ($(shell expr `echo $(LLVM_VERSION) | sed -e 's/\([0-9]\)\.\([0-9]\)/\10\2/g'` \>= 302),1) ++CXXFLAGS += -fno-rtti ++endif + + include ../Makefile.template + +diff -Naur Mesa-9.0.1/src/mesa/SConscript Mesa-9.0.1-haiku/src/mesa/SConscript +--- Mesa-9.0.1/src/mesa/SConscript 2012-11-09 12:16:31.015728640 -0600 ++++ Mesa-9.0.1-haiku/src/mesa/SConscript 2012-12-19 16:32:37.285736960 -0600 +@@ -371,7 +371,7 @@ + # + # Assembly sources + # +-if env['gcc'] and env['platform'] not in ('darwin', 'windows'): ++if env['gcc'] and env['platform'] not in ('darwin', 'windows', 'haiku'): + if env['machine'] == 'x86': + env.Append(CPPDEFINES = [ + 'USE_X86_ASM', diff --git a/sys-libs/mesa/patches/mesa-9.0.2.patch b/sys-libs/mesa/patches/mesa-9.0.2.patch new file mode 100644 index 000000000..541ca854e --- /dev/null +++ b/sys-libs/mesa/patches/mesa-9.0.2.patch @@ -0,0 +1,25 @@ +diff -Naur Mesa-9.0.2/scons/llvm.py Mesa-9.0.2-haiku/scons/llvm.py +--- Mesa-9.0.2/scons/llvm.py 2013-01-22 18:09:32.066322432 +0000 ++++ Mesa-9.0.2-haiku/scons/llvm.py 2013-02-17 21:20:51.626262016 +0000 +@@ -183,6 +183,9 @@ + if llvm_version >= distutils.version.LooseVersion('3.1'): + components.append('mcjit') + ++ if llvm_version >= distutils.version.LooseVersion('3.2'): ++ env.Append(CXXFLAGS = ('-fno-rtti',)) ++ + env.ParseConfig('llvm-config --libs ' + ' '.join(components)) + env.ParseConfig('llvm-config --ldflags') + except OSError: +diff -Naur Mesa-9.0.2/src/mesa/SConscript Mesa-9.0.2-haiku/src/mesa/SConscript +--- Mesa-9.0.2/src/mesa/SConscript 2013-01-22 18:09:32.040370176 +0000 ++++ Mesa-9.0.2-haiku/src/mesa/SConscript 2013-02-17 21:20:22.510394368 +0000 +@@ -371,7 +371,7 @@ + # + # Assembly sources + # +-if env['gcc'] and env['platform'] not in ('darwin', 'windows'): ++if env['gcc'] and env['platform'] not in ('darwin', 'windows', 'haiku'): + if env['machine'] == 'x86': + env.Append(CPPDEFINES = [ + 'USE_X86_ASM', diff --git a/sys-libs/mesa/patches/mesa-9.0.patch b/sys-libs/mesa/patches/mesa-9.0.patch new file mode 100644 index 000000000..eac5cce5f --- /dev/null +++ b/sys-libs/mesa/patches/mesa-9.0.patch @@ -0,0 +1,42 @@ +diff -Naur Mesa-9.0/src/mesa/sources.mak Mesa-9.0-haiku/src/mesa/sources.mak +--- Mesa-9.0/src/mesa/sources.mak 2012-08-31 23:36:09.036700160 +0000 ++++ Mesa-9.0-haiku/src/mesa/sources.mak 2012-10-09 13:17:15.991690752 +0000 +@@ -281,7 +281,6 @@ + $(SRCDIR)x86/x86_xform.c \ + $(SRCDIR)x86/3dnow.c \ + $(SRCDIR)x86/sse.c \ +- $(SRCDIR)x86/rtasm/x86sse.c \ + $(SRCDIR)sparc/sparc.c \ + $(SRCDIR)x86-64/x86-64.c + +diff -Naur Mesa-9.0/src/mesa/tnl/t_vertex_sse.c Mesa-9.0-haiku/src/mesa/tnl/t_vertex_sse.c +--- Mesa-9.0/src/mesa/tnl/t_vertex_sse.c 2012-08-31 23:33:41.058458112 +0000 ++++ Mesa-9.0-haiku/src/mesa/tnl/t_vertex_sse.c 2012-10-09 13:20:34.234356736 +0000 +@@ -36,7 +36,7 @@ + + #if defined(USE_SSE_ASM) + +-#include "x86/rtasm/x86sse.h" ++#include "rtasm/rtasm_x86sse.h" + #include "x86/common_x86_asm.h" + + +@@ -356,7 +356,7 @@ + struct x86_reg vp0 = x86_make_reg(file_XMM, 1); + struct x86_reg vp1 = x86_make_reg(file_XMM, 2); + struct x86_reg temp2 = x86_make_reg(file_XMM, 3); +- GLubyte *fixup, *label; ++ GLuint fixup, label; + + /* Push a few regs? + */ +@@ -658,7 +658,8 @@ + p.identity = x86_make_reg(file_XMM, 6); + p.chan0 = x86_make_reg(file_XMM, 7); + +- if (!x86_init_func_size(&p.func, MAX_SSE_CODE_SIZE)) { ++ x86_init_func_size(&p.func, MAX_SSE_CODE_SIZE); ++ if (p.func.caps == 0) { + vtx->emit = NULL; + return; + } diff --git a/sys-libs/ncurses/ncurses-5.6.bep b/sys-libs/ncurses/ncurses-5.6.bep index 1cd67aeb6..69ec76766 100644 --- a/sys-libs/ncurses/ncurses-5.6.bep +++ b/sys-libs/ncurses/ncurses-5.6.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd ncurses-5.6 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-libs/ncurses/ncurses-5.7.bep b/sys-libs/ncurses/ncurses-5.7.bep index aea58044f..06d53abd4 100644 --- a/sys-libs/ncurses/ncurses-5.7.bep +++ b/sys-libs/ncurses/ncurses-5.7.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd ncurses-5.7 - ./configure --prefix=/boot/common --with-libtool + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-libtool make } diff --git a/sys-libs/ncurses/ncurses-5.8.bep b/sys-libs/ncurses/ncurses-5.8.bep new file mode 100644 index 000000000..8679d2720 --- /dev/null +++ b/sys-libs/ncurses/ncurses-5.8.bep @@ -0,0 +1,23 @@ +DESCRIPTION="ncurses" +HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" +SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.8.tar.gz" +CHECKSUM_MD5="20ed3fa7599937f0ca268d9088837a64" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd ncurses-5.8 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY`/ \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-libtool + make +} + +INSTALL { + cd ncurses-5.8 + ./misc/shlib make install DESTDIR="${DESTDIR}" +} + +LICENSE="MIT" +COPYRIGHT="1998-2011 Free Software Foundation, Inc." diff --git a/sys-libs/ncurses/ncurses-5.9.bep b/sys-libs/ncurses/ncurses-5.9.bep new file mode 100644 index 000000000..392f126e2 --- /dev/null +++ b/sys-libs/ncurses/ncurses-5.9.bep @@ -0,0 +1,24 @@ +DESCRIPTION="ncurses" +HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" +SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz" +CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1" +REVISION="2" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd ncurses-5.9 + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-libtool \ + --enable-termcap + make +} + +INSTALL { + cd ncurses-5.9 + ./misc/shlib make install DESTDIR="${DESTDIR}" +} + +LICENSE="MIT" +COPYRIGHT="1998-2011 Free Software Foundation, Inc." diff --git a/sys-libs/readline/readline-5.2.bep b/sys-libs/readline/readline-5.2.bep index d0553a60c..b2fbf3746 100644 --- a/sys-libs/readline/readline-5.2.bep +++ b/sys-libs/readline/readline-5.2.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd readline-5.2 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-libs/readline/readline-6.0.bep b/sys-libs/readline/readline-6.0.bep index 807a3a1bf..77b1ff870 100644 --- a/sys-libs/readline/readline-6.0.bep +++ b/sys-libs/readline/readline-6.0.bep @@ -1,5 +1,5 @@ -DESCRIPTION="readline" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +DESCRIPTION="readline" +HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.0.tar.gz" CHECKSUM_MD5="b7f65a48add447693be6e86f04a63019" REVISION="1" @@ -11,11 +11,7 @@ BUILD { aclocal autoconf MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --libdir=$LIBDIR \ --mandir=$MANDIR diff --git a/sys-libs/readline/readline-6.1.bep b/sys-libs/readline/readline-6.1.bep index 9392c2d6f..90bbcff1c 100644 --- a/sys-libs/readline/readline-6.1.bep +++ b/sys-libs/readline/readline-6.1.bep @@ -1,5 +1,5 @@ -DESCRIPTION="readline" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +DESCRIPTION="readline" +HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.1.tar.gz" CHECKSUM_MD5="fc2f7e714fe792db1ce6ddc4c9fb4ef3" REVISION="1" @@ -10,15 +10,11 @@ BUILD { libtoolize --force --copy --install aclocal autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - if [ -n "$(setgcc | grep '2')" ]; then - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - else - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`/gcc4 - fi ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR +# --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ + --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } diff --git a/sys-libs/readline/readline-6.2.bep b/sys-libs/readline/readline-6.2.bep new file mode 100644 index 000000000..b1725633f --- /dev/null +++ b/sys-libs/readline/readline-6.2.bep @@ -0,0 +1,27 @@ +DESCRIPTION="readline" +HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz" +CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c" +REVISION="2" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd readline-6.2 + libtoolize --force --copy --install + aclocal + autoconf + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ + --infodir=$COMMON_DOCS/info \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL { + cd readline-6.2 + make install DESTDIR="${DESTDIR}" +} + +LICENSE="GNU GPL v3" +COPYRIGHT="1989-2011 Free Software Foundation, Inc." diff --git a/sys-libs/slang/slang-2.2.2.bep b/sys-libs/slang/slang-2.2.2.bep index 9ac8ae01b..2f452ce71 100644 --- a/sys-libs/slang/slang-2.2.2.bep +++ b/sys-libs/slang/slang-2.2.2.bep @@ -11,7 +11,7 @@ BUILD { cp autoconf/config.guess config.guess cd .. sed -i -e '/^TERMCAP=/s:=.*:=:' configure || die - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/sys-libs/zlib/zlib-1.2.3.bep b/sys-libs/zlib/zlib-1.2.3.bep index e08a18264..d74407c3d 100644 --- a/sys-libs/zlib/zlib-1.2.3.bep +++ b/sys-libs/zlib/zlib-1.2.3.bep @@ -7,7 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd zlib-1.2.3 - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } @@ -16,4 +16,4 @@ INSTALL { make install } LICENSE="Zlib" -COPYRIGHT="Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler" +COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" diff --git a/sys-libs/zlib/zlib-1.2.5.bep b/sys-libs/zlib/zlib-1.2.5.bep index 16fd2f294..03f91d8b2 100644 --- a/sys-libs/zlib/zlib-1.2.5.bep +++ b/sys-libs/zlib/zlib-1.2.5.bep @@ -7,6 +7,7 @@ STATUS_HAIKU="stable" DEPEND="" BUILD { cd zlib-1.2.5 + sed -i 's/share\/man/documentation\/man/' CMakeLists.txt cmake . make } @@ -16,4 +17,4 @@ INSTALL { make install } LICENSE="Zlib" -COPYRIGHT="Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler" +COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" diff --git a/sys-libs/zlib/zlib-1.2.7.bep b/sys-libs/zlib/zlib-1.2.7.bep new file mode 100644 index 000000000..6210e8655 --- /dev/null +++ b/sys-libs/zlib/zlib-1.2.7.bep @@ -0,0 +1,21 @@ +DESCRIPTION="zlib" +HOMEPAGE="http://www.zlib.net/" +SRC_URI="http://zlib.net/zlib-1.2.7.tar.gz" +CHECKSUM_MD5="60df6a37c56e7c1366cca812414f7b85" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd zlib-1.2.7 + sed -i 's/share\/man/documentation\/man/' CMakeLists.txt + sed -i 's/share\/pkgconfig/lib\/pkgconfig/' CMakeLists.txt + cmake . + make +} + +INSTALL { + cd zlib-1.2.7 + make install +} +LICENSE="Zlib" +COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" diff --git a/sys-libs/zopfli/zopfli-999.bep b/sys-libs/zopfli/zopfli-999.bep new file mode 100644 index 000000000..9efa227a0 --- /dev/null +++ b/sys-libs/zopfli/zopfli-999.bep @@ -0,0 +1,24 @@ +DESCRIPTION="Zopfli Compression Algorithm is a zlib (gzip, deflate) compatible compressor." +HOMEPAGE="http://code.google.com/p/zopfli" +SRC_URI="git+https://code.google.com/p/zopfli/" +#CHECKSUM_MD5="abc123" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." + +BUILD { + cd zopfli-999 + sed -i 's/\-lm//' makefile + make +} + +INSTALL { + cd zopfli-999 + BINDIR=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` + mkdir -p ${BINDIR} + cp -r zopfli ${BINDIR}/zopfli +} + +LICENSE="Apache v2" +COPYRIGHT="2011-2013 Google Inc." diff --git a/sys-process/htop/htop-1.0.2.bep b/sys-process/htop/htop-1.0.2.bep new file mode 100644 index 000000000..5b4c800ed --- /dev/null +++ b/sys-process/htop/htop-1.0.2.bep @@ -0,0 +1,19 @@ +DESCRIPTION="htop- an interactive process viewer for Linux" +HOMEPAGE="http://htop.sourceforge.net/" +SRC_URI="http://downloads.sourceforge.net/project/htop/htop/1.0.2/htop-1.0.2.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fhtop%2Ffiles%2Fhtop%2F1.0.2%2F&ts=1354198817&use_mirror=heanet" +CHECKSUM_MD5="0d01cca8df3349c74569cefebbd9919e" +REVISION="1" +STATUS_HAIKU="broken" +DEPEND="" +BUILD { + cd htop-1.0.2 + ./configure --disable-unicode --prefix=`finddir B_COMMON_DIRECTORY` + make +} + +INSTALL { + cd htop-1.0.2 + make install +} +LICENSE="GNU GPL v2" +COPYRIGHT="2004-2010 Hisham Muhammad" diff --git a/sys-process/htop/patches/htop-1.0.2.patch b/sys-process/htop/patches/htop-1.0.2.patch new file mode 100644 index 000000000..57e9442b9 --- /dev/null +++ b/sys-process/htop/patches/htop-1.0.2.patch @@ -0,0 +1,47 @@ +diff -Naur htop-1.0.2/configure htop-1.0.2-haiku/configure +--- htop-1.0.2/configure 2012-10-03 20:13:10.000000000 +0000 ++++ htop-1.0.2-haiku/configure 2012-11-29 12:07:07.717750272 +0000 +@@ -11388,13 +11388,13 @@ + + + # Checks for libraries. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ceil in -lm" >&5 +-$as_echo_n "checking for ceil in -lm... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ceil in $LIBM" >&5 ++$as_echo_n "checking for ceil in $LIBM... " >&6; } + if test "${ac_cv_lib_m_ceil+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lm $LIBS" ++LIBS="$LIBM $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -11429,7 +11429,7 @@ + #define HAVE_LIBM 1 + _ACEOF + +- LIBS="-lm $LIBS" ++ LIBS="$LIBM $LIBS" + + else + missing_libraries="$missing_libraries libm" +diff -Naur htop-1.0.2/configure.ac htop-1.0.2-haiku/configure.ac +--- htop-1.0.2/configure.ac 2012-08-29 13:24:31.023330816 +0000 ++++ htop-1.0.2-haiku/configure.ac 2012-11-29 10:13:11.320602112 +0000 +@@ -1,3 +1,5 @@ ++ ++ + # -*- Autoconf -*- + # Process this file with autoconf to produce a configure script. + +@@ -22,7 +24,7 @@ + AC_PROG_LIBTOOL + + # Checks for libraries. +-AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"]) ++AC_CHECK_LIB(m, cos, LIBM="$LIBM") + + # Checks for header files. + AC_HEADER_DIRENT diff --git a/www-client/links/links-2.3pre2.bep b/www-client/links/links-2.3pre2.bep new file mode 100644 index 000000000..15bb7a6f7 --- /dev/null +++ b/www-client/links/links-2.3pre2.bep @@ -0,0 +1,29 @@ +DESCRIPTION="links web browser" +HOMEPAGE="http://links.twibright.com" +SRC_URI="http://links.twibright.com/download/links-2.3pre2.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="bb2a4e058c88b8ec0c9f6c0e1640555c" +BUILD { + cd links-2.3pre2 + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --without-x \ + --enable-utf-8 \ + --enable-graphics + rc links-beos.rdef + make + xres -o links links-beos.rsrc + mimeset links +} + +INSTALL { + cd links-2.3pre2 + make install DESTDIR=${DESTDIR} +} + +LICENSE="GNU GPL v2" +COPYRIGHT="1999 - 2011 Mikulas Patocka + 2000 - 2011 Petr Kulhavy, Karel Kulhavy, Martin Pergel" diff --git a/www-client/links/patches/links-2.1pre33.beos.002.patch b/www-client/links/patches/links-2.1pre33.beos.002.patch new file mode 100644 index 000000000..6450a54f1 --- /dev/null +++ b/www-client/links/patches/links-2.1pre33.beos.002.patch @@ -0,0 +1,3157 @@ +BeOS graphics support, use with: +./configure --prefix=$HOME/config --without-x --enable-utf-8 --enable-graphics +beres -o links-beos.rsrc links-beos.rdef +make && xres -o links links-beos.rsrc && mimeset links + +Francois Revol, revol@free.fr + +diff -urN links-2.1pre33.org/Makefile.am links-2.1pre33/Makefile.am +--- links-2.1pre33.org/Makefile.am Tue Dec 25 02:43:02 2007 ++++ links-2.1pre33/Makefile.am Sat May 3 21:32:48 2008 +@@ -4,7 +4,7 @@ + + man_MANS=links.1 + +-EXTRA_DIST=atheos.cpp $(man_MANS) BRAILLE_HOWTO KEYS BUGS TODO SITES PATCH-gpm-1.20.0-smooth-cursor PATCH-libpng-1.2.18 mailcap.pl rebuild Links_logo.png Unicode/*.cp Unicode/[!C]* intl/[!C]* graphics/*.c graphics/arrow.png graphics/gen graphics/system_font/*.png graphics/font/century_school-medium-roman-serif-vari/*.png graphics/font/century_school-bold-roman-serif-vari/*.png graphics/font/symbol-medium-roman-sans-vari/*.png graphics/font/courier-medium-roman-serif-mono/*.png graphics/font/japanese-medium-roman-sans-mono/*.png graphics/font/century_school-bold-roman-serif-vari/aliases graphics/font/century_school-medium-roman-serif-vari/aliases graphics/font/symbol-medium-roman-sans-vari/aliases doc/links_cal/*.png doc/links_cal/*.html graphics/Makefile graphics/Fontmap graphics/clip.c graphics/links.xpm graphics/makefont graphics/pdf2html graphics/spacer.png links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm links.nsi ++EXTRA_DIST=atheos.cpp beosgui.cpp $(man_MANS) BRAILLE_HOWTO KEYS BUGS TODO SITES PATCH-gpm-1.20.0-smooth-cursor PATCH-libpng-1.2.18 mailcap.pl rebuild Links_logo.png Unicode/*.cp Unicode/[!C]* intl/[!C]* graphics/*.c graphics/arrow.png graphics/gen graphics/system_font/*.png graphics/font/century_school-medium-roman-serif-vari/*.png graphics/font/century_school-bold-roman-serif-vari/*.png graphics/font/symbol-medium-roman-sans-vari/*.png graphics/font/courier-medium-roman-serif-mono/*.png graphics/font/japanese-medium-roman-sans-mono/*.png graphics/font/century_school-bold-roman-serif-vari/aliases graphics/font/century_school-medium-roman-serif-vari/aliases graphics/font/symbol-medium-roman-sans-vari/aliases doc/links_cal/*.png doc/links_cal/*.html graphics/Makefile graphics/Fontmap graphics/clip.c graphics/links.xpm graphics/makefont graphics/pdf2html graphics/spacer.png links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm links.nsi links-beos.rdef + + bin_PROGRAMS=links + +@@ -13,6 +13,11 @@ + else + endif + ++if BEOS_GR ++links_LDADD=beosgui.o -lbe ++else ++endif ++ + links_SOURCES=af_unix.c auth.c beos.c bfu.c block.c bookmarks.c cache.c charsets.c connect.c cookies.c default.c dip.c directfb.c directfb_cursors.h dither.c dns.c drivers.c error.c file.c finger.c font_include.c framebuffer.c ftp.c gif.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c links_icon.c listedit.c lru.c mailto.c main.c menu.c memory.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c x.c xbm.c links.h cfg.h os_dep.h os_depx.h setup.h codepage.h language.h codepage.inc entity.inc uni_7b.inc language.inc upcase.inc arrow.inc bits.h + + dist-hook: +@@ -31,7 +36,12 @@ + CXXFLAGS=@CXXFLAGS@ + + atheos.o: atheos.cpp +- $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c atheos.cpp ++ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -o $@ -c $< ++ ++beosgui.o: beosgui.cpp ++ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -o $@ -c $< ++ ++ + + datadir = $(prefix)/@DATADIRNAME@ + LIBS = @LIBS@ +diff -urN links-2.1pre33.org/acconfig.h links-2.1pre33/acconfig.h +--- links-2.1pre33.org/acconfig.h Wed Mar 21 17:20:21 2007 ++++ links-2.1pre33/acconfig.h Sat May 3 18:30:26 2008 +@@ -113,6 +113,9 @@ + #undef GRDRV_ATHEOS + + /* */ ++#undef GRDRV_BEOS ++ ++/* */ + #undef DONT_INCLUDE_SETJMP + + /* Tiff by Brain */ +diff -urN links-2.1pre33.org/atheos.cpp links-2.1pre33/atheos.cpp +--- links-2.1pre33.org/atheos.cpp Fri Oct 22 21:11:31 2004 ++++ links-2.1pre33/atheos.cpp Sat May 3 18:30:27 2008 +@@ -207,7 +207,7 @@ + win->Unlock(); + ath_lock->Lock(); + win->Lock(); +- if (dev) dev->mouse_handler(dev, last_x = (int)p.x, last_y = (int)p.y, B_DOWN | (b == 2 ? B_RIGHT : b == 3 ? B_MIDDLE : B_LEFT)); ++ if (dev) dev->mouse_handler(dev, last_x = (int)p.x, last_y = (int)p.y, BTN_DOWN | (b == 2 ? BTN_RIGHT : b == 3 ? BTN_MIDDLE : BTN_LEFT)); + ath_lock->Unlock(); + write(wpipe, " ", 1); + } +@@ -217,7 +217,7 @@ + win->Unlock(); + ath_lock->Lock(); + win->Lock(); +- if (dev) dev->mouse_handler(dev, last_x = (int)p.x, last_y = (int)p.y, B_UP | (b == 2 ? B_RIGHT : b == 3 ? B_MIDDLE : B_LEFT)); ++ if (dev) dev->mouse_handler(dev, last_x = (int)p.x, last_y = (int)p.y, BTN_UP | (b == 2 ? BTN_RIGHT : b == 3 ? BTN_MIDDLE : BTN_LEFT)); + ath_lock->Unlock(); + write(wpipe, " ", 1); + } +@@ -227,7 +227,7 @@ + win->Unlock(); + ath_lock->Lock(); + win->Lock(); +- if (dev) dev->mouse_handler(dev, last_x = (int)p.x, last_y = (int)p.y, !b ? B_MOVE : B_DRAG | (b & 1 ? B_LEFT : b & 2 ? B_RIGHT : b & 4 ? B_MIDDLE : B_LEFT)); ++ if (dev) dev->mouse_handler(dev, last_x = (int)p.x, last_y = (int)p.y, !b ? BTN_MOVE : BTN_DRAG | (b & 1 ? BTN_LEFT : b & 2 ? BTN_RIGHT : b & 4 ? BTN_MIDDLE : BTN_LEFT)); + ath_lock->Unlock(); + write(wpipe, " ", 1); + } +@@ -237,8 +237,8 @@ + win->Unlock(); + ath_lock->Lock(); + win->Lock(); +- if (d.y) if (dev) dev->mouse_handler(dev, last_x, last_y, B_MOVE | (d.y > 0 ? B_WHEELDOWN : B_WHEELUP)); +- if (d.x) if (dev) dev->mouse_handler(dev, last_x, last_y, B_MOVE | (d.x < 0 ? B_WHEELLEFT : B_WHEELRIGHT)); ++ if (d.y) if (dev) dev->mouse_handler(dev, last_x, last_y, BTN_MOVE | (d.y > 0 ? BTN_WHEELDOWN : BTN_WHEELUP)); ++ if (d.x) if (dev) dev->mouse_handler(dev, last_x, last_y, BTN_MOVE | (d.x < 0 ? BTN_WHEELLEFT : BTN_WHEELRIGHT)); + ath_lock->Unlock(); + write(wpipe, " ", 1); + } +diff -urN links-2.1pre33.org/beos.c links-2.1pre33/beos.c +--- links-2.1pre33.org/beos.c Mon Sep 11 04:39:14 2006 ++++ links-2.1pre33/beos.c Sat May 3 21:08:27 2008 +@@ -11,8 +11,9 @@ + #include + #include + #include ++#include + #include +-#include ++#include + + #define SHS 128 + +@@ -20,6 +21,42 @@ + #define MAXINT 0x7fffffff + #endif + ++extern int ggr; ++ ++#ifdef __cplusplus ++extern "C" { ++int get_input_handle(); ++void unblock_stdin(); ++void block_stdin(); ++} ++#endif ++ ++void maybe_force_gr(void) ++{ ++ struct stat stn, stin, stout; ++ /* ++ * if stdin and out are /dev/null it's likely ++ * we have been started from the gui... ++ */ ++ if (lstat("/dev/null", &stn) < 0) ++ return; ++ if (fstat(0, &stin) < 0) ++ return; ++ if (fstat(1, &stout) < 0) ++ return; ++ if (stin.st_dev != stn.st_dev) ++ return; ++ if (stout.st_dev != stn.st_dev) ++ return; ++ if (stin.st_ino != stn.st_ino) ++ return; ++ if (stout.st_ino != stn.st_ino) ++ return; ++ ggr = 1; ++} ++ ++#if IPPROTO_TCP != 6 ++ + int be_read(int s, void *ptr, int len) + { + if (s >= SHS) return recv(s - SHS, ptr, len, 0); +@@ -90,6 +127,10 @@ + + #define PIPE_RETRIES 10 + ++#ifndef PF_INET ++#define PF_INET AF_INET ++#endif ++ + int be_pipe(int *fd) + { + int s1, s2, s3, l; +@@ -249,5 +290,22 @@ + } + return h = ohpipe[1]; + }*/ ++ ++#else /* IPPROTO_TCP != 6 */ ++ ++void block_stdin() ++{ ++} ++ ++void unblock_stdin() ++{ ++} ++ ++int get_input_handle() ++{ ++ return 0; ++} ++ ++#endif + + #endif +diff -urN links-2.1pre33.org/beosgui.cpp links-2.1pre33/beosgui.cpp +--- links-2.1pre33.org/beosgui.cpp Thu Jan 1 01:00:00 1970 ++++ links-2.1pre33/beosgui.cpp Sat May 3 23:27:52 2008 +@@ -0,0 +1,884 @@ ++/* beos.c ++ * (c) 2007 François Revol ++ * This file is a part of the Links program, released under GPL ++ */ ++ ++#ifdef __BEOS__ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* ++ * GUI code ++ */ ++ ++/* ++ * TODO: ++ * - BeOS doesn't handle BView::DrawBitmap() with RGB24, and links doesn't seem to handle RGB32, ++ * so the colorspace is forced into 16bpp for now. ++ * - more paste handling ? ++ * - more DnD (maybe check if in menu or not and prepend "g" ?) ++ * - handle DnD of Net+ bookmarks ++ */ ++ ++#include "cfg.h" ++ ++#ifdef GRDRV_BEOS ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++extern "C" { ++#include "links.h" ++} ++ ++//#define DBG(l...) fprintf(stderr, l); ++#define DBG(l...) {} ++ ++/* ++#ifdef debug ++#undef debug ++#endif ++#define debug(x) ++#define fprintf(x, y) ++*/ ++ ++extern struct graphics_driver beos_driver; ++ ++class LinksApplication : public BApplication { ++ public: ++ LinksApplication():BApplication("application/x-vnd.links"){} ++ virtual void RefsReceived(BMessage *message); ++ virtual bool QuitRequested(); ++}; ++ ++class LinksView; ++ ++class LinksWindow : public BWindow { ++ public: ++ LinksWindow(BRect r); ++ ~LinksWindow(); ++ virtual void FrameResized(float width, float height); ++ virtual bool QuitRequested(); ++ int resized; ++ LinksView *view; ++}; ++ ++class LinksView : public BView { ++ public: ++ LinksView(LinksWindow *w); ++ ~LinksView(); ++ virtual void Draw(BRect r); ++ virtual void MouseDown(BPoint p); ++ virtual void MouseUp(BPoint p); ++ virtual void MouseMoved(BPoint p, uint32 transit, const BMessage *dragmsg); ++ virtual void KeyDown(const char *s, int32 numBytes); ++ virtual void MessageReceived(BMessage *msg); ++ LinksWindow *win; ++ struct graphics_device *dev; ++ void d_flush(); ++ int flushing; ++ int last_x, last_y; ++}; ++ ++#define lv(dev) ((LinksView *)(dev)->driver_data) ++ ++#define lock_dev(dev) do { if (!lv(dev)->win->Lock()) return; } while (0) ++#define lock_dev0(dev) do { if (!lv(dev)->win->Lock()) return 0; } while (0) ++#define unlock_dev(dev) do { lv(dev)->win->Unlock(); } while (0) ++ ++void be_get_size(struct graphics_device *dev); ++ ++#define detach_message(dev) \ ++ BMessage *current = Looper()->DetachCurrentMessage(); \ ++ if (current) { \ ++ current->AddPointer("linksdev", dev); \ ++ } ++ ++#define pipe_message(dev) \ ++ if (current) { \ ++ write(wpipe, ¤t, sizeof(current)); \ ++ } ++ ++#define detach_and_pipe_message(dev) do { \ ++ BMessage *current = Looper()->DetachCurrentMessage(); \ ++ if (current) { \ ++ current->AddPointer("linksdev", dev); \ ++ write(wpipe, ¤t, sizeof(current)); \ ++ } \ ++} while (0) ++ ++LinksApplication *be_links_app; ++BLocker *be_lock = NULL; ++ ++int msg_pipe[2]; ++ ++thread_id be_app_thread_id; ++ ++#define rpipe (msg_pipe[0]) ++#define wpipe (msg_pipe[1]) ++ ++#define small_color (sizeof(rgb_color) <= sizeof(long)) ++#define get_color32(c, rgb) rgb_color c((rgb_color){(rgb >> 16) & 255, (rgb >> 8) & 255, rgb & 255, 255}) ++ ++color_space be_cs_desktop, be_cs_bmp; ++ ++int be_x_size, be_y_size; ++ ++int be_win_x_size, be_win_y_size; ++int be_win_x_pos, be_win_y_pos; ++ ++static BMessage *initial_refs_msg; ++ ++void LinksApplication::RefsReceived(BMessage *message) ++{ ++ entry_ref ref; ++ //if (!IsLaunching()) ++ // return; ++ BMessenger msgr(WindowAt(0)); ++ BMessage *m = new BMessage(*message); ++ m->AddSpecifier("View", (long)0); ++ //m->what = B_SIMPLE_DATA; ++ if (msgr.IsValid()) { ++ msgr.SendMessage(m); ++ } else ++ initial_refs_msg = m; ++} ++ ++bool LinksApplication::QuitRequested() ++{ ++ BApplication::QuitRequested(); ++ //printf("qc: %ld\n", CountWindows()); ++ return true; ++} ++ ++LinksWindow::LinksWindow(BRect r):BWindow(r, "Links", B_DOCUMENT_WINDOW, 0) ++{ ++ DBG("LINKSWINDOW\n"); ++ resized = 0; ++ view = NULL; ++} ++ ++LinksWindow::~LinksWindow() ++{ ++ view = NULL; ++ DBG("~LINKSWINDOW\n"); ++} ++ ++void LinksWindow::FrameResized(float width, float height) ++{ ++ resized = 1; ++} ++ ++bool LinksWindow::QuitRequested() ++{ ++ detach_and_pipe_message(view->dev); ++ return false; ++} ++ ++void do_flush(void *p_dev) ++{ ++ struct graphics_device *dev = (struct graphics_device *)p_dev; ++ LinksView *v = lv(dev); ++ v->win->Lock(); ++ v->win->Flush(); ++ v->win->Unlock(); ++ v->flushing = 0; ++} ++ ++LinksView::LinksView(LinksWindow *w):BView(w->Bounds(), "Links", B_FOLLOW_ALL, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE) ++{ ++ DBG("LINKSVIEW\n"); ++ (win = w)->AddChild(this); ++ SetViewColor(B_TRANSPARENT_32_BIT); ++ MakeFocus(); ++ w->view = this; ++ flushing = 0; ++ last_x = last_y = 0; ++} ++ ++LinksView::~LinksView() ++{ ++ win->view = NULL; ++ DBG("~LINKSVIEW\n"); ++} ++ ++void LinksView::d_flush() ++{ ++ if (flushing) return; ++ register_bottom_half(do_flush, this->dev); ++ flushing = 1; ++} ++ ++#undef select ++ ++int be_loop_select(int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t) ++{ ++ int v; ++ v = select(n, r, w, e, t); ++ check_bottom_halves(); ++ return v; ++} ++ ++void be_paste_string(struct graphics_device *dev, const char *str) ++{ ++ unsigned char *s = (unsigned char *)str; ++ int c, i; ++ while (s && *s) { ++ GET_UTF_8(s, c); ++ if (dev) dev->keyboard_handler(dev, c, 0); ++ } ++} ++ ++void be_get_event(void *dummy) ++{ ++ BMessage *msg; ++ LinksView *view = NULL; ++ LinksWindow *win = NULL; ++ struct graphics_device *dev; ++ read(rpipe, &msg, sizeof(msg)); ++ DBG("GETE\n"); ++ if (!msg) ++ return; ++ if (msg->FindPointer("linksdev", (void **)&dev) < B_OK) ++ return; ++ if (dev) { ++ view = lv(dev); ++ if (view) ++ win = dynamic_cast(view->Window()); ++ } ++ switch (msg->what) { ++ case B_QUIT_REQUESTED: ++ if (dev) ++ dev->keyboard_handler(dev, KBD_CTRL_C, 0); ++ break; ++ case _UPDATE_: ++ { ++ BRect r; ++ if (msg->FindRect("updateRect", &r) < B_OK) ++ return; ++ struct rect rr; ++ rr.x1 = (int)r.left; ++ rr.x2 = (int)r.right + 1; ++ rr.y1 = (int)r.top; ++ rr.y2 = (int)r.bottom + 1; ++ /*DBG("paint: %d %d %d %d\n", rr.x1, rr.x2, rr.y1, rr.y2);*/ ++ if (dev) { ++ if (!win->resized) dev->redraw_handler(dev, &rr); ++ else { ++ be_get_size(dev); ++ win->resized = 0; ++ dev->resize_handler(dev); ++ } ++ } ++ check_bottom_halves(); ++ } ++ break; ++ case B_MOUSE_DOWN: ++ { ++ BPoint where; ++ int32 buttons; ++ int btn = BTN_LEFT; ++ if (msg->FindInt32("buttons", &buttons) != B_OK) ++ return; ++ if (msg->FindPoint("where", &where) != B_OK) ++ return; ++ if (buttons & B_PRIMARY_MOUSE_BUTTON) ++ btn = BTN_LEFT; ++ else if (buttons & B_SECONDARY_MOUSE_BUTTON) ++ btn = BTN_RIGHT; ++ else if (buttons & B_TERTIARY_MOUSE_BUTTON) ++ btn = BTN_MIDDLE; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 1)) ++ btn = BTN_FOURTH; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 2)) ++ btn = BTN_FIFTH; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 3)) ++ btn = BTN_SIXTH; ++ if (dev) dev->mouse_handler(dev, view->last_x = (int)where.x, view->last_y = (int)where.y, BTN_DOWN | btn); ++ } ++ break; ++ case B_MOUSE_UP: ++ { ++ BPoint where; ++ int32 buttons; ++ int btn = BTN_LEFT; ++ if (msg->FindInt32("buttons", &buttons) != B_OK) ++ return; ++ if (msg->FindPoint("where", &where) != B_OK) ++ return; ++ if (buttons & ~B_PRIMARY_MOUSE_BUTTON == 0) ++ btn = BTN_LEFT; ++ else if (buttons & ~B_SECONDARY_MOUSE_BUTTON == 0) ++ btn = BTN_RIGHT; ++ else if (buttons & ~B_TERTIARY_MOUSE_BUTTON == 0) ++ btn = BTN_MIDDLE; ++ else if (buttons & ~(B_TERTIARY_MOUSE_BUTTON << 1) == 0) ++ btn = BTN_FOURTH; ++ else if (buttons & ~(B_TERTIARY_MOUSE_BUTTON << 2) == 0) ++ btn = BTN_FIFTH; ++ else if (buttons & ~(B_TERTIARY_MOUSE_BUTTON << 3) == 0) ++ btn = BTN_SIXTH; ++ if (dev) dev->mouse_handler(dev, view->last_x = (int)where.x, view->last_y = (int)where.y, BTN_UP | btn); ++ } ++ break; ++ case B_MOUSE_MOVED: ++ { ++ BPoint where; ++ int32 buttons; ++ int btn = BTN_LEFT; ++ if (msg->FindInt32("buttons", &buttons) != B_OK) ++ return; ++ if (msg->FindPoint("where", &where) != B_OK) ++ return; ++ if (buttons & B_PRIMARY_MOUSE_BUTTON) ++ btn = BTN_LEFT; ++ else if (buttons & B_SECONDARY_MOUSE_BUTTON) ++ btn = BTN_RIGHT; ++ else if (buttons & B_TERTIARY_MOUSE_BUTTON) ++ btn = BTN_MIDDLE; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 1)) ++ btn = BTN_FOURTH; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 2)) ++ btn = BTN_FIFTH; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 3)) ++ btn = BTN_SIXTH; ++ if (dev) dev->mouse_handler(dev, view->last_x = (int)where.x, view->last_y = (int)where.y, !buttons ? BTN_MOVE : BTN_DRAG | btn); ++ } ++ break; ++ case B_KEY_DOWN: ++ { ++ int32 modifiers; ++ int32 numBytes; ++ const char *bytes; ++ int c; ++ int mods = 0; ++ if (msg->FindInt32("modifiers", &modifiers) != B_OK) ++ return; ++ if (msg->FindString("bytes", &bytes) != B_OK) ++ return; ++ unsigned char buf[4] = { 0, 0, 0, 0 }; ++ unsigned char *ss; ++ if (modifiers & (B_LEFT_CONTROL_KEY | B_RIGHT_CONTROL_KEY | B_LEFT_COMMAND_KEY | B_RIGHT_COMMAND_KEY)) { ++ int32 raw; ++ if (msg->FindInt32("raw_char", &raw) != B_OK) ++ return; ++ buf[0] = (unsigned char)raw; ++ ss = buf; ++ } else ++ ss = (unsigned char *)bytes; ++ ++ GET_UTF_8(ss, c); ++ switch (c) { ++ case B_BACKSPACE: c = KBD_BS; break; ++ case B_ENTER: c = KBD_ENTER; break; ++ case B_SPACE: c = ' '; break; ++ case B_TAB: c = KBD_TAB; break; ++ case B_ESCAPE: c = KBD_ESC; break; ++ case B_LEFT_ARROW: c = KBD_LEFT; break; ++ case B_RIGHT_ARROW: c = KBD_RIGHT; break; ++ case B_UP_ARROW: c = KBD_UP; break; ++ case B_DOWN_ARROW: c = KBD_DOWN; break; ++ case B_INSERT: c = KBD_INS; break; ++ case B_DELETE: c = KBD_DEL; break; ++ case B_HOME: c = KBD_HOME; break; ++ case B_END: c = KBD_END; break; ++ case B_PAGE_UP: c = KBD_PAGE_UP; break; ++ case B_PAGE_DOWN: c = KBD_PAGE_DOWN; break; ++ default: if (c < 32) c = 0; ++ else modifiers &= ~(B_LEFT_SHIFT_KEY|B_RIGHT_SHIFT_KEY); ++ break; ++ } ++ if (modifiers & (B_LEFT_SHIFT_KEY|B_RIGHT_SHIFT_KEY)) ++ mods |= KBD_SHIFT; ++ if (modifiers & (B_LEFT_CONTROL_KEY|B_RIGHT_CONTROL_KEY)) ++ mods |= KBD_CTRL; ++ if (modifiers & (B_LEFT_COMMAND_KEY|B_RIGHT_COMMAND_KEY)) ++ mods |= KBD_ALT; ++ if (c) if (dev) dev->keyboard_handler(dev, c, mods); ++ } ++ break; ++ case B_MOUSE_WHEEL_CHANGED: ++ { ++ float delta_x, delta_y; ++ if (msg->FindFloat("be:wheel_delta_x", &delta_x) != B_OK) ++ delta_x = 0; ++ if (msg->FindFloat("be:wheel_delta_y", &delta_y) != B_OK) ++ delta_y = 0; ++ if (delta_y) if (dev) dev->mouse_handler(dev, view->last_x, view->last_y, BTN_MOVE | (delta_y > 0 ? BTN_WHEELDOWN : BTN_WHEELUP)); ++ if (delta_x) if (dev) dev->mouse_handler(dev, view->last_x, view->last_y, BTN_MOVE | (delta_x < 0 ? BTN_WHEELLEFT : BTN_WHEELRIGHT)); ++ } ++ break; ++ case B_PASTE: ++ if (be_clipboard->Lock()) { ++ BMessage *data = be_clipboard->Data(); ++ if (data) { ++ const char *text_plain; ++ ssize_t len; ++ //data->PrintToStream(); ++ if (data->FindData("text/plain", B_MIME_TYPE, (const void **)&text_plain, &len) == B_OK) { ++ be_paste_string(dev, text_plain); ++ } ++ } ++ be_clipboard->Unlock(); ++ } ++ break; ++ case B_REFS_RECEIVED: ++ if (dev) ++ be_paste_string(dev, "\033\ng"); ++ /* FALLTHROUGH */ ++ case B_SIMPLE_DATA: ++ { ++ /* something got dropped */ ++ entry_ref ref; ++ const char *text_plain; ++ ssize_t len; ++ //msg->PrintToStream(); ++ /* try find a file path to paste */ ++ if (msg->FindRef("refs", &ref) == B_OK) { ++ BPath path(&ref); ++ if (path.InitCheck() == B_OK) { ++ BFile f(path.Path(), B_READ_ONLY); ++ BString url; ++ if (f.InitCheck() == B_OK && f.ReadAttrString("META:url", &url) >= B_OK) { ++ be_paste_string(dev, url.String()); ++ } else ++ be_paste_string(dev, path.Path()); ++ } ++ } else if (msg->FindData("text/plain", B_MIME_TYPE, (const void **)&text_plain, &len) == B_OK) { ++ be_paste_string(dev, text_plain); ++ } ++ } ++ break; ++ default: ++ msg->PrintToStream(); ++ break; ++ } ++ delete msg; ++} ++ ++void be_get_size(struct graphics_device *dev) ++{ ++ BRect r; ++ lock_dev(dev); ++ r = lv(dev)->Bounds(); ++ unlock_dev(dev); ++ dev->size.x1 = dev->size.y1 = 0; ++ dev->size.x2 = (int)r.Width() + 1; ++ dev->size.y2 = (int)r.Height() + 1; ++} ++ ++void LinksView::Draw(BRect r) ++{ ++ detach_message(dev); ++ current->AddRect("updateRect", r); ++ pipe_message(dev); ++} ++ ++ ++void LinksView::MouseDown(BPoint p) ++{ ++ detach_and_pipe_message(dev); ++} ++ ++void LinksView::MouseUp(BPoint p) ++{ ++ detach_and_pipe_message(dev); ++} ++ ++void LinksView::MouseMoved(BPoint p, uint32 transit, const BMessage *dragmsg) ++{ ++ detach_and_pipe_message(dev); ++} ++ ++void LinksView::MessageReceived(BMessage *msg) ++{ ++ switch (msg->what) { ++ case B_REFS_RECEIVED: ++ case B_MOUSE_WHEEL_CHANGED: ++ case B_PASTE: ++ case B_SIMPLE_DATA: ++ detach_and_pipe_message(dev); ++ break; ++ default: ++ BView::MessageReceived(msg); ++ } ++} ++ ++void LinksView::KeyDown(const char *s, int32 numBytes) ++{ ++ detach_and_pipe_message(dev); ++} ++ ++unsigned char *be_get_driver_param(void) ++{ ++ return NULL; ++} ++ ++int32 be_app_thread(void *p) ++{ ++ be_links_app->Lock(); ++ be_links_app->Run(); ++ delete be_links_app; ++ return 0; ++} ++ ++unsigned char *be_init_driver(unsigned char *param, unsigned char *display) ++{ ++ be_links_app = new LinksApplication(); ++ if (!be_links_app) { ++ return stracpy((unsigned char *)"Unable to allocate Application object.\n"); ++ } ++ if (c_pipe(msg_pipe)) { ++ delete be_links_app; ++ return stracpy((unsigned char *)"Could not create pipe.\n"); ++ } ++ fcntl(rpipe, F_SETFL, O_NONBLOCK); ++ fcntl(wpipe, F_SETFL, O_NONBLOCK); ++ set_handlers(rpipe, be_get_event, NULL, NULL, NULL); ++ be_app_thread_id = spawn_thread(be_app_thread, "links_app", B_NORMAL_PRIORITY, NULL); ++ resume_thread(be_app_thread_id); ++ be_links_app->Unlock(); ++ be_cs_desktop = B_NO_COLOR_SPACE; ++ be_x_size = 640; ++ be_y_size = 480; ++ BScreen d; ++ if (d.IsValid()) { ++ be_cs_desktop = d.ColorSpace(); ++ be_x_size = (int)d.Frame().Width() + 1; ++ be_y_size = (int)d.Frame().Height() + 1; ++ } ++ be_win_y_size = be_y_size * 9 / 10; ++ be_win_x_size = be_win_y_size; ++ /* ++ DBG("%d %d\n", be_x_size, be_y_size); ++ DBG("%d %d\n", be_win_x_size, be_win_y_size); ++ */ ++ be_win_y_pos = (be_y_size - be_win_y_size) / 2; ++ be_win_x_pos = be_x_size - be_win_x_size - be_win_y_pos; ++ if (/*be_cs_desktop == B_RGB32 ||*/ be_cs_desktop == B_RGB24 || be_cs_desktop == B_RGB16 || be_cs_desktop == B_RGB15) ++ be_cs_bmp = be_cs_desktop; ++ else if (be_cs_desktop == B_RGB32 || be_cs_desktop == B_RGBA32) be_cs_bmp = B_RGB24; ++ else be_cs_bmp = B_RGB15; ++ be_cs_bmp = B_RGB16; // XXX: DEBUG ++ switch (be_cs_bmp) { ++ case B_RGB24: ++ beos_driver.depth = 0xc3; ++ break; ++ case B_RGB16: ++ beos_driver.depth = 0x82; ++ break; ++ case B_RGB15: ++ beos_driver.depth = 0x7a; ++ break; ++ default: ++ internal((unsigned char *)"unknown depth"); ++ } ++ return NULL; ++} ++ ++void be_shutdown_driver() ++{ ++ status_t ret; ++ //debug((unsigned char *)"D"); ++ close(rpipe); ++ close(wpipe); ++ set_handlers(rpipe, NULL, NULL, NULL, NULL); ++ //debug((unsigned char *)"DD"); ++ be_links_app->PostMessage(B_QUIT_REQUESTED); ++ //debug((unsigned char *)"E"); ++ wait_for_thread(be_app_thread_id, &ret); ++ //debug((unsigned char *)"F"); ++} ++ ++struct graphics_device *be_init_device() ++{ ++ LinksView *view; ++ LinksWindow *win; ++ struct graphics_device *dev = (struct graphics_device *)mem_calloc(sizeof(struct graphics_device)); ++ if (!dev) return NULL; ++ dev->drv = &beos_driver; ++ //debug((unsigned char *)"1"); ++ win = new LinksWindow(BRect(be_win_x_pos, be_win_y_pos, be_win_x_pos + be_win_x_size, be_win_y_pos + be_win_y_size)); ++ //debug((unsigned char *)"2"); ++ if (!win) { ++ mem_free(dev); ++ return NULL; ++ } ++ //debug((unsigned char *)"3"); ++ view = new LinksView(win); ++ if (!view) { ++ delete win; ++ mem_free(dev); ++ return NULL; ++ } ++ view->dev = dev; ++ dev->driver_data = view; ++ be_get_size(dev); ++ memcpy(&dev->clip, &dev->size, sizeof(struct rect)); ++ //debug((unsigned char *)"4"); ++ win->Show(); ++ win->Lock(); ++ view->MakeFocus(); ++ win->Unlock(); ++ //debug((unsigned char *)"5"); ++ if (initial_refs_msg) { ++ BMessenger msgr(win); ++ if (msgr.IsValid()) { ++ msgr.SendMessage(initial_refs_msg); ++ initial_refs_msg = NULL; ++ } ++ } ++ return dev; ++} ++ ++void be_shutdown_device(struct graphics_device *dev) ++{ ++ LinksWindow *win = lv(dev)->win; ++ unregister_bottom_half(do_flush, dev); ++ lv(dev)->dev = NULL; ++ win->PostMessage(B_QUIT_REQUESTED); ++ mem_free(dev); ++} ++ ++void be_set_title(struct graphics_device *dev, unsigned char *title) ++{ ++ LinksWindow *win = lv(dev)->win; ++ lock_dev(dev); ++ win->SetTitle((const char *)title); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++/* ++int be_get_filled_bitmap(struct bitmap *bmp, long color) ++{ ++ internal((unsigned char *)"nedopsano"); ++ return 0; ++} ++*/ ++ ++int be_get_empty_bitmap(struct bitmap *bmp) ++{ ++ DBG("bmp\n"); ++//DBG("bmp (%d, %d) cs %08x\n", bmp->x, bmp->y, be_cs_bmp); ++ BRect r(0, 0, bmp->x - 1, bmp->y - 1); ++ BBitmap *b = new BBitmap(r, /*B_RGB32*/be_cs_bmp); ++ if (!b) { ++ bmp->data = NULL; ++DBG("%s: error 1\n", __FUNCTION__); ++ return 0; ++ } ++ if (!b->IsValid()) { ++ bmp->data = NULL; ++ delete b; ++DBG("%s: error 2\n", __FUNCTION__); ++ return 0; ++ } ++ if (b->LockBits() < B_OK) { ++ bmp->data = NULL; ++ delete b; ++DBG("%s: error 3\n", __FUNCTION__); ++ return 0; ++ } ++ bmp->data = b->Bits(); ++ bmp->skip = b->BytesPerRow(); ++ bmp->flags = b; ++//DBG("bmp: data %p, skip %d, flags %p\n", bmp->data, bmp->skip, bmp->flags); ++ return 0; ++} ++ ++void be_register_bitmap(struct bitmap *bmp) ++{ ++ BBitmap *b = (BBitmap *)bmp->flags; ++ b->UnlockBits(); ++} ++ ++void *be_prepare_strip(struct bitmap *bmp, int top, int lines) ++{ ++ DBG("preps\n"); ++ BBitmap *b = (BBitmap *)bmp->flags; ++ if (b->LockBits() < B_OK) ++ return NULL; ++ bmp->data = b->Bits(); ++ bmp->skip = b->BytesPerRow(); ++ return ((char *)bmp->data) + bmp->skip * top; ++} ++ ++void be_commit_strip(struct bitmap *bmp, int top, int lines) ++{ ++ BBitmap *b = (BBitmap *)bmp->flags; ++ b->UnlockBits(); ++} ++ ++void be_unregister_bitmap(struct bitmap *bmp) ++{ ++ DBG("unb\n"); ++ BBitmap *b = (BBitmap *)bmp->flags; ++ delete b; ++} ++ ++void be_draw_bitmap(struct graphics_device *dev, struct bitmap *bmp, int x, int y) ++{ ++ DBG("drawb\n"); ++ BBitmap *b = (BBitmap *)bmp->flags; ++ lock_dev(dev); ++ lv(dev)->DrawBitmap(b, b->Bounds(), BRect(x, y, x + bmp->x - 1, y + bmp->y - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++void be_draw_bitmaps(struct graphics_device *dev, struct bitmap **bmp, int n, int x, int y) ++{ ++ LinksView *lvv = lv(dev); ++ lock_dev(dev); ++ while (n--) { ++ BBitmap *b = (BBitmap *)(*bmp)->flags; ++ lvv->DrawBitmap(b, b->Bounds(), BRect(x, y, x + (*bmp)->x, y + (*bmp)->y)); ++ x += (*bmp)->x; ++ bmp++; ++ } ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++long be_get_color(int rgb) ++{ ++ if (small_color) { ++ get_color32(c, rgb); ++ return *(long *)(void *)&c; ++ } else return rgb & 0xffffff; ++} ++ ++void be_fill_area(struct graphics_device *dev, int x1, int y1, int x2, int y2, long color) ++{ ++ DBG("fill\n"); ++ if (x1 >= x2 || y1 >= y2) return; ++ lock_dev(dev); ++ if (small_color) ++ lv(dev)->SetHighColor(*(rgb_color *)(void *)&color); ++ else ++ lv(dev)->SetHighColor(get_color32(, color)); ++ lv(dev)->FillRect(BRect(x1, y1, x2 - 1, y2 - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++void be_draw_hline(struct graphics_device *dev, int x1, int y, int x2, long color) ++{ ++ DBG("hline\n"); ++ if (x1 >= x2) return; ++ lock_dev(dev); ++ if (small_color) ++ lv(dev)->SetHighColor(*(rgb_color *)(void *)&color); ++ else ++ lv(dev)->SetHighColor(get_color32(, color)); ++ lv(dev)->StrokeLine(BPoint(x1, y), BPoint(x2 - 1, y)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++void be_draw_vline(struct graphics_device *dev, int x, int y1, int y2, long color) ++{ ++ DBG("vline\n"); ++ if (y1 >= y2) return; ++ lock_dev(dev); ++ if (small_color) ++ lv(dev)->SetHighColor(*(rgb_color *)(void *)&color); ++ else ++ lv(dev)->SetHighColor(get_color32(, color)); ++ lv(dev)->StrokeLine(BPoint(x, y1), BPoint(x, y2 - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++int be_hscroll(struct graphics_device *dev, struct rect_set **ignore, int sc) ++{ ++ DBG("hscroll\n"); ++ if (dev->clip.x1 >= dev->clip.x2 || dev->clip.y1 >= dev->clip.y2) return 0; ++ if (sc <= dev->clip.x1 - dev->clip.x2) return 1; ++ if (sc >= dev->clip.x2 - dev->clip.x1) return 1; ++ lock_dev0(dev); ++ if (sc > 0) lv(dev)->CopyBits(BRect(dev->clip.x1, dev->clip.y1, dev->clip.x2 - sc - 1, dev->clip.y2 - 1), BRect(dev->clip.x1 + sc, dev->clip.y1, dev->clip.x2 - 1, dev->clip.y2 - 1)); ++ else lv(dev)->CopyBits(BRect(dev->clip.x1 - sc, dev->clip.y1, dev->clip.x2 - 1, dev->clip.y2 - 1), BRect(dev->clip.x1, dev->clip.y1, dev->clip.x2 + sc - 1, dev->clip.y2 - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++ return 1; ++} ++ ++int be_vscroll(struct graphics_device *dev, struct rect_set **ignore, int sc) ++{ ++ DBG("vscroll\n"); ++ if (!sc || dev->clip.x1 >= dev->clip.x2 || dev->clip.y1 >= dev->clip.y2) return 0; ++ if (sc <= dev->clip.y1 - dev->clip.y2) return 1; ++ if (sc >= dev->clip.y2 - dev->clip.y1) return 1; ++ lock_dev0(dev); ++ if (sc > 0) lv(dev)->CopyBits(BRect(dev->clip.x1, dev->clip.y1, dev->clip.x2 - 1, dev->clip.y2 - sc - 1), BRect(dev->clip.x1, dev->clip.y1 + sc, dev->clip.x2 - 1, dev->clip.y2 - 1)); ++ else lv(dev)->CopyBits(BRect(dev->clip.x1, dev->clip.y1 - sc, dev->clip.x2 - 1, dev->clip.y2 - 1), BRect(dev->clip.x1, dev->clip.y1, dev->clip.x2 - 1, dev->clip.y2 + sc - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++ return 1; ++} ++ ++void be_set_clip_area(struct graphics_device *dev, struct rect *r) ++{ ++ DBG("setc\n"); ++ memcpy(&dev->clip, r, sizeof(struct rect)); ++ lock_dev(dev); ++ BRegion clip(BRect(r->x1, r->y1, r->x2 - 1, r->y2 - 1)); ++ lv(dev)->ConstrainClippingRegion(&clip); ++ unlock_dev(dev); ++} ++ ++struct graphics_driver beos_driver = { ++ (unsigned char *)"beos", ++ be_init_driver, ++ be_init_device, ++ be_shutdown_device, ++ be_shutdown_driver, ++ be_get_driver_param, ++ be_get_empty_bitmap, ++ /*be_get_filled_bitmap,*/ ++ be_register_bitmap, ++ be_prepare_strip, ++ be_commit_strip, ++ be_unregister_bitmap, ++ be_draw_bitmap, ++ be_draw_bitmaps, ++ be_get_color, ++ be_fill_area, ++ be_draw_hline, ++ be_draw_vline, ++ be_hscroll, ++ be_vscroll, ++ be_set_clip_area, ++ dummy_block, ++ dummy_unblock, ++ be_set_title, ++ NULL, /* exec */ ++ 0, /* depth */ ++ 0, 0, /* size */ ++ 0, /* flags */ ++ 0, /* codepage */ ++ NULL, /* shell */ ++}; ++ ++#endif /* GRDRV_BEOS */ ++ ++#endif +diff -urN links-2.1pre33.org/bfu.c links-2.1pre33/bfu.c +--- links-2.1pre33.org/bfu.c Fri Dec 28 07:39:58 2007 ++++ links-2.1pre33/bfu.c Sat May 3 18:30:29 2008 +@@ -466,7 +466,7 @@ + draw_to_window(win, (void (*)(struct terminal *, void *))gf_val(display_menu_txt, display_menu_gfx), menu); + break; + case EV_MOUSE: +- if ((ev->b & BM_ACT) == B_MOVE) break; ++ if ((ev->b & BM_ACT) == BTN_MOVE) break; + if (ev->x < menu->x || ev->x >= menu->x+menu->xw || ev->y < menu->y || ev->y >= menu->y+menu->yw) { + int f = 1; + for (w1 = win; (void *)w1 != &win->term->windows; w1 = w1->next) { +@@ -490,7 +490,7 @@ + if (ev->x > m1->x && ev->x < m1->x+m1->xw-1 && ev->y > m1->y && ev->y < m1->y+m1->yw-1) goto del; + f--; + } +- if ((ev->b & BM_ACT) == B_DOWN) goto del; ++ if ((ev->b & BM_ACT) == BTN_DOWN) goto del; + bbb:; + } else { + if (!(ev->x < menu->x || ev->x >= menu->x+menu->xw || ev->y < menu->y + gf_val(1, G_MENU_TOP_BORDER) || ev->y >= menu->y + menu->yw - gf_val(1, G_MENU_TOP_BORDER))) { +@@ -502,7 +502,7 @@ + scroll_menu(menu, 0); + draw_to_window(win, (void (*)(struct terminal *, void *))gf_val(display_menu_txt, display_menu_gfx), menu); + menu_oldview = menu_oldsel = -1; +- if ((ev->b & BM_ACT) == B_UP/* || menu->items[s].in_m*/) select_menu(win->term, menu); ++ if ((ev->b & BM_ACT) == BTN_UP/* || menu->items[s].in_m*/) select_menu(win->term, menu); + } + } + } +@@ -686,8 +686,8 @@ + draw_to_window(win, (void (*)(struct terminal *, void *))display_mainmenu, menu); + break; + case EV_MOUSE: +- if ((ev->b & BM_ACT) == B_MOVE) break; +- if ((ev->b & BM_ACT) == B_DOWN && ev->y >= gf_val(1, G_BFU_FONT_SIZE)) delete_window_ev(win, ev); ++ if ((ev->b & BM_ACT) == BTN_MOVE) break; ++ if ((ev->b & BM_ACT) == BTN_DOWN && ev->y >= gf_val(1, G_BFU_FONT_SIZE)) delete_window_ev(win, ev); + else if (ev->y < gf_val(1, G_BFU_FONT_SIZE)) { + int i; + int p = gf_val(2, G_MAINMENU_LEFT_BORDER); +@@ -698,7 +698,7 @@ + if (ev->x >= o && ev->x < p) { + menu->selected = i; + draw_to_window(win, (void (*)(struct terminal *, void *))display_mainmenu, menu); +- if ((ev->b & BM_ACT) == B_UP || menu->items[s].in_m) select_mainmenu(win->term, menu); ++ if ((ev->b & BM_ACT) == BTN_UP || menu->items[s].in_m) select_mainmenu(win->term, menu); + break; + } + } +@@ -1019,7 +1019,7 @@ + dlg->selected = di - dlg->items; + x_display_dlg_item(dlg, di, 1); + } +- if ((ev->b & BM_ACT) == B_UP) dlg_select_item(dlg, di); ++ if ((ev->b & BM_ACT) == BTN_UP) dlg_select_item(dlg, di); + return 1; + case D_FIELD: + case D_FIELD_PASS: +@@ -1054,7 +1054,7 @@ + dlg->selected = di - dlg->items; + x_display_dlg_item(dlg, di, 1); + } +- if ((ev->b & BM_ACT) == B_UP) dlg_select_item(dlg, di); ++ if ((ev->b & BM_ACT) == BTN_UP) dlg_select_item(dlg, di); + return 1; + } + return 0; +@@ -1193,9 +1193,9 @@ + draw_to_window(dlg->win, (void (*)(struct terminal *, void *))redraw_dialog, dlg); + break; + case EV_MOUSE: +- if ((ev->b & BM_ACT) == B_MOVE) break; ++ if ((ev->b & BM_ACT) == BTN_MOVE) break; + for (i = 0; i < dlg->n; i++) if (dlg_mouse(dlg, &dlg->items[i], ev)) break; +- if ((ev->b & BM_ACT) == B_DOWN && (ev->b & BM_BUTT) == B_MIDDLE) { ++ if ((ev->b & BM_ACT) == BTN_DOWN && (ev->b & BM_BUTT) == BTN_MIDDLE) { + di = &dlg->items[dlg->selected]; /* don't delete this!!! it's here because of jump from mouse event */ + if (di->item->type == D_FIELD || di->item->type == D_FIELD_PASS) goto clipbd_paste; + } +@@ -1388,9 +1388,9 @@ + goto bla; + } + if (ev->x == KBD_ENTER) for (i = 0; i < dlg->n; i++) +- if (dlg->dlg->items[i].type == D_BUTTON && dlg->dlg->items[i].gid & B_ENTER) goto sel; ++ if (dlg->dlg->items[i].type == D_BUTTON && dlg->dlg->items[i].gid & BTN_ENTER) goto sel; + if (ev->x == KBD_ESC) for (i = 0; i < dlg->n; i++) +- if (dlg->dlg->items[i].type == D_BUTTON && dlg->dlg->items[i].gid & B_ESC) goto sel; ++ if (dlg->dlg->items[i].type == D_BUTTON && dlg->dlg->items[i].gid & BTN_ESC) goto sel; + if (((ev->x == KBD_TAB && !ev->y) || ev->x == KBD_DOWN || ev->x == KBD_RIGHT) && (dlg->n > 1 || term->spec->braille)) { + if (term->spec->braille) dlg->brl_y = dlg->items[0].y - 3; + x_display_dlg_item(dlg, &dlg->items[dlg->selected], 0); +@@ -1426,11 +1426,11 @@ + unsigned char *end; + double d = strtod(di->cdata, (char **)(void *)&end); + if (!*di->cdata || *end) { +- msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_EXPECTED), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_EXPECTED), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return 1; + } + if (100*d < di->item->gid || 100*d > di->item->gnum) { +- msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_OUT_OF_RANGE), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_OUT_OF_RANGE), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return 1; + } + return 0; +@@ -1441,11 +1441,11 @@ + unsigned char *end; + long l = strtol(di->cdata, (char **)(void *)&end, 10); + if (!*di->cdata || *end) { +- msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_EXPECTED), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_EXPECTED), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return 1; + } + if (l < di->item->gid || l > di->item->gnum) { +- msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_OUT_OF_RANGE), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_OUT_OF_RANGE), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return 1; + } + return 0; +@@ -1456,11 +1456,11 @@ + unsigned char *end; + long l = strtol(di->cdata, (char **)(void *)&end, 16); + if (!*di->cdata || *end) { +- msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_EXPECTED), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_EXPECTED), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return 1; + } + if (l < di->item->gid || l > di->item->gnum) { +- msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_OUT_OF_RANGE), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_OUT_OF_RANGE), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return 1; + } + return 0; +@@ -1470,7 +1470,7 @@ + { + unsigned char *p; + for (p = di->cdata; *p; p++) if (*p > ' ') return 0; +- msg_box(dlg->win->term, NULL, TEXT(T_BAD_STRING), AL_CENTER, TEXT(T_EMPTY_STRING_NOT_ALLOWED), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(dlg->win->term, NULL, TEXT(T_BAD_STRING), AL_CENTER, TEXT(T_EMPTY_STRING_NOT_ALLOWED), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return 1; + } + +@@ -2218,7 +2218,7 @@ + va_start(va, check); + for (i = 1; i <= n; i++) { + dlg->items[i].type = D_BUTTON; +- dlg->items[i].gid = i == 1 ? B_ENTER : i == n ? B_ESC : 0; ++ dlg->items[i].gid = i == 1 ? BTN_ENTER : i == n ? BTN_ESC : 0; + dlg->items[i].fn = i != n || n == 1 ? input_field_ok : input_field_cancel; + dlg->items[i].dlen = 0; + dlg->items[i].text = va_arg(va, unsigned char *); +diff -urN links-2.1pre33.org/block.c links-2.1pre33/block.c +--- links-2.1pre33.org/block.c Sat Dec 31 07:31:01 2005 ++++ links-2.1pre33/block.c Sat May 3 18:30:30 2008 +@@ -227,11 +227,11 @@ + d->items[0].data = url; + d->items[0].fn = check_nonempty; + d->items[1].type = D_BUTTON; +- d->items[1].gid = B_ENTER; ++ d->items[1].gid = BTN_ENTER; + d->items[1].fn = ok_dialog; + d->items[1].text = TEXT(T_OK); + d->items[2].type = D_BUTTON; +- d->items[2].gid = B_ESC; ++ d->items[2].gid = BTN_ESC; + d->items[2].text = TEXT(T_CANCEL); + d->items[2].fn = cancel_dialog; + d->items[3].type = D_END; +diff -urN links-2.1pre33.org/bookmarks.c links-2.1pre33/bookmarks.c +--- links-2.1pre33.org/bookmarks.c Thu Oct 26 17:06:32 2006 ++++ links-2.1pre33/bookmarks.c Sat May 3 18:30:31 2008 +@@ -378,12 +378,12 @@ + } + + d->items[a+1].type = D_BUTTON; +- d->items[a+1].gid = B_ENTER; ++ d->items[a+1].gid = BTN_ENTER; + d->items[a+1].fn = ok_dialog; + d->items[a+1].text = TEXT(T_OK); + + d->items[a+2].type = D_BUTTON; +- d->items[a+2].gid = B_ESC; ++ d->items[a+2].gid = BTN_ESC; + d->items[a+2].text = TEXT(T_CANCEL); + d->items[a+2].fn = cancel_dialog; + +diff -urN links-2.1pre33.org/configure.in links-2.1pre33/configure.in +--- links-2.1pre33.org/configure.in Wed Dec 26 07:00:48 2007 ++++ links-2.1pre33/configure.in Sat May 3 18:30:33 2008 +@@ -18,7 +18,7 @@ + dnl Checks for programs. + AC_PROG_CC + +-#AC_PROG_CXX ++AC_PROG_CXX + #AC_PROG_AWK + #AM_PROG_LEX + #AC_PROG_YACC +@@ -221,7 +221,10 @@ + if test "$ac_cv_lib_socket_gethostbyname" = no; then + AC_CHECK_LIB(nsl, gethostbyname) + if test "$ac_cv_lib_nsl_gethostbyname" = no; then +- AC_ERROR([gethostbyname function not present]) ++ AC_CHECK_LIB(bind, gethostbyname) ++ if test "$ac_cv_lib_bind_gethostbyname" = no; then ++ AC_ERROR([gethostbyname function not present]) ++ fi + fi + fi + fi +@@ -321,6 +324,7 @@ + fi + #AC_CHECK_FUNC(clone, AC_DEFINE(HAVE_CLONE)) + AC_CHECK_HEADERS(atheos/threads.h) ++AC_CHECK_HEADERS(kernel/OS.h) + AC_HAVE_FUNCS(spawn_thread) + AC_HAVE_FUNCS(resume_thread) + +@@ -422,6 +426,7 @@ + + + cf_have_atheos=no ++cf_have_beos=no + + if test "$cf_use_graphics" = yes; then + AC_DEFINE(G) +@@ -433,6 +438,7 @@ + dnl AC_ARG_WITH(sdl, [ --without-sdl compile without SDL graphics driver],[if test "$withval" = no; then disable_sdl=yes; else disable_sdl=no; fi]) + AC_ARG_WITH(pmshell, [ --without-pmshell compile without PMShell graphics driver],[if test "$withval" = no; then disable_pmshell=yes; else disable_pmshell=no; fi]) + AC_ARG_WITH(atheos, [ --without-atheos compile without Atheos graphics driver],[if test "$withval" = no; then disable_atheos=yes; else disable_atheos; fi]) ++AC_ARG_WITH(beos, [ --without-beos compile without BeOS/Haiku graphics driver],[if test "$withval" = no; then disable_beos=yes; else disable_beos; fi]) + + drivers="" + +@@ -568,6 +574,31 @@ + fi + fi + ++if test "$disable_beos" != yes ; then ++ old_ext="$ac_ext" ++ ac_ext=cpp ++ AC_CHECK_HEADERS(interface/View.h) ++ AC_CHECK_HEADERS(interface/Window.h) ++ AC_CHECK_HEADERS(interface/Screen.h) ++ AC_CHECK_HEADERS(interface/Bitmap.h) ++ AC_CHECK_HEADERS(support/Locker.h) ++ AC_CHECK_HEADERS(app/Application.h) ++ ac_ext="$old_ext" ++ ++ if test "$ac_cv_header_kernel_OS_h" = yes && ++ test "$ac_cv_header_interface_View_h" = yes && ++ test "$ac_cv_header_interface_Window_h" = yes && ++ test "$ac_cv_header_interface_Screen_h" = yes && ++ test "$ac_cv_header_interface_Bitmap_h" = yes && ++ test "$ac_cv_header_support_Locker_h" = yes && ++ test "$ac_cv_header_app_Application_h" = yes; then ++ AC_PROG_CXX ++ AC_DEFINE(GRDRV_BEOS) ++ drivers="$drivers BEOS" ++ cf_have_beos=yes ++ fi ++fi ++ + AC_CHECK_LIB(z, inflate) + PKG_CHECK_MODULES(LIBPNG,libpng >= 1.0.0,pkgconfig_libpng=yes,pkgconfig_libpng=no) + if test "$pkgconfig_libpng" = "yes"; then +@@ -645,6 +676,7 @@ + + + AM_CONDITIONAL(ATHEOS_GR, test "$cf_have_atheos" = yes) ++AM_CONDITIONAL(BEOS_GR, test "$cf_have_beos" = yes) + + test "$ac_cv_have_emx" = yes && LDFLAGS="$LDFLAGS -Zexe" + +diff -urN links-2.1pre33.org/default.c links-2.1pre33/default.c +--- links-2.1pre33.org/default.c Mon Dec 24 23:33:44 2007 ++++ links-2.1pre33/default.c Sat May 3 18:30:34 2008 +@@ -452,7 +452,7 @@ + } + add_to_strn(&config_file, name); + if ((err = write_to_config_file(config_file, c))) { +- if (term) msg_box(term, NULL, TEXT(T_CONFIG_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_UNABLE_TO_WRITE_TO_CONFIG_FILE), ": ", get_err_msg(-err), NULL, NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ if (term) msg_box(term, NULL, TEXT(T_CONFIG_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_UNABLE_TO_WRITE_TO_CONFIG_FILE), ": ", get_err_msg(-err), NULL, NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + mem_free(c); + mem_free(config_file); + return -1; +diff -urN links-2.1pre33.org/directfb.c links-2.1pre33/directfb.c +--- links-2.1pre33.org/directfb.c Wed Nov 22 23:55:03 2006 ++++ links-2.1pre33/directfb.c Sat May 3 18:30:35 2008 +@@ -651,25 +651,25 @@ + + if (event.type == DWET_BUTTONUP) + { +- flags = B_UP; ++ flags = BTN_UP; + data->window->UngrabPointer (data->window); + } + else + { +- flags = B_DOWN; ++ flags = BTN_DOWN; + data->window->GrabPointer (data->window); + } + + switch (event.button) + { + case DIBI_LEFT: +- flags |= B_LEFT; ++ flags |= BTN_LEFT; + break; + case DIBI_RIGHT: +- flags |= B_RIGHT; ++ flags |= BTN_RIGHT; + break; + case DIBI_MIDDLE: +- flags |= B_MIDDLE; ++ flags |= BTN_MIDDLE; + break; + default: + continue; +@@ -681,8 +681,8 @@ + + case DWET_WHEEL: + gd->mouse_handler (gd, event.x, event.y, +- B_MOVE | +- (event.step > 0 ? B_WHEELUP : B_WHEELDOWN)); ++ BTN_MOVE | ++ (event.step > 0 ? BTN_WHEELUP : BTN_WHEELDOWN)); + break; + + case DWET_MOTION: +@@ -697,16 +697,16 @@ + switch (event.buttons) + { + case DIBM_LEFT: +- flags = B_DRAG | B_LEFT; ++ flags = BTN_DRAG | BTN_LEFT; + break; + case DIBM_RIGHT: +- flags = B_DRAG | B_RIGHT; ++ flags = BTN_DRAG | BTN_RIGHT; + break; + case DIBM_MIDDLE: +- flags = B_DRAG | B_MIDDLE; ++ flags = BTN_DRAG | BTN_MIDDLE; + break; + default: +- flags = B_MOVE; ++ flags = BTN_MOVE; + break; + } + +diff -urN links-2.1pre33.org/drivers.c links-2.1pre33/drivers.c +--- links-2.1pre33.org/drivers.c Mon Dec 24 23:33:44 2007 ++++ links-2.1pre33/drivers.c Sat May 3 18:30:36 2008 +@@ -31,6 +31,9 @@ + #ifdef GRDRV_ATHEOS + extern struct graphics_driver atheos_driver; + #endif ++#ifdef GRDRV_BEOS ++extern struct graphics_driver beos_driver; ++#endif + #ifdef GRDRV_SDL + extern struct graphics_driver sdl_driver; + #endif +@@ -47,6 +50,9 @@ + #endif + #ifdef GRDRV_ATHEOS + &atheos_driver, ++#endif ++#ifdef GRDRV_BEOS ++ &beos_driver, + #endif + #ifndef SPAD + #ifdef GRDRV_X +diff -urN links-2.1pre33.org/framebuffer.c links-2.1pre33/framebuffer.c +--- links-2.1pre33.org/framebuffer.c Sat Oct 27 05:36:22 2007 ++++ links-2.1pre33/framebuffer.c Sat May 3 18:30:38 2008 +@@ -322,7 +322,7 @@ + if (mouse_y < 0) mouse_y = 0; + ev.x = mouse_x; + ev.y = mouse_y; +- ev.b = B_MOVE; ++ ev.b = BTN_MOVE; + if (!current_virtual_device) return; + if (current_virtual_device->mouse_handler) current_virtual_device->mouse_handler(current_virtual_device, ev.x, ev.y, ev.b); + redraw_mouse(); +@@ -956,26 +956,26 @@ + + ev.x = mouse_x; + ev.y = mouse_y; +- if (gev.buttons & GPM_B_LEFT) ev.b = B_LEFT; +- else if (gev.buttons & GPM_B_MIDDLE) ev.b = B_MIDDLE; +- else if (gev.buttons & GPM_B_RIGHT) ev.b = B_RIGHT; ++ if (gev.buttons & GPM_B_LEFT) ev.b = BTN_LEFT; ++ else if (gev.buttons & GPM_B_MIDDLE) ev.b = BTN_MIDDLE; ++ else if (gev.buttons & GPM_B_RIGHT) ev.b = BTN_RIGHT; + else ev.b = 0; +- if (gev.type & GPM_DOWN) ev.b |= B_DOWN; +- else if (gev.type & GPM_UP) ev.b |= B_UP; +- else if (gev.type & GPM_DRAG) ev.b |= B_DRAG; +- else ev.b |= B_MOVE; ++ if (gev.type & GPM_DOWN) ev.b |= BTN_DOWN; ++ else if (gev.type & GPM_UP) ev.b |= BTN_UP; ++ else if (gev.type & GPM_DRAG) ev.b |= BTN_DRAG; ++ else ev.b |= BTN_MOVE; + + #ifndef USE_GPM_DX + if (fb_msetsize < 0) { + } else if (fb_msetsize < 10) { + fb_msetsize++; +- } else if ((ev.b & BM_ACT) == B_MOVE && !(ev.b & BM_BUTT)) { ++ } else if ((ev.b & BM_ACT) == BTN_MOVE && !(ev.b & BM_BUTT)) { + fb_mouse_setsize(); + fb_msetsize = -1; + } + #endif + +- if (((ev.b & BM_ACT) == B_MOVE && !(ev.b & BM_BUTT)) || (ev.b & BM_ACT) == B_DRAG) { ++ if (((ev.b & BM_ACT) == BTN_MOVE && !(ev.b & BM_BUTT)) || (ev.b & BM_ACT) == BTN_DRAG) { + if (can_read(fb_hgpm)) goto again; + } + +diff -urN links-2.1pre33.org/jsint.c links-2.1pre33/jsint.c +--- links-2.1pre33.org/jsint.c Sun May 27 14:23:48 2007 ++++ links-2.1pre33/jsint.c Sat May 3 18:30:39 2008 +@@ -1272,8 +1272,8 @@ + txt, /* message */ + jsid, /* data for button functions */ + 3, /* # of buttons */ +- TEXT(T_OK),js_upcall_confirm_ok_pressed,B_ENTER, /* first button */ +- TEXT(T_CANCEL),js_upcall_confirm_cancel_pressed,B_ESC, /* second button */ ++ TEXT(T_OK),js_upcall_confirm_ok_pressed,BTN_ENTER, /* first button */ ++ TEXT(T_CANCEL),js_upcall_confirm_cancel_pressed,BTN_ESC, /* second button */ + TEXT(T_KILL_SCRIPT), js_kill_script_pressed,NULL + ); + +@@ -1342,7 +1342,7 @@ + txt, /* message */ + jsid, /* data for button functions */ + 2, /* # of buttons */ +- TEXT(T_OK),js_upcall_alert_ok_pressed,B_ENTER|B_ESC, ++ TEXT(T_OK),js_upcall_alert_ok_pressed,BTN_ENTER|BTN_ESC, + TEXT(T_KILL_SCRIPT), js_kill_script_pressed,NULL + ); + +@@ -2933,8 +2933,8 @@ + jsid->n?TEXT(T_JS_IS_ATTEMPTING_TO_OPEN_NEW_WINDOW_WITH_URL):TEXT(T_JS_IS_ATTEMPTING_TO_GO_TO_URL), " \"",jsid->string,"\".",NULL, /* message */ + jsid, /* data for button functions */ + 3, /* # of buttons */ +- TEXT(T_ALLOW),js_upcall_goto_url_ok_pressed,B_ENTER, +- TEXT(T_REJECT),js_upcall_goto_url_cancel_pressed,B_ESC, ++ TEXT(T_ALLOW),js_upcall_goto_url_ok_pressed,BTN_ENTER, ++ TEXT(T_REJECT),js_upcall_goto_url_cancel_pressed,BTN_ESC, + TEXT(T_KILL_SCRIPT), js_kill_script_pressed,NULL /* dirty trick: gimme_js_id_string and gimme_js_id begins with the same long */ + ); + js_mem_free(s); +@@ -3089,8 +3089,8 @@ + TEXT(T_JS_IS_ATTEMPTING_TO_GO_INTO_HISTORY), txt, TEXT(T_TO_URL), " \"",url,"\".",NULL, /* message */ + jsid, /* data for button functions */ + 3, /* # of buttons */ +- TEXT(T_ALLOW),js_upcall_goto_history_ok_pressed,B_ENTER, +- TEXT(T_REJECT),js_upcall_goto_url_cancel_pressed,B_ESC, ++ TEXT(T_ALLOW),js_upcall_goto_history_ok_pressed,BTN_ENTER, ++ TEXT(T_REJECT),js_upcall_goto_url_cancel_pressed,BTN_ESC, + TEXT(T_KILL_SCRIPT), js_kill_script_pressed,NULL /* dirty trick: gimme_js_id_string and gimme_js_id begins with the same long */ + ); + js_mem_free(s); +diff -urN links-2.1pre33.org/kbd.c links-2.1pre33/kbd.c +--- links-2.1pre33.org/kbd.c Thu Jan 31 21:48:26 2008 ++++ links-2.1pre33/kbd.c Sat May 3 18:30:40 2008 +@@ -848,10 +848,10 @@ + ev.y = (unsigned char)(itrm->kqueue[el+3]) - ' ' - 1 + ((int)((unsigned char)(itrm->kqueue[el+4]) - ' ' - 1) << 7); + if ( ev.y & (1 << 13)) ev.y = 0; /* ev.y |= ~0 << 14; */ + switch ((itrm->kqueue[el] - ' ') ^ xterm_button) { /* Every event changhes only one bit */ +- case TW_BUTT_LEFT: ev.b = B_LEFT | ( (xterm_button & TW_BUTT_LEFT) ? B_UP : B_DOWN ); break; +- case TW_BUTT_MIDDLE: ev.b = B_MIDDLE | ( (xterm_button & TW_BUTT_MIDDLE) ? B_UP : B_DOWN ); break; +- case TW_BUTT_RIGHT: ev.b = B_RIGHT | ( (xterm_button & TW_BUTT_RIGHT) ? B_UP : B_DOWN ); break; +- case 0: ev.b = B_DRAG; ++ case TW_BUTT_LEFT: ev.b = BTN_LEFT | ( (xterm_button & TW_BUTT_LEFT) ? BTN_UP : BTN_DOWN ); break; ++ case TW_BUTT_MIDDLE: ev.b = BTN_MIDDLE | ( (xterm_button & TW_BUTT_MIDDLE) ? BTN_UP : BTN_DOWN ); break; ++ case TW_BUTT_RIGHT: ev.b = BTN_RIGHT | ( (xterm_button & TW_BUTT_RIGHT) ? BTN_UP : BTN_DOWN ); break; ++ case 0: ev.b = BTN_DRAG; + /* default : Twin protocol error */ + } + xterm_button = itrm->kqueue[el] - ' '; +@@ -859,15 +859,15 @@ + } else { + ev.x = itrm->kqueue[el+1] - ' ' - 1; + ev.y = itrm->kqueue[el+2] - ' ' - 1; +- ev.b = B_DOWN; +- if (itrm->kqueue[el] & 4) ev.b = B_DRAG; +- if ((ev.b |= (itrm->kqueue[el] & BM_BUTT) | B_DOWN) == 3) { +- ev.b = B_UP; ++ ev.b = BTN_DOWN; ++ if (itrm->kqueue[el] & 4) ev.b = BTN_DRAG; ++ if ((ev.b |= (itrm->kqueue[el] & BM_BUTT) | BTN_DOWN) == 3) { ++ ev.b = BTN_UP; + if (xterm_button != -1) ev.b |= xterm_button; + } +- /*if ((itrm->kqueue[el] & 4) && ev.b != B_UP) ev.b |= B_DRAG;*/ ++ /*if ((itrm->kqueue[el] & 4) && ev.b != BTN_UP) ev.b |= BTN_DRAG;*/ + xterm_button = -1; +- if ((ev.b & BM_ACT) == B_DOWN) xterm_button = ev.b & BM_BUTT; ++ if ((ev.b & BM_ACT) == BTN_DOWN) xterm_button = ev.b & BM_BUTT; + el += 3; + } + ev.ev = EV_MOUSE; +diff -urN links-2.1pre33.org/links-beos.rdef links-2.1pre33/links-beos.rdef +--- links-2.1pre33.org/links-beos.rdef Thu Jan 1 01:00:00 1970 ++++ links-2.1pre33/links-beos.rdef Sat May 3 23:50:16 2008 +@@ -0,0 +1,97 @@ ++/* ++** links-beos.rdef ++** ++** Automatically generated by BResourceParser on ++** Thursday, December 13, 2007 at 23:46:45. ++** ++*/ ++ ++resource(1, "BEOS:APP_FLAGS") (#'APPF') $"01000000"; ++ ++resource(1, "BEOS:APP_VERSION") #'APPV' array { ++ $"02000000010000000000000000000000210000006C696E6B7320322E31707265" ++ $"3333000000000000000000000000000000000000000000000000000000000000" ++ $"00000000000000000000000000000000000000004C696E6B732062726F777365" ++ $"7220322E31707265333300000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000" ++}; ++ ++resource(101, "BEOS:L:STD_ICON") #'ICON' array { ++ $"2A2A2A2A2A2A2A2A2A2A2A2A2A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2A2A2A2A2A2A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2B2B2B2B2B2B2B2B2B2B2B2C0000363434343434343434343434343434" ++ $"2A2A2A3200000000000000000000000000363434343434343434343434343434" ++ $"2A2A2A2FF1313200000000000131310000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A30000000002B2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2C2C2C2C2C2C2C30000000002C2C2D0000373636363636363636363636363636" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"2222222222222226000000002222230000151A1A1A1A1A1A1A1A1A1A1A1A1A1A" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F3F3F3F3F3F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F3F1501113F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F3F0E00133F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F3F0500163F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F1A0000193F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F0C00001B3F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F190000001E3F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F1A030000013F3F3F3F3F" ++ $"20202020202020270000000023202200001A3F1E170C00000000043F3F3F3F3F" ++ $"2020202628292900000000000029290000040300000000000000063F3F3F3F3F" ++ $"20202027292929292929292929292900000203030303030303030B3F3F3F3F3F" ++ $"20202020202020202020202020202200001A3F3F3F3F3F3F3F3F3F3F3F3F3F3F" ++ $"20202020202020202020202020202200001A3F3F3F3F3F3F3F3F3F3F3F3F3F3F" ++ $"20202020202020202020202020202200001A3F3F3F3F3F3F3F3F3F3F3F3F3F3F" ++}; ++ ++resource(101, "BEOS:M:STD_ICON") #'MICN' array { ++ $"2A2A2A2A2A2A2A303A34343434343434" ++ $"2A2C3030303030F73A34343434343434" ++ $"2A2B2D300000EB323A34343434343434" ++ $"2A2A2A2C00002A303A34343434343434" ++ $"2A2A2A2C00002A303A34343434343434" ++ $"2A2A2A2C00002A303A34343434343434" ++ $"2A2A2A2C00002A303A34343434343434" ++ $"303030310000F1333D3A3A3A3A3A3A3A" ++ $"2626262700002629050D0D0D0D0D0D0D" ++ $"20202022000020260D3F3F3F1D143F3F" ++ $"20202022000020260D3F3F3F140A3F3F" ++ $"20202022000020260D3F3F3F090D3F3F" ++ $"20202022000020260D3F3F16000F3F3F" ++ $"20222427000026280710090000123F3F" ++ $"202225252525252807111111111A3F3F" ++ $"20202020202020260D3F3F3F3F3F3F3F" ++}; ++ ++resource(1, "BEOS:APP_SIG") (#'MIMS') "application/x-vnd.links"; ++ ++resource(1, "BEOS:FILE_TYPES") message { ++ "types" = "text/html", ++ "types" = "application/x-vnd.Be-bookmark", ++ "types" = "application/x-vnd.Be.URL.http" ++}; ++ +diff -urN links-2.1pre33.org/links.h links-2.1pre33/links.h +--- links-2.1pre33.org/links.h Thu Jan 31 21:50:40 2008 ++++ links-2.1pre33/links.h Sat May 3 18:30:41 2008 +@@ -1295,26 +1295,26 @@ + /* kbd.c */ + + #define BM_BUTT 15 +-#define B_LEFT 0 +-#define B_MIDDLE 1 +-#define B_RIGHT 2 +-#define B_FOURTH 3 +-#define B_FIFTH 4 +-#define B_SIXTH 5 +-#define B_WHEELUP 8 +-#define B_WHEELDOWN 9 +-#define B_WHEELUP1 10 +-#define B_WHEELDOWN1 11 +-#define B_WHEELLEFT 12 +-#define B_WHEELRIGHT 13 +-#define B_WHEELLEFT1 14 +-#define B_WHEELRIGHT1 15 ++#define BTN_LEFT 0 ++#define BTN_MIDDLE 1 ++#define BTN_RIGHT 2 ++#define BTN_FOURTH 3 ++#define BTN_FIFTH 4 ++#define BTN_SIXTH 5 ++#define BTN_WHEELUP 8 ++#define BTN_WHEELDOWN 9 ++#define BTN_WHEELUP1 10 ++#define BTN_WHEELDOWN1 11 ++#define BTN_WHEELLEFT 12 ++#define BTN_WHEELRIGHT 13 ++#define BTN_WHEELLEFT1 14 ++#define BTN_WHEELRIGHT1 15 + + #define BM_ACT 48 +-#define B_DOWN 0 +-#define B_UP 16 +-#define B_DRAG 32 +-#define B_MOVE 48 ++#define BTN_DOWN 0 ++#define BTN_UP 16 ++#define BTN_DRAG 32 ++#define BTN_MOVE 48 + + #define KBD_ENTER -0x100 + #define KBD_BS -0x101 +@@ -3302,15 +3302,15 @@ + #define D_FIELD_PASS 3 + #define D_BUTTON 4 + +-#define B_ENTER 1 +-#define B_ESC 2 ++#define BTN_ENTER 1 ++#define BTN_ESC 2 + + struct dialog_item_data; + struct dialog_data; + + struct dialog_item { + int type; +- int gid, gnum; /* for buttons: gid - flags B_XXX */ /* for fields: min/max */ /* for box: gid is box height */ ++ int gid, gnum; /* for buttons: gid - flags BTN_XXX */ /* for fields: min/max */ /* for box: gid is box height */ + int (*fn)(struct dialog_data *, struct dialog_item_data *); + struct history *history; + int dlen; +diff -urN links-2.1pre33.org/listedit.c links-2.1pre33/listedit.c +--- links-2.1pre33.org/listedit.c Sun Jul 8 01:23:40 2007 ++++ links-2.1pre33/listedit.c Sat May 3 18:30:43 2008 +@@ -754,7 +754,7 @@ + TEXT(T_NO_ITEMS_SELECTED), /* text */ + NULL, /* data */ + 1, /* # of buttons */ +- TEXT(T_OK),NULL,B_ESC|B_ENTER /* button1 */ ++ TEXT(T_OK),NULL,BTN_ESC|BTN_ENTER /* button1 */ + ); + else + { +@@ -936,8 +936,8 @@ + TEXT(T_FOLDER)," \"",txt,"\" ",TEXT(T_NOT_EMPTY_SURE_DELETE),NULL, /* text */ + narez, /* data for ld->delete_item */ + 2, /* # of buttons */ +- TEXT(T_NO),NULL,B_ESC, /* button1 */ +- TEXT(T_YES),delete_folder_recursively,B_ENTER /* button2 */ ++ TEXT(T_NO),NULL,BTN_ESC, /* button1 */ ++ TEXT(T_YES),delete_folder_recursively,BTN_ENTER /* button2 */ + ); + else + msg_box( +@@ -948,8 +948,8 @@ + TEXT(T_SURE_DELETE)," ",TEXT(T_fOLDER)," \"",txt,"\"?",NULL, /* null-terminated text */ + narez, /* data for ld->delete_item */ + 2, /* # of buttons */ +- TEXT(T_YES),delete_ok,B_ENTER, /* button1 */ +- TEXT(T_NO),NULL,B_ESC /* button2 */ ++ TEXT(T_YES),delete_ok,BTN_ENTER, /* button1 */ ++ TEXT(T_NO),NULL,BTN_ESC /* button2 */ + ); + } + else /* item */ +@@ -961,8 +961,8 @@ + TEXT(T_SURE_DELETE)," ",TEXT(ld->item_description)," \"",txt,"\"?",NULL, /* null-terminated text */ + narez, /* data for ld->delete_item */ + 2, /* # of buttons */ +- TEXT(T_YES),delete_ok,B_ENTER, /* button1 */ +- TEXT(T_NO),NULL,B_ESC /* button2 */ ++ TEXT(T_YES),delete_ok,BTN_ENTER, /* button1 */ ++ TEXT(T_NO),NULL,BTN_ESC /* button2 */ + ); + return 0; + } +@@ -1507,7 +1507,7 @@ + struct session *ses=(struct session *)(dlg->dlg->udata); + struct list* item; + +- if (!ld->search_word) {msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_NO_PREVIOUS_SEARCH), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); return;} ++ if (!ld->search_word) {msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_NO_PREVIOUS_SEARCH), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); return;} + + if ((item=ld->find_item(ld->current_pos,ld->search_word,direction))) + { +@@ -1523,7 +1523,7 @@ + if (!F) if (!ses->term->spec->block_cursor || ses->term->spec->braille) set_cursor(ses->term, dlg->x + DIALOG_LB, dlg->y+DIALOG_TB+ld->win_pos, dlg->x + DIALOG_LB, dlg->y+DIALOG_TB+ld->win_pos); + } + else +- msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_SEARCH_STRING_NOT_FOUND), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_SEARCH_STRING_NOT_FOUND), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + + } + +@@ -1761,7 +1761,7 @@ + + case EV_MOUSE: + /* toggle select item */ +- if ((ev->b&BM_ACT)==B_DOWN&&(ev->b&BM_BUTT)==B_RIGHT) ++ if ((ev->b&BM_ACT)==BTN_DOWN&&(ev->b&BM_BUTT)==BTN_RIGHT) + { + int n,a; + struct list *l=ld->win_offset; +@@ -1793,7 +1793,7 @@ + return EVENT_PROCESSED; + } + /* click on item */ +- if ((ev->b&BM_ACT)==B_DOWN&&(ev->b&BM_BUTT)==B_LEFT) ++ if ((ev->b&BM_ACT)==BTN_DOWN&&(ev->b&BM_BUTT)==BTN_LEFT) + { + int n,a; + struct list *l=ld->win_offset; +@@ -1832,7 +1832,7 @@ + } + /* scroll with the bar */ + #ifdef G +- if (F&&((ev->b&BM_ACT)==B_DRAG&&(ev->b&BM_BUTT)==B_LEFT)) ++ if (F&&((ev->b&BM_ACT)==BTN_DRAG&&(ev->b&BM_BUTT)==BTN_LEFT)) + { + int total=get_total_items(ld); + int scroll_pos=get_scroll_pos(ld); +@@ -1876,7 +1876,7 @@ + + } + #endif +- if ((ev->b&BM_ACT)==B_DRAG&&(ev->b&BM_BUTT)==B_MIDDLE) ++ if ((ev->b&BM_ACT)==BTN_DRAG&&(ev->b&BM_BUTT)==BTN_MIDDLE) + { + long delta=(ev->y-last_mouse_y)/MOUSE_SCROLL_DIVIDER; + +@@ -1913,12 +1913,12 @@ + + } + /* mouse wheel */ +- if ((ev->b&BM_ACT)==B_MOVE&&((ev->b&BM_BUTT)==B_WHEELUP||(ev->b&BM_BUTT)==B_WHEELDOWN||(ev->b&BM_BUTT)==B_WHEELDOWN1||(ev->b&BM_BUTT)==B_WHEELUP1)) ++ if ((ev->b&BM_ACT)==BTN_MOVE&&((ev->b&BM_BUTT)==BTN_WHEELUP||(ev->b&BM_BUTT)==BTN_WHEELDOWN||(ev->b&BM_BUTT)==BTN_WHEELDOWN1||(ev->b&BM_BUTT)==BTN_WHEELUP1)) + { + int button=(ev->b)&BM_BUTT; + last_mouse_y=ev->y; + +- if (button==B_WHEELDOWN||button==B_WHEELDOWN1) /* scroll down */ ++ if (button==BTN_WHEELDOWN||button==BTN_WHEELDOWN1) /* scroll down */ + { + if (next_in_tree(ld,ld->current_pos)==ld->list)return EVENT_PROCESSED; /* already at the bottom */ + ld->current_pos=next_in_tree(ld,ld->current_pos); +@@ -1932,7 +1932,7 @@ + } + draw_to_window(dlg->win,redraw_list_line,&rd); + } +- if (button==B_WHEELUP||button==B_WHEELUP1) /* scroll up */ ++ if (button==BTN_WHEELUP||button==BTN_WHEELUP1) /* scroll up */ + { + if (ld->current_pos==ld->list)return EVENT_PROCESSED; /* already on the top */ + ld->current_pos=prev_in_tree(ld,ld->current_pos); +@@ -2043,7 +2043,7 @@ + TEXT(ld->already_in_use), + NULL, + 1, +- TEXT(T_OK),NULL,B_ENTER|B_ESC ++ TEXT(T_OK),NULL,BTN_ENTER|BTN_ESC + ); + return 1; + } +@@ -2108,7 +2108,7 @@ + d->items[a+4].fn=list_item_unselect; + + d->items[a+5].type=D_BUTTON; +- d->items[a+5].gid=B_ESC; ++ d->items[a+5].gid=BTN_ESC; + d->items[a+5].fn=cancel_dialog; + d->items[a+5].text=TEXT(T_CLOSE); + +diff -urN links-2.1pre33.org/mailto.c links-2.1pre33/mailto.c +--- links-2.1pre33.org/mailto.c Mon Dec 24 23:33:46 2007 ++++ links-2.1pre33/mailto.c Sat May 3 18:37:06 2008 +@@ -15,7 +15,7 @@ + { + unsigned char *prog, *cmd; + if (!(prog = get_prog(list)) || !*prog) { +- msg_box(term, NULL, TEXT(T_NO_PROGRAM), AL_CENTER | AL_EXTD_TEXT, TEXT(T_NO_PROGRAM_SPECIFIED_FOR), " ", name, ".", NULL, NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(term, NULL, TEXT(T_NO_PROGRAM), AL_CENTER | AL_EXTD_TEXT, TEXT(T_NO_PROGRAM_SPECIFIED_FOR), " ", name, ".", NULL, NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return; + } + if ((cmd = subst_file(prog, param, 0))) { +@@ -42,7 +42,7 @@ + fail1: + mem_free(user); + fail: +- if (f) msg_box(ses->term, NULL, TEXT(T_BAD_URL_SYNTAX), AL_CENTER, TEXT(T_BAD_MAILTO_URL), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ if (f) msg_box(ses->term, NULL, TEXT(T_BAD_URL_SYNTAX), AL_CENTER, TEXT(T_BAD_MAILTO_URL), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + } + + void tn_func(struct session *ses, unsigned char *url, struct list_head *prog, unsigned char *t1, unsigned char *t2) +@@ -71,7 +71,7 @@ + fail1: + mem_free(hh); + fail: +- if (f) msg_box(ses->term, NULL, TEXT(T_BAD_URL_SYNTAX), AL_CENTER, t2, NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ if (f) msg_box(ses->term, NULL, TEXT(T_BAD_URL_SYNTAX), AL_CENTER, t2, NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + } + + +@@ -88,7 +88,7 @@ + void mms_func(struct session *ses, unsigned char *url) + { + if (check_shell_url(url)) { +- msg_box(ses->term, NULL, TEXT(T_BAD_URL_SYNTAX), AL_CENTER, TEXT(T_MMS_URL_CONTAINS_INACCEPTABLE_CHARACTERS), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_BAD_URL_SYNTAX), AL_CENTER, TEXT(T_MMS_URL_CONTAINS_INACCEPTABLE_CHARACTERS), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return; + } + prog_func(ses->term, &mms_prog, url, TEXT(T_MMS)); +diff -urN links-2.1pre33.org/main.c links-2.1pre33/main.c +--- links-2.1pre33.org/main.c Tue Dec 11 19:45:38 2007 ++++ links-2.1pre33/main.c Sat May 3 18:30:43 2008 +@@ -277,6 +277,7 @@ + + void initialize_all_subsystems(void); + void initialize_all_subsystems_2(void); ++extern void maybe_force_gr(void); + + void init(void) + { +@@ -294,6 +295,9 @@ + retval = RET_FATAL; + goto ttt; + } ++#if defined(G) && defined(BEOS) ++ maybe_force_gr(); ++#endif + if (!(u = parse_options(g_argc - 1, g_argv + 1))) { + retval = RET_SYNTAX; + goto ttt; +diff -urN links-2.1pre33.org/menu.c links-2.1pre33/menu.c +--- links-2.1pre33.org/menu.c Mon Dec 24 23:33:46 2007 ++++ links-2.1pre33/menu.c Sat May 3 18:38:44 2008 +@@ -86,17 +86,17 @@ + + void menu_about(struct terminal *term, void *d, struct session *ses) + { +- msg_box(term, NULL, TEXT(T_ABOUT), AL_CENTER, TEXT(T_LINKS__LYNX_LIKE), NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(term, NULL, TEXT(T_ABOUT), AL_CENTER, TEXT(T_LINKS__LYNX_LIKE), NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + } + + void menu_keys(struct terminal *term, void *d, struct session *ses) + { +- msg_box(term, NULL, TEXT(T_KEYS), AL_LEFT | AL_MONO, TEXT(T_KEYS_DESC), NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(term, NULL, TEXT(T_KEYS), AL_LEFT | AL_MONO, TEXT(T_KEYS_DESC), NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + } + + void menu_copying(struct terminal *term, void *d, struct session *ses) + { +- msg_box(term, NULL, TEXT(T_COPYING), AL_CENTER, TEXT(T_COPYING_DESC), NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(term, NULL, TEXT(T_COPYING), AL_CENTER, TEXT(T_COPYING_DESC), NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + } + + void menu_manual(struct terminal *term, void *d, struct session *ses) +@@ -157,7 +157,7 @@ + void query_exit(struct session *ses) + { + ses->exit_query = 1; +- msg_box(ses->term, NULL, TEXT(T_EXIT_LINKS), AL_CENTER, (ses->term->next == ses->term->prev && are_there_downloads()) ? TEXT(T_DO_YOU_REALLY_WANT_TO_EXIT_LINKS_AND_TERMINATE_ALL_DOWNLOADS) : (!F || ses->term->next == ses->term->prev) ? TEXT(T_DO_YOU_REALLY_WANT_TO_EXIT_LINKS) : TEXT(T_DO_YOU_REALLY_WANT_TO_CLOSE_WINDOW), ses, 2, TEXT(T_YES), (void (*)(void *))really_exit_prog, B_ENTER, TEXT(T_NO), dont_exit_prog, B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_EXIT_LINKS), AL_CENTER, (ses->term->next == ses->term->prev && are_there_downloads()) ? TEXT(T_DO_YOU_REALLY_WANT_TO_EXIT_LINKS_AND_TERMINATE_ALL_DOWNLOADS) : (!F || ses->term->next == ses->term->prev) ? TEXT(T_DO_YOU_REALLY_WANT_TO_EXIT_LINKS) : TEXT(T_DO_YOU_REALLY_WANT_TO_CLOSE_WINDOW), ses, 2, TEXT(T_YES), (void (*)(void *))really_exit_prog, BTN_ENTER, TEXT(T_NO), dont_exit_prog, BTN_ESC); + } + + void exit_prog(struct terminal *term, void *d, struct session *ses) +@@ -284,7 +284,7 @@ + l = 0, a15 = init_str(); add_to_str(&a15, &l, ", "); add_num_to_str(&a15, &l, formatted_info(CI_LOCKED));add_to_str(&a15, &l, " "); + l = 0, a16 = init_str(); add_to_str(&a16, &l, "."); + +- if (!F) msg_box(term, getml(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, NULL), TEXT(T_RESOURCES), AL_LEFT | AL_EXTD_TEXT, TEXT(T_RESOURCES), a1, TEXT(T_HANDLES), a2, TEXT(T_TIMERS), a3, TEXT(T_CONNECTIONS), a4, TEXT(T_cONNECTIONS), a5, TEXT(T_CONNECTING), a6, TEXT(T_tRANSFERRING), a7, TEXT(T_KEEPALIVE), a8, TEXT(T_MEMORY_CACHE), a9, TEXT(T_BYTES), a10, TEXT(T_FILES), a11, TEXT(T_LOCKED), a12, TEXT(T_LOADING), a13, TEXT(T_FORMATTED_DOCUMENT_CACHE), a14, TEXT(T_DOCUMENTS), a15, TEXT(T_LOCKED), a16, NULL, r, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ if (!F) msg_box(term, getml(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, NULL), TEXT(T_RESOURCES), AL_LEFT | AL_EXTD_TEXT, TEXT(T_RESOURCES), a1, TEXT(T_HANDLES), a2, TEXT(T_TIMERS), a3, TEXT(T_CONNECTIONS), a4, TEXT(T_cONNECTIONS), a5, TEXT(T_CONNECTING), a6, TEXT(T_tRANSFERRING), a7, TEXT(T_KEEPALIVE), a8, TEXT(T_MEMORY_CACHE), a9, TEXT(T_BYTES), a10, TEXT(T_FILES), a11, TEXT(T_LOCKED), a12, TEXT(T_LOADING), a13, TEXT(T_FORMATTED_DOCUMENT_CACHE), a14, TEXT(T_DOCUMENTS), a15, TEXT(T_LOCKED), a16, NULL, r, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + #ifdef G + else msg_box(term, getml(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, + a12, a13, b14, b15, b16, b17, a14, a15, a16, +@@ -299,7 +299,7 @@ + TEXT(T_BYTES), b15, TEXT(T_IMAGES), b16, TEXT(T_LOCKED), + b17, TEXT(T_FONT_CACHE), c14, TEXT(T_BYTES), c15, + TEXT(T_BYTES_MAX), c16, TEXT(T_LETTERS), c17, +- TEXT(T_FORMATTED_DOCUMENT_CACHE), a14, TEXT(T_DOCUMENTS), a15, TEXT(T_LOCKED), a16, NULL, r, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ TEXT(T_FORMATTED_DOCUMENT_CACHE), a14, TEXT(T_DOCUMENTS), a15, TEXT(T_LOCKED), a16, NULL, r, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + #endif + r->win = term->windows.next; + ((struct dialog_data *)r->win->data)->dlg->abort = refresh_abort; +@@ -328,7 +328,7 @@ + add_to_str(&a, &l, "\n"); + add_to_str(&a, &l, ce->url); + } +- msg_box(term, getml(a, NULL), TEXT(T_CACHE_INFO), AL_LEFT | AL_EXTD_TEXT, TEXT(T_CACHE_CONTENT), a, NULL, r, 1, TEXT(T_OK), end_refresh, B_ENTER | B_ESC); ++ msg_box(term, getml(a, NULL), TEXT(T_CACHE_INFO), AL_LEFT | AL_EXTD_TEXT, TEXT(T_CACHE_CONTENT), a, NULL, r, 1, TEXT(T_OK), end_refresh, BTN_ENTER | BTN_ESC); + r->win = term->windows.next; + r->timer = install_timer(RESOURCE_INFO_REFRESH, (void (*)(void *))refresh, r); + /* !!! the refresh here is buggy */ +@@ -385,7 +385,7 @@ + } + #endif + p = stracpy(message); +- msg_box(term, getml(p, NULL), TEXT(T_MEMORY_INFO), AL_CENTER, p, r, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(term, getml(p, NULL), TEXT(T_MEMORY_INFO), AL_CENTER, p, r, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + r->win = term->windows.next; + ((struct dialog_data *)r->win->data)->dlg->abort = refresh_abort; + r->timer = install_timer(RESOURCE_INFO_REFRESH, (void (*)(void *))refresh, r); +@@ -596,11 +596,11 @@ + d->items[9].dlen = sizeof(int); + d->items[9].data = (void *)&ts->braille; + d->items[10].type = D_BUTTON; +- d->items[10].gid = B_ENTER; ++ d->items[10].gid = BTN_ENTER; + d->items[10].fn = ok_dialog; + d->items[10].text = TEXT(T_OK); + d->items[11].type = D_BUTTON; +- d->items[11].gid = B_ESC; ++ d->items[11].gid = BTN_ESC; + d->items[11].fn = cancel_dialog; + d->items[11].text = TEXT(T_CANCEL); + d->items[12].type = D_END; +@@ -707,11 +707,11 @@ + d->items[8].gid = 1024; + d->items[8].gnum = 30*1024; + d->items[9].type = D_BUTTON; +- d->items[9].gid = B_ENTER; ++ d->items[9].gid = BTN_ENTER; + d->items[9].fn = ok_dialog; + d->items[9].text = TEXT(T_OK); + d->items[10].type = D_BUTTON; +- d->items[10].gid = B_ESC; ++ d->items[10].gid = BTN_ESC; + d->items[10].fn = cancel_dialog; + d->items[10].text = TEXT(T_CANCEL); + d->items[11].type = D_END; +@@ -832,11 +832,11 @@ + d->items[13].dlen = MAX_STR_LEN; + d->items[13].data = bugs->fake_referer; + d->items[14].type = D_BUTTON; +- d->items[14].gid = B_ENTER; ++ d->items[14].gid = BTN_ENTER; + d->items[14].fn = ok_dialog; + d->items[14].text = TEXT(T_OK); + d->items[15].type = D_BUTTON; +- d->items[15].gid = B_ESC; ++ d->items[15].gid = BTN_ESC; + d->items[15].fn = cancel_dialog; + d->items[15].text = TEXT(T_CANCEL); + d->items[16].type = D_END; +@@ -911,12 +911,12 @@ + a = 3; + #endif + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ENTER; ++ d->items[a].gid = BTN_ENTER; + d->items[a].fn = ok_dialog; + d->items[a].text = TEXT(T_OK); + a++; + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ESC; ++ d->items[a].gid = BTN_ESC; + d->items[a].fn = cancel_dialog; + d->items[a].text = TEXT(T_CANCEL); + a++; +@@ -1134,11 +1134,11 @@ + d->items[13].dlen = sizeof(int); + d->items[13].data = (void *)&gamma_bits; + d->items[14].type = D_BUTTON; +- d->items[14].gid = B_ENTER; ++ d->items[14].gid = BTN_ENTER; + d->items[14].fn = ok_dialog; + d->items[14].text = TEXT(T_OK); + d->items[15].type = D_BUTTON; +- d->items[15].gid = B_ESC; ++ d->items[15].gid = BTN_ESC; + d->items[15].fn = cancel_dialog; + d->items[15].text = TEXT(T_CANCEL); + d->items[16].type = D_END; +@@ -1250,11 +1250,11 @@ + d->items[3].data = (unsigned char *)&p->only_proxies; + d->items[3].dlen = sizeof(int); + d->items[4].type = D_BUTTON; +- d->items[4].gid = B_ENTER; ++ d->items[4].gid = BTN_ENTER; + d->items[4].fn = ok_dialog; + d->items[4].text = TEXT(T_OK); + d->items[5].type = D_BUTTON; +- d->items[5].gid = B_ESC; ++ d->items[5].gid = BTN_ESC; + d->items[5].fn = cancel_dialog; + d->items[5].text = TEXT(T_CANCEL); + d->items[6].type = D_END; +@@ -1343,11 +1343,11 @@ + d->items[9].data = (unsigned char *)&ftp_options; + d->items[9].dlen = sizeof(struct ftp_options); + d->items[10].type = D_BUTTON; +- d->items[10].gid = B_ENTER; ++ d->items[10].gid = BTN_ENTER; + d->items[10].fn = ok_dialog; + d->items[10].text = TEXT(T_OK); + d->items[11].type = D_BUTTON; +- d->items[11].gid = B_ESC; ++ d->items[11].gid = BTN_ESC; + d->items[11].fn = cancel_dialog; + d->items[11].text = TEXT(T_CANCEL); + d->items[12].type = D_END; +@@ -1481,11 +1481,11 @@ + } + #endif + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ENTER; ++ d->items[a].gid = BTN_ENTER; + d->items[a].fn = ok_dialog; + d->items[a++].text = TEXT(T_OK); + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ESC; ++ d->items[a].gid = BTN_ESC; + d->items[a].fn = cancel_dialog; + d->items[a++].text = TEXT(T_CANCEL); + d->items[a].type = D_END; +@@ -1498,7 +1498,7 @@ + net_options(term, xxx, yyy); + return; + } +- msg_box(term, NULL, _("Network options"), AL_CENTER, _("Warning: configuring network will terminate all running downloads. Do you really want to configure network?"), term, 2, _("Yes"), (void (*)(void *))net_options, B_ENTER, _("No"), NULL, B_ESC); ++ msg_box(term, NULL, _("Network options"), AL_CENTER, _("Warning: configuring network will terminate all running downloads. Do you really want to configure network?"), term, 2, _("Yes"), (void (*)(void *))net_options, BTN_ENTER, _("No"), NULL, BTN_ESC); + }*/ + + unsigned char mc_str[8]; +@@ -1581,12 +1581,12 @@ + d->items[a].data = (void *)&http_bugs.aggressive_cache; + a++; + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ENTER; ++ d->items[a].gid = BTN_ENTER; + d->items[a].fn = ok_dialog; + d->items[a].text = TEXT(T_OK); + a++; + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ESC; ++ d->items[a].gid = BTN_ESC; + d->items[a].fn = cancel_dialog; + d->items[a].text = TEXT(T_CANCEL); + a++; +@@ -1746,12 +1746,12 @@ + a++; + if (!F){ + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ENTER; ++ d->items[a].gid = BTN_ENTER; + d->items[a].fn = ok_dialog; + d->items[a].text = TEXT(T_OK); + a++; + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ESC; ++ d->items[a].gid = BTN_ESC; + d->items[a].fn = cancel_dialog; + d->items[a].text = TEXT(T_CANCEL); + a++; +@@ -1777,12 +1777,12 @@ + d->items[a].dlen = sizeof(int); + a++; + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ENTER; ++ d->items[a].gid = BTN_ENTER; + d->items[a].fn = ok_dialog; + d->items[a].text = TEXT(T_OK); + a++; + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ESC; ++ d->items[a].gid = BTN_ESC; + d->items[a].fn = cancel_dialog; + d->items[a].text = TEXT(T_CANCEL); + a++; +@@ -2038,12 +2038,12 @@ + } + #endif + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ENTER; ++ d->items[a].gid = BTN_ENTER; + d->items[a].fn = ok_dialog; + d->items[a].text = TEXT(T_OK); + a++; + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ESC; ++ d->items[a].gid = BTN_ESC; + d->items[a].fn = cancel_dialog; + d->items[a].text = TEXT(T_CANCEL); + a++; +@@ -2111,11 +2111,11 @@ + d->items[1].gid = 1; + d->items[1].gnum = 999; + d->items[2].type = D_BUTTON; +- d->items[2].gid = B_ENTER; ++ d->items[2].gid = BTN_ENTER; + d->items[2].fn = ok_dialog; + d->items[2].text = TEXT(T_OK); + d->items[3].type = D_BUTTON; +- d->items[3].gid = B_ESC; ++ d->items[3].gid = BTN_ESC; + d->items[3].fn = cancel_dialog; + d->items[3].text = TEXT(T_CANCEL); + d->items[4].type = D_END; +@@ -2510,8 +2510,8 @@ + TEXT(T_FILE), " ", h->file, " ", TEXT(T_ALREADY_EXISTS_AS_DOWNLOAD), " ", TEXT(T_DO_YOU_WISH_TO_OVERWRITE), NULL, + h, + 3, +- TEXT(T_OVERWRITE), does_file_exist_ok, B_ENTER, +- TEXT(T_CANCEL), does_file_exist_cancel, B_ESC, ++ TEXT(T_OVERWRITE), does_file_exist_ok, BTN_ENTER, ++ TEXT(T_CANCEL), does_file_exist_cancel, BTN_ESC, + TEXT(T_RENAME), does_file_exist_rename, NULL + ); + return; +@@ -2537,8 +2537,8 @@ + TEXT(T_FILE), " ", h->file, " ", TEXT(T_ALREADY_EXISTS), " ", TEXT(T_DO_YOU_WISH_TO_OVERWRITE), NULL, + h, + 3, +- TEXT(T_OVERWRITE), does_file_exist_ok, B_ENTER, +- TEXT(T_CANCEL), does_file_exist_cancel, B_ESC, ++ TEXT(T_OVERWRITE), does_file_exist_ok, BTN_ENTER, ++ TEXT(T_CANCEL), does_file_exist_cancel, BTN_ESC, + TEXT(T_RENAME), does_file_exist_rename, NULL + ); + } +diff -urN links-2.1pre33.org/objreq.c links-2.1pre33/objreq.c +--- links-2.1pre33.org/objreq.c Mon Dec 24 23:33:46 2007 ++++ links-2.1pre33/objreq.c Sat May 3 18:30:44 2008 +@@ -167,12 +167,12 @@ + d->items[1].data = a->passwd; + + d->items[2].type = D_BUTTON; +- d->items[2].gid = B_ENTER; ++ d->items[2].gid = BTN_ENTER; + d->items[2].fn = auth_ok; + d->items[2].text = TEXT(T_OK); + + d->items[3].type = D_BUTTON; +- d->items[3].gid = B_ESC; ++ d->items[3].gid = BTN_ESC; + d->items[3].fn = auth_cancel; + d->items[3].text = TEXT(T_CANCEL); + +diff -urN links-2.1pre33.org/os_dep.c links-2.1pre33/os_dep.c +--- links-2.1pre33.org/os_dep.c Fri Dec 28 07:40:31 2007 ++++ links-2.1pre33/os_dep.c Sat May 3 21:08:57 2008 +@@ -1071,7 +1071,7 @@ + + #if defined(BEOS) + +-#include ++#include + + int thr_sem_init = 0; + sem_id thr_sem; +@@ -1263,16 +1263,16 @@ + ev.x = ms->col; + ev.y = ms->row; + /*debug("status: %d %d %d", ms->col, ms->row, ms->fs);*/ +- if (ms->fs & (MOUSE_BN1_DOWN | MOUSE_BN2_DOWN | MOUSE_BN3_DOWN)) ev.b = status = B_DOWN | (ms->fs & MOUSE_BN1_DOWN ? B_LEFT : ms->fs & MOUSE_BN2_DOWN ? B_MIDDLE : B_RIGHT); ++ if (ms->fs & (MOUSE_BN1_DOWN | MOUSE_BN2_DOWN | MOUSE_BN3_DOWN)) ev.b = status = BTN_DOWN | (ms->fs & MOUSE_BN1_DOWN ? BTN_LEFT : ms->fs & MOUSE_BN2_DOWN ? BTN_MIDDLE : BTN_RIGHT); + else if (ms->fs & (MOUSE_MOTION_WITH_BN1_DOWN | MOUSE_MOTION_WITH_BN2_DOWN | MOUSE_MOTION_WITH_BN3_DOWN)) { +- int b = ms->fs & MOUSE_MOTION_WITH_BN1_DOWN ? B_LEFT : ms->fs & MOUSE_MOTION_WITH_BN2_DOWN ? B_MIDDLE : B_RIGHT; +- if (status == -1) b |= B_DOWN; +- else b |= B_DRAG; ++ int b = ms->fs & MOUSE_MOTION_WITH_BN1_DOWN ? BTN_LEFT : ms->fs & MOUSE_MOTION_WITH_BN2_DOWN ? BTN_MIDDLE : BTN_RIGHT; ++ if (status == -1) b |= BTN_DOWN; ++ else b |= BTN_DRAG; + ev.b = status = b; + } + else { + if (status == -1) continue; +- ev.b = (status & BM_BUTT) | B_UP; ++ ev.b = (status & BM_BUTT) | BTN_UP; + status = -1; + } + if (hard_write(oms->p[1], (unsigned char *)&ev, sizeof(struct event)) != sizeof(struct event)) break; +@@ -1598,13 +1598,13 @@ + ev.y = gev.y - 1; + if (ev.x < 0) ev.x = 0; + if (ev.y < 0) ev.y = 0; +- if (gev.buttons & GPM_B_LEFT) ev.b = B_LEFT; +- else if (gev.buttons & GPM_B_MIDDLE) ev.b = B_MIDDLE; +- else if (gev.buttons & GPM_B_RIGHT) ev.b = B_RIGHT; ++ if (gev.buttons & GPM_B_LEFT) ev.b = BTN_LEFT; ++ else if (gev.buttons & GPM_B_MIDDLE) ev.b = BTN_MIDDLE; ++ else if (gev.buttons & GPM_B_RIGHT) ev.b = BTN_RIGHT; + else return; +- if (gev.type & GPM_DOWN) ev.b |= B_DOWN; +- else if (gev.type & GPM_UP) ev.b |= B_UP; +- else if (gev.type & GPM_DRAG) ev.b |= B_DRAG; ++ if (gev.type & GPM_DOWN) ev.b |= BTN_DOWN; ++ else if (gev.type & GPM_UP) ev.b |= BTN_UP; ++ else if (gev.type & GPM_DRAG) ev.b |= BTN_DRAG; + else return; + gms->fn(gms->data, (char *)&ev, sizeof(struct event)); + } +diff -urN links-2.1pre33.org/os_dep.h links-2.1pre33/os_dep.h +--- links-2.1pre33.org/os_dep.h Wed Dec 26 07:00:48 2007 ++++ links-2.1pre33/os_dep.h Sat May 3 18:30:45 2008 +@@ -111,11 +111,15 @@ + #define SHARED_CONFIG_DIR "/etc/" + #define NO_FORK_ON_EXIT + #define ASSOC_BLOCK ++#define SET_WINDOW_TITLE_UTF_8 + + #include + #include +-#include ++#include + ++#ifdef __cplusplus ++extern "C" { ++#endif + int be_socket(int, int, int); + int be_connect(int, struct sockaddr *, int); + int be_getpeername(int, struct sockaddr *, int *); +@@ -129,6 +133,9 @@ + int be_close(int); + int be_select(int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *); + int be_getsockopt(int, int, int, void *, int *); ++#ifdef __cplusplus ++} ++#endif + + #elif defined(RISCOS) + +diff -urN links-2.1pre33.org/os_depx.h links-2.1pre33/os_depx.h +--- links-2.1pre33.org/os_depx.h Sun Jul 8 01:23:40 2007 ++++ links-2.1pre33/os_depx.h Sat May 3 18:30:46 2008 +@@ -45,6 +45,8 @@ + #endif + + #ifdef BEOS ++#if IPPROTO_TCP != 6 ++/* net_server */ + #define socket be_socket + #define connect be_connect + #define getpeername be_getpeername +@@ -58,16 +60,22 @@ + #define close be_close + #define select be_select + #define getsockopt be_getsockopt ++/* ++#ifdef errno ++#undef errno ++#endif ++#define errno 1 ++*/ ++#endif + #ifndef PF_INET + #define PF_INET AF_INET + #endif + #ifndef SO_ERROR + #define SO_ERROR 10001 + #endif +-#ifdef errno +-#undef errno ++#ifndef FDSETSIZE ++#define FDSETSIZE FD_SETSIZE + #endif +-#define errno 1 + #endif + + #if defined(O_SIZE) && defined(__EMX__) +@@ -83,6 +91,9 @@ + #elif defined(GRDRV_ATHEOS) + #define loop_select ath_select + int ath_select(int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t); ++#elif defined(GRDRV_BEOS) ++#define loop_select be_loop_select ++int be_loop_select(int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t); + #else + #define loop_select select + #endif +diff -urN links-2.1pre33.org/pmshell.c links-2.1pre33/pmshell.c +--- links-2.1pre33.org/pmshell.c Fri Dec 28 07:40:31 2007 ++++ links-2.1pre33/pmshell.c Sat May 3 18:30:46 2008 +@@ -287,33 +287,33 @@ + case WM_BUTTON1DOWN: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- win->button |= 1 << B_LEFT; ++ win->button |= 1 << BTN_LEFT; + win->lastpos = (unsigned)mp1; +- pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), B_DOWN | B_LEFT, 0); ++ pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), BTN_DOWN | BTN_LEFT, 0); + pm_unlock; + break; + case WM_BUTTON2DOWN: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- win->button |= 1 << B_RIGHT; ++ win->button |= 1 << BTN_RIGHT; + win->lastpos = (unsigned)mp1; +- pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), B_DOWN | B_RIGHT, 0); ++ pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), BTN_DOWN | BTN_RIGHT, 0); + pm_unlock; + break; + case WM_BUTTON3DOWN: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- win->button |= 1 << B_MIDDLE; ++ win->button |= 1 << BTN_MIDDLE; + win->lastpos = (unsigned)mp1; +- pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), B_DOWN | B_MIDDLE, 0); ++ pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), BTN_DOWN | BTN_MIDDLE, 0); + pm_unlock; + break; + case WM_BUTTON1UP: + case WM_BUTTON1MOTIONEND: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- if (win->button & (1 << B_LEFT)) pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), B_UP | B_LEFT, 0); +- win->button &= ~(1 << B_LEFT); ++ if (win->button & (1 << BTN_LEFT)) pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), BTN_UP | BTN_LEFT, 0); ++ win->button &= ~(1 << BTN_LEFT); + win->lastpos = (unsigned)mp1; + pm_unlock; + break; +@@ -321,8 +321,8 @@ + case WM_BUTTON2MOTIONEND: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- if (win->button & (1 << B_RIGHT)) pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), B_UP | B_RIGHT, 0); +- win->button &= ~(1 << B_RIGHT); ++ if (win->button & (1 << BTN_RIGHT)) pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), BTN_UP | BTN_RIGHT, 0); ++ win->button &= ~(1 << BTN_RIGHT); + win->lastpos = (unsigned)mp1; + pm_unlock; + break; +@@ -330,8 +330,8 @@ + case WM_BUTTON3MOTIONEND: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- if (win->button & (1 << B_MIDDLE)) pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), B_UP | B_MIDDLE, 0); +- win->button &= ~(1 << B_MIDDLE); ++ if (win->button & (1 << BTN_MIDDLE)) pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), BTN_UP | BTN_MIDDLE, 0); ++ win->button &= ~(1 << BTN_MIDDLE); + win->lastpos = (unsigned)mp1; + pm_unlock; + break; +@@ -340,19 +340,19 @@ + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } + if (win->lastpos == (unsigned)mp1) { pm_unlock; break; } + win->lastpos = (unsigned)mp1; +- pm_send_mouse_event(win, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), (win->button ? B_DRAG : B_MOVE) | (win->button & (1 << B_LEFT) ? B_LEFT : win->button & (1 << B_MIDDLE) ? B_MIDDLE : win->button & (1 << B_RIGHT) ? B_RIGHT : 0)); ++ pm_send_mouse_event(win, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), (win->button ? BTN_DRAG : BTN_MOVE) | (win->button & (1 << BTN_LEFT) ? BTN_LEFT : win->button & (1 << BTN_MIDDLE) ? BTN_MIDDLE : win->button & (1 << BTN_RIGHT) ? BTN_RIGHT : 0)); + pm_unlock; + break; + case WM_VSCROLL: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- if ((unsigned)mp2 == SB_LINEUP << 16 || (unsigned)mp2 == SB_LINEDOWN << 16) pm_send_event(win, E_MOUSE, win->lastpos & 0xffff, win->y - (win->lastpos >> 16), ((unsigned)mp2 == SB_LINEUP << 16 ? B_WHEELUP1 : B_WHEELDOWN1) | B_MOVE, 0); ++ if ((unsigned)mp2 == SB_LINEUP << 16 || (unsigned)mp2 == SB_LINEDOWN << 16) pm_send_event(win, E_MOUSE, win->lastpos & 0xffff, win->y - (win->lastpos >> 16), ((unsigned)mp2 == SB_LINEUP << 16 ? BTN_WHEELUP1 : BTN_WHEELDOWN1) | BTN_MOVE, 0); + pm_unlock; + break; + case WM_HSCROLL: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- if ((unsigned)mp2 == SB_LINELEFT << 16 || (unsigned)mp2 == SB_LINERIGHT << 16) pm_send_event(win, E_MOUSE, win->lastpos & 0xffff, win->y - (win->lastpos >> 16), ((unsigned)mp2 == SB_LINELEFT << 16 ? B_WHEELLEFT1 : B_WHEELRIGHT1) | B_MOVE, 0); ++ if ((unsigned)mp2 == SB_LINELEFT << 16 || (unsigned)mp2 == SB_LINERIGHT << 16) pm_send_event(win, E_MOUSE, win->lastpos & 0xffff, win->y - (win->lastpos >> 16), ((unsigned)mp2 == SB_LINELEFT << 16 ? BTN_WHEELLEFT1 : BTN_WHEELRIGHT1) | BTN_MOVE, 0); + pm_unlock; + break; + } +diff -urN links-2.1pre33.org/session.c links-2.1pre33/session.c +--- links-2.1pre33.org/session.c Thu Jan 31 21:48:26 2008 ++++ links-2.1pre33/session.c Sat May 3 18:40:32 2008 +@@ -250,7 +250,7 @@ + unsigned char *u = stracpy(title); + if (strchr(u, POST_CHAR)) *strchr(u, POST_CHAR) = 0; + if (!t) return; +- msg_box(ses->term, getml(u, NULL), TEXT(T_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_ERROR_LOADING), " ", u, ":\n\n", t, NULL, ses, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC/*, _("Retry"), NULL, 0 !!! FIXME: retry */); ++ msg_box(ses->term, getml(u, NULL), TEXT(T_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_ERROR_LOADING), " ", u, ":\n\n", t, NULL, ses, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC/*, _("Retry"), NULL, 0 !!! FIXME: retry */); + } + + static inline unsigned char hx(int a) +@@ -520,7 +520,7 @@ + dlg->udata = down; + dlg->align = AL_CENTER; + dlg->items[0].type = D_BUTTON; +- dlg->items[0].gid = B_ENTER | B_ESC; ++ dlg->items[0].gid = BTN_ENTER | BTN_ESC; + dlg->items[0].fn = dlg_undisplay_download; + dlg->items[0].text = TEXT(T_BACKGROUND); + dlg->items[1].type = D_BUTTON; +@@ -668,7 +668,7 @@ + if (get_download_ses(down)) { + unsigned char *emsg = stracpy(errno ? strerror(errno) : "Zero returned"); + unsigned char *msg = stracpy(down->file); +- msg_box(get_download_ses(down)->term, getml(msg, emsg, NULL), TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_WRITE_TO_FILE), " ", msg, ": ", emsg, NULL, NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(get_download_ses(down)->term, getml(msg, emsg, NULL), TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_WRITE_TO_FILE), " ", msg, ": ", emsg, NULL, NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + } + return -1; + } +@@ -758,7 +758,7 @@ + if (t) { + unsigned char *tt = stracpy(down->url); + if (strchr(tt, POST_CHAR)) *strchr(tt, POST_CHAR) = 0; +- msg_box(get_download_ses(down)->term, getml(tt, NULL), TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_ERROR_DOWNLOADING), " ", tt, ":\n\n", t, NULL, get_download_ses(down), 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC/*, TEXT(T_RETRY), NULL, 0 !!! FIXME: retry */); ++ msg_box(get_download_ses(down)->term, getml(tt, NULL), TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_ERROR_DOWNLOADING), " ", tt, ":\n\n", t, NULL, get_download_ses(down), 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC/*, TEXT(T_RETRY), NULL, 0 !!! FIXME: retry */); + } + } else { + if (down->prog) { +@@ -835,7 +835,7 @@ + if (!ses) goto x; + msg = stracpy(file); + msge = stracpy(strerror(errno)); +- msg_box(ses->term, getml(msg, msge, NULL), TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_CREATE_FILE), " ", msg, ": ", msge, NULL, NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, getml(msg, msge, NULL), TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_CREATE_FILE), " ", msg, ": ", msge, NULL, NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + goto x; + } + set_bin(h); +@@ -1580,7 +1580,7 @@ + } + u = stracpy(ce->url); + if ((uu = strchr(u, POST_CHAR))) *uu = 0; +- msg_box(term, getml(u, NULL), TEXT(T_DECOMPRESSION_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_ERROR_DECOMPRESSING_), u, TEXT(T__wITH_), lib, ": ", msg, NULL, NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(term, getml(u, NULL), TEXT(T_DECOMPRESSION_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_ERROR_DECOMPRESSING_), u, TEXT(T__wITH_), lib, ": ", msg, NULL, NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + } + #endif + +@@ -2230,7 +2230,7 @@ + mem_free(file); + goto new_name; + } +- msg_box(ses->term, NULL, TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_CREATE_TEMPORARY_FILE), NULL, NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_CREATE_TEMPORARY_FILE), NULL, NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + } + if (ses->tq_prog) mem_free(file); + tp_cancel(ses); +@@ -2452,7 +2452,7 @@ + i++; + d->items[i].type = D_BUTTON; + d->items[i].fn = prog_sel_cancel; +- d->items[i].gid = B_ESC; ++ d->items[i].gid = BTN_ESC; + d->items[i].text = TEXT(T_CANCEL); + d->items[i+1].type = D_END; + do_dialog(ses->term, d, ml); +@@ -2478,12 +2478,12 @@ + } + m1 = stracpy(ct); + if (!a) { +- if (!anonymous) msg_box(ses->term, getml(m1, NULL), TEXT(T_UNKNOWN_TYPE), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_SAVE_OR_DISLPAY_THIS_FILE), NULL, ses, 3, TEXT(T_SAVE), tp_save, B_ENTER, TEXT(T_DISPLAY), tp_display, 0, TEXT(T_CANCEL), tp_cancel, B_ESC); +- else msg_box(ses->term, getml(m1, NULL), TEXT(T_UNKNOWN_TYPE), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_SAVE_OR_DISLPAY_THIS_FILE), NULL, ses, 2, TEXT(T_DISPLAY), tp_display, B_ENTER, TEXT(T_CANCEL), tp_cancel, B_ESC); ++ if (!anonymous) msg_box(ses->term, getml(m1, NULL), TEXT(T_UNKNOWN_TYPE), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_SAVE_OR_DISLPAY_THIS_FILE), NULL, ses, 3, TEXT(T_SAVE), tp_save, BTN_ENTER, TEXT(T_DISPLAY), tp_display, 0, TEXT(T_CANCEL), tp_cancel, BTN_ESC); ++ else msg_box(ses->term, getml(m1, NULL), TEXT(T_UNKNOWN_TYPE), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_SAVE_OR_DISLPAY_THIS_FILE), NULL, ses, 2, TEXT(T_DISPLAY), tp_display, BTN_ENTER, TEXT(T_CANCEL), tp_cancel, BTN_ESC); + } else { + m2 = stracpy(a[0].label ? a[0].label : (unsigned char *)""); +- if (!anonymous) msg_box(ses->term, getml(m1, m2, NULL), TEXT(T_WHAT_TO_DO), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_OPEN_FILE_WITH), " ", m2, ", ", TEXT(T_SAVE_IT_OR_DISPLAY_IT), NULL, ses, 4, TEXT(T_OPEN), tp_open, B_ENTER, TEXT(T_SAVE), tp_save, 0, TEXT(T_DISPLAY), tp_display, 0, TEXT(T_CANCEL), tp_cancel, B_ESC); +- else msg_box(ses->term, getml(m1, m2, NULL), TEXT(T_WHAT_TO_DO), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_OPEN_FILE_WITH), " ", m2, ", ", TEXT(T_SAVE_IT_OR_DISPLAY_IT), NULL, ses, 3, TEXT(T_OPEN), tp_open, B_ENTER, TEXT(T_DISPLAY), tp_display, 0, TEXT(T_CANCEL), tp_cancel, B_ESC); ++ if (!anonymous) msg_box(ses->term, getml(m1, m2, NULL), TEXT(T_WHAT_TO_DO), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_OPEN_FILE_WITH), " ", m2, ", ", TEXT(T_SAVE_IT_OR_DISPLAY_IT), NULL, ses, 4, TEXT(T_OPEN), tp_open, BTN_ENTER, TEXT(T_SAVE), tp_save, 0, TEXT(T_DISPLAY), tp_display, 0, TEXT(T_CANCEL), tp_cancel, BTN_ESC); ++ else msg_box(ses->term, getml(m1, m2, NULL), TEXT(T_WHAT_TO_DO), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_OPEN_FILE_WITH), " ", m2, ", ", TEXT(T_SAVE_IT_OR_DISPLAY_IT), NULL, ses, 3, TEXT(T_OPEN), tp_open, BTN_ENTER, TEXT(T_DISPLAY), tp_display, 0, TEXT(T_CANCEL), tp_cancel, BTN_ESC); + } + if (n)mem_free(a); + if (ct)mem_free(ct); +@@ -2579,7 +2579,7 @@ + ses_destroy_defered_jump(ses); + if ((fn = get_external_protocol_function(url))) { + if (proxies.only_proxies && url_bypasses_socks(url)) { +- msg_box(ses->term, NULL, TEXT(T_ERROR), AL_CENTER, TEXT(T_NO_PROXY), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_ERROR), AL_CENTER, TEXT(T_NO_PROXY), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return; + } + fn(ses, url); +@@ -2751,7 +2751,7 @@ + add_to_list(sessions, ses); + if (first_use) { + first_use = 0; +- msg_box(term, NULL, TEXT(T_WELCOME), AL_CENTER | AL_EXTD_TEXT, TEXT(T_WELCOME_TO_LINKS), "\n\n", TEXT(T_BASIC_HELP), NULL, NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(term, NULL, TEXT(T_WELCOME), AL_CENTER | AL_EXTD_TEXT, TEXT(T_WELCOME_TO_LINKS), "\n\n", TEXT(T_BASIC_HELP), NULL, NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + } + return ses; + } +diff -urN links-2.1pre33.org/svgalib.c links-2.1pre33/svgalib.c +--- links-2.1pre33.org/svgalib.c Sun Oct 28 02:06:25 2007 ++++ links-2.1pre33/svgalib.c Sat May 3 18:30:48 2008 +@@ -1892,80 +1892,80 @@ + /* Test movement without buttons */ + if (!(mouse_buttons & BUTTON_MASK) && moved) { + mouse_aggregate_flag=1; +- mouse_aggregate_action=B_MOVE; ++ mouse_aggregate_action=BTN_MOVE; + } + + /* Test presses */ + if ((button&MOUSE_LEFTBUTTON)&&!(mouse_buttons&MOUSE_LEFTBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_LEFT|B_DOWN); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_LEFT|BTN_DOWN); + } + if ((button&MOUSE_MIDDLEBUTTON)&&!(mouse_buttons&MOUSE_MIDDLEBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_MIDDLE|B_DOWN); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_MIDDLE|BTN_DOWN); + } + if ((button&MOUSE_RIGHTBUTTON)&&!(mouse_buttons&MOUSE_RIGHTBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_RIGHT|B_DOWN); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_RIGHT|BTN_DOWN); + } + if ((button&MOUSE_FOURTHBUTTON)&&!(mouse_buttons&MOUSE_FOURTHBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_RIGHT|B_FOURTH); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_RIGHT|BTN_FOURTH); + } + if ((button&MOUSE_FIFTHBUTTON)&&!(mouse_buttons&MOUSE_FIFTHBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_RIGHT|B_FIFTH); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_RIGHT|BTN_FIFTH); + } + if ((button&MOUSE_SIXTHBUTTON)&&!(mouse_buttons&MOUSE_SIXTHBUTTON)){ + mouse_aggregate_flush(); +- /*if (mh) mh(cd,mouse_x, mouse_y,B_RIGHT|B_SIXTH);*/ ++ /*if (mh) mh(cd,mouse_x, mouse_y,BTN_RIGHT|BTN_SIXTH);*/ + switch_virtual_device(VD_NEXT); + } + + /* Test releases */ + if (!(button&MOUSE_LEFTBUTTON)&&(mouse_buttons&MOUSE_LEFTBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_LEFT|B_UP); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_LEFT|BTN_UP); + } + if (!(button&MOUSE_MIDDLEBUTTON)&&(mouse_buttons&MOUSE_MIDDLEBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_MIDDLE|B_UP); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_MIDDLE|BTN_UP); + } + if (!(button&MOUSE_RIGHTBUTTON)&&(mouse_buttons&MOUSE_RIGHTBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_RIGHT|B_UP); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_RIGHT|BTN_UP); + } + if (!(button&MOUSE_FOURTHBUTTON)&&(mouse_buttons&MOUSE_FOURTHBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_FOURTH|B_UP); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_FOURTH|BTN_UP); + } + if (!(button&MOUSE_FIFTHBUTTON)&&(mouse_buttons&MOUSE_FIFTHBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_FIFTH|B_UP); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_FIFTH|BTN_UP); + } + if (!(button&MOUSE_SIXTHBUTTON)&&(mouse_buttons&MOUSE_SIXTHBUTTON)){ + mouse_aggregate_flush(); +- /*if (mh) mh(cd,mouse_x, mouse_y,B_SIXTH|B_UP);*/ ++ /*if (mh) mh(cd,mouse_x, mouse_y,BTN_SIXTH|BTN_UP);*/ + } + +- if (drx < 0 && mh) mh(cd, mouse_x, mouse_y, B_MOVE | B_WHEELUP); +- if (drx > 0 && mh) mh(cd, mouse_x, mouse_y, B_MOVE | B_WHEELDOWN); ++ if (drx < 0 && mh) mh(cd, mouse_x, mouse_y, BTN_MOVE | BTN_WHEELUP); ++ if (drx > 0 && mh) mh(cd, mouse_x, mouse_y, BTN_MOVE | BTN_WHEELDOWN); + +- if (dry < 0 && mh) mh(cd, mouse_x, mouse_y, B_MOVE | B_WHEELLEFT); +- if (dry > 0 && mh) mh(cd, mouse_x, mouse_y, B_MOVE | B_WHEELRIGHT); ++ if (dry < 0 && mh) mh(cd, mouse_x, mouse_y, BTN_MOVE | BTN_WHEELLEFT); ++ if (dry > 0 && mh) mh(cd, mouse_x, mouse_y, BTN_MOVE | BTN_WHEELRIGHT); + + /* Test drag */ + if (! ((button^mouse_buttons) & BUTTON_MASK ) && moved && (button & + BUTTON_MASK)){ + mouse_aggregate_flag=1; + mouse_aggregate_action=( +- button&MOUSE_LEFTBUTTON?B_LEFT: +- button&MOUSE_RIGHTBUTTON?B_RIGHT: +- button&MOUSE_MIDDLEBUTTON?B_MIDDLE: +- button&MOUSE_FOURTHBUTTON?B_FOURTH: +- button&MOUSE_FIFTHBUTTON?B_FIFTH: +- /*button&MOUSE_SIXTHBUTTON?B_SIXTH:*/ +- 0) | B_DRAG; ++ button&MOUSE_LEFTBUTTON?BTN_LEFT: ++ button&MOUSE_RIGHTBUTTON?BTN_RIGHT: ++ button&MOUSE_MIDDLEBUTTON?BTN_MIDDLE: ++ button&MOUSE_FOURTHBUTTON?BTN_FOURTH: ++ button&MOUSE_FIFTHBUTTON?BTN_FIFTH: ++ /*button&MOUSE_SIXTHBUTTON?BTN_SIXTH:*/ ++ 0) | BTN_DRAG; + } + mouse_buttons=button; + } +diff -urN links-2.1pre33.org/types.c links-2.1pre33/types.c +--- links-2.1pre33.org/types.c Tue Dec 11 19:45:39 2007 ++++ links-2.1pre33/types.c Sat May 3 18:30:50 2008 +@@ -350,11 +350,11 @@ + d->items[p].data = (unsigned char *)&new->accept_ftp; + d->items[p++].dlen = sizeof(int); + d->items[p].type = D_BUTTON; +- d->items[p].gid = B_ENTER; ++ d->items[p].gid = BTN_ENTER; + d->items[p].fn = ok_dialog; + d->items[p++].text = TEXT(T_OK); + d->items[p].type = D_BUTTON; +- d->items[p].gid = B_ESC; ++ d->items[p].gid = BTN_ESC; + d->items[p].text = TEXT(T_CANCEL); + d->items[p++].fn = cancel_dialog; + d->items[p++].type = D_END; +@@ -668,11 +668,11 @@ + d->items[1].data = ct; + d->items[1].fn = check_nonempty; + d->items[2].type = D_BUTTON; +- d->items[2].gid = B_ENTER; ++ d->items[2].gid = BTN_ENTER; + d->items[2].fn = ok_dialog; + d->items[2].text = TEXT(T_OK); + d->items[3].type = D_BUTTON; +- d->items[3].gid = B_ESC; ++ d->items[3].gid = BTN_ESC; + d->items[3].text = TEXT(T_CANCEL); + d->items[3].fn = cancel_dialog; + d->items[4].type = D_END; +diff -urN links-2.1pre33.org/view.c links-2.1pre33/view.c +--- links-2.1pre33.org/view.c Mon Dec 24 23:33:47 2007 ++++ links-2.1pre33/view.c Sat May 3 18:30:51 2008 +@@ -2028,7 +2028,7 @@ + *data = NULL; + m1 = stracpy(sv->value); + m2 = stracpy(strerror(errno)); +- msg_box(ses->term, getml(m1, m2, NULL), TEXT(T_ERROR_WHILE_POSTING_FORM), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_GET_FILE), " ", m1, ": ", m2, NULL, ses, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, getml(m1, m2, NULL), TEXT(T_ERROR_WHILE_POSTING_FORM), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_GET_FILE), " ", m1, ": ", m2, NULL, ses, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + } + + void reset_form(struct f_data_c *f, int form_num) +@@ -2878,7 +2878,7 @@ + if (!ses->search_word) { + if (!ses->last_search_word) { + no: +- msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_NO_PREVIOUS_SEARCH), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_NO_PREVIOUS_SEARCH), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return; + } + ses->search_word = stracpy(ses->last_search_word); +@@ -2910,7 +2910,7 @@ + p -= f->yw; + } + } while ((c += f->yw ? f->yw : 1) < f->f_data->y + f->yw); +- msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_SEARCH_STRING_NOT_FOUND), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_SEARCH_STRING_NOT_FOUND), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + } + + void find_next_back(struct session *ses, struct f_data_c *f, int a) +@@ -3081,12 +3081,12 @@ + x = 1; + fd->vs->current_link = l - fd->f_data->links; + fd->vs->orig_link = fd->vs->current_link; +- if (l->type == L_LINK || l->type == L_BUTTON || l->type == L_CHECKBOX || l->type == L_SELECT) if ((ev->b & BM_ACT) == B_UP) { ++ if (l->type == L_LINK || l->type == L_BUTTON || l->type == L_CHECKBOX || l->type == L_SELECT) if ((ev->b & BM_ACT) == BTN_UP) { + fd->active = 1; + draw_to_window(ses->win, (void (*)(struct terminal *, void *))draw_doc_c, fd); + change_screen_status(ses); + print_screen_status(ses); +- if ((ev->b & BM_BUTT) < B_MIDDLE) x = enter(ses, fd, 0); ++ if ((ev->b & BM_BUTT) < BTN_MIDDLE) x = enter(ses, fd, 0); + else link_menu(ses->term, NULL, ses); + } + +@@ -3481,13 +3481,13 @@ + } + } + if (ev->ev == EV_MOUSE) { +- if (ev->b == (B_DOWN | B_FOURTH)) { ++ if (ev->b == (BTN_DOWN | BTN_FOURTH)) { + go_back(ses); + goto x; + } + #ifdef G + if (ses->locked_link) { +- if ((ev->b & BM_ACT) != B_MOVE) { ++ if ((ev->b & BM_ACT) != BTN_MOVE) { + ses->locked_link = 0; + #ifdef JS + /* process onblur handler of current link */ +@@ -3510,7 +3510,7 @@ + } else return; + } + #endif +- if (ev->y < gf_val(1, G_BFU_FONT_SIZE) && (ev->b & BM_ACT) == B_DOWN) { ++ if (ev->y < gf_val(1, G_BFU_FONT_SIZE) && (ev->b & BM_ACT) == BTN_DOWN) { + #ifdef G + if (F && ev->x < ses->back_size) { + go_back(ses); +@@ -3790,7 +3790,7 @@ + struct f_data_c *f; + if (!(f = current_frame(ses)) || !f->f_data) return; + if ((h = create_download_file(ses, ses->term->cwd, file, 0, 0)) < 0) return; +- if (dump_to_file(f->f_data, h)) msg_box(ses->term, NULL, TEXT(T_SAVE_ERROR), AL_CENTER, TEXT(T_ERROR_WRITING_TO_FILE), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ if (dump_to_file(f->f_data, h)) msg_box(ses->term, NULL, TEXT(T_SAVE_ERROR), AL_CENTER, TEXT(T_ERROR_WRITING_TO_FILE), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + close(h); + } + +@@ -4160,7 +4160,7 @@ + int l = 0; + unsigned char *a; + if (!lo || !frame || !frame->vs || !frame->f_data) { +- msg_box(term, NULL, TEXT(T_INFO), AL_LEFT, TEXT(T_YOU_ARE_NOWHERE), NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(term, NULL, TEXT(T_INFO), AL_LEFT, TEXT(T_YOU_ARE_NOWHERE), NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + return; + } + s = init_str(); +@@ -4226,7 +4226,7 @@ + add_to_str(&s, &l, a); + mem_free(a); + } +- msg_box(term, getml(s, NULL), TEXT(T_INFO), AL_LEFT, s, NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(term, getml(s, NULL), TEXT(T_INFO), AL_LEFT, s, NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + } + + void state_msg(struct session *ses) +@@ -4241,7 +4241,7 @@ + unsigned char *s, *ss; + int len; + if (list_empty(ses->history)) { +- msg_box(ses->term, NULL, TEXT(T_HEADER_INFO), AL_LEFT, TEXT(T_YOU_ARE_NOWHERE), NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_HEADER_INFO), AL_LEFT, TEXT(T_YOU_ARE_NOWHERE), NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + return; + } + if (!find_in_cache(cur_loc(ses)->url, &ce)) { +@@ -4252,6 +4252,6 @@ + while ((ss = strstr(s, "\r\n"))) memmove(ss, ss + 1, strlen(ss)); + while (*s && s[strlen(s) - 1] == '\n') s[strlen(s) - 1] = 0; + } +- msg_box(ses->term, getml(s, NULL), TEXT(T_HEADER_INFO), AL_LEFT, s, NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, getml(s, NULL), TEXT(T_HEADER_INFO), AL_LEFT, s, NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + } + } +diff -urN links-2.1pre33.org/view_gr.c links-2.1pre33/view_gr.c +--- links-2.1pre33.org/view_gr.c Mon Dec 24 23:33:47 2007 ++++ links-2.1pre33/view_gr.c Sat May 3 18:30:52 2008 +@@ -826,7 +826,7 @@ + void g_text_mouse(struct f_data_c *fd, struct g_object_text *a, int x, int y, int b) + { + int e; +- g_set_current_link(fd, a, x, y, (b == (B_UP | B_LEFT))); ++ g_set_current_link(fd, a, x, y, (b == (BTN_UP | BTN_LEFT))); + + #ifdef JS + if (fd->vs&&fd->f_data&&fd->vs->current_link>=0&&fd->vs->current_linkf_data->nlinks) +@@ -835,16 +835,16 @@ + + struct link *l=&(fd->f_data->links[fd->vs->current_link]); + +- if (l->js_event&&l->js_event->up_code&&(b&BM_ACT)==B_UP) ++ if (l->js_event&&l->js_event->up_code&&(b&BM_ACT)==BTN_UP) + jsint_execute_code(fd,l->js_event->up_code,strlen(l->js_event->up_code),-1,-1,-1, NULL); + +- if (l->js_event&&l->js_event->down_code&&(b&BM_ACT)==B_DOWN) ++ if (l->js_event&&l->js_event->down_code&&(b&BM_ACT)==BTN_DOWN) + jsint_execute_code(fd,l->js_event->down_code,strlen(l->js_event->down_code),-1,-1,-1, NULL); + + } + #endif + +- if (b == (B_UP | B_LEFT)) { ++ if (b == (BTN_UP | BTN_LEFT)) { + int ix = ismap_x, iy = ismap_y, il = ismap_link; + ismap_x = x; + ismap_y = y; +@@ -861,7 +861,7 @@ + if (e == 2) fd->f_data->locked_on = (struct g_object *)a; + return; + } +- if (b == (B_UP | B_RIGHT)) { ++ if (b == (BTN_UP | BTN_RIGHT)) { + if (fd->vs->current_link != -1) link_menu(fd->ses->term, NULL, fd->ses); + } + } +@@ -1021,17 +1021,17 @@ + if (!fd->f_data) return 0; + switch (ev->ev) { + case EV_MOUSE: +- if ((ev->b & BM_BUTT) == B_WHEELUP) goto up; +- if ((ev->b & BM_BUTT) == B_WHEELDOWN) goto down; +- if ((ev->b & BM_BUTT) == B_WHEELUP1) goto up1; +- if ((ev->b & BM_BUTT) == B_WHEELDOWN1) goto down1; +- if ((ev->b & BM_BUTT) == B_WHEELLEFT) goto left; +- if ((ev->b & BM_BUTT) == B_WHEELRIGHT) goto right; +- if ((ev->b & BM_BUTT) == B_WHEELLEFT1) goto left1; +- if ((ev->b & BM_BUTT) == B_WHEELRIGHT1) goto right1; ++ if ((ev->b & BM_BUTT) == BTN_WHEELUP) goto up; ++ if ((ev->b & BM_BUTT) == BTN_WHEELDOWN) goto down; ++ if ((ev->b & BM_BUTT) == BTN_WHEELUP1) goto up1; ++ if ((ev->b & BM_BUTT) == BTN_WHEELDOWN1) goto down1; ++ if ((ev->b & BM_BUTT) == BTN_WHEELLEFT) goto left; ++ if ((ev->b & BM_BUTT) == BTN_WHEELRIGHT) goto right; ++ if ((ev->b & BM_BUTT) == BTN_WHEELLEFT1) goto left1; ++ if ((ev->b & BM_BUTT) == BTN_WHEELRIGHT1) goto right1; + x = ev->x; + y = ev->y; +- if ((ev->b & BM_ACT) == B_MOVE) ses->scrolling = 0; ++ if ((ev->b & BM_ACT) == BTN_MOVE) ses->scrolling = 0; + if (ses->scrolling == 1) process_sb_move(fd, ses->scrolltype ? ev->x : ev->y); + if (ses->scrolling == 2) { + fd->vs->view_pos = -ev->y + ses->scrolloff; +@@ -1039,31 +1039,31 @@ + fd->vs->orig_view_pos = fd->vs->view_pos; + fd->vs->orig_view_posx = fd->vs->view_posx; + draw_graphical_doc(fd->ses->term, fd, 1); +- if ((ev->b & BM_ACT) == B_UP) { ++ if ((ev->b & BM_ACT) == BTN_UP) { + ses->scrolling = 0; + } + break; + } + if (ses->scrolling) { +- if ((ev->b & BM_ACT) == B_UP) { ++ if ((ev->b & BM_ACT) == BTN_UP) { + ses->scrolling = 0; + } + break; + } + + +- if ((ev->b & BM_ACT) == B_DOWN && fd->f_data->vsb && ev_in_rect(ev, fd->xw - G_SCROLL_BAR_WIDTH, 0, fd->xw, fd->yw - fd->f_data->hsb * G_SCROLL_BAR_WIDTH)) { ++ if ((ev->b & BM_ACT) == BTN_DOWN && fd->f_data->vsb && ev_in_rect(ev, fd->xw - G_SCROLL_BAR_WIDTH, 0, fd->xw, fd->yw - fd->f_data->hsb * G_SCROLL_BAR_WIDTH)) { + process_sb_event(fd, ev->y, 0); + break; + } +- if ((ev->b & BM_ACT) == B_DOWN && fd->f_data->hsb && ev_in_rect(ev, 0, fd->yw - G_SCROLL_BAR_WIDTH, fd->xw - fd->f_data->vsb * G_SCROLL_BAR_WIDTH, fd->yw)) { ++ if ((ev->b & BM_ACT) == BTN_DOWN && fd->f_data->hsb && ev_in_rect(ev, 0, fd->yw - G_SCROLL_BAR_WIDTH, fd->xw - fd->f_data->vsb * G_SCROLL_BAR_WIDTH, fd->yw)) { + process_sb_event(fd, ev->x, 1); + break; + } + if (fd->f_data->vsb && ev_in_rect(ev, fd->xw - G_SCROLL_BAR_WIDTH, 0, fd->xw, fd->yw)) return 0; + if (fd->f_data->hsb && ev_in_rect(ev, 0, fd->yw - G_SCROLL_BAR_WIDTH, fd->xw, fd->yw)) return 0; + +- if ((ev->b & BM_ACT) == B_DOWN && (ev->b & BM_BUTT) == B_MIDDLE) { ++ if ((ev->b & BM_ACT) == BTN_DOWN && (ev->b & BM_BUTT) == BTN_MIDDLE) { + scrll: + ses->scrolltype = ev->x + fd->vs->view_posx; + ses->scrolloff = ev->y + fd->vs->view_pos; +@@ -1076,7 +1076,7 @@ + fd->vs->g_display_link = 0; + if (fd->vs->current_link >= 0 && fd->vs->current_link < fd->f_data->nlinks) redraw_link(fd, fd->vs->current_link); + } +- if (!(ev->b == (B_LEFT | B_UP) && fd->f_data->hlt_len && fd->f_data->start_highlight_x == -1)) { ++ if (!(ev->b == (BTN_LEFT | BTN_UP) && fd->f_data->hlt_len && fd->f_data->start_highlight_x == -1)) { + fd->vs->current_link = -1; + fd->vs->orig_link = fd->vs->current_link; + fd->f_data->root->mouse_event(fd, fd->f_data->root, ev->x + fd->vs->view_posx, ev->y + fd->vs->view_pos, ev->b); +@@ -1086,14 +1086,14 @@ + } + + /* highlight text */ +- if ((ev->b & BM_ACT) == B_DOWN && (ev->b & BM_BUTT) == B_LEFT) { /* start highlighting */ ++ if ((ev->b & BM_ACT) == BTN_DOWN && (ev->b & BM_BUTT) == BTN_LEFT) { /* start highlighting */ + fd->f_data->start_highlight_x = ev->x; + fd->f_data->start_highlight_y = ev->y; + fd->f_data->hlt_len = 0; + fd->f_data->hlt_pos = -1; + return 1; + } +- if (((ev->b & BM_ACT) == B_DRAG || (ev->b & BM_ACT) == B_UP) && (ev->b & BM_BUTT) == B_LEFT) { /* stop highlighting */ ++ if (((ev->b & BM_ACT) == BTN_DRAG || (ev->b & BM_ACT) == BTN_UP) && (ev->b & BM_BUTT) == BTN_LEFT) { /* stop highlighting */ + struct g_object_text *t; + if (fd->f_data->start_highlight_x != -1) { + if (abs(ev->x - fd->f_data->start_highlight_x) < 8 && abs(ev->y - fd->f_data->start_highlight_y) < 8) goto skip_hl; +@@ -1117,7 +1117,7 @@ + g_get_search_data(fd->f_data); + end=t->srch_pos+g_find_text_pos(t, ev->x+fd->vs->view_posx); + fd->f_data->hlt_len=end-fd->f_data->hlt_pos; +- if ((ev->b & BM_ACT) == B_UP || (ev->b & BM_ACT) == B_DRAG) { ++ if ((ev->b & BM_ACT) == BTN_UP || (ev->b & BM_ACT) == BTN_DRAG) { + unsigned char *m = memacpy(fd->f_data->srch_string + fd->f_data->hlt_pos + (fd->f_data->hlt_len > 0 ? 0 : fd->f_data->hlt_len), fd->f_data->hlt_len > 0 ? fd->f_data->hlt_len : -fd->f_data->hlt_len); + if (m) { + unsigned char *p = m; +@@ -1147,7 +1147,7 @@ + } + #endif + +- if ((ev->b & BM_ACT) == B_DOWN && (ev->b & BM_BUTT) == B_RIGHT && fd->vs->current_link == -1) goto scrll; ++ if ((ev->b & BM_ACT) == BTN_DOWN && (ev->b & BM_BUTT) == BTN_RIGHT && fd->vs->current_link == -1) goto scrll; + break; + case EV_KBD: + if (ses->locked_link && fd->vs->current_link >= 0 && fd->vs->current_link < fd->f_data->nlinks && (fd->f_data->links[fd->vs->current_link].type == L_FIELD || fd->f_data->links[fd->vs->current_link].type == L_AREA)) { +@@ -1537,7 +1537,7 @@ + g_get_search_data(f->f_data); + g_get_search(f->f_data, f->ses->search_word); + search_word = f->ses->search_word; +- if (!f->f_data->n_search_positions) msg_box(f->ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_SEARCH_STRING_NOT_FOUND), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ if (!f->f_data->n_search_positions) msg_box(f->ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_SEARCH_STRING_NOT_FOUND), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + + highlight_positions = f->f_data->search_positions; + highlight_lengths = f->f_data->search_lengths; +diff -urN links-2.1pre33.org/x.c links-2.1pre33/x.c +--- links-2.1pre33.org/x.c Sun Jul 8 02:04:50 2007 ++++ links-2.1pre33/x.c Sat May 3 18:30:52 2008 +@@ -552,28 +552,28 @@ + #endif + gd=x_find_gd(&(last_event.xmotion.window)); + if (!gd)break; +- a=B_LEFT; +- b=B_MOVE; ++ a=BTN_LEFT; ++ b=BTN_MOVE; + if ((last_event.xmotion.state)&Button1Mask) + { +- a=B_LEFT; +- b=B_DRAG; ++ a=BTN_LEFT; ++ b=BTN_DRAG; + #ifdef X_DEBUG + MESSAGE("left button/drag\n"); + #endif + } + if ((last_event.xmotion.state)&Button2Mask) + { +- a=B_MIDDLE; +- b=B_DRAG; ++ a=BTN_MIDDLE; ++ b=BTN_DRAG; + #ifdef X_DEBUG + MESSAGE("middle button/drag\n"); + #endif + } + if ((last_event.xmotion.state)&Button3Mask) + { +- a=B_RIGHT; +- b=B_DRAG; ++ a=BTN_RIGHT; ++ b=BTN_DRAG; + #ifdef X_DEBUG + MESSAGE("right button/drag\n"); + #endif +@@ -699,15 +699,15 @@ + switch(event.xbutton.button) + { + case 1: +- a=B_LEFT; ++ a=BTN_LEFT; + break; + + case 3: +- a=B_RIGHT; ++ a=BTN_RIGHT; + break; + + case 2: +- a=B_MIDDLE; ++ a=BTN_MIDDLE; + break; + + default: +@@ -716,7 +716,7 @@ + } + x_clip_number(&(event.xmotion.x),gd->size.x1,gd->size.x2); + x_clip_number(&(event.xmotion.y),gd->size.y1,gd->size.y2); +- gd->mouse_handler(gd,event.xbutton.x,event.xbutton.y,a|B_UP); ++ gd->mouse_handler(gd,event.xbutton.x,event.xbutton.y,a|BTN_UP); + r_xx:; + } + break; +@@ -738,31 +738,31 @@ + switch(event.xbutton.button) + { + case 1: +- a=B_LEFT; ++ a=BTN_LEFT; + break; + + case 3: +- a=B_RIGHT; ++ a=BTN_RIGHT; + break; + + case 2: +- a=B_MIDDLE; ++ a=BTN_MIDDLE; + break; + + case 4: +- a=B_WHEELUP; ++ a=BTN_WHEELUP; + break; + + case 5: +- a=B_WHEELDOWN; ++ a=BTN_WHEELDOWN; + break; + + case 6: +- a=B_WHEELLEFT; ++ a=BTN_WHEELLEFT; + break; + + case 7: +- a=B_WHEELRIGHT; ++ a=BTN_WHEELRIGHT; + break; + + default: +@@ -770,7 +770,7 @@ + } + x_clip_number(&(event.xmotion.x),gd->size.x1,gd->size.x2); + x_clip_number(&(event.xmotion.y),gd->size.y1,gd->size.y2); +- gd->mouse_handler(gd,event.xbutton.x,event.xbutton.y,a|(a != B_WHEELDOWN && a != B_WHEELUP && a != B_WHEELLEFT && a != B_WHEELRIGHT ? B_DOWN : B_MOVE)); ++ gd->mouse_handler(gd,event.xbutton.x,event.xbutton.y,a|(a != BTN_WHEELDOWN && a != BTN_WHEELUP && a != BTN_WHEELLEFT && a != BTN_WHEELRIGHT ? BTN_DOWN : BTN_MOVE)); + p_xx:; + } + break; +@@ -839,28 +839,28 @@ + #endif + gd=x_find_gd(&(last_event.xmotion.window)); + if (!gd)goto ret; +- a=B_LEFT; +- b=B_MOVE; ++ a=BTN_LEFT; ++ b=BTN_MOVE; + if ((last_event.xmotion.state)&Button1Mask) + { +- a=B_LEFT; +- b=B_DRAG; ++ a=BTN_LEFT; ++ b=BTN_DRAG; + #ifdef X_DEBUG + MESSAGE("left button/drag\n"); + #endif + } + if ((last_event.xmotion.state)&Button2Mask) + { +- a=B_MIDDLE; +- b=B_DRAG; ++ a=BTN_MIDDLE; ++ b=BTN_DRAG; + #ifdef X_DEBUG + MESSAGE("middle button/drag\n"); + #endif + } + if ((last_event.xmotion.state)&Button3Mask) + { +- a=B_RIGHT; +- b=B_DRAG; ++ a=BTN_RIGHT; ++ b=BTN_DRAG; + #ifdef X_DEBUG + MESSAGE("right button/drag\n"); + #endif diff --git a/www-client/links/patches/links-2.3pre2.patch b/www-client/links/patches/links-2.3pre2.patch new file mode 100644 index 000000000..98c9852ec --- /dev/null +++ b/www-client/links/patches/links-2.3pre2.patch @@ -0,0 +1,3199 @@ +diff -urN links-2.3pre2-orig/Makefile.am links-2.3pre2/Makefile.am +--- links-2.3pre2-orig/Makefile.am 2009-05-17 20:45:41.000000000 +0000 ++++ links-2.3pre2/Makefile.am 2011-05-13 09:05:58.243269632 +0000 +@@ -4,7 +4,7 @@ + + man_MANS=links.1 + +-EXTRA_DIST=atheos.cpp $(man_MANS) BRAILLE_HOWTO KEYS BUGS TODO SITES PATCH-gpm-1.20.0-smooth-cursor PATCH-libpng-1.2.18 mailcap.pl rebuild Links_logo.png Unicode/*.cp Unicode/[!C]* intl/[!C]* graphics/*.c graphics/arrow.png graphics/gen graphics/system_font/*.png graphics/font/century_school-medium-roman-serif-vari/*.png graphics/font/century_school-bold-roman-serif-vari/*.png graphics/font/symbol-medium-roman-sans-vari/*.png graphics/font/courier-medium-roman-serif-mono/*.png graphics/font/japanese-medium-roman-sans-mono/*.png graphics/font/century_school-bold-roman-serif-vari/aliases graphics/font/century_school-medium-roman-serif-vari/aliases graphics/font/symbol-medium-roman-sans-vari/aliases doc/links_cal/*.png doc/links_cal/*.html graphics/Makefile graphics/Fontmap graphics/clip.c graphics/links.xpm graphics/makefont graphics/pdf2html graphics/spacer.png links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm links.nsi ++EXTRA_DIST=atheos.cpp beosgui.cpp $(man_MANS) BRAILLE_HOWTO KEYS BUGS TODO SITES PATCH-gpm-1.20.0-smooth-cursor PATCH-libpng-1.2.18 mailcap.pl rebuild Links_logo.png Unicode/*.cp Unicode/[!C]* intl/[!C]* graphics/*.c graphics/arrow.png graphics/gen graphics/system_font/*.png graphics/font/century_school-medium-roman-serif-vari/*.png graphics/font/century_school-bold-roman-serif-vari/*.png graphics/font/symbol-medium-roman-sans-vari/*.png graphics/font/courier-medium-roman-serif-mono/*.png graphics/font/japanese-medium-roman-sans-mono/*.png graphics/font/century_school-bold-roman-serif-vari/aliases graphics/font/century_school-medium-roman-serif-vari/aliases graphics/font/symbol-medium-roman-sans-vari/aliases doc/links_cal/*.png doc/links_cal/*.html graphics/Makefile graphics/Fontmap graphics/clip.c graphics/links.xpm graphics/makefont graphics/pdf2html graphics/spacer.png links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm links.nsi links-beos.rdef + + bin_PROGRAMS=links + +@@ -13,6 +13,11 @@ + else + endif + ++if BEOS_GR ++links_LDADD=beosgui.o -lbe ++else ++endif ++ + links_SOURCES=af_unix.c auth.c beos.c bfu.c block.c bookmarks.c cache.c charsets.c connect.c cookies.c default.c dip.c directfb.c directfb_cursors.h dither.c dns.c drivers.c error.c file.c finger.c font_include.c framebuffer.c ftp.c gif.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c links_icon.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c x.c xbm.c links.h cfg.h os_dep.h os_depx.h setup.h codepage.h language.h codepage.inc entity.inc uni_7b.inc language.inc upcase.inc arrow.inc bits.h + + dist-hook: +@@ -31,7 +36,12 @@ + CXXFLAGS=@CXXFLAGS@ + + atheos.o: atheos.cpp +- $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c atheos.cpp ++ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -o $@ -c $< ++ ++beosgui.o: beosgui.cpp ++ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -o $@ -c $< ++ ++ + + datadir = $(prefix)/@DATADIRNAME@ + LIBS = @LIBS@ +diff -urN links-2.3pre2-orig/acconfig.h links-2.3pre2/acconfig.h +--- links-2.3pre2-orig/acconfig.h 2009-05-17 20:14:00.000000000 +0000 ++++ links-2.3pre2/acconfig.h 2011-05-13 09:04:15.857210880 +0000 +@@ -119,6 +119,9 @@ + #undef GRDRV_ATHEOS + + /* */ ++#undef GRDRV_BEOS ++ ++/* */ + #undef DONT_INCLUDE_SETJMP + + /* Tiff by Brain */ +diff -urN links-2.3pre2-orig/atheos.cpp links-2.3pre2/atheos.cpp +--- links-2.3pre2-orig/atheos.cpp 2004-10-22 18:11:31.000000000 +0000 ++++ links-2.3pre2/atheos.cpp 2011-05-13 09:04:15.882638848 +0000 +@@ -207,7 +207,7 @@ + win->Unlock(); + ath_lock->Lock(); + win->Lock(); +- if (dev) dev->mouse_handler(dev, last_x = (int)p.x, last_y = (int)p.y, B_DOWN | (b == 2 ? B_RIGHT : b == 3 ? B_MIDDLE : B_LEFT)); ++ if (dev) dev->mouse_handler(dev, last_x = (int)p.x, last_y = (int)p.y, BTN_DOWN | (b == 2 ? BTN_RIGHT : b == 3 ? BTN_MIDDLE : BTN_LEFT)); + ath_lock->Unlock(); + write(wpipe, " ", 1); + } +@@ -217,7 +217,7 @@ + win->Unlock(); + ath_lock->Lock(); + win->Lock(); +- if (dev) dev->mouse_handler(dev, last_x = (int)p.x, last_y = (int)p.y, B_UP | (b == 2 ? B_RIGHT : b == 3 ? B_MIDDLE : B_LEFT)); ++ if (dev) dev->mouse_handler(dev, last_x = (int)p.x, last_y = (int)p.y, BTN_UP | (b == 2 ? BTN_RIGHT : b == 3 ? BTN_MIDDLE : BTN_LEFT)); + ath_lock->Unlock(); + write(wpipe, " ", 1); + } +@@ -227,7 +227,7 @@ + win->Unlock(); + ath_lock->Lock(); + win->Lock(); +- if (dev) dev->mouse_handler(dev, last_x = (int)p.x, last_y = (int)p.y, !b ? B_MOVE : B_DRAG | (b & 1 ? B_LEFT : b & 2 ? B_RIGHT : b & 4 ? B_MIDDLE : B_LEFT)); ++ if (dev) dev->mouse_handler(dev, last_x = (int)p.x, last_y = (int)p.y, !b ? BTN_MOVE : BTN_DRAG | (b & 1 ? BTN_LEFT : b & 2 ? BTN_RIGHT : b & 4 ? BTN_MIDDLE : BTN_LEFT)); + ath_lock->Unlock(); + write(wpipe, " ", 1); + } +@@ -237,8 +237,8 @@ + win->Unlock(); + ath_lock->Lock(); + win->Lock(); +- if (d.y) if (dev) dev->mouse_handler(dev, last_x, last_y, B_MOVE | (d.y > 0 ? B_WHEELDOWN : B_WHEELUP)); +- if (d.x) if (dev) dev->mouse_handler(dev, last_x, last_y, B_MOVE | (d.x < 0 ? B_WHEELLEFT : B_WHEELRIGHT)); ++ if (d.y) if (dev) dev->mouse_handler(dev, last_x, last_y, BTN_MOVE | (d.y > 0 ? BTN_WHEELDOWN : BTN_WHEELUP)); ++ if (d.x) if (dev) dev->mouse_handler(dev, last_x, last_y, BTN_MOVE | (d.x < 0 ? BTN_WHEELLEFT : BTN_WHEELRIGHT)); + ath_lock->Unlock(); + write(wpipe, " ", 1); + } +diff -urN links-2.3pre2-orig/beos.c links-2.3pre2/beos.c +--- links-2.3pre2-orig/beos.c 2006-09-11 01:47:20.000000000 +0000 ++++ links-2.3pre2/beos.c 2011-05-13 09:32:23.000000000 +0000 +@@ -3,7 +3,7 @@ + * This file is a part of the Links program, released under GPL + */ + +-#ifdef __BEOS__ ++#if defined __BEOS__ || defined __HAIKU__ + + #include + #include +@@ -11,8 +11,9 @@ + #include + #include + #include ++#include + #include +-#include ++#include + + #define SHS 128 + +@@ -20,6 +21,42 @@ + #define MAXINT 0x7fffffff + #endif + ++extern int ggr; ++ ++#ifdef __cplusplus ++extern "C" { ++int get_input_handle(); ++void unblock_stdin(); ++void block_stdin(); ++} ++#endif ++ ++void maybe_force_gr(void) ++{ ++ struct stat stn, stin, stout; ++ /* ++ * if stdin and out are /dev/null it's likely ++ * we have been started from the gui... ++ */ ++ if (lstat("/dev/null", &stn) < 0) ++ return; ++ if (fstat(0, &stin) < 0) ++ return; ++ if (fstat(1, &stout) < 0) ++ return; ++ if (stin.st_dev != stn.st_dev) ++ return; ++ if (stout.st_dev != stn.st_dev) ++ return; ++ if (stin.st_ino != stn.st_ino) ++ return; ++ if (stout.st_ino != stn.st_ino) ++ return; ++ ggr = 1; ++} ++ ++#if IPPROTO_TCP != 6 ++ + int be_read(int s, void *ptr, int len) + { + if (s >= SHS) return recv(s - SHS, ptr, len, 0); +@@ -90,6 +127,10 @@ + + #define PIPE_RETRIES 10 + ++#ifndef PF_INET ++#define PF_INET AF_INET ++#endif ++ + int be_pipe(int *fd) + { + int s1, s2, s3, l; +@@ -250,4 +291,21 @@ + return h = ohpipe[1]; + }*/ + ++#else /* IPPROTO_TCP != 6 */ ++ ++void block_stdin() ++{ ++} ++ ++void unblock_stdin() ++{ ++} ++ ++int get_input_handle() ++{ ++ return 0; ++} ++ ++#endif ++ + #endif +diff -urN links-2.3pre2-orig/beosgui.cpp links-2.3pre2/beosgui.cpp +--- links-2.3pre2-orig/beosgui.cpp 1970-01-01 00:00:00.000000000 +0000 ++++ links-2.3pre2/beosgui.cpp 2011-05-13 09:04:15.932446208 +0000 +@@ -0,0 +1,884 @@ ++/* beos.c ++ * (c) 2007 François Revol ++ * This file is a part of the Links program, released under GPL ++ */ ++ ++#if defined __BEOS__ || defined __HAIKU__ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* ++ * GUI code ++ */ ++ ++/* ++ * TODO: ++ * - BeOS doesn't handle BView::DrawBitmap() with RGB24, and links doesn't seem to handle RGB32, ++ * so the colorspace is forced into 16bpp for now. ++ * - more paste handling ? ++ * - more DnD (maybe check if in menu or not and prepend "g" ?) ++ * - handle DnD of Net+ bookmarks ++ */ ++ ++#include "cfg.h" ++ ++#ifdef GRDRV_BEOS ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++extern "C" { ++#include "links.h" ++} ++ ++//#define DBG(l...) fprintf(stderr, l); ++#define DBG(l...) {} ++ ++/* ++#ifdef debug ++#undef debug ++#endif ++#define debug(x) ++#define fprintf(x, y) ++*/ ++ ++extern struct graphics_driver beos_driver; ++ ++class LinksApplication : public BApplication { ++ public: ++ LinksApplication():BApplication("application/x-vnd.links"){} ++ virtual void RefsReceived(BMessage *message); ++ virtual bool QuitRequested(); ++}; ++ ++class LinksView; ++ ++class LinksWindow : public BWindow { ++ public: ++ LinksWindow(BRect r); ++ ~LinksWindow(); ++ virtual void FrameResized(float width, float height); ++ virtual bool QuitRequested(); ++ int resized; ++ LinksView *view; ++}; ++ ++class LinksView : public BView { ++ public: ++ LinksView(LinksWindow *w); ++ ~LinksView(); ++ virtual void Draw(BRect r); ++ virtual void MouseDown(BPoint p); ++ virtual void MouseUp(BPoint p); ++ virtual void MouseMoved(BPoint p, uint32 transit, const BMessage *dragmsg); ++ virtual void KeyDown(const char *s, int32 numBytes); ++ virtual void MessageReceived(BMessage *msg); ++ LinksWindow *win; ++ struct graphics_device *dev; ++ void d_flush(); ++ int flushing; ++ int last_x, last_y; ++}; ++ ++#define lv(dev) ((LinksView *)(dev)->driver_data) ++ ++#define lock_dev(dev) do { if (!lv(dev)->win->Lock()) return; } while (0) ++#define lock_dev0(dev) do { if (!lv(dev)->win->Lock()) return 0; } while (0) ++#define unlock_dev(dev) do { lv(dev)->win->Unlock(); } while (0) ++ ++void be_get_size(struct graphics_device *dev); ++ ++#define detach_message(dev) \ ++ BMessage *current = Looper()->DetachCurrentMessage(); \ ++ if (current) { \ ++ current->AddPointer("linksdev", dev); \ ++ } ++ ++#define pipe_message(dev) \ ++ if (current) { \ ++ write(wpipe, ¤t, sizeof(current)); \ ++ } ++ ++#define detach_and_pipe_message(dev) do { \ ++ BMessage *current = Looper()->DetachCurrentMessage(); \ ++ if (current) { \ ++ current->AddPointer("linksdev", dev); \ ++ write(wpipe, ¤t, sizeof(current)); \ ++ } \ ++} while (0) ++ ++LinksApplication *be_links_app; ++BLocker *be_lock = NULL; ++ ++int msg_pipe[2]; ++ ++thread_id be_app_thread_id; ++ ++#define rpipe (msg_pipe[0]) ++#define wpipe (msg_pipe[1]) ++ ++#define small_color (sizeof(rgb_color) <= sizeof(long)) ++#define get_color32(c, rgb) rgb_color c((rgb_color){(rgb >> 16) & 255, (rgb >> 8) & 255, rgb & 255, 255}) ++ ++color_space be_cs_desktop, be_cs_bmp; ++ ++int be_x_size, be_y_size; ++ ++int be_win_x_size, be_win_y_size; ++int be_win_x_pos, be_win_y_pos; ++ ++static BMessage *initial_refs_msg; ++ ++void LinksApplication::RefsReceived(BMessage *message) ++{ ++ entry_ref ref; ++ //if (!IsLaunching()) ++ // return; ++ BMessenger msgr(WindowAt(0)); ++ BMessage *m = new BMessage(*message); ++ m->AddSpecifier("View", (long)0); ++ //m->what = B_SIMPLE_DATA; ++ if (msgr.IsValid()) { ++ msgr.SendMessage(m); ++ } else ++ initial_refs_msg = m; ++} ++ ++bool LinksApplication::QuitRequested() ++{ ++ BApplication::QuitRequested(); ++ //printf("qc: %ld\n", CountWindows()); ++ return true; ++} ++ ++LinksWindow::LinksWindow(BRect r):BWindow(r, "Links", B_DOCUMENT_WINDOW, 0) ++{ ++ DBG("LINKSWINDOW\n"); ++ resized = 0; ++ view = NULL; ++} ++ ++LinksWindow::~LinksWindow() ++{ ++ view = NULL; ++ DBG("~LINKSWINDOW\n"); ++} ++ ++void LinksWindow::FrameResized(float width, float height) ++{ ++ resized = 1; ++} ++ ++bool LinksWindow::QuitRequested() ++{ ++ detach_and_pipe_message(view->dev); ++ return false; ++} ++ ++void do_flush(void *p_dev) ++{ ++ struct graphics_device *dev = (struct graphics_device *)p_dev; ++ LinksView *v = lv(dev); ++ v->win->Lock(); ++ v->win->Flush(); ++ v->win->Unlock(); ++ v->flushing = 0; ++} ++ ++LinksView::LinksView(LinksWindow *w):BView(w->Bounds(), "Links", B_FOLLOW_ALL, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE) ++{ ++ DBG("LINKSVIEW\n"); ++ (win = w)->AddChild(this); ++ SetViewColor(B_TRANSPARENT_32_BIT); ++ MakeFocus(); ++ w->view = this; ++ flushing = 0; ++ last_x = last_y = 0; ++} ++ ++LinksView::~LinksView() ++{ ++ win->view = NULL; ++ DBG("~LINKSVIEW\n"); ++} ++ ++void LinksView::d_flush() ++{ ++ if (flushing) return; ++ register_bottom_half(do_flush, this->dev); ++ flushing = 1; ++} ++ ++#undef select ++ ++int be_loop_select(int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t) ++{ ++ int v; ++ v = select(n, r, w, e, t); ++ check_bottom_halves(); ++ return v; ++} ++ ++void be_paste_string(struct graphics_device *dev, const char *str) ++{ ++ unsigned char *s = (unsigned char *)str; ++ int c, i; ++ while (s && *s) { ++ GET_UTF_8(s, c); ++ if (dev) dev->keyboard_handler(dev, c, 0); ++ } ++} ++ ++void be_get_event(void *dummy) ++{ ++ BMessage *msg; ++ LinksView *view = NULL; ++ LinksWindow *win = NULL; ++ struct graphics_device *dev; ++ read(rpipe, &msg, sizeof(msg)); ++ DBG("GETE\n"); ++ if (!msg) ++ return; ++ if (msg->FindPointer("linksdev", (void **)&dev) < B_OK) ++ return; ++ if (dev) { ++ view = lv(dev); ++ if (view) ++ win = dynamic_cast(view->Window()); ++ } ++ switch (msg->what) { ++ case B_QUIT_REQUESTED: ++ if (dev) ++ dev->keyboard_handler(dev, KBD_CTRL_C, 0); ++ break; ++ case _UPDATE_: ++ { ++ BRect r; ++ if (msg->FindRect("updateRect", &r) < B_OK) ++ return; ++ struct rect rr; ++ rr.x1 = (int)r.left; ++ rr.x2 = (int)r.right + 1; ++ rr.y1 = (int)r.top; ++ rr.y2 = (int)r.bottom + 1; ++ /*DBG("paint: %d %d %d %d\n", rr.x1, rr.x2, rr.y1, rr.y2);*/ ++ if (dev) { ++ if (!win->resized) dev->redraw_handler(dev, &rr); ++ else { ++ be_get_size(dev); ++ win->resized = 0; ++ dev->resize_handler(dev); ++ } ++ } ++ check_bottom_halves(); ++ } ++ break; ++ case B_MOUSE_DOWN: ++ { ++ BPoint where; ++ int32 buttons; ++ int btn = BTN_LEFT; ++ if (msg->FindInt32("buttons", &buttons) != B_OK) ++ return; ++ if (msg->FindPoint("where", &where) != B_OK) ++ return; ++ if (buttons & B_PRIMARY_MOUSE_BUTTON) ++ btn = BTN_LEFT; ++ else if (buttons & B_SECONDARY_MOUSE_BUTTON) ++ btn = BTN_RIGHT; ++ else if (buttons & B_TERTIARY_MOUSE_BUTTON) ++ btn = BTN_MIDDLE; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 1)) ++ btn = BTN_FOURTH; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 2)) ++ btn = BTN_FIFTH; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 3)) ++ btn = BTN_SIXTH; ++ if (dev) dev->mouse_handler(dev, view->last_x = (int)where.x, view->last_y = (int)where.y, BTN_DOWN | btn); ++ } ++ break; ++ case B_MOUSE_UP: ++ { ++ BPoint where; ++ int32 buttons; ++ int btn = BTN_LEFT; ++ if (msg->FindInt32("buttons", &buttons) != B_OK) ++ return; ++ if (msg->FindPoint("where", &where) != B_OK) ++ return; ++ if (buttons & ~B_PRIMARY_MOUSE_BUTTON == 0) ++ btn = BTN_LEFT; ++ else if (buttons & ~B_SECONDARY_MOUSE_BUTTON == 0) ++ btn = BTN_RIGHT; ++ else if (buttons & ~B_TERTIARY_MOUSE_BUTTON == 0) ++ btn = BTN_MIDDLE; ++ else if (buttons & ~(B_TERTIARY_MOUSE_BUTTON << 1) == 0) ++ btn = BTN_FOURTH; ++ else if (buttons & ~(B_TERTIARY_MOUSE_BUTTON << 2) == 0) ++ btn = BTN_FIFTH; ++ else if (buttons & ~(B_TERTIARY_MOUSE_BUTTON << 3) == 0) ++ btn = BTN_SIXTH; ++ if (dev) dev->mouse_handler(dev, view->last_x = (int)where.x, view->last_y = (int)where.y, BTN_UP | btn); ++ } ++ break; ++ case B_MOUSE_MOVED: ++ { ++ BPoint where; ++ int32 buttons; ++ int btn = BTN_LEFT; ++ if (msg->FindInt32("buttons", &buttons) != B_OK) ++ return; ++ if (msg->FindPoint("where", &where) != B_OK) ++ return; ++ if (buttons & B_PRIMARY_MOUSE_BUTTON) ++ btn = BTN_LEFT; ++ else if (buttons & B_SECONDARY_MOUSE_BUTTON) ++ btn = BTN_RIGHT; ++ else if (buttons & B_TERTIARY_MOUSE_BUTTON) ++ btn = BTN_MIDDLE; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 1)) ++ btn = BTN_FOURTH; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 2)) ++ btn = BTN_FIFTH; ++ else if (buttons & (B_TERTIARY_MOUSE_BUTTON << 3)) ++ btn = BTN_SIXTH; ++ if (dev) dev->mouse_handler(dev, view->last_x = (int)where.x, view->last_y = (int)where.y, !buttons ? BTN_MOVE : BTN_DRAG | btn); ++ } ++ break; ++ case B_KEY_DOWN: ++ { ++ int32 modifiers; ++ int32 numBytes; ++ const char *bytes; ++ int c; ++ int mods = 0; ++ if (msg->FindInt32("modifiers", &modifiers) != B_OK) ++ return; ++ if (msg->FindString("bytes", &bytes) != B_OK) ++ return; ++ unsigned char buf[4] = { 0, 0, 0, 0 }; ++ unsigned char *ss; ++ if (modifiers & (B_LEFT_CONTROL_KEY | B_RIGHT_CONTROL_KEY | B_LEFT_COMMAND_KEY | B_RIGHT_COMMAND_KEY)) { ++ int32 raw; ++ if (msg->FindInt32("raw_char", &raw) != B_OK) ++ return; ++ buf[0] = (unsigned char)raw; ++ ss = buf; ++ } else ++ ss = (unsigned char *)bytes; ++ ++ GET_UTF_8(ss, c); ++ switch (c) { ++ case B_BACKSPACE: c = KBD_BS; break; ++ case B_ENTER: c = KBD_ENTER; break; ++ case B_SPACE: c = ' '; break; ++ case B_TAB: c = KBD_TAB; break; ++ case B_ESCAPE: c = KBD_ESC; break; ++ case B_LEFT_ARROW: c = KBD_LEFT; break; ++ case B_RIGHT_ARROW: c = KBD_RIGHT; break; ++ case B_UP_ARROW: c = KBD_UP; break; ++ case B_DOWN_ARROW: c = KBD_DOWN; break; ++ case B_INSERT: c = KBD_INS; break; ++ case B_DELETE: c = KBD_DEL; break; ++ case B_HOME: c = KBD_HOME; break; ++ case B_END: c = KBD_END; break; ++ case B_PAGE_UP: c = KBD_PAGE_UP; break; ++ case B_PAGE_DOWN: c = KBD_PAGE_DOWN; break; ++ default: if (c < 32) c = 0; ++ else modifiers &= ~(B_LEFT_SHIFT_KEY|B_RIGHT_SHIFT_KEY); ++ break; ++ } ++ if (modifiers & (B_LEFT_SHIFT_KEY|B_RIGHT_SHIFT_KEY)) ++ mods |= KBD_SHIFT; ++ if (modifiers & (B_LEFT_CONTROL_KEY|B_RIGHT_CONTROL_KEY)) ++ mods |= KBD_CTRL; ++ if (modifiers & (B_LEFT_COMMAND_KEY|B_RIGHT_COMMAND_KEY)) ++ mods |= KBD_ALT; ++ if (c) if (dev) dev->keyboard_handler(dev, c, mods); ++ } ++ break; ++ case B_MOUSE_WHEEL_CHANGED: ++ { ++ float delta_x, delta_y; ++ if (msg->FindFloat("be:wheel_delta_x", &delta_x) != B_OK) ++ delta_x = 0; ++ if (msg->FindFloat("be:wheel_delta_y", &delta_y) != B_OK) ++ delta_y = 0; ++ if (delta_y) if (dev) dev->mouse_handler(dev, view->last_x, view->last_y, BTN_MOVE | (delta_y > 0 ? BTN_WHEELDOWN : BTN_WHEELUP)); ++ if (delta_x) if (dev) dev->mouse_handler(dev, view->last_x, view->last_y, BTN_MOVE | (delta_x < 0 ? BTN_WHEELLEFT : BTN_WHEELRIGHT)); ++ } ++ break; ++ case B_PASTE: ++ if (be_clipboard->Lock()) { ++ BMessage *data = be_clipboard->Data(); ++ if (data) { ++ const char *text_plain; ++ ssize_t len; ++ //data->PrintToStream(); ++ if (data->FindData("text/plain", B_MIME_TYPE, (const void **)&text_plain, &len) == B_OK) { ++ be_paste_string(dev, text_plain); ++ } ++ } ++ be_clipboard->Unlock(); ++ } ++ break; ++ case B_REFS_RECEIVED: ++ if (dev) ++ be_paste_string(dev, "\033\ng"); ++ /* FALLTHROUGH */ ++ case B_SIMPLE_DATA: ++ { ++ /* something got dropped */ ++ entry_ref ref; ++ const char *text_plain; ++ ssize_t len; ++ //msg->PrintToStream(); ++ /* try find a file path to paste */ ++ if (msg->FindRef("refs", &ref) == B_OK) { ++ BPath path(&ref); ++ if (path.InitCheck() == B_OK) { ++ BFile f(path.Path(), B_READ_ONLY); ++ BString url; ++ if (f.InitCheck() == B_OK && f.ReadAttrString("META:url", &url) >= B_OK) { ++ be_paste_string(dev, url.String()); ++ } else ++ be_paste_string(dev, path.Path()); ++ } ++ } else if (msg->FindData("text/plain", B_MIME_TYPE, (const void **)&text_plain, &len) == B_OK) { ++ be_paste_string(dev, text_plain); ++ } ++ } ++ break; ++ default: ++ msg->PrintToStream(); ++ break; ++ } ++ delete msg; ++} ++ ++void be_get_size(struct graphics_device *dev) ++{ ++ BRect r; ++ lock_dev(dev); ++ r = lv(dev)->Bounds(); ++ unlock_dev(dev); ++ dev->size.x1 = dev->size.y1 = 0; ++ dev->size.x2 = (int)r.Width() + 1; ++ dev->size.y2 = (int)r.Height() + 1; ++} ++ ++void LinksView::Draw(BRect r) ++{ ++ detach_message(dev); ++ current->AddRect("updateRect", r); ++ pipe_message(dev); ++} ++ ++ ++void LinksView::MouseDown(BPoint p) ++{ ++ detach_and_pipe_message(dev); ++} ++ ++void LinksView::MouseUp(BPoint p) ++{ ++ detach_and_pipe_message(dev); ++} ++ ++void LinksView::MouseMoved(BPoint p, uint32 transit, const BMessage *dragmsg) ++{ ++ detach_and_pipe_message(dev); ++} ++ ++void LinksView::MessageReceived(BMessage *msg) ++{ ++ switch (msg->what) { ++ case B_REFS_RECEIVED: ++ case B_MOUSE_WHEEL_CHANGED: ++ case B_PASTE: ++ case B_SIMPLE_DATA: ++ detach_and_pipe_message(dev); ++ break; ++ default: ++ BView::MessageReceived(msg); ++ } ++} ++ ++void LinksView::KeyDown(const char *s, int32 numBytes) ++{ ++ detach_and_pipe_message(dev); ++} ++ ++unsigned char *be_get_driver_param(void) ++{ ++ return NULL; ++} ++ ++int32 be_app_thread(void *p) ++{ ++ be_links_app->Lock(); ++ be_links_app->Run(); ++ delete be_links_app; ++ return 0; ++} ++ ++unsigned char *be_init_driver(unsigned char *param, unsigned char *display) ++{ ++ be_links_app = new LinksApplication(); ++ if (!be_links_app) { ++ return stracpy((unsigned char *)"Unable to allocate Application object.\n"); ++ } ++ if (c_pipe(msg_pipe)) { ++ delete be_links_app; ++ return stracpy((unsigned char *)"Could not create pipe.\n"); ++ } ++ fcntl(rpipe, F_SETFL, O_NONBLOCK); ++ fcntl(wpipe, F_SETFL, O_NONBLOCK); ++ set_handlers(rpipe, be_get_event, NULL, NULL, NULL); ++ be_app_thread_id = spawn_thread(be_app_thread, "links_app", B_NORMAL_PRIORITY, NULL); ++ resume_thread(be_app_thread_id); ++ be_links_app->Unlock(); ++ be_cs_desktop = B_NO_COLOR_SPACE; ++ be_x_size = 640; ++ be_y_size = 480; ++ BScreen d; ++ if (d.IsValid()) { ++ be_cs_desktop = d.ColorSpace(); ++ be_x_size = (int)d.Frame().Width() + 1; ++ be_y_size = (int)d.Frame().Height() + 1; ++ } ++ be_win_y_size = be_y_size * 9 / 10; ++ be_win_x_size = be_win_y_size; ++ /* ++ DBG("%d %d\n", be_x_size, be_y_size); ++ DBG("%d %d\n", be_win_x_size, be_win_y_size); ++ */ ++ be_win_y_pos = (be_y_size - be_win_y_size) / 2; ++ be_win_x_pos = be_x_size - be_win_x_size - be_win_y_pos; ++ if (/*be_cs_desktop == B_RGB32 ||*/ be_cs_desktop == B_RGB24 || be_cs_desktop == B_RGB16 || be_cs_desktop == B_RGB15) ++ be_cs_bmp = be_cs_desktop; ++ else if (be_cs_desktop == B_RGB32 || be_cs_desktop == B_RGBA32) be_cs_bmp = B_RGB24; ++ else be_cs_bmp = B_RGB15; ++ be_cs_bmp = B_RGB16; // XXX: DEBUG ++ switch (be_cs_bmp) { ++ case B_RGB24: ++ beos_driver.depth = 0xc3; ++ break; ++ case B_RGB16: ++ beos_driver.depth = 0x82; ++ break; ++ case B_RGB15: ++ beos_driver.depth = 0x7a; ++ break; ++ default: ++ internal((unsigned char *)"unknown depth"); ++ } ++ return NULL; ++} ++ ++void be_shutdown_driver() ++{ ++ status_t ret; ++ //debug((unsigned char *)"D"); ++ close(rpipe); ++ close(wpipe); ++ set_handlers(rpipe, NULL, NULL, NULL, NULL); ++ //debug((unsigned char *)"DD"); ++ be_links_app->PostMessage(B_QUIT_REQUESTED); ++ //debug((unsigned char *)"E"); ++ wait_for_thread(be_app_thread_id, &ret); ++ //debug((unsigned char *)"F"); ++} ++ ++struct graphics_device *be_init_device() ++{ ++ LinksView *view; ++ LinksWindow *win; ++ struct graphics_device *dev = (struct graphics_device *)mem_calloc(sizeof(struct graphics_device)); ++ if (!dev) return NULL; ++ dev->drv = &beos_driver; ++ //debug((unsigned char *)"1"); ++ win = new LinksWindow(BRect(be_win_x_pos, be_win_y_pos, be_win_x_pos + be_win_x_size, be_win_y_pos + be_win_y_size)); ++ //debug((unsigned char *)"2"); ++ if (!win) { ++ mem_free(dev); ++ return NULL; ++ } ++ //debug((unsigned char *)"3"); ++ view = new LinksView(win); ++ if (!view) { ++ delete win; ++ mem_free(dev); ++ return NULL; ++ } ++ view->dev = dev; ++ dev->driver_data = view; ++ be_get_size(dev); ++ memcpy(&dev->clip, &dev->size, sizeof(struct rect)); ++ //debug((unsigned char *)"4"); ++ win->Show(); ++ win->Lock(); ++ view->MakeFocus(); ++ win->Unlock(); ++ //debug((unsigned char *)"5"); ++ if (initial_refs_msg) { ++ BMessenger msgr(win); ++ if (msgr.IsValid()) { ++ msgr.SendMessage(initial_refs_msg); ++ initial_refs_msg = NULL; ++ } ++ } ++ return dev; ++} ++ ++void be_shutdown_device(struct graphics_device *dev) ++{ ++ LinksWindow *win = lv(dev)->win; ++ unregister_bottom_half(do_flush, dev); ++ lv(dev)->dev = NULL; ++ win->PostMessage(B_QUIT_REQUESTED); ++ mem_free(dev); ++} ++ ++void be_set_title(struct graphics_device *dev, unsigned char *title) ++{ ++ LinksWindow *win = lv(dev)->win; ++ lock_dev(dev); ++ win->SetTitle((const char *)title); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++/* ++int be_get_filled_bitmap(struct bitmap *bmp, long color) ++{ ++ internal((unsigned char *)"nedopsano"); ++ return 0; ++} ++*/ ++ ++int be_get_empty_bitmap(struct bitmap *bmp) ++{ ++ DBG("bmp\n"); ++//DBG("bmp (%d, %d) cs %08x\n", bmp->x, bmp->y, be_cs_bmp); ++ BRect r(0, 0, bmp->x - 1, bmp->y - 1); ++ BBitmap *b = new BBitmap(r, /*B_RGB32*/be_cs_bmp); ++ if (!b) { ++ bmp->data = NULL; ++DBG("%s: error 1\n", __FUNCTION__); ++ return 0; ++ } ++ if (!b->IsValid()) { ++ bmp->data = NULL; ++ delete b; ++DBG("%s: error 2\n", __FUNCTION__); ++ return 0; ++ } ++ if (b->LockBits() < B_OK) { ++ bmp->data = NULL; ++ delete b; ++DBG("%s: error 3\n", __FUNCTION__); ++ return 0; ++ } ++ bmp->data = b->Bits(); ++ bmp->skip = b->BytesPerRow(); ++ bmp->flags = b; ++//DBG("bmp: data %p, skip %d, flags %p\n", bmp->data, bmp->skip, bmp->flags); ++ return 0; ++} ++ ++void be_register_bitmap(struct bitmap *bmp) ++{ ++ BBitmap *b = (BBitmap *)bmp->flags; ++ b->UnlockBits(); ++} ++ ++void *be_prepare_strip(struct bitmap *bmp, int top, int lines) ++{ ++ DBG("preps\n"); ++ BBitmap *b = (BBitmap *)bmp->flags; ++ if (b->LockBits() < B_OK) ++ return NULL; ++ bmp->data = b->Bits(); ++ bmp->skip = b->BytesPerRow(); ++ return ((char *)bmp->data) + bmp->skip * top; ++} ++ ++void be_commit_strip(struct bitmap *bmp, int top, int lines) ++{ ++ BBitmap *b = (BBitmap *)bmp->flags; ++ b->UnlockBits(); ++} ++ ++void be_unregister_bitmap(struct bitmap *bmp) ++{ ++ DBG("unb\n"); ++ BBitmap *b = (BBitmap *)bmp->flags; ++ delete b; ++} ++ ++void be_draw_bitmap(struct graphics_device *dev, struct bitmap *bmp, int x, int y) ++{ ++ DBG("drawb\n"); ++ BBitmap *b = (BBitmap *)bmp->flags; ++ lock_dev(dev); ++ lv(dev)->DrawBitmap(b, b->Bounds(), BRect(x, y, x + bmp->x - 1, y + bmp->y - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++void be_draw_bitmaps(struct graphics_device *dev, struct bitmap **bmp, int n, int x, int y) ++{ ++ LinksView *lvv = lv(dev); ++ lock_dev(dev); ++ while (n--) { ++ BBitmap *b = (BBitmap *)(*bmp)->flags; ++ lvv->DrawBitmap(b, b->Bounds(), BRect(x, y, x + (*bmp)->x, y + (*bmp)->y)); ++ x += (*bmp)->x; ++ bmp++; ++ } ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++long be_get_color(int rgb) ++{ ++ if (small_color) { ++ get_color32(c, rgb); ++ return *(long *)(void *)&c; ++ } else return rgb & 0xffffff; ++} ++ ++void be_fill_area(struct graphics_device *dev, int x1, int y1, int x2, int y2, long color) ++{ ++ DBG("fill\n"); ++ if (x1 >= x2 || y1 >= y2) return; ++ lock_dev(dev); ++ if (small_color) ++ lv(dev)->SetHighColor(*(rgb_color *)(void *)&color); ++ else ++ lv(dev)->SetHighColor(get_color32(, color)); ++ lv(dev)->FillRect(BRect(x1, y1, x2 - 1, y2 - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++void be_draw_hline(struct graphics_device *dev, int x1, int y, int x2, long color) ++{ ++ DBG("hline\n"); ++ if (x1 >= x2) return; ++ lock_dev(dev); ++ if (small_color) ++ lv(dev)->SetHighColor(*(rgb_color *)(void *)&color); ++ else ++ lv(dev)->SetHighColor(get_color32(, color)); ++ lv(dev)->StrokeLine(BPoint(x1, y), BPoint(x2 - 1, y)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++void be_draw_vline(struct graphics_device *dev, int x, int y1, int y2, long color) ++{ ++ DBG("vline\n"); ++ if (y1 >= y2) return; ++ lock_dev(dev); ++ if (small_color) ++ lv(dev)->SetHighColor(*(rgb_color *)(void *)&color); ++ else ++ lv(dev)->SetHighColor(get_color32(, color)); ++ lv(dev)->StrokeLine(BPoint(x, y1), BPoint(x, y2 - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++} ++ ++int be_hscroll(struct graphics_device *dev, struct rect_set **ignore, int sc) ++{ ++ DBG("hscroll\n"); ++ if (dev->clip.x1 >= dev->clip.x2 || dev->clip.y1 >= dev->clip.y2) return 0; ++ if (sc <= dev->clip.x1 - dev->clip.x2) return 1; ++ if (sc >= dev->clip.x2 - dev->clip.x1) return 1; ++ lock_dev0(dev); ++ if (sc > 0) lv(dev)->CopyBits(BRect(dev->clip.x1, dev->clip.y1, dev->clip.x2 - sc - 1, dev->clip.y2 - 1), BRect(dev->clip.x1 + sc, dev->clip.y1, dev->clip.x2 - 1, dev->clip.y2 - 1)); ++ else lv(dev)->CopyBits(BRect(dev->clip.x1 - sc, dev->clip.y1, dev->clip.x2 - 1, dev->clip.y2 - 1), BRect(dev->clip.x1, dev->clip.y1, dev->clip.x2 + sc - 1, dev->clip.y2 - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++ return 1; ++} ++ ++int be_vscroll(struct graphics_device *dev, struct rect_set **ignore, int sc) ++{ ++ DBG("vscroll\n"); ++ if (!sc || dev->clip.x1 >= dev->clip.x2 || dev->clip.y1 >= dev->clip.y2) return 0; ++ if (sc <= dev->clip.y1 - dev->clip.y2) return 1; ++ if (sc >= dev->clip.y2 - dev->clip.y1) return 1; ++ lock_dev0(dev); ++ if (sc > 0) lv(dev)->CopyBits(BRect(dev->clip.x1, dev->clip.y1, dev->clip.x2 - 1, dev->clip.y2 - sc - 1), BRect(dev->clip.x1, dev->clip.y1 + sc, dev->clip.x2 - 1, dev->clip.y2 - 1)); ++ else lv(dev)->CopyBits(BRect(dev->clip.x1, dev->clip.y1 - sc, dev->clip.x2 - 1, dev->clip.y2 - 1), BRect(dev->clip.x1, dev->clip.y1, dev->clip.x2 - 1, dev->clip.y2 + sc - 1)); ++ lv(dev)->d_flush(); ++ unlock_dev(dev); ++ return 1; ++} ++ ++void be_set_clip_area(struct graphics_device *dev, struct rect *r) ++{ ++ DBG("setc\n"); ++ memcpy(&dev->clip, r, sizeof(struct rect)); ++ lock_dev(dev); ++ BRegion clip(BRect(r->x1, r->y1, r->x2 - 1, r->y2 - 1)); ++ lv(dev)->ConstrainClippingRegion(&clip); ++ unlock_dev(dev); ++} ++ ++struct graphics_driver beos_driver = { ++ (unsigned char *)"beos", ++ be_init_driver, ++ be_init_device, ++ be_shutdown_device, ++ be_shutdown_driver, ++ be_get_driver_param, ++ be_get_empty_bitmap, ++ /*be_get_filled_bitmap,*/ ++ be_register_bitmap, ++ be_prepare_strip, ++ be_commit_strip, ++ be_unregister_bitmap, ++ be_draw_bitmap, ++ be_draw_bitmaps, ++ be_get_color, ++ be_fill_area, ++ be_draw_hline, ++ be_draw_vline, ++ be_hscroll, ++ be_vscroll, ++ be_set_clip_area, ++ dummy_block, ++ dummy_unblock, ++ be_set_title, ++ NULL, /* exec */ ++ 0, /* depth */ ++ 0, 0, /* size */ ++ 0, /* flags */ ++ 0, /* codepage */ ++ NULL, /* shell */ ++}; ++ ++#endif /* GRDRV_BEOS */ ++ ++#endif +diff -urN links-2.3pre2-orig/bfu.c links-2.3pre2/bfu.c +--- links-2.3pre2-orig/bfu.c 2011-04-19 15:17:48.000000000 +0000 ++++ links-2.3pre2/bfu.c 2011-05-13 09:04:15.983302144 +0000 +@@ -474,7 +474,7 @@ + draw_to_window(win, (void (*)(struct terminal *, void *))gf_val(display_menu_txt, display_menu_gfx), menu); + break; + case EV_MOUSE: +- if ((ev->b & BM_ACT) == B_MOVE) break; ++ if ((ev->b & BM_ACT) == BTN_MOVE) break; + if (ev->x < menu->x || ev->x >= menu->x+menu->xw || ev->y < menu->y || ev->y >= menu->y+menu->yw) { + int f = 1; + for (w1 = win; (void *)w1 != &win->term->windows; w1 = w1->next) { +@@ -498,7 +498,7 @@ + if (ev->x > m1->x && ev->x < m1->x+m1->xw-1 && ev->y > m1->y && ev->y < m1->y+m1->yw-1) goto del; + f--; + } +- if ((ev->b & BM_ACT) == B_DOWN) goto del; ++ if ((ev->b & BM_ACT) == BTN_DOWN) goto del; + bbb:; + } else { + if (!(ev->x < menu->x || ev->x >= menu->x+menu->xw || ev->y < menu->y + gf_val(1, G_MENU_TOP_BORDER) || ev->y >= menu->y + menu->yw - gf_val(1, G_MENU_TOP_BORDER))) { +@@ -510,7 +510,7 @@ + scroll_menu(menu, 0); + draw_to_window(win, (void (*)(struct terminal *, void *))gf_val(display_menu_txt, display_menu_gfx), menu); + menu_oldview = menu_oldsel = -1; +- if ((ev->b & BM_ACT) == B_UP/* || menu->items[s].in_m*/) select_menu(win->term, menu); ++ if ((ev->b & BM_ACT) == BTN_UP/* || menu->items[s].in_m*/) select_menu(win->term, menu); + } + } + } +@@ -698,8 +698,8 @@ + draw_to_window(win, (void (*)(struct terminal *, void *))display_mainmenu, menu); + break; + case EV_MOUSE: +- if ((ev->b & BM_ACT) == B_MOVE) break; +- if ((ev->b & BM_ACT) == B_DOWN && ev->y >= gf_val(1, G_BFU_FONT_SIZE)) delete_window_ev(win, ev); ++ if ((ev->b & BM_ACT) == BTN_MOVE) break; ++ if ((ev->b & BM_ACT) == BTN_DOWN && ev->y >= gf_val(1, G_BFU_FONT_SIZE)) delete_window_ev(win, ev); + else if (ev->y < gf_val(1, G_BFU_FONT_SIZE)) { + int i; + int p = gf_val(2, G_MAINMENU_LEFT_BORDER); +@@ -710,7 +710,7 @@ + if (ev->x >= o && ev->x < p) { + menu->selected = i; + draw_to_window(win, (void (*)(struct terminal *, void *))display_mainmenu, menu); +- if ((ev->b & BM_ACT) == B_UP || menu->items[s].in_m) select_mainmenu(win->term, menu); ++ if ((ev->b & BM_ACT) == BTN_UP || menu->items[s].in_m) select_mainmenu(win->term, menu); + break; + } + } +@@ -1046,7 +1046,7 @@ + dlg->selected = di - dlg->items; + x_display_dlg_item(dlg, di, 1); + } +- if ((ev->b & BM_ACT) == B_UP) dlg_select_item(dlg, di); ++ if ((ev->b & BM_ACT) == BTN_UP) dlg_select_item(dlg, di); + return 1; + case D_FIELD: + case D_FIELD_PASS: +@@ -1082,7 +1082,7 @@ + dlg->selected = di - dlg->items; + x_display_dlg_item(dlg, di, 1); + } +- if ((ev->b & BM_ACT) == B_UP) dlg_select_item(dlg, di); ++ if ((ev->b & BM_ACT) == BTN_UP) dlg_select_item(dlg, di); + return 1; + } + return 0; +@@ -1221,9 +1221,9 @@ + draw_to_window(dlg->win, (void (*)(struct terminal *, void *))redraw_dialog, dlg); + break; + case EV_MOUSE: +- if ((ev->b & BM_ACT) == B_MOVE) break; ++ if ((ev->b & BM_ACT) == BTN_MOVE) break; + for (i = 0; i < dlg->n; i++) if (dlg_mouse(dlg, &dlg->items[i], ev)) break; +- if ((ev->b & BM_ACT) == B_DOWN && (ev->b & BM_BUTT) == B_MIDDLE) { ++ if ((ev->b & BM_ACT) == BTN_DOWN && (ev->b & BM_BUTT) == BTN_MIDDLE) { + di = &dlg->items[dlg->selected]; /* don't delete this!!! it's here because of jump from mouse event */ + if (di->item->type == D_FIELD || di->item->type == D_FIELD_PASS) goto clipbd_paste; + } +@@ -1409,9 +1409,9 @@ + } + } + if (ev->x == KBD_ENTER) for (i = 0; i < dlg->n; i++) +- if (dlg->dlg->items[i].type == D_BUTTON && dlg->dlg->items[i].gid & B_ENTER) goto sel; ++ if (dlg->dlg->items[i].type == D_BUTTON && dlg->dlg->items[i].gid & BTN_ENTER) goto sel; + if (ev->x == KBD_ESC) for (i = 0; i < dlg->n; i++) +- if (dlg->dlg->items[i].type == D_BUTTON && dlg->dlg->items[i].gid & B_ESC) goto sel; ++ if (dlg->dlg->items[i].type == D_BUTTON && dlg->dlg->items[i].gid & BTN_ESC) goto sel; + if (((ev->x == KBD_TAB && !ev->y) || ev->x == KBD_DOWN || ev->x == KBD_RIGHT) && (dlg->n > 1 || term->spec->braille)) { + if (term->spec->braille) dlg->brl_y = dlg->items[0].y - 3; + x_display_dlg_item(dlg, &dlg->items[dlg->selected], 0); +@@ -1447,11 +1447,11 @@ + unsigned char *end; + double d = strtod(di->cdata, (char **)(void *)&end); + if (!*di->cdata || *end) { +- msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_EXPECTED), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_EXPECTED), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return 1; + } + if (100*d < di->item->gid || 100*d > di->item->gnum) { +- msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_OUT_OF_RANGE), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_OUT_OF_RANGE), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return 1; + } + return 0; +@@ -1462,11 +1462,11 @@ + unsigned char *end; + long l = strtol(di->cdata, (char **)(void *)&end, 10); + if (!*di->cdata || *end) { +- msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_EXPECTED), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_EXPECTED), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return 1; + } + if (l < di->item->gid || l > di->item->gnum) { +- msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_OUT_OF_RANGE), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_OUT_OF_RANGE), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return 1; + } + return 0; +@@ -1477,11 +1477,11 @@ + unsigned char *end; + long l = strtol(di->cdata, (char **)(void *)&end, 16); + if (!*di->cdata || *end) { +- msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_EXPECTED), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_EXPECTED), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return 1; + } + if (l < di->item->gid || l > di->item->gnum) { +- msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_OUT_OF_RANGE), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(dlg->win->term, NULL, TEXT(T_BAD_NUMBER), AL_CENTER, TEXT(T_NUMBER_OUT_OF_RANGE), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return 1; + } + return 0; +@@ -1491,7 +1491,7 @@ + { + unsigned char *p; + for (p = di->cdata; *p; p++) if (*p > ' ') return 0; +- msg_box(dlg->win->term, NULL, TEXT(T_BAD_STRING), AL_CENTER, TEXT(T_EMPTY_STRING_NOT_ALLOWED), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(dlg->win->term, NULL, TEXT(T_BAD_STRING), AL_CENTER, TEXT(T_EMPTY_STRING_NOT_ALLOWED), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return 1; + } + +@@ -2283,7 +2283,7 @@ + va_start(va, check); + for (i = 1; i <= n; i++) { + dlg->items[i].type = D_BUTTON; +- dlg->items[i].gid = i == 1 ? B_ENTER : i == n ? B_ESC : 0; ++ dlg->items[i].gid = i == 1 ? BTN_ENTER : i == n ? BTN_ESC : 0; + dlg->items[i].fn = i != n || n == 1 ? input_field_ok : input_field_cancel; + dlg->items[i].dlen = 0; + dlg->items[i].text = va_arg(va, unsigned char *); +diff -urN links-2.3pre2-orig/block.c links-2.3pre2/block.c +--- links-2.3pre2-orig/block.c 2011-04-19 15:17:48.000000000 +0000 ++++ links-2.3pre2/block.c 2011-05-13 09:04:16.001310720 +0000 +@@ -222,11 +222,11 @@ + d->items[0].data = url; + d->items[0].fn = check_nonempty; + d->items[1].type = D_BUTTON; +- d->items[1].gid = B_ENTER; ++ d->items[1].gid = BTN_ENTER; + d->items[1].fn = ok_dialog; + d->items[1].text = TEXT(T_OK); + d->items[2].type = D_BUTTON; +- d->items[2].gid = B_ESC; ++ d->items[2].gid = BTN_ESC; + d->items[2].text = TEXT(T_CANCEL); + d->items[2].fn = cancel_dialog; + d->items[3].type = D_END; +diff -urN links-2.3pre2-orig/bookmarks.c links-2.3pre2/bookmarks.c +--- links-2.3pre2-orig/bookmarks.c 2011-04-19 15:17:48.000000000 +0000 ++++ links-2.3pre2/bookmarks.c 2011-05-13 09:04:16.036438016 +0000 +@@ -370,12 +370,12 @@ + } + + d->items[a+1].type = D_BUTTON; +- d->items[a+1].gid = B_ENTER; ++ d->items[a+1].gid = BTN_ENTER; + d->items[a+1].fn = ok_dialog; + d->items[a+1].text = TEXT(T_OK); + + d->items[a+2].type = D_BUTTON; +- d->items[a+2].gid = B_ESC; ++ d->items[a+2].gid = BTN_ESC; + d->items[a+2].text = TEXT(T_CANCEL); + d->items[a+2].fn = cancel_dialog; + +diff -urN links-2.3pre2-orig/cfg.h links-2.3pre2/cfg.h +--- links-2.3pre2-orig/cfg.h 2002-05-07 10:13:18.000000000 +0000 ++++ links-2.3pre2/cfg.h 2011-05-13 09:33:41.000000000 +0000 +@@ -16,7 +16,7 @@ + /* no one will probably ever port svgalib on atheos or beos or port atheos + interface to beos, but anyway: make sure they don't clash */ + +-#ifdef __BEOS__ ++#if defined __BEOS__ || defined __HAIKU__ + #ifdef GRDRV_SVGALIB + #undef GRDRV_SVGALIB + #endif +diff -urN links-2.3pre2-orig/configure.in links-2.3pre2/configure.in +--- links-2.3pre2-orig/configure.in 2011-04-19 15:30:57.000000000 +0000 ++++ links-2.3pre2/configure.in 2011-05-13 09:04:16.068681728 +0000 +@@ -18,7 +18,7 @@ + dnl Checks for programs. + AC_PROG_CC + +-#AC_PROG_CXX ++AC_PROG_CXX + #AC_PROG_AWK + #AM_PROG_LEX + #AC_PROG_YACC +@@ -33,6 +33,7 @@ + + dnl Check for libraries + ++AC_SEARCH_LIBS(socket, socket network) + AC_CACHE_CHECK([for EMX], ac_cv_have_emx, + AC_TRY_COMPILE(, [#ifndef __EMX__ + kill me! +@@ -220,7 +221,10 @@ + if test "$ac_cv_lib_socket_gethostbyname" = no; then + AC_CHECK_LIB(nsl, gethostbyname) + if test "$ac_cv_lib_nsl_gethostbyname" = no; then +- AC_ERROR([gethostbyname function not present]) ++ AC_CHECK_LIB(bind, gethostbyname) ++ if test "$ac_cv_lib_bind_gethostbyname" = no; then ++ AC_ERROR([gethostbyname function not present]) ++ fi + fi + fi + fi +@@ -329,6 +333,7 @@ + fi + #AC_CHECK_FUNC(clone, AC_DEFINE(HAVE_CLONE)) + AC_CHECK_HEADERS(atheos/threads.h) ++AC_CHECK_HEADERS(kernel/OS.h) + AC_HAVE_FUNCS(spawn_thread) + AC_HAVE_FUNCS(resume_thread) + +@@ -458,6 +463,7 @@ + + + cf_have_atheos=no ++cf_have_beos=no + + if test "$cf_use_graphics" != no; then + AC_DEFINE(G) +@@ -469,6 +475,7 @@ + dnl AC_ARG_WITH(sdl, [ --without-sdl compile without SDL graphics driver],[if test "$withval" = no; then disable_sdl=yes; else disable_sdl=no; fi]) + AC_ARG_WITH(pmshell, [ --without-pmshell compile without PMShell graphics driver],[if test "$withval" = no; then disable_pmshell=yes; else disable_pmshell=no; fi]) + AC_ARG_WITH(atheos, [ --without-atheos compile without Atheos graphics driver],[if test "$withval" = no; then disable_atheos=yes; else disable_atheos; fi]) ++AC_ARG_WITH(beos, [ --without-beos compile without BeOS/Haiku graphics driver],[if test "$withval" = no; then disable_beos=yes; else disable_beos; fi]) + + drivers="" + +@@ -604,6 +611,31 @@ + fi + fi + ++if test "$disable_beos" != yes ; then ++ old_ext="$ac_ext" ++ ac_ext=cpp ++ AC_CHECK_HEADERS(interface/View.h) ++ AC_CHECK_HEADERS(interface/Window.h) ++ AC_CHECK_HEADERS(interface/Screen.h) ++ AC_CHECK_HEADERS(interface/Bitmap.h) ++ AC_CHECK_HEADERS(support/Locker.h) ++ AC_CHECK_HEADERS(app/Application.h) ++ ac_ext="$old_ext" ++ ++ if test "$ac_cv_header_kernel_OS_h" = yes && ++ test "$ac_cv_header_interface_View_h" = yes && ++ test "$ac_cv_header_interface_Window_h" = yes && ++ test "$ac_cv_header_interface_Screen_h" = yes && ++ test "$ac_cv_header_interface_Bitmap_h" = yes && ++ test "$ac_cv_header_support_Locker_h" = yes && ++ test "$ac_cv_header_app_Application_h" = yes; then ++ AC_PROG_CXX ++ AC_DEFINE(GRDRV_BEOS) ++ drivers="$drivers BEOS" ++ cf_have_beos=yes ++ fi ++fi ++ + AC_CHECK_LIB(z, inflate) + PKG_CHECK_MODULES(LIBPNG,libpng >= 1.0.0,pkgconfig_libpng=yes,pkgconfig_libpng=no) + if test "$pkgconfig_libpng" = "yes"; then +@@ -681,6 +713,7 @@ + + + AM_CONDITIONAL(ATHEOS_GR, test "$cf_have_atheos" = yes) ++AM_CONDITIONAL(BEOS_GR, test "$cf_have_beos" = yes) + + test "$ac_cv_have_emx" = yes && LDFLAGS="$LDFLAGS -Zexe" + +diff -urN links-2.3pre2-orig/default.c links-2.3pre2/default.c +--- links-2.3pre2-orig/default.c 2011-04-19 15:17:48.000000000 +0000 ++++ links-2.3pre2/default.c 2011-05-13 09:04:16.099876864 +0000 +@@ -449,7 +449,7 @@ + } + add_to_strn(&config_file, name); + if ((err = write_to_config_file(config_file, c))) { +- if (term) msg_box(term, NULL, TEXT(T_CONFIG_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_UNABLE_TO_WRITE_TO_CONFIG_FILE), ": ", get_err_msg(-err), NULL, NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ if (term) msg_box(term, NULL, TEXT(T_CONFIG_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_UNABLE_TO_WRITE_TO_CONFIG_FILE), ": ", get_err_msg(-err), NULL, NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + mem_free(c); + mem_free(config_file); + return -1; +diff -urN links-2.3pre2-orig/directfb.c links-2.3pre2/directfb.c +--- links-2.3pre2-orig/directfb.c 2008-06-10 20:53:29.000000000 +0000 ++++ links-2.3pre2/directfb.c 2011-05-13 09:04:16.108527616 +0000 +@@ -652,25 +652,25 @@ + + if (event.type == DWET_BUTTONUP) + { +- flags = B_UP; ++ flags = BTN_UP; + data->window->UngrabPointer (data->window); + } + else + { +- flags = B_DOWN; ++ flags = BTN_DOWN; + data->window->GrabPointer (data->window); + } + + switch (event.button) + { + case DIBI_LEFT: +- flags |= B_LEFT; ++ flags |= BTN_LEFT; + break; + case DIBI_RIGHT: +- flags |= B_RIGHT; ++ flags |= BTN_RIGHT; + break; + case DIBI_MIDDLE: +- flags |= B_MIDDLE; ++ flags |= BTN_MIDDLE; + break; + default: + continue; +@@ -682,8 +682,8 @@ + + case DWET_WHEEL: + gd->mouse_handler (gd, event.x, event.y, +- B_MOVE | +- (event.step > 0 ? B_WHEELUP : B_WHEELDOWN)); ++ BTN_MOVE | ++ (event.step > 0 ? BTN_WHEELUP : BTN_WHEELDOWN)); + break; + + case DWET_MOTION: +@@ -698,16 +698,16 @@ + switch (event.buttons) + { + case DIBM_LEFT: +- flags = B_DRAG | B_LEFT; ++ flags = BTN_DRAG | BTN_LEFT; + break; + case DIBM_RIGHT: +- flags = B_DRAG | B_RIGHT; ++ flags = BTN_DRAG | BTN_RIGHT; + break; + case DIBM_MIDDLE: +- flags = B_DRAG | B_MIDDLE; ++ flags = BTN_DRAG | BTN_MIDDLE; + break; + default: +- flags = B_MOVE; ++ flags = BTN_MOVE; + break; + } + +diff -urN links-2.3pre2-orig/drivers.c links-2.3pre2/drivers.c +--- links-2.3pre2-orig/drivers.c 2011-04-19 15:17:48.000000000 +0000 ++++ links-2.3pre2/drivers.c 2011-05-13 09:04:16.130285568 +0000 +@@ -31,6 +31,9 @@ + #ifdef GRDRV_ATHEOS + extern struct graphics_driver atheos_driver; + #endif ++#ifdef GRDRV_BEOS ++extern struct graphics_driver beos_driver; ++#endif + #ifdef GRDRV_SDL + extern struct graphics_driver sdl_driver; + #endif +@@ -48,6 +51,9 @@ + #ifdef GRDRV_ATHEOS + &atheos_driver, + #endif ++#ifdef GRDRV_BEOS ++ &beos_driver, ++#endif + #ifndef SPAD + #ifdef GRDRV_X + &x_driver, +diff -urN links-2.3pre2-orig/framebuffer.c links-2.3pre2/framebuffer.c +--- links-2.3pre2-orig/framebuffer.c 2011-04-19 15:17:49.000000000 +0000 ++++ links-2.3pre2/framebuffer.c 2011-05-13 09:04:16.148897792 +0000 +@@ -383,7 +383,7 @@ + if (mouse_y < 0) mouse_y = 0; + ev.x = mouse_x; + ev.y = mouse_y; +- ev.b = B_MOVE; ++ ev.b = BTN_MOVE; + if (!current_virtual_device) return; + if (current_virtual_device->mouse_handler) current_virtual_device->mouse_handler(current_virtual_device, ev.x, ev.y, ev.b); + redraw_mouse(); +@@ -1018,26 +1018,26 @@ + + ev.x = mouse_x; + ev.y = mouse_y; +- if (gev.buttons & GPM_B_LEFT) ev.b = B_LEFT; +- else if (gev.buttons & GPM_B_MIDDLE) ev.b = B_MIDDLE; +- else if (gev.buttons & GPM_B_RIGHT) ev.b = B_RIGHT; ++ if (gev.buttons & GPM_B_LEFT) ev.b = BTN_LEFT; ++ else if (gev.buttons & GPM_B_MIDDLE) ev.b = BTN_MIDDLE; ++ else if (gev.buttons & GPM_B_RIGHT) ev.b = BTN_RIGHT; + else ev.b = 0; +- if (gev.type & GPM_DOWN) ev.b |= B_DOWN; +- else if (gev.type & GPM_UP) ev.b |= B_UP; +- else if (gev.type & GPM_DRAG) ev.b |= B_DRAG; +- else ev.b |= B_MOVE; ++ if (gev.type & GPM_DOWN) ev.b |= BTN_DOWN; ++ else if (gev.type & GPM_UP) ev.b |= BTN_UP; ++ else if (gev.type & GPM_DRAG) ev.b |= BTN_DRAG; ++ else ev.b |= BTN_MOVE; + + #ifndef USE_GPM_DX + if (fb_msetsize < 0) { + } else if (fb_msetsize < 10) { + fb_msetsize++; +- } else if ((ev.b & BM_ACT) == B_MOVE && !(ev.b & BM_BUTT)) { ++ } else if ((ev.b & BM_ACT) == BTN_MOVE && !(ev.b & BM_BUTT)) { + fb_mouse_setsize(); + fb_msetsize = -1; + } + #endif + +- if (((ev.b & BM_ACT) == B_MOVE && !(ev.b & BM_BUTT)) || (ev.b & BM_ACT) == B_DRAG) { ++ if (((ev.b & BM_ACT) == BTN_MOVE && !(ev.b & BM_BUTT)) || (ev.b & BM_ACT) == BTN_DRAG) { + if (can_read(fb_hgpm)) goto again; + } + +diff -urN links-2.3pre2-orig/jsint.c links-2.3pre2/jsint.c +--- links-2.3pre2-orig/jsint.c 2008-08-15 23:37:46.000000000 +0000 ++++ links-2.3pre2/jsint.c 2011-05-13 09:04:16.185860096 +0000 +@@ -1272,8 +1272,8 @@ + txt, /* message */ + jsid, /* data for button functions */ + 3, /* # of buttons */ +- TEXT(T_OK),js_upcall_confirm_ok_pressed,B_ENTER, /* first button */ +- TEXT(T_CANCEL),js_upcall_confirm_cancel_pressed,B_ESC, /* second button */ ++ TEXT(T_OK),js_upcall_confirm_ok_pressed,BTN_ENTER, /* first button */ ++ TEXT(T_CANCEL),js_upcall_confirm_cancel_pressed,BTN_ESC, /* second button */ + TEXT(T_KILL_SCRIPT), js_kill_script_pressed,NULL + ); + +@@ -1342,7 +1342,7 @@ + txt, /* message */ + jsid, /* data for button functions */ + 2, /* # of buttons */ +- TEXT(T_OK),js_upcall_alert_ok_pressed,B_ENTER|B_ESC, ++ TEXT(T_OK),js_upcall_alert_ok_pressed,BTN_ENTER|BTN_ESC, + TEXT(T_KILL_SCRIPT), js_kill_script_pressed,NULL + ); + +@@ -2933,8 +2933,8 @@ + jsid->n?TEXT(T_JS_IS_ATTEMPTING_TO_OPEN_NEW_WINDOW_WITH_URL):TEXT(T_JS_IS_ATTEMPTING_TO_GO_TO_URL), " \"",jsid->string,"\".",NULL, /* message */ + jsid, /* data for button functions */ + 3, /* # of buttons */ +- TEXT(T_ALLOW),js_upcall_goto_url_ok_pressed,B_ENTER, +- TEXT(T_REJECT),js_upcall_goto_url_cancel_pressed,B_ESC, ++ TEXT(T_ALLOW),js_upcall_goto_url_ok_pressed,BTN_ENTER, ++ TEXT(T_REJECT),js_upcall_goto_url_cancel_pressed,BTN_ESC, + TEXT(T_KILL_SCRIPT), js_kill_script_pressed,NULL /* dirty trick: gimme_js_id_string and gimme_js_id begins with the same long */ + ); + js_mem_free(s); +@@ -3089,8 +3089,8 @@ + TEXT(T_JS_IS_ATTEMPTING_TO_GO_INTO_HISTORY), txt, TEXT(T_TO_URL), " \"",url,"\".",NULL, /* message */ + jsid, /* data for button functions */ + 3, /* # of buttons */ +- TEXT(T_ALLOW),js_upcall_goto_history_ok_pressed,B_ENTER, +- TEXT(T_REJECT),js_upcall_goto_url_cancel_pressed,B_ESC, ++ TEXT(T_ALLOW),js_upcall_goto_history_ok_pressed,BTN_ENTER, ++ TEXT(T_REJECT),js_upcall_goto_url_cancel_pressed,BTN_ESC, + TEXT(T_KILL_SCRIPT), js_kill_script_pressed,NULL /* dirty trick: gimme_js_id_string and gimme_js_id begins with the same long */ + ); + js_mem_free(s); +diff -urN links-2.3pre2-orig/kbd.c links-2.3pre2/kbd.c +--- links-2.3pre2-orig/kbd.c 2011-04-19 15:17:49.000000000 +0000 ++++ links-2.3pre2/kbd.c 2011-05-13 09:04:16.190054400 +0000 +@@ -843,10 +843,10 @@ + ev.y = (unsigned char)(itrm->kqueue[el+3]) - ' ' - 1 + ((int)((unsigned char)(itrm->kqueue[el+4]) - ' ' - 1) << 7); + if ( ev.y & (1 << 13)) ev.y = 0; /* ev.y |= ~0 << 14; */ + switch ((itrm->kqueue[el] - ' ') ^ xterm_button) { /* Every event changhes only one bit */ +- case TW_BUTT_LEFT: ev.b = B_LEFT | ( (xterm_button & TW_BUTT_LEFT) ? B_UP : B_DOWN ); break; +- case TW_BUTT_MIDDLE: ev.b = B_MIDDLE | ( (xterm_button & TW_BUTT_MIDDLE) ? B_UP : B_DOWN ); break; +- case TW_BUTT_RIGHT: ev.b = B_RIGHT | ( (xterm_button & TW_BUTT_RIGHT) ? B_UP : B_DOWN ); break; +- case 0: ev.b = B_DRAG; ++ case TW_BUTT_LEFT: ev.b = BTN_LEFT | ( (xterm_button & TW_BUTT_LEFT) ? BTN_UP : BTN_DOWN ); break; ++ case TW_BUTT_MIDDLE: ev.b = BTN_MIDDLE | ( (xterm_button & TW_BUTT_MIDDLE) ? BTN_UP : BTN_DOWN ); break; ++ case TW_BUTT_RIGHT: ev.b = BTN_RIGHT | ( (xterm_button & TW_BUTT_RIGHT) ? BTN_UP : BTN_DOWN ); break; ++ case 0: ev.b = BTN_DRAG; + /* default : Twin protocol error */ + } + xterm_button = itrm->kqueue[el] - ' '; +@@ -854,15 +854,15 @@ + } else { + ev.x = itrm->kqueue[el+1] - ' ' - 1; + ev.y = itrm->kqueue[el+2] - ' ' - 1; +- ev.b = B_DOWN; +- if (itrm->kqueue[el] & 4) ev.b = B_DRAG; +- if ((ev.b |= (itrm->kqueue[el] & BM_BUTT) | B_DOWN) == 3) { +- ev.b = B_UP; ++ ev.b = BTN_DOWN; ++ if (itrm->kqueue[el] & 4) ev.b = BTN_DRAG; ++ if ((ev.b |= (itrm->kqueue[el] & BM_BUTT) | BTN_DOWN) == 3) { ++ ev.b = BTN_UP; + if (xterm_button != -1) ev.b |= xterm_button; + } +- /*if ((itrm->kqueue[el] & 4) && ev.b != B_UP) ev.b |= B_DRAG;*/ ++ /*if ((itrm->kqueue[el] & 4) && ev.b != BTN_UP) ev.b |= BTN_DRAG;*/ + xterm_button = -1; +- if ((ev.b & BM_ACT) == B_DOWN) xterm_button = ev.b & BM_BUTT; ++ if ((ev.b & BM_ACT) == BTN_DOWN) xterm_button = ev.b & BM_BUTT; + el += 3; + } + ev.ev = EV_MOUSE; +diff -urN links-2.3pre2-orig/links-beos.rdef links-2.3pre2/links-beos.rdef +--- links-2.3pre2-orig/links-beos.rdef 1970-01-01 00:00:00.000000000 +0000 ++++ links-2.3pre2/links-beos.rdef 2011-05-13 09:04:16.208928768 +0000 +@@ -0,0 +1,97 @@ ++/* ++** links-beos.rdef ++** ++** Automatically generated by BResourceParser on ++** Thursday, December 13, 2007 at 23:46:45. ++** ++*/ ++ ++resource(1, "BEOS:APP_FLAGS") (#'APPF') $"01000000"; ++ ++resource(1, "BEOS:APP_VERSION") #'APPV' array { ++ $"02000000010000000000000000000000210000006C696E6B7320322E31707265" ++ $"3333000000000000000000000000000000000000000000000000000000000000" ++ $"00000000000000000000000000000000000000004C696E6B732062726F777365" ++ $"7220322E31707265333300000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000" ++}; ++ ++resource(101, "BEOS:L:STD_ICON") #'ICON' array { ++ $"2A2A2A2A2A2A2A2A2A2A2A2A2A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2A2A2A2A2A2A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2B2B2B2B2B2B2B2B2B2B2B2C0000363434343434343434343434343434" ++ $"2A2A2A3200000000000000000000000000363434343434343434343434343434" ++ $"2A2A2A2FF1313200000000000131310000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A30000000002B2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2A2A2A2A2A2A2A2F000000002A2A2C0000363434343434343434343434343434" ++ $"2C2C2C2C2C2C2C30000000002C2C2D0000373636363636363636363636363636" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"0000000000000000000000000000000000000000000000000000000000000000" ++ $"2222222222222226000000002222230000151A1A1A1A1A1A1A1A1A1A1A1A1A1A" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F3F3F3F3F3F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F3F1501113F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F3F0E00133F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F3F0500163F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F1A0000193F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F3F0C00001B3F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F3F190000001E3F3F3F3F" ++ $"20202020202020250000000020202200001A3F3F3F3F1A030000013F3F3F3F3F" ++ $"20202020202020270000000023202200001A3F1E170C00000000043F3F3F3F3F" ++ $"2020202628292900000000000029290000040300000000000000063F3F3F3F3F" ++ $"20202027292929292929292929292900000203030303030303030B3F3F3F3F3F" ++ $"20202020202020202020202020202200001A3F3F3F3F3F3F3F3F3F3F3F3F3F3F" ++ $"20202020202020202020202020202200001A3F3F3F3F3F3F3F3F3F3F3F3F3F3F" ++ $"20202020202020202020202020202200001A3F3F3F3F3F3F3F3F3F3F3F3F3F3F" ++}; ++ ++resource(101, "BEOS:M:STD_ICON") #'MICN' array { ++ $"2A2A2A2A2A2A2A303A34343434343434" ++ $"2A2C3030303030F73A34343434343434" ++ $"2A2B2D300000EB323A34343434343434" ++ $"2A2A2A2C00002A303A34343434343434" ++ $"2A2A2A2C00002A303A34343434343434" ++ $"2A2A2A2C00002A303A34343434343434" ++ $"2A2A2A2C00002A303A34343434343434" ++ $"303030310000F1333D3A3A3A3A3A3A3A" ++ $"2626262700002629050D0D0D0D0D0D0D" ++ $"20202022000020260D3F3F3F1D143F3F" ++ $"20202022000020260D3F3F3F140A3F3F" ++ $"20202022000020260D3F3F3F090D3F3F" ++ $"20202022000020260D3F3F16000F3F3F" ++ $"20222427000026280710090000123F3F" ++ $"202225252525252807111111111A3F3F" ++ $"20202020202020260D3F3F3F3F3F3F3F" ++}; ++ ++resource(1, "BEOS:APP_SIG") (#'MIMS') "application/x-vnd.links"; ++ ++resource(1, "BEOS:FILE_TYPES") message { ++ "types" = "text/html", ++ "types" = "application/x-vnd.Be-bookmark", ++ "types" = "application/x-vnd.Be.URL.http" ++}; ++ +diff -urN links-2.3pre2-orig/links.h links-2.3pre2/links.h +--- links-2.3pre2-orig/links.h 2011-04-19 15:17:49.000000000 +0000 ++++ links-2.3pre2/links.h 2011-05-13 09:04:16.239337472 +0000 +@@ -989,26 +989,26 @@ + /* kbd.c */ + + #define BM_BUTT 15 +-#define B_LEFT 0 +-#define B_MIDDLE 1 +-#define B_RIGHT 2 +-#define B_FOURTH 3 +-#define B_FIFTH 4 +-#define B_SIXTH 5 +-#define B_WHEELUP 8 +-#define B_WHEELDOWN 9 +-#define B_WHEELUP1 10 +-#define B_WHEELDOWN1 11 +-#define B_WHEELLEFT 12 +-#define B_WHEELRIGHT 13 +-#define B_WHEELLEFT1 14 +-#define B_WHEELRIGHT1 15 ++#define BTN_LEFT 0 ++#define BTN_MIDDLE 1 ++#define BTN_RIGHT 2 ++#define BTN_FOURTH 3 ++#define BTN_FIFTH 4 ++#define BTN_SIXTH 5 ++#define BTN_WHEELUP 8 ++#define BTN_WHEELDOWN 9 ++#define BTN_WHEELUP1 10 ++#define BTN_WHEELDOWN1 11 ++#define BTN_WHEELLEFT 12 ++#define BTN_WHEELRIGHT 13 ++#define BTN_WHEELLEFT1 14 ++#define BTN_WHEELRIGHT1 15 + + #define BM_ACT 48 +-#define B_DOWN 0 +-#define B_UP 16 +-#define B_DRAG 32 +-#define B_MOVE 48 ++#define BTN_DOWN 0 ++#define BTN_UP 16 ++#define BTN_DRAG 32 ++#define BTN_MOVE 48 + + #define KBD_ENTER -0x100 + #define KBD_BS -0x101 +@@ -3014,15 +3014,15 @@ + #define D_FIELD_PASS 3 + #define D_BUTTON 4 + +-#define B_ENTER 1 +-#define B_ESC 2 ++#define BTN_ENTER 1 ++#define BTN_ESC 2 + + struct dialog_item_data; + struct dialog_data; + + struct dialog_item { + int type; +- int gid, gnum; /* for buttons: gid - flags B_XXX */ /* for fields: min/max */ /* for box: gid is box height */ ++ int gid, gnum; /* for buttons: gid - flags BTN_XXX */ /* for fields: min/max */ /* for box: gid is box height */ + int (*fn)(struct dialog_data *, struct dialog_item_data *); + struct history *history; + int dlen; +diff -urN links-2.3pre2-orig/listedit.c links-2.3pre2/listedit.c +--- links-2.3pre2-orig/listedit.c 2011-04-19 15:17:49.000000000 +0000 ++++ links-2.3pre2/listedit.c 2011-05-13 09:04:16.272367616 +0000 +@@ -734,7 +734,7 @@ + TEXT(T_NO_ITEMS_SELECTED), /* text */ + NULL, /* data */ + 1, /* # of buttons */ +- TEXT(T_OK),NULL,B_ESC|B_ENTER /* button1 */ ++ TEXT(T_OK),NULL,BTN_ESC|BTN_ENTER /* button1 */ + ); + else + { +@@ -916,8 +916,8 @@ + TEXT(T_FOLDER)," \"",txt,"\" ",TEXT(T_NOT_EMPTY_SURE_DELETE),NULL, /* text */ + narez, /* data for ld->delete_item */ + 2, /* # of buttons */ +- TEXT(T_NO),NULL,B_ESC, /* button1 */ +- TEXT(T_YES),delete_folder_recursively,B_ENTER /* button2 */ ++ TEXT(T_NO),NULL,BTN_ESC, /* button1 */ ++ TEXT(T_YES),delete_folder_recursively,BTN_ENTER /* button2 */ + ); + else + msg_box( +@@ -928,8 +928,8 @@ + TEXT(T_SURE_DELETE)," ",TEXT(T_fOLDER)," \"",txt,"\"?",NULL, /* null-terminated text */ + narez, /* data for ld->delete_item */ + 2, /* # of buttons */ +- TEXT(T_YES),delete_ok,B_ENTER, /* button1 */ +- TEXT(T_NO),NULL,B_ESC /* button2 */ ++ TEXT(T_YES),delete_ok,BTN_ENTER, /* button1 */ ++ TEXT(T_NO),NULL,BTN_ESC /* button2 */ + ); + } + else /* item */ +@@ -941,8 +941,8 @@ + TEXT(T_SURE_DELETE)," ",TEXT(ld->item_description)," \"",txt,"\"?",NULL, /* null-terminated text */ + narez, /* data for ld->delete_item */ + 2, /* # of buttons */ +- TEXT(T_YES),delete_ok,B_ENTER, /* button1 */ +- TEXT(T_NO),NULL,B_ESC /* button2 */ ++ TEXT(T_YES),delete_ok,BTN_ENTER, /* button1 */ ++ TEXT(T_NO),NULL,BTN_ESC /* button2 */ + ); + return 0; + } +@@ -1485,7 +1485,7 @@ + struct session *ses=(struct session *)(dlg->dlg->udata); + struct list* item; + +- if (!ld->search_word) {msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_NO_PREVIOUS_SEARCH), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); return;} ++ if (!ld->search_word) {msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_NO_PREVIOUS_SEARCH), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); return;} + + if ((item=ld->find_item(ld->current_pos,ld->search_word,direction))) + { +@@ -1501,7 +1501,7 @@ + if (!F) if (!ses->term->spec->block_cursor || ses->term->spec->braille) set_cursor(ses->term, dlg->x + DIALOG_LB, dlg->y+DIALOG_TB+ld->win_pos, dlg->x + DIALOG_LB, dlg->y+DIALOG_TB+ld->win_pos); + } + else +- msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_SEARCH_STRING_NOT_FOUND), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_SEARCH_STRING_NOT_FOUND), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + + } + +@@ -1739,7 +1739,7 @@ + + case EV_MOUSE: + /* toggle select item */ +- if ((ev->b&BM_ACT)==B_DOWN&&(ev->b&BM_BUTT)==B_RIGHT) ++ if ((ev->b&BM_ACT)==BTN_DOWN&&(ev->b&BM_BUTT)==BTN_RIGHT) + { + int n,a; + struct list *l=ld->win_offset; +@@ -1771,7 +1771,7 @@ + return EVENT_PROCESSED; + } + /* click on item */ +- if ((ev->b&BM_ACT)==B_DOWN&&(ev->b&BM_BUTT)==B_LEFT) ++ if ((ev->b&BM_ACT)==BTN_DOWN&&(ev->b&BM_BUTT)==BTN_LEFT) + { + int n,a; + struct list *l=ld->win_offset; +@@ -1810,7 +1810,7 @@ + } + /* scroll with the bar */ + #ifdef G +- if (F&&((ev->b&BM_ACT)==B_DRAG&&(ev->b&BM_BUTT)==B_LEFT)) ++ if (F&&((ev->b&BM_ACT)==BTN_DRAG&&(ev->b&BM_BUTT)==BTN_LEFT)) + { + int total=get_total_items(ld); + int scroll_pos=get_scroll_pos(ld); +@@ -1854,7 +1854,7 @@ + + } + #endif +- if ((ev->b&BM_ACT)==B_DRAG&&(ev->b&BM_BUTT)==B_MIDDLE) ++ if ((ev->b&BM_ACT)==BTN_DRAG&&(ev->b&BM_BUTT)==BTN_MIDDLE) + { + long delta=(ev->y-last_mouse_y)/MOUSE_SCROLL_DIVIDER; + +@@ -1891,12 +1891,12 @@ + + } + /* mouse wheel */ +- if ((ev->b&BM_ACT)==B_MOVE&&((ev->b&BM_BUTT)==B_WHEELUP||(ev->b&BM_BUTT)==B_WHEELDOWN||(ev->b&BM_BUTT)==B_WHEELDOWN1||(ev->b&BM_BUTT)==B_WHEELUP1)) ++ if ((ev->b&BM_ACT)==BTN_MOVE&&((ev->b&BM_BUTT)==BTN_WHEELUP||(ev->b&BM_BUTT)==BTN_WHEELDOWN||(ev->b&BM_BUTT)==BTN_WHEELDOWN1||(ev->b&BM_BUTT)==BTN_WHEELUP1)) + { + int button=(ev->b)&BM_BUTT; + last_mouse_y=ev->y; + +- if (button==B_WHEELDOWN||button==B_WHEELDOWN1) /* scroll down */ ++ if (button==BTN_WHEELDOWN||button==BTN_WHEELDOWN1) /* scroll down */ + { + if (next_in_tree(ld,ld->current_pos)==ld->list)return EVENT_PROCESSED; /* already at the bottom */ + ld->current_pos=next_in_tree(ld,ld->current_pos); +@@ -1910,7 +1910,7 @@ + } + draw_to_window(dlg->win,redraw_list_line,&rd); + } +- if (button==B_WHEELUP||button==B_WHEELUP1) /* scroll up */ ++ if (button==BTN_WHEELUP||button==BTN_WHEELUP1) /* scroll up */ + { + if (ld->current_pos==ld->list)return EVENT_PROCESSED; /* already on the top */ + ld->current_pos=prev_in_tree(ld,ld->current_pos); +@@ -2021,7 +2021,7 @@ + TEXT(ld->already_in_use), + NULL, + 1, +- TEXT(T_OK),NULL,B_ENTER|B_ESC ++ TEXT(T_OK),NULL,BTN_ENTER|BTN_ESC + ); + return 1; + } +@@ -2086,7 +2086,7 @@ + d->items[a+4].fn=list_item_unselect; + + d->items[a+5].type=D_BUTTON; +- d->items[a+5].gid=B_ESC; ++ d->items[a+5].gid=BTN_ESC; + d->items[a+5].fn=cancel_dialog; + d->items[a+5].text=TEXT(T_CLOSE); + +diff -urN links-2.3pre2-orig/mailto.c links-2.3pre2/mailto.c +--- links-2.3pre2-orig/mailto.c 2011-04-19 15:17:49.000000000 +0000 ++++ links-2.3pre2/mailto.c 2011-05-13 09:04:16.292814848 +0000 +@@ -11,7 +11,7 @@ + { + unsigned char *prog, *cmd; + if (!(prog = get_prog(list)) || !*prog) { +- msg_box(term, NULL, TEXT(T_NO_PROGRAM), AL_CENTER | AL_EXTD_TEXT, TEXT(T_NO_PROGRAM_SPECIFIED_FOR), " ", name, ".", NULL, NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(term, NULL, TEXT(T_NO_PROGRAM), AL_CENTER | AL_EXTD_TEXT, TEXT(T_NO_PROGRAM_SPECIFIED_FOR), " ", name, ".", NULL, NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return; + } + if ((cmd = subst_file(prog, param, 0))) { +@@ -38,7 +38,7 @@ + fail1: + mem_free(user); + fail: +- if (f) msg_box(ses->term, NULL, TEXT(T_BAD_URL_SYNTAX), AL_CENTER, TEXT(T_BAD_MAILTO_URL), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ if (f) msg_box(ses->term, NULL, TEXT(T_BAD_URL_SYNTAX), AL_CENTER, TEXT(T_BAD_MAILTO_URL), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + } + + static void tn_func(struct session *ses, unsigned char *url, struct list_head *prog, unsigned char *t1, unsigned char *t2) +@@ -67,7 +67,7 @@ + fail1: + mem_free(hh); + fail: +- if (f) msg_box(ses->term, NULL, TEXT(T_BAD_URL_SYNTAX), AL_CENTER, t2, NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ if (f) msg_box(ses->term, NULL, TEXT(T_BAD_URL_SYNTAX), AL_CENTER, t2, NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + } + + +@@ -91,7 +91,7 @@ + void mms_func(struct session *ses, unsigned char *url) + { + if (check_shell_url(url)) { +- msg_box(ses->term, NULL, TEXT(T_BAD_URL_SYNTAX), AL_CENTER, TEXT(T_MMS_URL_CONTAINS_INACCEPTABLE_CHARACTERS), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_BAD_URL_SYNTAX), AL_CENTER, TEXT(T_MMS_URL_CONTAINS_INACCEPTABLE_CHARACTERS), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return; + } + prog_func(ses->term, &mms_prog, url, TEXT(T_MMS)); +diff -urN links-2.3pre2-orig/main.c links-2.3pre2/main.c +--- links-2.3pre2-orig/main.c 2011-04-19 15:17:49.000000000 +0000 ++++ links-2.3pre2/main.c 2011-05-13 09:04:16.313262080 +0000 +@@ -271,6 +271,7 @@ + + void initialize_all_subsystems(void); + void initialize_all_subsystems_2(void); ++extern void maybe_force_gr(void); + + static void init(void) + { +@@ -288,6 +289,9 @@ + retval = RET_FATAL; + goto ttt; + } ++#if defined(G) && defined(BEOS) ++ maybe_force_gr(); ++#endif + if (!(u = parse_options(g_argc - 1, g_argv + 1))) { + retval = RET_SYNTAX; + goto ttt; +diff -urN links-2.3pre2-orig/menu.c links-2.3pre2/menu.c +--- links-2.3pre2-orig/menu.c 2011-04-19 15:17:49.000000000 +0000 ++++ links-2.3pre2/menu.c 2011-05-13 09:19:13.692322304 +0000 +@@ -17,17 +17,17 @@ + + static void menu_about(struct terminal *term, void *d, struct session *ses) + { +- msg_box(term, NULL, TEXT(T_ABOUT), AL_CENTER, TEXT(T_LINKS__LYNX_LIKE), NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(term, NULL, TEXT(T_ABOUT), AL_CENTER, TEXT(T_LINKS__LYNX_LIKE), NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + } + + static void menu_keys(struct terminal *term, void *d, struct session *ses) + { +- msg_box(term, NULL, TEXT(T_KEYS), AL_LEFT | AL_MONO, TEXT(T_KEYS_DESC), NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(term, NULL, TEXT(T_KEYS), AL_LEFT | AL_MONO, TEXT(T_KEYS_DESC), NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + } + + static void menu_copying(struct terminal *term, void *d, struct session *ses) + { +- msg_box(term, NULL, TEXT(T_COPYING), AL_CENTER, TEXT(T_COPYING_DESC), NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(term, NULL, TEXT(T_COPYING), AL_CENTER, TEXT(T_COPYING_DESC), NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + } + + static void menu_manual(struct terminal *term, void *d, struct session *ses) +@@ -88,7 +88,7 @@ + void query_exit(struct session *ses) + { + ses->exit_query = 1; +- msg_box(ses->term, NULL, TEXT(T_EXIT_LINKS), AL_CENTER, (ses->term->next == ses->term->prev && are_there_downloads()) ? TEXT(T_DO_YOU_REALLY_WANT_TO_EXIT_LINKS_AND_TERMINATE_ALL_DOWNLOADS) : (!F || ses->term->next == ses->term->prev) ? TEXT(T_DO_YOU_REALLY_WANT_TO_EXIT_LINKS) : TEXT(T_DO_YOU_REALLY_WANT_TO_CLOSE_WINDOW), ses, 2, TEXT(T_YES), (void (*)(void *))really_exit_prog, B_ENTER, TEXT(T_NO), dont_exit_prog, B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_EXIT_LINKS), AL_CENTER, (ses->term->next == ses->term->prev && are_there_downloads()) ? TEXT(T_DO_YOU_REALLY_WANT_TO_EXIT_LINKS_AND_TERMINATE_ALL_DOWNLOADS) : (!F || ses->term->next == ses->term->prev) ? TEXT(T_DO_YOU_REALLY_WANT_TO_EXIT_LINKS) : TEXT(T_DO_YOU_REALLY_WANT_TO_CLOSE_WINDOW), ses, 2, TEXT(T_YES), (void (*)(void *))really_exit_prog, BTN_ENTER, TEXT(T_NO), dont_exit_prog, BTN_ESC); + } + + void exit_prog(struct terminal *term, void *d, struct session *ses) +@@ -215,7 +215,7 @@ + l = 0, a15 = init_str(); add_to_str(&a15, &l, ", "); add_num_to_str(&a15, &l, formatted_info(CI_LOCKED));add_to_str(&a15, &l, " "); + l = 0, a16 = init_str(); add_to_str(&a16, &l, "."); + +- if (!F) msg_box(term, getml(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, NULL), TEXT(T_RESOURCES), AL_LEFT | AL_EXTD_TEXT, TEXT(T_RESOURCES), a1, TEXT(T_HANDLES), a2, TEXT(T_TIMERS), a3, TEXT(T_CONNECTIONS), a4, TEXT(T_cONNECTIONS), a5, TEXT(T_CONNECTING), a6, TEXT(T_tRANSFERRING), a7, TEXT(T_KEEPALIVE), a8, TEXT(T_MEMORY_CACHE), a9, TEXT(T_BYTES), a10, TEXT(T_FILES), a11, TEXT(T_LOCKED), a12, TEXT(T_LOADING), a13, TEXT(T_FORMATTED_DOCUMENT_CACHE), a14, TEXT(T_DOCUMENTS), a15, TEXT(T_LOCKED), a16, NULL, r, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ if (!F) msg_box(term, getml(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, NULL), TEXT(T_RESOURCES), AL_LEFT | AL_EXTD_TEXT, TEXT(T_RESOURCES), a1, TEXT(T_HANDLES), a2, TEXT(T_TIMERS), a3, TEXT(T_CONNECTIONS), a4, TEXT(T_cONNECTIONS), a5, TEXT(T_CONNECTING), a6, TEXT(T_tRANSFERRING), a7, TEXT(T_KEEPALIVE), a8, TEXT(T_MEMORY_CACHE), a9, TEXT(T_BYTES), a10, TEXT(T_FILES), a11, TEXT(T_LOCKED), a12, TEXT(T_LOADING), a13, TEXT(T_FORMATTED_DOCUMENT_CACHE), a14, TEXT(T_DOCUMENTS), a15, TEXT(T_LOCKED), a16, NULL, r, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + #ifdef G + else msg_box(term, getml(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, + a12, a13, b14, b15, b16, b17, a14, a15, a16, +@@ -230,7 +230,7 @@ + TEXT(T_BYTES), b15, TEXT(T_IMAGES), b16, TEXT(T_LOCKED), + b17, TEXT(T_FONT_CACHE), c14, TEXT(T_BYTES), c15, + TEXT(T_BYTES_MAX), c16, TEXT(T_LETTERS), c17, +- TEXT(T_FORMATTED_DOCUMENT_CACHE), a14, TEXT(T_DOCUMENTS), a15, TEXT(T_LOCKED), a16, NULL, r, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ TEXT(T_FORMATTED_DOCUMENT_CACHE), a14, TEXT(T_DOCUMENTS), a15, TEXT(T_LOCKED), a16, NULL, r, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + #endif + r->win = term->windows.next; + ((struct dialog_data *)r->win->data)->dlg->abort = refresh_abort; +@@ -259,7 +259,7 @@ + add_to_str(&a, &l, "\n"); + add_to_str(&a, &l, ce->url); + } +- msg_box(term, getml(a, NULL), TEXT(T_CACHE_INFO), AL_LEFT | AL_EXTD_TEXT, TEXT(T_CACHE_CONTENT), a, NULL, r, 1, TEXT(T_OK), end_refresh, B_ENTER | B_ESC); ++ msg_box(term, getml(a, NULL), TEXT(T_CACHE_INFO), AL_LEFT | AL_EXTD_TEXT, TEXT(T_CACHE_CONTENT), a, NULL, r, 1, TEXT(T_OK), end_refresh, BTN_ENTER | BTN_ESC); + r->win = term->windows.next; + r->timer = install_timer(RESOURCE_INFO_REFRESH, (void (*)(void *))refresh, r); + /* !!! the refresh here is buggy */ +@@ -311,7 +311,7 @@ + } + #endif + p = stracpy(message); +- msg_box(term, getml(p, NULL), TEXT(T_MEMORY_INFO), AL_CENTER, p, r, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(term, getml(p, NULL), TEXT(T_MEMORY_INFO), AL_CENTER, p, r, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + r->win = term->windows.next; + ((struct dialog_data *)r->win->data)->dlg->abort = refresh_abort; + r->timer = install_timer(RESOURCE_INFO_REFRESH, (void (*)(void *))refresh, r); +@@ -526,11 +526,11 @@ + d->items[9].dlen = sizeof(int); + d->items[9].data = (void *)&ts->braille; + d->items[10].type = D_BUTTON; +- d->items[10].gid = B_ENTER; ++ d->items[10].gid = BTN_ENTER; + d->items[10].fn = ok_dialog; + d->items[10].text = TEXT(T_OK); + d->items[11].type = D_BUTTON; +- d->items[11].gid = B_ESC; ++ d->items[11].gid = BTN_ESC; + d->items[11].fn = cancel_dialog; + d->items[11].text = TEXT(T_CANCEL); + d->items[12].type = D_END; +@@ -637,11 +637,11 @@ + d->items[8].gid = 1024; + d->items[8].gnum = 30*1024; + d->items[9].type = D_BUTTON; +- d->items[9].gid = B_ENTER; ++ d->items[9].gid = BTN_ENTER; + d->items[9].fn = ok_dialog; + d->items[9].text = TEXT(T_OK); + d->items[10].type = D_BUTTON; +- d->items[10].gid = B_ESC; ++ d->items[10].gid = BTN_ESC; + d->items[10].fn = cancel_dialog; + d->items[10].text = TEXT(T_CANCEL); + d->items[11].type = D_END; +@@ -742,11 +742,11 @@ + d->items[7].dlen = MAX_STR_LEN; + d->items[7].data = header->extra_header; + d->items[8].type = D_BUTTON; +- d->items[8].gid = B_ENTER; ++ d->items[8].gid = BTN_ENTER; + d->items[8].fn = ok_dialog; + d->items[8].text = TEXT(T_OK); + d->items[9].type = D_BUTTON; +- d->items[9].gid = B_ESC; ++ d->items[9].gid = BTN_ESC; + d->items[9].fn = cancel_dialog; + d->items[9].text = TEXT(T_CANCEL); + d->items[10].type = D_END; +@@ -798,11 +798,11 @@ + d->items[7].data = (void *)&options->header; + d->items[7].dlen = sizeof(struct http_header_options); + d->items[8].type = D_BUTTON; +- d->items[8].gid = B_ENTER; ++ d->items[8].gid = BTN_ENTER; + d->items[8].fn = ok_dialog; + d->items[8].text = TEXT(T_OK); + d->items[9].type = D_BUTTON; +- d->items[9].gid = B_ESC; ++ d->items[9].gid = BTN_ESC; + d->items[9].fn = cancel_dialog; + d->items[9].text = TEXT(T_CANCEL); + d->items[10].type = D_END; +@@ -877,12 +877,12 @@ + a = 3; + #endif + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ENTER; ++ d->items[a].gid = BTN_ENTER; + d->items[a].fn = ok_dialog; + d->items[a].text = TEXT(T_OK); + a++; + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ESC; ++ d->items[a].gid = BTN_ESC; + d->items[a].fn = cancel_dialog; + d->items[a].text = TEXT(T_CANCEL); + a++; +@@ -1100,11 +1100,11 @@ + d->items[13].dlen = sizeof(int); + d->items[13].data = (void *)&gamma_bits; + d->items[14].type = D_BUTTON; +- d->items[14].gid = B_ENTER; ++ d->items[14].gid = BTN_ENTER; + d->items[14].fn = ok_dialog; + d->items[14].text = TEXT(T_OK); + d->items[15].type = D_BUTTON; +- d->items[15].gid = B_ESC; ++ d->items[15].gid = BTN_ESC; + d->items[15].fn = cancel_dialog; + d->items[15].text = TEXT(T_CANCEL); + d->items[16].type = D_END; +@@ -1226,11 +1226,11 @@ + d->items[4].data = (unsigned char *)&p->only_proxies; + d->items[4].dlen = sizeof(int); + d->items[5].type = D_BUTTON; +- d->items[5].gid = B_ENTER; ++ d->items[5].gid = BTN_ENTER; + d->items[5].fn = ok_dialog; + d->items[5].text = TEXT(T_OK); + d->items[6].type = D_BUTTON; +- d->items[6].gid = B_ESC; ++ d->items[6].gid = BTN_ESC; + d->items[6].fn = cancel_dialog; + d->items[6].text = TEXT(T_CANCEL); + d->items[7].type = D_END; +@@ -1319,11 +1319,11 @@ + d->items[9].data = (unsigned char *)&ftp_options; + d->items[9].dlen = sizeof(struct ftp_options); + d->items[10].type = D_BUTTON; +- d->items[10].gid = B_ENTER; ++ d->items[10].gid = BTN_ENTER; + d->items[10].fn = ok_dialog; + d->items[10].text = TEXT(T_OK); + d->items[11].type = D_BUTTON; +- d->items[11].gid = B_ESC; ++ d->items[11].gid = BTN_ESC; + d->items[11].fn = cancel_dialog; + d->items[11].text = TEXT(T_CANCEL); + d->items[12].type = D_END; +@@ -1469,11 +1469,11 @@ + } + #endif + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ENTER; ++ d->items[a].gid = BTN_ENTER; + d->items[a].fn = ok_dialog; + d->items[a++].text = TEXT(T_OK); + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ESC; ++ d->items[a].gid = BTN_ESC; + d->items[a].fn = cancel_dialog; + d->items[a++].text = TEXT(T_CANCEL); + d->items[a].type = D_END; +@@ -1486,7 +1486,7 @@ + net_options(term, xxx, yyy); + return; + } +- msg_box(term, NULL, _("Network options"), AL_CENTER, _("Warning: configuring network will terminate all running downloads. Do you really want to configure network?"), term, 2, _("Yes"), (void (*)(void *))net_options, B_ENTER, _("No"), NULL, B_ESC); ++ msg_box(term, NULL, _("Network options"), AL_CENTER, _("Warning: configuring network will terminate all running downloads. Do you really want to configure network?"), term, 2, _("Yes"), (void (*)(void *))net_options, BTN_ENTER, _("No"), NULL, BTN_ESC); + }*/ + + static unsigned char mc_str[8]; +@@ -1568,12 +1568,12 @@ + d->items[a].data = (void *)&aggressive_cache; + a++; + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ENTER; ++ d->items[a].gid = BTN_ENTER; + d->items[a].fn = ok_dialog; + d->items[a].text = TEXT(T_OK); + a++; + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ESC; ++ d->items[a].gid = BTN_ESC; + d->items[a].fn = cancel_dialog; + d->items[a].text = TEXT(T_CANCEL); + a++; +@@ -1733,12 +1733,12 @@ + a++; + if (!F){ + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ENTER; ++ d->items[a].gid = BTN_ENTER; + d->items[a].fn = ok_dialog; + d->items[a].text = TEXT(T_OK); + a++; + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ESC; ++ d->items[a].gid = BTN_ESC; + d->items[a].fn = cancel_dialog; + d->items[a].text = TEXT(T_CANCEL); + a++; +@@ -1764,12 +1764,12 @@ + d->items[a].dlen = sizeof(int); + a++; + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ENTER; ++ d->items[a].gid = BTN_ENTER; + d->items[a].fn = ok_dialog; + d->items[a].text = TEXT(T_OK); + a++; + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ESC; ++ d->items[a].gid = BTN_ESC; + d->items[a].fn = cancel_dialog; + d->items[a].text = TEXT(T_CANCEL); + a++; +@@ -2025,12 +2025,12 @@ + } + #endif + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ENTER; ++ d->items[a].gid = BTN_ENTER; + d->items[a].fn = ok_dialog; + d->items[a].text = TEXT(T_OK); + a++; + d->items[a].type = D_BUTTON; +- d->items[a].gid = B_ESC; ++ d->items[a].gid = BTN_ESC; + d->items[a].fn = cancel_dialog; + d->items[a].text = TEXT(T_CANCEL); + a++; +@@ -2098,11 +2098,11 @@ + d->items[1].gid = 1; + d->items[1].gnum = 999; + d->items[2].type = D_BUTTON; +- d->items[2].gid = B_ENTER; ++ d->items[2].gid = BTN_ENTER; + d->items[2].fn = ok_dialog; + d->items[2].text = TEXT(T_OK); + d->items[3].type = D_BUTTON; +- d->items[3].gid = B_ESC; ++ d->items[3].gid = BTN_ESC; + d->items[3].fn = cancel_dialog; + d->items[3].text = TEXT(T_CANCEL); + d->items[4].type = D_END; +@@ -2495,8 +2495,8 @@ + TEXT(T_FILE), " ", h->file, " ", TEXT(T_ALREADY_EXISTS_AS_DOWNLOAD), " ", TEXT(T_DO_YOU_WISH_TO_OVERWRITE), NULL, + h, + 3, +- TEXT(T_OVERWRITE), does_file_exist_ok, B_ENTER, +- TEXT(T_CANCEL), does_file_exist_cancel, B_ESC, ++ TEXT(T_OVERWRITE), does_file_exist_ok, BTN_ENTER, ++ TEXT(T_CANCEL), does_file_exist_cancel, BTN_ESC, + TEXT(T_RENAME), does_file_exist_rename, NULL + ); + return; +@@ -2525,8 +2525,8 @@ + TEXT(T_FILE), " ", h->file, " ", TEXT(T_ALREADY_EXISTS), " ", TEXT(T_DO_YOU_WISH_TO_OVERWRITE), NULL, + h, + 3, +- TEXT(T_OVERWRITE), does_file_exist_ok, B_ENTER, +- TEXT(T_CANCEL), does_file_exist_cancel, B_ESC, ++ TEXT(T_OVERWRITE), does_file_exist_ok, BTN_ENTER, ++ TEXT(T_CANCEL), does_file_exist_cancel, BTN_ESC, + TEXT(T_RENAME), does_file_exist_rename, NULL + ); + } +diff -urN links-2.3pre2-orig/objreq.c links-2.3pre2/objreq.c +--- links-2.3pre2-orig/objreq.c 2011-04-19 15:17:49.000000000 +0000 ++++ links-2.3pre2/objreq.c 2011-05-13 09:04:16.414711808 +0000 +@@ -163,12 +163,12 @@ + d->items[1].data = a->passwd; + + d->items[2].type = D_BUTTON; +- d->items[2].gid = B_ENTER; ++ d->items[2].gid = BTN_ENTER; + d->items[2].fn = auth_ok; + d->items[2].text = TEXT(T_OK); + + d->items[3].type = D_BUTTON; +- d->items[3].gid = B_ESC; ++ d->items[3].gid = BTN_ESC; + d->items[3].fn = auth_cancel; + d->items[3].text = TEXT(T_CANCEL); + +diff -urN links-2.3pre2-orig/os_dep.c links-2.3pre2/os_dep.c +--- links-2.3pre2-orig/os_dep.c 2011-04-19 15:17:49.000000000 +0000 ++++ links-2.3pre2/os_dep.c 2011-05-13 09:04:16.451674112 +0000 +@@ -1059,7 +1059,7 @@ + + #if defined(BEOS) + +-#include ++#include + + int thr_sem_init = 0; + sem_id thr_sem; +@@ -1251,16 +1251,16 @@ + ev.x = ms->col; + ev.y = ms->row; + /*debug("status: %d %d %d", ms->col, ms->row, ms->fs);*/ +- if (ms->fs & (MOUSE_BN1_DOWN | MOUSE_BN2_DOWN | MOUSE_BN3_DOWN)) ev.b = status = B_DOWN | (ms->fs & MOUSE_BN1_DOWN ? B_LEFT : ms->fs & MOUSE_BN2_DOWN ? B_MIDDLE : B_RIGHT); ++ if (ms->fs & (MOUSE_BN1_DOWN | MOUSE_BN2_DOWN | MOUSE_BN3_DOWN)) ev.b = status = BTN_DOWN | (ms->fs & MOUSE_BN1_DOWN ? BTN_LEFT : ms->fs & MOUSE_BN2_DOWN ? BTN_MIDDLE : BTN_RIGHT); + else if (ms->fs & (MOUSE_MOTION_WITH_BN1_DOWN | MOUSE_MOTION_WITH_BN2_DOWN | MOUSE_MOTION_WITH_BN3_DOWN)) { +- int b = ms->fs & MOUSE_MOTION_WITH_BN1_DOWN ? B_LEFT : ms->fs & MOUSE_MOTION_WITH_BN2_DOWN ? B_MIDDLE : B_RIGHT; +- if (status == -1) b |= B_DOWN; +- else b |= B_DRAG; ++ int b = ms->fs & MOUSE_MOTION_WITH_BN1_DOWN ? BTN_LEFT : ms->fs & MOUSE_MOTION_WITH_BN2_DOWN ? BTN_MIDDLE : BTN_RIGHT; ++ if (status == -1) b |= BTN_DOWN; ++ else b |= BTN_DRAG; + ev.b = status = b; + } + else { + if (status == -1) continue; +- ev.b = (status & BM_BUTT) | B_UP; ++ ev.b = (status & BM_BUTT) | BTN_UP; + status = -1; + } + if (hard_write(oms->p[1], (unsigned char *)&ev, sizeof(struct event)) != sizeof(struct event)) break; +@@ -1634,13 +1634,13 @@ + ev.y = gev.y - 1; + if (ev.x < 0) ev.x = 0; + if (ev.y < 0) ev.y = 0; +- if (gev.buttons & GPM_B_LEFT) ev.b = B_LEFT; +- else if (gev.buttons & GPM_B_MIDDLE) ev.b = B_MIDDLE; +- else if (gev.buttons & GPM_B_RIGHT) ev.b = B_RIGHT; ++ if (gev.buttons & GPM_B_LEFT) ev.b = BTN_LEFT; ++ else if (gev.buttons & GPM_B_MIDDLE) ev.b = BTN_MIDDLE; ++ else if (gev.buttons & GPM_B_RIGHT) ev.b = BTN_RIGHT; + else return; +- if (gev.type & GPM_DOWN) ev.b |= B_DOWN; +- else if (gev.type & GPM_UP) ev.b |= B_UP; +- else if (gev.type & GPM_DRAG) ev.b |= B_DRAG; ++ if (gev.type & GPM_DOWN) ev.b |= BTN_DOWN; ++ else if (gev.type & GPM_UP) ev.b |= BTN_UP; ++ else if (gev.type & GPM_DRAG) ev.b |= BTN_DRAG; + else return; + gms->fn(gms->data, (char *)&ev, sizeof(struct event)); + } +diff -urN links-2.3pre2-orig/os_dep.h links-2.3pre2/os_dep.h +--- links-2.3pre2-orig/os_dep.h 2007-12-26 03:13:05.000000000 +0000 ++++ links-2.3pre2/os_dep.h 2011-05-13 09:34:37.000000000 +0000 +@@ -20,7 +20,7 @@ + #define OS2 + #elif defined(_WIN32) || defined(__CYGWIN__) + #define WIN32 +-#elif defined(__BEOS__) ++#elif defined(__BEOS__) || defined(__HAIKU__) + #define BEOS + #elif defined(__riscos__) + #define RISCOS +@@ -111,11 +111,15 @@ + #define SHARED_CONFIG_DIR "/etc/" + #define NO_FORK_ON_EXIT + #define ASSOC_BLOCK ++#define SET_WINDOW_TITLE_UTF_8 + + #include + #include +-#include ++#include + ++#ifdef __cplusplus ++extern "C" { ++#endif + int be_socket(int, int, int); + int be_connect(int, struct sockaddr *, int); + int be_getpeername(int, struct sockaddr *, int *); +@@ -129,6 +133,9 @@ + int be_close(int); + int be_select(int, struct fd_set *, struct fd_set *, struct fd_set *, struct timeval *); + int be_getsockopt(int, int, int, void *, int *); ++#ifdef __cplusplus ++} ++#endif + + #elif defined(RISCOS) + +diff -urN links-2.3pre2-orig/os_depx.h links-2.3pre2/os_depx.h +--- links-2.3pre2-orig/os_depx.h 2007-07-07 02:55:24.000000000 +0000 ++++ links-2.3pre2/os_depx.h 2011-05-13 09:04:16.484966400 +0000 +@@ -45,6 +45,8 @@ + #endif + + #ifdef BEOS ++#if IPPROTO_TCP != 6 ++/* net_server */ + #define socket be_socket + #define connect be_connect + #define getpeername be_getpeername +@@ -58,16 +60,22 @@ + #define close be_close + #define select be_select + #define getsockopt be_getsockopt ++/* ++#ifdef errno ++#undef errno ++#endif ++#define errno 1 ++*/ ++#endif + #ifndef PF_INET + #define PF_INET AF_INET + #endif + #ifndef SO_ERROR + #define SO_ERROR 10001 + #endif +-#ifdef errno +-#undef errno ++#ifndef FDSETSIZE ++#define FDSETSIZE FD_SETSIZE + #endif +-#define errno 1 + #endif + + #if defined(O_SIZE) && defined(__EMX__) +@@ -83,6 +91,9 @@ + #elif defined(GRDRV_ATHEOS) + #define loop_select ath_select + int ath_select(int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t); ++#elif defined(GRDRV_BEOS) ++#define loop_select be_loop_select ++int be_loop_select(int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t); + #else + #define loop_select select + #endif +diff -urN links-2.3pre2-orig/pmshell.c links-2.3pre2/pmshell.c +--- links-2.3pre2-orig/pmshell.c 2011-04-19 15:17:49.000000000 +0000 ++++ links-2.3pre2/pmshell.c 2011-05-13 09:04:16.524025856 +0000 +@@ -287,33 +287,33 @@ + case WM_BUTTON1DOWN: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- win->button |= 1 << B_LEFT; ++ win->button |= 1 << BTN_LEFT; + win->lastpos = (unsigned)mp1; +- pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), B_DOWN | B_LEFT, 0); ++ pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), BTN_DOWN | BTN_LEFT, 0); + pm_unlock; + break; + case WM_BUTTON2DOWN: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- win->button |= 1 << B_RIGHT; ++ win->button |= 1 << BTN_RIGHT; + win->lastpos = (unsigned)mp1; +- pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), B_DOWN | B_RIGHT, 0); ++ pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), BTN_DOWN | BTN_RIGHT, 0); + pm_unlock; + break; + case WM_BUTTON3DOWN: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- win->button |= 1 << B_MIDDLE; ++ win->button |= 1 << BTN_MIDDLE; + win->lastpos = (unsigned)mp1; +- pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), B_DOWN | B_MIDDLE, 0); ++ pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), BTN_DOWN | BTN_MIDDLE, 0); + pm_unlock; + break; + case WM_BUTTON1UP: + case WM_BUTTON1MOTIONEND: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- if (win->button & (1 << B_LEFT)) pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), B_UP | B_LEFT, 0); +- win->button &= ~(1 << B_LEFT); ++ if (win->button & (1 << BTN_LEFT)) pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), BTN_UP | BTN_LEFT, 0); ++ win->button &= ~(1 << BTN_LEFT); + win->lastpos = (unsigned)mp1; + pm_unlock; + break; +@@ -321,8 +321,8 @@ + case WM_BUTTON2MOTIONEND: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- if (win->button & (1 << B_RIGHT)) pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), B_UP | B_RIGHT, 0); +- win->button &= ~(1 << B_RIGHT); ++ if (win->button & (1 << BTN_RIGHT)) pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), BTN_UP | BTN_RIGHT, 0); ++ win->button &= ~(1 << BTN_RIGHT); + win->lastpos = (unsigned)mp1; + pm_unlock; + break; +@@ -330,8 +330,8 @@ + case WM_BUTTON3MOTIONEND: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- if (win->button & (1 << B_MIDDLE)) pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), B_UP | B_MIDDLE, 0); +- win->button &= ~(1 << B_MIDDLE); ++ if (win->button & (1 << BTN_MIDDLE)) pm_send_event(win, E_MOUSE, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), BTN_UP | BTN_MIDDLE, 0); ++ win->button &= ~(1 << BTN_MIDDLE); + win->lastpos = (unsigned)mp1; + pm_unlock; + break; +@@ -340,19 +340,19 @@ + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } + if (win->lastpos == (unsigned)mp1) { pm_unlock; break; } + win->lastpos = (unsigned)mp1; +- pm_send_mouse_event(win, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), (win->button ? B_DRAG : B_MOVE) | (win->button & (1 << B_LEFT) ? B_LEFT : win->button & (1 << B_MIDDLE) ? B_MIDDLE : win->button & (1 << B_RIGHT) ? B_RIGHT : 0)); ++ pm_send_mouse_event(win, (unsigned)mp1 & 0xffff, win->y - ((unsigned)mp1 >> 16), (win->button ? BTN_DRAG : BTN_MOVE) | (win->button & (1 << BTN_LEFT) ? BTN_LEFT : win->button & (1 << BTN_MIDDLE) ? BTN_MIDDLE : win->button & (1 << BTN_RIGHT) ? BTN_RIGHT : 0)); + pm_unlock; + break; + case WM_VSCROLL: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- if ((unsigned)mp2 == SB_LINEUP << 16 || (unsigned)mp2 == SB_LINEDOWN << 16) pm_send_event(win, E_MOUSE, win->lastpos & 0xffff, win->y - (win->lastpos >> 16), ((unsigned)mp2 == SB_LINEUP << 16 ? B_WHEELUP1 : B_WHEELDOWN1) | B_MOVE, 0); ++ if ((unsigned)mp2 == SB_LINEUP << 16 || (unsigned)mp2 == SB_LINEDOWN << 16) pm_send_event(win, E_MOUSE, win->lastpos & 0xffff, win->y - (win->lastpos >> 16), ((unsigned)mp2 == SB_LINEUP << 16 ? BTN_WHEELUP1 : BTN_WHEELDOWN1) | BTN_MOVE, 0); + pm_unlock; + break; + case WM_HSCROLL: + pm_lock; + if (!(win = pm_lookup_window(hwnd))) { pm_unlock; break; } +- if ((unsigned)mp2 == SB_LINELEFT << 16 || (unsigned)mp2 == SB_LINERIGHT << 16) pm_send_event(win, E_MOUSE, win->lastpos & 0xffff, win->y - (win->lastpos >> 16), ((unsigned)mp2 == SB_LINELEFT << 16 ? B_WHEELLEFT1 : B_WHEELRIGHT1) | B_MOVE, 0); ++ if ((unsigned)mp2 == SB_LINELEFT << 16 || (unsigned)mp2 == SB_LINERIGHT << 16) pm_send_event(win, E_MOUSE, win->lastpos & 0xffff, win->y - (win->lastpos >> 16), ((unsigned)mp2 == SB_LINELEFT << 16 ? BTN_WHEELLEFT1 : BTN_WHEELRIGHT1) | BTN_MOVE, 0); + pm_unlock; + break; + } +diff -urN links-2.3pre2-orig/session.c links-2.3pre2/session.c +--- links-2.3pre2-orig/session.c 2011-04-19 15:17:50.000000000 +0000 ++++ links-2.3pre2/session.c 2011-05-13 09:04:16.556269568 +0000 +@@ -195,7 +195,7 @@ + unsigned char *u = stracpy(title); + if (strchr(u, POST_CHAR)) *strchr(u, POST_CHAR) = 0; + if (!t) return; +- msg_box(ses->term, getml(u, NULL), TEXT(T_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_ERROR_LOADING), " ", u, ":\n\n", t, NULL, ses, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC/*, _("Retry"), NULL, 0 !!! FIXME: retry */); ++ msg_box(ses->term, getml(u, NULL), TEXT(T_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_ERROR_LOADING), " ", u, ":\n\n", t, NULL, ses, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC/*, _("Retry"), NULL, 0 !!! FIXME: retry */); + } + + static inline unsigned char hx(int a) +@@ -477,7 +477,7 @@ + dlg->udata = down; + dlg->align = AL_CENTER; + dlg->items[0].type = D_BUTTON; +- dlg->items[0].gid = B_ENTER | B_ESC; ++ dlg->items[0].gid = BTN_ENTER | BTN_ESC; + dlg->items[0].fn = dlg_undisplay_download; + dlg->items[0].text = TEXT(T_BACKGROUND); + dlg->items[1].type = D_BUTTON; +@@ -625,7 +625,7 @@ + if (get_download_ses(down)) { + unsigned char *emsg = stracpy(errno ? strerror(errno) : "Zero returned"); + unsigned char *msg = stracpy(down->file); +- msg_box(get_download_ses(down)->term, getml(msg, emsg, NULL), TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_WRITE_TO_FILE), " ", msg, ": ", emsg, NULL, NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(get_download_ses(down)->term, getml(msg, emsg, NULL), TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_WRITE_TO_FILE), " ", msg, ": ", emsg, NULL, NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + } + return -1; + } +@@ -715,7 +715,7 @@ + if (t) { + unsigned char *tt = stracpy(down->url); + if (strchr(tt, POST_CHAR)) *strchr(tt, POST_CHAR) = 0; +- msg_box(get_download_ses(down)->term, getml(tt, NULL), TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_ERROR_DOWNLOADING), " ", tt, ":\n\n", t, NULL, get_download_ses(down), 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC/*, TEXT(T_RETRY), NULL, 0 !!! FIXME: retry */); ++ msg_box(get_download_ses(down)->term, getml(tt, NULL), TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_ERROR_DOWNLOADING), " ", tt, ":\n\n", t, NULL, get_download_ses(down), 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC/*, TEXT(T_RETRY), NULL, 0 !!! FIXME: retry */); + } + } else { + if (down->prog) { +@@ -792,7 +792,7 @@ + if (!ses) goto x; + msg = stracpy(file); + msge = stracpy(strerror(errno)); +- msg_box(ses->term, getml(msg, msge, NULL), TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_CREATE_FILE), " ", msg, ": ", msge, NULL, NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, getml(msg, msge, NULL), TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_CREATE_FILE), " ", msg, ": ", msge, NULL, NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + goto x; + } + set_bin(h); +@@ -1545,7 +1545,7 @@ + } + u = stracpy(ce->url); + if ((uu = strchr(u, POST_CHAR))) *uu = 0; +- msg_box(term, getml(u, NULL), TEXT(T_DECOMPRESSION_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_ERROR_DECOMPRESSING_), u, TEXT(T__wITH_), lib, ": ", msg, NULL, NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(term, getml(u, NULL), TEXT(T_DECOMPRESSION_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_ERROR_DECOMPRESSING_), u, TEXT(T__wITH_), lib, ": ", msg, NULL, NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + } + #endif + +@@ -2196,7 +2196,7 @@ + mem_free(file); + goto new_name; + } +- msg_box(ses->term, NULL, TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_CREATE_TEMPORARY_FILE), NULL, NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_DOWNLOAD_ERROR), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_CREATE_TEMPORARY_FILE), NULL, NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + } + if (ses->tq_prog) mem_free(file); + tp_cancel(ses); +@@ -2419,7 +2419,7 @@ + i++; + d->items[i].type = D_BUTTON; + d->items[i].fn = prog_sel_cancel; +- d->items[i].gid = B_ESC; ++ d->items[i].gid = BTN_ESC; + d->items[i].text = TEXT(T_CANCEL); + d->items[i+1].type = D_END; + do_dialog(ses->term, d, ml); +@@ -2445,12 +2445,12 @@ + } + m1 = stracpy(ct); + if (!a) { +- if (!anonymous) msg_box(ses->term, getml(m1, NULL), TEXT(T_UNKNOWN_TYPE), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_SAVE_OR_DISLPAY_THIS_FILE), NULL, ses, 3, TEXT(T_SAVE), tp_save, B_ENTER, TEXT(T_DISPLAY), tp_display, 0, TEXT(T_CANCEL), tp_cancel, B_ESC); +- else msg_box(ses->term, getml(m1, NULL), TEXT(T_UNKNOWN_TYPE), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_SAVE_OR_DISLPAY_THIS_FILE), NULL, ses, 2, TEXT(T_DISPLAY), tp_display, B_ENTER, TEXT(T_CANCEL), tp_cancel, B_ESC); ++ if (!anonymous) msg_box(ses->term, getml(m1, NULL), TEXT(T_UNKNOWN_TYPE), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_SAVE_OR_DISLPAY_THIS_FILE), NULL, ses, 3, TEXT(T_SAVE), tp_save, BTN_ENTER, TEXT(T_DISPLAY), tp_display, 0, TEXT(T_CANCEL), tp_cancel, BTN_ESC); ++ else msg_box(ses->term, getml(m1, NULL), TEXT(T_UNKNOWN_TYPE), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_SAVE_OR_DISLPAY_THIS_FILE), NULL, ses, 2, TEXT(T_DISPLAY), tp_display, BTN_ENTER, TEXT(T_CANCEL), tp_cancel, BTN_ESC); + } else { + m2 = stracpy(a[0].label ? a[0].label : (unsigned char *)""); +- if (!anonymous) msg_box(ses->term, getml(m1, m2, NULL), TEXT(T_WHAT_TO_DO), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_OPEN_FILE_WITH), " ", m2, ", ", TEXT(T_SAVE_IT_OR_DISPLAY_IT), NULL, ses, 4, TEXT(T_OPEN), tp_open, B_ENTER, TEXT(T_SAVE), tp_save, 0, TEXT(T_DISPLAY), tp_display, 0, TEXT(T_CANCEL), tp_cancel, B_ESC); +- else msg_box(ses->term, getml(m1, m2, NULL), TEXT(T_WHAT_TO_DO), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_OPEN_FILE_WITH), " ", m2, ", ", TEXT(T_SAVE_IT_OR_DISPLAY_IT), NULL, ses, 3, TEXT(T_OPEN), tp_open, B_ENTER, TEXT(T_DISPLAY), tp_display, 0, TEXT(T_CANCEL), tp_cancel, B_ESC); ++ if (!anonymous) msg_box(ses->term, getml(m1, m2, NULL), TEXT(T_WHAT_TO_DO), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_OPEN_FILE_WITH), " ", m2, ", ", TEXT(T_SAVE_IT_OR_DISPLAY_IT), NULL, ses, 4, TEXT(T_OPEN), tp_open, BTN_ENTER, TEXT(T_SAVE), tp_save, 0, TEXT(T_DISPLAY), tp_display, 0, TEXT(T_CANCEL), tp_cancel, BTN_ESC); ++ else msg_box(ses->term, getml(m1, m2, NULL), TEXT(T_WHAT_TO_DO), AL_CENTER | AL_EXTD_TEXT, TEXT(T_CONTEN_TYPE_IS), " ", m1, ".\n", TEXT(T_DO_YOU_WANT_TO_OPEN_FILE_WITH), " ", m2, ", ", TEXT(T_SAVE_IT_OR_DISPLAY_IT), NULL, ses, 3, TEXT(T_OPEN), tp_open, BTN_ENTER, TEXT(T_DISPLAY), tp_display, 0, TEXT(T_CANCEL), tp_cancel, BTN_ESC); + } + if (n)mem_free(a); + if (ct)mem_free(ct); +@@ -2546,7 +2546,7 @@ + ses_destroy_defered_jump(ses); + if ((fn = get_external_protocol_function(url))) { + if (proxies.only_proxies && url_bypasses_socks(url)) { +- msg_box(ses->term, NULL, TEXT(T_ERROR), AL_CENTER, TEXT(T_NO_PROXY), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_ERROR), AL_CENTER, TEXT(T_NO_PROXY), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return; + } + fn(ses, url); +@@ -2718,7 +2718,7 @@ + add_to_list(sessions, ses); + if (first_use) { + first_use = 0; +- msg_box(term, NULL, TEXT(T_WELCOME), AL_CENTER | AL_EXTD_TEXT, TEXT(T_WELCOME_TO_LINKS), "\n\n", TEXT(T_BASIC_HELP), NULL, NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(term, NULL, TEXT(T_WELCOME), AL_CENTER | AL_EXTD_TEXT, TEXT(T_WELCOME_TO_LINKS), "\n\n", TEXT(T_BASIC_HELP), NULL, NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + } + return ses; + } +diff -urN links-2.3pre2-orig/svgalib.c links-2.3pre2/svgalib.c +--- links-2.3pre2-orig/svgalib.c 2011-04-19 15:17:50.000000000 +0000 ++++ links-2.3pre2/svgalib.c 2011-05-13 09:04:16.565182464 +0000 +@@ -1889,80 +1889,80 @@ + /* Test movement without buttons */ + if (!(mouse_buttons & BUTTON_MASK) && moved) { + mouse_aggregate_flag=1; +- mouse_aggregate_action=B_MOVE; ++ mouse_aggregate_action=BTN_MOVE; + } + + /* Test presses */ + if ((button&MOUSE_LEFTBUTTON)&&!(mouse_buttons&MOUSE_LEFTBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_LEFT|B_DOWN); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_LEFT|BTN_DOWN); + } + if ((button&MOUSE_MIDDLEBUTTON)&&!(mouse_buttons&MOUSE_MIDDLEBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_MIDDLE|B_DOWN); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_MIDDLE|BTN_DOWN); + } + if ((button&MOUSE_RIGHTBUTTON)&&!(mouse_buttons&MOUSE_RIGHTBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_RIGHT|B_DOWN); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_RIGHT|BTN_DOWN); + } + if ((button&MOUSE_FOURTHBUTTON)&&!(mouse_buttons&MOUSE_FOURTHBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_RIGHT|B_FOURTH); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_RIGHT|BTN_FOURTH); + } + if ((button&MOUSE_FIFTHBUTTON)&&!(mouse_buttons&MOUSE_FIFTHBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_RIGHT|B_FIFTH); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_RIGHT|BTN_FIFTH); + } + if ((button&MOUSE_SIXTHBUTTON)&&!(mouse_buttons&MOUSE_SIXTHBUTTON)){ + mouse_aggregate_flush(); +- /*if (mh) mh(cd,mouse_x, mouse_y,B_RIGHT|B_SIXTH);*/ ++ /*if (mh) mh(cd,mouse_x, mouse_y,BTN_RIGHT|BTN_SIXTH);*/ + switch_virtual_device(VD_NEXT); + } + + /* Test releases */ + if (!(button&MOUSE_LEFTBUTTON)&&(mouse_buttons&MOUSE_LEFTBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_LEFT|B_UP); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_LEFT|BTN_UP); + } + if (!(button&MOUSE_MIDDLEBUTTON)&&(mouse_buttons&MOUSE_MIDDLEBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_MIDDLE|B_UP); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_MIDDLE|BTN_UP); + } + if (!(button&MOUSE_RIGHTBUTTON)&&(mouse_buttons&MOUSE_RIGHTBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_RIGHT|B_UP); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_RIGHT|BTN_UP); + } + if (!(button&MOUSE_FOURTHBUTTON)&&(mouse_buttons&MOUSE_FOURTHBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_FOURTH|B_UP); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_FOURTH|BTN_UP); + } + if (!(button&MOUSE_FIFTHBUTTON)&&(mouse_buttons&MOUSE_FIFTHBUTTON)){ + mouse_aggregate_flush(); +- if (mh) mh(cd,mouse_x, mouse_y,B_FIFTH|B_UP); ++ if (mh) mh(cd,mouse_x, mouse_y,BTN_FIFTH|BTN_UP); + } + if (!(button&MOUSE_SIXTHBUTTON)&&(mouse_buttons&MOUSE_SIXTHBUTTON)){ + mouse_aggregate_flush(); +- /*if (mh) mh(cd,mouse_x, mouse_y,B_SIXTH|B_UP);*/ ++ /*if (mh) mh(cd,mouse_x, mouse_y,BTN_SIXTH|BTN_UP);*/ + } + +- if (drx < 0 && mh) mh(cd, mouse_x, mouse_y, B_MOVE | B_WHEELUP); +- if (drx > 0 && mh) mh(cd, mouse_x, mouse_y, B_MOVE | B_WHEELDOWN); ++ if (drx < 0 && mh) mh(cd, mouse_x, mouse_y, BTN_MOVE | BTN_WHEELUP); ++ if (drx > 0 && mh) mh(cd, mouse_x, mouse_y, BTN_MOVE | BTN_WHEELDOWN); + +- if (dry < 0 && mh) mh(cd, mouse_x, mouse_y, B_MOVE | B_WHEELLEFT); +- if (dry > 0 && mh) mh(cd, mouse_x, mouse_y, B_MOVE | B_WHEELRIGHT); ++ if (dry < 0 && mh) mh(cd, mouse_x, mouse_y, BTN_MOVE | BTN_WHEELLEFT); ++ if (dry > 0 && mh) mh(cd, mouse_x, mouse_y, BTN_MOVE | BTN_WHEELRIGHT); + + /* Test drag */ + if (! ((button^mouse_buttons) & BUTTON_MASK ) && moved && (button & + BUTTON_MASK)){ + mouse_aggregate_flag=1; + mouse_aggregate_action=( +- button&MOUSE_LEFTBUTTON?B_LEFT: +- button&MOUSE_RIGHTBUTTON?B_RIGHT: +- button&MOUSE_MIDDLEBUTTON?B_MIDDLE: +- button&MOUSE_FOURTHBUTTON?B_FOURTH: +- button&MOUSE_FIFTHBUTTON?B_FIFTH: +- /*button&MOUSE_SIXTHBUTTON?B_SIXTH:*/ +- 0) | B_DRAG; ++ button&MOUSE_LEFTBUTTON?BTN_LEFT: ++ button&MOUSE_RIGHTBUTTON?BTN_RIGHT: ++ button&MOUSE_MIDDLEBUTTON?BTN_MIDDLE: ++ button&MOUSE_FOURTHBUTTON?BTN_FOURTH: ++ button&MOUSE_FIFTHBUTTON?BTN_FIFTH: ++ /*button&MOUSE_SIXTHBUTTON?BTN_SIXTH:*/ ++ 0) | BTN_DRAG; + } + mouse_buttons=button; + } +diff -urN links-2.3pre2-orig/types.c links-2.3pre2/types.c +--- links-2.3pre2-orig/types.c 2011-04-19 15:17:50.000000000 +0000 ++++ links-2.3pre2/types.c 2011-05-13 09:04:16.599523328 +0000 +@@ -342,11 +342,11 @@ + d->items[p].data = (unsigned char *)&new->accept_ftp; + d->items[p++].dlen = sizeof(int); + d->items[p].type = D_BUTTON; +- d->items[p].gid = B_ENTER; ++ d->items[p].gid = BTN_ENTER; + d->items[p].fn = ok_dialog; + d->items[p++].text = TEXT(T_OK); + d->items[p].type = D_BUTTON; +- d->items[p].gid = B_ESC; ++ d->items[p].gid = BTN_ESC; + d->items[p].text = TEXT(T_CANCEL); + d->items[p++].fn = cancel_dialog; + d->items[p++].type = D_END; +@@ -660,11 +660,11 @@ + d->items[1].data = ct; + d->items[1].fn = check_nonempty; + d->items[2].type = D_BUTTON; +- d->items[2].gid = B_ENTER; ++ d->items[2].gid = BTN_ENTER; + d->items[2].fn = ok_dialog; + d->items[2].text = TEXT(T_OK); + d->items[3].type = D_BUTTON; +- d->items[3].gid = B_ESC; ++ d->items[3].gid = BTN_ESC; + d->items[3].text = TEXT(T_CANCEL); + d->items[3].fn = cancel_dialog; + d->items[4].type = D_END; +diff -urN links-2.3pre2-orig/view.c links-2.3pre2/view.c +--- links-2.3pre2-orig/view.c 2011-04-19 15:17:50.001048576 +0000 ++++ links-2.3pre2/view.c 2011-05-13 09:04:16.624164864 +0000 +@@ -2037,7 +2037,7 @@ + *data = NULL; + m1 = stracpy(sv->value); + m2 = stracpy(strerror(errno)); +- msg_box(ses->term, getml(m1, m2, NULL), TEXT(T_ERROR_WHILE_POSTING_FORM), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_GET_FILE), " ", m1, ": ", m2, NULL, ses, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, getml(m1, m2, NULL), TEXT(T_ERROR_WHILE_POSTING_FORM), AL_CENTER | AL_EXTD_TEXT, TEXT(T_COULD_NOT_GET_FILE), " ", m1, ": ", m2, NULL, ses, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + } + + void reset_form(struct f_data_c *f, int form_num) +@@ -2878,7 +2878,7 @@ + if (!ses->search_word) { + if (!ses->last_search_word) { + no: +- msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_NO_PREVIOUS_SEARCH), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_NO_PREVIOUS_SEARCH), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + return; + } + ses->search_word = stracpy(ses->last_search_word); +@@ -2910,7 +2910,7 @@ + p -= f->yw; + } + } while ((c += f->yw ? f->yw : 1) < f->f_data->y + f->yw); +- msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_SEARCH_STRING_NOT_FOUND), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_SEARCH_STRING_NOT_FOUND), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + } + + void find_next_back(struct session *ses, struct f_data_c *f, int a) +@@ -3081,12 +3081,12 @@ + x = 1; + fd->vs->current_link = l - fd->f_data->links; + fd->vs->orig_link = fd->vs->current_link; +- if (l->type == L_LINK || l->type == L_BUTTON || l->type == L_CHECKBOX || l->type == L_SELECT) if ((ev->b & BM_ACT) == B_UP) { ++ if (l->type == L_LINK || l->type == L_BUTTON || l->type == L_CHECKBOX || l->type == L_SELECT) if ((ev->b & BM_ACT) == BTN_UP) { + fd->active = 1; + draw_to_window(ses->win, (void (*)(struct terminal *, void *))draw_doc_c, fd); + change_screen_status(ses); + print_screen_status(ses); +- if ((ev->b & BM_BUTT) < B_MIDDLE) x = enter(ses, fd, 0); ++ if ((ev->b & BM_BUTT) < BTN_MIDDLE) x = enter(ses, fd, 0); + else link_menu(ses->term, NULL, ses); + } + +@@ -3485,13 +3485,13 @@ + } + } + if (ev->ev == EV_MOUSE) { +- if (ev->b == (B_DOWN | B_FOURTH)) { ++ if (ev->b == (BTN_DOWN | BTN_FOURTH)) { + go_back(ses); + goto x; + } + #ifdef G + if (ses->locked_link) { +- if ((ev->b & BM_ACT) != B_MOVE) { ++ if ((ev->b & BM_ACT) != BTN_MOVE) { + ses->locked_link = 0; + #ifdef JS + /* process onblur handler of current link */ +@@ -3514,7 +3514,7 @@ + } else return; + } + #endif +- if (ev->y < gf_val(1, G_BFU_FONT_SIZE) && (ev->b & BM_ACT) == B_DOWN) { ++ if (ev->y < gf_val(1, G_BFU_FONT_SIZE) && (ev->b & BM_ACT) == BTN_DOWN) { + #ifdef G + if (F && ev->x < ses->back_size) { + go_back(ses); +@@ -3792,7 +3792,7 @@ + struct f_data_c *f; + if (!(f = current_frame(ses)) || !f->f_data) return; + if ((h = create_download_file(ses, ses->term->cwd, file, 0, 0)) < 0) return; +- if (dump_to_file(f->f_data, h)) msg_box(ses->term, NULL, TEXT(T_SAVE_ERROR), AL_CENTER, TEXT(T_ERROR_WRITING_TO_FILE), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ if (dump_to_file(f->f_data, h)) msg_box(ses->term, NULL, TEXT(T_SAVE_ERROR), AL_CENTER, TEXT(T_ERROR_WRITING_TO_FILE), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + close(h); + } + +@@ -4173,7 +4173,7 @@ + int l = 0; + unsigned char *a; + if (!lo || !frame || !frame->vs || !frame->f_data) { +- msg_box(term, NULL, TEXT(T_INFO), AL_LEFT, TEXT(T_YOU_ARE_NOWHERE), NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(term, NULL, TEXT(T_INFO), AL_LEFT, TEXT(T_YOU_ARE_NOWHERE), NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + return; + } + s = init_str(); +@@ -4239,7 +4239,7 @@ + add_to_str(&s, &l, a); + mem_free(a); + } +- msg_box(term, getml(s, NULL), TEXT(T_INFO), AL_LEFT, s, NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(term, getml(s, NULL), TEXT(T_INFO), AL_LEFT, s, NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + } + + void state_msg(struct session *ses) +@@ -4254,7 +4254,7 @@ + unsigned char *s, *ss; + int len; + if (list_empty(ses->history)) { +- msg_box(ses->term, NULL, TEXT(T_HEADER_INFO), AL_LEFT, TEXT(T_YOU_ARE_NOWHERE), NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, NULL, TEXT(T_HEADER_INFO), AL_LEFT, TEXT(T_YOU_ARE_NOWHERE), NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + return; + } + if (!find_in_cache(cur_loc(ses)->url, &ce)) { +@@ -4265,6 +4265,6 @@ + while ((ss = strstr(s, "\r\n"))) memmove(ss, ss + 1, strlen(ss)); + while (*s && s[strlen(s) - 1] == '\n') s[strlen(s) - 1] = 0; + } +- msg_box(ses->term, getml(s, NULL), TEXT(T_HEADER_INFO), AL_LEFT, s, NULL, 1, TEXT(T_OK), NULL, B_ENTER | B_ESC); ++ msg_box(ses->term, getml(s, NULL), TEXT(T_HEADER_INFO), AL_LEFT, s, NULL, 1, TEXT(T_OK), NULL, BTN_ENTER | BTN_ESC); + } + } +diff -urN links-2.3pre2-orig/view_gr.c links-2.3pre2/view_gr.c +--- links-2.3pre2-orig/view_gr.c 2011-04-19 15:17:50.000000000 +0000 ++++ links-2.3pre2/view_gr.c 2011-05-13 09:10:56.174325760 +0000 +@@ -800,7 +800,7 @@ + void g_text_mouse(struct f_data_c *fd, struct g_object_text *a, int x, int y, int b) + { + int e; +- g_set_current_link(fd, a, x, y, (b == (B_UP | B_LEFT))); ++ g_set_current_link(fd, a, x, y, (b == (BTN_UP | BTN_LEFT))); + + #ifdef JS + if (fd->vs&&fd->f_data&&fd->vs->current_link>=0&&fd->vs->current_linkf_data->nlinks) +@@ -809,16 +809,16 @@ + + struct link *l=&(fd->f_data->links[fd->vs->current_link]); + +- if (l->js_event&&l->js_event->up_code&&(b&BM_ACT)==B_UP) ++ if (l->js_event&&l->js_event->up_code&&(b&BM_ACT)==BTN_UP) + jsint_execute_code(fd,l->js_event->up_code,strlen(l->js_event->up_code),-1,-1,-1, NULL); + +- if (l->js_event&&l->js_event->down_code&&(b&BM_ACT)==B_DOWN) ++ if (l->js_event&&l->js_event->down_code&&(b&BM_ACT)==BTN_DOWN) + jsint_execute_code(fd,l->js_event->down_code,strlen(l->js_event->down_code),-1,-1,-1, NULL); + + } + #endif + +- if (b == (B_UP | B_LEFT)) { ++ if (b == (BTN_UP | BTN_LEFT)) { + int ix = ismap_x, iy = ismap_y, il = ismap_link; + ismap_x = x; + ismap_y = y; +@@ -835,7 +835,7 @@ + if (e == 2) fd->f_data->locked_on = (struct g_object *)a; + return; + } +- if (b == (B_UP | B_RIGHT)) { ++ if (b == (BTN_UP | BTN_RIGHT)) { + if (fd->vs->current_link != -1) link_menu(fd->ses->term, NULL, fd->ses); + } + } +@@ -994,15 +994,15 @@ + if (!fd->f_data) return 0; + switch (ev->ev) { + case EV_MOUSE: +- if ((ev->b & BM_BUTT) == B_WHEELUP) goto up; +- if ((ev->b & BM_BUTT) == B_WHEELDOWN) goto down; +- if ((ev->b & BM_BUTT) == B_WHEELUP1) goto up1; +- if ((ev->b & BM_BUTT) == B_WHEELDOWN1) goto down1; +- if ((ev->b & BM_BUTT) == B_WHEELLEFT) goto left; +- if ((ev->b & BM_BUTT) == B_WHEELRIGHT) goto right; +- if ((ev->b & BM_BUTT) == B_WHEELLEFT1) goto left1; +- if ((ev->b & BM_BUTT) == B_WHEELRIGHT1) goto right1; +- if ((ev->b & BM_ACT) == B_MOVE) ses->scrolling = 0; ++ if ((ev->b & BM_BUTT) == BTN_WHEELUP) goto up; ++ if ((ev->b & BM_BUTT) == BTN_WHEELDOWN) goto down; ++ if ((ev->b & BM_BUTT) == BTN_WHEELUP1) goto up1; ++ if ((ev->b & BM_BUTT) == BTN_WHEELDOWN1) goto down1; ++ if ((ev->b & BM_BUTT) == BTN_WHEELLEFT) goto left; ++ if ((ev->b & BM_BUTT) == BTN_WHEELRIGHT) goto right; ++ if ((ev->b & BM_BUTT) == BTN_WHEELLEFT1) goto left1; ++ if ((ev->b & BM_BUTT) == BTN_WHEELRIGHT1) goto right1; ++ if ((ev->b & BM_ACT) == BTN_MOVE) ses->scrolling = 0; + if (ses->scrolling == 1) process_sb_move(fd, ses->scrolltype ? ev->x : ev->y); + if (ses->scrolling == 2) { + fd->vs->view_pos = -ev->y + ses->scrolloff; +@@ -1010,31 +1010,31 @@ + fd->vs->orig_view_pos = fd->vs->view_pos; + fd->vs->orig_view_posx = fd->vs->view_posx; + draw_graphical_doc(fd->ses->term, fd, 1); +- if ((ev->b & BM_ACT) == B_UP) { ++ if ((ev->b & BM_ACT) == BTN_UP) { + ses->scrolling = 0; + } + break; + } + if (ses->scrolling) { +- if ((ev->b & BM_ACT) == B_UP) { ++ if ((ev->b & BM_ACT) == BTN_UP) { + ses->scrolling = 0; + } + break; + } + + +- if ((ev->b & BM_ACT) == B_DOWN && fd->f_data->vsb && ev_in_rect(ev, fd->xw - G_SCROLL_BAR_WIDTH, 0, fd->xw, fd->yw - fd->f_data->hsb * G_SCROLL_BAR_WIDTH)) { ++ if ((ev->b & BM_ACT) == BTN_DOWN && fd->f_data->vsb && ev_in_rect(ev, fd->xw - G_SCROLL_BAR_WIDTH, 0, fd->xw, fd->yw - fd->f_data->hsb * G_SCROLL_BAR_WIDTH)) { + process_sb_event(fd, ev->y, 0); + break; + } +- if ((ev->b & BM_ACT) == B_DOWN && fd->f_data->hsb && ev_in_rect(ev, 0, fd->yw - G_SCROLL_BAR_WIDTH, fd->xw - fd->f_data->vsb * G_SCROLL_BAR_WIDTH, fd->yw)) { ++ if ((ev->b & BM_ACT) == BTN_DOWN && fd->f_data->hsb && ev_in_rect(ev, 0, fd->yw - G_SCROLL_BAR_WIDTH, fd->xw - fd->f_data->vsb * G_SCROLL_BAR_WIDTH, fd->yw)) { + process_sb_event(fd, ev->x, 1); + break; + } + if (fd->f_data->vsb && ev_in_rect(ev, fd->xw - G_SCROLL_BAR_WIDTH, 0, fd->xw, fd->yw)) return 0; + if (fd->f_data->hsb && ev_in_rect(ev, 0, fd->yw - G_SCROLL_BAR_WIDTH, fd->xw, fd->yw)) return 0; + +- if ((ev->b & BM_ACT) == B_DOWN && (ev->b & BM_BUTT) == B_MIDDLE) { ++ if ((ev->b & BM_ACT) == BTN_DOWN && (ev->b & BM_BUTT) == BTN_MIDDLE) { + scrll: + ses->scrolltype = ev->x + fd->vs->view_posx; + ses->scrolloff = ev->y + fd->vs->view_pos; +@@ -1047,7 +1047,7 @@ + fd->vs->g_display_link = 0; + if (fd->vs->current_link >= 0 && fd->vs->current_link < fd->f_data->nlinks) redraw_link(fd, fd->vs->current_link); + } +- if (!(ev->b == (B_LEFT | B_UP) && fd->f_data->hlt_len && fd->f_data->start_highlight_x == -1)) { ++ if (!(ev->b == (BTN_LEFT | BTN_UP) && fd->f_data->hlt_len && fd->f_data->start_highlight_x == -1)) { + fd->vs->current_link = -1; + fd->vs->orig_link = fd->vs->current_link; + fd->f_data->root->mouse_event(fd, fd->f_data->root, ev->x + fd->vs->view_posx, ev->y + fd->vs->view_pos, ev->b); +@@ -1057,14 +1057,14 @@ + } + + /* highlight text */ +- if ((ev->b & BM_ACT) == B_DOWN && (ev->b & BM_BUTT) == B_LEFT) { /* start highlighting */ ++ if ((ev->b & BM_ACT) == BTN_DOWN && (ev->b & BM_BUTT) == BTN_LEFT) { /* start highlighting */ + fd->f_data->start_highlight_x = ev->x; + fd->f_data->start_highlight_y = ev->y; + fd->f_data->hlt_len = 0; + fd->f_data->hlt_pos = -1; + return 1; + } +- if (((ev->b & BM_ACT) == B_DRAG || (ev->b & BM_ACT) == B_UP) && (ev->b & BM_BUTT) == B_LEFT) { /* stop highlighting */ ++ if (((ev->b & BM_ACT) == BTN_DRAG || (ev->b & BM_ACT) == BTN_UP) && (ev->b & BM_BUTT) == BTN_LEFT) { /* stop highlighting */ + struct g_object_text *t; + if (fd->f_data->start_highlight_x != -1) { + if (abs(ev->x - fd->f_data->start_highlight_x) < 8 && abs(ev->y - fd->f_data->start_highlight_y) < 8) goto skip_hl; +@@ -1088,7 +1088,7 @@ + g_get_search_data(fd->f_data); + end=t->srch_pos+g_find_text_pos(t, ev->x+fd->vs->view_posx); + fd->f_data->hlt_len=end-fd->f_data->hlt_pos; +- if ((ev->b & BM_ACT) == B_UP || (ev->b & BM_ACT) == B_DRAG) { ++ if ((ev->b & BM_ACT) == BTN_UP || (ev->b & BM_ACT) == BTN_DRAG) { + unsigned char *m = memacpy(fd->f_data->srch_string + fd->f_data->hlt_pos + (fd->f_data->hlt_len > 0 ? 0 : fd->f_data->hlt_len), fd->f_data->hlt_len > 0 ? fd->f_data->hlt_len : -fd->f_data->hlt_len); + if (m) { + unsigned char *p = m; +@@ -1118,7 +1118,7 @@ + } + #endif + +- if ((ev->b & BM_ACT) == B_DOWN && (ev->b & BM_BUTT) == B_RIGHT && fd->vs->current_link == -1) goto scrll; ++ if ((ev->b & BM_ACT) == BTN_DOWN && (ev->b & BM_BUTT) == BTN_RIGHT && fd->vs->current_link == -1) goto scrll; + break; + case EV_KBD: + if (ses->locked_link && fd->vs->current_link >= 0 && fd->vs->current_link < fd->f_data->nlinks && (fd->f_data->links[fd->vs->current_link].type == L_FIELD || fd->f_data->links[fd->vs->current_link].type == L_AREA)) { +@@ -1507,7 +1507,7 @@ + g_get_search_data(f->f_data); + g_get_search(f->f_data, f->ses->search_word); + search_word = f->ses->search_word; +- if (!f->f_data->n_search_positions) msg_box(f->ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_SEARCH_STRING_NOT_FOUND), NULL, 1, TEXT(T_CANCEL), NULL, B_ENTER | B_ESC); ++ if (!f->f_data->n_search_positions) msg_box(f->ses->term, NULL, TEXT(T_SEARCH), AL_CENTER, TEXT(T_SEARCH_STRING_NOT_FOUND), NULL, 1, TEXT(T_CANCEL), NULL, BTN_ENTER | BTN_ESC); + + highlight_positions = f->f_data->search_positions; + highlight_lengths = f->f_data->search_lengths; +diff -urN links-2.3pre2-orig/x.c links-2.3pre2/x.c +--- links-2.3pre2-orig/x.c 2011-04-19 15:17:50.000000000 +0000 ++++ links-2.3pre2/x.c 2011-05-13 09:04:16.722993152 +0000 +@@ -571,28 +571,28 @@ + #endif + gd=x_find_gd(&(last_event.xmotion.window)); + if (!gd)break; +- a=B_LEFT; +- b=B_MOVE; ++ a=BTN_LEFT; ++ b=BTN_MOVE; + if ((last_event.xmotion.state)&Button1Mask) + { +- a=B_LEFT; +- b=B_DRAG; ++ a=BTN_LEFT; ++ b=BTN_DRAG; + #ifdef X_DEBUG + MESSAGE("left button/drag\n"); + #endif + } + if ((last_event.xmotion.state)&Button2Mask) + { +- a=B_MIDDLE; +- b=B_DRAG; ++ a=BTN_MIDDLE; ++ b=BTN_DRAG; + #ifdef X_DEBUG + MESSAGE("middle button/drag\n"); + #endif + } + if ((last_event.xmotion.state)&Button3Mask) + { +- a=B_RIGHT; +- b=B_DRAG; ++ a=BTN_RIGHT; ++ b=BTN_DRAG; + #ifdef X_DEBUG + MESSAGE("right button/drag\n"); + #endif +@@ -718,15 +718,15 @@ + switch(event.xbutton.button) + { + case 1: +- a=B_LEFT; ++ a=BTN_LEFT; + break; + + case 3: +- a=B_RIGHT; ++ a=BTN_RIGHT; + break; + + case 2: +- a=B_MIDDLE; ++ a=BTN_MIDDLE; + break; + + default: +@@ -735,7 +735,7 @@ + } + x_clip_number(&(event.xmotion.x),gd->size.x1,gd->size.x2); + x_clip_number(&(event.xmotion.y),gd->size.y1,gd->size.y2); +- gd->mouse_handler(gd,event.xbutton.x,event.xbutton.y,a|B_UP); ++ gd->mouse_handler(gd,event.xbutton.x,event.xbutton.y,a|BTN_UP); + r_xx:; + } + break; +@@ -757,31 +757,31 @@ + switch(event.xbutton.button) + { + case 1: +- a=B_LEFT; ++ a=BTN_LEFT; + break; + + case 3: +- a=B_RIGHT; ++ a=BTN_RIGHT; + break; + + case 2: +- a=B_MIDDLE; ++ a=BTN_MIDDLE; + break; + + case 4: +- a=B_WHEELUP; ++ a=BTN_WHEELUP; + break; + + case 5: +- a=B_WHEELDOWN; ++ a=BTN_WHEELDOWN; + break; + + case 6: +- a=B_WHEELLEFT; ++ a=BTN_WHEELLEFT; + break; + + case 7: +- a=B_WHEELRIGHT; ++ a=BTN_WHEELRIGHT; + break; + + default: +@@ -789,7 +789,7 @@ + } + x_clip_number(&(event.xmotion.x),gd->size.x1,gd->size.x2); + x_clip_number(&(event.xmotion.y),gd->size.y1,gd->size.y2); +- gd->mouse_handler(gd,event.xbutton.x,event.xbutton.y,a|(a != B_WHEELDOWN && a != B_WHEELUP && a != B_WHEELLEFT && a != B_WHEELRIGHT ? B_DOWN : B_MOVE)); ++ gd->mouse_handler(gd,event.xbutton.x,event.xbutton.y,a|(a != BTN_WHEELDOWN && a != BTN_WHEELUP && a != BTN_WHEELLEFT && a != BTN_WHEELRIGHT ? BTN_DOWN : BTN_MOVE)); + p_xx:; + } + break; +@@ -858,28 +858,28 @@ + #endif + gd=x_find_gd(&(last_event.xmotion.window)); + if (!gd)goto ret; +- a=B_LEFT; +- b=B_MOVE; ++ a=BTN_LEFT; ++ b=BTN_MOVE; + if ((last_event.xmotion.state)&Button1Mask) + { +- a=B_LEFT; +- b=B_DRAG; ++ a=BTN_LEFT; ++ b=BTN_DRAG; + #ifdef X_DEBUG + MESSAGE("left button/drag\n"); + #endif + } + if ((last_event.xmotion.state)&Button2Mask) + { +- a=B_MIDDLE; +- b=B_DRAG; ++ a=BTN_MIDDLE; ++ b=BTN_DRAG; + #ifdef X_DEBUG + MESSAGE("middle button/drag\n"); + #endif + } + if ((last_event.xmotion.state)&Button3Mask) + { +- a=B_RIGHT; +- b=B_DRAG; ++ a=BTN_RIGHT; ++ b=BTN_DRAG; + #ifdef X_DEBUG + MESSAGE("right button/drag\n"); + #endif diff --git a/www-client/netsurf/netsurf-2.1.bep b/www-client/netsurf/netsurf-2.1.bep index 28d699620..f1fd077b1 100644 --- a/www-client/netsurf/netsurf-2.1.bep +++ b/www-client/netsurf/netsurf-2.1.bep @@ -18,30 +18,30 @@ BUILD { cd libparserutils echo 'CFLAGS += -DWITH_ICONV_FILTER' > Makefile.config.override make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libwapcaplet make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../hubbub make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libcss make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libnsgif make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libnsbmp make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../librosprite make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libsvgtiny make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd .. - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/www-client/netsurf/netsurf-2.6.bep b/www-client/netsurf/netsurf-2.6.bep index 463eb5d59..8285bec06 100644 --- a/www-client/netsurf/netsurf-2.6.bep +++ b/www-client/netsurf/netsurf-2.6.bep @@ -1,10 +1,10 @@ DESCRIPTION="NetSurf is a multi-platform web browser" HOMEPAGE="http://www.netsurf-browser.org/" -SRC_URI="http://www.netsurf-browser.org/downloads/development/netsurf-r10808.tar.gz" +SRC_URI="http://www.netsurf-browser.org/downloads/releases/netsurf-2.6-src.tar.gz" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -CHECKSUM_MD5="4700e911ac79accd14b6fdd5e9197a1a" +CHECKSUM_MD5="8653789d2ede6dbbfe79882afc7538fc" BUILD { cd netsurf svn co svn://svn.netsurf-browser.org/trunk/libparserutils @@ -18,29 +18,29 @@ BUILD { cd libparserutils echo 'CFLAGS += -DWITH_ICONV_FILTER' > Makefile.config.override make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libwapcaplet make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../hubbub make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libcss make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libnsgif make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libnsbmp make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libsvgtiny make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../librosprite - patch -p0 -ui ../../../patches/librosprite.patch +# patch -p0 -ui ../../../patches/librosprite.patch make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd .. make beos } diff --git a/www-client/netsurf/netsurf-2.7-svn.bep b/www-client/netsurf/netsurf-2.7-svn.bep index 31d5efd1b..fd2d8c123 100644 --- a/www-client/netsurf/netsurf-2.7-svn.bep +++ b/www-client/netsurf/netsurf-2.7-svn.bep @@ -3,9 +3,15 @@ HOMEPAGE="http://www.netsurf-browser.org/" SRC_URI="svn+svn://svn.netsurf-browser.org/trunk/netsurf" REVISION="1" STATUS_HAIKU="stable" -DEPEND="" +DEPEND="dev-util/gperf >= 3.0.4 + media-libs/libmng > 1.0.10 + dev-libs/pkgconfig >= 0.25 + net-misc/curl >= 7.21.6" BUILD { cd netsurf-2.7-svn + + sed -i 's/B_TOOLTIP_/B_TOOL_TIP_/g' beos/system_colour.cpp + svn co svn://svn.netsurf-browser.org/trunk/libparserutils svn co svn://svn.netsurf-browser.org/trunk/libwapcaplet svn co svn://svn.netsurf-browser.org/trunk/hubbub @@ -38,7 +44,7 @@ BUILD { make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../librosprite make CFLAGS="" - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd .. make beos } diff --git a/www-client/netsurf/netsurf-2.7.bep b/www-client/netsurf/netsurf-2.7.bep new file mode 100644 index 000000000..8394fd42d --- /dev/null +++ b/www-client/netsurf/netsurf-2.7.bep @@ -0,0 +1,59 @@ +DESCRIPTION="NetSurf is a multi-platform web browser" +HOMEPAGE="http://www.netsurf-browser.org/" +SRC_URI="http://www.netsurf-browser.org/downloads/releases/netsurf-2.7-src.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/gperf >= 3.0.4 + media-libs/libmng > 1.0.10 + dev-libs/pkgconfig >= 0.25 + net-misc/curl >= 7.21.6" +CHECKSUM_MD5="52939f2e2319269d7d758ec665f6cb8e" + +BUILD { + cd netsurf + sed -i 's/B_TOOLTIP_/B_TOOL_TIP_/g' beos/system_colour.cpp + svn co svn://svn.netsurf-browser.org/trunk/libparserutils -r12456 + svn co svn://svn.netsurf-browser.org/trunk/libwapcaplet -r12456 + svn co svn://svn.netsurf-browser.org/trunk/hubbub -r12456 + svn co svn://svn.netsurf-browser.org/trunk/libcss -r12456 + svn co svn://svn.netsurf-browser.org/trunk/libnsgif -r12456 + svn co svn://svn.netsurf-browser.org/trunk/libnsbmp -r12456 + svn co svn://svn.netsurf-browser.org/trunk/librosprite -r12456 + svn co svn://svn.netsurf-browser.org/trunk/libsvgtiny -r12456 + cd libparserutils + echo 'CFLAGS += -DWITH_ICONV_FILTER' > Makefile.config.override + make + make install PREFIX=`finddir B_COMMON_DIRECTORY` + cd ../libwapcaplet + make + make install PREFIX=`finddir B_COMMON_DIRECTORY` + cd ../hubbub + make + make install PREFIX=`finddir B_COMMON_DIRECTORY` + cd ../libcss + make + make install PREFIX=`finddir B_COMMON_DIRECTORY` + cd ../libnsgif + make + make install PREFIX=`finddir B_COMMON_DIRECTORY` + cd ../libnsbmp + make + make install PREFIX=`finddir B_COMMON_DIRECTORY` + cd ../libsvgtiny + make + make install PREFIX=`finddir B_COMMON_DIRECTORY` + cd ../librosprite + make CFLAGS="" + make install PREFIX=`finddir B_COMMON_DIRECTORY` + cd .. + make beos +} + +INSTALL { + cd netsurf + make install +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2011 The NetSurf Developers" diff --git a/www-client/netsurf/netsurf-2.9.bep b/www-client/netsurf/netsurf-2.9.bep new file mode 100644 index 000000000..95d70633f --- /dev/null +++ b/www-client/netsurf/netsurf-2.9.bep @@ -0,0 +1,28 @@ +DESCRIPTION="NetSurf is a multi-platform web browser" +HOMEPAGE="http://www.netsurf-browser.org/" +SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-2.9-full-src.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/gperf >= 3.0.4 + media-libs/libmng > 1.0.10 + dev-libs/pkgconfig >= 0.25 + net-misc/curl >= 7.21.6 + media-libs/libpng >= 1.5.7 + media-libs/jpeg >= 8d + media-libs/libwebp >= 0.1.3 + media-libs/lcms >= 2.1" +CHECKSUM_MD5="cfc2789997b356f2ea9d9f7694c4c909" + +BUILD { + cd netsurf-2.9 + make +} + +INSTALL { + cd netsurf-2.9 + make install +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/www-client/netsurf/netsurf-2.HEAD.bep b/www-client/netsurf/netsurf-2.HEAD.bep new file mode 100644 index 000000000..c13cdb423 --- /dev/null +++ b/www-client/netsurf/netsurf-2.HEAD.bep @@ -0,0 +1,34 @@ +DESCRIPTION="NetSurf is a multi-platform web browser" +HOMEPAGE="http://www.netsurf-browser.org/" +SRC_URI="git://git.netsurf-browser.org/netsurf.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/gperf >= 3.0.4 + media-libs/libmng > 1.0.10 + dev-libs/pkgconfig >= 0.25 + net-misc/curl >= 7.21.6 + media-libs/libpng >= 1.5.7 + media-libs/jpeg >= 8d + media-libs/libwebp >= 0.1.3 + media-libs/lcms >= 2.1 + media-libs/libsvgtiny >= 0.HEAD + media-libs/libnsbmp >= 0.0.3 + media-libs/libnsgif >= 0.0.3 + dev-libs/libcss >= 0.1.2 + dev-libs/libwapcaplet >= 0.1.1-HEAD + net-libs/libdom >= 0 + " + +BUILD { + cd netsurf-2.HEAD + make +} + +INSTALL { + cd netsurf-2.HEAD + make install +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/www-client/netsurf/netsurf-9799.bep b/www-client/netsurf/netsurf-9799.bep index 2d2f5b525..5870ed123 100644 --- a/www-client/netsurf/netsurf-9799.bep +++ b/www-client/netsurf/netsurf-9799.bep @@ -20,28 +20,28 @@ BUILD { cd libparserutils echo 'CFLAGS += -DWITH_ICONV_FILTER' > Makefile.config.override make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libwapcaplet make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../hubbub make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libcss make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libnsgif make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libnsbmp make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` # cd ../librosprite # make -# make install PREFIX=/boot/common +# make install PREFIX=`finddir B_COMMON_DIRECTORY` cd ../libsvgtiny make - make install PREFIX=/boot/common + make install PREFIX=`finddir B_COMMON_DIRECTORY` cd .. make } diff --git a/www-client/netsurf/patches/librosprite.patch b/www-client/netsurf/patches/librosprite.patch deleted file mode 100644 index cbaa2e8b5..000000000 --- a/www-client/netsurf/patches/librosprite.patch +++ /dev/null @@ -1,311 +0,0 @@ -Index: librosprite.c -=================================================================== ---- librosprite.c (revision 10841) -+++ librosprite.c (working copy) -@@ -233,11 +233,14 @@ - - rosprite_error rosprite_load(reader reader, void* ctx, struct rosprite_area** result) - { -+ uint32_t firstSpriteOffset, firstFreeWordOffset; -+ int bytes_read; -+ uint32_t i; -+ - struct rosprite_area* sprite_area = malloc(sizeof(struct rosprite_area)); - - ERRCHK(rosprite_read_word(reader, ctx, &(sprite_area->sprite_count))); - -- uint32_t firstSpriteOffset, firstFreeWordOffset; - ERRCHK(rosprite_read_word(reader, ctx, &firstSpriteOffset)); - ERRCHK(rosprite_read_word(reader, ctx, &firstFreeWordOffset)); /* TODO: use this for some sanity checking? */ - sprite_area->extension_size = 16 - firstSpriteOffset; -@@ -245,14 +248,14 @@ - sprite_area->extension_words = NULL; - if (sprite_area->extension_size > 0) { - sprite_area->extension_words = malloc(sprite_area->extension_size); -- int bytes_read = reader(sprite_area->extension_words, (size_t) (sprite_area->extension_size), ctx); -+ bytes_read = reader(sprite_area->extension_words, (size_t) (sprite_area->extension_size), ctx); - if (bytes_read < (signed long) sprite_area->extension_size) { - return ROSPRITE_EOF; - } - } - - sprite_area->sprites = malloc(sizeof(struct rosprite*) * sprite_area->sprite_count); /* allocate array of pointers */ -- for (uint32_t i = 0; i < sprite_area->sprite_count; i++) { -+ for (i = 0; i < sprite_area->sprite_count; i++) { - struct rosprite* sprite; - ERRCHK(rosprite_load_sprite(reader, ctx, &sprite)); - sprite_area->sprites[i] = sprite; -@@ -265,7 +268,8 @@ - - void rosprite_destroy_sprite_area(struct rosprite_area* sprite_area) - { -- for (uint32_t i = 0; i < sprite_area->sprite_count; i++) { -+ uint32_t i; -+ for (i = 0; i < sprite_area->sprite_count; i++) { - struct rosprite* sprite = sprite_area->sprites[i]; - if (sprite->has_palette) free(sprite->palette); - free(sprite->image); -@@ -279,15 +283,18 @@ - - rosprite_error rosprite_load_palette(reader reader, void* ctx, struct rosprite_palette** result) - { -+ uint32_t c; -+ uint8_t b[6]; -+ unsigned int bytesRead; -+ - /* TODO: currently assume palette has linear entries (2nd byte in is 00, 01, 02 etc) */ - struct rosprite_palette* palette = malloc(sizeof(struct rosprite_palette)); - - palette->palette = malloc(sizeof(uint32_t) * 256); /* allocate 256 whether we need them all or not */ - -- uint32_t c = 0; -- uint8_t b[6]; -+ c = 0; - -- unsigned int bytesRead = reader(b, 6, ctx); -+ bytesRead = reader(b, 6, ctx); - assert(bytesRead % 6 == 0); - while (bytesRead == 6) { - assert(b[0] == 19); /* VDU 19 */ -@@ -360,13 +367,13 @@ - - int rosprite_mem_reader(uint8_t* buf, size_t count, void* ctx) - { -+ size_t copy_size; - struct rosprite_mem_context* memctx = (struct rosprite_mem_context*) ctx; - if (memctx->offset + count > memctx->size) { - return -1; - } - - // if we're asked for more memory than the block contains, only copy as much as we can -- size_t copy_size; - if ((memctx->offset + count) > memctx->size) { - copy_size = memctx->size - memctx->offset; - } else { -@@ -385,11 +392,17 @@ - rosprite_error rosprite_load_sprite(reader reader, void* ctx, struct rosprite** result) - { - uint32_t nextSpriteOffset; -- ERRCHK(rosprite_read_word(reader, ctx, &nextSpriteOffset)); -- -+ uint32_t imageOffset; -+ uint32_t maskOffset, spriteModeWord; -+ uint32_t paletteEntries; -+ uint8_t* image; -+ uint8_t* mask = NULL; -+ - struct rosprite* sprite = malloc(sizeof(struct rosprite)); - struct rosprite_header* header = malloc(sizeof(struct rosprite_header)); - -+ ERRCHK(rosprite_read_word(reader, ctx, &nextSpriteOffset)); -+ - reader(sprite->name, 12, ctx); - sprite->name[12] = '\0'; - -@@ -400,11 +413,9 @@ - ERRCHK(rosprite_read_word(reader, ctx, &(header->first_used_bit))); /* old format only (spriteType = 0) */ - ERRCHK(rosprite_read_word(reader, ctx, &(header->last_used_bit))); - -- uint32_t imageOffset; - ERRCHK(rosprite_read_word(reader, ctx, &imageOffset)); - assert(imageOffset >= 44); /* should never be smaller than the size of the header) */ - -- uint32_t maskOffset, spriteModeWord; - ERRCHK(rosprite_read_word(reader, ctx, &maskOffset)); - ERRCHK(rosprite_read_word(reader, ctx, &spriteModeWord)); - -@@ -431,31 +442,30 @@ - } - - if (sprite->has_palette) { -+ uint32_t j, word1, word2, entry; - assert(sprite->palettesize % 8 == 0); - sprite->palette = malloc(sizeof(uint32_t) * sprite->palettesize); -- uint32_t paletteEntries = sprite->palettesize / 8; -+ paletteEntries = sprite->palettesize / 8; - - /* Each palette entry is two words big - * The second word is a duplicate of the first - * I think this is in case you ever wanted flashing colours - * PRM1-730 - */ -- for (uint32_t j = 0; j < paletteEntries; j++) { -- uint32_t word1, word2; -+ for (j = 0; j < paletteEntries; j++) { - ERRCHK(rosprite_read_word(reader, ctx, &word1)); - ERRCHK(rosprite_read_word(reader, ctx, &word2)); - assert(word1 == word2); /* if they aren't equal, flashing colours are desired, which we don't support */ - - /* swap rr and bb parts -- PRM1-731 */ -- uint32_t entry = ((word1 & 0xff000000) >> 16) | (word1 & 0x00ff0000) | ((word1 & 0x0000ff00) << 16) | 0xff; -+ entry = ((word1 & 0xff000000) >> 16) | (word1 & 0x00ff0000) | ((word1 & 0x0000ff00) << 16) | 0xff; - sprite->palette[j] = entry; - } - } - -- uint8_t* image = malloc(header->image_size); -+ image = malloc(header->image_size); - reader(image, header->image_size, ctx); - -- uint8_t* mask = NULL; - if (sprite->has_mask) { - mask = malloc(header->mask_size); - reader(mask, header->mask_size, ctx); -@@ -547,32 +557,36 @@ - static rosprite_error rosprite_load_high_color(uint8_t* image_in, uint8_t* mask, struct rosprite* sprite, struct rosprite_header* header) - { - struct rosprite_mask_state* mask_state = NULL; -+ uint32_t currentByteIndex = 0; -+ uint32_t j, x, y, x_pixels, pixel; -+ bool has_alpha_pixel_data = false; -+ uint8_t b; -+ bool old_has_alpha; -+ - if (sprite->has_mask) { - ERRCHK(rosprite_init_mask_state(sprite, header, mask, &mask_state)); - } - - sprite->image = malloc(sprite->width * sprite->height * 4); /* all image data is 32bpp going out */ - -- uint32_t currentByteIndex = 0; -+ /* Spec says that there must be no left-hand wastage */ -+ assert(header->first_used_bit == 0); -+ -+ { - const uint32_t bpp = sprite->mode.colorbpp; - const uint32_t bytesPerPixel = bpp / 8; - const uint32_t row_max_bit = header->width_words * 32 - (31 - header->last_used_bit); /* Last used bit in row */ - -- bool has_alpha_pixel_data = false; -- -- /* Spec says that there must be no left-hand wastage */ -- assert(header->first_used_bit == 0); -- -- for (uint32_t y = 0; y < sprite->height; y++) { -- uint32_t x_pixels = 0; -- for (uint32_t x = 0; x < row_max_bit; x += bpp) { -- uint32_t pixel = 0; -- for (uint32_t j = 0; j < bytesPerPixel; j++) { -- uint8_t b = image_in[currentByteIndex++]; -+ for (y = 0; y < sprite->height; y++) { -+ x_pixels = 0; -+ for (x = 0; x < row_max_bit; x += bpp) { -+ pixel = 0; -+ for (j = 0; j < bytesPerPixel; j++) { -+ b = image_in[currentByteIndex++]; - pixel = pixel | (b << (j * 8)); - } - -- bool old_has_alpha = has_alpha_pixel_data; -+ old_has_alpha = has_alpha_pixel_data; - pixel = rosprite_upscale_color(pixel, &(sprite->mode), &has_alpha_pixel_data); - if (old_has_alpha != has_alpha_pixel_data && (y > 0 || x_pixels > 0)) { - rosprite_fix_alpha(sprite->image, (y * sprite->width) + x_pixels - 1); -@@ -590,7 +604,7 @@ - currentByteIndex = (currentByteIndex + 3) & ~3; /* Round up to next multiple of 4 */ - } - } -- -+ } - if (sprite->has_mask) free(mask_state); - return ROSPRITE_OK; - } -@@ -601,7 +615,8 @@ - */ - static inline void rosprite_fix_alpha(uint32_t* image, unsigned long pixels) - { -- for (uint32_t i = 0; i <= pixels; i++) { -+ uint32_t i; -+ for (i = 0; i <= pixels; i++) { - image[i] = image[i] & 0xffffff00; - } - } -@@ -613,6 +628,10 @@ - */ - static rosprite_error rosprite_load_low_color(uint8_t* image_in, uint8_t* mask, struct rosprite* sprite, struct rosprite_header* header) - { -+ uint32_t current_byte_index, currentword; -+ uint32_t x, y, x_pixels, pixel; -+ uint8_t mask_pixel; -+ - struct rosprite_mask_state* mask_state = NULL; - if (sprite->has_mask) { - ERRCHK(rosprite_init_mask_state(sprite, header, mask, &mask_state)); -@@ -620,23 +639,24 @@ - - sprite->image = malloc(sprite->width * sprite->height * 4); /* all image data is 32bpp going out */ - -+ { - const uint32_t bpp = sprite->mode.colorbpp; - const uint32_t row_max_bit = header->width_words * 32 - (31 - header->last_used_bit); /* Last used bit in row */ - const uint32_t bitmask = (1 << bpp) - 1; /* creates a mask of 1s that is bpp bits wide */ -- -- uint32_t current_byte_index = 0; -- uint32_t currentword = BTUINT((image_in + current_byte_index)); -+ -+ current_byte_index = 0; -+ currentword = BTUINT((image_in + current_byte_index)); - current_byte_index += 4; - -- for (uint32_t y = 0; y < sprite->height; y++) { -- uint32_t x_pixels = 0; -- for (uint32_t x = header->first_used_bit; x < row_max_bit ; x += bpp) { -+ for (y = 0; y < sprite->height; y++) { -+ x_pixels = 0; -+ for (x = header->first_used_bit; x < row_max_bit ; x += bpp) { - const uint32_t offset_into_word = x % 32; - -- uint32_t pixel = (currentword & (bitmask << offset_into_word)) >> offset_into_word; -+ pixel = (currentword & (bitmask << offset_into_word)) >> offset_into_word; - pixel = rosprite_palette_lookup(sprite, pixel); /* lookup returns 32bpp */ - if (sprite->has_mask) { -- uint8_t mask_pixel = rosprite_next_mask_pixel(mask, mask_state); -+ mask_pixel = rosprite_next_mask_pixel(mask, mask_state); - pixel = (pixel & 0xffffff00) | mask_pixel; - } - sprite->image[y*sprite->width + x_pixels] = pixel; -@@ -655,7 +675,7 @@ - current_byte_index += 4; - } - } -- -+ } - if (sprite->has_mask) free(mask_state); - - return ROSPRITE_OK; -@@ -759,6 +779,7 @@ - */ - static uint32_t rosprite_upscale_color(uint32_t pixel, struct rosprite_mode* mode, bool* has_alpha_pixel_data) - { -+ uint8_t alpha; - switch (mode->colorbpp) { - case 32: - if (mode->color_model == ROSPRITE_RGB) { -@@ -798,7 +819,7 @@ - assert(false); /* unknown bpp */ - } - -- uint8_t alpha = pixel & 0xff; -+ alpha = pixel & 0xff; - if (alpha == 0x00) { - if (!(*has_alpha_pixel_data)) { - pixel = pixel | 0xff; -Index: Makefile -=================================================================== ---- Makefile (revision 10841) -+++ Makefile (working copy) -@@ -8,13 +8,7 @@ - PKG_CONFIG = pkg-config - - ARFLAGS = -cru --CFLAGS = -g -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \ -- -Wwrite-strings -Wstrict-prototypes \ -- -Wnested-externs -Werror -pedantic -std=c99 \ -- -Wno-format-zero-length -Wformat-security -Wstrict-aliasing=2 \ -- -Wmissing-format-attribute -Wunused -Wunreachable-code \ -- -Wformat=2 -Werror-implicit-function-declaration \ -- -Wmissing-declarations -Wmissing-prototypes -+CFLAGS = -g - LDFLAGS = -g -L./ - - # Installation prefix, if not already defined (e.g. on command line) diff --git a/www-client/netsurf/patches/netsurf-2.7.patch b/www-client/netsurf/patches/netsurf-2.7.patch new file mode 100644 index 000000000..a7e08f8cc --- /dev/null +++ b/www-client/netsurf/patches/netsurf-2.7.patch @@ -0,0 +1,18 @@ +diff -urN netsurf/Makefile.defaults netsurf-haiku/Makefile.defaults +--- netsurf/Makefile.defaults 2011-03-20 23:32:44.054525952 +0000 ++++ netsurf-haiku/Makefile.defaults 2011-06-04 00:09:37.272105472 +0000 +@@ -179,12 +179,12 @@ + + + # Where to install the netsurf binary +- NETSURF_BEOS_BIN := /boot/apps/netsurf/ ++ NETSURF_BEOS_BIN := $(shell finddir B_APPS_DIRECTORY)/NetSurf/ + + # TODO:HAIKU -- not sure if ~/.netsurf applies in beos + # Where to search for NetSurf's resources after looking in ~/.netsurf and + # $NETSURFRES. It must have a trailing / +- NETSURF_BEOS_RESOURCES := /boot/apps/netsurf/res/ ++ NETSURF_BEOS_RESOURCES := $(shell finddir B_APPS_DIRECTORY)/NetSurf/res/ + + # Enable NetSurf's use of libsvgtiny for displaying SVGs + # Valid options: YES, NO, AUTO diff --git a/www-client/netsurf/patches/netsurf-2.9.patch b/www-client/netsurf/patches/netsurf-2.9.patch new file mode 100644 index 000000000..ff7b69f98 --- /dev/null +++ b/www-client/netsurf/patches/netsurf-2.9.patch @@ -0,0 +1,77 @@ +diff -ur netsurf-2.9/libcss-0.1.2/include/libcss/font_face.h netsurf-2.9-c89/libcss-0.1.2/include/libcss/font_face.h +--- netsurf-2.9/libcss-0.1.2/include/libcss/font_face.h 2011-12-04 21:06:24.023592960 +0000 ++++ netsurf-2.9-c89/libcss-0.1.2/include/libcss/font_face.h 2012-08-30 23:10:26.000000000 +0000 +@@ -33,7 +33,7 @@ + CSS_FONT_FACE_FORMAT_SVG = 0x08, + /* SVG Font; .svg, .svgz */ + +- CSS_FONT_FACE_FORMAT_UNKNOWN = 0x10, ++ CSS_FONT_FACE_FORMAT_UNKNOWN = 0x10 + /* Format specified, but not recognised */ + + /* We don't define CSS_FONT_FACE_SRC_FORMAT_TRUETYPE as might be +@@ -49,7 +49,7 @@ + typedef enum css_font_face_location_type { + CSS_FONT_FACE_LOCATION_TYPE_UNSPECIFIED = 0, + CSS_FONT_FACE_LOCATION_TYPE_LOCAL = 1, +- CSS_FONT_FACE_LOCATION_TYPE_URI = 2, ++ CSS_FONT_FACE_LOCATION_TYPE_URI = 2 + } css_font_face_location_type; + + +diff -ur netsurf-2.9/libcss-0.1.2/include/libcss/properties.h netsurf-2.9-c89/libcss-0.1.2/include/libcss/properties.h +--- netsurf-2.9/libcss-0.1.2/include/libcss/properties.h 2012-01-28 20:25:01.023330816 +0000 ++++ netsurf-2.9-c89/libcss-0.1.2/include/libcss/properties.h 2012-08-30 23:11:48.000000000 +0000 +@@ -287,7 +287,7 @@ + enum css_column_rule_color_e { + CSS_COLUMN_RULE_COLOR_INHERIT = CSS_BACKGROUND_COLOR_INHERIT, + CSS_COLUMN_RULE_COLOR_COLOR = CSS_BACKGROUND_COLOR_COLOR, +- CSS_COLUMN_RULE_COLOR_CURRENT_COLOR = CSS_BACKGROUND_COLOR_CURRENT_COLOR, ++ CSS_COLUMN_RULE_COLOR_CURRENT_COLOR = CSS_BACKGROUND_COLOR_CURRENT_COLOR + }; + + enum css_column_rule_style_e { +diff -ur netsurf-2.9/libcss-0.1.2/src/parse/properties/content.c netsurf-2.9-c89/libcss-0.1.2/src/parse/properties/content.c +--- netsurf-2.9/libcss-0.1.2/src/parse/properties/content.c 2011-01-26 12:49:58.027000832 +0000 ++++ netsurf-2.9-c89/libcss-0.1.2/src/parse/properties/content.c 2012-08-30 23:23:00.000000000 +0000 +@@ -33,7 +33,7 @@ + css_style *result) + { + int orig_ctx = *ctx; +- css_error error; ++ css_error error = 0; + const css_token *token; + bool match; + +diff -ur netsurf-2.9/libcss-0.1.2/src/parse/properties/quotes.c netsurf-2.9-c89/libcss-0.1.2/src/parse/properties/quotes.c +--- netsurf-2.9/libcss-0.1.2/src/parse/properties/quotes.c 2011-01-26 12:49:58.027787264 +0000 ++++ netsurf-2.9-c89/libcss-0.1.2/src/parse/properties/quotes.c 2012-08-30 23:25:08.000000000 +0000 +@@ -32,7 +32,7 @@ + css_style *result) + { + int orig_ctx = *ctx; +- css_error error; ++ css_error error = 0; + const css_token *token; + bool match; + +diff -ur netsurf-2.9/netsurf-2.9/Makefile.defaults netsurf-2.9-c89/netsurf-2.9/Makefile.defaults +--- netsurf-2.9/netsurf-2.9/Makefile.defaults 2012-01-01 21:42:38.027000832 +0000 ++++ netsurf-2.9-c89/netsurf-2.9/Makefile.defaults 2012-08-31 16:45:50.000000000 +0000 +@@ -186,13 +186,13 @@ + ifeq ($(TARGET),beos) + + ++ # HAIKU use finddir + # Where to install the netsurf binary +- NETSURF_BEOS_BIN := /boot/apps/netsurf/ ++ NETSURF_BEOS_BIN := $(shell finddir B_APPS_DIRECTORY)/NetSurf/ + +- # TODO:HAIKU -- not sure if ~/.netsurf applies in beos + # Where to search for NetSurf's resources after looking in ~/.netsurf and + # $NETSURFRES. It must have a trailing / +- NETSURF_BEOS_RESOURCES := /boot/apps/netsurf/res/ ++ NETSURF_BEOS_RESOURCES := $(shell finddir B_APPS_DIRECTORY)/NetSurf/res/ + + # Enable NetSurf's use of libsvgtiny for displaying SVGs + # Valid options: YES, NO, AUTO diff --git a/www-client/netsurf/patches/netsurf-2.HEAD.patch b/www-client/netsurf/patches/netsurf-2.HEAD.patch new file mode 100644 index 000000000..606e567c4 --- /dev/null +++ b/www-client/netsurf/patches/netsurf-2.HEAD.patch @@ -0,0 +1,272 @@ +diff --git a/beos/download.cpp b/beos/download.cpp +index bdd85b5..6927dcb 100644 +--- a/beos/download.cpp ++++ b/beos/download.cpp +@@ -29,6 +29,7 @@ extern "C" { + #include + #include + #include ++#include + #include + + class NSDownloadWindow: public BWindow +@@ -192,12 +193,23 @@ struct gui_download_window *gui_download_window_create(download_context *ctx, + download->window = new NSDownloadWindow(ctx); + + // Also ask the user where to save the file +- // TODO inject the suggested name somehow + BMessage* msg = new BMessage(B_SAVE_REQUESTED); + + BFilePanel* panel = new BFilePanel(B_SAVE_PANEL, + new BMessenger(download->window), NULL, 0, false); + ++ BWindow* win = panel->Window(); ++ ++ win->LockLooper(); ++ ++ BView* background = win->ChildAt(0); ++ BView* nameView = background->FindView("text view"); ++ ++ BTextControl* txt = dynamic_cast(nameView); ++ txt->SetText(download_context_get_filename(ctx)); ++ ++ win->UnlockLooper(); ++ + msg->AddPointer("source", panel); + msg->AddPointer("dw", download); + panel->SetMessage(msg); +diff --git a/beos/gui.cpp b/beos/gui.cpp +index ff9b92d..b2f4043 100644 +--- a/beos/gui.cpp ++++ b/beos/gui.cpp +@@ -378,12 +378,12 @@ static void gui_init2(int argc, char** argv) + /* create an initial browser window */ + error = nsurl_create(addr, &url); + if (error == NSERROR_OK) { +- error = browser_window_create(BROWSER_WINDOW_VERIFIABLE | +- BROWSER_WINDOW_HISTORY, +- url, +- NULL, +- NULL, +- NULL); ++ error = browser_window_create((browser_window_nav_flags) ++ (BROWSER_WINDOW_VERIFIABLE | BROWSER_WINDOW_HISTORY), ++ url, ++ NULL, ++ NULL, ++ NULL); + nsurl_unref(url); + } + if (error != NSERROR_OK) { +@@ -414,7 +414,7 @@ int main(int argc, char** argv) + new NSBrowserApplication; + } + +- char* messages = "/boot/apps/netsurf/res/en/Messages"; ++ const char* messages = "/boot/apps/netsurf/res/en/Messages"; + + /* initialise netsurf */ + netsurf_init(&argc, &argv, options.Path(), messages); +@@ -439,7 +439,7 @@ int gui_init_replicant(int argc, char** argv) + options.Append("x-vnd.NetSurf"); + } + +- char* messages = "/boot/apps/netsurf/res/en/Messages"; ++ const char* messages = "/boot/apps/netsurf/res/en/Messages"; + + /* initialise netsurf */ + netsurf_init(&argc, &argv, options.Path(), messages); +diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp +index 873c9e8..7f2b120 100644 +--- a/beos/scaffolding.cpp ++++ b/beos/scaffolding.cpp +@@ -140,7 +140,6 @@ struct replicant_thread_info { + + + static int open_windows = 0; /**< current number of open browsers */ +-static struct beos_scaffolding *current_model; /**< current window for model dialogue use */ + static NSBaseView *replicant_view = NULL; /**< if not NULL, the replicant View we are running NetSurf for */ + static sem_id replicant_done_sem = -1; + +@@ -558,7 +557,7 @@ static void nsbeos_window_destroy_event(NSBrowserWindow *window, nsbeos_scaffold + } + + +-void nsbeos_scaffolding_update_colors(nsbeos_scaffolding *g) ++static void nsbeos_scaffolding_update_colors(nsbeos_scaffolding *g) + { + if (!g->top_view->LockLooper()) + return; +@@ -592,7 +591,6 @@ NSBrowserWindow::activeWindow = NULL; + + void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *message) + { +- int width, height; + struct browser_window *bw; + bw = nsbeos_get_browser_for_gui(scaffold->top_level); + bool reloadAll = false; +@@ -649,32 +647,28 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m + } else + url << path.Path(); + +- nsurl *nsurl; +- nserror error; +- +- error = nsurl_create(url.String(), &nsurl); +- if (error == NSERROR_OK) { +- if (/*message->WasDropped() &&*/ i == 0) { +- browser_window_navigate(bw, +- nsurl, +- NULL, +- BROWSER_WINDOW_HISTORY | +- BROWSER_WINDOW_VERIFIABLE, +- NULL, +- NULL, +- NULL); +- } else { +- error = browser_window_create(BROWSER_WINDOW_VERIFIABLE, +- nsurl, +- NULL, +- bw, +- NULL); +- } +- nsurl_unref(nsurl); +- } +- if (error != NSERROR_OK) { +- warn_user(messages_get_errorcode(error), 0); +- } ++ nsurl *nsurl; ++ nserror error; ++ ++ error = nsurl_create(url.String(), &nsurl); ++ if (error == NSERROR_OK) { ++ if (/*message->WasDropped() &&*/ i == 0) { ++ browser_window_navigate(bw, nsurl, NULL, ++ (browser_window_nav_flags) ++ (BROWSER_WINDOW_HISTORY | BROWSER_WINDOW_VERIFIABLE), ++ NULL, NULL, NULL); ++ } else { ++ error = browser_window_create(BROWSER_WINDOW_VERIFIABLE, ++ nsurl, ++ NULL, ++ bw, ++ NULL); ++ } ++ nsurl_unref(nsurl); ++ } ++ if (error != NSERROR_OK) { ++ warn_user(messages_get_errorcode(error), 0); ++ } + } + break; + } +@@ -712,23 +706,23 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m + if (message->FindString("be:url", &url) < B_OK) + break; + +- nsurl *nsurl; +- nserror error; +- +- error = nsurl_create(url.String(), &nsurl); +- if (error != NSERROR_OK) { +- warn_user(messages_get_errorcode(error), 0); +- } else { +- browser_window_navigate(bw, +- nsurl, +- NULL, +- BROWSER_WINDOW_HISTORY | +- BROWSER_WINDOW_VERIFIABLE, +- NULL, +- NULL, +- NULL); +- nsurl_unref(nsurl); +- } ++ nsurl *nsurl; ++ nserror error; ++ ++ error = nsurl_create(url.String(), &nsurl); ++ if (error != NSERROR_OK) { ++ warn_user(messages_get_errorcode(error), 0); ++ } else { ++ browser_window_navigate(bw, ++ nsurl, ++ NULL, ++ (browser_window_nav_flags)(BROWSER_WINDOW_HISTORY | ++ BROWSER_WINDOW_VERIFIABLE), ++ NULL, ++ NULL, ++ NULL); ++ nsurl_unref(nsurl); ++ } + break; + } + case B_COPY: +@@ -777,35 +771,35 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m + case BROWSER_NAVIGATE_HOME: + case 'home': + { +- nsurl *url; +- nserror error; ++ nsurl *url; ++ nserror error; + + static const char *addr = NETSURF_HOMEPAGE; + + if (nsoption_charp(homepage_url) != NULL) { + addr = nsoption_charp(homepage_url); +- } ++ } + +- error = nsurl_create(addr, &url); +- if (error != NSERROR_OK) { +- warn_user(messages_get_errorcode(error), 0); +- } else { +- browser_window_navigate(bw, ++ error = nsurl_create(addr, &url); ++ if (error != NSERROR_OK) { ++ warn_user(messages_get_errorcode(error), 0); ++ } else { ++ browser_window_navigate(bw, + url, + NULL, +- BROWSER_WINDOW_HISTORY | +- BROWSER_WINDOW_VERIFIABLE, ++ (browser_window_nav_flags)(BROWSER_WINDOW_HISTORY | ++ BROWSER_WINDOW_VERIFIABLE), + NULL, + NULL, + NULL); +- nsurl_unref(url); +- } ++ nsurl_unref(url); ++ } + break; + } + case 'urle': + { +- nsurl *url; +- nserror error; ++ nsurl *url; ++ nserror error; + BString text; + + if (!scaffold->url_bar->LockLooper()) +@@ -822,8 +816,8 @@ void nsbeos_scaffolding_dispatch_event(nsbeos_scaffolding *scaffold, BMessage *m + browser_window_navigate(bw, + url, + NULL, +- BROWSER_WINDOW_HISTORY | +- BROWSER_WINDOW_VERIFIABLE, ++ (browser_window_nav_flags)(BROWSER_WINDOW_HISTORY | ++ BROWSER_WINDOW_VERIFIABLE), + NULL, + NULL, + NULL); +@@ -1034,7 +1028,6 @@ void nsbeos_scaffolding_destroy(nsbeos_scaffolding *scaffold) + + void nsbeos_window_update_back_forward(struct beos_scaffolding *g) + { +- int width, height; + struct browser_window *bw = nsbeos_get_browser_for_gui(g->top_level); + + if (!g->top_view->LockLooper()) diff --git a/www-client/w3m/licenses/W3M b/www-client/w3m/licenses/W3M new file mode 100644 index 000000000..a7e0282f8 --- /dev/null +++ b/www-client/w3m/licenses/W3M @@ -0,0 +1,11 @@ + (C) Copyright 1994-2002 by Akinori Ito + (C) Copyright 2002-2011 by Akinori Ito, Hironori Sakamoto, Fumitoshi Ukai + +Use, modification and redistribution of this software is hereby granted, +provided that this entire copyright notice is included on any copies of +this software and applications and derivations thereof. + +This software is provided on an "as is" basis, without warranty of any +kind, either expressed or implied, as to any matter including, but not +limited to warranty of fitness of purpose, or merchantability, or +results obtained from use of this software. diff --git a/www-client/w3m/patches/w3m-0.5.3.patch b/www-client/w3m/patches/w3m-0.5.3.patch new file mode 100644 index 000000000..b7a47197b --- /dev/null +++ b/www-client/w3m/patches/w3m-0.5.3.patch @@ -0,0 +1,74 @@ +diff -up w3m-0.5.3/acinclude.m4.orig w3m-0.5.3/acinclude.m4 +--- w3m-0.5.3/acinclude.m4.orig 2011-01-04 02:22:18.056885248 -0700 ++++ w3m-0.5.3/acinclude.m4 2012-05-04 23:23:51.741605376 -0600 +@@ -382,7 +382,7 @@ AC_DEFUN([AC_W3M_EXTLIBS], + [lib=$1 + AC_MSG_CHECKING(for -l$lib) + extlib="not found" +- for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64 ++ for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64 /boot/common/lib /boot/develop/abi/current/lib + do + if test -f $dir/lib$lib.a -o -f $dir/lib$lib.so ; then + LIBS="$LIBS -l$lib" +@@ -420,7 +420,7 @@ AC_ARG_WITH(gc, + [test x"$with_gc" = xno && AC_MSG_ERROR([You can not build w3m without gc])], + [with_gc="yes"]) + AC_MSG_RESULT($with_gc) +- test x"$with_gc" = xyes && with_gc="/usr /usr/local ${HOME}" ++ test x"$with_gc" = xyes && with_gc="/usr /usr/local /boot/common ${HOME}" + unset ac_cv_header_gc_h + AC_CHECK_HEADER(gc.h) + if test x"$ac_cv_header_gc_h" = xno; then +@@ -477,7 +477,7 @@ AC_MSG_RESULT($with_ssl) + if test x"$with_ssl" != xno; then + PKG_CHECK_MODULES(SSL, openssl,,[ + AC_MSG_CHECKING(for SSL library/header) +- test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local" ++ test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local /boot/common" + AC_MSG_RESULT($with_ssl) + for dir in $with_ssl + do +diff -up w3m-0.5.3/configure.ac.orig w3m-0.5.3/configure.ac +--- w3m-0.5.3/configure.ac.orig 2011-01-14 20:01:55.044826624 -0700 ++++ w3m-0.5.3/configure.ac 2012-05-04 23:25:37.043778048 -0600 +@@ -82,7 +82,7 @@ AC_W3M_MAILER + AC_W3M_EXT_BROWSER + + dnl Checks for ext libs +-for lib in bsd BSD 44bsd socket nsl dld dl ++for lib in bsd BSD 44bsd socket network nsl dld dl + do + AC_W3M_EXTLIBS($lib) + done +@@ -169,7 +169,14 @@ AC_SUBST(HELP_DIR) + HELP_DIR="$datadir/$PACKAGE" + AC_DEFINE(HELP_DIR, "$HELP_DIR") + AC_SUBST(RC_DIR) +-RC_DIR="~/.$PACKAGE" ++case "$host_os" in ++ *haiku*) ++ RC_DIR="~/config/settings/$PACKAGE" ++ ;; ++ *) ++ RC_DIR="~/.$PACKAGE" ++ ;; ++esac + AC_DEFINE(RC_DIR, "$RC_DIR") + AC_SUBST(DOCDIRS) + DOCDIRS="doc:en_English doc-jp:ja_Japanese" +diff -up w3m-0.5.3/main.c.orig w3m-0.5.3/main.c +--- w3m-0.5.3/main.c.orig 2011-01-04 02:42:19.049807360 -0700 ++++ w3m-0.5.3/main.c 2012-05-04 23:23:51.778305536 -0600 +@@ -833,7 +833,12 @@ main(int argc, char **argv, char **envp) + mySignal(SIGPIPE, SigPipe); + #endif + ++#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2 ++ orig_GC_warn_proc = GC_get_warn_proc(); ++ GC_set_warn_proc(wrap_GC_warn_proc); ++#else + orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); ++#endif + err_msg = Strnew(); + if (load_argc == 0) { + /* no URL specified */ diff --git a/www-client/w3m/w3m-0.5.3.bep b/www-client/w3m/w3m-0.5.3.bep new file mode 100644 index 000000000..fc8b1b292 --- /dev/null +++ b/www-client/w3m/w3m-0.5.3.bep @@ -0,0 +1,30 @@ +DESCRIPTION="Text based WWW browser, supports tables and frames" +HOMEPAGE="http://w3m.sourceforge.net/" +SRC_URI="http://sourceforge.net/projects/w3m/files/w3m/w3m-0.5.3/w3m-0.5.3.tar.gz/download" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/boehm-gc >= 7.2_alpha6 + sys-libs/ncurses >= 5.9 + dev-libs/openssl >= 0.9.8l + sys-devel/gettext >= 0.17" +CHECKSUM_MD5="1b845a983a50b8dec0169ac48479eacc" +BUILD { + cd w3m-0.5.3 + libtoolize -fci + autoconf + ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ + --sysconfdir="$(finddir B_COMMON_SETTINGS_DIRECTORY)" \ + --mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \ + --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" + make +} + +INSTALL { + cd w3m-0.5.3 + make install +} + +LICENSE="W3M" +COPYRIGHT="1994-2011 Akinori ITO + 2002-2011 Hironori SAKAMOTO + 2002-2011 Fumitoshi UKAI" diff --git a/www-servers/apache/apache-2.2.17.bep b/www-servers/apache/apache-2.2.17.bep index b51ecbfa5..201911275 100644 --- a/www-servers/apache/apache-2.2.17.bep +++ b/www-servers/apache/apache-2.2.17.bep @@ -12,7 +12,7 @@ BUILD { aclocal autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_SERVERS_DIRECTORY` \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` make diff --git a/www-servers/apache/apache-2.2.22.bep b/www-servers/apache/apache-2.2.22.bep new file mode 100644 index 000000000..66ac4713a --- /dev/null +++ b/www-servers/apache/apache-2.2.22.bep @@ -0,0 +1,32 @@ +DESCRIPTION="The Apache Web Server." +HOMEPAGE="http://httpd.apache.org" +SRC_URI="http://apache.osuosl.org//httpd/httpd-2.2.22.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/apr >= 1.4 2 + dev-libs/apr-utils >= 1.3.9" +CHECKSUM_MD5="d77fa5af23df96a8af68ea8114fa6ce1" +BUILD { + cd httpd-2.2.22 + libtoolize --force --copy --install + aclocal + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` + make +} + +INSTALL { + cd httpd-2.2.22 + make install +} + +TEST { + cd httpd-2.2.22 + make test +} + +LICENSE="Apache v2" +COPYRIGHT="2012 The Apache Software Foundation." diff --git a/www-servers/apache/apache-2.4.3.bep b/www-servers/apache/apache-2.4.3.bep new file mode 100644 index 000000000..10bc209c9 --- /dev/null +++ b/www-servers/apache/apache-2.4.3.bep @@ -0,0 +1,33 @@ +DESCRIPTION="The Apache Web Server." +HOMEPAGE="http://httpd.apache.org" +SRC_URI="http://apache.osuosl.org//httpd/httpd-2.4.3.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-libs/apr >= 1.4 2 + dev-libs/apr-util >= 1.3.9" +CHECKSUM_MD5="538dccd22dd18466fff3ec7948495417" +BUILD { + cd httpd-2.4.3 + libtoolize --force --copy --install + aclocal + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ + --with-z=`finddir B_COMMON_LIB_DIRECTORY` + make +} + +INSTALL { + cd httpd-2.4.3 + make install +} + +TEST { + cd httpd-2.4.3 + make test +} + +LICENSE="Apache v2" +COPYRIGHT="2012 The Apache Software Foundation." diff --git a/www-servers/apache/patches/apache-2.2.22.patch b/www-servers/apache/patches/apache-2.2.22.patch new file mode 100644 index 000000000..d615f7fc3 --- /dev/null +++ b/www-servers/apache/patches/apache-2.2.22.patch @@ -0,0 +1,48 @@ +diff -urN httpd-2.2.22/server/mpm_common.c httpd-2.2.22-haiku/server/mpm_common.c +--- httpd-2.2.22/server/mpm_common.c 2010-10-07 16:56:54.055836672 +0000 ++++ httpd-2.2.22-haiku/server/mpm_common.c 2011-02-05 10:58:12.295436288 +0000 +@@ -950,7 +950,7 @@ + + static const char *dash_k_arg; + +-static int send_signal(pid_t pid, int sig) ++static int _send_signal(pid_t pid, int sig) + { + if (kill(pid, sig) < 0) { + ap_log_error(APLOG_MARK, APLOG_STARTUP, errno, NULL, +@@ -1007,7 +1007,7 @@ + printf("%s\n", status); + } + else { +- send_signal(otherpid, SIGTERM); ++ _send_signal(otherpid, SIGTERM); + } + return 1; + } +@@ -1017,7 +1017,7 @@ + printf("httpd not running, trying to start\n"); + } + else { +- *exit_status = send_signal(otherpid, SIGHUP); ++ *exit_status = _send_signal(otherpid, SIGHUP); + return 1; + } + } +@@ -1027,7 +1027,7 @@ + printf("httpd not running, trying to start\n"); + } + else { +- *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL); ++ *exit_status = _send_signal(otherpid, AP_SIG_GRACEFUL); + return 1; + } + } +@@ -1038,7 +1038,7 @@ + printf("%s\n", status); + } + else { +- *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL_STOP); ++ *exit_status = _send_signal(otherpid, AP_SIG_GRACEFUL_STOP); + } + #else + printf("httpd MPM \"" MPM_NAME "\" does not support graceful-stop\n"); diff --git a/www-servers/apache/patches/apache-2.4.3.patch b/www-servers/apache/patches/apache-2.4.3.patch new file mode 100644 index 000000000..714cf4479 --- /dev/null +++ b/www-servers/apache/patches/apache-2.4.3.patch @@ -0,0 +1,172 @@ +diff -urN httpd-2.4.3/modules/proxy/mod_proxy_connect.c httpd-2.4.3-haiku/modules/proxy/mod_proxy_connect.c +--- httpd-2.4.3/modules/proxy/mod_proxy_connect.c 2012-07-28 14:40:23.041680896 +0000 ++++ httpd-2.4.3-haiku/modules/proxy/mod_proxy_connect.c 2012-12-02 06:58:17.131072000 +0000 +@@ -254,7 +254,7 @@ + rv = apr_sockaddr_info_get(&nexthop, connectname, APR_UNSPEC, + connectport, 0, p); + if (rv != APR_SUCCESS) { +- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO() ++ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + "failed to resolve hostname '%s'", connectname); + return ap_proxyerror(r, HTTP_BAD_GATEWAY, + apr_pstrcat(p, "DNS lookup failure for: ", +diff -urN httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c httpd-2.4.3-haiku/modules/slotmem/mod_slotmem_shm.c +--- httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c 2012-04-03 13:36:55.037224448 +0000 ++++ httpd-2.4.3-haiku/modules/slotmem/mod_slotmem_shm.c 2012-12-02 06:58:40.734265344 +0000 +@@ -33,7 +33,7 @@ + #include /* for getpid() */ + #endif + +-#if HAVE_SYS_SEM_H ++#if HAVE_SYS_SHM_H + #include + #if !defined(SHM_R) + #define SHM_R 0400 +diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 +--- httpd-2.4.3/acinclude.m4 2012-07-23 15:20:48.061341696 +0000 ++++ httpd-2.4.3-haiku/acinclude.m4 2012-12-02 15:18:03.000000000 +0000 +@@ -4,25 +4,25 @@ + dnl AC_HELP_STRING, so let's try to call it if we can. + dnl Note: this define must be on one line so that it can be properly returned + dnl as the help string. +-AC_DEFUN(APACHE_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl ++AC_DEFUN([APACHE_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl + + dnl APACHE_SUBST(VARIABLE) + dnl Makes VARIABLE available in generated files + dnl (do not use @variable@ in Makefiles, but $(variable)) +-AC_DEFUN(APACHE_SUBST,[ ++AC_DEFUN([APACHE_SUBST],[ + APACHE_VAR_SUBST="$APACHE_VAR_SUBST $1" + AC_SUBST($1) + ]) + + dnl APACHE_FAST_OUTPUT(FILENAME) + dnl Perform substitutions on FILENAME (Makefiles only) +-AC_DEFUN(APACHE_FAST_OUTPUT,[ ++AC_DEFUN([APACHE_FAST_OUTPUT],[ + APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $1" + ]) + + dnl APACHE_GEN_CONFIG_VARS + dnl Creates config_vars.mk +-AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ ++AC_DEFUN([APACHE_GEN_CONFIG_VARS],[ + APACHE_SUBST(abs_srcdir) + APACHE_SUBST(bindir) + APACHE_SUBST(sbindir) +@@ -112,14 +112,14 @@ + + dnl APACHE_GEN_MAKEFILES + dnl Creates Makefiles +-AC_DEFUN(APACHE_GEN_MAKEFILES,[ ++AC_DEFUN([APACHE_GEN_MAKEFILES],[ + $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $APACHE_FAST_OUTPUT_FILES + ]) + + dnl ## APACHE_OUTPUT(file) + dnl ## adds "file" to the list of files generated by AC_OUTPUT + dnl ## This macro can be used several times. +-AC_DEFUN(APACHE_OUTPUT, [ ++AC_DEFUN([APACHE_OUTPUT], [ + APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1" + ]) + +@@ -128,7 +128,7 @@ + dnl + dnl If rlim_t is not defined, define it to int + dnl +-AC_DEFUN(APACHE_TYPE_RLIM_T, [ ++AC_DEFUN([APACHE_TYPE_RLIM_T], [ + AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [ + AC_TRY_COMPILE([ + #include +@@ -146,7 +146,7 @@ + ]) + + dnl APACHE_MODPATH_INIT(modpath) +-AC_DEFUN(APACHE_MODPATH_INIT,[ ++AC_DEFUN([APACHE_MODPATH_INIT],[ + current_dir=$1 + modpath_current=modules/$1 + modpath_static= +@@ -155,7 +155,7 @@ + > $modpath_current/modules.mk + ])dnl + dnl +-AC_DEFUN(APACHE_MODPATH_FINISH,[ ++AC_DEFUN([APACHE_MODPATH_FINISH],[ + echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk + echo "static = $modpath_static" >> $modpath_current/modules.mk + echo "shared = $modpath_shared" >> $modpath_current/modules.mk +@@ -168,7 +168,7 @@ + ])dnl + dnl + dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]]) +-AC_DEFUN(APACHE_MODPATH_ADD,[ ++AC_DEFUN([APACHE_MODPATH_ADD],[ + if test -z "$3"; then + objects="mod_$1.lo" + else +@@ -214,7 +214,7 @@ + dnl path -- relative path to MPM (default: server/mpm/mpmname) + dnl libs -- libs needed by this MPM + dnl +-AC_DEFUN(APACHE_MPM_MODULE,[ ++AC_DEFUN([APACHE_MPM_MODULE],[ + if ap_mpm_is_enabled $1; then + if test -z "$3"; then + objects="$1.lo" +@@ -291,7 +291,7 @@ + dnl prereq_module's APACHE_MODULE() statement must have been processed + dnl before the current APACHE_MODULE() statement. + dnl +-AC_DEFUN(APACHE_MODULE,[ ++AC_DEFUN([APACHE_MODULE],[ + AC_MSG_CHECKING(whether to enable mod_$1) + define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl + AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),force_$1=$enableval,enable_$1=ifelse($5,,maybe-all,$5)) +@@ -392,7 +392,7 @@ + dnl + dnl APACHE_ENABLE_MODULES + dnl +-AC_DEFUN(APACHE_ENABLE_MODULES,[ ++AC_DEFUN([APACHE_ENABLE_MODULES],[ + module_selection=most + module_default=shared + +@@ -452,7 +452,7 @@ + ]) + ]) + +-AC_DEFUN(APACHE_REQUIRE_CXX,[ ++AC_DEFUN([APACHE_REQUIRE_CXX],[ + if test -z "$apache_cxx_done"; then + AC_PROG_CXX + AC_PROG_CXXCPP +@@ -466,7 +466,7 @@ + dnl Configure for OpenSSL, giving preference to + dnl "--with-ssl=" if it was specified. + dnl +-AC_DEFUN(APACHE_CHECK_OPENSSL,[ ++AC_DEFUN([APACHE_CHECK_OPENSSL],[ + AC_CACHE_CHECK([for OpenSSL], [ac_cv_openssl], [ + dnl initialise the variables we use + ac_cv_openssl=no +@@ -576,14 +576,14 @@ + dnl apache will use while generating scripts like autoconf and apxs and + dnl the default config file. + +-AC_DEFUN(APACHE_SUBST_EXPANDED_ARG,[ ++AC_DEFUN([APACHE_SUBST_EXPANDED_ARG],[ + APR_EXPAND_VAR(exp_$1, [$]$1) + APACHE_SUBST(exp_$1) + APR_PATH_RELATIVE(rel_$1, [$]exp_$1, ${prefix}) + APACHE_SUBST(rel_$1) + ]) + +-AC_DEFUN(APACHE_EXPORT_ARGUMENTS,[ ++AC_DEFUN([APACHE_EXPORT_ARGUMENTS],[ + APACHE_SUBST_EXPANDED_ARG(exec_prefix) + APACHE_SUBST_EXPANDED_ARG(bindir) + APACHE_SUBST_EXPANDED_ARG(sbindir) diff --git a/www-servers/cherokee/cherokee-1.2.101.bep b/www-servers/cherokee/cherokee-1.2.101.bep new file mode 100644 index 000000000..468b11357 --- /dev/null +++ b/www-servers/cherokee/cherokee-1.2.101.bep @@ -0,0 +1,32 @@ +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" +STATUS_HAIKU="broken" +DEPEND="" +CHECKSUM_MD5="ef47003355a2e368e4d9596cd070ef23" +BUILD { + cd cherokee-1.2.101 + libtoolize --force --copy --install + aclocal -I m4 + autoheader + automake --add-missing + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-nls=no + make +} + +INSTALL { + cd cherokee-1.2.101 + make install +} + +TEST { + cd cherokee-1.2.101 +# make test +# make check +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2001-2011 Alvaro Lopez Ortega" diff --git a/www-servers/cherokee/patches/cherokee-1.2.101.patch b/www-servers/cherokee/patches/cherokee-1.2.101.patch new file mode 100644 index 000000000..71e854259 --- /dev/null +++ b/www-servers/cherokee/patches/cherokee-1.2.101.patch @@ -0,0 +1,21 @@ +diff -urN cherokee-1.2.101/configure.in cherokee-1.2.101-haiku/configure.in +--- cherokee-1.2.101/configure.in 2011-10-18 18:49:42.034865152 +0000 ++++ cherokee-1.2.101-haiku/configure.in 2012-07-19 15:37:24.169869312 +0000 +@@ -109,6 +109,9 @@ + setenv_is_threadsafe="yes" + libdl="-ldl" + ;; ++ *-*-haiku*) ++ libdl="" ++ ;; + *-*-hpux*) + libdl="-ldl" + ;; +@@ -324,6 +327,7 @@ + + AC_CHECK_FUNC(socket, :, [ + AC_CHECK_LIB(socket, main) ++ AC_CHECK_LIB(network, socket) + AC_CHECK_LIB(net, main) + AC_CHECK_LIB(nsl_s, main) + AC_CHECK_LIB(nsl, main) diff --git a/www-servers/haproxy/haproxy-1.4.22.bep b/www-servers/haproxy/haproxy-1.4.22.bep new file mode 100644 index 000000000..fa1d3ce35 --- /dev/null +++ b/www-servers/haproxy/haproxy-1.4.22.bep @@ -0,0 +1,22 @@ +DESCRIPTION="Reliable, high performace TCP/HTTP load balancer" +HOMEPAGE="http://haproxy.1wt.eu/" +SRC_URI="http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz" +CHECKSUM_MD5="a0b007c76f6a78524f3b3dd5e704979c" +STATUS_HAIKU="stable" +REVISION="1" +BUILD { + cd haproxy-1.4.22 + make TARGET=haiku PREFIX= SBINDIR=`finddir B_COMMON_BIN_DIRECTORY` \ + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` +} + +INSTALL { + cd haproxy-1.4.22 + make install DESTDIR=$DESTDIR PREFIX= SBINDIR=`finddir B_COMMON_BIN_DIRECTORY` \ + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2012 Willy Tarreau" \ No newline at end of file diff --git a/www-servers/haproxy/patches/haproxy-1.4.22.patch b/www-servers/haproxy/patches/haproxy-1.4.22.patch new file mode 100644 index 000000000..5f0a50fb8 --- /dev/null +++ b/www-servers/haproxy/patches/haproxy-1.4.22.patch @@ -0,0 +1,47 @@ +diff -ur haproxy-1.4.22/Makefile haproxy-1.4.22-haiku/Makefile +--- haproxy-1.4.22/Makefile 2012-08-14 07:09:31.000000000 +0000 ++++ haproxy-1.4.22-haiku/Makefile 2012-12-28 02:09:24.868483072 +0000 +@@ -176,6 +176,12 @@ + USE_POLL = implicit + USE_TPROXY = implicit + else ++ifeq ($(TARGET),haiku) ++ # For Haiku ++ TARGET_LDFLAGS = -lnetwork ++ USE_POLL = implicit ++ USE_TPROXY = implicit ++else + ifeq ($(TARGET),linux22) + # This is for Linux 2.2 + USE_GETSOCKNAME = implicit +@@ -269,6 +275,7 @@ + endif # linux24e + endif # linux24 + endif # linux22 ++endif # haiku + endif # generic + + +diff -ur haproxy-1.4.22/src/proto_http.c haproxy-1.4.22-haiku/src/proto_http.c +--- haproxy-1.4.22/src/proto_http.c 2012-08-14 07:09:31.000000000 +0000 ++++ haproxy-1.4.22-haiku/src/proto_http.c 2012-12-28 02:09:24.873988096 +0000 +@@ -3973,13 +3973,15 @@ + int http_send_name_header(struct http_txn *txn, struct http_msg *msg, struct buffer *buf, struct proxy* be, const char* srv_name) { + + struct hdr_ctx ctx; +- ++ char *hdr_name = 0; ++ char *hdr_val; ++ int hdr_name_len; + ctx.idx = 0; + +- char *hdr_name = be->server_id_hdr_name; +- int hdr_name_len = be->server_id_hdr_len; ++ hdr_name = be->server_id_hdr_name; ++ hdr_name_len = be->server_id_hdr_len; + +- char *hdr_val; ++ + + while (http_find_header2(hdr_name, hdr_name_len, msg->sol, &txn->hdr_idx, &ctx)) { + /* remove any existing values from the header */ diff --git a/www-servers/nginx/patches/nginx-1.3.0-svn.diff b/www-servers/nginx/patches/nginx-1.3.0-svn.diff new file mode 100644 index 000000000..3d089c92c --- /dev/null +++ b/www-servers/nginx/patches/nginx-1.3.0-svn.diff @@ -0,0 +1,66 @@ +Index: src/os/unix/ngx_errno.c +=================================================================== +--- src/os/unix/ngx_errno.c (revision 4615) ++++ src/os/unix/ngx_errno.c (working copy) +@@ -9,6 +9,8 @@ + #include + + ++#if (NGX_SYS_NERR) ++ + /* + * The strerror() messages are copied because: + * +@@ -85,3 +87,5 @@ + + return NGX_ERROR; + } ++ ++#endif /* NGX_SYS_NERR */ +Index: auto/os/conf +=================================================================== +--- auto/os/conf (revision 4615) ++++ auto/os/conf (working copy) +@@ -59,6 +59,16 @@ + CORE_SRCS="$UNIX_SRCS" + ;; + ++ Haiku:*) ++ # Haiku ++ have=NGX_HAIKU . auto/have_headers ++ CORE_INCS="$UNIX_INCS" ++ CORE_DEPS="$UNIX_DEPS $POSIX_DEPS" ++ CORE_SRCS="$UNIX_SRCS" ++ NGX_PREFIX="${NGX_PREFIX:-`finddir B_COMMON_DIRECTORY`}" ++ NGX_SBIN_PATH="${NGX_SBIN_PATH:-`finddir B_COMMON_BIN_DIRECTORY`/nginx}" ++ ;; ++ + *) + CORE_INCS="$UNIX_INCS" + CORE_DEPS="$UNIX_DEPS $POSIX_DEPS" +@@ -70,7 +80,7 @@ + + case "$NGX_MACHINE" in + +- i386 | i686 | i86pc) ++ i386 | i686 | i86pc | BePC) + have=NGX_HAVE_NONALIGNED . auto/have + NGX_MACH_CACHE_LINE=32 + ;; +Index: auto/unix +=================================================================== +--- auto/unix (revision 4615) ++++ auto/unix (working copy) +@@ -555,9 +555,10 @@ + fi + + +-if [ $ngx_found = no ]; then ++if [ $ngx_found = no -a "$NGX_SYSTEM" != "Haiku" ]; then + +- # Solaris has no sys_nerr ++ # Solaris has no sys_nerr, so test for the maximum ++ # Haiku neither but has negative error codes, so skip this + ngx_feature='maximum errno' + ngx_feature_name=NGX_SYS_NERR + ngx_feature_run=value diff --git a/x11-libs/cairo/cairo-1.10.0.bep b/x11-libs/cairo/cairo-1.10.0.bep index 36c359c48..b23acc8b0 100644 --- a/x11-libs/cairo/cairo-1.10.0.bep +++ b/x11-libs/cairo/cairo-1.10.0.bep @@ -13,7 +13,7 @@ BUILD { aclocal -I build autoconf automake - ./configure --prefix=/boot/common --enable-beos + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-beos make } diff --git a/x11-libs/cairo/cairo-1.8.10.bep b/x11-libs/cairo/cairo-1.8.10.bep index 1fa640d51..69bfa28fd 100644 --- a/x11-libs/cairo/cairo-1.8.10.bep +++ b/x11-libs/cairo/cairo-1.8.10.bep @@ -13,7 +13,7 @@ BUILD { aclocal -I build autoconf automake - ./configure --prefix=/boot/common --enable-beos + ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-beos make } diff --git a/x11-libs/libX11/libX11-1.3.3.bep b/x11-libs/libX11/libX11-1.3.3.bep index 6d4c0240c..d5d0199d2 100644 --- a/x11-libs/libX11/libX11-1.3.3.bep +++ b/x11-libs/libX11/libX11-1.3.3.bep @@ -19,7 +19,7 @@ BUILD { cd libX11-1.3.3 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/x11-libs/libXau/libXau-1.0.5.bep b/x11-libs/libXau/libXau-1.0.5.bep index ad41e327a..fd8eee947 100644 --- a/x11-libs/libXau/libXau-1.0.5.bep +++ b/x11-libs/libXau/libXau-1.0.5.bep @@ -10,7 +10,7 @@ BUILD { cd libXau-1.0.5 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/x11-libs/libxcb/libxcb-1.6.bep b/x11-libs/libxcb/libxcb-1.6.bep index 997032721..4ecfc01c2 100644 --- a/x11-libs/libxcb/libxcb-1.6.bep +++ b/x11-libs/libxcb/libxcb-1.6.bep @@ -14,7 +14,7 @@ BUILD { cd libxcb-1.6 libtoolize --force --copy --install ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` } INSTALL { diff --git a/x11-libs/pango/pango-1.28.1.bep b/x11-libs/pango/pango-1.28.1.bep index 4d9cfe6b1..0f68809d9 100644 --- a/x11-libs/pango/pango-1.28.1.bep +++ b/x11-libs/pango/pango-1.28.1.bep @@ -15,7 +15,7 @@ DEPEND="pkgconfig >= 0.23 BUILD { cd pango-1.28.1 ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/x11-libs/pixman/pixman-0.17.2.bep b/x11-libs/pixman/pixman-0.17.2.bep index 0345029cc..db949ba89 100644 --- a/x11-libs/pixman/pixman-0.17.2.bep +++ b/x11-libs/pixman/pixman-0.17.2.bep @@ -11,7 +11,7 @@ BUILD { aclocal automake autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/x11-libs/pixman/pixman-0.18.2.bep b/x11-libs/pixman/pixman-0.18.2.bep index 39367049d..0141d1aef 100644 --- a/x11-libs/pixman/pixman-0.18.2.bep +++ b/x11-libs/pixman/pixman-0.18.2.bep @@ -11,7 +11,7 @@ BUILD { aclocal automake autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/x11-libs/pixman/pixman-0.18.4.bep b/x11-libs/pixman/pixman-0.18.4.bep index c31a522b4..8a8d9f5f1 100644 --- a/x11-libs/pixman/pixman-0.18.4.bep +++ b/x11-libs/pixman/pixman-0.18.4.bep @@ -11,7 +11,7 @@ BUILD { aclocal automake autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/x11-libs/pixman/pixman-0.19-master.bep b/x11-libs/pixman/pixman-0.19-master.bep index 187ba483f..620b4c6ef 100644 --- a/x11-libs/pixman/pixman-0.19-master.bep +++ b/x11-libs/pixman/pixman-0.19-master.bep @@ -9,7 +9,7 @@ BUILD { cd pixman-master libtoolize --force --copy --install ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/x11-libs/pixman/pixman-0.19.4.bep b/x11-libs/pixman/pixman-0.19.4.bep index 96a1ca754..c97b06ae6 100644 --- a/x11-libs/pixman/pixman-0.19.4.bep +++ b/x11-libs/pixman/pixman-0.19.4.bep @@ -9,7 +9,7 @@ BUILD { cd pixman-0.19.4 libtoolize --force --copy --install ./autogen.sh - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/x11-libs/pixman/pixman-0.20.0.bep b/x11-libs/pixman/pixman-0.20.0.bep index 869613857..d93ac2db0 100644 --- a/x11-libs/pixman/pixman-0.20.0.bep +++ b/x11-libs/pixman/pixman-0.20.0.bep @@ -10,7 +10,7 @@ BUILD { libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/x11-libs/xtrans/xtrans-1.2.5.bep b/x11-libs/xtrans/xtrans-1.2.5.bep index 7dc2fc7b4..dabe29737 100644 --- a/x11-libs/xtrans/xtrans-1.2.5.bep +++ b/x11-libs/xtrans/xtrans-1.2.5.bep @@ -11,7 +11,8 @@ BUILD { cd xtrans-1.2.5 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` } INSTALL { diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.0.bep b/x11-misc/shared-mime-info/shared-mime-info-1.0.bep new file mode 100644 index 000000000..0c61c66ad --- /dev/null +++ b/x11-misc/shared-mime-info/shared-mime-info-1.0.bep @@ -0,0 +1,23 @@ +DESCRIPTION="Freedesktop MIME database specification" +HOMEPAGE="http://freedesktop.org/wiki/Software/shared-mime-info" +SRC_URI="http://freedesktop.org/~hadess/shared-mime-info-1.0.tar.xz" +CHECKSUM_MD5="901b7977dbb2b71d12d30d4d8fb97028" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="intltool, + glib" +BUILD { + cd shared-mime-info-1.0 + ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ + --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ + --mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" + make +} + +INSTALL { + cd shared-mime-info-1.0 + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT=""Freedesktop.org diff --git a/x11-misc/util-macros/util-macros-1.17.0-git.bep b/x11-misc/util-macros/util-macros-1.17.0-git.bep new file mode 100644 index 000000000..ea93fa92c --- /dev/null +++ b/x11-misc/util-macros/util-macros-1.17.0-git.bep @@ -0,0 +1,23 @@ +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." +LICENSE="MIT" + +SRC_URI="git://anongit.freedesktop.org/xorg/util/macros" +#CHECKSUM_MD5="" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="" +BUILD { + cd util-macros-1.17.0-git + ./autogen.sh -V + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_LIB_DIRECTORY` + make +} + +INSTALL { + cd util-macros-1.17.0-git + make install +} diff --git a/x11-misc/util-macros/util-macros-1.7.0.bep b/x11-misc/util-macros/util-macros-1.7.0.bep index be4c04899..13a30101a 100644 --- a/x11-misc/util-macros/util-macros-1.7.0.bep +++ b/x11-misc/util-macros/util-macros-1.7.0.bep @@ -8,7 +8,7 @@ DEPEND="" BUILD { cd util-macros-1.7.0 libtoolize --force --copy --install - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` } INSTALL { diff --git a/x11-proto/inputproto/inputproto-2.0.bep b/x11-proto/inputproto/inputproto-2.0.bep index 76620d5e9..8428ac375 100644 --- a/x11-proto/inputproto/inputproto-2.0.bep +++ b/x11-proto/inputproto/inputproto-2.0.bep @@ -10,7 +10,7 @@ BUILD { cd inputproto-2.0 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` } INSTALL { diff --git a/x11-proto/kbproto/kbproto-1.0.4.bep b/x11-proto/kbproto/kbproto-1.0.4.bep index a7a601771..aa6a56080 100644 --- a/x11-proto/kbproto/kbproto-1.0.4.bep +++ b/x11-proto/kbproto/kbproto-1.0.4.bep @@ -10,7 +10,7 @@ BUILD { cd kbproto-1.0.4 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` } INSTALL { diff --git a/x11-proto/xcb-proto/xcb-proto-1.6.bep b/x11-proto/xcb-proto/xcb-proto-1.6.bep index 0798f940c..ab77c5e0e 100644 --- a/x11-proto/xcb-proto/xcb-proto-1.6.bep +++ b/x11-proto/xcb-proto/xcb-proto-1.6.bep @@ -10,7 +10,7 @@ BUILD { cd xcb-proto-1.6 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } diff --git a/x11-proto/xextproto/xextproto-7.1.1.bep b/x11-proto/xextproto/xextproto-7.1.1.bep index 2f7b83e86..79bbbd807 100644 --- a/x11-proto/xextproto/xextproto-7.1.1.bep +++ b/x11-proto/xextproto/xextproto-7.1.1.bep @@ -10,7 +10,7 @@ BUILD { cd xextproto-7.1.1 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` } INSTALL { diff --git a/x11-proto/xproto/patches/xproto-7.0.23-git.patch b/x11-proto/xproto/patches/xproto-7.0.23-git.patch new file mode 100644 index 000000000..04ba8ad82 --- /dev/null +++ b/x11-proto/xproto/patches/xproto-7.0.23-git.patch @@ -0,0 +1,48 @@ +diff --git a/Xos_r.h xproto-7.0.23-git/Xos_r.h +index f963b64..f8b727b 100644 +--- a/Xos_r.h ++++ xproto-7.0.23-git/Xos_r.h +@@ -88,6 +88,10 @@ in this Software without prior written authorization from The Open Group. + # endif + #endif /* _XOS_R_H */ + ++#ifdef __HAIKU__ ++#define _POSIX_THREAD_SAFE_FUNCTIONS ++#endif ++ + #ifndef WIN32 + + #ifdef __cplusplus +diff --git a/configure.ac xproto-7.0.23-git/configure.ac +index c4acf24..b3c82aa 100644 +--- a/configure.ac ++++ xproto-7.0.23-git/configure.ac +@@ -99,6 +99,28 @@ if test "x$fds_bits_found" = xfalse ; then + fi + + if test "x$fds_bits_found" = xfalse ; then ++AC_CHECK_MEMBER(fd_set.bits, ++ [ ++ fds_bits_found=plain_simple ++ USE_FDS_BITS="bits" ++ ],, ++ [ ++ #ifdef HAVE_SYS_PARAM_H ++ #include ++ #endif ++ #ifdef HAVE_SYS_TYPES_H ++ #include ++ #endif ++ #ifdef HAVE_SYS_TIME_H ++ #include ++ #endif ++ #ifdef HAVE_SYS_SELECT_H ++ #include ++ #endif ++ ]) ++fi ++ ++if test "x$fds_bits_found" = xfalse ; then + AC_MSG_ERROR([Could not determine how to access the fds_bits or equivalent + structure in fd_set on your platform.]) + fi diff --git a/x11-proto/xproto/xproto-7.0.16.bep b/x11-proto/xproto/xproto-7.0.16.bep index 5a13c71ed..d3ab77900 100644 --- a/x11-proto/xproto/xproto-7.0.16.bep +++ b/x11-proto/xproto/xproto-7.0.16.bep @@ -9,7 +9,7 @@ BUILD { cd xproto-7.0.16 libtoolize --force --copy --install autoreconf -i - ./configure --prefix=/boot/common + ./configure --prefix=`finddir B_COMMON_DIRECTORY` } INSTALL { diff --git a/x11-proto/xproto/xproto-7.0.23-git.bep b/x11-proto/xproto/xproto-7.0.23-git.bep new file mode 100644 index 000000000..643668b5a --- /dev/null +++ b/x11-proto/xproto/xproto-7.0.23-git.bep @@ -0,0 +1,27 @@ +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 + 1987 by Digital Equipment Corporation, Maynard, Massachusetts. + 1987 by Apollo Computer Inc., Chelmsford, Massachusetts. + 1989 by Hewlett-Packard Company. + 1999 The XFree86 Project Inc." +LICENSE="MIT (no promotion)" + +SRC_URI="git://anongit.freedesktop.org/xorg/proto/xproto" +#CHECKSUM_MD5="" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="" +BUILD { + cd xproto-7.0.23-git + ./autogen.sh -V + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_LIB_DIRECTORY` + make +} + +INSTALL { + cd xproto-7.0.23-git + make install +} From 60aba35d6488f184124f4c48a505ab52139dd619 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 29 Mar 2013 16:31:03 +0000 Subject: [PATCH 046/587] * convert all .bep files to follow shell syntax * rename all .bep files to .recipe --- app-admin/pwgen/{pwgen-2.06.bep => pwgen-2.06.recipe} | 6 ++++-- app-arch/arc/{arc-5.21o.bep => arc-5.21o.recipe} | 9 ++++++--- app-arch/bzip2/{bzip2-1.0.5.bep => bzip2-1.0.5.recipe} | 6 ++++-- app-arch/bzip2/{bzip2-1.0.6.bep => bzip2-1.0.6.recipe} | 6 ++++-- .../{cabextract-1.2.bep => cabextract-1.2.recipe} | 6 ++++-- .../{cabextract-1.3.bep => cabextract-1.3.recipe} | 6 ++++-- app-arch/cpio/{cpio-2.10.bep => cpio-2.10.recipe} | 9 ++++++--- app-arch/cpio/{cpio-2.11.bep => cpio-2.11.recipe} | 9 ++++++--- .../fastjar/{fastjar-0.98.bep => fastjar-0.98.recipe} | 6 ++++-- app-arch/gzip/{gzip-1.2.4a.bep => gzip-1.2.4a.recipe} | 6 ++++-- app-arch/gzip/{gzip-1.3.12.bep => gzip-1.3.12.recipe} | 6 ++++-- app-arch/gzip/{gzip-1.4.bep => gzip-1.4.recipe} | 6 ++++-- app-arch/ha/{ha-0999.bep => ha-0999.recipe} | 6 ++++-- app-arch/lha/{lha-1.14i.bep => lha-1.14i.recipe} | 9 ++++++--- .../{libarchive-2.8.3.bep => libarchive-2.8.3.recipe} | 9 ++++++--- .../{libarchive-2.8.4.bep => libarchive-2.8.4.recipe} | 9 ++++++--- .../{libarchive-2.8.5.bep => libarchive-2.8.5.recipe} | 9 ++++++--- .../{libarchive-3.0.3.bep => libarchive-3.0.3.recipe} | 9 ++++++--- app-arch/p7zip/{p7zip-9.04.bep => p7zip-9.04.recipe} | 6 ++++-- app-arch/p7zip/{p7zip-9.13.bep => p7zip-9.13.recipe} | 6 ++++-- app-arch/p7zip/{p7zip-9.20.1.bep => p7zip-9.20.1.recipe} | 6 ++++-- app-arch/pigz/{pigz-2.1.6.bep => pigz-2.1.6.recipe} | 9 ++++++--- .../{sharutils-4.10.bep => sharutils-4.10.recipe} | 6 ++++-- .../{sharutils-4.6.3.bep => sharutils-4.6.3.recipe} | 6 ++++-- app-arch/tar/{tar-1.22.bep => tar-1.22.recipe} | 6 ++++-- app-arch/tar/{tar-1.23.bep => tar-1.23.recipe} | 6 ++++-- app-arch/tar/{tar-1.25.bep => tar-1.25.recipe} | 9 ++++++--- app-arch/tar/{tar-1.26.bep => tar-1.26.recipe} | 6 ++++-- app-arch/unrar/{unrar-4.2.4.bep => unrar-4.2.4.recipe} | 6 ++++-- app-arch/unzip/{unzip-6.0.bep => unzip-6.0.recipe} | 9 ++++++--- app-arch/xar/{xar-1.5.2.bep => xar-1.5.2.recipe} | 6 ++++-- .../{xz-utils-4.999.9.bep => xz-utils-4.999.9.recipe} | 9 ++++++--- .../{xz-utils-5.0.1.bep => xz-utils-5.0.1.recipe} | 9 ++++++--- .../{xz-utils-5.0.4.bep => xz-utils-5.0.4.recipe} | 9 ++++++--- app-arch/zip/{zip-3.0.bep => zip-3.0.recipe} | 9 ++++++--- app-arch/zoo/{zoo-2.10.bep => zoo-2.10.recipe} | 6 ++++-- .../{bonnie++-1.03e.bep => bonnie++-1.03e.recipe} | 6 ++++-- .../ffsb/{ffsb-6.0-rc2.bep => ffsb-6.0-rc2.recipe} | 6 ++++-- .../iozone/{iozone-3.326.bep => iozone-3.326.recipe} | 6 ++++-- .../{libmicro-0.4.1.bep => libmicro-0.4.1.recipe} | 9 ++++++--- .../piozone/{piozone-1.0.bep => piozone-1.0.recipe} | 6 ++++-- app-cdr/bchunk/{bchunk-1.2.0.bep => bchunk-1.2.0.recipe} | 6 ++++-- app-cdr/cdrdao/{cdrdao-1.2.3.bep => cdrdao-1.2.3.recipe} | 6 ++++-- ...drtools-2.01.01a66.bep => cdrtools-2.01.01a66.recipe} | 6 ++++-- ...drtools-2.01.01a77.bep => cdrtools-2.01.01a77.recipe} | 6 ++++-- .../cdrtools/{cdrtools-3.00.bep => cdrtools-3.00.recipe} | 6 ++++-- .../{cdrtools-3.01a01.bep => cdrtools-3.01a01.recipe} | 6 ++++-- .../{cdrtools-3.01a06.bep => cdrtools-3.01a06.recipe} | 6 ++++-- .../{cdrtools-3.01a07.bep => cdrtools-3.01a07.recipe} | 6 ++++-- .../{daa2iso-0.1.7e.bep => daa2iso-0.1.7e.recipe} | 6 ++++-- .../{uif2iso-0.1.7c.bep => uif2iso-0.1.7c.recipe} | 6 ++++-- .../gnupg/{gnupg-1.4.10.bep => gnupg-1.4.10.recipe} | 6 ++++-- .../gnupg/{gnupg-1.4.11.bep => gnupg-1.4.11.recipe} | 6 ++++-- .../doxygen/{doxygen-1.6.1.bep => doxygen-1.6.1.recipe} | 6 ++++-- .../doxygen/{doxygen-1.6.2.bep => doxygen-1.6.2.recipe} | 6 ++++-- .../doxygen/{doxygen-1.6.3.bep => doxygen-1.6.3.recipe} | 6 ++++-- .../doxygen/{doxygen-1.7.4.bep => doxygen-1.7.4.recipe} | 6 ++++-- app-editors/jed/{jed-0.99-19.bep => jed-0.99-19.recipe} | 6 ++++-- app-editors/joe/{joe-3.8-hg.bep => joe-3.8-hg.recipe} | 6 ++++-- app-editors/nano/{nano-2.2.3.bep => nano-2.2.3.recipe} | 6 ++++-- app-editors/nano/{nano-2.2.5.bep => nano-2.2.5.recipe} | 6 ++++-- app-editors/nano/{nano-2.2.6.bep => nano-2.2.6.recipe} | 6 ++++-- app-editors/nano/{nano-2.3.1.bep => nano-2.3.1.recipe} | 6 ++++-- app-editors/ne/{ne-2.1.bep => ne-2.1.recipe} | 6 ++++-- ...emacs-0.3.2dev-cvs.bep => qemacs-0.3.2dev-cvs.recipe} | 6 ++++-- .../qemacs/{qemacs-0.3.3.bep => qemacs-0.3.3.recipe} | 6 ++++-- app-editors/se/{se-3.0.bep => se-3.0.recipe} | 6 ++++-- app-editors/vim/{vim-7.2.bep => vim-7.2.recipe} | 6 ++++-- app-editors/vim/{vim-7.3.bep => vim-7.3.recipe} | 6 ++++-- .../{aranym-0.9.11-cvs.bep => aranym-0.9.11-cvs.recipe} | 6 ++++-- .../libdsk/{libdsk-1.3.3.bep => libdsk-1.3.3.recipe} | 6 ++++-- .../{mednafen-0.9.26.bep => mednafen-0.9.26.recipe} | 9 ++++++--- .../{oricutron-0.9-svn.bep => oricutron-0.9-svn.recipe} | 6 ++++-- .../{pearpc-0.5.0-cvs.bep => pearpc-0.5.0-cvs.recipe} | 6 ++++-- .../qemu/{qemu-0.12.4.bep => qemu-0.12.4.recipe} | 6 ++++-- app-i18n/anthy/{anthy-9100.bep => anthy-9100.recipe} | 6 ++++-- .../{colordiff-1.0.10.bep => colordiff-1.0.10.recipe} | 6 ++++-- app-misc/figlet/{figlet-222.bep => figlet-222.recipe} | 6 ++++-- .../getopt/{getopt-1.1.4.bep => getopt-1.1.4.recipe} | 6 ++++-- .../abiword/{abiword-2.8.6.bep => abiword-2.8.6.recipe} | 9 ++++++--- app-shells/bash/{bash-4.1.bep => bash-4.1.recipe} | 6 ++++-- .../fish/{fish-1.23.1-git.bep => fish-1.23.1-git.recipe} | 9 ++++++--- app-shells/zsh/{zsh-4.3.10.bep => zsh-4.3.10.recipe} | 6 ++++-- app-shells/zsh/{zsh-5.0.0.bep => zsh-5.0.0.recipe} | 6 ++++-- .../antiword/{antiword-0.37.bep => antiword-0.37.recipe} | 6 ++++-- .../aspell/{aspell-0.60.6.bep => aspell-0.60.6.recipe} | 6 ++++-- app-text/convmv/{convmv-1.15.bep => convmv-1.15.recipe} | 9 ++++++--- .../{discount-2.1.3.bep => discount-2.1.3.recipe} | 6 ++++-- .../dos2unix/{dos2unix-1.0.bep => dos2unix-1.0.recipe} | 6 ++++-- .../{ebook-tools-0.2.1.bep => ebook-tools-0.2.1.recipe} | 6 ++++-- .../enchant/{enchant-1.6.0.bep => enchant-1.6.0.recipe} | 6 ++++-- app-text/gocr/{gocr-0.49.bep => gocr-0.49.recipe} | 6 ++++-- app-text/gpp/{gpp-2.4.bep => gpp-2.4.recipe} | 6 ++++-- .../{htmldoc-1.8.27.bep => htmldoc-1.8.27.recipe} | 9 ++++++--- .../{htmltidy-20092812.bep => htmltidy-20092812.recipe} | 6 ++++-- .../{hunspell-1.3.2.bep => hunspell-1.3.2.recipe} | 6 ++++-- .../{libpaper-1.1.23.bep => libpaper-1.1.23.recipe} | 6 ++++-- .../{libpaper-1.1.24.bep => libpaper-1.1.24.recipe} | 6 ++++-- .../libwpd/{libwpd-0.9.6.bep => libwpd-0.9.6.recipe} | 6 ++++-- .../libwpg/{libwpg-0.2.1.bep => libwpg-0.2.1.recipe} | 6 ++++-- .../psiconv/{psiconv-0.9.8.bep => psiconv-0.9.8.recipe} | 6 ++++-- app-text/rman/{rman-3.2.bep => rman-3.2.recipe} | 6 ++++-- .../{sablotron-1.0.3.bep => sablotron-1.0.3.recipe} | 6 ++++-- .../{tesseract-3.x-svn.bep => tesseract-3.x-svn.recipe} | 9 ++++++--- .../{texi2html-1.82.bep => texi2html-1.82.recipe} | 9 ++++++--- app-text/tree/{tree-1.6.0.bep => tree-1.6.0.recipe} | 9 ++++++--- dev-cpp/eigen/{eigen-3.1.2.bep => eigen-3.1.2.recipe} | 9 ++++++--- dev-cpp/glog/{glog-0.3.3.bep => glog-0.3.3.recipe} | 6 ++++-- .../{mm-common-0.9.2.bep => mm-common-0.9.2.recipe} | 6 ++++-- dev-cpp/mxml/{mxml-2.6.bep => mxml-2.6.recipe} | 6 ++++-- dev-db/mysql/{mysql-5.0.83.bep => mysql-5.0.83.recipe} | 6 ++++-- .../{postgresql-9.0.4.bep => postgresql-9.0.4.recipe} | 9 ++++++--- .../{postgresql-9.2.3.bep => postgresql-9.2.3.recipe} | 9 ++++++--- dev-db/redis/{redis-2.2.11.bep => redis-2.2.11.recipe} | 6 ++++-- .../{redis-2.9.0-git.bep => redis-2.9.0-git.recipe} | 6 ++++-- .../sqlite/{sqlite-3.6.22.bep => sqlite-3.6.22.recipe} | 6 ++++-- .../sqlite/{sqlite-3.6.23.bep => sqlite-3.6.23.recipe} | 6 ++++-- .../sqlite/{sqlite-3.7.13.bep => sqlite-3.7.13.recipe} | 6 ++++-- .../{sqlite-3.7.15.1.bep => sqlite-3.7.15.1.recipe} | 6 ++++-- dev-db/sqlite/{sqlite-3.7.2.bep => sqlite-3.7.2.recipe} | 6 ++++-- dev-db/sqlite/{sqlite-3.7.3.bep => sqlite-3.7.3.recipe} | 6 ++++-- dev-db/sqlite/{sqlite-3.7.4.bep => sqlite-3.7.4.recipe} | 6 ++++-- dev-db/sqlite/{sqlite-3.7.5.bep => sqlite-3.7.5.recipe} | 6 ++++-- .../sqlite/{sqlite-3.7.6.2.bep => sqlite-3.7.6.2.recipe} | 6 ++++-- .../sqlite/{sqlite-3.7.7.1.bep => sqlite-3.7.7.1.recipe} | 6 ++++-- dev-dotnet/pnet/{pnet-0.8.0.bep => pnet-0.8.0.recipe} | 6 ++++-- ...oot-tools-2012.10.bep => u-boot-tools-2012.10.recipe} | 6 ++++-- dev-games/box2d/{box2d-2.1.2.bep => box2d-2.1.2.recipe} | 6 ++++-- .../{flatzebra-0.1.3.bep => flatzebra-0.1.3.recipe} | 6 ++++-- .../libggz/{libggz-0.99.5.bep => libggz-0.99.5.recipe} | 6 ++++-- dev-games/ode/{ode-0.12.bep => ode-0.12.recipe} | 6 ++++-- .../physfs/{physfs-2.0.1.bep => physfs-2.0.1.recipe} | 6 ++++-- ...{gnu-classpath-0.98.bep => gnu-classpath-0.98.recipe} | 9 ++++++--- dev-java/jamvm/{jamvm-1.5.4.bep => jamvm-1.5.4.recipe} | 6 ++++-- dev-lang/camlp5/{camlp5-6.06.bep => camlp5-6.06.recipe} | 6 ++++-- .../dmd-bin/{dmd-bin-1.064.bep => dmd-bin-1.064.recipe} | 6 ++++-- dev-lang/erlang/{erlang-R14B.bep => erlang-R14B.recipe} | 6 ++++-- dev-lang/fpc/{fpc-2.4.0.bep => fpc-2.4.0.recipe} | 6 ++++-- dev-lang/fpc/{fpc-2.6.0.bep => fpc-2.6.0.recipe} | 9 ++++++--- dev-lang/lua/{lua-5.1.4.bep => lua-5.1.4-3.recipe} | 6 ++++-- dev-lang/lua/{lua-5.1.4-3.bep => lua-5.1.4.recipe} | 6 ++++-- dev-lang/lua/{lua-5.2.1.bep => lua-5.2.1.recipe} | 6 ++++-- dev-lang/nasm/{nasm-2.08.01.bep => nasm-2.08.01.recipe} | 6 ++++-- dev-lang/ocaml/{ocaml-4.00.0.bep => ocaml-4.00.0.recipe} | 6 ++++-- dev-lang/openjdk/{openjdk-1.7.bep => openjdk-1.7.recipe} | 9 ++++++--- dev-lang/orc/{orc-0.4.16.bep => orc-0.4.16.recipe} | 6 ++++-- dev-lang/perl/{perl-5.10.1.bep => perl-5.10.1.recipe} | 6 ++++-- dev-lang/php/{php-5.3.4.bep => php-5.3.4.recipe} | 6 ++++-- dev-lang/php/{php-5.3.5.bep => php-5.3.5.recipe} | 9 ++++++--- .../python/{python-2.5.4.bep => python-2.5.4.recipe} | 6 ++++-- .../python/{python-2.6.4.bep => python-2.6.4.recipe} | 6 ++++-- .../python/{python-2.6.5.bep => python-2.6.5.recipe} | 6 ++++-- .../python/{python-2.6.6.bep => python-2.6.6.recipe} | 9 ++++++--- .../python/{python-2.6.7.bep => python-2.6.7.recipe} | 9 ++++++--- .../python/{python-2.6.8.bep => python-2.6.8.recipe} | 9 ++++++--- .../python/{python-2.7.1.bep => python-2.7.1.recipe} | 9 ++++++--- dev-lang/python/{python-3.2.bep => python-3.2.recipe} | 9 ++++++--- ...{rebol-2.101.0.5.75.bep => rebol-2.101.0.5.75.recipe} | 9 ++++++--- dev-lang/ruby/{ruby-1.9.1.bep => ruby-1.9.1.recipe} | 6 ++++-- .../{swi-prolog-6.0.2.bep => swi-prolog-6.0.2.recipe} | 9 ++++++--- .../{swi-prolog-6.2.0.bep => swi-prolog-6.2.0.recipe} | 9 ++++++--- dev-lang/swig/{swig-1.3.40.bep => swig-1.3.40.recipe} | 6 ++++-- dev-lang/swig/{swig-2.0.2.bep => swig-2.0.2.recipe} | 6 ++++-- dev-lang/tcl/{tcl-8.5.9.bep => tcl-8.5.9.recipe} | 9 ++++++--- dev-lang/v8/{v8-r13067.bep => v8-r13067.recipe} | 9 ++++++--- dev-lang/yasm/{yasm-1.1.0.bep => yasm-1.1.0.recipe} | 6 ++++-- dev-lang/yasm/{yasm-1.2.0.bep => yasm-1.2.0.recipe} | 6 ++++-- .../{apr-util-1.3.10.bep => apr-util-1.3.10.recipe} | 6 ++++-- .../{apr-util-1.3.11.bep => apr-util-1.3.11.recipe} | 6 ++++-- .../{apr-util-1.3.12.bep => apr-util-1.3.12.recipe} | 6 ++++-- .../{apr-util-1.3.9.bep => apr-util-1.3.9.recipe} | 6 ++++-- .../{apr-util-1.4.1.bep => apr-util-1.4.1.recipe} | 6 ++++-- dev-libs/apr/{apr-1.3.8.bep => apr-1.3.8.recipe} | 6 ++++-- dev-libs/apr/{apr-1.3.9.bep => apr-1.3.9.recipe} | 6 ++++-- dev-libs/apr/{apr-1.4.2.bep => apr-1.4.2.recipe} | 9 ++++++--- dev-libs/apr/{apr-1.4.4.bep => apr-1.4.4.recipe} | 9 ++++++--- dev-libs/apr/{apr-1.4.5.bep => apr-1.4.5.recipe} | 9 ++++++--- dev-libs/apr/{apr-1.4.6.bep => apr-1.4.6.recipe} | 9 ++++++--- dev-libs/atk/{atk-1.29.2.bep => atk-1.29.2.recipe} | 6 ++++-- dev-libs/atk/{atk-1.30.0.bep => atk-1.30.0.recipe} | 6 ++++-- ...oehm-gc-7.2_alpha6.bep => boehm-gc-7.2_alpha6.recipe} | 9 ++++++--- .../boehm-gc/{boehm-gc-7.2d.bep => boehm-gc-7.2d.recipe} | 9 ++++++--- dev-libs/boost/{boost-1.42.0.bep => boost-1.42.0.recipe} | 6 ++++-- dev-libs/boost/{boost-1.50.0.bep => boost-1.50.0.recipe} | 6 ++++-- dev-libs/boost/{boost-1.53.0.bep => boost-1.53.0.recipe} | 6 ++++-- dev-libs/chmlib/{chmlib-0.40.bep => chmlib-0.40.recipe} | 6 ++++-- .../cyassl/{cyassl-1.6.5.bep => cyassl-1.6.5.recipe} | 9 ++++++--- .../cyassl/{cyassl-1.8.0.bep => cyassl-1.8.0.recipe} | 9 ++++++--- .../cyassl/{cyassl-2.0.2.bep => cyassl-2.0.2.recipe} | 9 ++++++--- .../cyassl/{cyassl-2.5.0.bep => cyassl-2.5.0.recipe} | 9 ++++++--- dev-libs/expat/{expat-2.0.1.bep => expat-2.0.1.recipe} | 6 ++++-- .../{fribidi-0.19.2.bep => fribidi-0.19.2.recipe} | 6 ++++-- dev-libs/glib/{glib-2.22.2.bep => glib-2.22.2.recipe} | 6 ++++-- dev-libs/glib/{glib-2.24.1.bep => glib-2.24.1.recipe} | 6 ++++-- dev-libs/glib/{glib-2.24.2.bep => glib-2.24.2.recipe} | 6 ++++-- dev-libs/glib/{glib-2.26.1.bep => glib-2.26.1.recipe} | 6 ++++-- dev-libs/gmp/{gmp-4.3.1.bep => gmp-4.3.1.recipe} | 9 ++++++--- dev-libs/gmp/{gmp-4.3.2.bep => gmp-4.3.2.recipe} | 9 ++++++--- dev-libs/gmp/{gmp-5.0.1.bep => gmp-5.0.1.recipe} | 9 ++++++--- dev-libs/gmp/{gmp-5.0.5.bep => gmp-5.0.5.recipe} | 9 ++++++--- dev-libs/gmp/{gmp-5.1.1.bep => gmp-5.1.1.recipe} | 9 ++++++--- dev-libs/gnulib/{gnulib-9999.bep => gnulib-9999.recipe} | 9 ++++++--- dev-libs/icu/{icu-4.4.1.bep => icu-4.4.1.recipe} | 6 ++++-- dev-libs/icu/{icu-4.8.1.bep => icu-4.8.1.recipe} | 6 ++++-- dev-libs/jansson/{jansson-2.4.bep => jansson-2.4.recipe} | 9 ++++++--- dev-libs/json-c/{json-c-0.9.bep => json-c-0.9.recipe} | 6 ++++-- .../{libattica-0.4.1.bep => libattica-0.4.1.recipe} | 6 ++++-- .../libcdio/{libcdio-0.82.bep => libcdio-0.82.recipe} | 6 ++++-- .../libcdio/{libcdio-0.83.bep => libcdio-0.83.recipe} | 6 ++++-- .../libcdio/{libcdio-0.90.bep => libcdio-0.90.recipe} | 6 ++++-- .../libcss/{libcss-0.1.2.bep => libcss-0.1.2.recipe} | 6 ++++-- .../{libdwarf-20120410.bep => libdwarf-20120410.recipe} | 6 ++++-- .../libebml/{libebml-1.0.0.bep => libebml-1.0.0.recipe} | 6 ++++-- .../{libedit-20090923.bep => libedit-20090923.recipe} | 6 ++++-- .../{libedit-20100424.bep => libedit-20100424.recipe} | 6 ++++-- ...edit-20110802-3.0.bep => libedit-20110802-3.0.recipe} | 6 ++++-- ...edit-20120601-3.0.bep => libedit-20120601-3.0.recipe} | 6 ++++-- .../libelf/{libelf-0.8.13.bep => libelf-0.8.13.recipe} | 6 ++++-- .../{libevent-1.4.11.bep => libevent-1.4.11.recipe} | 6 ++++-- .../{libevent-1.4.13.bep => libevent-1.4.13.recipe} | 6 ++++-- .../{libevent-1.4.14b.bep => libevent-1.4.14b.recipe} | 6 ++++-- .../{libevent-2.0.10.bep => libevent-2.0.10.recipe} | 6 ++++-- .../libffi/{libffi-3.0.11.bep => libffi-3.0.11.recipe} | 6 ++++-- .../libffi/{libffi-3.0.9.bep => libffi-3.0.9.recipe} | 6 ++++-- .../{libgcrypt-1.4.5.bep => libgcrypt-1.4.5.recipe} | 6 ++++-- .../{libgcrypt-1.5.0.bep => libgcrypt-1.5.0.recipe} | 6 ++++-- .../{libgpg-error-1.10.bep => libgpg-error-1.10.recipe} | 6 ++++-- .../{libgpg-error-1.7.bep => libgpg-error-1.7.recipe} | 6 ++++-- .../libiconv/{libiconv-1.12.bep => libiconv-1.12.recipe} | 6 ++++-- .../{libiconv-1.13.1.bep => libiconv-1.13.1.recipe} | 6 ++++-- .../liboil/{liboil-0.3.17.bep => liboil-0.3.17.recipe} | 6 ++++-- ...parserutils-0.1.1.bep => libparserutils-0.1.1.recipe} | 6 ++++-- .../libpcre/{libpcre-8.00.bep => libpcre-8.00.recipe} | 6 ++++-- .../libpcre/{libpcre-8.02.bep => libpcre-8.02.recipe} | 6 ++++-- .../libpcre/{libpcre-8.12.bep => libpcre-8.12.recipe} | 9 ++++++--- .../libpcre/{libpcre-8.21.bep => libpcre-8.21.recipe} | 9 ++++++--- ...ead-stubs-0.3.2.bep => libpthread-stubs-0.3.2.recipe} | 6 ++++-- ...pthread-stubs-0.3.bep => libpthread-stubs-0.3.recipe} | 6 ++++-- .../{libsigc++-1.2.7.bep => libsigc++-1.2.7.recipe} | 6 ++++-- .../{libsigc++-2.2.7.bep => libsigc++-2.2.7.recipe} | 6 ++++-- .../{libsigsegv-2.8.bep => libsigsegv-2.8.recipe} | 6 ++++-- ...unistring-0.9.1.1.bep => libunistring-0.9.1.1.recipe} | 6 ++++-- ...let-0.1.1-HEAD.bep => libwapcaplet-0.1.1-HEAD.recipe} | 6 ++++-- ...{libwapcaplet-0.1.1.bep => libwapcaplet-0.1.1.recipe} | 6 ++++-- ...xdg-basedir-1.1.1.bep => libxdg-basedir-1.1.1.recipe} | 6 ++++-- .../libxml2/{libxml2-2.7.3.bep => libxml2-2.7.3.recipe} | 6 ++++-- .../libxml2/{libxml2-2.7.6.bep => libxml2-2.7.6.recipe} | 6 ++++-- .../libxml2/{libxml2-2.7.7.bep => libxml2-2.7.7.recipe} | 9 ++++++--- .../libxml2/{libxml2-2.7.8.bep => libxml2-2.7.8.recipe} | 9 ++++++--- .../libxml2/{libxml2-2.8.0.bep => libxml2-2.8.0.recipe} | 9 ++++++--- .../libxml2/{libxml2-2.9.0.bep => libxml2-2.9.0.recipe} | 9 ++++++--- .../{libxslt-1.1.26.bep => libxslt-1.1.26.recipe} | 6 ++++-- .../{libxslt-1.1.28.bep => libxslt-1.1.28.recipe} | 6 ++++-- .../libzip/{libzip-0.10.1.bep => libzip-0.10.1.recipe} | 6 ++++-- dev-libs/libzip/{libzip-0.10.bep => libzip-0.10.recipe} | 6 ++++-- dev-libs/lzo/{lzo-2.06.bep => lzo-2.06.recipe} | 9 ++++++--- dev-libs/mpc/{mpc-1.0.1.bep => mpc-1.0.1.recipe} | 9 ++++++--- .../mpfr/{mpfr-3.0.0-7047.bep => mpfr-3.0.0-7047.recipe} | 6 ++++-- dev-libs/mpfr/{mpfr-3.1.1.bep => mpfr-3.1.1.recipe} | 9 ++++++--- .../{oniguruma-5.9.2.bep => oniguruma-5.9.2.recipe} | 9 ++++++--- .../{openssl-0.9.8l.bep => openssl-0.9.8l.recipe} | 6 ++++-- .../{openssl-0.9.8m.bep => openssl-0.9.8m.recipe} | 6 ++++-- .../openssl/{openssl-1.0.0.bep => openssl-1.0.0.recipe} | 6 ++++-- .../{openssl-1.0.0a.bep => openssl-1.0.0a.recipe} | 6 ++++-- .../{openssl-1.0.0c.bep => openssl-1.0.0c.recipe} | 9 ++++++--- .../{openssl-1.0.0d.bep => openssl-1.0.0d.recipe} | 9 ++++++--- .../{openssl-1.0.0e.bep => openssl-1.0.0e.recipe} | 9 ++++++--- .../{openssl-1.0.0g.bep => openssl-1.0.0g.recipe} | 9 ++++++--- .../{openssl-1.0.0j.bep => openssl-1.0.0j.recipe} | 9 ++++++--- dev-libs/popt/{popt-1.16.bep => popt-1.16.recipe} | 6 ++++-- .../{protobuf-2.4.1.bep => protobuf-2.4.1.recipe} | 9 ++++++--- .../raptor2/{raptor2-2.0.8.bep => raptor2-2.0.8.recipe} | 9 ++++++--- .../rasqal/{rasqal-0.9.29.bep => rasqal-0.9.29.recipe} | 9 ++++++--- .../{redland-1.0.15.bep => redland-1.0.15.recipe} | 9 ++++++--- dev-libs/serd/{serd-0.18.0.bep => serd-0.18.0.recipe} | 6 ++++-- .../tinyxml/{tinyxml-2.6.2.bep => tinyxml-2.6.2.recipe} | 6 ++++-- .../{uriparser-0.7.5.bep => uriparser-0.7.5.recipe} | 6 ++++-- .../{xerces-c-3.1.1.bep => xerces-c-3.1.1.recipe} | 6 ++++-- .../{zziplib-0.13.59.bep => zziplib-0.13.59.recipe} | 6 ++++-- .../{luarocks-2.0.4.1.bep => luarocks-2.0.4.1.recipe} | 6 ++++-- .../{XML-Parser-2.36.bep => XML-Parser-2.36.recipe} | 6 ++++-- dev-python/cnf/{cnf-1.0-git.bep => cnf-1.0-git.recipe} | 6 ++++-- dev-python/numpy/{numpy-1.4.1.bep => numpy-1.4.1.recipe} | 6 ++++-- dev-python/numpy/{numpy-1.5.0.bep => numpy-1.5.0.recipe} | 6 ++++-- .../{paramiko-1.7.6.bep => paramiko-1.7.6.recipe} | 6 ++++-- .../{pychart-1.39-bzr.bep => pychart-1.39-bzr.recipe} | 9 ++++++--- .../pychart/{pychart-1.39.bep => pychart-1.39.recipe} | 9 ++++++--- .../pycrypto/{pycrypto-2.3.bep => pycrypto-2.3.recipe} | 6 ++++-- ...{pydispatcher-2.0.1.bep => pydispatcher-2.0.1.recipe} | 6 ++++-- .../pygame/{pygame-1.9.1.bep => pygame-1.9.1.recipe} | 6 ++++-- .../pylzma/{pylzma-0.4.4.bep => pylzma-0.4.4.recipe} | 6 ++++-- .../{pyopengl-3.0.1.bep => pyopengl-3.0.1.recipe} | 6 ++++-- .../pyserial/{pyserial-2.5.bep => pyserial-2.5.recipe} | 6 ++++-- dev-python/pyxml/{pyxml-0.8.4.bep => pyxml-0.8.4.recipe} | 6 ++++-- .../rdflib/{rdflib-3.2.0.bep => rdflib-3.2.0.recipe} | 6 ++++-- .../{setuptools-0.6.bep => setuptools-0.6.recipe} | 6 ++++-- ...impleparse-2.1.1a2.bep => simpleparse-2.1.1a2.recipe} | 6 ++++-- dev-qt/qtcore/{qtcore-4.7.3.bep => qtcore-4.7.3.recipe} | 6 ++++-- .../{qtcore-4.8.x-git.bep => qtcore-4.8.x-git.recipe} | 6 ++++-- dev-qt/qtcore/{qtcore-4.8.x.bep => qtcore-4.8.x.recipe} | 6 ++++-- .../chicken/{chicken-4.5.0.bep => chicken-4.5.0.recipe} | 6 ++++-- .../chicken/{chicken-4.7.0.bep => chicken-4.7.0.recipe} | 9 ++++++--- ...r-1.98.3.bep => abi-compliance-checker-1.98.3.recipe} | 9 ++++++--- dev-util/astyle/{astyle-r339.bep => astyle-r339.recipe} | 6 ++++-- dev-util/astyle/{astyle-r361.bep => astyle-r361.recipe} | 6 ++++-- .../automoc/{automoc-4-git.bep => automoc-4-git.recipe} | 6 ++++-- .../{bakefile-0.2.8.bep => bakefile-0.2.8.recipe} | 6 ++++-- .../bsdbuild/{bsdbuild-2.9.bep => bsdbuild-2.9.recipe} | 9 ++++++--- .../{buildsystem-0.bep => buildsystem-0.recipe} | 6 ++++-- .../ccache/{ccache-3.0.1.bep => ccache-3.0.1.recipe} | 6 ++++-- .../ccache/{ccache-3.1.4.bep => ccache-3.1.4.recipe} | 6 ++++-- .../ccache/{ccache-3.1.7.bep => ccache-3.1.7.recipe} | 6 ++++-- dev-util/cmake/{cmake-2.6.4.bep => cmake-2.6.4.recipe} | 6 ++++-- .../cmake/{cmake-2.8-git.bep => cmake-2.8-git.recipe} | 9 ++++++--- dev-util/cmake/{cmake-2.8.0.bep => cmake-2.8.0.recipe} | 6 ++++-- dev-util/cmake/{cmake-2.8.1.bep => cmake-2.8.1.recipe} | 6 ++++-- .../cmake/{cmake-2.8.10.2.bep => cmake-2.8.10.2.recipe} | 6 ++++-- dev-util/cmake/{cmake-2.8.2.bep => cmake-2.8.2.recipe} | 6 ++++-- dev-util/cmake/{cmake-2.8.3.bep => cmake-2.8.3.recipe} | 6 ++++-- dev-util/cmake/{cmake-2.8.4.bep => cmake-2.8.4.recipe} | 6 ++++-- dev-util/cmake/{cmake-2.8.5.bep => cmake-2.8.5.recipe} | 6 ++++-- .../{cppunit-1.12.1.bep => cppunit-1.12.1.recipe} | 6 ++++-- .../cscope/{cscope-15.7a.bep => cscope-15.7a.recipe} | 6 ++++-- dev-util/ctags/{ctags-5.8.bep => ctags-5.8.recipe} | 6 ++++-- .../diffstat/{diffstat-1.51.bep => diffstat-1.51.recipe} | 6 ++++-- .../fastdep/{fastdep-0.16.bep => fastdep-0.16.recipe} | 6 ++++-- .../global/{global-6.2.2.bep => global-6.2.2.recipe} | 6 ++++-- .../global/{global-6.2.4.bep => global-6.2.4.recipe} | 6 ++++-- dev-util/gperf/{gperf-3.0.4.bep => gperf-3.0.4.recipe} | 6 ++++-- .../gtk-doc/{gtk-doc-1.15.bep => gtk-doc-1.15.recipe} | 6 ++++-- .../{idutils-20061208.bep => idutils-20061208.recipe} | 6 ++++-- dev-util/idutils/{idutils-4.2.bep => idutils-4.2.recipe} | 6 ++++-- .../indent/{indent-2.2.11.bep => indent-2.2.11.recipe} | 9 ++++++--- .../{intltool-0.40.6.bep => intltool-0.40.6.recipe} | 6 ++++-- .../{patchutils-0.3.1.bep => patchutils-0.3.1.recipe} | 6 ++++-- .../{patchutils-0.3.2.bep => patchutils-0.3.2.recipe} | 6 ++++-- ...{pjdfstest-20100807.bep => pjdfstest-20100807.recipe} | 9 ++++++--- .../{pkgconfig-0.23.bep => pkgconfig-0.23.recipe} | 6 ++++-- .../{pkgconfig-0.25.bep => pkgconfig-0.25.recipe} | 6 ++++-- ...ixtestsuite-1.5.2.bep => posixtestsuite-1.5.2.recipe} | 9 ++++++--- dev-util/premake/{premake-4.3.bep => premake-4.3.recipe} | 6 ++++-- dev-util/quilt/{quilt-0.48.bep => quilt-0.48.recipe} | 6 ++++-- dev-util/re2c/{re2c-0.13.5.bep => re2c-0.13.5.recipe} | 9 ++++++--- ...-1.0.1-python2.5.bep => scons-1.0.1-python2.5.recipe} | 6 ++++-- dev-util/scons/{scons-1.0.1.bep => scons-1.0.1.recipe} | 6 ++++-- dev-util/scons/{scons-2.0.1.bep => scons-2.0.1.recipe} | 6 ++++-- dev-util/scons/{scons-2.2.0.bep => scons-2.2.0.recipe} | 6 ++++-- dev-vcs/bzr/{bzr-2.2.0.bep => bzr-2.2.0.recipe} | 6 ++++-- dev-vcs/bzr/{bzr-2.2.1.bep => bzr-2.2.1.recipe} | 6 ++++-- dev-vcs/bzr/{bzr-2.2.2.bep => bzr-2.2.2.recipe} | 6 ++++-- dev-vcs/bzr/{bzr-2.2b4.bep => bzr-2.2b4.recipe} | 6 ++++-- dev-vcs/bzr/{bzr-2.5.1.bep => bzr-2.5.1.recipe} | 6 ++++-- dev-vcs/bzr/{bzr-2.6b1.bep => bzr-2.6b1.recipe} | 6 ++++-- dev-vcs/cvs/{cvs-1.12.13.1.bep => cvs-1.12.13.1.recipe} | 6 ++++-- dev-vcs/cvs/{cvs-1.12.13.bep => cvs-1.12.13.recipe} | 6 ++++-- ...{fossil-1.22-fossil.bep => fossil-1.22-fossil.recipe} | 9 ++++++--- dev-vcs/fossil/{fossil-1.22.bep => fossil-1.22.recipe} | 9 ++++++--- dev-vcs/git/{git-1.7.10.2.bep => git-1.7.10.2.recipe} | 9 ++++++--- dev-vcs/git/{git-1.7.11.3.bep => git-1.7.11.3.recipe} | 9 ++++++--- dev-vcs/git/{git-1.8.0.bep => git-1.8.0.recipe} | 9 ++++++--- dev-vcs/git/{git-1.8.1.3.bep => git-1.8.1.3.recipe} | 9 ++++++--- .../{gitdoc-1.7.10.2.bep => gitdoc-1.7.10.2.recipe} | 6 ++++-- .../{gitdoc-1.7.11.3.bep => gitdoc-1.7.11.3.recipe} | 6 ++++-- dev-vcs/gitdoc/{gitdoc-1.8.0.bep => gitdoc-1.8.0.recipe} | 6 ++++-- .../gitdoc/{gitdoc-1.8.1.3.bep => gitdoc-1.8.1.3.recipe} | 6 ++++-- .../{mercurial-2.2.2.bep => mercurial-2.2.2.recipe} | 9 ++++++--- .../{mercurial-2.2.3.bep => mercurial-2.2.3.recipe} | 9 ++++++--- .../{mercurial-2.3.bep => mercurial-2.3.recipe} | 9 ++++++--- .../{mercurial-2.4.bep => mercurial-2.4.recipe} | 9 ++++++--- .../{subversion-1.6.11.bep => subversion-1.6.11.recipe} | 6 ++++-- .../{subversion-1.6.12.bep => subversion-1.6.12.recipe} | 6 ++++-- .../{subversion-1.6.13.bep => subversion-1.6.13.recipe} | 6 ++++-- .../{subversion-1.6.15.bep => subversion-1.6.15.recipe} | 6 ++++-- .../{subversion-1.6.17.bep => subversion-1.6.17.recipe} | 9 ++++++--- .../{subversion-1.6.18.bep => subversion-1.6.18.recipe} | 9 ++++++--- .../{subversion-1.6.6.bep => subversion-1.6.6.recipe} | 6 ++++-- .../{subversion-1.6.9.bep => subversion-1.6.9.recipe} | 6 ++++-- ...version-1.7.0-rc2.bep => subversion-1.7.0-rc2.recipe} | 9 ++++++--- ...rsion-1.7.xx-svn.bep => subversion-1.7.xx-svn.recipe} | 6 ++++-- dev-vcs/tig/{tig-0.16.bep => tig-0.16.recipe} | 6 ++++-- .../bzflag/{bzflag-2.0.14.bep => bzflag-2.0.14.recipe} | 6 ++++-- .../{cylindrix-1.0.bep => cylindrix-1.0.recipe} | 6 ++++-- ...{alienblaster-1.1.0.bep => alienblaster-1.1.0.recipe} | 6 ++++-- .../{supertux-0.1.3.bep => supertux-0.1.3.recipe} | 6 ++++-- .../{dosbox-0.74-svn.bep => dosbox-0.74-svn.recipe} | 6 ++++-- ...oyadvance-1.7.2.bep => visualboyadvance-1.7.2.recipe} | 6 ++++-- ...dljoytest-11102003.bep => sdljoytest-11102003.recipe} | 6 ++++-- .../abrick/{abrick-1.12.bep => abrick-1.12.recipe} | 6 ++++-- .../{flobopuyo-0.20.bep => flobopuyo-0.20.recipe} | 6 ++++-- .../gnurobbo/{gnurobbo-0.65.bep => gnurobbo-0.65.recipe} | 6 ++++-- ...yphysics-0.2-157.bep => numptyphysics-0.2-157.recipe} | 6 ++++-- .../wizznic/{wizznic-0.9.9.bep => wizznic-0.9.9.recipe} | 6 ++++-- .../wizznic/{wizznic-0.9.bep => wizznic-0.9.recipe} | 6 ++++-- .../{freedroid-1.0.2.bep => freedroid-1.0.2.recipe} | 6 ++++-- .../openttd/{openttd-1.2.3.bep => openttd-1.2.3.recipe} | 6 ++++-- .../{gnome-common-2.28.bep => gnome-common-2.28.recipe} | 6 ++++-- .../libgsf/{libgsf-1.14.18.bep => libgsf-1.14.18.recipe} | 6 ++++-- haiku-apps/W6/{W6-1.7.bep => W6-1.7.recipe} | 6 ++++-- haiku-apps/album/{album-0.9.2.bep => album-0.9.2.recipe} | 6 ++++-- .../aplayer/{aplayer-4.0.1.bep => aplayer-4.0.1.recipe} | 6 ++++-- .../armyknife/{armyknife-61.bep => armyknife-61.recipe} | 6 ++++-- .../armyknife/{armyknife-62.bep => armyknife-62.recipe} | 6 ++++-- .../armyknife/{armyknife-63.bep => armyknife-63.recipe} | 6 ++++-- .../{armyknife-999-git.bep => armyknife-999-git.recipe} | 6 ++++-- .../artpaint/{artpaint-339.bep => artpaint-339.recipe} | 6 ++++-- haiku-apps/beacon/{beacon-27.bep => beacon-27.recipe} | 6 ++++-- haiku-apps/beae/{beae-20.bep => beae-20.recipe} | 6 ++++-- haiku-apps/beae/{beae-22.bep => beae-22.recipe} | 6 ++++-- haiku-apps/beae/{beae-25.bep => beae-25.recipe} | 6 ++++-- .../beam/{beam-1.2alpha.bep => beam-1.2alpha.recipe} | 6 ++++-- haiku-apps/beezer/{beezer-1.bep => beezer-1.recipe} | 6 ++++-- haiku-apps/beget/{beget-1.2.3.bep => beget-1.2.3.recipe} | 6 ++++-- haiku-apps/behappy/{behappy-16.bep => behappy-16.recipe} | 6 ++++-- .../bepdf/{bepdf-1.1.1b4.bep => bepdf-1.1.1b4.recipe} | 6 ++++-- haiku-apps/beshare/{beshare-4.bep => beshare-4.recipe} | 6 ++++-- .../{bowser-1.1.1-cvs.bep => bowser-1.1.1-cvs.recipe} | 6 ++++-- haiku-apps/bsl/{bsl-108.bep => bsl-108.recipe} | 6 ++++-- .../{burnitnow-2-svn.bep => burnitnow-2-svn.recipe} | 6 ++++-- .../burnitnow/{burnitnow-27.bep => burnitnow-27.recipe} | 6 ++++-- .../burnitnow/{burnitnow-38.bep => burnitnow-38.recipe} | 6 ++++-- .../burnitnow/{burnitnow-39.bep => burnitnow-39.recipe} | 6 ++++-- .../burnitnow/{burnitnow-43.bep => burnitnow-43.recipe} | 6 ++++-- ...urnitnow-beta5-svn.bep => burnitnow-beta5-svn.recipe} | 6 ++++-- ...urnitnow-beta6-git.bep => burnitnow-beta6-git.recipe} | 6 ++++-- .../{burnitnow-beta6.bep => burnitnow-beta6.recipe} | 6 ++++-- ...ocols-0.HEAD.bep => caya-gpl-protocols-0.HEAD.recipe} | 6 ++++-- ...gpl-protocols-19.bep => caya-gpl-protocols-19.recipe} | 6 ++++-- ...gpl-protocols-24.bep => caya-gpl-protocols-24.recipe} | 6 ++++-- ...gpl-protocols-35.bep => caya-gpl-protocols-35.recipe} | 6 ++++-- ...gpl-protocols-36.bep => caya-gpl-protocols-36.recipe} | 6 ++++-- haiku-apps/caya/{caya-0.HEAD.bep => caya-0.HEAD.recipe} | 6 ++++-- haiku-apps/caya/{caya-236.bep => caya-236.recipe} | 6 ++++-- haiku-apps/caya/{caya-240.bep => caya-240.recipe} | 6 ++++-- haiku-apps/caya/{caya-264.bep => caya-264.recipe} | 6 ++++-- haiku-apps/caya/{caya-278.bep => caya-278.recipe} | 6 ++++-- haiku-apps/caya/{caya-279.bep => caya-279.recipe} | 6 ++++-- .../clockwerk/{clockwerk-78.bep => clockwerk-78.recipe} | 6 ++++-- .../clockwerk/{clockwerk-80.bep => clockwerk-80.recipe} | 6 ++++-- ...umentviewer-0.3.2.bep => documentviewer-0.3.2.recipe} | 6 ++++-- .../friss/{friss-0.7-svn.bep => friss-0.7-svn.recipe} | 6 ++++-- haiku-apps/globe/{globe-0.4.bep => globe-0.4.recipe} | 6 ++++-- ...kutwitter-1.0-svn.bep => haikutwitter-1.0-svn.recipe} | 6 ++++-- .../{haikutwitter-1.0.bep => haikutwitter-1.0.recipe} | 6 ++++-- .../hare/{hare-beta1-git.bep => hare-beta1-git.recipe} | 6 ++++-- ...mapswitcher-1.2.7.bep => keymapswitcher-1.2.7.recipe} | 6 ++++-- .../mkdepend/{mkdepend-1.7.bep => mkdepend-1.7.recipe} | 6 ++++-- .../{open-sum-it-108.bep => open-sum-it-108.recipe} | 6 ++++-- .../{paladin-1.3-hg.bep => paladin-1.3-hg.recipe} | 6 ++++-- .../paladin/{paladin-1.3.bep => paladin-1.3.recipe} | 6 ++++-- haiku-apps/pe/{pe-2.4.2-597.bep => pe-2.4.2-597.recipe} | 6 ++++-- haiku-apps/pe/{pe-2.4.3-600.bep => pe-2.4.3-600.recipe} | 6 ++++-- haiku-apps/pe/{pe-2.4.3-hg.bep => pe-2.4.3-hg.recipe} | 6 ++++-- .../puri/{puri-0.3.9.1.bep => puri-0.3.9.1.recipe} | 6 ++++-- haiku-apps/rez/{rez-108.bep => rez-108.recipe} | 6 ++++-- .../sawteeth/{sawteeth-1.3.bep => sawteeth-1.3.recipe} | 6 ++++-- ...{thememanager-0-svn.bep => thememanager-0-svn.recipe} | 6 ++++-- haiku-apps/vision/{vision-908.bep => vision-908.recipe} | 6 ++++-- haiku-apps/vision/{vision-933.bep => vision-933.recipe} | 6 ++++-- haiku-apps/yab/{yab-1.6.bep => yab-1.6.recipe} | 6 ++++-- .../libwalter/{libwalter-97.bep => libwalter-97.recipe} | 9 ++++++--- ...{arabeyes-fonts-1.1.bep => arabeyes-fonts-1.1.recipe} | 6 ++++-- .../{courier-prime-1.0.bep => courier-prime-1.0.recipe} | 6 ++++-- media-fonts/droid/{droid-113.bep => droid-113.recipe} | 6 ++++-- .../{farsi-fonts-0.4.bep => farsi-fonts-0.4.recipe} | 9 ++++++--- .../{inconsolata-1.0.bep => inconsolata-1.0.recipe} | 6 ++++-- .../{kacst-fonts-5.0.bep => kacst-fonts-5.0.recipe} | 6 ++++-- .../{lateef-font-1.001.bep => lateef-font-1.001.recipe} | 6 ++++-- ...00721.bep => liberation-fonts-1.06.0.20100721.recipe} | 6 ++++-- ...s-nastaleeq-1.02.bep => nafees-nastaleeq-1.02.recipe} | 6 ++++-- .../{nafees-riqa-1.00.bep => nafees-riqa-1.00.recipe} | 6 ++++-- .../{nanumfont-2.0.bep => nanumfont-2.0.recipe} | 6 ++++-- ...ade-font-1.005.bep => scheherazade-font-1.005.recipe} | 6 ++++-- .../{ukijorgfonts-1.0.bep => ukijorgfonts-1.0.recipe} | 6 ++++-- ...hei-0.2.0-beta.bep => wqy-microhei-0.2.0-beta.recipe} | 6 ++++-- .../{wqy-zenhei-0.9.45.bep => wqy-zenhei-0.9.45.recipe} | 6 ++++-- ...{x-series-fonts-2.0.bep => x-series-fonts-2.0.recipe} | 6 ++++-- .../blender/{blender-2.49b.bep => blender-2.49b.recipe} | 6 ++++-- media-gfx/flam3/{flam3-3.0.bep => flam3-3.0.recipe} | 6 ++++-- ...ontforge-201005010.bep => fontforge-201005010.recipe} | 6 ++++-- .../graphviz/{graphviz-2.24.bep => graphviz-2.24.recipe} | 6 ++++-- .../{graphviz-2.26.3.bep => graphviz-2.26.3.recipe} | 6 ++++-- media-gfx/hqx/{hqx-1.1.bep => hqx-1.1.recipe} | 6 ++++-- ...gemagick-6.6.1-10.bep => imagemagick-6.6.1-10.recipe} | 6 ++++-- .../{pngcrush-1.7.11.bep => pngcrush-1.7.11.recipe} | 6 ++++-- .../{pngcrush-1.7.12.bep => pngcrush-1.7.12.recipe} | 6 ++++-- .../{pngcrush-1.7.6.bep => pngcrush-1.7.6.recipe} | 6 ++++-- .../potrace/{potrace-1.8.bep => potrace-1.8.recipe} | 6 ++++-- .../{tuxpaint-0.9.21.bep => tuxpaint-0.9.21.recipe} | 6 ++++-- ...uxpaint-0.9.2x-cvs.bep => tuxpaint-0.9.2x-cvs.recipe} | 6 ++++-- .../a52dec/{a52dec-0.7.4.bep => a52dec-0.7.4.recipe} | 6 ++++-- .../aalib/{aalib-1.4rc4.bep => aalib-1.4rc4.recipe} | 6 ++++-- media-libs/agar/{agar-1.4.1.bep => agar-1.4.1.recipe} | 9 ++++++--- .../allegro/{allegro-4.4.0.bep => allegro-4.4.0.recipe} | 6 ++++-- .../{allegro-4.4.1.1.bep => allegro-4.4.1.1.recipe} | 6 ++++-- .../{allegro-4.4.x-svn.bep => allegro-4.4.x-svn.recipe} | 6 ++++-- media-libs/almp3/{almp3-2.0.4.bep => almp3-2.0.4.recipe} | 6 ++++-- .../cal3d/{cal3d-0.11.0.bep => cal3d-0.11.0.recipe} | 6 ++++-- media-libs/devil/{devil-1.7.8.bep => devil-1.7.8.recipe} | 6 ++++-- .../{djvulibre-3.5.25.bep => djvulibre-3.5.25.recipe} | 6 ++++-- media-libs/dumb/{dumb-0.9.3.bep => dumb-0.9.3.recipe} | 6 ++++-- media-libs/faac/{faac-1.28.bep => faac-1.28.recipe} | 6 ++++-- media-libs/faad2/{faad2-2.7.bep => faad2-2.7.recipe} | 6 ++++-- media-libs/fblend/{fblend-0.4.bep => fblend-0.4.recipe} | 6 ++++-- media-libs/fitz/{fitz-1.0.bep => fitz-1.0.recipe} | 6 ++++-- media-libs/flac/{flac-1.2.1.bep => flac-1.2.1.recipe} | 6 ++++-- .../{fontconfig-2.10.0.bep => fontconfig-2.10.0.recipe} | 6 ++++-- .../{fontconfig-2.10.2.bep => fontconfig-2.10.2.recipe} | 6 ++++-- .../{freealut-1.1.0.bep => freealut-1.1.0.recipe} | 6 ++++-- .../{freeimage-3.15.3.bep => freeimage-3.15.3.recipe} | 6 ++++-- .../{freetype-2.3.11.bep => freetype-2.3.11.recipe} | 6 ++++-- .../{freetype-2.4.11.bep => freetype-2.4.11.recipe} | 6 ++++-- .../{freetype-2.4.2.bep => freetype-2.4.2.recipe} | 6 ++++-- .../{freetype-2.4.4.bep => freetype-2.4.4.recipe} | 6 ++++-- .../{freetype-2.4.6.bep => freetype-2.4.6.recipe} | 6 ++++-- ...reetype-2.4.9-with-subpixel-rendering-enabled.recipe} | 6 ++++-- .../{freetype-2.4.9.bep => freetype-2.4.9.recipe} | 6 ++++-- .../ftgl/{ftgl-2.1-svn.bep => ftgl-2.1-svn.recipe} | 6 ++++-- media-libs/ftgl/{ftgl-2.1.3.bep => ftgl-2.1.3.recipe} | 6 ++++-- media-libs/gd/{gd-2.0.36rc1.bep => gd-2.0.36rc1.recipe} | 6 ++++-- .../giflib/{giflib-4.1.6.bep => giflib-4.1.6.recipe} | 6 ++++-- media-libs/glew/{glew-1.5.7.bep => glew-1.5.7.recipe} | 9 ++++++--- media-libs/glpng/{glpng-1.4.5.bep => glpng-1.4.5.recipe} | 6 ++++-- .../guilib/{guilib-1.2.1.bep => guilib-1.2.1.recipe} | 6 ++++-- .../ilmbase/{ilmbase-1.0.1.bep => ilmbase-1.0.1.recipe} | 6 ++++-- .../ilmbase/{ilmbase-1.0.2.bep => ilmbase-1.0.2.recipe} | 6 ++++-- .../jasper/{jasper-1.900.1.bep => jasper-1.900.1.recipe} | 6 ++++-- .../jbig2dec/{jbig2dec-0.11.bep => jbig2dec-0.11.recipe} | 6 ++++-- .../jbigkit/{jbigkit-1.6.bep => jbigkit-1.6.recipe} | 6 ++++-- .../jbigkit/{jbigkit-2.0.bep => jbigkit-2.0.recipe} | 6 ++++-- media-libs/jgmod/{jgmod-0.99.bep => jgmod-0.99.recipe} | 6 ++++-- media-libs/jpeg/{jpeg-7.bep => jpeg-7.recipe} | 6 ++++-- media-libs/jpeg/{jpeg-8b.bep => jpeg-8b.recipe} | 6 ++++-- media-libs/jpeg/{jpeg-8c.bep => jpeg-8c.recipe} | 6 ++++-- media-libs/jpeg/{jpeg-8d.bep => jpeg-8d.recipe} | 6 ++++-- .../{ladspa-sdk-1.13.bep => ladspa-sdk-1.13.recipe} | 6 ++++-- media-libs/lcms/{lcms-1.18a.bep => lcms-1.18a.recipe} | 6 ++++-- media-libs/lcms/{lcms-1.19.bep => lcms-1.19.recipe} | 6 ++++-- media-libs/lcms/{lcms-2.0a.bep => lcms-2.0a.recipe} | 6 ++++-- media-libs/lcms/{lcms-2.1.bep => lcms-2.1.recipe} | 6 ++++-- .../{leptonica-1.68.bep => leptonica-1.68.recipe} | 9 ++++++--- media-libs/libao/{libao-1.0.0.bep => libao-1.0.0.recipe} | 6 ++++-- ...{libart_lgpl-2.3.21.bep => libart_lgpl-2.3.21.recipe} | 6 ++++-- .../libass/{libass-0.10.1.bep => libass-0.10.1.recipe} | 6 ++++-- .../libass/{libass-0.9.11.bep => libass-0.9.11.recipe} | 6 ++++-- .../{libbluray-0.2.2.bep => libbluray-0.2.2.recipe} | 6 ++++-- .../libcddb/{libcddb-1.3.2.bep => libcddb-1.3.2.recipe} | 6 ++++-- .../{libcoverart-1.0.0.bep => libcoverart-1.0.0.recipe} | 9 ++++++--- .../libdca/{libdca-0.0.5.bep => libdca-0.0.5.recipe} | 6 ++++-- .../{libdiscid-0.3.0.bep => libdiscid-0.3.0.recipe} | 9 ++++++--- .../{libdvbpsi-0.1.7.bep => libdvbpsi-0.1.7.recipe} | 9 ++++++--- .../{libdvdcss-1.2.10.bep => libdvdcss-1.2.10.recipe} | 6 ++++-- .../{libdvdcss-1.2.12.bep => libdvdcss-1.2.12.recipe} | 6 ++++-- .../{libdvdnav-4.1.3.bep => libdvdnav-4.1.3.recipe} | 6 ++++-- .../{libdvdnav-4.2.0.bep => libdvdnav-4.2.0.recipe} | 6 ++++-- .../{libdvdread-4.1.3.bep => libdvdread-4.1.3.recipe} | 6 ++++-- .../{libdvdread-4.2.0.bep => libdvdread-4.2.0.recipe} | 6 ++++-- ...{libdvdread-svn1168.bep => libdvdread-svn1168.recipe} | 6 ++++-- ...{libdvdread-svn1226.bep => libdvdread-svn1226.recipe} | 6 ++++-- .../libharu/{libharu-2.1.0.bep => libharu-2.1.0.recipe} | 6 ++++-- .../{libid3tag-0.15.1b.bep => libid3tag-0.15.1b.recipe} | 9 ++++++--- media-libs/liblo/{liblo-0.26.bep => liblo-0.26.recipe} | 6 ++++-- .../libmad/{libmad-0.15.1b.bep => libmad-0.15.1b.recipe} | 6 ++++-- .../{libmatroska-1.0.0.bep => libmatroska-1.0.0.recipe} | 6 ++++-- .../{libmikmod-3.1.11.bep => libmikmod-3.1.11.recipe} | 6 ++++-- media-libs/libmms/{libmms-0.5.bep => libmms-0.5.recipe} | 6 ++++-- .../libmng/{libmng-1.0.10.bep => libmng-1.0.10.recipe} | 6 ++++-- .../{libmodplug-0.8.7.bep => libmodplug-0.8.7.recipe} | 6 ++++-- ...{libmodplug-0.8.8.1.bep => libmodplug-0.8.8.1.recipe} | 6 ++++-- ...{libmodplug-0.8.8.4.bep => libmodplug-0.8.8.4.recipe} | 6 ++++-- .../{libmpeg2-0.5.1.bep => libmpeg2-0.5.1.recipe} | 6 ++++-- ...ibnsbmp-0.0.3-HEAD.bep => libnsbmp-0.0.3-HEAD.recipe} | 6 ++++-- .../{libnsbmp-0.0.3.bep => libnsbmp-0.0.3.recipe} | 6 ++++-- .../{libnsgif-0.0.3.bep => libnsgif-0.0.3.recipe} | 6 ++++-- .../libogg/{libogg-1.1.3.bep => libogg-1.1.3.recipe} | 6 ++++-- .../libogg/{libogg-1.1.4.bep => libogg-1.1.4.recipe} | 6 ++++-- .../libogg/{libogg-1.2.0.bep => libogg-1.2.0.recipe} | 6 ++++-- .../libogg/{libogg-1.2.2.bep => libogg-1.2.2.recipe} | 6 ++++-- .../libogg/{libogg-1.3.0.bep => libogg-1.3.0.recipe} | 6 ++++-- .../libpng/{libpng-1.2.29.bep => libpng-1.2.29.recipe} | 6 ++++-- .../libpng/{libpng-1.2.30.bep => libpng-1.2.30.recipe} | 6 ++++-- .../libpng/{libpng-1.2.40.bep => libpng-1.2.40.recipe} | 6 ++++-- .../libpng/{libpng-1.2.41.bep => libpng-1.2.41.recipe} | 6 ++++-- .../libpng/{libpng-1.2.43.bep => libpng-1.2.43.recipe} | 6 ++++-- .../libpng/{libpng-1.2.44.bep => libpng-1.2.44.recipe} | 6 ++++-- .../libpng/{libpng-1.2.46.bep => libpng-1.2.46.recipe} | 6 ++++-- .../libpng/{libpng-1.4.1.bep => libpng-1.4.1.recipe} | 6 ++++-- .../libpng/{libpng-1.4.2.bep => libpng-1.4.2.recipe} | 6 ++++-- .../libpng/{libpng-1.4.3.bep => libpng-1.4.3.recipe} | 6 ++++-- .../libpng/{libpng-1.4.4.bep => libpng-1.4.4.recipe} | 6 ++++-- .../libpng/{libpng-1.5.0.bep => libpng-1.5.0.recipe} | 6 ++++-- .../libpng/{libpng-1.5.12.bep => libpng-1.5.12.recipe} | 6 ++++-- .../libpng/{libpng-1.5.13.bep => libpng-1.5.13.recipe} | 9 ++++++--- .../libpng/{libpng-1.5.2.bep => libpng-1.5.2.recipe} | 6 ++++-- .../libpng/{libpng-1.5.4.bep => libpng-1.5.4.recipe} | 6 ++++-- .../libpng/{libpng-1.5.7.bep => libpng-1.5.7.recipe} | 6 ++++-- ...ibsamplerate-0.1.8.bep => libsamplerate-0.1.8.recipe} | 6 ++++-- .../libsdl/{libsdl-1.2-hg.bep => libsdl-1.2-hg.recipe} | 9 ++++++--- .../libsdl/{libsdl-1.2.12.bep => libsdl-1.2.12.recipe} | 6 ++++-- .../libsdl/{libsdl-1.2.13.bep => libsdl-1.2.13.recipe} | 6 ++++-- .../libsdl/{libsdl-1.2.14.bep => libsdl-1.2.14.recipe} | 6 ++++-- .../libsdl/{libsdl-1.2.15.bep => libsdl-1.2.15.recipe} | 9 ++++++--- .../{libsdl-1.3-gsoc.bep => libsdl-1.3-gsoc.recipe} | 9 ++++++--- ...ibsdl-2.0-hg-cmake.bep => libsdl-2.0-hg-cmake.recipe} | 6 ++++-- .../libsdl/{libsdl-2.0-hg.bep => libsdl-2.0-hg.recipe} | 6 ++++-- .../{libsndfile-1.0.21.bep => libsndfile-1.0.21.recipe} | 6 ++++-- .../{libsvgtiny-0-HEAD.bep => libsvgtiny-0-HEAD.recipe} | 6 ++++-- .../{libsvgtiny-10856.bep => libsvgtiny-10856.recipe} | 6 ++++-- .../{libtheora-1.1.1.bep => libtheora-1.1.1.recipe} | 6 ++++-- .../{libvorbis-1.2.3.bep => libvorbis-1.2.3.recipe} | 6 ++++-- .../{libvorbis-1.3.1.bep => libvorbis-1.3.1.recipe} | 6 ++++-- .../{libvorbis-1.3.2.bep => libvorbis-1.3.2.recipe} | 6 ++++-- .../{libvpx-0.9.2-git.bep => libvpx-0.9.2-git.recipe} | 6 ++++-- .../libvpx/{libvpx-1.0.0.bep => libvpx-1.0.0.recipe} | 6 ++++-- .../{libwebm-0.9.2-git.bep => libwebm-0.9.2-git.recipe} | 6 ++++-- .../{libwebp-0.1.2-git.bep => libwebp-0.1.2-git.recipe} | 6 ++++-- .../libwebp/{libwebp-0.1.3.bep => libwebp-0.1.3.recipe} | 6 ++++-- .../loadpng/{loadpng-1.5.bep => loadpng-1.5.recipe} | 6 ++++-- media-libs/lv2/{lv2-1.2.0.bep => lv2-1.2.0.recipe} | 6 ++++-- .../{mediainfo-0.7.61.bep => mediainfo-0.7.61.recipe} | 6 ++++-- .../{musicbrainz-5.0.1.bep => musicbrainz-5.0.1.recipe} | 9 ++++++--- .../{openal-1.12-git.bep => openal-1.12-git.recipe} | 6 ++++-- .../{openal-1.12.854.bep => openal-1.12.854.recipe} | 6 ++++-- .../openal/{openal-1.13.bep => openal-1.13.recipe} | 6 ++++-- .../{openjpeg-1.5.0.bep => openjpeg-1.5.0.recipe} | 6 ++++-- media-libs/plib/{plib-1.8.5.bep => plib-1.8.5.recipe} | 6 ++++-- ...chroedinger-1.0.11.bep => schroedinger-1.0.11.recipe} | 6 ++++-- .../{sdl-gfx-2.0.20.bep => sdl-gfx-2.0.20.recipe} | 6 ++++-- .../{sdl-gfx-2.0.22.bep => sdl-gfx-2.0.22.recipe} | 6 ++++-- .../{sdl-gfx-2.0.23.bep => sdl-gfx-2.0.23.recipe} | 6 ++++-- .../{sdl-image-1.2-hg.bep => sdl-image-1.2-hg.recipe} | 6 ++++-- .../{sdl-image-1.2.10.bep => sdl-image-1.2.10.recipe} | 6 ++++-- .../{sdl-image-1.2.12.bep => sdl-image-1.2.12.recipe} | 6 ++++-- .../{sdl-image-1.2.6.bep => sdl-image-1.2.6.recipe} | 6 ++++-- .../{sdl-image-1.2.8.bep => sdl-image-1.2.8.recipe} | 6 ++++-- .../{sdl-image-1.2.9.bep => sdl-image-1.2.9.recipe} | 6 ++++-- .../{sdl-mixer-1.2-hg.bep => sdl-mixer-1.2-hg.recipe} | 6 ++++-- .../{sdl-mixer-1.2.10.bep => sdl-mixer-1.2.10.recipe} | 6 ++++-- .../{sdl-mixer-1.2.11.bep => sdl-mixer-1.2.11.recipe} | 6 ++++-- .../{sdl-mixer-1.2.12.bep => sdl-mixer-1.2.12.recipe} | 6 ++++-- .../{sdl-mixer-1.2.9.bep => sdl-mixer-1.2.9.recipe} | 6 ++++-- .../{sdl-net-1.2-hg.bep => sdl-net-1.2-hg.recipe} | 6 ++++-- .../sdl-net/{sdl-net-1.2.7.bep => sdl-net-1.2.7.recipe} | 6 ++++-- .../sdl-net/{sdl-net-1.2.8.bep => sdl-net-1.2.8.recipe} | 6 ++++-- .../sdl-rtf/{sdl-rtf-0.1.0.bep => sdl-rtf-0.1.0.recipe} | 6 ++++-- .../{sdl-sound-1.0-hg.bep => sdl-sound-1.0-hg.recipe} | 6 ++++-- .../{sdl-sound-1.0.3.bep => sdl-sound-1.0.3.recipe} | 6 ++++-- .../{sdl-ttf-2.0-hg.bep => sdl-ttf-2.0-hg.recipe} | 6 ++++-- .../{sdl-ttf-2.0.10.bep => sdl-ttf-2.0.10.recipe} | 6 ++++-- .../{sdl-ttf-2.0.11.bep => sdl-ttf-2.0.11.recipe} | 6 ++++-- .../sdl-ttf/{sdl-ttf-2.0.9.bep => sdl-ttf-2.0.9.recipe} | 6 ++++-- media-libs/sge/{sge-030809.bep => sge-030809.recipe} | 6 ++++-- .../smjpeg/{smjpeg-0.2.1.bep => smjpeg-0.2.1.recipe} | 6 ++++-- media-libs/smpeg/{smpeg-0.4.5.bep => smpeg-0.4.5.recipe} | 6 ++++-- .../speex/{speex-1.2-git.bep => speex-1.2-git.recipe} | 6 ++++-- .../speex/{speex-1.2rc1.bep => speex-1.2rc1.recipe} | 6 ++++-- .../taglib/{taglib-1.6.1.bep => taglib-1.6.1.recipe} | 6 ++++-- .../taglib/{taglib-1.6.2.bep => taglib-1.6.2.recipe} | 6 ++++-- .../taglib/{taglib-1.6.3.bep => taglib-1.6.3.recipe} | 6 ++++-- .../taglib/{taglib-1.7.1.bep => taglib-1.7.1.recipe} | 6 ++++-- .../taglib/{taglib-1.7.2.bep => taglib-1.7.2.recipe} | 6 ++++-- media-libs/taglib/{taglib-1.7.bep => taglib-1.7.recipe} | 6 ++++-- media-libs/taglib/{taglib-1.8.bep => taglib-1.8.recipe} | 6 ++++-- media-libs/tiff/{tiff-3.8.2.bep => tiff-3.8.2.recipe} | 6 ++++-- media-libs/tiff/{tiff-3.9.1.bep => tiff-3.9.1.recipe} | 6 ++++-- media-libs/tiff/{tiff-3.9.4.bep => tiff-3.9.4.recipe} | 6 ++++-- media-libs/tiff/{tiff-3.9.6.bep => tiff-3.9.6.recipe} | 6 ++++-- media-libs/tiff/{tiff-4.0.2.bep => tiff-4.0.2.recipe} | 6 ++++-- media-libs/vigra/{vigra-1.8.0.bep => vigra-1.8.0.recipe} | 6 ++++-- media-libs/waave/{waave-1.01.bep => waave-1.01.recipe} | 9 ++++++--- .../x264/{x264-20120803.bep => x264-20120803.recipe} | 6 ++++-- .../{bladeenc-0.94.2.bep => bladeenc-0.94.2.recipe} | 6 ++++-- ...midi-buffer.bep => fluidsynth-1.1-midi-buffer.recipe} | 6 ++++-- .../{fluidsynth-1.1.3.bep => fluidsynth-1.1.3.recipe} | 6 ++++-- .../{fluidsynth-1.1.6.bep => fluidsynth-1.1.6.recipe} | 6 ++++-- .../{gogo-no-coda-3.13.bep => gogo-no-coda-3.13.recipe} | 6 ++++-- .../jack2/{jack2-1.9.8.bep => jack2-1.9.8.recipe} | 6 ++++-- media-sound/lame/{lame-3.98.4.bep => lame-3.98.4.recipe} | 6 ++++-- media-sound/lame/{lame-3.99.bep => lame-3.99.recipe} | 6 ++++-- media-sound/lame/{lame-398-2.bep => lame-398-2.recipe} | 6 ++++-- ...kytracker-0.90.85.bep => milkytracker-0.90.85.recipe} | 6 ++++-- .../mpg123/{mpg123-1.12.1.bep => mpg123-1.12.1.recipe} | 6 ++++-- .../{naspro-0.2.9-hg.bep => naspro-0.2.9-hg.recipe} | 6 ++++-- .../ocp/{ocp-0.1.21-git.bep => ocp-0.1.21-git.recipe} | 6 ++++-- ...-snapshot20110319.bep => ocp-snapshot20110319.recipe} | 6 ++++-- ...-snapshot20110320.bep => ocp-snapshot20110320.recipe} | 6 ++++-- ...nd-232d0de71550.bep => opensound-232d0de71550.recipe} | 6 ++++-- .../{opensound-4.2.bep => opensound-4.2.recipe} | 6 ++++-- ...nd-cac211efd60d.bep => opensound-cac211efd60d.recipe} | 6 ++++-- ...racker-20100713.bep => schismtracker-20100713.recipe} | 6 ++++-- .../{twolame-0.3.13.bep => twolame-0.3.13.recipe} | 6 ++++-- ...{vorbis-tools-1.2.0.bep => vorbis-tools-1.2.0.recipe} | 6 ++++-- ...{vorbis-tools-1.4.0.bep => vorbis-tools-1.4.0.recipe} | 6 ++++-- .../{ffmpeg-0.10.2-vlc.bep => ffmpeg-0.10.2-vlc.recipe} | 6 ++++-- .../ffmpeg/{ffmpeg-0.10.2.bep => ffmpeg-0.10.2.recipe} | 6 ++++-- .../ffmpeg/{ffmpeg-0.10.bep => ffmpeg-0.10.recipe} | 6 ++++-- .../ffmpeg/{ffmpeg-0.11.1.bep => ffmpeg-0.11.1.recipe} | 6 ++++-- media-video/ffmpeg/{ffmpeg-0.5.bep => ffmpeg-0.5.recipe} | 6 ++++-- media-video/ffmpeg/{ffmpeg-0.6.bep => ffmpeg-0.6.recipe} | 6 ++++-- .../ffmpeg/{ffmpeg-23081.bep => ffmpeg-23081.recipe} | 6 ++++-- .../ffmpeg/{ffmpeg-7407.bep => ffmpeg-7407.recipe} | 6 ++++-- media-video/gnash/{gnash-0.bep => gnash-0.recipe} | 6 ++++-- .../{handbrake-0.9.5.bep => handbrake-0.9.5.recipe} | 6 ++++-- .../mplayer/{mplayer-1.0.bep => mplayer-1.0.recipe} | 6 ++++-- media-video/vlc/{vlc-0.8.6i.bep => vlc-0.8.6i.recipe} | 6 ++++-- ...{vlc-1.1.5-20101107.bep => vlc-1.1.5-20101107.recipe} | 6 ++++-- media-video/vlc/{vlc-2.0.5.bep => vlc-2.0.5.recipe} | 6 ++++-- .../tnftp/{tnftp-20091122.bep => tnftp-20091122.recipe} | 6 ++++-- net-irc/irssi/{irssi-0.8.15.bep => irssi-0.8.15.recipe} | 6 ++++-- ...{rhapsody-irc-0.28b.bep => rhapsody-irc-0.28b.recipe} | 6 ++++-- net-libs/enet/{enet-1.2.2.bep => enet-1.2.2.recipe} | 6 ++++-- net-libs/enet/{enet-1.3.0.bep => enet-1.3.0.recipe} | 6 ++++-- .../gnutls/{gnutls-2.8.6.bep => gnutls-2.8.6.recipe} | 6 ++++-- .../{hubbub-0.1.2-HEAD.bep => hubbub-0.1.2-HEAD.recipe} | 6 ++++-- .../hubbub/{hubbub-0.1.2.bep => hubbub-0.1.2.recipe} | 6 ++++-- net-libs/libdom/{libdom-0.bep => libdom-0.recipe} | 6 ++++-- net-libs/libs3/{libs3-2.0.bep => libs3-2.0.recipe} | 6 ++++-- .../{libtorrent-0.12.5.bep => libtorrent-0.12.5.recipe} | 6 ++++-- .../{libyahoo2-1.0.1.bep => libyahoo2-1.0.1.recipe} | 6 ++++-- net-misc/axel/{axel-2.4.bep => axel-2.4.recipe} | 6 ++++-- net-misc/curl/{curl-7.18.2.bep => curl-7.18.2.recipe} | 6 ++++-- net-misc/curl/{curl-7.19.1.bep => curl-7.19.1.recipe} | 6 ++++-- net-misc/curl/{curl-7.19.2.bep => curl-7.19.2.recipe} | 6 ++++-- net-misc/curl/{curl-7.19.5.bep => curl-7.19.5.recipe} | 6 ++++-- net-misc/curl/{curl-7.19.7.bep => curl-7.19.7.recipe} | 6 ++++-- net-misc/curl/{curl-7.20.0.bep => curl-7.20.0.recipe} | 6 ++++-- net-misc/curl/{curl-7.20.1.bep => curl-7.20.1.recipe} | 6 ++++-- net-misc/curl/{curl-7.21.1.bep => curl-7.21.1.recipe} | 6 ++++-- net-misc/curl/{curl-7.21.2.bep => curl-7.21.2.recipe} | 6 ++++-- net-misc/curl/{curl-7.21.3.bep => curl-7.21.3.recipe} | 9 ++++++--- net-misc/curl/{curl-7.21.4.bep => curl-7.21.4.recipe} | 9 ++++++--- net-misc/curl/{curl-7.21.6.bep => curl-7.21.6.recipe} | 9 ++++++--- net-misc/curl/{curl-7.21.7.bep => curl-7.21.7.recipe} | 9 ++++++--- net-misc/curl/{curl-7.22.0.bep => curl-7.22.0.recipe} | 9 ++++++--- net-misc/curl/{curl-7.24.0.bep => curl-7.24.0.recipe} | 9 ++++++--- net-misc/curl/{curl-7.25.0.bep => curl-7.25.0.recipe} | 9 ++++++--- net-misc/curl/{curl-7.26.0.bep => curl-7.26.0.recipe} | 9 ++++++--- net-misc/curl/{curl-7.28.1.bep => curl-7.28.1.recipe} | 9 ++++++--- .../{mediatomb-0.12.1.bep => mediatomb-0.12.1.recipe} | 6 ++++-- .../{minidlna-1.0.21.bep => minidlna-1.0.21.recipe} | 6 ++++-- net-misc/neon/{neon-0.29.1.bep => neon-0.29.1.recipe} | 6 ++++-- net-misc/neon/{neon-0.29.3.bep => neon-0.29.3.recipe} | 6 ++++-- net-misc/neon/{neon-0.29.4.bep => neon-0.29.4.recipe} | 6 ++++-- net-misc/neon/{neon-0.29.5.bep => neon-0.29.5.recipe} | 6 ++++-- net-misc/neon/{neon-0.29.6.bep => neon-0.29.6.recipe} | 6 ++++-- net-misc/ntp/{ntp-4.2.6p2.bep => ntp-4.2.6p2.recipe} | 6 ++++-- .../openssh/{openssh-5.4p1.bep => openssh-5.4p1.recipe} | 6 ++++-- .../openssh/{openssh-5.5p1.bep => openssh-5.5p1.recipe} | 6 ++++-- .../openssh/{openssh-5.6p1.bep => openssh-5.6p1.recipe} | 9 ++++++--- .../openssh/{openssh-5.7p1.bep => openssh-5.7p1.recipe} | 9 ++++++--- .../openssh/{openssh-5.8p1.bep => openssh-5.8p1.recipe} | 9 ++++++--- .../openssh/{openssh-5.8p2.bep => openssh-5.8p2.recipe} | 9 ++++++--- .../openssh/{openssh-5.9p1.bep => openssh-5.9p1.recipe} | 9 ++++++--- .../openssh/{openssh-6.0p1.bep => openssh-6.0p1.recipe} | 9 ++++++--- .../openssh/{openssh-6.1p1.bep => openssh-6.1p1.recipe} | 9 ++++++--- .../openssh/{openssh-6.2p1.bep => openssh-6.2p1.recipe} | 9 ++++++--- net-misc/putty/{putty-0.60.bep => putty-0.60.recipe} | 6 ++++-- net-misc/rsync/{rsync-3.0.6.bep => rsync-3.0.6.recipe} | 6 ++++-- net-misc/rsync/{rsync-3.0.7.bep => rsync-3.0.7.recipe} | 9 ++++++--- net-misc/tor/{tor-0.2.2.35.bep => tor-0.2.2.35.recipe} | 9 ++++++--- net-misc/tor/{tor-0.2.3.25.bep => tor-0.2.3.25.recipe} | 9 ++++++--- net-misc/wget/{wget-1.12.bep => wget-1.12.recipe} | 6 ++++-- net-misc/wget/{wget-1.13.4.bep => wget-1.13.4.recipe} | 6 ++++-- net-misc/wput/{wput-0.6.1.bep => wput-0.6.1.recipe} | 6 ++++-- .../{rtorrent-0.8.5.bep => rtorrent-0.8.5.recipe} | 6 ++++-- .../seeks/{seeks-0.x-git.bep => seeks-0.x-git.recipe} | 6 ++++-- .../{transmission-1.72.bep => transmission-1.72.recipe} | 6 ++++-- .../{transmission-1.73.bep => transmission-1.73.recipe} | 6 ++++-- .../{transmission-1.93.bep => transmission-1.93.recipe} | 6 ++++-- .../{transmission-2.01.bep => transmission-2.01.recipe} | 6 ++++-- .../{transmission-2.12.bep => transmission-2.12.recipe} | 6 ++++-- .../{transmission-2.21.bep => transmission-2.21.recipe} | 6 ++++-- .../{transmission-2.73.bep => transmission-2.73.recipe} | 6 ++++-- .../{transmission-2.75.bep => transmission-2.75.recipe} | 6 ++++-- .../{privoxy-3.0.19.bep => privoxy-3.0.19.recipe} | 6 ++++-- .../{b43-fwcutter-012.bep => b43-fwcutter-012.recipe} | 6 ++++-- ..._supplicant-0.7.3.bep => wpa_supplicant-0.7.3.recipe} | 6 ++++-- packs/libpak/{libpak-0.9.1.bep => libpak-0.9.1.recipe} | 6 ++++-- packs/libpak/{libpak-0.9.2.bep => libpak-0.9.2.recipe} | 6 ++++-- packs/libpak/{libpak-0.9.3.bep => libpak-0.9.3.recipe} | 6 ++++-- .../{libpak-0.9.4-gcc2.bep => libpak-0.9.4-gcc2.recipe} | 6 ++++-- .../{libpak-0.9.4-gcc4.bep => libpak-0.9.4-gcc4.recipe} | 6 ++++-- packs/libpak/{libpak-0.9.4.bep => libpak-0.9.4.recipe} | 6 ++++-- .../{libpak-0.9.5-gcc2.bep => libpak-0.9.5-gcc2.recipe} | 6 ++++-- .../{libpak-0.9.6-gcc2.bep => libpak-0.9.6-gcc2.recipe} | 6 ++++-- .../{libpak-0.9.6-gcc4.bep => libpak-0.9.6-gcc4.recipe} | 6 ++++-- packs/libpak/{libpak-0.9.bep => libpak-0.9.recipe} | 6 ++++-- ...ionalpackages-0.5.bep => optionalpackages-0.5.recipe} | 6 ++++-- ...ges-0.6-gcc2.bep => optionalpackages-0.6-gcc2.recipe} | 6 ++++-- ...ges-0.6-gcc4.bep => optionalpackages-0.6-gcc4.recipe} | 6 ++++-- ...ionalpackages-0.6.bep => optionalpackages-0.6.recipe} | 6 ++++-- ...ges-0.7-gcc2.bep => optionalpackages-0.7-gcc2.recipe} | 6 ++++-- ...ges-0.7-gcc4.bep => optionalpackages-0.7-gcc4.recipe} | 6 ++++-- .../{celestia-1.6.0.bep => celestia-1.6.0.recipe} | 6 ++++-- sci-libs/cln/{cln-1.3.2.bep => cln-1.3.2.recipe} | 6 ++++-- sci-libs/fftw/{fftw-3.2.2.bep => fftw-3.2.2.recipe} | 6 ++++-- sci-libs/gdal/{gdal-1.7.2.bep => gdal-1.7.2.recipe} | 6 ++++-- sci-libs/gsl/{gsl-1.13.bep => gsl-1.13.recipe} | 6 ++++-- sci-libs/gsl/{gsl-1.14.bep => gsl-1.14.recipe} | 6 ++++-- .../bullet/{bullet-2.78.bep => bullet-2.78.recipe} | 6 ++++-- .../{coreutils-8.5.bep => coreutils-8.5.recipe} | 9 ++++++--- sys-apps/dbus/{dbus-1.6.8.bep => dbus-1.6.8.recipe} | 9 ++++++--- .../{diffutils-2.9.bep => diffutils-2.9.recipe} | 6 ++++-- .../{diffutils-3.0.bep => diffutils-3.0.recipe} | 9 ++++++--- .../{diffutils-3.2.bep => diffutils-3.2.recipe} | 9 ++++++--- .../{dmidecode-2.11.bep => dmidecode-2.11.recipe} | 6 ++++-- sys-apps/dtc/{dtc-1.3.0-git.bep => dtc-1.3.0-git.recipe} | 9 ++++++--- sys-apps/ed/{ed-1.4.bep => ed-1.4.recipe} | 6 ++++-- sys-apps/file/{file-5.04.bep => file-5.04.recipe} | 6 ++++-- sys-apps/file/{file-5.11.bep => file-5.11.recipe} | 6 ++++-- .../{findutils-4.4.2.bep => findutils-4.4.2.recipe} | 9 ++++++--- sys-apps/gawk/{gawk-3.1.8.bep => gawk-3.1.8.recipe} | 9 ++++++--- sys-apps/gawk/{gawk-4.0.1.bep => gawk-4.0.1.recipe} | 6 ++++-- sys-apps/grep/{grep-2.12.bep => grep-2.12.recipe} | 9 ++++++--- .../grep/{grep-2.14-bz2.bep => grep-2.14-bz2.recipe} | 6 ++++-- sys-apps/grep/{grep-2.14.bep => grep-2.14.recipe} | 9 ++++++--- sys-apps/grep/{grep-2.5.4.bep => grep-2.5.4.recipe} | 9 ++++++--- sys-apps/grep/{grep-2.6.1.bep => grep-2.6.1.recipe} | 9 ++++++--- sys-apps/grep/{grep-2.6.3.bep => grep-2.6.3.recipe} | 9 ++++++--- sys-apps/grep/{grep-2.7.bep => grep-2.7.recipe} | 9 ++++++--- sys-apps/groff/{groff-1.20.1.bep => groff-1.20.1.recipe} | 9 ++++++--- sys-apps/hgrep/{hgrep-1.0.1.bep => hgrep-1.0.1.recipe} | 6 ++++-- sys-apps/hgrep/{hgrep-1.0.bep => hgrep-1.0.recipe} | 6 ++++-- sys-apps/less/{less-436.bep => less-436.recipe} | 6 ++++-- sys-apps/less/{less-451.bep => less-451.recipe} | 6 ++++-- sys-apps/lgrep/{lgrep-1.0.bep => lgrep-1.0.recipe} | 6 ++++-- sys-apps/man/{man-1.6f.bep => man-1.6f.recipe} | 6 ++++-- sys-apps/man/{man-1.6g.bep => man-1.6g.recipe} | 6 ++++-- sys-apps/sed/{sed-4.2.1.bep => sed-4.2.1.recipe} | 6 ++++-- .../texinfo/{texinfo-4.13a.bep => texinfo-4.13a.recipe} | 6 ++++-- .../xinetd/{xinetd-2.3.14.bep => xinetd-2.3.14.recipe} | 6 ++++-- .../autoconf/{autoconf-2.65.bep => autoconf-2.65.recipe} | 6 ++++-- .../autoconf/{autoconf-2.66.bep => autoconf-2.66.recipe} | 6 ++++-- .../autoconf/{autoconf-2.67.bep => autoconf-2.67.recipe} | 6 ++++-- .../{autoconf-2.67xz.bep => autoconf-2.67xz.recipe} | 6 ++++-- .../autoconf/{autoconf-2.68.bep => autoconf-2.68.recipe} | 9 ++++++--- .../autoconf/{autoconf-2.69.bep => autoconf-2.69.recipe} | 9 ++++++--- .../{automake-1.10.3.bep => automake-1.10.3.recipe} | 6 ++++-- .../{automake-1.11.1.bep => automake-1.11.1.recipe} | 9 ++++++--- .../{automake-1.12.2.bep => automake-1.12.2.recipe} | 9 ++++++--- .../{automake-1.12.5.bep => automake-1.12.5.recipe} | 9 ++++++--- .../{automake-1.13.1.bep => automake-1.13.1.recipe} | 9 ++++++--- .../automake/{automake-1.13.bep => automake-1.13.recipe} | 9 ++++++--- sys-devel/bc/{bc-1.06.bep => bc-1.06.recipe} | 9 ++++++--- sys-devel/bison/{bison-2.4.1.bep => bison-2.4.1.recipe} | 9 ++++++--- sys-devel/bison/{bison-2.4.3.bep => bison-2.4.3.recipe} | 9 ++++++--- sys-devel/bison/{bison-2.4.bep => bison-2.4.recipe} | 6 ++++-- sys-devel/bison/{bison-2.5.bep => bison-2.5.recipe} | 9 ++++++--- sys-devel/bison/{bison-2.6.2.bep => bison-2.6.2.recipe} | 9 ++++++--- sys-devel/clang/{clang-3.0.bep => clang-3.0.recipe} | 6 ++++-- sys-devel/clang/{clang-3.2.bep => clang-3.2.recipe} | 9 ++++++--- sys-devel/flex/{flex-2.5.35.bep => flex-2.5.35.recipe} | 6 ++++-- .../{gcc-2.95.3_110711.bep => gcc-2.95.3_110711.recipe} | 6 ++++-- .../gettext/{gettext-0.17.bep => gettext-0.17.recipe} | 9 ++++++--- ...text-0.18.1.1-dev.bep => gettext-0.18.1.1-dev.recipe} | 9 ++++++--- .../{gettext-0.18.1.1.bep => gettext-0.18.1.1.recipe} | 9 ++++++--- sys-devel/jam/{jam-2.5.bep => jam-2.5.recipe} | 6 ++++-- sys-devel/lemon/{lemon-3.7.5.bep => lemon-3.7.5.recipe} | 6 ++++-- .../{libtool-2.2.10.bep => libtool-2.2.10.recipe} | 9 ++++++--- .../libtool/{libtool-2.2.6.bep => libtool-2.2.6.recipe} | 6 ++++-- .../{libtool-2.2.6b.bep => libtool-2.2.6b.recipe} | 6 ++++-- .../{libtool-2.2.7b.bep => libtool-2.2.7b.recipe} | 6 ++++-- .../libtool/{libtool-2.2.8.bep => libtool-2.2.8.recipe} | 9 ++++++--- .../libtool/{libtool-2.2.x.bep => libtool-2.2.x.recipe} | 6 ++++-- .../libtool/{libtool-2.4.2.bep => libtool-2.4.2.recipe} | 9 ++++++--- .../libtool/{libtool-2.4.bep => libtool-2.4.recipe} | 9 ++++++--- sys-devel/llvm/{llvm-3.0.bep => llvm-3.0.recipe} | 6 ++++-- sys-devel/llvm/{llvm-3.2.bep => llvm-3.2.recipe} | 6 ++++-- sys-devel/m4/{m4-1.4.14.bep => m4-1.4.14.recipe} | 9 ++++++--- sys-devel/m4/{m4-1.4.15.bep => m4-1.4.15.recipe} | 9 ++++++--- sys-devel/m4/{m4-1.4.16.bep => m4-1.4.16.recipe} | 9 ++++++--- sys-devel/make/{make-3.81.bep => make-3.81.recipe} | 6 ++++-- sys-devel/make/{make-3.82.bep => make-3.82.recipe} | 6 ++++-- sys-devel/patch/{patch-2.6.1.bep => patch-2.6.1.recipe} | 6 ++++-- sys-devel/patch/{patch-2.7.1.bep => patch-2.7.1.recipe} | 6 ++++-- ...{e2fsprogs-1.43-git.bep => e2fsprogs-1.43-git.recipe} | 6 ++++-- .../{e2fsprogs-1.43.bep => e2fsprogs-1.43.recipe} | 6 ++++-- sys-libs/glu/{glu-9.0.bep => glu-9.0.recipe} | 6 ++++-- sys-libs/mesa/{mesa-7.8.2.bep => mesa-7.8.2.recipe} | 3 ++- sys-libs/mesa/{mesa-9.0.1.bep => mesa-9.0.1.recipe} | 3 ++- sys-libs/mesa/{mesa-9.0.2.bep => mesa-9.0.2.recipe} | 3 ++- sys-libs/mesa/{mesa-9.0.bep => mesa-9.0.recipe} | 3 ++- sys-libs/mesa/{mesa-9.1.0.bep => mesa-9.1.0.recipe} | 3 ++- sys-libs/mesa/{mesa-9.1.1.bep => mesa-9.1.1.recipe} | 3 ++- sys-libs/ncurses/{ncurses-5.6.bep => ncurses-5.6.recipe} | 6 ++++-- sys-libs/ncurses/{ncurses-5.7.bep => ncurses-5.7.recipe} | 6 ++++-- sys-libs/ncurses/{ncurses-5.8.bep => ncurses-5.8.recipe} | 6 ++++-- sys-libs/ncurses/{ncurses-5.9.bep => ncurses-5.9.recipe} | 6 ++++-- .../readline/{readline-5.2.bep => readline-5.2.recipe} | 6 ++++-- .../readline/{readline-6.0.bep => readline-6.0.recipe} | 6 ++++-- .../readline/{readline-6.1.bep => readline-6.1.recipe} | 6 ++++-- .../readline/{readline-6.2.bep => readline-6.2.recipe} | 6 ++++-- sys-libs/slang/{slang-2.2.2.bep => slang-2.2.2.recipe} | 6 ++++-- sys-libs/zlib/{zlib-1.2.3.bep => zlib-1.2.3.recipe} | 6 ++++-- sys-libs/zlib/{zlib-1.2.5.bep => zlib-1.2.5.recipe} | 6 ++++-- sys-libs/zlib/{zlib-1.2.7.bep => zlib-1.2.7.recipe} | 6 ++++-- sys-libs/zopfli/{zopfli-999.bep => zopfli-999.recipe} | 6 ++++-- sys-process/htop/{htop-1.0.2.bep => htop-1.0.2.recipe} | 6 ++++-- .../links/{links-2.3pre2.bep => links-2.3pre2.recipe} | 6 ++++-- .../netsurf/{netsurf-10380.bep => netsurf-10380.recipe} | 6 ++++-- .../netsurf/{netsurf-2.1.bep => netsurf-2.1.recipe} | 6 ++++-- .../netsurf/{netsurf-2.6.bep => netsurf-2.6.recipe} | 6 ++++-- .../{netsurf-2.7-svn.bep => netsurf-2.7-svn.recipe} | 6 ++++-- .../netsurf/{netsurf-2.7.bep => netsurf-2.7.recipe} | 6 ++++-- .../netsurf/{netsurf-2.9.bep => netsurf-2.9.recipe} | 6 ++++-- .../{netsurf-2.HEAD.bep => netsurf-2.HEAD.recipe} | 6 ++++-- .../netsurf/{netsurf-9799.bep => netsurf-9799.recipe} | 6 ++++-- .../netsurf/{netsurf-9872.bep => netsurf-9872.recipe} | 6 ++++-- www-client/w3m/{w3m-0.5.3.bep => w3m-0.5.3.recipe} | 6 ++++-- .../apache/{apache-2.2.17.bep => apache-2.2.17.recipe} | 9 ++++++--- .../apache/{apache-2.2.22.bep => apache-2.2.22.recipe} | 9 ++++++--- .../apache/{apache-2.4.3.bep => apache-2.4.3.recipe} | 9 ++++++--- .../{cherokee-1.2.101.bep => cherokee-1.2.101.recipe} | 9 ++++++--- .../{haproxy-1.4.22.bep => haproxy-1.4.22.recipe} | 6 ++++-- x11-libs/agg/{agg-2.5.bep => agg-2.5.recipe} | 6 ++++-- x11-libs/cairo/{cairo-1.10.0.bep => cairo-1.10.0.recipe} | 6 ++++-- x11-libs/cairo/{cairo-1.8.10.bep => cairo-1.8.10.recipe} | 6 ++++-- .../libX11/{libX11-1.3.3.bep => libX11-1.3.3.recipe} | 6 ++++-- .../libXau/{libXau-1.0.5.bep => libXau-1.0.5.recipe} | 6 ++++-- x11-libs/libxcb/{libxcb-1.6.bep => libxcb-1.6.recipe} | 6 ++++-- x11-libs/pango/{pango-1.28.1.bep => pango-1.28.1.recipe} | 6 ++++-- .../pixman/{pixman-0.17.2.bep => pixman-0.17.2.recipe} | 6 ++++-- .../pixman/{pixman-0.18.2.bep => pixman-0.18.2.recipe} | 6 ++++-- .../pixman/{pixman-0.18.4.bep => pixman-0.18.4.recipe} | 6 ++++-- ...{pixman-0.19-master.bep => pixman-0.19-master.recipe} | 9 ++++++--- .../pixman/{pixman-0.19.4.bep => pixman-0.19.4.recipe} | 9 ++++++--- .../pixman/{pixman-0.20.0.bep => pixman-0.20.0.recipe} | 9 ++++++--- .../xtrans/{xtrans-1.2.5.bep => xtrans-1.2.5.recipe} | 6 ++++-- .../{makedepend-1.0.2.bep => makedepend-1.0.2.recipe} | 6 ++++-- ...red-mime-info-1.0.bep => shared-mime-info-1.0.recipe} | 6 ++++-- ...cros-1.17.0-git.bep => util-macros-1.17.0-git.recipe} | 6 ++++-- .../{util-macros-1.7.0.bep => util-macros-1.7.0.recipe} | 6 ++++-- .../{inputproto-2.0.bep => inputproto-2.0.recipe} | 6 ++++-- .../kbproto/{kbproto-1.0.4.bep => kbproto-1.0.4.recipe} | 6 ++++-- .../{xcb-proto-1.6.bep => xcb-proto-1.6.recipe} | 6 ++++-- .../{xextproto-7.1.1.bep => xextproto-7.1.1.recipe} | 6 ++++-- .../xproto/{xproto-7.0.16.bep => xproto-7.0.16.recipe} | 6 ++++-- .../{xproto-7.0.23-git.bep => xproto-7.0.23-git.recipe} | 6 ++++-- 937 files changed, 4094 insertions(+), 2047 deletions(-) rename app-admin/pwgen/{pwgen-2.06.bep => pwgen-2.06.recipe} (94%) rename app-arch/arc/{arc-5.21o.bep => arc-5.21o.recipe} (83%) rename app-arch/bzip2/{bzip2-1.0.5.bep => bzip2-1.0.5.recipe} (95%) rename app-arch/bzip2/{bzip2-1.0.6.bep => bzip2-1.0.6.recipe} (95%) rename app-arch/cabextract/{cabextract-1.2.bep => cabextract-1.2.recipe} (95%) rename app-arch/cabextract/{cabextract-1.3.bep => cabextract-1.3.recipe} (95%) rename app-arch/cpio/{cpio-2.10.bep => cpio-2.10.recipe} (96%) rename app-arch/cpio/{cpio-2.11.bep => cpio-2.11.recipe} (96%) rename app-arch/fastjar/{fastjar-0.98.bep => fastjar-0.98.recipe} (96%) rename app-arch/gzip/{gzip-1.2.4a.bep => gzip-1.2.4a.recipe} (93%) rename app-arch/gzip/{gzip-1.3.12.bep => gzip-1.3.12.recipe} (93%) rename app-arch/gzip/{gzip-1.4.bep => gzip-1.4.recipe} (95%) rename app-arch/ha/{ha-0999.bep => ha-0999.recipe} (95%) rename app-arch/lha/{lha-1.14i.bep => lha-1.14i.recipe} (95%) rename app-arch/libarchive/{libarchive-2.8.3.bep => libarchive-2.8.3.recipe} (95%) rename app-arch/libarchive/{libarchive-2.8.4.bep => libarchive-2.8.4.recipe} (95%) rename app-arch/libarchive/{libarchive-2.8.5.bep => libarchive-2.8.5.recipe} (96%) rename app-arch/libarchive/{libarchive-3.0.3.bep => libarchive-3.0.3.recipe} (96%) rename app-arch/p7zip/{p7zip-9.04.bep => p7zip-9.04.recipe} (96%) rename app-arch/p7zip/{p7zip-9.13.bep => p7zip-9.13.recipe} (96%) rename app-arch/p7zip/{p7zip-9.20.1.bep => p7zip-9.20.1.recipe} (96%) rename app-arch/pigz/{pigz-2.1.6.bep => pigz-2.1.6.recipe} (94%) rename app-arch/sharutils/{sharutils-4.10.bep => sharutils-4.10.recipe} (96%) rename app-arch/sharutils/{sharutils-4.6.3.bep => sharutils-4.6.3.recipe} (94%) rename app-arch/tar/{tar-1.22.bep => tar-1.22.recipe} (96%) rename app-arch/tar/{tar-1.23.bep => tar-1.23.recipe} (95%) rename app-arch/tar/{tar-1.25.bep => tar-1.25.recipe} (97%) rename app-arch/tar/{tar-1.26.bep => tar-1.26.recipe} (96%) rename app-arch/unrar/{unrar-4.2.4.bep => unrar-4.2.4.recipe} (94%) rename app-arch/unzip/{unzip-6.0.bep => unzip-6.0.recipe} (94%) rename app-arch/xar/{xar-1.5.2.bep => xar-1.5.2.recipe} (95%) rename app-arch/xz-utils/{xz-utils-4.999.9.bep => xz-utils-4.999.9.recipe} (95%) rename app-arch/xz-utils/{xz-utils-5.0.1.bep => xz-utils-5.0.1.recipe} (96%) rename app-arch/xz-utils/{xz-utils-5.0.4.bep => xz-utils-5.0.4.recipe} (96%) rename app-arch/zip/{zip-3.0.bep => zip-3.0.recipe} (94%) rename app-arch/zoo/{zoo-2.10.bep => zoo-2.10.recipe} (93%) rename app-benchmarks/bonnie++/{bonnie++-1.03e.bep => bonnie++-1.03e.recipe} (97%) rename app-benchmarks/ffsb/{ffsb-6.0-rc2.bep => ffsb-6.0-rc2.recipe} (96%) rename app-benchmarks/iozone/{iozone-3.326.bep => iozone-3.326.recipe} (96%) rename app-benchmarks/libmicro/{libmicro-0.4.1.bep => libmicro-0.4.1.recipe} (93%) rename app-benchmarks/piozone/{piozone-1.0.bep => piozone-1.0.recipe} (95%) rename app-cdr/bchunk/{bchunk-1.2.0.bep => bchunk-1.2.0.recipe} (97%) rename app-cdr/cdrdao/{cdrdao-1.2.3.bep => cdrdao-1.2.3.recipe} (95%) rename app-cdr/cdrtools/{cdrtools-2.01.01a66.bep => cdrtools-2.01.01a66.recipe} (95%) rename app-cdr/cdrtools/{cdrtools-2.01.01a77.bep => cdrtools-2.01.01a77.recipe} (94%) rename app-cdr/cdrtools/{cdrtools-3.00.bep => cdrtools-3.00.recipe} (94%) rename app-cdr/cdrtools/{cdrtools-3.01a01.bep => cdrtools-3.01a01.recipe} (98%) rename app-cdr/cdrtools/{cdrtools-3.01a06.bep => cdrtools-3.01a06.recipe} (98%) rename app-cdr/cdrtools/{cdrtools-3.01a07.bep => cdrtools-3.01a07.recipe} (98%) rename app-cdr/daa2iso/{daa2iso-0.1.7e.bep => daa2iso-0.1.7e.recipe} (95%) rename app-cdr/uif2iso/{uif2iso-0.1.7c.bep => uif2iso-0.1.7c.recipe} (95%) rename app-crypt/gnupg/{gnupg-1.4.10.bep => gnupg-1.4.10.recipe} (95%) rename app-crypt/gnupg/{gnupg-1.4.11.bep => gnupg-1.4.11.recipe} (95%) rename app-doc/doxygen/{doxygen-1.6.1.bep => doxygen-1.6.1.recipe} (96%) rename app-doc/doxygen/{doxygen-1.6.2.bep => doxygen-1.6.2.recipe} (96%) rename app-doc/doxygen/{doxygen-1.6.3.bep => doxygen-1.6.3.recipe} (96%) rename app-doc/doxygen/{doxygen-1.7.4.bep => doxygen-1.7.4.recipe} (96%) rename app-editors/jed/{jed-0.99-19.bep => jed-0.99-19.recipe} (96%) rename app-editors/joe/{joe-3.8-hg.bep => joe-3.8-hg.recipe} (96%) rename app-editors/nano/{nano-2.2.3.bep => nano-2.2.3.recipe} (95%) rename app-editors/nano/{nano-2.2.5.bep => nano-2.2.5.recipe} (95%) rename app-editors/nano/{nano-2.2.6.bep => nano-2.2.6.recipe} (96%) rename app-editors/nano/{nano-2.3.1.bep => nano-2.3.1.recipe} (96%) rename app-editors/ne/{ne-2.1.bep => ne-2.1.recipe} (95%) rename app-editors/qemacs/{qemacs-0.3.2dev-cvs.bep => qemacs-0.3.2dev-cvs.recipe} (95%) rename app-editors/qemacs/{qemacs-0.3.3.bep => qemacs-0.3.3.recipe} (95%) rename app-editors/se/{se-3.0.bep => se-3.0.recipe} (96%) rename app-editors/vim/{vim-7.2.bep => vim-7.2.recipe} (94%) rename app-editors/vim/{vim-7.3.bep => vim-7.3.recipe} (94%) rename app-emulation/aranym/{aranym-0.9.11-cvs.bep => aranym-0.9.11-cvs.recipe} (96%) rename app-emulation/libdsk/{libdsk-1.3.3.bep => libdsk-1.3.3.recipe} (96%) rename app-emulation/mednafen/{mednafen-0.9.26.bep => mednafen-0.9.26.recipe} (95%) rename app-emulation/oricutron/{oricutron-0.9-svn.bep => oricutron-0.9-svn.recipe} (94%) rename app-emulation/pearpc/{pearpc-0.5.0-cvs.bep => pearpc-0.5.0-cvs.recipe} (95%) rename app-emulation/qemu/{qemu-0.12.4.bep => qemu-0.12.4.recipe} (95%) rename app-i18n/anthy/{anthy-9100.bep => anthy-9100.recipe} (96%) rename app-misc/colordiff/{colordiff-1.0.10.bep => colordiff-1.0.10.recipe} (96%) rename app-misc/figlet/{figlet-222.bep => figlet-222.recipe} (97%) rename app-misc/getopt/{getopt-1.1.4.bep => getopt-1.1.4.recipe} (95%) rename app-office/abiword/{abiword-2.8.6.bep => abiword-2.8.6.recipe} (94%) rename app-shells/bash/{bash-4.1.bep => bash-4.1.recipe} (95%) rename app-shells/fish/{fish-1.23.1-git.bep => fish-1.23.1-git.recipe} (95%) rename app-shells/zsh/{zsh-4.3.10.bep => zsh-4.3.10.recipe} (96%) rename app-shells/zsh/{zsh-5.0.0.bep => zsh-5.0.0.recipe} (97%) rename app-text/antiword/{antiword-0.37.bep => antiword-0.37.recipe} (95%) rename app-text/aspell/{aspell-0.60.6.bep => aspell-0.60.6.recipe} (95%) rename app-text/convmv/{convmv-1.15.bep => convmv-1.15.recipe} (95%) rename app-text/discount/{discount-2.1.3.bep => discount-2.1.3.recipe} (96%) rename app-text/dos2unix/{dos2unix-1.0.bep => dos2unix-1.0.recipe} (96%) rename app-text/ebook-tools/{ebook-tools-0.2.1.bep => ebook-tools-0.2.1.recipe} (96%) rename app-text/enchant/{enchant-1.6.0.bep => enchant-1.6.0.recipe} (97%) rename app-text/gocr/{gocr-0.49.bep => gocr-0.49.recipe} (96%) rename app-text/gpp/{gpp-2.4.bep => gpp-2.4.recipe} (97%) rename app-text/htmldoc/{htmldoc-1.8.27.bep => htmldoc-1.8.27.recipe} (96%) rename app-text/htmltidy/{htmltidy-20092812.bep => htmltidy-20092812.recipe} (95%) rename app-text/hunspell/{hunspell-1.3.2.bep => hunspell-1.3.2.recipe} (97%) rename app-text/libpaper/{libpaper-1.1.23.bep => libpaper-1.1.23.recipe} (96%) rename app-text/libpaper/{libpaper-1.1.24.bep => libpaper-1.1.24.recipe} (97%) rename app-text/libwpd/{libwpd-0.9.6.bep => libwpd-0.9.6.recipe} (96%) rename app-text/libwpg/{libwpg-0.2.1.bep => libwpg-0.2.1.recipe} (96%) rename app-text/psiconv/{psiconv-0.9.8.bep => psiconv-0.9.8.recipe} (95%) rename app-text/rman/{rman-3.2.bep => rman-3.2.recipe} (97%) rename app-text/sablotron/{sablotron-1.0.3.bep => sablotron-1.0.3.recipe} (96%) rename app-text/tesseract/{tesseract-3.x-svn.bep => tesseract-3.x-svn.recipe} (94%) rename app-text/texi2html/{texi2html-1.82.bep => texi2html-1.82.recipe} (94%) rename app-text/tree/{tree-1.6.0.bep => tree-1.6.0.recipe} (94%) rename dev-cpp/eigen/{eigen-3.1.2.bep => eigen-3.1.2.recipe} (94%) rename dev-cpp/glog/{glog-0.3.3.bep => glog-0.3.3.recipe} (97%) rename dev-cpp/mm-common/{mm-common-0.9.2.bep => mm-common-0.9.2.recipe} (95%) rename dev-cpp/mxml/{mxml-2.6.bep => mxml-2.6.recipe} (96%) rename dev-db/mysql/{mysql-5.0.83.bep => mysql-5.0.83.recipe} (96%) rename dev-db/postgresql/{postgresql-9.0.4.bep => postgresql-9.0.4.recipe} (95%) rename dev-db/postgresql/{postgresql-9.2.3.bep => postgresql-9.2.3.recipe} (95%) rename dev-db/redis/{redis-2.2.11.bep => redis-2.2.11.recipe} (96%) rename dev-db/redis/{redis-2.9.0-git.bep => redis-2.9.0-git.recipe} (96%) rename dev-db/sqlite/{sqlite-3.6.22.bep => sqlite-3.6.22.recipe} (96%) rename dev-db/sqlite/{sqlite-3.6.23.bep => sqlite-3.6.23.recipe} (96%) rename dev-db/sqlite/{sqlite-3.7.13.bep => sqlite-3.7.13.recipe} (96%) rename dev-db/sqlite/{sqlite-3.7.15.1.bep => sqlite-3.7.15.1.recipe} (97%) rename dev-db/sqlite/{sqlite-3.7.2.bep => sqlite-3.7.2.recipe} (96%) rename dev-db/sqlite/{sqlite-3.7.3.bep => sqlite-3.7.3.recipe} (96%) rename dev-db/sqlite/{sqlite-3.7.4.bep => sqlite-3.7.4.recipe} (96%) rename dev-db/sqlite/{sqlite-3.7.5.bep => sqlite-3.7.5.recipe} (97%) rename dev-db/sqlite/{sqlite-3.7.6.2.bep => sqlite-3.7.6.2.recipe} (96%) rename dev-db/sqlite/{sqlite-3.7.7.1.bep => sqlite-3.7.7.1.recipe} (96%) rename dev-dotnet/pnet/{pnet-0.8.0.bep => pnet-0.8.0.recipe} (95%) rename dev-embedded/u-boot-tools/{u-boot-tools-2012.10.bep => u-boot-tools-2012.10.recipe} (95%) rename dev-games/box2d/{box2d-2.1.2.bep => box2d-2.1.2.recipe} (95%) rename dev-games/flatzebra/{flatzebra-0.1.3.bep => flatzebra-0.1.3.recipe} (96%) rename dev-games/libggz/{libggz-0.99.5.bep => libggz-0.99.5.recipe} (96%) rename dev-games/ode/{ode-0.12.bep => ode-0.12.recipe} (96%) rename dev-games/physfs/{physfs-2.0.1.bep => physfs-2.0.1.recipe} (97%) rename dev-java/gnu-classpath/{gnu-classpath-0.98.bep => gnu-classpath-0.98.recipe} (97%) rename dev-java/jamvm/{jamvm-1.5.4.bep => jamvm-1.5.4.recipe} (96%) rename dev-lang/camlp5/{camlp5-6.06.bep => camlp5-6.06.recipe} (97%) rename dev-lang/dmd-bin/{dmd-bin-1.064.bep => dmd-bin-1.064.recipe} (96%) rename dev-lang/erlang/{erlang-R14B.bep => erlang-R14B.recipe} (99%) rename dev-lang/fpc/{fpc-2.4.0.bep => fpc-2.4.0.recipe} (93%) rename dev-lang/fpc/{fpc-2.6.0.bep => fpc-2.6.0.recipe} (97%) rename dev-lang/lua/{lua-5.1.4.bep => lua-5.1.4-3.recipe} (96%) rename dev-lang/lua/{lua-5.1.4-3.bep => lua-5.1.4.recipe} (96%) rename dev-lang/lua/{lua-5.2.1.bep => lua-5.2.1.recipe} (95%) rename dev-lang/nasm/{nasm-2.08.01.bep => nasm-2.08.01.recipe} (95%) rename dev-lang/ocaml/{ocaml-4.00.0.bep => ocaml-4.00.0.recipe} (97%) rename dev-lang/openjdk/{openjdk-1.7.bep => openjdk-1.7.recipe} (98%) rename dev-lang/orc/{orc-0.4.16.bep => orc-0.4.16.recipe} (96%) rename dev-lang/perl/{perl-5.10.1.bep => perl-5.10.1.recipe} (98%) rename dev-lang/php/{php-5.3.4.bep => php-5.3.4.recipe} (95%) rename dev-lang/php/{php-5.3.5.bep => php-5.3.5.recipe} (97%) rename dev-lang/python/{python-2.5.4.bep => python-2.5.4.recipe} (96%) rename dev-lang/python/{python-2.6.4.bep => python-2.6.4.recipe} (96%) rename dev-lang/python/{python-2.6.5.bep => python-2.6.5.recipe} (97%) rename dev-lang/python/{python-2.6.6.bep => python-2.6.6.recipe} (96%) rename dev-lang/python/{python-2.6.7.bep => python-2.6.7.recipe} (96%) rename dev-lang/python/{python-2.6.8.bep => python-2.6.8.recipe} (96%) rename dev-lang/python/{python-2.7.1.bep => python-2.7.1.recipe} (96%) rename dev-lang/python/{python-3.2.bep => python-3.2.recipe} (97%) rename dev-lang/rebol/{rebol-2.101.0.5.75.bep => rebol-2.101.0.5.75.recipe} (96%) rename dev-lang/ruby/{ruby-1.9.1.bep => ruby-1.9.1.recipe} (96%) rename dev-lang/swi-prolog/{swi-prolog-6.0.2.bep => swi-prolog-6.0.2.recipe} (95%) rename dev-lang/swi-prolog/{swi-prolog-6.2.0.bep => swi-prolog-6.2.0.recipe} (95%) rename dev-lang/swig/{swig-1.3.40.bep => swig-1.3.40.recipe} (96%) rename dev-lang/swig/{swig-2.0.2.bep => swig-2.0.2.recipe} (96%) rename dev-lang/tcl/{tcl-8.5.9.bep => tcl-8.5.9.recipe} (95%) rename dev-lang/v8/{v8-r13067.bep => v8-r13067.recipe} (97%) rename dev-lang/yasm/{yasm-1.1.0.bep => yasm-1.1.0.recipe} (96%) rename dev-lang/yasm/{yasm-1.2.0.bep => yasm-1.2.0.recipe} (96%) rename dev-libs/apr-util/{apr-util-1.3.10.bep => apr-util-1.3.10.recipe} (98%) rename dev-libs/apr-util/{apr-util-1.3.11.bep => apr-util-1.3.11.recipe} (98%) rename dev-libs/apr-util/{apr-util-1.3.12.bep => apr-util-1.3.12.recipe} (98%) rename dev-libs/apr-util/{apr-util-1.3.9.bep => apr-util-1.3.9.recipe} (98%) rename dev-libs/apr-util/{apr-util-1.4.1.bep => apr-util-1.4.1.recipe} (98%) rename dev-libs/apr/{apr-1.3.8.bep => apr-1.3.8.recipe} (94%) rename dev-libs/apr/{apr-1.3.9.bep => apr-1.3.9.recipe} (95%) rename dev-libs/apr/{apr-1.4.2.bep => apr-1.4.2.recipe} (96%) rename dev-libs/apr/{apr-1.4.4.bep => apr-1.4.4.recipe} (97%) rename dev-libs/apr/{apr-1.4.5.bep => apr-1.4.5.recipe} (97%) rename dev-libs/apr/{apr-1.4.6.bep => apr-1.4.6.recipe} (97%) rename dev-libs/atk/{atk-1.29.2.bep => atk-1.29.2.recipe} (95%) rename dev-libs/atk/{atk-1.30.0.bep => atk-1.30.0.recipe} (96%) rename dev-libs/boehm-gc/{boehm-gc-7.2_alpha6.bep => boehm-gc-7.2_alpha6.recipe} (96%) rename dev-libs/boehm-gc/{boehm-gc-7.2d.bep => boehm-gc-7.2d.recipe} (96%) rename dev-libs/boost/{boost-1.42.0.bep => boost-1.42.0.recipe} (96%) rename dev-libs/boost/{boost-1.50.0.bep => boost-1.50.0.recipe} (98%) rename dev-libs/boost/{boost-1.53.0.bep => boost-1.53.0.recipe} (98%) rename dev-libs/chmlib/{chmlib-0.40.bep => chmlib-0.40.recipe} (96%) rename dev-libs/cyassl/{cyassl-1.6.5.bep => cyassl-1.6.5.recipe} (95%) rename dev-libs/cyassl/{cyassl-1.8.0.bep => cyassl-1.8.0.recipe} (95%) rename dev-libs/cyassl/{cyassl-2.0.2.bep => cyassl-2.0.2.recipe} (95%) rename dev-libs/cyassl/{cyassl-2.5.0.bep => cyassl-2.5.0.recipe} (95%) rename dev-libs/expat/{expat-2.0.1.bep => expat-2.0.1.recipe} (97%) rename dev-libs/fribidi/{fribidi-0.19.2.bep => fribidi-0.19.2.recipe} (97%) rename dev-libs/glib/{glib-2.22.2.bep => glib-2.22.2.recipe} (96%) rename dev-libs/glib/{glib-2.24.1.bep => glib-2.24.1.recipe} (96%) rename dev-libs/glib/{glib-2.24.2.bep => glib-2.24.2.recipe} (98%) rename dev-libs/glib/{glib-2.26.1.bep => glib-2.26.1.recipe} (97%) rename dev-libs/gmp/{gmp-4.3.1.bep => gmp-4.3.1.recipe} (94%) rename dev-libs/gmp/{gmp-4.3.2.bep => gmp-4.3.2.recipe} (94%) rename dev-libs/gmp/{gmp-5.0.1.bep => gmp-5.0.1.recipe} (94%) rename dev-libs/gmp/{gmp-5.0.5.bep => gmp-5.0.5.recipe} (94%) rename dev-libs/gmp/{gmp-5.1.1.bep => gmp-5.1.1.recipe} (94%) rename dev-libs/gnulib/{gnulib-9999.bep => gnulib-9999.recipe} (93%) rename dev-libs/icu/{icu-4.4.1.bep => icu-4.4.1.recipe} (95%) rename dev-libs/icu/{icu-4.8.1.bep => icu-4.8.1.recipe} (95%) rename dev-libs/jansson/{jansson-2.4.bep => jansson-2.4.recipe} (94%) rename dev-libs/json-c/{json-c-0.9.bep => json-c-0.9.recipe} (95%) rename dev-libs/libattica/{libattica-0.4.1.bep => libattica-0.4.1.recipe} (94%) rename dev-libs/libcdio/{libcdio-0.82.bep => libcdio-0.82.recipe} (96%) rename dev-libs/libcdio/{libcdio-0.83.bep => libcdio-0.83.recipe} (96%) rename dev-libs/libcdio/{libcdio-0.90.bep => libcdio-0.90.recipe} (96%) rename dev-libs/libcss/{libcss-0.1.2.bep => libcss-0.1.2.recipe} (95%) rename dev-libs/libdwarf/{libdwarf-20120410.bep => libdwarf-20120410.recipe} (97%) rename dev-libs/libebml/{libebml-1.0.0.bep => libebml-1.0.0.recipe} (95%) rename dev-libs/libedit/{libedit-20090923.bep => libedit-20090923.recipe} (95%) rename dev-libs/libedit/{libedit-20100424.bep => libedit-20100424.recipe} (96%) rename dev-libs/libedit/{libedit-20110802-3.0.bep => libedit-20110802-3.0.recipe} (96%) rename dev-libs/libedit/{libedit-20120601-3.0.bep => libedit-20120601-3.0.recipe} (96%) rename dev-libs/libelf/{libelf-0.8.13.bep => libelf-0.8.13.recipe} (96%) rename dev-libs/libevent/{libevent-1.4.11.bep => libevent-1.4.11.recipe} (95%) rename dev-libs/libevent/{libevent-1.4.13.bep => libevent-1.4.13.recipe} (95%) rename dev-libs/libevent/{libevent-1.4.14b.bep => libevent-1.4.14b.recipe} (96%) rename dev-libs/libevent/{libevent-2.0.10.bep => libevent-2.0.10.recipe} (96%) rename dev-libs/libffi/{libffi-3.0.11.bep => libffi-3.0.11.recipe} (96%) rename dev-libs/libffi/{libffi-3.0.9.bep => libffi-3.0.9.recipe} (96%) rename dev-libs/libgcrypt/{libgcrypt-1.4.5.bep => libgcrypt-1.4.5.recipe} (95%) rename dev-libs/libgcrypt/{libgcrypt-1.5.0.bep => libgcrypt-1.5.0.recipe} (96%) rename dev-libs/libgpg-error/{libgpg-error-1.10.bep => libgpg-error-1.10.recipe} (96%) rename dev-libs/libgpg-error/{libgpg-error-1.7.bep => libgpg-error-1.7.recipe} (95%) rename dev-libs/libiconv/{libiconv-1.12.bep => libiconv-1.12.recipe} (98%) rename dev-libs/libiconv/{libiconv-1.13.1.bep => libiconv-1.13.1.recipe} (98%) rename dev-libs/liboil/{liboil-0.3.17.bep => liboil-0.3.17.recipe} (96%) rename dev-libs/libparserutils/{libparserutils-0.1.1.bep => libparserutils-0.1.1.recipe} (95%) rename dev-libs/libpcre/{libpcre-8.00.bep => libpcre-8.00.recipe} (96%) rename dev-libs/libpcre/{libpcre-8.02.bep => libpcre-8.02.recipe} (96%) rename dev-libs/libpcre/{libpcre-8.12.bep => libpcre-8.12.recipe} (96%) rename dev-libs/libpcre/{libpcre-8.21.bep => libpcre-8.21.recipe} (96%) rename dev-libs/libpthread-stubs/{libpthread-stubs-0.3.2.bep => libpthread-stubs-0.3.2.recipe} (95%) rename dev-libs/libpthread-stubs/{libpthread-stubs-0.3.bep => libpthread-stubs-0.3.recipe} (95%) rename dev-libs/libsigc++/{libsigc++-1.2.7.bep => libsigc++-1.2.7.recipe} (97%) rename dev-libs/libsigc++/{libsigc++-2.2.7.bep => libsigc++-2.2.7.recipe} (96%) rename dev-libs/libsigsegv/{libsigsegv-2.8.bep => libsigsegv-2.8.recipe} (95%) rename dev-libs/libunistring/{libunistring-0.9.1.1.bep => libunistring-0.9.1.1.recipe} (96%) rename dev-libs/libwapcaplet/{libwapcaplet-0.1.1-HEAD.bep => libwapcaplet-0.1.1-HEAD.recipe} (95%) rename dev-libs/libwapcaplet/{libwapcaplet-0.1.1.bep => libwapcaplet-0.1.1.recipe} (94%) rename dev-libs/libxdg-basedir/{libxdg-basedir-1.1.1.bep => libxdg-basedir-1.1.1.recipe} (95%) rename dev-libs/libxml2/{libxml2-2.7.3.bep => libxml2-2.7.3.recipe} (96%) rename dev-libs/libxml2/{libxml2-2.7.6.bep => libxml2-2.7.6.recipe} (96%) rename dev-libs/libxml2/{libxml2-2.7.7.bep => libxml2-2.7.7.recipe} (95%) rename dev-libs/libxml2/{libxml2-2.7.8.bep => libxml2-2.7.8.recipe} (96%) rename dev-libs/libxml2/{libxml2-2.8.0.bep => libxml2-2.8.0.recipe} (96%) rename dev-libs/libxml2/{libxml2-2.9.0.bep => libxml2-2.9.0.recipe} (96%) rename dev-libs/libxslt/{libxslt-1.1.26.bep => libxslt-1.1.26.recipe} (97%) rename dev-libs/libxslt/{libxslt-1.1.28.bep => libxslt-1.1.28.recipe} (97%) rename dev-libs/libzip/{libzip-0.10.1.bep => libzip-0.10.1.recipe} (96%) rename dev-libs/libzip/{libzip-0.10.bep => libzip-0.10.recipe} (96%) rename dev-libs/lzo/{lzo-2.06.bep => lzo-2.06.recipe} (94%) rename dev-libs/mpc/{mpc-1.0.1.bep => mpc-1.0.1.recipe} (95%) rename dev-libs/mpfr/{mpfr-3.0.0-7047.bep => mpfr-3.0.0-7047.recipe} (95%) rename dev-libs/mpfr/{mpfr-3.1.1.bep => mpfr-3.1.1.recipe} (95%) rename dev-libs/oniguruma/{oniguruma-5.9.2.bep => oniguruma-5.9.2.recipe} (94%) rename dev-libs/openssl/{openssl-0.9.8l.bep => openssl-0.9.8l.recipe} (95%) rename dev-libs/openssl/{openssl-0.9.8m.bep => openssl-0.9.8m.recipe} (95%) rename dev-libs/openssl/{openssl-1.0.0.bep => openssl-1.0.0.recipe} (95%) rename dev-libs/openssl/{openssl-1.0.0a.bep => openssl-1.0.0a.recipe} (95%) rename dev-libs/openssl/{openssl-1.0.0c.bep => openssl-1.0.0c.recipe} (94%) rename dev-libs/openssl/{openssl-1.0.0d.bep => openssl-1.0.0d.recipe} (97%) rename dev-libs/openssl/{openssl-1.0.0e.bep => openssl-1.0.0e.recipe} (95%) rename dev-libs/openssl/{openssl-1.0.0g.bep => openssl-1.0.0g.recipe} (95%) rename dev-libs/openssl/{openssl-1.0.0j.bep => openssl-1.0.0j.recipe} (95%) rename dev-libs/popt/{popt-1.16.bep => popt-1.16.recipe} (95%) rename dev-libs/protobuf/{protobuf-2.4.1.bep => protobuf-2.4.1.recipe} (94%) rename dev-libs/raptor2/{raptor2-2.0.8.bep => raptor2-2.0.8.recipe} (95%) rename dev-libs/rasqal/{rasqal-0.9.29.bep => rasqal-0.9.29.recipe} (95%) rename dev-libs/redland/{redland-1.0.15.bep => redland-1.0.15.recipe} (95%) rename dev-libs/serd/{serd-0.18.0.bep => serd-0.18.0.recipe} (96%) rename dev-libs/tinyxml/{tinyxml-2.6.2.bep => tinyxml-2.6.2.recipe} (95%) rename dev-libs/uriparser/{uriparser-0.7.5.bep => uriparser-0.7.5.recipe} (96%) rename dev-libs/xerces-c/{xerces-c-3.1.1.bep => xerces-c-3.1.1.recipe} (96%) rename dev-libs/zziplib/{zziplib-0.13.59.bep => zziplib-0.13.59.recipe} (97%) rename dev-lua/luarocks/{luarocks-2.0.4.1.bep => luarocks-2.0.4.1.recipe} (95%) rename dev-perl/XML-Parser/{XML-Parser-2.36.bep => XML-Parser-2.36.recipe} (96%) rename dev-python/cnf/{cnf-1.0-git.bep => cnf-1.0-git.recipe} (95%) rename dev-python/numpy/{numpy-1.4.1.bep => numpy-1.4.1.recipe} (95%) rename dev-python/numpy/{numpy-1.5.0.bep => numpy-1.5.0.recipe} (96%) rename dev-python/paramiko/{paramiko-1.7.6.bep => paramiko-1.7.6.recipe} (96%) rename dev-python/pychart/{pychart-1.39-bzr.bep => pychart-1.39-bzr.recipe} (94%) rename dev-python/pychart/{pychart-1.39.bep => pychart-1.39.recipe} (94%) rename dev-python/pycrypto/{pycrypto-2.3.bep => pycrypto-2.3.recipe} (96%) rename dev-python/pydispatcher/{pydispatcher-2.0.1.bep => pydispatcher-2.0.1.recipe} (96%) rename dev-python/pygame/{pygame-1.9.1.bep => pygame-1.9.1.recipe} (96%) rename dev-python/pylzma/{pylzma-0.4.4.bep => pylzma-0.4.4.recipe} (95%) rename dev-python/pyopengl/{pyopengl-3.0.1.bep => pyopengl-3.0.1.recipe} (95%) rename dev-python/pyserial/{pyserial-2.5.bep => pyserial-2.5.recipe} (96%) rename dev-python/pyxml/{pyxml-0.8.4.bep => pyxml-0.8.4.recipe} (95%) rename dev-python/rdflib/{rdflib-3.2.0.bep => rdflib-3.2.0.recipe} (95%) rename dev-python/setuptools/{setuptools-0.6.bep => setuptools-0.6.recipe} (96%) rename dev-python/simpleparse/{simpleparse-2.1.1a2.bep => simpleparse-2.1.1a2.recipe} (95%) rename dev-qt/qtcore/{qtcore-4.7.3.bep => qtcore-4.7.3.recipe} (97%) rename dev-qt/qtcore/{qtcore-4.8.x-git.bep => qtcore-4.8.x-git.recipe} (97%) rename dev-qt/qtcore/{qtcore-4.8.x.bep => qtcore-4.8.x.recipe} (96%) rename dev-scheme/chicken/{chicken-4.5.0.bep => chicken-4.5.0.recipe} (95%) rename dev-scheme/chicken/{chicken-4.7.0.bep => chicken-4.7.0.recipe} (97%) rename dev-util/abi-compliance-checker/{abi-compliance-checker-1.98.3.bep => abi-compliance-checker-1.98.3.recipe} (97%) rename dev-util/astyle/{astyle-r339.bep => astyle-r339.recipe} (96%) rename dev-util/astyle/{astyle-r361.bep => astyle-r361.recipe} (96%) rename dev-util/automoc/{automoc-4-git.bep => automoc-4-git.recipe} (93%) rename dev-util/bakefile/{bakefile-0.2.8.bep => bakefile-0.2.8.recipe} (95%) rename dev-util/bsdbuild/{bsdbuild-2.9.bep => bsdbuild-2.9.recipe} (97%) rename dev-util/buildsystem/{buildsystem-0.bep => buildsystem-0.recipe} (94%) rename dev-util/ccache/{ccache-3.0.1.bep => ccache-3.0.1.recipe} (95%) rename dev-util/ccache/{ccache-3.1.4.bep => ccache-3.1.4.recipe} (95%) rename dev-util/ccache/{ccache-3.1.7.bep => ccache-3.1.7.recipe} (95%) rename dev-util/cmake/{cmake-2.6.4.bep => cmake-2.6.4.recipe} (95%) rename dev-util/cmake/{cmake-2.8-git.bep => cmake-2.8-git.recipe} (96%) rename dev-util/cmake/{cmake-2.8.0.bep => cmake-2.8.0.recipe} (95%) rename dev-util/cmake/{cmake-2.8.1.bep => cmake-2.8.1.recipe} (95%) rename dev-util/cmake/{cmake-2.8.10.2.bep => cmake-2.8.10.2.recipe} (97%) rename dev-util/cmake/{cmake-2.8.2.bep => cmake-2.8.2.recipe} (95%) rename dev-util/cmake/{cmake-2.8.3.bep => cmake-2.8.3.recipe} (95%) rename dev-util/cmake/{cmake-2.8.4.bep => cmake-2.8.4.recipe} (97%) rename dev-util/cmake/{cmake-2.8.5.bep => cmake-2.8.5.recipe} (97%) rename dev-util/cppunit/{cppunit-1.12.1.bep => cppunit-1.12.1.recipe} (95%) rename dev-util/cscope/{cscope-15.7a.bep => cscope-15.7a.recipe} (95%) rename dev-util/ctags/{ctags-5.8.bep => ctags-5.8.recipe} (96%) rename dev-util/diffstat/{diffstat-1.51.bep => diffstat-1.51.recipe} (95%) rename dev-util/fastdep/{fastdep-0.16.bep => fastdep-0.16.recipe} (95%) rename dev-util/global/{global-6.2.2.bep => global-6.2.2.recipe} (97%) rename dev-util/global/{global-6.2.4.bep => global-6.2.4.recipe} (97%) rename dev-util/gperf/{gperf-3.0.4.bep => gperf-3.0.4.recipe} (96%) rename dev-util/gtk-doc/{gtk-doc-1.15.bep => gtk-doc-1.15.recipe} (95%) rename dev-util/idutils/{idutils-20061208.bep => idutils-20061208.recipe} (95%) rename dev-util/idutils/{idutils-4.2.bep => idutils-4.2.recipe} (95%) rename dev-util/indent/{indent-2.2.11.bep => indent-2.2.11.recipe} (96%) rename dev-util/intltool/{intltool-0.40.6.bep => intltool-0.40.6.recipe} (96%) rename dev-util/patchutils/{patchutils-0.3.1.bep => patchutils-0.3.1.recipe} (95%) rename dev-util/patchutils/{patchutils-0.3.2.bep => patchutils-0.3.2.recipe} (95%) rename dev-util/pjdfstest/{pjdfstest-20100807.bep => pjdfstest-20100807.recipe} (94%) rename dev-util/pkgconfig/{pkgconfig-0.23.bep => pkgconfig-0.23.recipe} (96%) rename dev-util/pkgconfig/{pkgconfig-0.25.bep => pkgconfig-0.25.recipe} (97%) rename dev-util/posixtestsuite/{posixtestsuite-1.5.2.bep => posixtestsuite-1.5.2.recipe} (95%) rename dev-util/premake/{premake-4.3.bep => premake-4.3.recipe} (96%) rename dev-util/quilt/{quilt-0.48.bep => quilt-0.48.recipe} (96%) rename dev-util/re2c/{re2c-0.13.5.bep => re2c-0.13.5.recipe} (95%) rename dev-util/scons/{scons-1.0.1-python2.5.bep => scons-1.0.1-python2.5.recipe} (96%) rename dev-util/scons/{scons-1.0.1.bep => scons-1.0.1.recipe} (96%) rename dev-util/scons/{scons-2.0.1.bep => scons-2.0.1.recipe} (97%) rename dev-util/scons/{scons-2.2.0.bep => scons-2.2.0.recipe} (97%) rename dev-vcs/bzr/{bzr-2.2.0.bep => bzr-2.2.0.recipe} (97%) rename dev-vcs/bzr/{bzr-2.2.1.bep => bzr-2.2.1.recipe} (97%) rename dev-vcs/bzr/{bzr-2.2.2.bep => bzr-2.2.2.recipe} (97%) rename dev-vcs/bzr/{bzr-2.2b4.bep => bzr-2.2b4.recipe} (97%) rename dev-vcs/bzr/{bzr-2.5.1.bep => bzr-2.5.1.recipe} (97%) rename dev-vcs/bzr/{bzr-2.6b1.bep => bzr-2.6b1.recipe} (97%) rename dev-vcs/cvs/{cvs-1.12.13.1.bep => cvs-1.12.13.1.recipe} (97%) rename dev-vcs/cvs/{cvs-1.12.13.bep => cvs-1.12.13.recipe} (97%) rename dev-vcs/fossil/{fossil-1.22-fossil.bep => fossil-1.22-fossil.recipe} (92%) rename dev-vcs/fossil/{fossil-1.22.bep => fossil-1.22.recipe} (94%) rename dev-vcs/git/{git-1.7.10.2.bep => git-1.7.10.2.recipe} (94%) rename dev-vcs/git/{git-1.7.11.3.bep => git-1.7.11.3.recipe} (94%) rename dev-vcs/git/{git-1.8.0.bep => git-1.8.0.recipe} (93%) rename dev-vcs/git/{git-1.8.1.3.bep => git-1.8.1.3.recipe} (94%) rename dev-vcs/gitdoc/{gitdoc-1.7.10.2.bep => gitdoc-1.7.10.2.recipe} (97%) rename dev-vcs/gitdoc/{gitdoc-1.7.11.3.bep => gitdoc-1.7.11.3.recipe} (97%) rename dev-vcs/gitdoc/{gitdoc-1.8.0.bep => gitdoc-1.8.0.recipe} (97%) rename dev-vcs/gitdoc/{gitdoc-1.8.1.3.bep => gitdoc-1.8.1.3.recipe} (97%) rename dev-vcs/mercurial/{mercurial-2.2.2.bep => mercurial-2.2.2.recipe} (96%) rename dev-vcs/mercurial/{mercurial-2.2.3.bep => mercurial-2.2.3.recipe} (96%) rename dev-vcs/mercurial/{mercurial-2.3.bep => mercurial-2.3.recipe} (96%) rename dev-vcs/mercurial/{mercurial-2.4.bep => mercurial-2.4.recipe} (96%) rename dev-vcs/subversion/{subversion-1.6.11.bep => subversion-1.6.11.recipe} (97%) rename dev-vcs/subversion/{subversion-1.6.12.bep => subversion-1.6.12.recipe} (97%) rename dev-vcs/subversion/{subversion-1.6.13.bep => subversion-1.6.13.recipe} (97%) rename dev-vcs/subversion/{subversion-1.6.15.bep => subversion-1.6.15.recipe} (98%) rename dev-vcs/subversion/{subversion-1.6.17.bep => subversion-1.6.17.recipe} (98%) rename dev-vcs/subversion/{subversion-1.6.18.bep => subversion-1.6.18.recipe} (97%) rename dev-vcs/subversion/{subversion-1.6.6.bep => subversion-1.6.6.recipe} (97%) rename dev-vcs/subversion/{subversion-1.6.9.bep => subversion-1.6.9.recipe} (98%) rename dev-vcs/subversion/{subversion-1.7.0-rc2.bep => subversion-1.7.0-rc2.recipe} (98%) rename dev-vcs/subversion/{subversion-1.7.xx-svn.bep => subversion-1.7.xx-svn.recipe} (97%) rename dev-vcs/tig/{tig-0.16.bep => tig-0.16.recipe} (95%) rename games-action/bzflag/{bzflag-2.0.14.bep => bzflag-2.0.14.recipe} (96%) rename games-action/cylindrix/{cylindrix-1.0.bep => cylindrix-1.0.recipe} (94%) rename games-arcade/alienblaster/{alienblaster-1.1.0.bep => alienblaster-1.1.0.recipe} (97%) rename games-arcade/supertux/{supertux-0.1.3.bep => supertux-0.1.3.recipe} (96%) rename games-emulation/dosbox/{dosbox-0.74-svn.bep => dosbox-0.74-svn.recipe} (95%) rename games-emulation/visualboyadvance/{visualboyadvance-1.7.2.bep => visualboyadvance-1.7.2.recipe} (97%) rename games-misc/sdljoytest/{sdljoytest-11102003.bep => sdljoytest-11102003.recipe} (96%) rename games-puzzle/abrick/{abrick-1.12.bep => abrick-1.12.recipe} (96%) rename games-puzzle/flobopuyo/{flobopuyo-0.20.bep => flobopuyo-0.20.recipe} (94%) rename games-puzzle/gnurobbo/{gnurobbo-0.65.bep => gnurobbo-0.65.recipe} (97%) rename games-puzzle/numptyphysics/{numptyphysics-0.2-157.bep => numptyphysics-0.2-157.recipe} (97%) rename games-puzzle/wizznic/{wizznic-0.9.9.bep => wizznic-0.9.9.recipe} (97%) rename games-puzzle/wizznic/{wizznic-0.9.bep => wizznic-0.9.recipe} (96%) rename games-rpg/freedroid/{freedroid-1.0.2.bep => freedroid-1.0.2.recipe} (96%) rename games-simulation/openttd/{openttd-1.2.3.bep => openttd-1.2.3.recipe} (96%) rename gnome-base/gnome-common/{gnome-common-2.28.bep => gnome-common-2.28.recipe} (95%) rename gnome-extra/libgsf/{libgsf-1.14.18.bep => libgsf-1.14.18.recipe} (96%) rename haiku-apps/W6/{W6-1.7.bep => W6-1.7.recipe} (96%) rename haiku-apps/album/{album-0.9.2.bep => album-0.9.2.recipe} (95%) rename haiku-apps/aplayer/{aplayer-4.0.1.bep => aplayer-4.0.1.recipe} (95%) rename haiku-apps/armyknife/{armyknife-61.bep => armyknife-61.recipe} (95%) rename haiku-apps/armyknife/{armyknife-62.bep => armyknife-62.recipe} (95%) rename haiku-apps/armyknife/{armyknife-63.bep => armyknife-63.recipe} (95%) rename haiku-apps/armyknife/{armyknife-999-git.bep => armyknife-999-git.recipe} (95%) rename haiku-apps/artpaint/{artpaint-339.bep => artpaint-339.recipe} (95%) rename haiku-apps/beacon/{beacon-27.bep => beacon-27.recipe} (93%) rename haiku-apps/beae/{beae-20.bep => beae-20.recipe} (97%) rename haiku-apps/beae/{beae-22.bep => beae-22.recipe} (97%) rename haiku-apps/beae/{beae-25.bep => beae-25.recipe} (97%) rename haiku-apps/beam/{beam-1.2alpha.bep => beam-1.2alpha.recipe} (96%) rename haiku-apps/beezer/{beezer-1.bep => beezer-1.recipe} (97%) rename haiku-apps/beget/{beget-1.2.3.bep => beget-1.2.3.recipe} (96%) rename haiku-apps/behappy/{behappy-16.bep => behappy-16.recipe} (94%) rename haiku-apps/bepdf/{bepdf-1.1.1b4.bep => bepdf-1.1.1b4.recipe} (96%) rename haiku-apps/beshare/{beshare-4.bep => beshare-4.recipe} (92%) rename haiku-apps/bowser/{bowser-1.1.1-cvs.bep => bowser-1.1.1-cvs.recipe} (91%) rename haiku-apps/bsl/{bsl-108.bep => bsl-108.recipe} (94%) rename haiku-apps/burnitnow/{burnitnow-2-svn.bep => burnitnow-2-svn.recipe} (96%) rename haiku-apps/burnitnow/{burnitnow-27.bep => burnitnow-27.recipe} (97%) rename haiku-apps/burnitnow/{burnitnow-38.bep => burnitnow-38.recipe} (97%) rename haiku-apps/burnitnow/{burnitnow-39.bep => burnitnow-39.recipe} (97%) rename haiku-apps/burnitnow/{burnitnow-43.bep => burnitnow-43.recipe} (97%) rename haiku-apps/burnitnow/{burnitnow-beta5-svn.bep => burnitnow-beta5-svn.recipe} (97%) rename haiku-apps/burnitnow/{burnitnow-beta6-git.bep => burnitnow-beta6-git.recipe} (97%) rename haiku-apps/burnitnow/{burnitnow-beta6.bep => burnitnow-beta6.recipe} (97%) rename haiku-apps/caya-gpl-protocols/{caya-gpl-protocols-0.HEAD.bep => caya-gpl-protocols-0.HEAD.recipe} (97%) rename haiku-apps/caya-gpl-protocols/{caya-gpl-protocols-19.bep => caya-gpl-protocols-19.recipe} (97%) rename haiku-apps/caya-gpl-protocols/{caya-gpl-protocols-24.bep => caya-gpl-protocols-24.recipe} (97%) rename haiku-apps/caya-gpl-protocols/{caya-gpl-protocols-35.bep => caya-gpl-protocols-35.recipe} (97%) rename haiku-apps/caya-gpl-protocols/{caya-gpl-protocols-36.bep => caya-gpl-protocols-36.recipe} (97%) rename haiku-apps/caya/{caya-0.HEAD.bep => caya-0.HEAD.recipe} (98%) rename haiku-apps/caya/{caya-236.bep => caya-236.recipe} (98%) rename haiku-apps/caya/{caya-240.bep => caya-240.recipe} (98%) rename haiku-apps/caya/{caya-264.bep => caya-264.recipe} (98%) rename haiku-apps/caya/{caya-278.bep => caya-278.recipe} (98%) rename haiku-apps/caya/{caya-279.bep => caya-279.recipe} (98%) rename haiku-apps/clockwerk/{clockwerk-78.bep => clockwerk-78.recipe} (96%) rename haiku-apps/clockwerk/{clockwerk-80.bep => clockwerk-80.recipe} (96%) rename haiku-apps/documentviewer/{documentviewer-0.3.2.bep => documentviewer-0.3.2.recipe} (96%) rename haiku-apps/friss/{friss-0.7-svn.bep => friss-0.7-svn.recipe} (97%) rename haiku-apps/globe/{globe-0.4.bep => globe-0.4.recipe} (96%) rename haiku-apps/haikutwitter/{haikutwitter-1.0-svn.bep => haikutwitter-1.0-svn.recipe} (95%) rename haiku-apps/haikutwitter/{haikutwitter-1.0.bep => haikutwitter-1.0.recipe} (95%) rename haiku-apps/hare/{hare-beta1-git.bep => hare-beta1-git.recipe} (96%) rename haiku-apps/keymapswitcher/{keymapswitcher-1.2.7.bep => keymapswitcher-1.2.7.recipe} (94%) rename haiku-apps/mkdepend/{mkdepend-1.7.bep => mkdepend-1.7.recipe} (96%) rename haiku-apps/open-sum-it/{open-sum-it-108.bep => open-sum-it-108.recipe} (96%) rename haiku-apps/paladin/{paladin-1.3-hg.bep => paladin-1.3-hg.recipe} (98%) rename haiku-apps/paladin/{paladin-1.3.bep => paladin-1.3.recipe} (98%) rename haiku-apps/pe/{pe-2.4.2-597.bep => pe-2.4.2-597.recipe} (96%) rename haiku-apps/pe/{pe-2.4.3-600.bep => pe-2.4.3-600.recipe} (96%) rename haiku-apps/pe/{pe-2.4.3-hg.bep => pe-2.4.3-hg.recipe} (96%) rename haiku-apps/puri/{puri-0.3.9.1.bep => puri-0.3.9.1.recipe} (96%) rename haiku-apps/rez/{rez-108.bep => rez-108.recipe} (94%) rename haiku-apps/sawteeth/{sawteeth-1.3.bep => sawteeth-1.3.recipe} (97%) rename haiku-apps/thememanager/{thememanager-0-svn.bep => thememanager-0-svn.recipe} (92%) rename haiku-apps/vision/{vision-908.bep => vision-908.recipe} (97%) rename haiku-apps/vision/{vision-933.bep => vision-933.recipe} (96%) rename haiku-apps/yab/{yab-1.6.bep => yab-1.6.recipe} (97%) rename haiku-libs/libwalter/{libwalter-97.bep => libwalter-97.recipe} (97%) rename media-fonts/arabeyes-fonts/{arabeyes-fonts-1.1.bep => arabeyes-fonts-1.1.recipe} (96%) rename media-fonts/courier-prime/{courier-prime-1.0.bep => courier-prime-1.0.recipe} (96%) rename media-fonts/droid/{droid-113.bep => droid-113.recipe} (97%) rename media-fonts/farsi-fonts/{farsi-fonts-0.4.bep => farsi-fonts-0.4.recipe} (89%) rename media-fonts/inconsolata/{inconsolata-1.0.bep => inconsolata-1.0.recipe} (96%) rename media-fonts/kacst-fonts/{kacst-fonts-5.0.bep => kacst-fonts-5.0.recipe} (96%) rename media-fonts/lateef-font/{lateef-font-1.001.bep => lateef-font-1.001.recipe} (95%) rename media-fonts/liberation-fonts/{liberation-fonts-1.06.0.20100721.bep => liberation-fonts-1.06.0.20100721.recipe} (96%) rename media-fonts/nafees-nastaleeq/{nafees-nastaleeq-1.02.bep => nafees-nastaleeq-1.02.recipe} (97%) rename media-fonts/nafees-riqa/{nafees-riqa-1.00.bep => nafees-riqa-1.00.recipe} (96%) rename media-fonts/nanumfont/{nanumfont-2.0.bep => nanumfont-2.0.recipe} (95%) rename media-fonts/scheherazade-font/{scheherazade-font-1.005.bep => scheherazade-font-1.005.recipe} (96%) rename media-fonts/ukijorgfonts/{ukijorgfonts-1.0.bep => ukijorgfonts-1.0.recipe} (96%) rename media-fonts/wqy-microhei/{wqy-microhei-0.2.0-beta.bep => wqy-microhei-0.2.0-beta.recipe} (96%) rename media-fonts/wqy-zenhei/{wqy-zenhei-0.9.45.bep => wqy-zenhei-0.9.45.recipe} (96%) rename media-fonts/x-series-fonts/{x-series-fonts-2.0.bep => x-series-fonts-2.0.recipe} (99%) rename media-gfx/blender/{blender-2.49b.bep => blender-2.49b.recipe} (95%) rename media-gfx/flam3/{flam3-3.0.bep => flam3-3.0.recipe} (96%) rename media-gfx/fontforge/{fontforge-201005010.bep => fontforge-201005010.recipe} (95%) rename media-gfx/graphviz/{graphviz-2.24.bep => graphviz-2.24.recipe} (96%) rename media-gfx/graphviz/{graphviz-2.26.3.bep => graphviz-2.26.3.recipe} (96%) rename media-gfx/hqx/{hqx-1.1.bep => hqx-1.1.recipe} (96%) rename media-gfx/imagemagick/{imagemagick-6.6.1-10.bep => imagemagick-6.6.1-10.recipe} (97%) rename media-gfx/pngcrush/{pngcrush-1.7.11.bep => pngcrush-1.7.11.recipe} (96%) rename media-gfx/pngcrush/{pngcrush-1.7.12.bep => pngcrush-1.7.12.recipe} (96%) rename media-gfx/pngcrush/{pngcrush-1.7.6.bep => pngcrush-1.7.6.recipe} (95%) rename media-gfx/potrace/{potrace-1.8.bep => potrace-1.8.recipe} (95%) rename media-gfx/tuxpaint/{tuxpaint-0.9.21.bep => tuxpaint-0.9.21.recipe} (96%) rename media-gfx/tuxpaint/{tuxpaint-0.9.2x-cvs.bep => tuxpaint-0.9.2x-cvs.recipe} (97%) rename media-libs/a52dec/{a52dec-0.7.4.bep => a52dec-0.7.4.recipe} (95%) rename media-libs/aalib/{aalib-1.4rc4.bep => aalib-1.4rc4.recipe} (96%) rename media-libs/agar/{agar-1.4.1.bep => agar-1.4.1.recipe} (94%) rename media-libs/allegro/{allegro-4.4.0.bep => allegro-4.4.0.recipe} (95%) rename media-libs/allegro/{allegro-4.4.1.1.bep => allegro-4.4.1.1.recipe} (97%) rename media-libs/allegro/{allegro-4.4.x-svn.bep => allegro-4.4.x-svn.recipe} (96%) rename media-libs/almp3/{almp3-2.0.4.bep => almp3-2.0.4.recipe} (96%) rename media-libs/cal3d/{cal3d-0.11.0.bep => cal3d-0.11.0.recipe} (95%) rename media-libs/devil/{devil-1.7.8.bep => devil-1.7.8.recipe} (96%) rename media-libs/djvulibre/{djvulibre-3.5.25.bep => djvulibre-3.5.25.recipe} (97%) rename media-libs/dumb/{dumb-0.9.3.bep => dumb-0.9.3.recipe} (97%) rename media-libs/faac/{faac-1.28.bep => faac-1.28.recipe} (97%) rename media-libs/faad2/{faad2-2.7.bep => faad2-2.7.recipe} (96%) rename media-libs/fblend/{fblend-0.4.bep => fblend-0.4.recipe} (96%) rename media-libs/fitz/{fitz-1.0.bep => fitz-1.0.recipe} (97%) rename media-libs/flac/{flac-1.2.1.bep => flac-1.2.1.recipe} (98%) rename media-libs/fontconfig/{fontconfig-2.10.0.bep => fontconfig-2.10.0.recipe} (98%) rename media-libs/fontconfig/{fontconfig-2.10.2.bep => fontconfig-2.10.2.recipe} (98%) rename media-libs/freealut/{freealut-1.1.0.bep => freealut-1.1.0.recipe} (96%) rename media-libs/freeimage/{freeimage-3.15.3.bep => freeimage-3.15.3.recipe} (97%) rename media-libs/freetype/{freetype-2.3.11.bep => freetype-2.3.11.recipe} (96%) rename media-libs/freetype/{freetype-2.4.11.bep => freetype-2.4.11.recipe} (96%) rename media-libs/freetype/{freetype-2.4.2.bep => freetype-2.4.2.recipe} (96%) rename media-libs/freetype/{freetype-2.4.4.bep => freetype-2.4.4.recipe} (96%) rename media-libs/freetype/{freetype-2.4.6.bep => freetype-2.4.6.recipe} (96%) rename media-libs/freetype/{freetype-2.4.9-with-subpixel-rendering-enabled.bep => freetype-2.4.9-with-subpixel-rendering-enabled.recipe} (96%) rename media-libs/freetype/{freetype-2.4.9.bep => freetype-2.4.9.recipe} (96%) rename media-libs/ftgl/{ftgl-2.1-svn.bep => ftgl-2.1-svn.recipe} (96%) rename media-libs/ftgl/{ftgl-2.1.3.bep => ftgl-2.1.3.recipe} (97%) rename media-libs/gd/{gd-2.0.36rc1.bep => gd-2.0.36rc1.recipe} (96%) rename media-libs/giflib/{giflib-4.1.6.bep => giflib-4.1.6.recipe} (96%) rename media-libs/glew/{glew-1.5.7.bep => glew-1.5.7.recipe} (94%) rename media-libs/glpng/{glpng-1.4.5.bep => glpng-1.4.5.recipe} (94%) rename media-libs/guilib/{guilib-1.2.1.bep => guilib-1.2.1.recipe} (96%) rename media-libs/ilmbase/{ilmbase-1.0.1.bep => ilmbase-1.0.1.recipe} (95%) rename media-libs/ilmbase/{ilmbase-1.0.2.bep => ilmbase-1.0.2.recipe} (96%) rename media-libs/jasper/{jasper-1.900.1.bep => jasper-1.900.1.recipe} (96%) rename media-libs/jbig2dec/{jbig2dec-0.11.bep => jbig2dec-0.11.recipe} (96%) rename media-libs/jbigkit/{jbigkit-1.6.bep => jbigkit-1.6.recipe} (92%) rename media-libs/jbigkit/{jbigkit-2.0.bep => jbigkit-2.0.recipe} (96%) rename media-libs/jgmod/{jgmod-0.99.bep => jgmod-0.99.recipe} (97%) rename media-libs/jpeg/{jpeg-7.bep => jpeg-7.recipe} (94%) rename media-libs/jpeg/{jpeg-8b.bep => jpeg-8b.recipe} (94%) rename media-libs/jpeg/{jpeg-8c.bep => jpeg-8c.recipe} (96%) rename media-libs/jpeg/{jpeg-8d.bep => jpeg-8d.recipe} (96%) rename media-libs/ladspa-sdk/{ladspa-sdk-1.13.bep => ladspa-sdk-1.13.recipe} (94%) rename media-libs/lcms/{lcms-1.18a.bep => lcms-1.18a.recipe} (95%) rename media-libs/lcms/{lcms-1.19.bep => lcms-1.19.recipe} (96%) rename media-libs/lcms/{lcms-2.0a.bep => lcms-2.0a.recipe} (96%) rename media-libs/lcms/{lcms-2.1.bep => lcms-2.1.recipe} (96%) rename media-libs/leptonica/{leptonica-1.68.bep => leptonica-1.68.recipe} (94%) rename media-libs/libao/{libao-1.0.0.bep => libao-1.0.0.recipe} (97%) rename media-libs/libart_lgpl/{libart_lgpl-2.3.21.bep => libart_lgpl-2.3.21.recipe} (96%) rename media-libs/libass/{libass-0.10.1.bep => libass-0.10.1.recipe} (96%) rename media-libs/libass/{libass-0.9.11.bep => libass-0.9.11.recipe} (96%) rename media-libs/libbluray/{libbluray-0.2.2.bep => libbluray-0.2.2.recipe} (96%) rename media-libs/libcddb/{libcddb-1.3.2.bep => libcddb-1.3.2.recipe} (95%) rename media-libs/libcoverart/{libcoverart-1.0.0.bep => libcoverart-1.0.0.recipe} (95%) rename media-libs/libdca/{libdca-0.0.5.bep => libdca-0.0.5.recipe} (96%) rename media-libs/libdiscid/{libdiscid-0.3.0.bep => libdiscid-0.3.0.recipe} (94%) rename media-libs/libdvbpsi/{libdvbpsi-0.1.7.bep => libdvbpsi-0.1.7.recipe} (94%) rename media-libs/libdvdcss/{libdvdcss-1.2.10.bep => libdvdcss-1.2.10.recipe} (95%) rename media-libs/libdvdcss/{libdvdcss-1.2.12.bep => libdvdcss-1.2.12.recipe} (95%) rename media-libs/libdvdnav/{libdvdnav-4.1.3.bep => libdvdnav-4.1.3.recipe} (96%) rename media-libs/libdvdnav/{libdvdnav-4.2.0.bep => libdvdnav-4.2.0.recipe} (96%) rename media-libs/libdvdread/{libdvdread-4.1.3.bep => libdvdread-4.1.3.recipe} (94%) rename media-libs/libdvdread/{libdvdread-4.2.0.bep => libdvdread-4.2.0.recipe} (96%) rename media-libs/libdvdread/{libdvdread-svn1168.bep => libdvdread-svn1168.recipe} (95%) rename media-libs/libdvdread/{libdvdread-svn1226.bep => libdvdread-svn1226.recipe} (95%) rename media-libs/libharu/{libharu-2.1.0.bep => libharu-2.1.0.recipe} (95%) rename media-libs/libid3tag/{libid3tag-0.15.1b.bep => libid3tag-0.15.1b.recipe} (94%) rename media-libs/liblo/{liblo-0.26.bep => liblo-0.26.recipe} (96%) rename media-libs/libmad/{libmad-0.15.1b.bep => libmad-0.15.1b.recipe} (96%) rename media-libs/libmatroska/{libmatroska-1.0.0.bep => libmatroska-1.0.0.recipe} (96%) rename media-libs/libmikmod/{libmikmod-3.1.11.bep => libmikmod-3.1.11.recipe} (97%) rename media-libs/libmms/{libmms-0.5.bep => libmms-0.5.recipe} (95%) rename media-libs/libmng/{libmng-1.0.10.bep => libmng-1.0.10.recipe} (97%) rename media-libs/libmodplug/{libmodplug-0.8.7.bep => libmodplug-0.8.7.recipe} (96%) rename media-libs/libmodplug/{libmodplug-0.8.8.1.bep => libmodplug-0.8.8.1.recipe} (96%) rename media-libs/libmodplug/{libmodplug-0.8.8.4.bep => libmodplug-0.8.8.4.recipe} (96%) rename media-libs/libmpeg2/{libmpeg2-0.5.1.bep => libmpeg2-0.5.1.recipe} (95%) rename media-libs/libnsbmp/{libnsbmp-0.0.3-HEAD.bep => libnsbmp-0.0.3-HEAD.recipe} (95%) rename media-libs/libnsbmp/{libnsbmp-0.0.3.bep => libnsbmp-0.0.3.recipe} (94%) rename media-libs/libnsgif/{libnsgif-0.0.3.bep => libnsgif-0.0.3.recipe} (94%) rename media-libs/libogg/{libogg-1.1.3.bep => libogg-1.1.3.recipe} (94%) rename media-libs/libogg/{libogg-1.1.4.bep => libogg-1.1.4.recipe} (95%) rename media-libs/libogg/{libogg-1.2.0.bep => libogg-1.2.0.recipe} (96%) rename media-libs/libogg/{libogg-1.2.2.bep => libogg-1.2.2.recipe} (97%) rename media-libs/libogg/{libogg-1.3.0.bep => libogg-1.3.0.recipe} (95%) rename media-libs/libpng/{libpng-1.2.29.bep => libpng-1.2.29.recipe} (95%) rename media-libs/libpng/{libpng-1.2.30.bep => libpng-1.2.30.recipe} (96%) rename media-libs/libpng/{libpng-1.2.40.bep => libpng-1.2.40.recipe} (95%) rename media-libs/libpng/{libpng-1.2.41.bep => libpng-1.2.41.recipe} (95%) rename media-libs/libpng/{libpng-1.2.43.bep => libpng-1.2.43.recipe} (95%) rename media-libs/libpng/{libpng-1.2.44.bep => libpng-1.2.44.recipe} (95%) rename media-libs/libpng/{libpng-1.2.46.bep => libpng-1.2.46.recipe} (95%) rename media-libs/libpng/{libpng-1.4.1.bep => libpng-1.4.1.recipe} (95%) rename media-libs/libpng/{libpng-1.4.2.bep => libpng-1.4.2.recipe} (95%) rename media-libs/libpng/{libpng-1.4.3.bep => libpng-1.4.3.recipe} (95%) rename media-libs/libpng/{libpng-1.4.4.bep => libpng-1.4.4.recipe} (95%) rename media-libs/libpng/{libpng-1.5.0.bep => libpng-1.5.0.recipe} (96%) rename media-libs/libpng/{libpng-1.5.12.bep => libpng-1.5.12.recipe} (96%) rename media-libs/libpng/{libpng-1.5.13.bep => libpng-1.5.13.recipe} (95%) rename media-libs/libpng/{libpng-1.5.2.bep => libpng-1.5.2.recipe} (96%) rename media-libs/libpng/{libpng-1.5.4.bep => libpng-1.5.4.recipe} (96%) rename media-libs/libpng/{libpng-1.5.7.bep => libpng-1.5.7.recipe} (96%) rename media-libs/libsamplerate/{libsamplerate-0.1.8.bep => libsamplerate-0.1.8.recipe} (95%) rename media-libs/libsdl/{libsdl-1.2-hg.bep => libsdl-1.2-hg.recipe} (98%) rename media-libs/libsdl/{libsdl-1.2.12.bep => libsdl-1.2.12.recipe} (94%) rename media-libs/libsdl/{libsdl-1.2.13.bep => libsdl-1.2.13.recipe} (94%) rename media-libs/libsdl/{libsdl-1.2.14.bep => libsdl-1.2.14.recipe} (96%) rename media-libs/libsdl/{libsdl-1.2.15.bep => libsdl-1.2.15.recipe} (98%) rename media-libs/libsdl/{libsdl-1.3-gsoc.bep => libsdl-1.3-gsoc.recipe} (95%) rename media-libs/libsdl/{libsdl-2.0-hg-cmake.bep => libsdl-2.0-hg-cmake.recipe} (96%) rename media-libs/libsdl/{libsdl-2.0-hg.bep => libsdl-2.0-hg.recipe} (96%) rename media-libs/libsndfile/{libsndfile-1.0.21.bep => libsndfile-1.0.21.recipe} (98%) rename media-libs/libsvgtiny/{libsvgtiny-0-HEAD.bep => libsvgtiny-0-HEAD.recipe} (96%) rename media-libs/libsvgtiny/{libsvgtiny-10856.bep => libsvgtiny-10856.recipe} (95%) rename media-libs/libtheora/{libtheora-1.1.1.bep => libtheora-1.1.1.recipe} (96%) rename media-libs/libvorbis/{libvorbis-1.2.3.bep => libvorbis-1.2.3.recipe} (96%) rename media-libs/libvorbis/{libvorbis-1.3.1.bep => libvorbis-1.3.1.recipe} (96%) rename media-libs/libvorbis/{libvorbis-1.3.2.bep => libvorbis-1.3.2.recipe} (96%) rename media-libs/libvpx/{libvpx-0.9.2-git.bep => libvpx-0.9.2-git.recipe} (95%) rename media-libs/libvpx/{libvpx-1.0.0.bep => libvpx-1.0.0.recipe} (96%) rename media-libs/libwebm/{libwebm-0.9.2-git.bep => libwebm-0.9.2-git.recipe} (95%) rename media-libs/libwebp/{libwebp-0.1.2-git.bep => libwebp-0.1.2-git.recipe} (95%) rename media-libs/libwebp/{libwebp-0.1.3.bep => libwebp-0.1.3.recipe} (95%) rename media-libs/loadpng/{loadpng-1.5.bep => loadpng-1.5.recipe} (97%) rename media-libs/lv2/{lv2-1.2.0.bep => lv2-1.2.0.recipe} (97%) rename media-libs/mediainfo/{mediainfo-0.7.61.bep => mediainfo-0.7.61.recipe} (97%) rename media-libs/musicbrainz/{musicbrainz-5.0.1.bep => musicbrainz-5.0.1.recipe} (95%) rename media-libs/openal/{openal-1.12-git.bep => openal-1.12-git.recipe} (95%) rename media-libs/openal/{openal-1.12.854.bep => openal-1.12.854.recipe} (95%) rename media-libs/openal/{openal-1.13.bep => openal-1.13.recipe} (95%) rename media-libs/openjpeg/{openjpeg-1.5.0.bep => openjpeg-1.5.0.recipe} (97%) rename media-libs/plib/{plib-1.8.5.bep => plib-1.8.5.recipe} (95%) rename media-libs/schroedinger/{schroedinger-1.0.11.bep => schroedinger-1.0.11.recipe} (96%) rename media-libs/sdl-gfx/{sdl-gfx-2.0.20.bep => sdl-gfx-2.0.20.recipe} (97%) rename media-libs/sdl-gfx/{sdl-gfx-2.0.22.bep => sdl-gfx-2.0.22.recipe} (97%) rename media-libs/sdl-gfx/{sdl-gfx-2.0.23.bep => sdl-gfx-2.0.23.recipe} (97%) rename media-libs/sdl-image/{sdl-image-1.2-hg.bep => sdl-image-1.2-hg.recipe} (97%) rename media-libs/sdl-image/{sdl-image-1.2.10.bep => sdl-image-1.2.10.recipe} (97%) rename media-libs/sdl-image/{sdl-image-1.2.12.bep => sdl-image-1.2.12.recipe} (97%) rename media-libs/sdl-image/{sdl-image-1.2.6.bep => sdl-image-1.2.6.recipe} (96%) rename media-libs/sdl-image/{sdl-image-1.2.8.bep => sdl-image-1.2.8.recipe} (95%) rename media-libs/sdl-image/{sdl-image-1.2.9.bep => sdl-image-1.2.9.recipe} (95%) rename media-libs/sdl-mixer/{sdl-mixer-1.2-hg.bep => sdl-mixer-1.2-hg.recipe} (97%) rename media-libs/sdl-mixer/{sdl-mixer-1.2.10.bep => sdl-mixer-1.2.10.recipe} (96%) rename media-libs/sdl-mixer/{sdl-mixer-1.2.11.bep => sdl-mixer-1.2.11.recipe} (97%) rename media-libs/sdl-mixer/{sdl-mixer-1.2.12.bep => sdl-mixer-1.2.12.recipe} (97%) rename media-libs/sdl-mixer/{sdl-mixer-1.2.9.bep => sdl-mixer-1.2.9.recipe} (96%) rename media-libs/sdl-net/{sdl-net-1.2-hg.bep => sdl-net-1.2-hg.recipe} (96%) rename media-libs/sdl-net/{sdl-net-1.2.7.bep => sdl-net-1.2.7.recipe} (96%) rename media-libs/sdl-net/{sdl-net-1.2.8.bep => sdl-net-1.2.8.recipe} (96%) rename media-libs/sdl-rtf/{sdl-rtf-0.1.0.bep => sdl-rtf-0.1.0.recipe} (97%) rename media-libs/sdl-sound/{sdl-sound-1.0-hg.bep => sdl-sound-1.0-hg.recipe} (96%) rename media-libs/sdl-sound/{sdl-sound-1.0.3.bep => sdl-sound-1.0.3.recipe} (96%) rename media-libs/sdl-ttf/{sdl-ttf-2.0-hg.bep => sdl-ttf-2.0-hg.recipe} (97%) rename media-libs/sdl-ttf/{sdl-ttf-2.0.10.bep => sdl-ttf-2.0.10.recipe} (97%) rename media-libs/sdl-ttf/{sdl-ttf-2.0.11.bep => sdl-ttf-2.0.11.recipe} (97%) rename media-libs/sdl-ttf/{sdl-ttf-2.0.9.bep => sdl-ttf-2.0.9.recipe} (96%) rename media-libs/sge/{sge-030809.bep => sge-030809.recipe} (94%) rename media-libs/smjpeg/{smjpeg-0.2.1.bep => smjpeg-0.2.1.recipe} (96%) rename media-libs/smpeg/{smpeg-0.4.5.bep => smpeg-0.4.5.recipe} (97%) rename media-libs/speex/{speex-1.2-git.bep => speex-1.2-git.recipe} (97%) rename media-libs/speex/{speex-1.2rc1.bep => speex-1.2rc1.recipe} (97%) rename media-libs/taglib/{taglib-1.6.1.bep => taglib-1.6.1.recipe} (94%) rename media-libs/taglib/{taglib-1.6.2.bep => taglib-1.6.2.recipe} (94%) rename media-libs/taglib/{taglib-1.6.3.bep => taglib-1.6.3.recipe} (94%) rename media-libs/taglib/{taglib-1.7.1.bep => taglib-1.7.1.recipe} (94%) rename media-libs/taglib/{taglib-1.7.2.bep => taglib-1.7.2.recipe} (94%) rename media-libs/taglib/{taglib-1.7.bep => taglib-1.7.recipe} (94%) rename media-libs/taglib/{taglib-1.8.bep => taglib-1.8.recipe} (94%) rename media-libs/tiff/{tiff-3.8.2.bep => tiff-3.8.2.recipe} (96%) rename media-libs/tiff/{tiff-3.9.1.bep => tiff-3.9.1.recipe} (94%) rename media-libs/tiff/{tiff-3.9.4.bep => tiff-3.9.4.recipe} (94%) rename media-libs/tiff/{tiff-3.9.6.bep => tiff-3.9.6.recipe} (94%) rename media-libs/tiff/{tiff-4.0.2.bep => tiff-4.0.2.recipe} (94%) rename media-libs/vigra/{vigra-1.8.0.bep => vigra-1.8.0.recipe} (96%) rename media-libs/waave/{waave-1.01.bep => waave-1.01.recipe} (94%) rename media-libs/x264/{x264-20120803.bep => x264-20120803.recipe} (96%) rename media-sound/bladeenc/{bladeenc-0.94.2.bep => bladeenc-0.94.2.recipe} (96%) rename media-sound/fluidsynth/{fluidsynth-1.1-midi-buffer.bep => fluidsynth-1.1-midi-buffer.recipe} (96%) rename media-sound/fluidsynth/{fluidsynth-1.1.3.bep => fluidsynth-1.1.3.recipe} (96%) rename media-sound/fluidsynth/{fluidsynth-1.1.6.bep => fluidsynth-1.1.6.recipe} (96%) rename media-sound/gogo-no-coda/{gogo-no-coda-3.13.bep => gogo-no-coda-3.13.recipe} (96%) rename media-sound/jack2/{jack2-1.9.8.bep => jack2-1.9.8.recipe} (96%) rename media-sound/lame/{lame-3.98.4.bep => lame-3.98.4.recipe} (96%) rename media-sound/lame/{lame-3.99.bep => lame-3.99.recipe} (96%) rename media-sound/lame/{lame-398-2.bep => lame-398-2.recipe} (95%) rename media-sound/milkytracker/{milkytracker-0.90.85.bep => milkytracker-0.90.85.recipe} (97%) rename media-sound/mpg123/{mpg123-1.12.1.bep => mpg123-1.12.1.recipe} (96%) rename media-sound/naspro/{naspro-0.2.9-hg.bep => naspro-0.2.9-hg.recipe} (95%) rename media-sound/ocp/{ocp-0.1.21-git.bep => ocp-0.1.21-git.recipe} (96%) rename media-sound/ocp/{ocp-snapshot20110319.bep => ocp-snapshot20110319.recipe} (97%) rename media-sound/ocp/{ocp-snapshot20110320.bep => ocp-snapshot20110320.recipe} (97%) rename media-sound/opensound/{opensound-232d0de71550.bep => opensound-232d0de71550.recipe} (96%) rename media-sound/opensound/{opensound-4.2.bep => opensound-4.2.recipe} (96%) rename media-sound/opensound/{opensound-cac211efd60d.bep => opensound-cac211efd60d.recipe} (95%) rename media-sound/schismtracker/{schismtracker-20100713.bep => schismtracker-20100713.recipe} (96%) rename media-sound/twolame/{twolame-0.3.13.bep => twolame-0.3.13.recipe} (96%) rename media-sound/vorbis-tools/{vorbis-tools-1.2.0.bep => vorbis-tools-1.2.0.recipe} (96%) rename media-sound/vorbis-tools/{vorbis-tools-1.4.0.bep => vorbis-tools-1.4.0.recipe} (97%) rename media-video/ffmpeg/{ffmpeg-0.10.2-vlc.bep => ffmpeg-0.10.2-vlc.recipe} (97%) rename media-video/ffmpeg/{ffmpeg-0.10.2.bep => ffmpeg-0.10.2.recipe} (97%) rename media-video/ffmpeg/{ffmpeg-0.10.bep => ffmpeg-0.10.recipe} (97%) rename media-video/ffmpeg/{ffmpeg-0.11.1.bep => ffmpeg-0.11.1.recipe} (97%) rename media-video/ffmpeg/{ffmpeg-0.5.bep => ffmpeg-0.5.recipe} (95%) rename media-video/ffmpeg/{ffmpeg-0.6.bep => ffmpeg-0.6.recipe} (96%) rename media-video/ffmpeg/{ffmpeg-23081.bep => ffmpeg-23081.recipe} (95%) rename media-video/ffmpeg/{ffmpeg-7407.bep => ffmpeg-7407.recipe} (95%) rename media-video/gnash/{gnash-0.bep => gnash-0.recipe} (99%) rename media-video/handbrake/{handbrake-0.9.5.bep => handbrake-0.9.5.recipe} (98%) rename media-video/mplayer/{mplayer-1.0.bep => mplayer-1.0.recipe} (97%) rename media-video/vlc/{vlc-0.8.6i.bep => vlc-0.8.6i.recipe} (96%) rename media-video/vlc/{vlc-1.1.5-20101107.bep => vlc-1.1.5-20101107.recipe} (96%) rename media-video/vlc/{vlc-2.0.5.bep => vlc-2.0.5.recipe} (97%) rename net-ftp/tnftp/{tnftp-20091122.bep => tnftp-20091122.recipe} (96%) rename net-irc/irssi/{irssi-0.8.15.bep => irssi-0.8.15.recipe} (96%) rename net-irc/rhapsody-irc/{rhapsody-irc-0.28b.bep => rhapsody-irc-0.28b.recipe} (95%) rename net-libs/enet/{enet-1.2.2.bep => enet-1.2.2.recipe} (94%) rename net-libs/enet/{enet-1.3.0.bep => enet-1.3.0.recipe} (94%) rename net-libs/gnutls/{gnutls-2.8.6.bep => gnutls-2.8.6.recipe} (97%) rename net-libs/hubbub/{hubbub-0.1.2-HEAD.bep => hubbub-0.1.2-HEAD.recipe} (95%) rename net-libs/hubbub/{hubbub-0.1.2.bep => hubbub-0.1.2.recipe} (94%) rename net-libs/libdom/{libdom-0.bep => libdom-0.recipe} (94%) rename net-libs/libs3/{libs3-2.0.bep => libs3-2.0.recipe} (95%) rename net-libs/libtorrent/{libtorrent-0.12.5.bep => libtorrent-0.12.5.recipe} (96%) rename net-libs/libyahoo2/{libyahoo2-1.0.1.bep => libyahoo2-1.0.1.recipe} (96%) rename net-misc/axel/{axel-2.4.bep => axel-2.4.recipe} (95%) rename net-misc/curl/{curl-7.18.2.bep => curl-7.18.2.recipe} (95%) rename net-misc/curl/{curl-7.19.1.bep => curl-7.19.1.recipe} (95%) rename net-misc/curl/{curl-7.19.2.bep => curl-7.19.2.recipe} (95%) rename net-misc/curl/{curl-7.19.5.bep => curl-7.19.5.recipe} (95%) rename net-misc/curl/{curl-7.19.7.bep => curl-7.19.7.recipe} (95%) rename net-misc/curl/{curl-7.20.0.bep => curl-7.20.0.recipe} (95%) rename net-misc/curl/{curl-7.20.1.bep => curl-7.20.1.recipe} (95%) rename net-misc/curl/{curl-7.21.1.bep => curl-7.21.1.recipe} (95%) rename net-misc/curl/{curl-7.21.2.bep => curl-7.21.2.recipe} (95%) rename net-misc/curl/{curl-7.21.3.bep => curl-7.21.3.recipe} (94%) rename net-misc/curl/{curl-7.21.4.bep => curl-7.21.4.recipe} (94%) rename net-misc/curl/{curl-7.21.6.bep => curl-7.21.6.recipe} (94%) rename net-misc/curl/{curl-7.21.7.bep => curl-7.21.7.recipe} (95%) rename net-misc/curl/{curl-7.22.0.bep => curl-7.22.0.recipe} (95%) rename net-misc/curl/{curl-7.24.0.bep => curl-7.24.0.recipe} (95%) rename net-misc/curl/{curl-7.25.0.bep => curl-7.25.0.recipe} (95%) rename net-misc/curl/{curl-7.26.0.bep => curl-7.26.0.recipe} (95%) rename net-misc/curl/{curl-7.28.1.bep => curl-7.28.1.recipe} (95%) rename net-misc/mediatomb/{mediatomb-0.12.1.bep => mediatomb-0.12.1.recipe} (97%) rename net-misc/minidlna/{minidlna-1.0.21.bep => minidlna-1.0.21.recipe} (97%) rename net-misc/neon/{neon-0.29.1.bep => neon-0.29.1.recipe} (96%) rename net-misc/neon/{neon-0.29.3.bep => neon-0.29.3.recipe} (96%) rename net-misc/neon/{neon-0.29.4.bep => neon-0.29.4.recipe} (96%) rename net-misc/neon/{neon-0.29.5.bep => neon-0.29.5.recipe} (97%) rename net-misc/neon/{neon-0.29.6.bep => neon-0.29.6.recipe} (97%) rename net-misc/ntp/{ntp-4.2.6p2.bep => ntp-4.2.6p2.recipe} (96%) rename net-misc/openssh/{openssh-5.4p1.bep => openssh-5.4p1.recipe} (98%) rename net-misc/openssh/{openssh-5.5p1.bep => openssh-5.5p1.recipe} (98%) rename net-misc/openssh/{openssh-5.6p1.bep => openssh-5.6p1.recipe} (97%) rename net-misc/openssh/{openssh-5.7p1.bep => openssh-5.7p1.recipe} (97%) rename net-misc/openssh/{openssh-5.8p1.bep => openssh-5.8p1.recipe} (97%) rename net-misc/openssh/{openssh-5.8p2.bep => openssh-5.8p2.recipe} (97%) rename net-misc/openssh/{openssh-5.9p1.bep => openssh-5.9p1.recipe} (97%) rename net-misc/openssh/{openssh-6.0p1.bep => openssh-6.0p1.recipe} (97%) rename net-misc/openssh/{openssh-6.1p1.bep => openssh-6.1p1.recipe} (97%) rename net-misc/openssh/{openssh-6.2p1.bep => openssh-6.2p1.recipe} (97%) rename net-misc/putty/{putty-0.60.bep => putty-0.60.recipe} (95%) rename net-misc/rsync/{rsync-3.0.6.bep => rsync-3.0.6.recipe} (96%) rename net-misc/rsync/{rsync-3.0.7.bep => rsync-3.0.7.recipe} (95%) rename net-misc/tor/{tor-0.2.2.35.bep => tor-0.2.2.35.recipe} (94%) rename net-misc/tor/{tor-0.2.3.25.bep => tor-0.2.3.25.recipe} (96%) rename net-misc/wget/{wget-1.12.bep => wget-1.12.recipe} (95%) rename net-misc/wget/{wget-1.13.4.bep => wget-1.13.4.recipe} (94%) rename net-misc/wput/{wput-0.6.1.bep => wput-0.6.1.recipe} (96%) rename net-p2p/rtorrent/{rtorrent-0.8.5.bep => rtorrent-0.8.5.recipe} (96%) rename net-p2p/seeks/{seeks-0.x-git.bep => seeks-0.x-git.recipe} (96%) rename net-p2p/transmission/{transmission-1.72.bep => transmission-1.72.recipe} (96%) rename net-p2p/transmission/{transmission-1.73.bep => transmission-1.73.recipe} (96%) rename net-p2p/transmission/{transmission-1.93.bep => transmission-1.93.recipe} (97%) rename net-p2p/transmission/{transmission-2.01.bep => transmission-2.01.recipe} (97%) rename net-p2p/transmission/{transmission-2.12.bep => transmission-2.12.recipe} (97%) rename net-p2p/transmission/{transmission-2.21.bep => transmission-2.21.recipe} (97%) rename net-p2p/transmission/{transmission-2.73.bep => transmission-2.73.recipe} (97%) rename net-p2p/transmission/{transmission-2.75.bep => transmission-2.75.recipe} (97%) rename net-proxy/privoxy/{privoxy-3.0.19.bep => privoxy-3.0.19.recipe} (97%) rename net-wireless/b43-fwcutter/{b43-fwcutter-012.bep => b43-fwcutter-012.recipe} (97%) rename net-wireless/wpa_supplicant/{wpa_supplicant-0.7.3.bep => wpa_supplicant-0.7.3.recipe} (96%) rename packs/libpak/{libpak-0.9.1.bep => libpak-0.9.1.recipe} (99%) rename packs/libpak/{libpak-0.9.2.bep => libpak-0.9.2.recipe} (99%) rename packs/libpak/{libpak-0.9.3.bep => libpak-0.9.3.recipe} (99%) rename packs/libpak/{libpak-0.9.4-gcc2.bep => libpak-0.9.4-gcc2.recipe} (99%) rename packs/libpak/{libpak-0.9.4-gcc4.bep => libpak-0.9.4-gcc4.recipe} (99%) rename packs/libpak/{libpak-0.9.4.bep => libpak-0.9.4.recipe} (99%) rename packs/libpak/{libpak-0.9.5-gcc2.bep => libpak-0.9.5-gcc2.recipe} (99%) rename packs/libpak/{libpak-0.9.6-gcc2.bep => libpak-0.9.6-gcc2.recipe} (99%) rename packs/libpak/{libpak-0.9.6-gcc4.bep => libpak-0.9.6-gcc4.recipe} (99%) rename packs/libpak/{libpak-0.9.bep => libpak-0.9.recipe} (99%) rename packs/optionalpackages/{optionalpackages-0.5.bep => optionalpackages-0.5.recipe} (99%) rename packs/optionalpackages/{optionalpackages-0.6-gcc2.bep => optionalpackages-0.6-gcc2.recipe} (99%) rename packs/optionalpackages/{optionalpackages-0.6-gcc4.bep => optionalpackages-0.6-gcc4.recipe} (99%) rename packs/optionalpackages/{optionalpackages-0.6.bep => optionalpackages-0.6.recipe} (99%) rename packs/optionalpackages/{optionalpackages-0.7-gcc2.bep => optionalpackages-0.7-gcc2.recipe} (99%) rename packs/optionalpackages/{optionalpackages-0.7-gcc4.bep => optionalpackages-0.7-gcc4.recipe} (99%) rename sci-astronomy/celestia/{celestia-1.6.0.bep => celestia-1.6.0.recipe} (96%) rename sci-libs/cln/{cln-1.3.2.bep => cln-1.3.2.recipe} (96%) rename sci-libs/fftw/{fftw-3.2.2.bep => fftw-3.2.2.recipe} (95%) rename sci-libs/gdal/{gdal-1.7.2.bep => gdal-1.7.2.recipe} (96%) rename sci-libs/gsl/{gsl-1.13.bep => gsl-1.13.recipe} (94%) rename sci-libs/gsl/{gsl-1.14.bep => gsl-1.14.recipe} (97%) rename sci-physics/bullet/{bullet-2.78.bep => bullet-2.78.recipe} (95%) rename sys-apps/coreutils/{coreutils-8.5.bep => coreutils-8.5.recipe} (95%) rename sys-apps/dbus/{dbus-1.6.8.bep => dbus-1.6.8.recipe} (95%) rename sys-apps/diffutils/{diffutils-2.9.bep => diffutils-2.9.recipe} (95%) rename sys-apps/diffutils/{diffutils-3.0.bep => diffutils-3.0.recipe} (94%) rename sys-apps/diffutils/{diffutils-3.2.bep => diffutils-3.2.recipe} (95%) rename sys-apps/dmidecode/{dmidecode-2.11.bep => dmidecode-2.11.recipe} (97%) rename sys-apps/dtc/{dtc-1.3.0-git.bep => dtc-1.3.0-git.recipe} (94%) rename sys-apps/ed/{ed-1.4.bep => ed-1.4.recipe} (95%) rename sys-apps/file/{file-5.04.bep => file-5.04.recipe} (95%) rename sys-apps/file/{file-5.11.bep => file-5.11.recipe} (96%) rename sys-apps/findutils/{findutils-4.4.2.bep => findutils-4.4.2.recipe} (95%) rename sys-apps/gawk/{gawk-3.1.8.bep => gawk-3.1.8.recipe} (95%) rename sys-apps/gawk/{gawk-4.0.1.bep => gawk-4.0.1.recipe} (96%) rename sys-apps/grep/{grep-2.12.bep => grep-2.12.recipe} (95%) rename sys-apps/grep/{grep-2.14-bz2.bep => grep-2.14-bz2.recipe} (97%) rename sys-apps/grep/{grep-2.14.bep => grep-2.14.recipe} (96%) rename sys-apps/grep/{grep-2.5.4.bep => grep-2.5.4.recipe} (94%) rename sys-apps/grep/{grep-2.6.1.bep => grep-2.6.1.recipe} (94%) rename sys-apps/grep/{grep-2.6.3.bep => grep-2.6.3.recipe} (94%) rename sys-apps/grep/{grep-2.7.bep => grep-2.7.recipe} (95%) rename sys-apps/groff/{groff-1.20.1.bep => groff-1.20.1.recipe} (96%) rename sys-apps/hgrep/{hgrep-1.0.1.bep => hgrep-1.0.1.recipe} (95%) rename sys-apps/hgrep/{hgrep-1.0.bep => hgrep-1.0.recipe} (95%) rename sys-apps/less/{less-436.bep => less-436.recipe} (96%) rename sys-apps/less/{less-451.bep => less-451.recipe} (96%) rename sys-apps/lgrep/{lgrep-1.0.bep => lgrep-1.0.recipe} (95%) rename sys-apps/man/{man-1.6f.bep => man-1.6f.recipe} (96%) rename sys-apps/man/{man-1.6g.bep => man-1.6g.recipe} (96%) rename sys-apps/sed/{sed-4.2.1.bep => sed-4.2.1.recipe} (97%) rename sys-apps/texinfo/{texinfo-4.13a.bep => texinfo-4.13a.recipe} (97%) rename sys-apps/xinetd/{xinetd-2.3.14.bep => xinetd-2.3.14.recipe} (98%) rename sys-devel/autoconf/{autoconf-2.65.bep => autoconf-2.65.recipe} (95%) rename sys-devel/autoconf/{autoconf-2.66.bep => autoconf-2.66.recipe} (95%) rename sys-devel/autoconf/{autoconf-2.67.bep => autoconf-2.67.recipe} (95%) rename sys-devel/autoconf/{autoconf-2.67xz.bep => autoconf-2.67xz.recipe} (95%) rename sys-devel/autoconf/{autoconf-2.68.bep => autoconf-2.68.recipe} (97%) rename sys-devel/autoconf/{autoconf-2.69.bep => autoconf-2.69.recipe} (95%) rename sys-devel/automake/{automake-1.10.3.bep => automake-1.10.3.recipe} (95%) rename sys-devel/automake/{automake-1.11.1.bep => automake-1.11.1.recipe} (97%) rename sys-devel/automake/{automake-1.12.2.bep => automake-1.12.2.recipe} (95%) rename sys-devel/automake/{automake-1.12.5.bep => automake-1.12.5.recipe} (95%) rename sys-devel/automake/{automake-1.13.1.bep => automake-1.13.1.recipe} (96%) rename sys-devel/automake/{automake-1.13.bep => automake-1.13.recipe} (95%) rename sys-devel/bc/{bc-1.06.bep => bc-1.06.recipe} (95%) rename sys-devel/bison/{bison-2.4.1.bep => bison-2.4.1.recipe} (94%) rename sys-devel/bison/{bison-2.4.3.bep => bison-2.4.3.recipe} (97%) rename sys-devel/bison/{bison-2.4.bep => bison-2.4.recipe} (95%) rename sys-devel/bison/{bison-2.5.bep => bison-2.5.recipe} (95%) rename sys-devel/bison/{bison-2.6.2.bep => bison-2.6.2.recipe} (96%) rename sys-devel/clang/{clang-3.0.bep => clang-3.0.recipe} (96%) rename sys-devel/clang/{clang-3.2.bep => clang-3.2.recipe} (96%) rename sys-devel/flex/{flex-2.5.35.bep => flex-2.5.35.recipe} (98%) rename sys-devel/gcc/{gcc-2.95.3_110711.bep => gcc-2.95.3_110711.recipe} (99%) rename sys-devel/gettext/{gettext-0.17.bep => gettext-0.17.recipe} (97%) rename sys-devel/gettext/{gettext-0.18.1.1-dev.bep => gettext-0.18.1.1-dev.recipe} (96%) rename sys-devel/gettext/{gettext-0.18.1.1.bep => gettext-0.18.1.1.recipe} (97%) rename sys-devel/jam/{jam-2.5.bep => jam-2.5.recipe} (94%) rename sys-devel/lemon/{lemon-3.7.5.bep => lemon-3.7.5.recipe} (95%) rename sys-devel/libtool/{libtool-2.2.10.bep => libtool-2.2.10.recipe} (93%) rename sys-devel/libtool/{libtool-2.2.6.bep => libtool-2.2.6.recipe} (95%) rename sys-devel/libtool/{libtool-2.2.6b.bep => libtool-2.2.6b.recipe} (95%) rename sys-devel/libtool/{libtool-2.2.7b.bep => libtool-2.2.7b.recipe} (95%) rename sys-devel/libtool/{libtool-2.2.8.bep => libtool-2.2.8.recipe} (93%) rename sys-devel/libtool/{libtool-2.2.x.bep => libtool-2.2.x.recipe} (95%) rename sys-devel/libtool/{libtool-2.4.2.bep => libtool-2.4.2.recipe} (95%) rename sys-devel/libtool/{libtool-2.4.bep => libtool-2.4.recipe} (98%) rename sys-devel/llvm/{llvm-3.0.bep => llvm-3.0.recipe} (96%) rename sys-devel/llvm/{llvm-3.2.bep => llvm-3.2.recipe} (97%) rename sys-devel/m4/{m4-1.4.14.bep => m4-1.4.14.recipe} (96%) rename sys-devel/m4/{m4-1.4.15.bep => m4-1.4.15.recipe} (96%) rename sys-devel/m4/{m4-1.4.16.bep => m4-1.4.16.recipe} (95%) rename sys-devel/make/{make-3.81.bep => make-3.81.recipe} (97%) rename sys-devel/make/{make-3.82.bep => make-3.82.recipe} (97%) rename sys-devel/patch/{patch-2.6.1.bep => patch-2.6.1.recipe} (97%) rename sys-devel/patch/{patch-2.7.1.bep => patch-2.7.1.recipe} (95%) rename sys-fs/e2fsprogs/{e2fsprogs-1.43-git.bep => e2fsprogs-1.43-git.recipe} (96%) rename sys-fs/e2fsprogs/{e2fsprogs-1.43.bep => e2fsprogs-1.43.recipe} (97%) rename sys-libs/glu/{glu-9.0.bep => glu-9.0.recipe} (96%) rename sys-libs/mesa/{mesa-7.8.2.bep => mesa-7.8.2.recipe} (98%) rename sys-libs/mesa/{mesa-9.0.1.bep => mesa-9.0.1.recipe} (98%) rename sys-libs/mesa/{mesa-9.0.2.bep => mesa-9.0.2.recipe} (99%) rename sys-libs/mesa/{mesa-9.0.bep => mesa-9.0.recipe} (98%) rename sys-libs/mesa/{mesa-9.1.0.bep => mesa-9.1.0.recipe} (99%) rename sys-libs/mesa/{mesa-9.1.1.bep => mesa-9.1.1.recipe} (99%) rename sys-libs/ncurses/{ncurses-5.6.bep => ncurses-5.6.recipe} (94%) rename sys-libs/ncurses/{ncurses-5.7.bep => ncurses-5.7.recipe} (95%) rename sys-libs/ncurses/{ncurses-5.8.bep => ncurses-5.8.recipe} (96%) rename sys-libs/ncurses/{ncurses-5.9.bep => ncurses-5.9.recipe} (96%) rename sys-libs/readline/{readline-5.2.bep => readline-5.2.recipe} (95%) rename sys-libs/readline/{readline-6.0.bep => readline-6.0.recipe} (96%) rename sys-libs/readline/{readline-6.1.bep => readline-6.1.recipe} (97%) rename sys-libs/readline/{readline-6.2.bep => readline-6.2.recipe} (96%) rename sys-libs/slang/{slang-2.2.2.bep => slang-2.2.2.recipe} (96%) rename sys-libs/zlib/{zlib-1.2.3.bep => zlib-1.2.3.recipe} (94%) rename sys-libs/zlib/{zlib-1.2.5.bep => zlib-1.2.5.recipe} (94%) rename sys-libs/zlib/{zlib-1.2.7.bep => zlib-1.2.7.recipe} (95%) rename sys-libs/zopfli/{zopfli-999.bep => zopfli-999.recipe} (96%) rename sys-process/htop/{htop-1.0.2.bep => htop-1.0.2.recipe} (96%) rename www-client/links/{links-2.3pre2.bep => links-2.3pre2.recipe} (96%) rename www-client/netsurf/{netsurf-10380.bep => netsurf-10380.recipe} (97%) rename www-client/netsurf/{netsurf-2.1.bep => netsurf-2.1.recipe} (98%) rename www-client/netsurf/{netsurf-2.6.bep => netsurf-2.6.recipe} (98%) rename www-client/netsurf/{netsurf-2.7-svn.bep => netsurf-2.7-svn.recipe} (98%) rename www-client/netsurf/{netsurf-2.7.bep => netsurf-2.7.recipe} (98%) rename www-client/netsurf/{netsurf-2.9.bep => netsurf-2.9.recipe} (96%) rename www-client/netsurf/{netsurf-2.HEAD.bep => netsurf-2.HEAD.recipe} (97%) rename www-client/netsurf/{netsurf-9799.bep => netsurf-9799.recipe} (98%) rename www-client/netsurf/{netsurf-9872.bep => netsurf-9872.recipe} (97%) rename www-client/w3m/{w3m-0.5.3.bep => w3m-0.5.3.recipe} (97%) rename www-servers/apache/{apache-2.2.17.bep => apache-2.2.17.recipe} (95%) rename www-servers/apache/{apache-2.2.22.bep => apache-2.2.22.recipe} (95%) rename www-servers/apache/{apache-2.4.3.bep => apache-2.4.3.recipe} (96%) rename www-servers/cherokee/{cherokee-1.2.101.bep => cherokee-1.2.101.recipe} (95%) rename www-servers/haproxy/{haproxy-1.4.22.bep => haproxy-1.4.22.recipe} (97%) rename x11-libs/agg/{agg-2.5.bep => agg-2.5.recipe} (96%) rename x11-libs/cairo/{cairo-1.10.0.bep => cairo-1.10.0.recipe} (97%) rename x11-libs/cairo/{cairo-1.8.10.bep => cairo-1.8.10.recipe} (97%) rename x11-libs/libX11/{libX11-1.3.3.bep => libX11-1.3.3.recipe} (97%) rename x11-libs/libXau/{libXau-1.0.5.bep => libXau-1.0.5.recipe} (95%) rename x11-libs/libxcb/{libxcb-1.6.bep => libxcb-1.6.recipe} (96%) rename x11-libs/pango/{pango-1.28.1.bep => pango-1.28.1.recipe} (96%) rename x11-libs/pixman/{pixman-0.17.2.bep => pixman-0.17.2.recipe} (95%) rename x11-libs/pixman/{pixman-0.18.2.bep => pixman-0.18.2.recipe} (95%) rename x11-libs/pixman/{pixman-0.18.4.bep => pixman-0.18.4.recipe} (95%) rename x11-libs/pixman/{pixman-0.19-master.bep => pixman-0.19-master.recipe} (95%) rename x11-libs/pixman/{pixman-0.19.4.bep => pixman-0.19.4.recipe} (95%) rename x11-libs/pixman/{pixman-0.20.0.bep => pixman-0.20.0.recipe} (95%) rename x11-libs/xtrans/{xtrans-1.2.5.bep => xtrans-1.2.5.recipe} (96%) rename x11-misc/makedepend/{makedepend-1.0.2.bep => makedepend-1.0.2.recipe} (96%) rename x11-misc/shared-mime-info/{shared-mime-info-1.0.bep => shared-mime-info-1.0.recipe} (96%) rename x11-misc/util-macros/{util-macros-1.17.0-git.bep => util-macros-1.17.0-git.recipe} (95%) rename x11-misc/util-macros/{util-macros-1.7.0.bep => util-macros-1.7.0.recipe} (95%) rename x11-proto/inputproto/{inputproto-2.0.bep => inputproto-2.0.recipe} (95%) rename x11-proto/kbproto/{kbproto-1.0.4.bep => kbproto-1.0.4.recipe} (95%) rename x11-proto/xcb-proto/{xcb-proto-1.6.bep => xcb-proto-1.6.recipe} (94%) rename x11-proto/xextproto/{xextproto-7.1.1.bep => xextproto-7.1.1.recipe} (95%) rename x11-proto/xproto/{xproto-7.0.16.bep => xproto-7.0.16.recipe} (95%) rename x11-proto/xproto/{xproto-7.0.23-git.bep => xproto-7.0.23-git.recipe} (97%) diff --git a/app-admin/pwgen/pwgen-2.06.bep b/app-admin/pwgen/pwgen-2.06.recipe similarity index 94% rename from app-admin/pwgen/pwgen-2.06.bep rename to app-admin/pwgen/pwgen-2.06.recipe index 209ad42d1..36dcee239 100644 --- a/app-admin/pwgen/pwgen-2.06.bep +++ b/app-admin/pwgen/pwgen-2.06.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="935aebcbe610fbc9de8125e7b7d71297" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pwgen-2.06 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd pwgen-2.06 make install } diff --git a/app-arch/arc/arc-5.21o.bep b/app-arch/arc/arc-5.21o.recipe similarity index 83% rename from app-arch/arc/arc-5.21o.bep rename to app-arch/arc/arc-5.21o.recipe index a27d79533..f1f238dfe 100644 --- a/app-arch/arc/arc-5.21o.bep +++ b/app-arch/arc/arc-5.21o.recipe @@ -5,16 +5,19 @@ CHECKSUM_MD5="3b30c739b42b2fe8ac4ec0a05f34f284" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd arc-5.21o make } -INSTALL { +INSTALL() +{ cd arc-5.21o install arc --prefix={$DESTDIR}`finddir B_COMMON_DIRECTORY` install marc --prefix={$DESTDIR}`finddir B_COMMON_DIRECTORY` - install arc.1 {$DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1 + install arc.1() +{$DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1 } LICENSE="GNU GPL v2" diff --git a/app-arch/bzip2/bzip2-1.0.5.bep b/app-arch/bzip2/bzip2-1.0.5.recipe similarity index 95% rename from app-arch/bzip2/bzip2-1.0.5.bep rename to app-arch/bzip2/bzip2-1.0.5.recipe index 1cb918a1b..4580dc8e2 100644 --- a/app-arch/bzip2/bzip2-1.0.5.bep +++ b/app-arch/bzip2/bzip2-1.0.5.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="3c15a0c8d1d3ee1c46a1634d00617b1a" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bzip2-1.0.5 make make -f Makefile-libbz2_so } -INSTALL { +INSTALL() +{ cd bzip2-1.0.5 make install PREFIX=/boot/common cp libbz2.so.1.0.4 /boot/common/lib diff --git a/app-arch/bzip2/bzip2-1.0.6.bep b/app-arch/bzip2/bzip2-1.0.6.recipe similarity index 95% rename from app-arch/bzip2/bzip2-1.0.6.bep rename to app-arch/bzip2/bzip2-1.0.6.recipe index 615a0df08..cdd18ca38 100644 --- a/app-arch/bzip2/bzip2-1.0.6.bep +++ b/app-arch/bzip2/bzip2-1.0.6.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bzip2-1.0.6 make make -f Makefile-libbz2_so } -INSTALL { +INSTALL() +{ cd bzip2-1.0.6 make install PREFIX=/boot/common cp libbz2.so.1.0.6 /boot/common/lib diff --git a/app-arch/cabextract/cabextract-1.2.bep b/app-arch/cabextract/cabextract-1.2.recipe similarity index 95% rename from app-arch/cabextract/cabextract-1.2.bep rename to app-arch/cabextract/cabextract-1.2.recipe index 5e6df8e4c..1897cb9c0 100644 --- a/app-arch/cabextract/cabextract-1.2.bep +++ b/app-arch/cabextract/cabextract-1.2.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="dc421a690648b503265c82ade84e143e" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cabextract-1.2 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd cabextract-1.2 make install } diff --git a/app-arch/cabextract/cabextract-1.3.bep b/app-arch/cabextract/cabextract-1.3.recipe similarity index 95% rename from app-arch/cabextract/cabextract-1.3.bep rename to app-arch/cabextract/cabextract-1.3.recipe index be5f7b460..9a711b005 100644 --- a/app-arch/cabextract/cabextract-1.3.bep +++ b/app-arch/cabextract/cabextract-1.3.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="cb9a4a38470d2a71a0275968e7eb64d3" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cabextract-1.3 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd cabextract-1.3 make install } diff --git a/app-arch/cpio/cpio-2.10.bep b/app-arch/cpio/cpio-2.10.recipe similarity index 96% rename from app-arch/cpio/cpio-2.10.bep rename to app-arch/cpio/cpio-2.10.recipe index f0971c4c3..c22619dc0 100644 --- a/app-arch/cpio/cpio-2.10.bep +++ b/app-arch/cpio/cpio-2.10.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="351ab3d38d8949913e478cc23b9d6ad4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cpio-2.10 sed -i 's/restrict//g' gnu/string.in.h ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cpio-2.10 make install } -TEST { +TEST() +{ cd cpio-2.10 make check } diff --git a/app-arch/cpio/cpio-2.11.bep b/app-arch/cpio/cpio-2.11.recipe similarity index 96% rename from app-arch/cpio/cpio-2.11.bep rename to app-arch/cpio/cpio-2.11.recipe index 4b5e8d0bb..cbcda6e09 100644 --- a/app-arch/cpio/cpio-2.11.bep +++ b/app-arch/cpio/cpio-2.11.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="1112bb6c45863468b5496ba128792f6c" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd cpio-2.11 # sed -i 's/restrict//g' gnu/string.in.h ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cpio-2.11 make install } -TEST { +TEST() +{ cd cpio-2.11 make check } diff --git a/app-arch/fastjar/fastjar-0.98.bep b/app-arch/fastjar/fastjar-0.98.recipe similarity index 96% rename from app-arch/fastjar/fastjar-0.98.bep rename to app-arch/fastjar/fastjar-0.98.recipe index d1d6e50f3..b881de5aa 100644 --- a/app-arch/fastjar/fastjar-0.98.bep +++ b/app-arch/fastjar/fastjar-0.98.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="d2d264d343d4d0e1575832cc1023c3bf" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd fastjar-0.98 autoreconf -vfi configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd fastjar-0.98 make install } diff --git a/app-arch/gzip/gzip-1.2.4a.bep b/app-arch/gzip/gzip-1.2.4a.recipe similarity index 93% rename from app-arch/gzip/gzip-1.2.4a.bep rename to app-arch/gzip/gzip-1.2.4a.recipe index df43f1de9..a48ec2e18 100644 --- a/app-arch/gzip/gzip-1.2.4a.bep +++ b/app-arch/gzip/gzip-1.2.4a.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="39053e044b18ecd0627f80fbe7cfeaad" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd gzip-1.2.4a ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd gzip-1.2.4a make install } diff --git a/app-arch/gzip/gzip-1.3.12.bep b/app-arch/gzip/gzip-1.3.12.recipe similarity index 93% rename from app-arch/gzip/gzip-1.3.12.bep rename to app-arch/gzip/gzip-1.3.12.recipe index b5a35d4ef..e3fb7a487 100644 --- a/app-arch/gzip/gzip-1.3.12.bep +++ b/app-arch/gzip/gzip-1.3.12.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="b5bac2d21840ae077e0217bc5e4845b1" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd gzip-1.3.12 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd gzip-1.3.12 make install } diff --git a/app-arch/gzip/gzip-1.4.bep b/app-arch/gzip/gzip-1.4.recipe similarity index 95% rename from app-arch/gzip/gzip-1.4.bep rename to app-arch/gzip/gzip-1.4.recipe index 555edcd22..0dbe2f094 100644 --- a/app-arch/gzip/gzip-1.4.bep +++ b/app-arch/gzip/gzip-1.4.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="e381b8506210c794278f5527cba0e765" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd gzip-1.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd gzip-1.4 make install } diff --git a/app-arch/ha/ha-0999.bep b/app-arch/ha/ha-0999.recipe similarity index 95% rename from app-arch/ha/ha-0999.bep rename to app-arch/ha/ha-0999.recipe index 6e95afa56..04b3d130f 100644 --- a/app-arch/ha/ha-0999.bep +++ b/app-arch/ha/ha-0999.recipe @@ -5,11 +5,13 @@ REVISION="1" CHECKSUM_MD5="77f3266a451712bec55d60df67f61486" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ make -f makefile.nix } -INSTALL { +INSTALL() +{ mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` cp ha ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`/ha } diff --git a/app-arch/lha/lha-1.14i.bep b/app-arch/lha/lha-1.14i.recipe similarity index 95% rename from app-arch/lha/lha-1.14i.bep rename to app-arch/lha/lha-1.14i.recipe index 1219ed066..4052ba216 100644 --- a/app-arch/lha/lha-1.14i.bep +++ b/app-arch/lha/lha-1.14i.recipe @@ -5,20 +5,23 @@ CHECKSUM_MD5="9f52430410928ba4390a73a41a36d56f" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd lha-1.14i-ac20050924p1 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY`/ make } -INSTALL { +INSTALL() +{ cd lha-1.14i-ac20050924p1 make install DESTDIR=${DESTDIR} } -TEST { +TEST() +{ cd lha-1.14i-ac20050924p1 make check } diff --git a/app-arch/libarchive/libarchive-2.8.3.bep b/app-arch/libarchive/libarchive-2.8.3.recipe similarity index 95% rename from app-arch/libarchive/libarchive-2.8.3.bep rename to app-arch/libarchive/libarchive-2.8.3.recipe index 2ff868cd4..27e342a7c 100644 --- a/app-arch/libarchive/libarchive-2.8.3.bep +++ b/app-arch/libarchive/libarchive-2.8.3.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e4fb38b224f623e1cf1122631bf35b82" -BUILD { +BUILD() +{ cd libarchive-2.8.3 libtoolize --force --copy --install aclocal -I build/autoconf @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libarchive-2.8.3 make install } -TEST { +TEST() +{ cd libarchive-2.8.3 make check } diff --git a/app-arch/libarchive/libarchive-2.8.4.bep b/app-arch/libarchive/libarchive-2.8.4.recipe similarity index 95% rename from app-arch/libarchive/libarchive-2.8.4.bep rename to app-arch/libarchive/libarchive-2.8.4.recipe index b859d62ba..01d29a599 100644 --- a/app-arch/libarchive/libarchive-2.8.4.bep +++ b/app-arch/libarchive/libarchive-2.8.4.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="83b237a542f27969a8d68ac217dc3796" -BUILD { +BUILD() +{ cd libarchive-2.8.4 libtoolize --force --copy --install aclocal -I build/autoconf @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libarchive-2.8.4 make install } -TEST { +TEST() +{ cd libarchive-2.8.4 make check } diff --git a/app-arch/libarchive/libarchive-2.8.5.bep b/app-arch/libarchive/libarchive-2.8.5.recipe similarity index 96% rename from app-arch/libarchive/libarchive-2.8.5.bep rename to app-arch/libarchive/libarchive-2.8.5.recipe index d44ecd1b8..4a816b54f 100644 --- a/app-arch/libarchive/libarchive-2.8.5.bep +++ b/app-arch/libarchive/libarchive-2.8.5.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="58d1b202b4878e9da45cfe6d2a740881" -BUILD { +BUILD() +{ cd libarchive-2.8.5 libtoolize --force --copy --install aclocal -I build/autoconf @@ -20,12 +21,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libarchive-2.8.5 make install } -TEST { +TEST() +{ cd libarchive-2.8.5 make check } diff --git a/app-arch/libarchive/libarchive-3.0.3.bep b/app-arch/libarchive/libarchive-3.0.3.recipe similarity index 96% rename from app-arch/libarchive/libarchive-3.0.3.bep rename to app-arch/libarchive/libarchive-3.0.3.recipe index b5d4644a6..6f782a822 100644 --- a/app-arch/libarchive/libarchive-3.0.3.bep +++ b/app-arch/libarchive/libarchive-3.0.3.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="ca4090f0099432a9ac5a8b6618dc3892" -BUILD { +BUILD() +{ cd libarchive-3.0.3 libtoolize --force --copy --install aclocal -I build/autoconf @@ -20,12 +21,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libarchive-3.0.3 make install } -TEST { +TEST() +{ cd libarchive-3.0.3 make check } diff --git a/app-arch/p7zip/p7zip-9.04.bep b/app-arch/p7zip/p7zip-9.04.recipe similarity index 96% rename from app-arch/p7zip/p7zip-9.04.bep rename to app-arch/p7zip/p7zip-9.04.recipe index 26ae736bb..f679f10b0 100644 --- a/app-arch/p7zip/p7zip-9.04.bep +++ b/app-arch/p7zip/p7zip-9.04.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="9194ebf9a2b3735d236aed001de5f6f8" -BUILD { +BUILD() +{ cd p7zip_9.04 cp makefile.beos makefile.machine make } -INSTALL { +INSTALL() +{ cd p7zip_9.04 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` make install DEST_DIR=${DESTDIR} \ diff --git a/app-arch/p7zip/p7zip-9.13.bep b/app-arch/p7zip/p7zip-9.13.recipe similarity index 96% rename from app-arch/p7zip/p7zip-9.13.bep rename to app-arch/p7zip/p7zip-9.13.recipe index a2b44e7f1..7fc9cdc99 100644 --- a/app-arch/p7zip/p7zip-9.13.bep +++ b/app-arch/p7zip/p7zip-9.13.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8ddb5053db3b1f2696407d01be145779" -BUILD { +BUILD() +{ cd p7zip_9.13 cp makefile.haiku makefile.machine make } -INSTALL { +INSTALL() +{ cd p7zip_9.13 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \ diff --git a/app-arch/p7zip/p7zip-9.20.1.bep b/app-arch/p7zip/p7zip-9.20.1.recipe similarity index 96% rename from app-arch/p7zip/p7zip-9.20.1.bep rename to app-arch/p7zip/p7zip-9.20.1.recipe index a011b20e1..2c45ea1fb 100644 --- a/app-arch/p7zip/p7zip-9.20.1.bep +++ b/app-arch/p7zip/p7zip-9.20.1.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89" -BUILD { +BUILD() +{ cd p7zip_9.20.1 cp makefile.haiku makefile.machine make } -INSTALL { +INSTALL() +{ cd p7zip_9.20.1 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \ diff --git a/app-arch/pigz/pigz-2.1.6.bep b/app-arch/pigz/pigz-2.1.6.recipe similarity index 94% rename from app-arch/pigz/pigz-2.1.6.bep rename to app-arch/pigz/pigz-2.1.6.recipe index 1ef41604a..5beb18652 100644 --- a/app-arch/pigz/pigz-2.1.6.bep +++ b/app-arch/pigz/pigz-2.1.6.recipe @@ -5,21 +5,24 @@ CHECKSUM_MD5="cbe9030c4be3d0ef2438ee5f8b169ca4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pigz-2.1.6 sed -i 's/-lpthread/ /g' Makefile sed -i 's/ln -f pigz unpigz/cp pigz unpigz/' Makefile make } -INSTALL { +INSTALL() +{ cd pigz-2.1.6 mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` cp pigz ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/pigz cp unpigz ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/unpigz } -TEST { +TEST() +{ cd pigz-2.1.6 make test } diff --git a/app-arch/sharutils/sharutils-4.10.bep b/app-arch/sharutils/sharutils-4.10.recipe similarity index 96% rename from app-arch/sharutils/sharutils-4.10.bep rename to app-arch/sharutils/sharutils-4.10.recipe index 9c30b836d..c81ae0831 100644 --- a/app-arch/sharutils/sharutils-4.10.bep +++ b/app-arch/sharutils/sharutils-4.10.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd sharutils-4.10 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sharutils-4.10 make install } diff --git a/app-arch/sharutils/sharutils-4.6.3.bep b/app-arch/sharutils/sharutils-4.6.3.recipe similarity index 94% rename from app-arch/sharutils/sharutils-4.6.3.bep rename to app-arch/sharutils/sharutils-4.6.3.recipe index e940d99d5..9adb9d2ee 100644 --- a/app-arch/sharutils/sharutils-4.6.3.bep +++ b/app-arch/sharutils/sharutils-4.6.3.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="74127a560e59be6dfa8b59993eb0ca91" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd sharutils-4.6.3 ./configure --prefix=/boot/home/common make } -INSTALL { +INSTALL() +{ cd sharutils-4.6.3 make install } diff --git a/app-arch/tar/tar-1.22.bep b/app-arch/tar/tar-1.22.recipe similarity index 96% rename from app-arch/tar/tar-1.22.bep rename to app-arch/tar/tar-1.22.recipe index c27dcb404..e719a43bc 100644 --- a/app-arch/tar/tar-1.22.bep +++ b/app-arch/tar/tar-1.22.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="07fa517027f426bb80f5f5ff91b63585" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd tar-1.22 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tar-1.22 make install } diff --git a/app-arch/tar/tar-1.23.bep b/app-arch/tar/tar-1.23.recipe similarity index 95% rename from app-arch/tar/tar-1.23.bep rename to app-arch/tar/tar-1.23.recipe index 8b61cc573..c1942e654 100644 --- a/app-arch/tar/tar-1.23.bep +++ b/app-arch/tar/tar-1.23.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="41e2ca4b924ec7860e51b43ad06cdb7e" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd tar-1.23 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd tar-1.23 make install } diff --git a/app-arch/tar/tar-1.25.bep b/app-arch/tar/tar-1.25.recipe similarity index 97% rename from app-arch/tar/tar-1.25.bep rename to app-arch/tar/tar-1.25.recipe index 28fecf0bf..1a16cafd0 100644 --- a/app-arch/tar/tar-1.25.bep +++ b/app-arch/tar/tar-1.25.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="6e497f861c77bbba2f7da4e10270995b" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/gnulib = 9999" -BUILD { +BUILD() +{ cd tar-1.25 if [ ! -e `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999 ] ; then echo "gnulib not found, so updating it now..." @@ -27,12 +28,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tar-1.25 make install } -TEST { +TEST() +{ cd tar-1.25 make check } diff --git a/app-arch/tar/tar-1.26.bep b/app-arch/tar/tar-1.26.recipe similarity index 96% rename from app-arch/tar/tar-1.26.bep rename to app-arch/tar/tar-1.26.recipe index ee941c03c..4f52f7bb9 100644 --- a/app-arch/tar/tar-1.26.bep +++ b/app-arch/tar/tar-1.26.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd tar-1.26 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tar-1.26 make install } diff --git a/app-arch/unrar/unrar-4.2.4.bep b/app-arch/unrar/unrar-4.2.4.recipe similarity index 94% rename from app-arch/unrar/unrar-4.2.4.bep rename to app-arch/unrar/unrar-4.2.4.recipe index 1b697795b..0fecb8745 100644 --- a/app-arch/unrar/unrar-4.2.4.bep +++ b/app-arch/unrar/unrar-4.2.4.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8ea9d1b4139474b282d76e627a2de3e4" -BUILD { +BUILD() +{ cd unrar make -f makefile.unix DESTDIR=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd unrar make -f makefile.unix DESTDIR=`finddir B_COMMON_DIRECTORY` install } diff --git a/app-arch/unzip/unzip-6.0.bep b/app-arch/unzip/unzip-6.0.recipe similarity index 94% rename from app-arch/unzip/unzip-6.0.bep rename to app-arch/unzip/unzip-6.0.recipe index 868411e99..b2cd86962 100644 --- a/app-arch/unzip/unzip-6.0.bep +++ b/app-arch/unzip/unzip-6.0.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="62b490407489521db863b523a7f86375" -BUILD { +BUILD() +{ cd unzip60 make -f beos/Makefile \ PREFIX=`finddir B_COMMON_DIRECTORY` \ @@ -13,12 +14,14 @@ BUILD { } -INSTALL { +INSTALL() +{ cd unzip60 make -f beos/Makefile install } -TEST { +TEST() +{ cd unzip60 # make test # make check diff --git a/app-arch/xar/xar-1.5.2.bep b/app-arch/xar/xar-1.5.2.recipe similarity index 95% rename from app-arch/xar/xar-1.5.2.bep rename to app-arch/xar/xar-1.5.2.recipe index 5eddcd68b..2835e1565 100644 --- a/app-arch/xar/xar-1.5.2.bep +++ b/app-arch/xar/xar-1.5.2.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" MESSAGE="This port builds only with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd xar-1.5.2 libtoolize --force --copy --install aclocal @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd xar-1.5.2 make install } diff --git a/app-arch/xz-utils/xz-utils-4.999.9.bep b/app-arch/xz-utils/xz-utils-4.999.9.recipe similarity index 95% rename from app-arch/xz-utils/xz-utils-4.999.9.bep rename to app-arch/xz-utils/xz-utils-4.999.9.recipe index a692dc832..f79763e27 100644 --- a/app-arch/xz-utils/xz-utils-4.999.9.bep +++ b/app-arch/xz-utils/xz-utils-4.999.9.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd xz-4.999.9beta cp -f `finddir B_COMMON_BIN_DIRECTORY`/libtool . libtoolize -c -f @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd xz-4.999.9beta make install } -TEST { +TEST() +{ cd xz-4.999.9beta make check } diff --git a/app-arch/xz-utils/xz-utils-5.0.1.bep b/app-arch/xz-utils/xz-utils-5.0.1.recipe similarity index 96% rename from app-arch/xz-utils/xz-utils-5.0.1.bep rename to app-arch/xz-utils/xz-utils-5.0.1.recipe index cfec88a3c..537853ebf 100644 --- a/app-arch/xz-utils/xz-utils-5.0.1.bep +++ b/app-arch/xz-utils/xz-utils-5.0.1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4." DEPEND="" -BUILD { +BUILD() +{ cd xz-5.0.1 touch po/t-cs.gmo libtoolize --force --copy --install @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd xz-5.0.1 make install } -TEST { +TEST() +{ cd xz-5.0.1 make check } diff --git a/app-arch/xz-utils/xz-utils-5.0.4.bep b/app-arch/xz-utils/xz-utils-5.0.4.recipe similarity index 96% rename from app-arch/xz-utils/xz-utils-5.0.4.bep rename to app-arch/xz-utils/xz-utils-5.0.4.recipe index efeaeaeb8..987591dd8 100644 --- a/app-arch/xz-utils/xz-utils-5.0.4.bep +++ b/app-arch/xz-utils/xz-utils-5.0.4.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4." DEPEND="" -BUILD { +BUILD() +{ cd xz-5.0.4 touch po/t-cs.gmo libtoolize --force --copy --install @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd xz-5.0.4 make install } -TEST { +TEST() +{ cd xz-5.0.4 make check } diff --git a/app-arch/zip/zip-3.0.bep b/app-arch/zip/zip-3.0.recipe similarity index 94% rename from app-arch/zip/zip-3.0.bep rename to app-arch/zip/zip-3.0.recipe index 132af02e8..5b68a26d1 100644 --- a/app-arch/zip/zip-3.0.bep +++ b/app-arch/zip/zip-3.0.recipe @@ -5,19 +5,22 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="7b74551e63f8ee6aab6fbc86676c0d37" -BUILD { +BUILD() +{ cd zip30 make -f beos/Makefile \ PREFIX=`finddir B_COMMON_DIRECTORY` \ MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man } -INSTALL { +INSTALL() +{ cd zip30 make -f beos/Makefile install } -TEST { +TEST() +{ cd zip30 # make test # make check diff --git a/app-arch/zoo/zoo-2.10.bep b/app-arch/zoo/zoo-2.10.recipe similarity index 93% rename from app-arch/zoo/zoo-2.10.bep rename to app-arch/zoo/zoo-2.10.recipe index 96f3dc0f9..b6f401a28 100644 --- a/app-arch/zoo/zoo-2.10.bep +++ b/app-arch/zoo/zoo-2.10.recipe @@ -5,11 +5,13 @@ CHECKSUM_MD5="70a0a785ecc8f7f747be1421e495d837" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ make haiku } -INSTALL { +INSTALL() +{ make inst_prod } LICENSE="zoo" diff --git a/app-benchmarks/bonnie++/bonnie++-1.03e.bep b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe similarity index 97% rename from app-benchmarks/bonnie++/bonnie++-1.03e.bep rename to app-benchmarks/bonnie++/bonnie++-1.03e.recipe index bb6fb950f..0f26cfcf9 100644 --- a/app-benchmarks/bonnie++/bonnie++-1.03e.bep +++ b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe @@ -5,7 +5,8 @@ REVISION= "1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="750aa5b5051263a99c6c195888c74968" -BUILD { +BUILD() +{ cd bonnie++-1.03e COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` @@ -15,7 +16,8 @@ BUILD { --sbindir=$COMMON_BIN make } -INSTALL { +INSTALL() +{ cd bonnie++-1.03e make install DESTDIR=${DESTDIR} diff --git a/app-benchmarks/ffsb/ffsb-6.0-rc2.bep b/app-benchmarks/ffsb/ffsb-6.0-rc2.recipe similarity index 96% rename from app-benchmarks/ffsb/ffsb-6.0-rc2.bep rename to app-benchmarks/ffsb/ffsb-6.0-rc2.recipe index bcf3b899d..b4a80b504 100644 --- a/app-benchmarks/ffsb/ffsb-6.0-rc2.bep +++ b/app-benchmarks/ffsb/ffsb-6.0-rc2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="cabfc1021c2ec6c6b168fefc84210891" -BUILD { +BUILD() +{ cd ffsb-6.0-rc2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ffsb-6.0-rc2 make install } diff --git a/app-benchmarks/iozone/iozone-3.326.bep b/app-benchmarks/iozone/iozone-3.326.recipe similarity index 96% rename from app-benchmarks/iozone/iozone-3.326.bep rename to app-benchmarks/iozone/iozone-3.326.recipe index 73b7b44f4..e95216033 100644 --- a/app-benchmarks/iozone/iozone-3.326.bep +++ b/app-benchmarks/iozone/iozone-3.326.recipe @@ -5,11 +5,13 @@ CHECKSUM_MD5="e80f06da89d314f7fc08fcef4046d367" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd iozone3_326/src/current/ make haiku } -INSTALL { +INSTALL() +{ cd iozone3_326/src/current/ mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` cp iozone ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`/iozone diff --git a/app-benchmarks/libmicro/libmicro-0.4.1.bep b/app-benchmarks/libmicro/libmicro-0.4.1.recipe similarity index 93% rename from app-benchmarks/libmicro/libmicro-0.4.1.bep rename to app-benchmarks/libmicro/libmicro-0.4.1.recipe index db2d7b796..065421c1c 100644 --- a/app-benchmarks/libmicro/libmicro-0.4.1.bep +++ b/app-benchmarks/libmicro/libmicro-0.4.1.recipe @@ -5,18 +5,21 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="2b6e1ff22164e4ae0c21c11e6c28f7ed" -BUILD { +BUILD() +{ cd libMicro-0.4.1 make } -INSTALL { +INSTALL() +{ cd libMicro-0.4.1 cd bin-BePC ls } -TEST { +TEST() +{ cd libMicro-0.4.1 # make test # make check diff --git a/app-benchmarks/piozone/piozone-1.0.bep b/app-benchmarks/piozone/piozone-1.0.recipe similarity index 95% rename from app-benchmarks/piozone/piozone-1.0.bep rename to app-benchmarks/piozone/piozone-1.0.recipe index c8069b088..fc6399b29 100644 --- a/app-benchmarks/piozone/piozone-1.0.bep +++ b/app-benchmarks/piozone/piozone-1.0.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="e48370a9aa80aed212b18e16c08b9056" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd piozone-1.0 make } -INSTALL { +INSTALL() +{ cd piozone-1.0 mkdir -p $DESTDIR/`finddir B_COMMON_BIN_DIRECTORY` cp -a piozone $DESTDIR/`finddir B_COMMON_BIN_DIRECTORY`/piozone diff --git a/app-cdr/bchunk/bchunk-1.2.0.bep b/app-cdr/bchunk/bchunk-1.2.0.recipe similarity index 97% rename from app-cdr/bchunk/bchunk-1.2.0.bep rename to app-cdr/bchunk/bchunk-1.2.0.recipe index 0e4d80adb..001e94823 100644 --- a/app-cdr/bchunk/bchunk-1.2.0.bep +++ b/app-cdr/bchunk/bchunk-1.2.0.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6a613da3f34f9a303f202d2e9731d231" -BUILD { +BUILD() +{ cd bchunk-1.2.0 make } -INSTALL { +INSTALL() +{ cd bchunk-1.2.0 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` diff --git a/app-cdr/cdrdao/cdrdao-1.2.3.bep b/app-cdr/cdrdao/cdrdao-1.2.3.recipe similarity index 95% rename from app-cdr/cdrdao/cdrdao-1.2.3.bep rename to app-cdr/cdrdao/cdrdao-1.2.3.recipe index 560f0daf2..e88cea319 100644 --- a/app-cdr/cdrdao/cdrdao-1.2.3.bep +++ b/app-cdr/cdrdao/cdrdao-1.2.3.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8d15ba6280bb7ba2f4d6be31d28b3c0c" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd cdrdao-1.2.3 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cdrdao-1.2.3 make install } diff --git a/app-cdr/cdrtools/cdrtools-2.01.01a66.bep b/app-cdr/cdrtools/cdrtools-2.01.01a66.recipe similarity index 95% rename from app-cdr/cdrtools/cdrtools-2.01.01a66.bep rename to app-cdr/cdrtools/cdrtools-2.01.01a66.recipe index ee394e382..ae598c583 100644 --- a/app-cdr/cdrtools/cdrtools-2.01.01a66.bep +++ b/app-cdr/cdrtools/cdrtools-2.01.01a66.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="b9d40bddf1ce75989d0a36b939f0c3fb" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cdrtools-2.01.01 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd cdrtools-2.01.01 make install } diff --git a/app-cdr/cdrtools/cdrtools-2.01.01a77.bep b/app-cdr/cdrtools/cdrtools-2.01.01a77.recipe similarity index 94% rename from app-cdr/cdrtools/cdrtools-2.01.01a77.bep rename to app-cdr/cdrtools/cdrtools-2.01.01a77.recipe index ea13e679c..10b69724c 100644 --- a/app-cdr/cdrtools/cdrtools-2.01.01a77.bep +++ b/app-cdr/cdrtools/cdrtools-2.01.01a77.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="d0b4c56f1215be636996b8e1e3d2b284" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cdrtools-2.01.01 make } -INSTALL { +INSTALL() +{ cd cdrtools-2.01.01 make install } diff --git a/app-cdr/cdrtools/cdrtools-3.00.bep b/app-cdr/cdrtools/cdrtools-3.00.recipe similarity index 94% rename from app-cdr/cdrtools/cdrtools-3.00.bep rename to app-cdr/cdrtools/cdrtools-3.00.recipe index 801cfa10f..a3692e607 100644 --- a/app-cdr/cdrtools/cdrtools-3.00.bep +++ b/app-cdr/cdrtools/cdrtools-3.00.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="f9fbab08fbd458b0d2312976d8c5f558" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cdrtools-3.00 make GMAKE_NOWARN=true } -INSTALL { +INSTALL() +{ cd cdrtools-3.00 make install } diff --git a/app-cdr/cdrtools/cdrtools-3.01a01.bep b/app-cdr/cdrtools/cdrtools-3.01a01.recipe similarity index 98% rename from app-cdr/cdrtools/cdrtools-3.01a01.bep rename to app-cdr/cdrtools/cdrtools-3.01a01.recipe index 146935807..e85e084c7 100644 --- a/app-cdr/cdrtools/cdrtools-3.01a01.bep +++ b/app-cdr/cdrtools/cdrtools-3.01a01.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="6c81803b1e2bedefc1ad75fabd1c8474" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cdrtools-3.01 sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype @@ -21,7 +22,8 @@ BUILD { make GMAKE_NOWARN=true } -INSTALL { +INSTALL() +{ cd cdrtools-3.01 make GMAKE_NOWARN=true DEFMANBASE=documentation install } diff --git a/app-cdr/cdrtools/cdrtools-3.01a06.bep b/app-cdr/cdrtools/cdrtools-3.01a06.recipe similarity index 98% rename from app-cdr/cdrtools/cdrtools-3.01a06.bep rename to app-cdr/cdrtools/cdrtools-3.01a06.recipe index b4e4171fe..f9baf6c61 100644 --- a/app-cdr/cdrtools/cdrtools-3.01a06.bep +++ b/app-cdr/cdrtools/cdrtools-3.01a06.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="00b6c2128023186e712cf27e629ed246" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cdrtools-3.01 sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype @@ -21,7 +22,8 @@ BUILD { make GMAKE_NOWARN=true } -INSTALL { +INSTALL() +{ cd cdrtools-3.01 make GMAKE_NOWARN=true DEFMANBASE=documentation install } diff --git a/app-cdr/cdrtools/cdrtools-3.01a07.bep b/app-cdr/cdrtools/cdrtools-3.01a07.recipe similarity index 98% rename from app-cdr/cdrtools/cdrtools-3.01a07.bep rename to app-cdr/cdrtools/cdrtools-3.01a07.recipe index 819664d1f..f2b262ee7 100644 --- a/app-cdr/cdrtools/cdrtools-3.01a07.bep +++ b/app-cdr/cdrtools/cdrtools-3.01a07.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="266bae8db7d1e5473555b48c306aa216" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cdrtools-3.01 sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype @@ -21,7 +22,8 @@ BUILD { make GMAKE_NOWARN=true } -INSTALL { +INSTALL() +{ cd cdrtools-3.01 make GMAKE_NOWARN=true DEFMANBASE=documentation install } diff --git a/app-cdr/daa2iso/daa2iso-0.1.7e.bep b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe similarity index 95% rename from app-cdr/daa2iso/daa2iso-0.1.7e.bep rename to app-cdr/daa2iso/daa2iso-0.1.7e.recipe index c98e0db64..d3685840c 100644 --- a/app-cdr/daa2iso/daa2iso-0.1.7e.bep +++ b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe @@ -6,12 +6,14 @@ DEPEND="" STATUS_HAIKU="stable" CHECKSUM_MD5="6930ebcd8568e8ade0a175352d4a3481" -BUILD { +BUILD() +{ cd src make CFLAGS="-DNOLFS -O2 -s" } -INSTALL { +INSTALL() +{ cd src make install PREFIX=${DESTDIR}/$(finddir B_COMMON_DIRECTORY) } diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c.bep b/app-cdr/uif2iso/uif2iso-0.1.7c.recipe similarity index 95% rename from app-cdr/uif2iso/uif2iso-0.1.7c.bep rename to app-cdr/uif2iso/uif2iso-0.1.7c.recipe index c9bf0a10b..0803678b7 100644 --- a/app-cdr/uif2iso/uif2iso-0.1.7c.bep +++ b/app-cdr/uif2iso/uif2iso-0.1.7c.recipe @@ -6,12 +6,14 @@ DEPEND="" STATUS_HAIKU="stable" CHECKSUM_MD5="2eb9797ec463c38253014d45591a7043" -BUILD { +BUILD() +{ cd src make CFLAGS="-DNOLFS -O2 -s" } -INSTALL { +INSTALL() +{ cd src make install prefix=$(finddir B_COMMON_DIRECTORY) DESTDIR="${DESTDIR}" } diff --git a/app-crypt/gnupg/gnupg-1.4.10.bep b/app-crypt/gnupg/gnupg-1.4.10.recipe similarity index 95% rename from app-crypt/gnupg/gnupg-1.4.10.bep rename to app-crypt/gnupg/gnupg-1.4.10.recipe index 8ec90e2c8..04e8e6e99 100644 --- a/app-crypt/gnupg/gnupg-1.4.10.bep +++ b/app-crypt/gnupg/gnupg-1.4.10.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="dcf7ed712997888d616e029637bfc303" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gnupg-1.4.10 libtoolize --force --copy --install autoconf @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gnupg-1.4.10 make install } diff --git a/app-crypt/gnupg/gnupg-1.4.11.bep b/app-crypt/gnupg/gnupg-1.4.11.recipe similarity index 95% rename from app-crypt/gnupg/gnupg-1.4.11.bep rename to app-crypt/gnupg/gnupg-1.4.11.recipe index 9e6bf53b1..0f1c2ffd5 100644 --- a/app-crypt/gnupg/gnupg-1.4.11.bep +++ b/app-crypt/gnupg/gnupg-1.4.11.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="411744e1ef8ce90b87938c4203f001f1" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gnupg-1.4.11 libtoolize --force --copy --install autoconf @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gnupg-1.4.11 make install } diff --git a/app-doc/doxygen/doxygen-1.6.1.bep b/app-doc/doxygen/doxygen-1.6.1.recipe similarity index 96% rename from app-doc/doxygen/doxygen-1.6.1.bep rename to app-doc/doxygen/doxygen-1.6.1.recipe index 85346e8d9..94f3c58ae 100644 --- a/app-doc/doxygen/doxygen-1.6.1.bep +++ b/app-doc/doxygen/doxygen-1.6.1.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="2ec343643e134f0d3ce2069420bcb4f0" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd doxygen-1.6.1 ./configure --prefix /boot/common make } -INSTALL { +INSTALL() +{ cd doxygen-1.6.1 make install } diff --git a/app-doc/doxygen/doxygen-1.6.2.bep b/app-doc/doxygen/doxygen-1.6.2.recipe similarity index 96% rename from app-doc/doxygen/doxygen-1.6.2.bep rename to app-doc/doxygen/doxygen-1.6.2.recipe index 39efbbab9..88d2e032d 100644 --- a/app-doc/doxygen/doxygen-1.6.2.bep +++ b/app-doc/doxygen/doxygen-1.6.2.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="70260101ef60952cb99484700241c99e" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd doxygen-1.6.2 ./configure --prefix /boot/common make } -INSTALL { +INSTALL() +{ cd doxygen-1.6.2 make install } diff --git a/app-doc/doxygen/doxygen-1.6.3.bep b/app-doc/doxygen/doxygen-1.6.3.recipe similarity index 96% rename from app-doc/doxygen/doxygen-1.6.3.bep rename to app-doc/doxygen/doxygen-1.6.3.recipe index 946585e34..3711e6e59 100644 --- a/app-doc/doxygen/doxygen-1.6.3.bep +++ b/app-doc/doxygen/doxygen-1.6.3.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd doxygen-1.6.3 sed -i 's/MAN1DIR = man\/man1/MAN1DIR = documentation\/man\/man1/' Makefile.in ./configure --prefix `finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd doxygen-1.6.3 make install } diff --git a/app-doc/doxygen/doxygen-1.7.4.bep b/app-doc/doxygen/doxygen-1.7.4.recipe similarity index 96% rename from app-doc/doxygen/doxygen-1.7.4.bep rename to app-doc/doxygen/doxygen-1.7.4.recipe index 1f00fc066..f1597e8ea 100644 --- a/app-doc/doxygen/doxygen-1.7.4.bep +++ b/app-doc/doxygen/doxygen-1.7.4.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="ff908759ff7cd9464424b04ae6c68e48" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd doxygen-1.7.4 sed -i 's/MAN1DIR = man\/man1/MAN1DIR = documentation\/man\/man1/' Makefile.in ./configure --prefix `finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd doxygen-1.7.4 make install } diff --git a/app-editors/jed/jed-0.99-19.bep b/app-editors/jed/jed-0.99-19.recipe similarity index 96% rename from app-editors/jed/jed-0.99-19.bep rename to app-editors/jed/jed-0.99-19.recipe index 28e7ed07f..405e19c38 100644 --- a/app-editors/jed/jed-0.99-19.bep +++ b/app-editors/jed/jed-0.99-19.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="ncurses >= 5.7 slang >= 2.2.2" CHECKSUM_MD5="c9b2f58a3defc6f61faa1ce7d6d629ea" -BUILD { +BUILD() +{ cd jed-0.99-19 cd autoconf cp /boot/common/share/libtool/config/config.guess . @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jed-0.99-19 touch src/objs/xjed make install DESTDIR=${DESTDIR} diff --git a/app-editors/joe/joe-3.8-hg.bep b/app-editors/joe/joe-3.8-hg.recipe similarity index 96% rename from app-editors/joe/joe-3.8-hg.bep rename to app-editors/joe/joe-3.8-hg.recipe index c187bada5..a1954b5f8 100644 --- a/app-editors/joe/joe-3.8-hg.bep +++ b/app-editors/joe/joe-3.8-hg.recipe @@ -5,7 +5,8 @@ REVISION="2" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="66de1b073e869ba12abbfcde3885c577" -BUILD { +BUILD() +{ cd joe-3.8-hg autojoe COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd joe-3.8-hg make install } diff --git a/app-editors/nano/nano-2.2.3.bep b/app-editors/nano/nano-2.2.3.recipe similarity index 95% rename from app-editors/nano/nano-2.2.3.bep rename to app-editors/nano/nano-2.2.3.recipe index 77247c1bf..4bc904ada 100644 --- a/app-editors/nano/nano-2.2.3.bep +++ b/app-editors/nano/nano-2.2.3.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/ncurses >= 5.6" CHECKSUM_MD5="91918a484f54f94fedaebe00dc393a50" -BUILD { +BUILD() +{ cd nano-2.2.3 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd nano-2.2.3 make install } diff --git a/app-editors/nano/nano-2.2.5.bep b/app-editors/nano/nano-2.2.5.recipe similarity index 95% rename from app-editors/nano/nano-2.2.5.bep rename to app-editors/nano/nano-2.2.5.recipe index 216e4fc4f..ce7a97840 100644 --- a/app-editors/nano/nano-2.2.5.bep +++ b/app-editors/nano/nano-2.2.5.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/ncurses >= 5.6" CHECKSUM_MD5="77a10a49589f975ce98350a4527a2ebf" -BUILD { +BUILD() +{ cd nano-2.2.5 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd nano-2.2.5 make install } diff --git a/app-editors/nano/nano-2.2.6.bep b/app-editors/nano/nano-2.2.6.recipe similarity index 96% rename from app-editors/nano/nano-2.2.6.bep rename to app-editors/nano/nano-2.2.6.recipe index 074d13d35..9abbc2515 100644 --- a/app-editors/nano/nano-2.2.6.bep +++ b/app-editors/nano/nano-2.2.6.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="sys-libs/ncurses >= 5.6 sys-apps/groff >= 1.20.1" CHECKSUM_MD5="03233ae480689a008eb98feb1b599807" -BUILD { +BUILD() +{ cd nano-2.2.6 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd nano-2.2.6 make install } diff --git a/app-editors/nano/nano-2.3.1.bep b/app-editors/nano/nano-2.3.1.recipe similarity index 96% rename from app-editors/nano/nano-2.3.1.bep rename to app-editors/nano/nano-2.3.1.recipe index 572854138..f44f95d4b 100644 --- a/app-editors/nano/nano-2.3.1.bep +++ b/app-editors/nano/nano-2.3.1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/ncurses >= 5.6 sys-apps/groff >= 1.20.1" -BUILD { +BUILD() +{ cd nano-2.3.1 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd nano-2.3.1 make install } diff --git a/app-editors/ne/ne-2.1.bep b/app-editors/ne/ne-2.1.recipe similarity index 95% rename from app-editors/ne/ne-2.1.bep rename to app-editors/ne/ne-2.1.recipe index 474e9206a..1c7dd6bbc 100644 --- a/app-editors/ne/ne-2.1.bep +++ b/app-editors/ne/ne-2.1.recipe @@ -4,12 +4,14 @@ SRC_URI="http://ne.dsi.unimi.it/ne-2.1.tar.gz" REVISION="1" STATUS_HAIKU="stable" CHECKSUM_MD5="9f76652f6349721cfe0e8dc2aec9c767" -BUILD { +BUILD() +{ cd ne-2.1 make PREFIX=`finddir B_COMMON_DIRECTORY` NE_ANSI=1 haiku } -INSTALL { +INSTALL() +{ cd ne-2.1 make PREFIX=`finddir B_COMMON_DIRECTORY` haiku } diff --git a/app-editors/qemacs/qemacs-0.3.2dev-cvs.bep b/app-editors/qemacs/qemacs-0.3.2dev-cvs.recipe similarity index 95% rename from app-editors/qemacs/qemacs-0.3.2dev-cvs.bep rename to app-editors/qemacs/qemacs-0.3.2dev-cvs.recipe index 61a3b25fb..1d224709c 100644 --- a/app-editors/qemacs/qemacs-0.3.2dev-cvs.bep +++ b/app-editors/qemacs/qemacs-0.3.2dev-cvs.recipe @@ -5,13 +5,15 @@ SRC_URI="cvs://:pserver:anonymous@cvs.savannah.nongnu.org:/sources/qemacs/qemacs REVISION="1" STATUS_HAIKU="broken" DEPEND="app-text/texi2html >= 1.82" -BUILD { +BUILD() +{ cd qemacs-0.3.2dev-cvs ./configure make } -INSTALL { +INSTALL() +{ cd qemacs-0.3.2dev-cvs make install } diff --git a/app-editors/qemacs/qemacs-0.3.3.bep b/app-editors/qemacs/qemacs-0.3.3.recipe similarity index 95% rename from app-editors/qemacs/qemacs-0.3.3.bep rename to app-editors/qemacs/qemacs-0.3.3.recipe index 6f08ac38a..250da5505 100644 --- a/app-editors/qemacs/qemacs-0.3.3.bep +++ b/app-editors/qemacs/qemacs-0.3.3.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="42fe8cc431bb9cbbeb898a2c18335990" REVISION="1" STATUS_HAIKU="broken" DEPEND="app-text/texi2html >= 1.82" -BUILD { +BUILD() +{ cd qemacs-0.3.3 ./configure make } -INSTALL { +INSTALL() +{ cd qemacs-0.3.3 make install } diff --git a/app-editors/se/se-3.0.bep b/app-editors/se/se-3.0.recipe similarity index 96% rename from app-editors/se/se-3.0.bep rename to app-editors/se/se-3.0.recipe index fbb4eef2a..397b8aefe 100644 --- a/app-editors/se/se-3.0.bep +++ b/app-editors/se/se-3.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/ncurses >= 5.6" -BUILD { +BUILD() +{ cd se-3.0 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd se-3.0 make install } diff --git a/app-editors/vim/vim-7.2.bep b/app-editors/vim/vim-7.2.recipe similarity index 94% rename from app-editors/vim/vim-7.2.bep rename to app-editors/vim/vim-7.2.recipe index 7b6d90625..8d7496e91 100644 --- a/app-editors/vim/vim-7.2.bep +++ b/app-editors/vim/vim-7.2.recipe @@ -5,7 +5,8 @@ REVISION="1" CHECKSUM_MD5="c368894a65c09605517fd56ced57fb12" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd vim72 cd src make autoconf @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd vim72 make install } diff --git a/app-editors/vim/vim-7.3.bep b/app-editors/vim/vim-7.3.recipe similarity index 94% rename from app-editors/vim/vim-7.3.bep rename to app-editors/vim/vim-7.3.recipe index 52c00432d..d4a2297e0 100644 --- a/app-editors/vim/vim-7.3.bep +++ b/app-editors/vim/vim-7.3.recipe @@ -5,7 +5,8 @@ REVISION="1" CHECKSUM_MD5="5b9510a17074e2b37d8bb38ae09edbf2" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd vim73 cd src make autoconf @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd vim73 make install } diff --git a/app-emulation/aranym/aranym-0.9.11-cvs.bep b/app-emulation/aranym/aranym-0.9.11-cvs.recipe similarity index 96% rename from app-emulation/aranym/aranym-0.9.11-cvs.bep rename to app-emulation/aranym/aranym-0.9.11-cvs.recipe index d5866162a..b1900a133 100644 --- a/app-emulation/aranym/aranym-0.9.11-cvs.bep +++ b/app-emulation/aranym/aranym-0.9.11-cvs.recipe @@ -7,14 +7,16 @@ DEPEND="dev-libs/libcdio >= 0.82 media-libs/libsdl >= 1.2.10" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd aranym ./autogen.sh --help >/dev/null ./configure --prefix=/boot/apps/ARAnyM make } -INSTALL { +INSTALL() +{ cd aranym make install } diff --git a/app-emulation/libdsk/libdsk-1.3.3.bep b/app-emulation/libdsk/libdsk-1.3.3.recipe similarity index 96% rename from app-emulation/libdsk/libdsk-1.3.3.bep rename to app-emulation/libdsk/libdsk-1.3.3.recipe index b9217604b..7ff988b9b 100644 --- a/app-emulation/libdsk/libdsk-1.3.3.bep +++ b/app-emulation/libdsk/libdsk-1.3.3.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="untested" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd libdsk-1.3.3 # Need to update the libtools in the package to build shared libraries libtoolize @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdsk-1.3.3 make install } diff --git a/app-emulation/mednafen/mednafen-0.9.26.bep b/app-emulation/mednafen/mednafen-0.9.26.recipe similarity index 95% rename from app-emulation/mednafen/mednafen-0.9.26.bep rename to app-emulation/mednafen/mednafen-0.9.26.recipe index a273028a5..9e33fb29e 100644 --- a/app-emulation/mednafen/mednafen-0.9.26.bep +++ b/app-emulation/mednafen/mednafen-0.9.26.recipe @@ -9,18 +9,21 @@ DEPEND="media-libs/libsdl >= 1.2.15, dev-libs/libcdio >= 0.82, media-libs/libsndfile >= 1.0.21" -BUILD { +BUILD() +{ cd mednafen ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd mednafen make install } -TEST { +TEST() +{ cd mednafen make check } diff --git a/app-emulation/oricutron/oricutron-0.9-svn.bep b/app-emulation/oricutron/oricutron-0.9-svn.recipe similarity index 94% rename from app-emulation/oricutron/oricutron-0.9-svn.bep rename to app-emulation/oricutron/oricutron-0.9-svn.recipe index 702d1bf26..ca7088f5b 100644 --- a/app-emulation/oricutron/oricutron-0.9-svn.bep +++ b/app-emulation/oricutron/oricutron-0.9-svn.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="untested" DEPEND="media-libs/libsdl >= 1.2.10" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd trunk make } -INSTALL { +INSTALL() +{ cd trunk make install } diff --git a/app-emulation/pearpc/pearpc-0.5.0-cvs.bep b/app-emulation/pearpc/pearpc-0.5.0-cvs.recipe similarity index 95% rename from app-emulation/pearpc/pearpc-0.5.0-cvs.bep rename to app-emulation/pearpc/pearpc-0.5.0-cvs.recipe index e8b8f682f..f742be56e 100644 --- a/app-emulation/pearpc/pearpc-0.5.0-cvs.bep +++ b/app-emulation/pearpc/pearpc-0.5.0-cvs.recipe @@ -6,14 +6,16 @@ STATUS_HAIKU="untested" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd pearpc-0.5.0-cvs ./autogen.sh >/dev/null ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd pearpc-0.5.0-cvs make install } diff --git a/app-emulation/qemu/qemu-0.12.4.bep b/app-emulation/qemu/qemu-0.12.4.recipe similarity index 95% rename from app-emulation/qemu/qemu-0.12.4.bep rename to app-emulation/qemu/qemu-0.12.4.recipe index e97a8f4f4..7e97ecfc0 100644 --- a/app-emulation/qemu/qemu-0.12.4.bep +++ b/app-emulation/qemu/qemu-0.12.4.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="93e6b134dff89b2799f57b7d9e0e0fc5" -BUILD { +BUILD() +{ cd qemu-0.12.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd qemu-0.12.4 make install } diff --git a/app-i18n/anthy/anthy-9100.bep b/app-i18n/anthy/anthy-9100.recipe similarity index 96% rename from app-i18n/anthy/anthy-9100.bep rename to app-i18n/anthy/anthy-9100.recipe index 58d79885e..8d3365daa 100644 --- a/app-i18n/anthy/anthy-9100.bep +++ b/app-i18n/anthy/anthy-9100.recipe @@ -4,7 +4,8 @@ SRC_URI="http://sourceforge.jp/frs/redir.php?m=keihanna&f=%2Fanthy%2F37536%2Fant REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd anthy-9100h libtoolize --force --copy --install aclocal @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd anthy-9100h make install } diff --git a/app-misc/colordiff/colordiff-1.0.10.bep b/app-misc/colordiff/colordiff-1.0.10.recipe similarity index 96% rename from app-misc/colordiff/colordiff-1.0.10.bep rename to app-misc/colordiff/colordiff-1.0.10.recipe index 1f73f2885..8f8393bc7 100644 --- a/app-misc/colordiff/colordiff-1.0.10.bep +++ b/app-misc/colordiff/colordiff-1.0.10.recipe @@ -6,12 +6,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/perl >= 5.10.1 sys-apps/diffutils >= 2.8.1" -BUILD { +BUILD() +{ # Nothing to see here cd colordiff-1.0.10 } -INSTALL { +INSTALL() +{ cd colordiff-1.0.10 make INSTALL_DIR="$(finddir B_COMMON_BIN_DIRECTORY)" \ MAN_DIR="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1" \ diff --git a/app-misc/figlet/figlet-222.bep b/app-misc/figlet/figlet-222.recipe similarity index 97% rename from app-misc/figlet/figlet-222.bep rename to app-misc/figlet/figlet-222.recipe index 93ba4a04b..b889537e4 100644 --- a/app-misc/figlet/figlet-222.bep +++ b/app-misc/figlet/figlet-222.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="5f84ad52d092d5db4ad5916df767646b" -BUILD { +BUILD() +{ cd figlet222 make } -INSTALL { +INSTALL() +{ cd figlet222 DISTRODIR=${DESTDIR} MANDIR=${DISTRODIR}/`finddir B_APPS_DIRECTORY`/figlet/share/man diff --git a/app-misc/getopt/getopt-1.1.4.bep b/app-misc/getopt/getopt-1.1.4.recipe similarity index 95% rename from app-misc/getopt/getopt-1.1.4.bep rename to app-misc/getopt/getopt-1.1.4.recipe index 2ae2b7510..28028bab7 100644 --- a/app-misc/getopt/getopt-1.1.4.bep +++ b/app-misc/getopt/getopt-1.1.4.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="02188ca68da27c4175d6e9f3da732101" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd getopt-1.1.4 make } -INSTALL { +INSTALL() +{ cd getopt-1.1.4 make install prefix=`finddir B_COMMON_DIRECTORY` DESTDIR="${DESTDIR}" } diff --git a/app-office/abiword/abiword-2.8.6.bep b/app-office/abiword/abiword-2.8.6.recipe similarity index 94% rename from app-office/abiword/abiword-2.8.6.bep rename to app-office/abiword/abiword-2.8.6.recipe index a973c4127..21de67380 100644 --- a/app-office/abiword/abiword-2.8.6.bep +++ b/app-office/abiword/abiword-2.8.6.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="broken" DEPEND="media-libs/jpeg >= 6b media-libs/libpng >= 1.2" CHECKSUM_MD5="f883b0a7f26229a9c66fd6a1a94381aa" -BUILD { +BUILD() +{ cd abiword-2.8.6 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd abiword-2.8.6 make install } -TEST { +TEST() +{ cd abiword-2.8.6 # make test # make check diff --git a/app-shells/bash/bash-4.1.bep b/app-shells/bash/bash-4.1.recipe similarity index 95% rename from app-shells/bash/bash-4.1.bep rename to app-shells/bash/bash-4.1.recipe index 8d09bbf5d..9bd5889c1 100644 --- a/app-shells/bash/bash-4.1.bep +++ b/app-shells/bash/bash-4.1.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="9800d8724815fd84994d9be65ab5e7b8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bash-4.1 ./configure make } -INSTALL { +INSTALL() +{ cd bash-4.1 make install DESTDIR=${DESTDIR} } diff --git a/app-shells/fish/fish-1.23.1-git.bep b/app-shells/fish/fish-1.23.1-git.recipe similarity index 95% rename from app-shells/fish/fish-1.23.1-git.bep rename to app-shells/fish/fish-1.23.1-git.recipe index db9e1bea1..d79dff6f6 100644 --- a/app-shells/fish/fish-1.23.1-git.bep +++ b/app-shells/fish/fish-1.23.1-git.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="untested" DEPEND="app-doc/doxygen >= 1.7.4 sys-libs/ncurses >= 5.9" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd fish-1.23.1-git libtoolize --force --copy --install autoconf @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd fish-1.23.1-git make install DESTDIR=${DESTDIR} } -TEST { +TEST() +{ cd fish-1.23.1-git make test } diff --git a/app-shells/zsh/zsh-4.3.10.bep b/app-shells/zsh/zsh-4.3.10.recipe similarity index 96% rename from app-shells/zsh/zsh-4.3.10.bep rename to app-shells/zsh/zsh-4.3.10.recipe index dda63358d..8fc1a7402 100644 --- a/app-shells/zsh/zsh-4.3.10.bep +++ b/app-shells/zsh/zsh-4.3.10.recipe @@ -5,14 +5,16 @@ REVISION="1" CHECKSUM_MD5="74c5b275544400082a1cde806c98682a" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd zsh-4.3.10 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd zsh-4.3.10 make install } diff --git a/app-shells/zsh/zsh-5.0.0.bep b/app-shells/zsh/zsh-5.0.0.recipe similarity index 97% rename from app-shells/zsh/zsh-5.0.0.bep rename to app-shells/zsh/zsh-5.0.0.recipe index 107a8d4ed..55e8661bd 100644 --- a/app-shells/zsh/zsh-5.0.0.bep +++ b/app-shells/zsh/zsh-5.0.0.recipe @@ -5,7 +5,8 @@ REVISION="1" CHECKSUM_MD5="e8484468925cec8d9a84b8b04797e764" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd zsh-5.0.0 autoconf COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd zsh-5.0.0 make install } diff --git a/app-text/antiword/antiword-0.37.bep b/app-text/antiword/antiword-0.37.recipe similarity index 95% rename from app-text/antiword/antiword-0.37.bep rename to app-text/antiword/antiword-0.37.recipe index 1f1fe561e..7d9e8bf75 100644 --- a/app-text/antiword/antiword-0.37.bep +++ b/app-text/antiword/antiword-0.37.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="f868e2a269edcbc06bf77e89a55898d1" -BUILD { +BUILD() +{ cd antiword-0.37 make --makefile Makefile.haiku } -INSTALL { +INSTALL() +{ cd antiword-0.37 make --makefile Makefile.haiku global_install } diff --git a/app-text/aspell/aspell-0.60.6.bep b/app-text/aspell/aspell-0.60.6.recipe similarity index 95% rename from app-text/aspell/aspell-0.60.6.bep rename to app-text/aspell/aspell-0.60.6.recipe index 04b35f516..b6c56f112 100644 --- a/app-text/aspell/aspell-0.60.6.bep +++ b/app-text/aspell/aspell-0.60.6.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="bc80f0198773d5c05086522be67334eb" -BUILD { +BUILD() +{ cd aspell-0.60.6 libtoolize --force --copy --install aclocal -I m4 @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd aspell-0.60.6 make install } diff --git a/app-text/convmv/convmv-1.15.bep b/app-text/convmv/convmv-1.15.recipe similarity index 95% rename from app-text/convmv/convmv-1.15.bep rename to app-text/convmv/convmv-1.15.recipe index 8846ecc96..2f318f0d0 100644 --- a/app-text/convmv/convmv-1.15.bep +++ b/app-text/convmv/convmv-1.15.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/perl >= 5.8" CHECKSUM_MD5="b1bb703c08c6355868d15890ff193f7d" -BUILD { +BUILD() +{ cd convmv-1.15 sed -i "s#/usr/bin/perl#`finddir B_COMMON_BIN_DIRECTORY`/perl#" convmv make \ @@ -13,14 +14,16 @@ BUILD { MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man } -INSTALL { +INSTALL() +{ cd convmv-1.15 make install \ PREFIX=`finddir B_COMMON_DIRECTORY` \ MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man } -TEST { +TEST() +{ cd convmv-1.15 make test } diff --git a/app-text/discount/discount-2.1.3.bep b/app-text/discount/discount-2.1.3.recipe similarity index 96% rename from app-text/discount/discount-2.1.3.bep rename to app-text/discount/discount-2.1.3.recipe index 0dbba6cc7..0671c341d 100644 --- a/app-text/discount/discount-2.1.3.bep +++ b/app-text/discount/discount-2.1.3.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="a1a4eade44f8141e38f2be7f2ed56c98" -BUILD { +BUILD() +{ cd discount-2.1.3 ./configure.sh --prefix=$(finddir B_COMMON_DIRECTORY) \ --mandir=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man \ @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd discount-2.1.3 make install.everything } diff --git a/app-text/dos2unix/dos2unix-1.0.bep b/app-text/dos2unix/dos2unix-1.0.recipe similarity index 96% rename from app-text/dos2unix/dos2unix-1.0.bep rename to app-text/dos2unix/dos2unix-1.0.recipe index 474299688..dba72d456 100644 --- a/app-text/dos2unix/dos2unix-1.0.bep +++ b/app-text/dos2unix/dos2unix-1.0.recipe @@ -4,13 +4,15 @@ SRC_URI="svn+http://ports.haiku-files.org/svn/haikuports/trunk/app-text/dos2unix REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd dos2unix-1.0 gcc -O -o dos2unix DOS2UNIX.C gcc -O -o unix2dos UNIX2DOS.C } -INSTALL { +INSTALL() +{ cd dos2unix-1.0 mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` cp dos2unix ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/dos2unix diff --git a/app-text/ebook-tools/ebook-tools-0.2.1.bep b/app-text/ebook-tools/ebook-tools-0.2.1.recipe similarity index 96% rename from app-text/ebook-tools/ebook-tools-0.2.1.bep rename to app-text/ebook-tools/ebook-tools-0.2.1.recipe index b991c058e..bf9675b0f 100644 --- a/app-text/ebook-tools/ebook-tools-0.2.1.bep +++ b/app-text/ebook-tools/ebook-tools-0.2.1.recipe @@ -7,14 +7,16 @@ STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="libzip >= 0.10" -BUILD { +BUILD() +{ cd ebook-tools-0.2.1 sed -i 's/-Wmissing-format-attribute//' CMakeLists.txt cmake . make } -INSTALL { +INSTALL() +{ cd ebook-tools-0.2.1 make install } diff --git a/app-text/enchant/enchant-1.6.0.bep b/app-text/enchant/enchant-1.6.0.recipe similarity index 97% rename from app-text/enchant/enchant-1.6.0.bep rename to app-text/enchant/enchant-1.6.0.recipe index 2a099a927..3c88d288b 100644 --- a/app-text/enchant/enchant-1.6.0.bep +++ b/app-text/enchant/enchant-1.6.0.recipe @@ -12,7 +12,8 @@ DEPEND="dev-util/pkgconfig >= 0.23 CHECKSUM_MD5="de11011aff801dc61042828041fb59c7" -BUILD { +BUILD() +{ cd enchant-1.6.0 cp /boot/common/share/libtool/config/config.* . libtoolize --force --copy @@ -23,7 +24,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd enchant-1.6.0 make install DESTDIR=${DESTDIR} } diff --git a/app-text/gocr/gocr-0.49.bep b/app-text/gocr/gocr-0.49.recipe similarity index 96% rename from app-text/gocr/gocr-0.49.bep rename to app-text/gocr/gocr-0.49.recipe index cd25998ec..5b1361012 100644 --- a/app-text/gocr/gocr-0.49.bep +++ b/app-text/gocr/gocr-0.49.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="4e527bc4bdd97c2be15fdd818857507f" -BUILD { +BUILD() +{ cd gocr-0.49 libtoolize --force --copy --install aclocal @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gocr-0.49 make install DESTDIR=${DESTDIR} } diff --git a/app-text/gpp/gpp-2.4.bep b/app-text/gpp/gpp-2.4.recipe similarity index 97% rename from app-text/gpp/gpp-2.4.bep rename to app-text/gpp/gpp-2.4.recipe index 24a5a82b8..0aa221569 100644 --- a/app-text/gpp/gpp-2.4.bep +++ b/app-text/gpp/gpp-2.4.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="f04c2a23312ab3d0c462c7972d1c6aa6" -BUILD { +BUILD() +{ cd gpp-2.24 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gpp-2.24 make install } diff --git a/app-text/htmldoc/htmldoc-1.8.27.bep b/app-text/htmldoc/htmldoc-1.8.27.recipe similarity index 96% rename from app-text/htmldoc/htmldoc-1.8.27.bep rename to app-text/htmldoc/htmldoc-1.8.27.recipe index 617dbd975..0cfc5a444 100644 --- a/app-text/htmldoc/htmldoc-1.8.27.bep +++ b/app-text/htmldoc/htmldoc-1.8.27.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="cb45c2823e282e3cd0cc05172e305072" -BUILD { +BUILD() +{ cd htmldoc-1.8.27 autoconf chmod 755 configure @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd htmldoc-1.8.27 make install } -TEST { +TEST() +{ cd htmldoc-1.8.27 # make test # make check diff --git a/app-text/htmltidy/htmltidy-20092812.bep b/app-text/htmltidy/htmltidy-20092812.recipe similarity index 95% rename from app-text/htmltidy/htmltidy-20092812.bep rename to app-text/htmltidy/htmltidy-20092812.recipe index 567430299..8a584fc01 100644 --- a/app-text/htmltidy/htmltidy-20092812.bep +++ b/app-text/htmltidy/htmltidy-20092812.recipe @@ -6,11 +6,13 @@ STATUS_HAIKU="stable" DEPEND="" LICENSE="MIT" COPYRIGHT="1998-2008 World Wide Web Consortium" -BUILD { +BUILD() +{ cd htmltidy-20092812/build/gmake make } -INSTALL { +INSTALL() +{ cd htmltidy-20092812/build/gmake make installexes installhdrs installib } diff --git a/app-text/hunspell/hunspell-1.3.2.bep b/app-text/hunspell/hunspell-1.3.2.recipe similarity index 97% rename from app-text/hunspell/hunspell-1.3.2.bep rename to app-text/hunspell/hunspell-1.3.2.recipe index 39cc9e780..a4e26881a 100644 --- a/app-text/hunspell/hunspell-1.3.2.bep +++ b/app-text/hunspell/hunspell-1.3.2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="3121aaf3e13e5d88dfff13fb4a5f1ab8" -BUILD { +BUILD() +{ cd hunspell-1.3.2 libtoolize --force --copy --install aclocal -I m4 @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd hunspell-1.3.2 make install } diff --git a/app-text/libpaper/libpaper-1.1.23.bep b/app-text/libpaper/libpaper-1.1.23.recipe similarity index 96% rename from app-text/libpaper/libpaper-1.1.23.bep rename to app-text/libpaper/libpaper-1.1.23.recipe index b26f9c558..34eeaa7a3 100644 --- a/app-text/libpaper/libpaper-1.1.23.bep +++ b/app-text/libpaper/libpaper-1.1.23.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="30e58b56c0b891b89e7d8c287be368b8" -BUILD { +BUILD() +{ cd libpaper-1.1.23+nmu2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpaper-1.1.23+nmu2 make install } diff --git a/app-text/libpaper/libpaper-1.1.24.bep b/app-text/libpaper/libpaper-1.1.24.recipe similarity index 97% rename from app-text/libpaper/libpaper-1.1.24.bep rename to app-text/libpaper/libpaper-1.1.24.recipe index fd1521d8f..86c0d3792 100644 --- a/app-text/libpaper/libpaper-1.1.24.bep +++ b/app-text/libpaper/libpaper-1.1.24.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="5bc87d494ba470aba54f6d2d51471834" -BUILD { +BUILD() +{ cd libpaper-1.1.24 mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac @@ -22,7 +23,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpaper-1.1.24 make install diff --git a/app-text/libwpd/libwpd-0.9.6.bep b/app-text/libwpd/libwpd-0.9.6.recipe similarity index 96% rename from app-text/libwpd/libwpd-0.9.6.bep rename to app-text/libwpd/libwpd-0.9.6.recipe index bc7a7bfbb..9f95286e3 100644 --- a/app-text/libwpd/libwpd-0.9.6.bep +++ b/app-text/libwpd/libwpd-0.9.6.recipe @@ -6,7 +6,8 @@ CHECKSUM_MD5="979fc276bcecb1f3220b529ffa68d52c" REVISION="1" DEPEND="glib >= 2.0.0 libgsf >= 1.6.0" -BUILD { +BUILD() +{ cd libwpd-0.9.6 libtoolize --force --copy --install aclocal @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libwpd-0.9.6 make install } diff --git a/app-text/libwpg/libwpg-0.2.1.bep b/app-text/libwpg/libwpg-0.2.1.recipe similarity index 96% rename from app-text/libwpg/libwpg-0.2.1.bep rename to app-text/libwpg/libwpg-0.2.1.recipe index 972a5f7c4..7ff6df5ed 100644 --- a/app-text/libwpg/libwpg-0.2.1.bep +++ b/app-text/libwpg/libwpg-0.2.1.recipe @@ -6,7 +6,8 @@ CHECKSUM_MD5="7f292980b5c458a58bf89ebba1ed07b6" REVISION="1" DEPEND="pkg-config >= 0.2 libwpd >= 0.8" -BUILD { +BUILD() +{ cd libwpg-0.2.1 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libwpg-0.2.1 make install } diff --git a/app-text/psiconv/psiconv-0.9.8.bep b/app-text/psiconv/psiconv-0.9.8.recipe similarity index 95% rename from app-text/psiconv/psiconv-0.9.8.bep rename to app-text/psiconv/psiconv-0.9.8.recipe index 349302576..02fe07f4a 100644 --- a/app-text/psiconv/psiconv-0.9.8.bep +++ b/app-text/psiconv/psiconv-0.9.8.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8d7548e3c6b9cd408544736133728acd" -BUILD { +BUILD() +{ cd psiconv-0.9.8 libtoolize --force --copy --install aclocal @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd psiconv-0.9.8 make install } diff --git a/app-text/rman/rman-3.2.bep b/app-text/rman/rman-3.2.recipe similarity index 97% rename from app-text/rman/rman-3.2.bep rename to app-text/rman/rman-3.2.recipe index 5111df686..abbe39f1c 100644 --- a/app-text/rman/rman-3.2.bep +++ b/app-text/rman/rman-3.2.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6d1d67641c6d042595a96a62340d3cc6" -BUILD { +BUILD() +{ cd rman-3.2 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` make BINDIR=$COMMON_BIN MANDIR=$COMMON_DOCS/man } -INSTALL { +INSTALL() +{ cd rman-3.2 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` diff --git a/app-text/sablotron/sablotron-1.0.3.bep b/app-text/sablotron/sablotron-1.0.3.recipe similarity index 96% rename from app-text/sablotron/sablotron-1.0.3.bep rename to app-text/sablotron/sablotron-1.0.3.recipe index bac92023e..b13e7d4bc 100644 --- a/app-text/sablotron/sablotron-1.0.3.bep +++ b/app-text/sablotron/sablotron-1.0.3.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="72654c4b832e7562f8240ea675577f5e" -BUILD { +BUILD() +{ cd Sablot-1.0.3 touch NEWS touch AUTHORS @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd Sablot-1.0.3 make install } diff --git a/app-text/tesseract/tesseract-3.x-svn.bep b/app-text/tesseract/tesseract-3.x-svn.recipe similarity index 94% rename from app-text/tesseract/tesseract-3.x-svn.bep rename to app-text/tesseract/tesseract-3.x-svn.recipe index 3b0cade1c..de89df11c 100644 --- a/app-text/tesseract/tesseract-3.x-svn.bep +++ b/app-text/tesseract/tesseract-3.x-svn.recipe @@ -5,19 +5,22 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" #CHECKSUM_MD5="cc812a261088ea0c3d2da735be35d09f" -BUILD { +BUILD() +{ cd tesseract-3.x-svn ./runautoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd tesseract-3.x-svn make install } -TEST { +TEST() +{ cd tesseract-ocr-3.x # make test # make check diff --git a/app-text/texi2html/texi2html-1.82.bep b/app-text/texi2html/texi2html-1.82.recipe similarity index 94% rename from app-text/texi2html/texi2html-1.82.bep rename to app-text/texi2html/texi2html-1.82.recipe index 4fa7ae502..3aea7ad1f 100644 --- a/app-text/texi2html/texi2html-1.82.bep +++ b/app-text/texi2html/texi2html-1.82.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="a8a9193c0ac1bec2f3ca7be40a5a82eb" -BUILD { +BUILD() +{ cd texi2html-1.82 libtoolize --force --copy --install ./autogen.sh @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd texi2html-1.82 make install } -TEST { +TEST() +{ cd texi2html-1.82 make check } diff --git a/app-text/tree/tree-1.6.0.bep b/app-text/tree/tree-1.6.0.recipe similarity index 94% rename from app-text/tree/tree-1.6.0.bep rename to app-text/tree/tree-1.6.0.recipe index fc016e3c0..b21079d37 100644 --- a/app-text/tree/tree-1.6.0.bep +++ b/app-text/tree/tree-1.6.0.recipe @@ -5,19 +5,22 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="04e967a3f4108d50cde3b4b0e89e970a" -BUILD { +BUILD() +{ cd tree-1.6.0 make } -INSTALL { +INSTALL() +{ cd tree-1.6.0 make install \ BINDIR=${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` \ MANDIR=${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man } -TEST { +TEST() +{ # none } diff --git a/dev-cpp/eigen/eigen-3.1.2.bep b/dev-cpp/eigen/eigen-3.1.2.recipe similarity index 94% rename from dev-cpp/eigen/eigen-3.1.2.bep rename to dev-cpp/eigen/eigen-3.1.2.recipe index 3f4bab9a0..7b554d33e 100644 --- a/dev-cpp/eigen/eigen-3.1.2.bep +++ b/dev-cpp/eigen/eigen-3.1.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e9c081360dde5e7dcb8eba3c8430fde2" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd eigen-eigen-5097c01bcdc4 mkdir build cd build @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd eigen-eigen-5097c01bcdc4/build make install } -TEST { +TEST() +{ cd eigen-eigen-5097c01bcdc4/build make check } diff --git a/dev-cpp/glog/glog-0.3.3.bep b/dev-cpp/glog/glog-0.3.3.recipe similarity index 97% rename from dev-cpp/glog/glog-0.3.3.bep rename to dev-cpp/glog/glog-0.3.3.recipe index 381e22ec0..48d065e92 100644 --- a/dev-cpp/glog/glog-0.3.3.bep +++ b/dev-cpp/glog/glog-0.3.3.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd glog-0.3.3 sed -i 's/docdir = $(prefix)\/share/docdir = \/boot\/common\/documentation/g' Makefile.am libtoolize --force --copy --install @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd glog-0.3.3 make install } diff --git a/dev-cpp/mm-common/mm-common-0.9.2.bep b/dev-cpp/mm-common/mm-common-0.9.2.recipe similarity index 95% rename from dev-cpp/mm-common/mm-common-0.9.2.bep rename to dev-cpp/mm-common/mm-common-0.9.2.recipe index de0845cf9..1c88a8a8f 100644 --- a/dev-cpp/mm-common/mm-common-0.9.2.bep +++ b/dev-cpp/mm-common/mm-common-0.9.2.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="87dedc889b8d642b616813f23ed8c9f9" -BUILD { +BUILD() +{ cd mm-common-0.9.2 autoreconf --force --install --verbose ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd mm-common-0.9.2 make install } diff --git a/dev-cpp/mxml/mxml-2.6.bep b/dev-cpp/mxml/mxml-2.6.recipe similarity index 96% rename from dev-cpp/mxml/mxml-2.6.bep rename to dev-cpp/mxml/mxml-2.6.recipe index eef7b918a..9370a586d 100644 --- a/dev-cpp/mxml/mxml-2.6.bep +++ b/dev-cpp/mxml/mxml-2.6.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="68977789ae64985dddbd1a1a1652642e" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd mxml-2.6 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared make } -INSTALL { +INSTALL() +{ cd mxml-2.6 make install } diff --git a/dev-db/mysql/mysql-5.0.83.bep b/dev-db/mysql/mysql-5.0.83.recipe similarity index 96% rename from dev-db/mysql/mysql-5.0.83.bep rename to dev-db/mysql/mysql-5.0.83.recipe index 85a0b2dac..628e61b55 100644 --- a/dev-db/mysql/mysql-5.0.83.bep +++ b/dev-db/mysql/mysql-5.0.83.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="untested" DEPEND="sys-libs/readline >= 5.2" -BUILD { +BUILD() +{ cd mysql-5.0.83 libtoolize --force --install --copy aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd mysql-5.0.83 make install } diff --git a/dev-db/postgresql/postgresql-9.0.4.bep b/dev-db/postgresql/postgresql-9.0.4.recipe similarity index 95% rename from dev-db/postgresql/postgresql-9.0.4.bep rename to dev-db/postgresql/postgresql-9.0.4.recipe index dc88cb0b8..baf721faa 100644 --- a/dev-db/postgresql/postgresql-9.0.4.bep +++ b/dev-db/postgresql/postgresql-9.0.4.recipe @@ -5,18 +5,21 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-libs/libedit >= 20100424" CHECKSUM_MD5="80390514d568a7af5ab61db1cda27e29" -BUILD { +BUILD() +{ cd postgresql-9.0.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-template=haiku make } -INSTALL { +INSTALL() +{ cd postgresql-9.0.4 make install } -TEST { +TEST() +{ cd postgresql-9.0.4 # make test # make check diff --git a/dev-db/postgresql/postgresql-9.2.3.bep b/dev-db/postgresql/postgresql-9.2.3.recipe similarity index 95% rename from dev-db/postgresql/postgresql-9.2.3.bep rename to dev-db/postgresql/postgresql-9.2.3.recipe index 6f12c132d..61dfce44c 100644 --- a/dev-db/postgresql/postgresql-9.2.3.bep +++ b/dev-db/postgresql/postgresql-9.2.3.recipe @@ -5,18 +5,21 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-libs/libedit >= 20100424" CHECKSUM_MD5="59f42a93695b0186ed5eb03c2653a7d4" -BUILD { +BUILD() +{ cd postgresql-9.2.3 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-template=haiku make } -INSTALL { +INSTALL() +{ cd postgresql-9.2.3 make install } -TEST { +TEST() +{ cd postgresql-9.2.3 # make test # make check diff --git a/dev-db/redis/redis-2.2.11.bep b/dev-db/redis/redis-2.2.11.recipe similarity index 96% rename from dev-db/redis/redis-2.2.11.bep rename to dev-db/redis/redis-2.2.11.recipe index 86f637606..65e74444d 100644 --- a/dev-db/redis/redis-2.2.11.bep +++ b/dev-db/redis/redis-2.2.11.recipe @@ -6,12 +6,14 @@ DEPEND="" CHECKSUM_MD5= "5501c90ca02ae7ea93c34f067b3e0619" STATUS_HAIKU="broken" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd redis-2.2.11 make PREFIX=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd redis-2.2.11 make install PREFIX=`finddir B_COMMON_DIRECTORY` } diff --git a/dev-db/redis/redis-2.9.0-git.bep b/dev-db/redis/redis-2.9.0-git.recipe similarity index 96% rename from dev-db/redis/redis-2.9.0-git.bep rename to dev-db/redis/redis-2.9.0-git.recipe index c4b1ac78a..e6d5a43be 100644 --- a/dev-db/redis/redis-2.9.0-git.bep +++ b/dev-db/redis/redis-2.9.0-git.recipe @@ -6,12 +6,14 @@ DEPEND="" STATUS_HAIKU="stable" # CHECKSUM_MD5= "5501c90ca02ae7ea93c34f067b3e0619" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd redis-2.9.0-git make PREFIX=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd redis-2.9.0-git make install PREFIX=`finddir B_COMMON_DIRECTORY` } diff --git a/dev-db/sqlite/sqlite-3.6.22.bep b/dev-db/sqlite/sqlite-3.6.22.recipe similarity index 96% rename from dev-db/sqlite/sqlite-3.6.22.bep rename to dev-db/sqlite/sqlite-3.6.22.recipe index 5095f9226..5d8723bac 100644 --- a/dev-db/sqlite/sqlite-3.6.22.bep +++ b/dev-db/sqlite/sqlite-3.6.22.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="b683b3903e79ab8a6d928dc9d4a56937" -BUILD { +BUILD() +{ cd sqlite-3.6.22 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sqlite-3.6.22 make install } diff --git a/dev-db/sqlite/sqlite-3.6.23.bep b/dev-db/sqlite/sqlite-3.6.23.recipe similarity index 96% rename from dev-db/sqlite/sqlite-3.6.23.bep rename to dev-db/sqlite/sqlite-3.6.23.recipe index 407412de8..ba681fb39 100644 --- a/dev-db/sqlite/sqlite-3.6.23.bep +++ b/dev-db/sqlite/sqlite-3.6.23.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8f1e86b3909a27f8122b0981afd16fcd" -BUILD { +BUILD() +{ cd sqlite-3.6.23 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sqlite-3.6.23 make install } diff --git a/dev-db/sqlite/sqlite-3.7.13.bep b/dev-db/sqlite/sqlite-3.7.13.recipe similarity index 96% rename from dev-db/sqlite/sqlite-3.7.13.bep rename to dev-db/sqlite/sqlite-3.7.13.recipe index f7a717d95..8ce7af2d0 100644 --- a/dev-db/sqlite/sqlite-3.7.13.bep +++ b/dev-db/sqlite/sqlite-3.7.13.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="c97df403e8a3d5b67bb408fcd6aabd8e" -BUILD { +BUILD() +{ cd sqlite-autoconf-3071300 libtoolize --force --copy --install aclocal @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sqlite-autoconf-3071300 make install } diff --git a/dev-db/sqlite/sqlite-3.7.15.1.bep b/dev-db/sqlite/sqlite-3.7.15.1.recipe similarity index 97% rename from dev-db/sqlite/sqlite-3.7.15.1.bep rename to dev-db/sqlite/sqlite-3.7.15.1.recipe index b8c740e4f..5d30c8b64 100644 --- a/dev-db/sqlite/sqlite-3.7.15.1.bep +++ b/dev-db/sqlite/sqlite-3.7.15.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="a67c25afa199a11f0a37aff7ed9d2c14" -BUILD { +BUILD() +{ cd sqlite-autoconf-3071501 libtoolize --force --copy --install aclocal @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sqlite-autoconf-3071501 make install } diff --git a/dev-db/sqlite/sqlite-3.7.2.bep b/dev-db/sqlite/sqlite-3.7.2.recipe similarity index 96% rename from dev-db/sqlite/sqlite-3.7.2.bep rename to dev-db/sqlite/sqlite-3.7.2.recipe index 9741f2403..482c5f9bb 100644 --- a/dev-db/sqlite/sqlite-3.7.2.bep +++ b/dev-db/sqlite/sqlite-3.7.2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="bd9586208f48ba840467bcfd066a6fa9" -BUILD { +BUILD() +{ cd sqlite-3.7.2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sqlite-3.7.2 make install } diff --git a/dev-db/sqlite/sqlite-3.7.3.bep b/dev-db/sqlite/sqlite-3.7.3.recipe similarity index 96% rename from dev-db/sqlite/sqlite-3.7.3.bep rename to dev-db/sqlite/sqlite-3.7.3.recipe index 77252fc92..6e459ad97 100644 --- a/dev-db/sqlite/sqlite-3.7.3.bep +++ b/dev-db/sqlite/sqlite-3.7.3.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="74fe78b264f1c434c4b159d45b78e9b7" -BUILD { +BUILD() +{ cd sqlite-3.7.3 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sqlite-3.7.3 make install } diff --git a/dev-db/sqlite/sqlite-3.7.4.bep b/dev-db/sqlite/sqlite-3.7.4.recipe similarity index 96% rename from dev-db/sqlite/sqlite-3.7.4.bep rename to dev-db/sqlite/sqlite-3.7.4.recipe index 81686d062..490127749 100644 --- a/dev-db/sqlite/sqlite-3.7.4.bep +++ b/dev-db/sqlite/sqlite-3.7.4.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8f0c690bfb33c3cbbc2471c3d9ba0158" -BUILD { +BUILD() +{ cd sqlite-autoconf-3070400 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sqlite-autoconf-3070400 make install } diff --git a/dev-db/sqlite/sqlite-3.7.5.bep b/dev-db/sqlite/sqlite-3.7.5.recipe similarity index 97% rename from dev-db/sqlite/sqlite-3.7.5.bep rename to dev-db/sqlite/sqlite-3.7.5.recipe index 6cc0b64c7..ba99e8c15 100644 --- a/dev-db/sqlite/sqlite-3.7.5.bep +++ b/dev-db/sqlite/sqlite-3.7.5.recipe @@ -22,7 +22,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" SOURCE_DIR="sqlite-autoconf-3070500" -BUILD { +BUILD() +{ libtoolize --force --copy --install aclocal autoconf @@ -31,7 +32,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ make install } diff --git a/dev-db/sqlite/sqlite-3.7.6.2.bep b/dev-db/sqlite/sqlite-3.7.6.2.recipe similarity index 96% rename from dev-db/sqlite/sqlite-3.7.6.2.bep rename to dev-db/sqlite/sqlite-3.7.6.2.recipe index 55cf7dd3c..24337da57 100644 --- a/dev-db/sqlite/sqlite-3.7.6.2.bep +++ b/dev-db/sqlite/sqlite-3.7.6.2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="f16c08617968b4087b3d591fd575f59f" -BUILD { +BUILD() +{ cd sqlite-autoconf-3070602 libtoolize --force --copy --install aclocal @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sqlite-autoconf-3070602 make install } diff --git a/dev-db/sqlite/sqlite-3.7.7.1.bep b/dev-db/sqlite/sqlite-3.7.7.1.recipe similarity index 96% rename from dev-db/sqlite/sqlite-3.7.7.1.bep rename to dev-db/sqlite/sqlite-3.7.7.1.recipe index a46b764d7..a5cfdc082 100644 --- a/dev-db/sqlite/sqlite-3.7.7.1.bep +++ b/dev-db/sqlite/sqlite-3.7.7.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="554026fe7fac47b1cf61c18d5fe43419" -BUILD { +BUILD() +{ cd sqlite-autoconf-3070701 libtoolize --force --copy --install aclocal @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sqlite-autoconf-3070701 make install } diff --git a/dev-dotnet/pnet/pnet-0.8.0.bep b/dev-dotnet/pnet/pnet-0.8.0.recipe similarity index 95% rename from dev-dotnet/pnet/pnet-0.8.0.bep rename to dev-dotnet/pnet/pnet-0.8.0.recipe index 1c6acc7d7..0f5f62432 100644 --- a/dev-dotnet/pnet/pnet-0.8.0.bep +++ b/dev-dotnet/pnet/pnet-0.8.0.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-util/treecc" CHECKSUM_MD5="84cb3612d7175bd9e476c88e66fe19f9" -BUILD { +BUILD() +{ cd pnet-0.8.0 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pnet-0.8.0 make install } diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2012.10.bep b/dev-embedded/u-boot-tools/u-boot-tools-2012.10.recipe similarity index 95% rename from dev-embedded/u-boot-tools/u-boot-tools-2012.10.bep rename to dev-embedded/u-boot-tools/u-boot-tools-2012.10.recipe index 5f038a90f..ef0172941 100644 --- a/dev-embedded/u-boot-tools/u-boot-tools-2012.10.bep +++ b/dev-embedded/u-boot-tools/u-boot-tools-2012.10.recipe @@ -4,13 +4,15 @@ SRC_URI="http://ftp.denx.de/pub/u-boot/u-boot-2012.10.tar.bz2" REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd u-boot-2012.10 mv include/image.h include/uimage.h make tools } -INSTALL { +INSTALL() +{ cd u-boot-2012.10 cp -r /tools/mkimage /boot/common/bin/ cp -r /tools/mkenvimage /boot/common/bin/ diff --git a/dev-games/box2d/box2d-2.1.2.bep b/dev-games/box2d/box2d-2.1.2.recipe similarity index 95% rename from dev-games/box2d/box2d-2.1.2.bep rename to dev-games/box2d/box2d-2.1.2.recipe index 19d75a42e..3740e7c64 100644 --- a/dev-games/box2d/box2d-2.1.2.bep +++ b/dev-games/box2d/box2d-2.1.2.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="59d142cd8d4d73e8832c7b67591f590c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd Box2D_v2.1.2/Box2D cmake . -DOPENGL_INCLUDE_DIR:=/boot/develop/headers/os/opengl/GL \ -DHAIKU:=TRUE make } -INSTALL { +INSTALL() +{ cd Box2D_v2.1.2/Box2D make install } diff --git a/dev-games/flatzebra/flatzebra-0.1.3.bep b/dev-games/flatzebra/flatzebra-0.1.3.recipe similarity index 96% rename from dev-games/flatzebra/flatzebra-0.1.3.bep rename to dev-games/flatzebra/flatzebra-0.1.3.recipe index d65b12935..807077409 100644 --- a/dev-games/flatzebra/flatzebra-0.1.3.bep +++ b/dev-games/flatzebra/flatzebra-0.1.3.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2.4 media-libs/libsdl_image >= 1.2.2 media-libs/libsdl_mixer >= 1.2.4" -BUILD { +BUILD() +{ cd flatzebra-0.1.3 libtoolize --force --copy --install aclocal -I macros @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd flatzebra-0.1.3 make install } diff --git a/dev-games/libggz/libggz-0.99.5.bep b/dev-games/libggz/libggz-0.99.5.recipe similarity index 96% rename from dev-games/libggz/libggz-0.99.5.bep rename to dev-games/libggz/libggz-0.99.5.recipe index 894a5bb2f..bd526ab24 100644 --- a/dev-games/libggz/libggz-0.99.5.bep +++ b/dev-games/libggz/libggz-0.99.5.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-util/pkgconfig >= 0.23" -BUILD { +BUILD() +{ cd ggz-base-libs-snapshot-0.99.5 libtoolize -fci aclocal -I m4 -I m4/ggz @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ggz-base-libs-snapshot-0.99.5 make install } diff --git a/dev-games/ode/ode-0.12.bep b/dev-games/ode/ode-0.12.recipe similarity index 96% rename from dev-games/ode/ode-0.12.bep rename to dev-games/ode/ode-0.12.recipe index b6209a625..06df78601 100644 --- a/dev-games/ode/ode-0.12.bep +++ b/dev-games/ode/ode-0.12.recipe @@ -6,12 +6,14 @@ COPYRIGHT="2001-2004 Russell L. Smith" LICENSE="GNU LGPL v3 BSD (3-clause)" CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599" -BUILD { +BUILD() +{ cd ode-0.12 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd ode-0.12 make install } diff --git a/dev-games/physfs/physfs-2.0.1.bep b/dev-games/physfs/physfs-2.0.1.recipe similarity index 97% rename from dev-games/physfs/physfs-2.0.1.bep rename to dev-games/physfs/physfs-2.0.1.recipe index dfc030b5a..6ca2c54d8 100644 --- a/dev-games/physfs/physfs-2.0.1.bep +++ b/dev-games/physfs/physfs-2.0.1.recipe @@ -7,13 +7,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0 dev-util/mercurial >= 1.4" -BUILD { +BUILD() +{ cd physfs-2.0.1 cmake . -DLIBRARY_OUTPUT_PATH:=`finddir B_COMMON_LIB_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd physfs-2.0.1 make install if [ -n "$(setgcc | grep '4')" ]; then diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98.bep b/dev-java/gnu-classpath/gnu-classpath-0.98.recipe similarity index 97% rename from dev-java/gnu-classpath/gnu-classpath-0.98.bep rename to dev-java/gnu-classpath/gnu-classpath-0.98.recipe index 5c3ae52ea..56d07ee1d 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.98.bep +++ b/dev-java/gnu-classpath/gnu-classpath-0.98.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="90c6571b8b0309e372faa0f9f6255ea9" -BUILD { +BUILD() +{ cd classpath-0.98 libtoolize --force --copy --install aclocal -I m4 @@ -23,12 +24,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd classpath-0.98 make install } -TEST { +TEST() +{ cd classpath-0.98 # make test # make check diff --git a/dev-java/jamvm/jamvm-1.5.4.bep b/dev-java/jamvm/jamvm-1.5.4.recipe similarity index 96% rename from dev-java/jamvm/jamvm-1.5.4.bep rename to dev-java/jamvm/jamvm-1.5.4.recipe index 056ddf8a3..771a21d35 100644 --- a/dev-java/jamvm/jamvm-1.5.4.bep +++ b/dev-java/jamvm/jamvm-1.5.4.recipe @@ -7,7 +7,8 @@ DEPEND="" CHECKSUM_MD5="7654e9657691f5f09c4f481ed4686176" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd jamvm-1.5.4 libtoolize --force --copy --install aclocal @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jamvm-1.5.4 make install } diff --git a/dev-lang/camlp5/camlp5-6.06.bep b/dev-lang/camlp5/camlp5-6.06.recipe similarity index 97% rename from dev-lang/camlp5/camlp5-6.06.bep rename to dev-lang/camlp5/camlp5-6.06.recipe index ec5a58d26..088012815 100644 --- a/dev-lang/camlp5/camlp5-6.06.bep +++ b/dev-lang/camlp5/camlp5-6.06.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8de69094d73d24768844a5017a2bd04b" REVISION="1" STATUS_HAIKU="untested" DEPEND="ocaml" -BUILD { +BUILD() +{ cd camlp5-6.06 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --strict --prefix `finddir B_COMMON_DIRECTORY` \ @@ -13,7 +14,8 @@ BUILD { make world.opt } -INSTALL { +INSTALL() +{ cd camlp5-6.06 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` make install PREFIX=${DESTDIR}`finddir B_COMMON_DIRECTORY` \ diff --git a/dev-lang/dmd-bin/dmd-bin-1.064.bep b/dev-lang/dmd-bin/dmd-bin-1.064.recipe similarity index 96% rename from dev-lang/dmd-bin/dmd-bin-1.064.bep rename to dev-lang/dmd-bin/dmd-bin-1.064.recipe index f24e02ef8..7a024771d 100644 --- a/dev-lang/dmd-bin/dmd-bin-1.064.bep +++ b/dev-lang/dmd-bin/dmd-bin-1.064.recipe @@ -6,13 +6,15 @@ CHECKSUM_MD5="3d73758a7006397c2e66021532e2ff73" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ./dmd/src/dmd make -f haiku.mak strip dmd } -INSTALL { +INSTALL() +{ mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` cp dmd/src/dmd/dmd ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/dmd diff --git a/dev-lang/erlang/erlang-R14B.bep b/dev-lang/erlang/erlang-R14B.recipe similarity index 99% rename from dev-lang/erlang/erlang-R14B.bep rename to dev-lang/erlang/erlang-R14B.recipe index ac71683aa..0865f3e9c 100644 --- a/dev-lang/erlang/erlang-R14B.bep +++ b/dev-lang/erlang/erlang-R14B.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="5292a04556d17ad528d570e02357dfbb" -BUILD { +BUILD() +{ cd otp_src_R14B mkdir -p m4 echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.in" @@ -50,7 +51,8 @@ BUILD { make -s } -INSTALL { +INSTALL() +{ cd otp_src_R14B make -s install } diff --git a/dev-lang/fpc/fpc-2.4.0.bep b/dev-lang/fpc/fpc-2.4.0.recipe similarity index 93% rename from dev-lang/fpc/fpc-2.4.0.bep rename to dev-lang/fpc/fpc-2.4.0.recipe index 87b1b7a36..ec36300e6 100644 --- a/dev-lang/fpc/fpc-2.4.0.bep +++ b/dev-lang/fpc/fpc-2.4.0.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd fpc-2.4.0 make } -INSTALL { +INSTALL() +{ cd fpc-2.4.0 make install diff --git a/dev-lang/fpc/fpc-2.6.0.bep b/dev-lang/fpc/fpc-2.6.0.recipe similarity index 97% rename from dev-lang/fpc/fpc-2.6.0.bep rename to dev-lang/fpc/fpc-2.6.0.recipe index 6ef4f70bc..137083d32 100644 --- a/dev-lang/fpc/fpc-2.6.0.bep +++ b/dev-lang/fpc/fpc-2.6.0.recipe @@ -14,12 +14,14 @@ REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-lang/fpc" -BUILD { +BUILD() +{ cd fpc-2.6.0 make build } -INSTALL { +INSTALL() +{ cd fpc-2.6.0 make install INSTALL_PREFIX=${DESTDIR}`finddir B_USER_CONFIG_DIRECTORY` \ FPCDIR=${DESTDIR}`finddir B_USER_LIB_DIRECTORY`/fpc/2.6.0 @@ -28,7 +30,8 @@ INSTALL { ${DESTDIR}`finddir B_USER_CONFIG_DIRECTORY`/bin } -TEST { +TEST() +{ cd fpc-2.6.0/tests make full TEST_FPC=${DESTDIR}`finddir B_USER_CONFIG_DIRECTORY`/bin/fpc } diff --git a/dev-lang/lua/lua-5.1.4.bep b/dev-lang/lua/lua-5.1.4-3.recipe similarity index 96% rename from dev-lang/lua/lua-5.1.4.bep rename to dev-lang/lua/lua-5.1.4-3.recipe index 525e47545..1ac5dddbe 100644 --- a/dev-lang/lua/lua-5.1.4.bep +++ b/dev-lang/lua/lua-5.1.4-3.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150" REVISION="3" STATUS_HAIKU="stable" DEPEND="pkgconfig >= 0.25" -BUILD { +BUILD() +{ cd lua-5.1.4 make haiku } -INSTALL { +INSTALL() +{ cd lua-5.1.4 make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \ INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man" diff --git a/dev-lang/lua/lua-5.1.4-3.bep b/dev-lang/lua/lua-5.1.4.recipe similarity index 96% rename from dev-lang/lua/lua-5.1.4-3.bep rename to dev-lang/lua/lua-5.1.4.recipe index 525e47545..1ac5dddbe 100644 --- a/dev-lang/lua/lua-5.1.4-3.bep +++ b/dev-lang/lua/lua-5.1.4.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150" REVISION="3" STATUS_HAIKU="stable" DEPEND="pkgconfig >= 0.25" -BUILD { +BUILD() +{ cd lua-5.1.4 make haiku } -INSTALL { +INSTALL() +{ cd lua-5.1.4 make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \ INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man" diff --git a/dev-lang/lua/lua-5.2.1.bep b/dev-lang/lua/lua-5.2.1.recipe similarity index 95% rename from dev-lang/lua/lua-5.2.1.bep rename to dev-lang/lua/lua-5.2.1.recipe index 6e4dd9fcf..e2c970227 100644 --- a/dev-lang/lua/lua-5.2.1.bep +++ b/dev-lang/lua/lua-5.2.1.recipe @@ -4,12 +4,14 @@ SRC_URI="http://www.lua.org/ftp/lua-5.2.1.tar.gz" CHECKSUM_MD5="ae08f641b45d737d12d30291a5e5f6e3" REVISION="3" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd lua-5.2.1 make haiku } -INSTALL { +INSTALL() +{ cd lua-5.2.1 make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \ INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man" diff --git a/dev-lang/nasm/nasm-2.08.01.bep b/dev-lang/nasm/nasm-2.08.01.recipe similarity index 95% rename from dev-lang/nasm/nasm-2.08.01.bep rename to dev-lang/nasm/nasm-2.08.01.recipe index f1c59328d..b4264decb 100644 --- a/dev-lang/nasm/nasm-2.08.01.bep +++ b/dev-lang/nasm/nasm-2.08.01.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="1e3ebc1289c2be5963571c0937b7a211" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd nasm-2.08.01 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd nasm-2.08.01 make install INSTALLROOT=${DESTDIR} } diff --git a/dev-lang/ocaml/ocaml-4.00.0.bep b/dev-lang/ocaml/ocaml-4.00.0.recipe similarity index 97% rename from dev-lang/ocaml/ocaml-4.00.0.bep rename to dev-lang/ocaml/ocaml-4.00.0.recipe index 5e462e5d4..98e48d772 100644 --- a/dev-lang/ocaml/ocaml-4.00.0.bep +++ b/dev-lang/ocaml/ocaml-4.00.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="fa11560a45793bd9fa45c1295a6f4a91" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd ocaml-4.00.0 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix `finddir B_COMMON_DIRECTORY` \ @@ -13,7 +14,8 @@ BUILD { make world.opt } -INSTALL { +INSTALL() +{ cd ocaml-4.00.0 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` make install PREFIX=${DESTDIR}`finddir B_COMMON_DIRECTORY` \ diff --git a/dev-lang/openjdk/openjdk-1.7.bep b/dev-lang/openjdk/openjdk-1.7.recipe similarity index 98% rename from dev-lang/openjdk/openjdk-1.7.bep rename to dev-lang/openjdk/openjdk-1.7.recipe index da068202f..7ce9e461c 100644 --- a/dev-lang/openjdk/openjdk-1.7.bep +++ b/dev-lang/openjdk/openjdk-1.7.recipe @@ -8,7 +8,8 @@ DEPEND="app-arch/cpio >= 2.10 CHECKSUM_MD5="28b8630373769e1e897a75bf81f2e1eb" -BUILD { +BUILD() +{ OPENJDK_DIR=`haikuporter -t`/dev-lang/openjdk/work # Get and build Apache Ant. @@ -86,12 +87,14 @@ BUILD { # fi } -INSTALL { +INSTALL() +{ export DESTDIR=`finddir B_COMMON_DIRECTORY` cp -r -f -v output ${DESTDIR}/jdk } -TEST { +TEST() +{ echo "OpenJDK tests are not yet ported to Haiku." } diff --git a/dev-lang/orc/orc-0.4.16.bep b/dev-lang/orc/orc-0.4.16.recipe similarity index 96% rename from dev-lang/orc/orc-0.4.16.bep rename to dev-lang/orc/orc-0.4.16.recipe index d86af92c5..e7fa5a9b5 100644 --- a/dev-lang/orc/orc-0.4.16.bep +++ b/dev-lang/orc/orc-0.4.16.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e482932e544c847761449b106ecbc483" -BUILD { +BUILD() +{ cd orc-0.4.16 autoconf COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd orc-0.4.16 make install } diff --git a/dev-lang/perl/perl-5.10.1.bep b/dev-lang/perl/perl-5.10.1.recipe similarity index 98% rename from dev-lang/perl/perl-5.10.1.bep rename to dev-lang/perl/perl-5.10.1.recipe index 4101df1ef..6896166aa 100644 --- a/dev-lang/perl/perl-5.10.1.bep +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -17,7 +17,8 @@ CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ ./Configure \ -Dprefix=$prefix \ -Dprivlib=$prefix/lib/perl5/core_perl/$portVersion \ @@ -41,7 +42,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ perlArch=BePC-haiku make install cd "$binDir" diff --git a/dev-lang/php/php-5.3.4.bep b/dev-lang/php/php-5.3.4.recipe similarity index 95% rename from dev-lang/php/php-5.3.4.bep rename to dev-lang/php/php-5.3.4.recipe index f2331a1d4..794224740 100644 --- a/dev-lang/php/php-5.3.4.bep +++ b/dev-lang/php/php-5.3.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="2c069d8f690933e3bf6a8741ed818150" REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-libs/libpcre >= 8.00" -BUILD { +BUILD() +{ cd php-5.3.4 cat $(aclocal --print-ac-dir)/libtool.m4 > build/libtool.m4 autoreconf @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd php-5.3.4 make install } diff --git a/dev-lang/php/php-5.3.5.bep b/dev-lang/php/php-5.3.5.recipe similarity index 97% rename from dev-lang/php/php-5.3.5.bep rename to dev-lang/php/php-5.3.5.recipe index e3bdf018a..03db2e432 100644 --- a/dev-lang/php/php-5.3.5.bep +++ b/dev-lang/php/php-5.3.5.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libpcre >= 8.00 " -BUILD { +BUILD() +{ cd php-5.3.5 libtoolize --force --copy --install aclocal @@ -40,12 +41,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd php-5.3.5 make install INSTALL_ROOT=${DESTDIR} } -TEST { +TEST() +{ cd php-5.3.5 make test } diff --git a/dev-lang/python/python-2.5.4.bep b/dev-lang/python/python-2.5.4.recipe similarity index 96% rename from dev-lang/python/python-2.5.4.bep rename to dev-lang/python/python-2.5.4.recipe index 90c98e358..88d459fbb 100644 --- a/dev-lang/python/python-2.5.4.bep +++ b/dev-lang/python/python-2.5.4.recipe @@ -7,7 +7,8 @@ CHECKSUM_MD5="ad47b23778f64edadaaa8b5534986eed" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd Python-2.5.4/Modules/_ctypes/libffi libtoolize --force --copy --install aclocal @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd Python-2.5.4 make install } diff --git a/dev-lang/python/python-2.6.4.bep b/dev-lang/python/python-2.6.4.recipe similarity index 96% rename from dev-lang/python/python-2.6.4.bep rename to dev-lang/python/python-2.6.4.recipe index b372618e3..bdb1c1e2e 100644 --- a/dev-lang/python/python-2.6.4.bep +++ b/dev-lang/python/python-2.6.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="17dcac33e4f3adb69a57c2607b6de246" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd Python-2.6.4/Modules/_ctypes/libffi libtoolize --force --copy --install cd ../../.. @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd Python-2.6.4 make install } diff --git a/dev-lang/python/python-2.6.5.bep b/dev-lang/python/python-2.6.5.recipe similarity index 97% rename from dev-lang/python/python-2.6.5.bep rename to dev-lang/python/python-2.6.5.recipe index b1b1afb6d..ee375a445 100644 --- a/dev-lang/python/python-2.6.5.bep +++ b/dev-lang/python/python-2.6.5.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="cd04b5b9383b6c1fccdaa991af762cf4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd Python-2.6.5/Modules/_ctypes/libffi libtoolize --force --copy --install cd ../../.. @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd Python-2.6.5 make install } diff --git a/dev-lang/python/python-2.6.6.bep b/dev-lang/python/python-2.6.6.recipe similarity index 96% rename from dev-lang/python/python-2.6.6.bep rename to dev-lang/python/python-2.6.6.recipe index 172740f87..cdc28008f 100644 --- a/dev-lang/python/python-2.6.6.bep +++ b/dev-lang/python/python-2.6.6.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="cf4e6881bb84a7ce6089e4a307f71f14" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/readline >= 6.0" -BUILD { +BUILD() +{ cd Python-2.6.6/Modules/_ctypes/libffi libtoolize --force --copy --install cd ../../.. @@ -20,12 +21,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd Python-2.6.6 make install } -TEST { +TEST() +{ cd Python-2.6.6 cd Lib/test rm test_asynchat.py # this one stalls, so skip it for now diff --git a/dev-lang/python/python-2.6.7.bep b/dev-lang/python/python-2.6.7.recipe similarity index 96% rename from dev-lang/python/python-2.6.7.bep rename to dev-lang/python/python-2.6.7.recipe index f4bca719a..af4de579a 100644 --- a/dev-lang/python/python-2.6.7.bep +++ b/dev-lang/python/python-2.6.7.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="d40ef58ed88438a870bbeb0ac5d4217b" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/readline >= 6.0" -BUILD { +BUILD() +{ cd Python-2.6.7/Modules/_ctypes/libffi libtoolize --force --copy --install cd ../../.. @@ -20,12 +21,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd Python-2.6.7 make install } -TEST { +TEST() +{ cd Python-2.6.7 cd Lib/test rm test_asynchat.py # this one stalls, so skip it for now diff --git a/dev-lang/python/python-2.6.8.bep b/dev-lang/python/python-2.6.8.recipe similarity index 96% rename from dev-lang/python/python-2.6.8.bep rename to dev-lang/python/python-2.6.8.recipe index 8fe22dd32..159516b43 100644 --- a/dev-lang/python/python-2.6.8.bep +++ b/dev-lang/python/python-2.6.8.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/readline >= 6.0" -BUILD { +BUILD() +{ cd Python-2.6.8/Modules/_ctypes/libffi libtoolize --force --copy --install cd ../../.. @@ -20,12 +21,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd Python-2.6.8 make install } -TEST { +TEST() +{ cd Python-2.6.8 cd Lib/test rm test_asynchat.py # this one stalls, so skip it for now diff --git a/dev-lang/python/python-2.7.1.bep b/dev-lang/python/python-2.7.1.recipe similarity index 96% rename from dev-lang/python/python-2.7.1.bep rename to dev-lang/python/python-2.7.1.recipe index 264f79473..a9294c883 100644 --- a/dev-lang/python/python-2.7.1.bep +++ b/dev-lang/python/python-2.7.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="aa27bc25725137ba155910bd8e5ddc4f" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/readline >= 6.0" -BUILD { +BUILD() +{ cd Python-2.7.1/Modules/_ctypes/libffi libtoolize --force --copy --install cd ../../.. @@ -20,12 +21,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd Python-2.7.1 make install } -TEST { +TEST() +{ cd Python-2.7.1 cd Lib/test rm test_asynchat.py # this one stalls, so skip it for now diff --git a/dev-lang/python/python-3.2.bep b/dev-lang/python/python-3.2.recipe similarity index 97% rename from dev-lang/python/python-3.2.bep rename to dev-lang/python/python-3.2.recipe index fe7bb3ef1..25d290522 100644 --- a/dev-lang/python/python-3.2.bep +++ b/dev-lang/python/python-3.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="92e94b5b6652b96349d6362b8337811d" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/readline >= 6.0" -BUILD { +BUILD() +{ cd Python-3.2/Modules/_ctypes/libffi libtoolize --force --copy --install cd ../../.. @@ -21,12 +22,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd Python-3.2 make install } -TEST { +TEST() +{ cd Python-3.2 cd Lib/test rm test_asynchat.py # this one stalls, so skip it for now diff --git a/dev-lang/rebol/rebol-2.101.0.5.75.bep b/dev-lang/rebol/rebol-2.101.0.5.75.recipe similarity index 96% rename from dev-lang/rebol/rebol-2.101.0.5.75.bep rename to dev-lang/rebol/rebol-2.101.0.5.75.recipe index 135c0d76a..5c5046485 100644 --- a/dev-lang/rebol/rebol-2.101.0.5.75.bep +++ b/dev-lang/rebol/rebol-2.101.0.5.75.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd r3-master/make wget http://metaeducation.com/media/shared/haiku/r3-make.zip unzip r3-make.zip @@ -15,13 +16,15 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd r3-master/make mkdir -p $DESTDIR`finddir B_COMMON_BIN_DIRECTORY` install -m 0755 r3 $DESTDIR`finddir B_COMMON_BIN_DIRECTORY`/rebol } -TEST { +TEST() +{ mkdir -p tests cd tests wget -N https://github.com/rebolsource/rebol-test/archive/master.zip diff --git a/dev-lang/ruby/ruby-1.9.1.bep b/dev-lang/ruby/ruby-1.9.1.recipe similarity index 96% rename from dev-lang/ruby/ruby-1.9.1.bep rename to dev-lang/ruby/ruby-1.9.1.recipe index c8f874a77..34f62b0c2 100644 --- a/dev-lang/ruby/ruby-1.9.1.bep +++ b/dev-lang/ruby/ruby-1.9.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="515bfd965814e718c0943abf3dde5494" REVISION="2" STATUS_HAIKU="stable" DEPEND="dev-libs/libedit >= 20100424" -BUILD { +BUILD() +{ cd ruby-1.9.1-p243 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ruby-1.9.1-p243 make install } diff --git a/dev-lang/swi-prolog/swi-prolog-6.0.2.bep b/dev-lang/swi-prolog/swi-prolog-6.0.2.recipe similarity index 95% rename from dev-lang/swi-prolog/swi-prolog-6.0.2.bep rename to dev-lang/swi-prolog/swi-prolog-6.0.2.recipe index 5e8b7c7e2..4ab667dac 100644 --- a/dev-lang/swi-prolog/swi-prolog-6.0.2.bep +++ b/dev-lang/swi-prolog/swi-prolog-6.0.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/gmp >= 5.0.5 sys-libs/readline >= 6.2" -BUILD { +BUILD() +{ cd pl-6.0.2/src libtoolize -fci autoreconf @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pl-6.0.2/src make install } -TEST { +TEST() +{ cd pl-6.0.2/src make check } diff --git a/dev-lang/swi-prolog/swi-prolog-6.2.0.bep b/dev-lang/swi-prolog/swi-prolog-6.2.0.recipe similarity index 95% rename from dev-lang/swi-prolog/swi-prolog-6.2.0.bep rename to dev-lang/swi-prolog/swi-prolog-6.2.0.recipe index af37884a6..d88c003b4 100644 --- a/dev-lang/swi-prolog/swi-prolog-6.2.0.bep +++ b/dev-lang/swi-prolog/swi-prolog-6.2.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/gmp >= 5.0.5 sys-libs/readline >= 6.2" -BUILD { +BUILD() +{ cd pl-6.2.0/src libtoolize -fci autoreconf @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pl-6.2.0/src make install } -TEST { +TEST() +{ cd pl-6.2.0/src make check } diff --git a/dev-lang/swig/swig-1.3.40.bep b/dev-lang/swig/swig-1.3.40.recipe similarity index 96% rename from dev-lang/swig/swig-1.3.40.bep rename to dev-lang/swig/swig-1.3.40.recipe index 2239e2fdb..072de4125 100644 --- a/dev-lang/swig/swig-1.3.40.bep +++ b/dev-lang/swig/swig-1.3.40.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="2df766c9e03e02811b1ab4bba1c7b9cc" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd swig-1.3.40 libtoolize -fci ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd swig-1.3.40 make install } diff --git a/dev-lang/swig/swig-2.0.2.bep b/dev-lang/swig/swig-2.0.2.recipe similarity index 96% rename from dev-lang/swig/swig-2.0.2.bep rename to dev-lang/swig/swig-2.0.2.recipe index df8d4a24e..18dd1aaae 100644 --- a/dev-lang/swig/swig-2.0.2.bep +++ b/dev-lang/swig/swig-2.0.2.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="eaf619a4169886923e5f828349504a29" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd swig-2.0.2 libtoolize -fci ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd swig-2.0.2 make install } diff --git a/dev-lang/tcl/tcl-8.5.9.bep b/dev-lang/tcl/tcl-8.5.9.recipe similarity index 95% rename from dev-lang/tcl/tcl-8.5.9.bep rename to dev-lang/tcl/tcl-8.5.9.recipe index a95b225d0..9e424aa9b 100644 --- a/dev-lang/tcl/tcl-8.5.9.bep +++ b/dev-lang/tcl/tcl-8.5.9.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8512d8db3233041dd68a81476906012a" -BUILD { +BUILD() +{ cd tcl8.5.9/unix autoconf -f ./configure --prefix=$(finddir B_COMMON_DIRECTORY) \ @@ -13,13 +14,15 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tcl8.5.9/unix make install ln -s tclsh8.5 "$(finddir B_COMMON_BIN_DIRECTORY)/tclsh" } -TEST { +TEST() +{ cd tcl8.5.9/unix make test } diff --git a/dev-lang/v8/v8-r13067.bep b/dev-lang/v8/v8-r13067.recipe similarity index 97% rename from dev-lang/v8/v8-r13067.bep rename to dev-lang/v8/v8-r13067.recipe index 39ac947e2..de190c951 100644 --- a/dev-lang/v8/v8-r13067.bep +++ b/dev-lang/v8/v8-r13067.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="unstable" DEPEND="" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ gyp_patch_path=$(dirname ${PWD})/patches/gyp-r1501.patch cd v8-r13067 cd build @@ -17,12 +18,14 @@ BUILD { make library=shared ia32.debug } -TEST { +TEST() +{ cd v8-r13067 make ia32.debug.check } -INSTALL { +INSTALL() +{ cd v8-r13067 includedir=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY`/v8 mkdir -p ${includedir} diff --git a/dev-lang/yasm/yasm-1.1.0.bep b/dev-lang/yasm/yasm-1.1.0.recipe similarity index 96% rename from dev-lang/yasm/yasm-1.1.0.bep rename to dev-lang/yasm/yasm-1.1.0.recipe index d808cf8c5..08112aced 100644 --- a/dev-lang/yasm/yasm-1.1.0.bep +++ b/dev-lang/yasm/yasm-1.1.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8392e5f2235c2c2a981e1a633f2698cb" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd yasm-1.1.0 libtoolize --force --copy --install COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd yasm-1.1.0 make install } diff --git a/dev-lang/yasm/yasm-1.2.0.bep b/dev-lang/yasm/yasm-1.2.0.recipe similarity index 96% rename from dev-lang/yasm/yasm-1.2.0.bep rename to dev-lang/yasm/yasm-1.2.0.recipe index 4e556013f..cf851af25 100644 --- a/dev-lang/yasm/yasm-1.2.0.bep +++ b/dev-lang/yasm/yasm-1.2.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="4cfc0686cf5350dd1305c4d905eb55a6" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd yasm-1.2.0 libtoolize --force --copy --install COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd yasm-1.2.0 make install } diff --git a/dev-libs/apr-util/apr-util-1.3.10.bep b/dev-libs/apr-util/apr-util-1.3.10.recipe similarity index 98% rename from dev-libs/apr-util/apr-util-1.3.10.bep rename to dev-libs/apr-util/apr-util-1.3.10.recipe index 810b4cb48..1ee3e329a 100644 --- a/dev-libs/apr-util/apr-util-1.3.10.bep +++ b/dev-libs/apr-util/apr-util-1.3.10.recipe @@ -26,7 +26,8 @@ SOURCE_DIR="$portVersionedName" # TODO: The hard-coded reference to the apr work directory isn't good at all. # We should declare a build dependency on the APR sources instead. -BUILD { +BUILD() +{ aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName aprInstallDir=$aprUtilPackageLinksDir/apr @@ -58,7 +59,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ make install } diff --git a/dev-libs/apr-util/apr-util-1.3.11.bep b/dev-libs/apr-util/apr-util-1.3.11.recipe similarity index 98% rename from dev-libs/apr-util/apr-util-1.3.11.bep rename to dev-libs/apr-util/apr-util-1.3.11.recipe index 0c3e85385..8427643e5 100644 --- a/dev-libs/apr-util/apr-util-1.3.11.bep +++ b/dev-libs/apr-util/apr-util-1.3.11.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="bfc16065a784785dd356dc4067fe2504" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/apr >= 1.3.9" -BUILD { +BUILD() +{ cd apr-util-1.3.11 rm -rf aclocal.m4 mkdir -p m4 @@ -40,7 +41,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd apr-util-1.3.11 make install } diff --git a/dev-libs/apr-util/apr-util-1.3.12.bep b/dev-libs/apr-util/apr-util-1.3.12.recipe similarity index 98% rename from dev-libs/apr-util/apr-util-1.3.12.bep rename to dev-libs/apr-util/apr-util-1.3.12.recipe index 893bdaeff..215237a3c 100644 --- a/dev-libs/apr-util/apr-util-1.3.12.bep +++ b/dev-libs/apr-util/apr-util-1.3.12.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="d1977289889592ef998e3f777f68efe4" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/apr >= 1.3.9" -BUILD { +BUILD() +{ cd apr-util-1.3.12 rm -rf aclocal.m4 mkdir -p m4 @@ -40,7 +41,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd apr-util-1.3.12 make install } diff --git a/dev-libs/apr-util/apr-util-1.3.9.bep b/dev-libs/apr-util/apr-util-1.3.9.recipe similarity index 98% rename from dev-libs/apr-util/apr-util-1.3.9.bep rename to dev-libs/apr-util/apr-util-1.3.9.recipe index a01e185fc..896323400 100644 --- a/dev-libs/apr-util/apr-util-1.3.9.bep +++ b/dev-libs/apr-util/apr-util-1.3.9.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="cc2ec0ba4f01d88375f1170f762518fa" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/apr >= 1.3.9" -BUILD { +BUILD() +{ cd apr-util-1.3.9 rm -rf aclocal.m4 mkdir -p m4 @@ -39,7 +40,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd apr-util-1.3.9 make install } diff --git a/dev-libs/apr-util/apr-util-1.4.1.bep b/dev-libs/apr-util/apr-util-1.4.1.recipe similarity index 98% rename from dev-libs/apr-util/apr-util-1.4.1.bep rename to dev-libs/apr-util/apr-util-1.4.1.recipe index bd3695d4c..c5878e7ef 100644 --- a/dev-libs/apr-util/apr-util-1.4.1.bep +++ b/dev-libs/apr-util/apr-util-1.4.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="666a5d56098a9debf998510e304c8095" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/apr == 1.4.6" -BUILD { +BUILD() +{ cd apr-util-1.4.1 rm -rf aclocal.m4 mkdir -p m4 @@ -40,7 +41,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd apr-util-1.4.1 make install } diff --git a/dev-libs/apr/apr-1.3.8.bep b/dev-libs/apr/apr-1.3.8.recipe similarity index 94% rename from dev-libs/apr/apr-1.3.8.bep rename to dev-libs/apr/apr-1.3.8.recipe index 4b7ee85d2..be0c3c309 100644 --- a/dev-libs/apr/apr-1.3.8.bep +++ b/dev-libs/apr/apr-1.3.8.recipe @@ -4,7 +4,8 @@ SRC_URI="http://www.apache.org/dist/apr/apr-1.3.8.tar.gz" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd apr-1.3.8 libtoolize --force --copy --install buildconf @@ -12,7 +13,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd apr-1.3.8 make install } diff --git a/dev-libs/apr/apr-1.3.9.bep b/dev-libs/apr/apr-1.3.9.recipe similarity index 95% rename from dev-libs/apr/apr-1.3.9.bep rename to dev-libs/apr/apr-1.3.9.recipe index 678bd894c..8a9b44563 100644 --- a/dev-libs/apr/apr-1.3.9.bep +++ b/dev-libs/apr/apr-1.3.9.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="85bcd8005153b8fa63b1e3f95ea31f07" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd apr-1.3.9 libtoolize --force --copy --install buildconf @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd apr-1.3.9 make install } diff --git a/dev-libs/apr/apr-1.4.2.bep b/dev-libs/apr/apr-1.4.2.recipe similarity index 96% rename from dev-libs/apr/apr-1.4.2.bep rename to dev-libs/apr/apr-1.4.2.recipe index 477d094f7..6032068bc 100644 --- a/dev-libs/apr/apr-1.4.2.bep +++ b/dev-libs/apr/apr-1.4.2.recipe @@ -20,7 +20,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ libtoolize --force --copy --install touch libtool.m4 # ./buildconf @@ -30,11 +31,13 @@ BUILD { make } -INSTALL { +INSTALL() +{ make install } -TEST { +TEST() +{ cd apr-1.4.2 make test } diff --git a/dev-libs/apr/apr-1.4.4.bep b/dev-libs/apr/apr-1.4.4.recipe similarity index 97% rename from dev-libs/apr/apr-1.4.4.bep rename to dev-libs/apr/apr-1.4.4.recipe index d4724c91e..0d3ffc1fa 100644 --- a/dev-libs/apr/apr-1.4.4.bep +++ b/dev-libs/apr/apr-1.4.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="9d70b96d4d7f7449f9c3cc81a691c5bf" REVISION="3" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd apr-1.4.4 libtoolize -fci touch libtool.m4 @@ -25,12 +26,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd apr-1.4.4 make install } -TEST { +TEST() +{ cd apr-1.4.4 make test } diff --git a/dev-libs/apr/apr-1.4.5.bep b/dev-libs/apr/apr-1.4.5.recipe similarity index 97% rename from dev-libs/apr/apr-1.4.5.bep rename to dev-libs/apr/apr-1.4.5.recipe index 6a86547d5..750e66449 100644 --- a/dev-libs/apr/apr-1.4.5.bep +++ b/dev-libs/apr/apr-1.4.5.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="97262fe54dddaf583eaaee3497a426e1" REVISION="4" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd apr-1.4.5 libtoolize -fci touch libtool.m4 @@ -25,12 +26,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd apr-1.4.5 make install } -TEST { +TEST() +{ cd apr-1.4.5 make test } diff --git a/dev-libs/apr/apr-1.4.6.bep b/dev-libs/apr/apr-1.4.6.recipe similarity index 97% rename from dev-libs/apr/apr-1.4.6.bep rename to dev-libs/apr/apr-1.4.6.recipe index 5256885db..0d6e54591 100644 --- a/dev-libs/apr/apr-1.4.6.bep +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb" REVISION="4" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd apr-1.4.6 libtoolize -fci touch libtool.m4 @@ -25,12 +26,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd apr-1.4.6 make install } -TEST { +TEST() +{ cd apr-1.4.6 make test } diff --git a/dev-libs/atk/atk-1.29.2.bep b/dev-libs/atk/atk-1.29.2.recipe similarity index 95% rename from dev-libs/atk/atk-1.29.2.bep rename to dev-libs/atk/atk-1.29.2.recipe index 5fbeadeb8..78bf73576 100644 --- a/dev-libs/atk/atk-1.29.2.bep +++ b/dev-libs/atk/atk-1.29.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="sys-devel/gettext >= 0.17 dev-libs/glib >= 2.24.0" -BUILD { +BUILD() +{ cd atk-1.29.2 libtoolize --force --copy --install aclocal @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd atk-1.29.2 make isntall } diff --git a/dev-libs/atk/atk-1.30.0.bep b/dev-libs/atk/atk-1.30.0.recipe similarity index 96% rename from dev-libs/atk/atk-1.30.0.bep rename to dev-libs/atk/atk-1.30.0.recipe index bdaa27b25..3df557196 100644 --- a/dev-libs/atk/atk-1.30.0.bep +++ b/dev-libs/atk/atk-1.30.0.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="broken" DEPEND="sys-devel/gettext >= 0.17 dev-libs/glib >= 2.24.0 dev-util/gtk-doc >= 1.15" -BUILD { +BUILD() +{ cd atk-1.30.0 libtoolize --force --copy --install aclocal @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd atk-1.30.0 make isntall } diff --git a/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep b/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.recipe similarity index 96% rename from dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep rename to dev-libs/boehm-gc/boehm-gc-7.2_alpha6.recipe index 7f20ba736..9e2ca9c29 100644 --- a/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.bep +++ b/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="319d0b18cc4eb735c8038ece9df055e4" -BUILD { +BUILD() +{ cd gc-7.2alpha6 libtoolize --force --copy --install autoconf -f @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gc-7.2alpha6 make install } -TEST { +TEST() +{ cd gc-7.2alpha6 make check } diff --git a/dev-libs/boehm-gc/boehm-gc-7.2d.bep b/dev-libs/boehm-gc/boehm-gc-7.2d.recipe similarity index 96% rename from dev-libs/boehm-gc/boehm-gc-7.2d.bep rename to dev-libs/boehm-gc/boehm-gc-7.2d.recipe index b8f67af6f..194c705cb 100644 --- a/dev-libs/boehm-gc/boehm-gc-7.2d.bep +++ b/dev-libs/boehm-gc/boehm-gc-7.2d.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="91340b28c61753a789eb6077675d87d2" -BUILD { +BUILD() +{ cd gc-7.2 libtoolize --force --copy --install autoconf -f @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gc-7.2 make install } -TEST { +TEST() +{ cd gc-7.2 make check } diff --git a/dev-libs/boost/boost-1.42.0.bep b/dev-libs/boost/boost-1.42.0.recipe similarity index 96% rename from dev-libs/boost/boost-1.42.0.bep rename to dev-libs/boost/boost-1.42.0.recipe index 9884d876b..f7789a6c3 100644 --- a/dev-libs/boost/boost-1.42.0.bep +++ b/dev-libs/boost/boost-1.42.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="broken" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd boost_1_42_0 ./bootstrap.sh --prefix=`finddir B_COMMON_DIRECTORY` ./bjam --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -18,7 +19,8 @@ BUILD { runtime-link=shared } -INSTALL { +INSTALL() +{ cd boost_1_42_0 ./bjam install } diff --git a/dev-libs/boost/boost-1.50.0.bep b/dev-libs/boost/boost-1.50.0.recipe similarity index 98% rename from dev-libs/boost/boost-1.50.0.bep rename to dev-libs/boost/boost-1.50.0.recipe index d0eef3144..590e1969e 100644 --- a/dev-libs/boost/boost-1.50.0.bep +++ b/dev-libs/boost/boost-1.50.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="boehm-gc" -BUILD { +BUILD() +{ cd boost_1_50_0 ./bootstrap.sh \ --without-icu \ @@ -34,7 +35,8 @@ BUILD { runtime-link=shared } -INSTALL { +INSTALL() +{ cd boost_1_50_0 ./bjam install \ -d2 \ diff --git a/dev-libs/boost/boost-1.53.0.bep b/dev-libs/boost/boost-1.53.0.recipe similarity index 98% rename from dev-libs/boost/boost-1.53.0.bep rename to dev-libs/boost/boost-1.53.0.recipe index 65dfda630..4b4a6adbe 100644 --- a/dev-libs/boost/boost-1.53.0.bep +++ b/dev-libs/boost/boost-1.53.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="broken" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="boehm-gc" -BUILD { +BUILD() +{ cd boost_1_53_0 ./bootstrap.sh \ --without-icu \ @@ -34,7 +35,8 @@ BUILD { runtime-link=shared } -INSTALL { +INSTALL() +{ cd boost_1_53_0 ./bjam install \ -d2 \ diff --git a/dev-libs/chmlib/chmlib-0.40.bep b/dev-libs/chmlib/chmlib-0.40.recipe similarity index 96% rename from dev-libs/chmlib/chmlib-0.40.bep rename to dev-libs/chmlib/chmlib-0.40.recipe index b072d2c84..9182b515e 100644 --- a/dev-libs/chmlib/chmlib-0.40.bep +++ b/dev-libs/chmlib/chmlib-0.40.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a20d86103b8ab369e5b93506d5ffa802" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd chmlib-0.40 rm aclocal.m4 rm acinclude.m4 @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd chmlib-0.40 make install } diff --git a/dev-libs/cyassl/cyassl-1.6.5.bep b/dev-libs/cyassl/cyassl-1.6.5.recipe similarity index 95% rename from dev-libs/cyassl/cyassl-1.6.5.bep rename to dev-libs/cyassl/cyassl-1.6.5.recipe index 67654514a..45c76da1a 100644 --- a/dev-libs/cyassl/cyassl-1.6.5.bep +++ b/dev-libs/cyassl/cyassl-1.6.5.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="98c2c6350acf1d089756a1de9ccb9903" -BUILD { +BUILD() +{ cd cyassl-1.6.5 libtoolize --force --copy --install rm acinclude.m4 @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cyassl-1.6.5 make install } -TEST { +TEST() +{ cd cyassl-1.6.5 make check cd testsuite diff --git a/dev-libs/cyassl/cyassl-1.8.0.bep b/dev-libs/cyassl/cyassl-1.8.0.recipe similarity index 95% rename from dev-libs/cyassl/cyassl-1.8.0.bep rename to dev-libs/cyassl/cyassl-1.8.0.recipe index ac5c9a2bd..c5f42dabb 100644 --- a/dev-libs/cyassl/cyassl-1.8.0.bep +++ b/dev-libs/cyassl/cyassl-1.8.0.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="app-text/dos2unix >= 1.0" CHECKSUM_MD5="d2ce70ffe04b6603eeb630258e236a58" -BUILD { +BUILD() +{ cd cyassl-1.8.0 dos2unix * dos2unix include/* @@ -22,12 +23,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cyassl-1.8.0 make install } -TEST { +TEST() +{ cd cyassl-1.8.0 make check cd testsuite diff --git a/dev-libs/cyassl/cyassl-2.0.2.bep b/dev-libs/cyassl/cyassl-2.0.2.recipe similarity index 95% rename from dev-libs/cyassl/cyassl-2.0.2.bep rename to dev-libs/cyassl/cyassl-2.0.2.recipe index 9a45cb316..ee333d453 100644 --- a/dev-libs/cyassl/cyassl-2.0.2.bep +++ b/dev-libs/cyassl/cyassl-2.0.2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="app-text/dos2unix >= 1.0" CHECKSUM_MD5="2f51752207132c161155508eeb517e38" -BUILD { +BUILD() +{ cd cyassl-2.0.2 dos2unix * dos2unix include/* @@ -20,12 +21,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cyassl-2.0.2 make install } -TEST { +TEST() +{ cd cyassl-2.0.2 make check cd testsuite diff --git a/dev-libs/cyassl/cyassl-2.5.0.bep b/dev-libs/cyassl/cyassl-2.5.0.recipe similarity index 95% rename from dev-libs/cyassl/cyassl-2.5.0.bep rename to dev-libs/cyassl/cyassl-2.5.0.recipe index cb0404bf6..890172492 100644 --- a/dev-libs/cyassl/cyassl-2.5.0.bep +++ b/dev-libs/cyassl/cyassl-2.5.0.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="app-text/dos2unix >= 1.0" CHECKSUM_MD5="8965fb76f89af827ace53e423453b7cd" -BUILD { +BUILD() +{ cd cyassl-2.5.0 dos2unix * dos2unix include/* @@ -20,12 +21,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cyassl-2.5.0 make install } -TEST { +TEST() +{ cd cyassl-2.5.0 make check cd testsuite diff --git a/dev-libs/expat/expat-2.0.1.bep b/dev-libs/expat/expat-2.0.1.recipe similarity index 97% rename from dev-libs/expat/expat-2.0.1.bep rename to dev-libs/expat/expat-2.0.1.recipe index a163d044c..a73cccda6 100644 --- a/dev-libs/expat/expat-2.0.1.bep +++ b/dev-libs/expat/expat-2.0.1.recipe @@ -19,7 +19,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ rm -f conftools/libtool.m4 echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am @@ -30,7 +31,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ make install } diff --git a/dev-libs/fribidi/fribidi-0.19.2.bep b/dev-libs/fribidi/fribidi-0.19.2.recipe similarity index 97% rename from dev-libs/fribidi/fribidi-0.19.2.bep rename to dev-libs/fribidi/fribidi-0.19.2.recipe index 2b145c184..b1ecc82ef 100644 --- a/dev-libs/fribidi/fribidi-0.19.2.bep +++ b/dev-libs/fribidi/fribidi-0.19.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="626db17d2d99b43615ad9d12500f568a" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd fribidi-0.19.2 rm -rf aclocal.m4 mkdir -p m4 @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd fribidi-0.19.2 make install } diff --git a/dev-libs/glib/glib-2.22.2.bep b/dev-libs/glib/glib-2.22.2.recipe similarity index 96% rename from dev-libs/glib/glib-2.22.2.bep rename to dev-libs/glib/glib-2.22.2.recipe index 2f27e322c..b33e97fc1 100644 --- a/dev-libs/glib/glib-2.22.2.bep +++ b/dev-libs/glib/glib-2.22.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="00eb873975e2ef9361b8177131c7c943" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd glib-2.22.2 rm -rf aclocal.m4 mkdir -p m4 @@ -22,7 +23,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd glib-2.22.2 make install } diff --git a/dev-libs/glib/glib-2.24.1.bep b/dev-libs/glib/glib-2.24.1.recipe similarity index 96% rename from dev-libs/glib/glib-2.24.1.bep rename to dev-libs/glib/glib-2.24.1.recipe index 91942f10f..0e74b1972 100644 --- a/dev-libs/glib/glib-2.24.1.bep +++ b/dev-libs/glib/glib-2.24.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e61f2e9636f9d57067c4e3a690b9911a" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd glib-2.24.1 rm -rf aclocal.m4 mkdir -p m4 @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd glib-2.24.1 make install } diff --git a/dev-libs/glib/glib-2.24.2.bep b/dev-libs/glib/glib-2.24.2.recipe similarity index 98% rename from dev-libs/glib/glib-2.24.2.bep rename to dev-libs/glib/glib-2.24.2.recipe index 4be365b05..a19d4cd8e 100644 --- a/dev-libs/glib/glib-2.24.2.bep +++ b/dev-libs/glib/glib-2.24.2.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/pkgconfig >= 0.23 sys-devel/gettext >= 0.17 dev-libs/libpcre >= 8.00" -BUILD { +BUILD() +{ cd glib-2.24.2 rm -rf aclocal.m4 mkdir -p m4 @@ -27,7 +28,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd glib-2.24.2 make install } diff --git a/dev-libs/glib/glib-2.26.1.bep b/dev-libs/glib/glib-2.26.1.recipe similarity index 97% rename from dev-libs/glib/glib-2.26.1.bep rename to dev-libs/glib/glib-2.26.1.recipe index a01e3eeec..4d44567d8 100644 --- a/dev-libs/glib/glib-2.26.1.bep +++ b/dev-libs/glib/glib-2.26.1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-libs/pkgconfig >= 0.23 sys-devel/gettext >= 0.17" -BUILD { +BUILD() +{ cd glib-2.26.1 rm -rf aclocal.m4 mkdir -p m4 @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd glib-2.26.1 make install } diff --git a/dev-libs/gmp/gmp-4.3.1.bep b/dev-libs/gmp/gmp-4.3.1.recipe similarity index 94% rename from dev-libs/gmp/gmp-4.3.1.bep rename to dev-libs/gmp/gmp-4.3.1.recipe index a79acb26d..811275dc9 100644 --- a/dev-libs/gmp/gmp-4.3.1.bep +++ b/dev-libs/gmp/gmp-4.3.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="26cec15a90885042dd4a15c4003b08ae" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gmp-4.3.1 libtoolize --force --copy --install aclocal @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gmp-4.3.1 make install } -TEST { +TEST() +{ cd gmp-4.3.1 make check } diff --git a/dev-libs/gmp/gmp-4.3.2.bep b/dev-libs/gmp/gmp-4.3.2.recipe similarity index 94% rename from dev-libs/gmp/gmp-4.3.2.bep rename to dev-libs/gmp/gmp-4.3.2.recipe index 25053b62d..f0190945d 100644 --- a/dev-libs/gmp/gmp-4.3.2.bep +++ b/dev-libs/gmp/gmp-4.3.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="dd60683d7057917e34630b4a787932e8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gmp-4.3.2 libtoolize --force --copy --install aclocal @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gmp-4.3.2 make install } -TEST { +TEST() +{ cd gmp-4.3.2 make check } diff --git a/dev-libs/gmp/gmp-5.0.1.bep b/dev-libs/gmp/gmp-5.0.1.recipe similarity index 94% rename from dev-libs/gmp/gmp-5.0.1.bep rename to dev-libs/gmp/gmp-5.0.1.recipe index 7610ec638..5b7af9fa7 100644 --- a/dev-libs/gmp/gmp-5.0.1.bep +++ b/dev-libs/gmp/gmp-5.0.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="6bac6df75c192a13419dfd71d19240a7" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gmp-5.0.1 libtoolize --force --copy --install aclocal @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gmp-5.0.1 make install } -TEST { +TEST() +{ cd gmp-5.0.1 make check } diff --git a/dev-libs/gmp/gmp-5.0.5.bep b/dev-libs/gmp/gmp-5.0.5.recipe similarity index 94% rename from dev-libs/gmp/gmp-5.0.5.bep rename to dev-libs/gmp/gmp-5.0.5.recipe index 38f2da522..b9daccb9c 100644 --- a/dev-libs/gmp/gmp-5.0.5.bep +++ b/dev-libs/gmp/gmp-5.0.5.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8aef50959acec2a1ad41d144ffe0f3b5" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gmp-5.0.5 libtoolize --force --copy --install aclocal @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gmp-5.0.5 make install } -TEST { +TEST() +{ cd gmp-5.0.5 make check } diff --git a/dev-libs/gmp/gmp-5.1.1.bep b/dev-libs/gmp/gmp-5.1.1.recipe similarity index 94% rename from dev-libs/gmp/gmp-5.1.1.bep rename to dev-libs/gmp/gmp-5.1.1.recipe index a50602270..7fc727a98 100644 --- a/dev-libs/gmp/gmp-5.1.1.bep +++ b/dev-libs/gmp/gmp-5.1.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="485b1296e6287fa381e6015b19767989" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gmp-5.1.1 libtoolize --force --copy --install aclocal @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gmp-5.1.1 make install } -TEST { +TEST() +{ cd gmp-5.1.1 make check } diff --git a/dev-libs/gnulib/gnulib-9999.bep b/dev-libs/gnulib/gnulib-9999.recipe similarity index 93% rename from dev-libs/gnulib/gnulib-9999.bep rename to dev-libs/gnulib/gnulib-9999.recipe index d3236b7ee..35cbc5db5 100644 --- a/dev-libs/gnulib/gnulib-9999.bep +++ b/dev-libs/gnulib/gnulib-9999.recipe @@ -5,15 +5,18 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ echo "gnulib isn't meant to be built." } -INSTALL { +INSTALL() +{ echo "gnulib isn't meant to be installed." } -TEST { +TEST() +{ make check } diff --git a/dev-libs/icu/icu-4.4.1.bep b/dev-libs/icu/icu-4.4.1.recipe similarity index 95% rename from dev-libs/icu/icu-4.4.1.bep rename to dev-libs/icu/icu-4.4.1.recipe index 3a3bdc891..45e38e444 100644 --- a/dev-libs/icu/icu-4.4.1.bep +++ b/dev-libs/icu/icu-4.4.1.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="b6bc0a1153540b2088f8b03e0ba625d3" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd icu/source CPPFLAGS="-D__STDC_ISO_10646__ -DU_CHARSET_IS_UTF8=1" ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd icu/source make install } diff --git a/dev-libs/icu/icu-4.8.1.bep b/dev-libs/icu/icu-4.8.1.recipe similarity index 95% rename from dev-libs/icu/icu-4.8.1.bep rename to dev-libs/icu/icu-4.8.1.recipe index 423c57d5d..d4b141419 100644 --- a/dev-libs/icu/icu-4.8.1.bep +++ b/dev-libs/icu/icu-4.8.1.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="af36f635271a239d76d038d6cf8da8df" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd icu/source ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-renaming --disable-samples --disable-extras make } -INSTALL { +INSTALL() +{ cd icu/source make install } diff --git a/dev-libs/jansson/jansson-2.4.bep b/dev-libs/jansson/jansson-2.4.recipe similarity index 94% rename from dev-libs/jansson/jansson-2.4.bep rename to dev-libs/jansson/jansson-2.4.recipe index ad46db01e..c7f74eea7 100644 --- a/dev-libs/jansson/jansson-2.4.bep +++ b/dev-libs/jansson/jansson-2.4.recipe @@ -5,18 +5,21 @@ CHECKSUM_MD5="c4629b89bf0432f3158c461e88fe0113" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd jansson-2.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd jansson-2.4 make install } -TEST { +TEST() +{ cd jansson-2.4/test run-suites } diff --git a/dev-libs/json-c/json-c-0.9.bep b/dev-libs/json-c/json-c-0.9.recipe similarity index 95% rename from dev-libs/json-c/json-c-0.9.bep rename to dev-libs/json-c/json-c-0.9.recipe index 2672551fb..bc916a517 100644 --- a/dev-libs/json-c/json-c-0.9.bep +++ b/dev-libs/json-c/json-c-0.9.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="3a13d264528dcbaf3931b0cede24abae" -BUILD { +BUILD() +{ cd json-c-0.9 libtoolize --force --install --copy aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd json-c-0.9 make install DESTDIR=${DESTDIR} } diff --git a/dev-libs/libattica/libattica-0.4.1.bep b/dev-libs/libattica/libattica-0.4.1.recipe similarity index 94% rename from dev-libs/libattica/libattica-0.4.1.bep rename to dev-libs/libattica/libattica-0.4.1.recipe index 7652478be..881958ff4 100644 --- a/dev-libs/libattica/libattica-0.4.1.bep +++ b/dev-libs/libattica/libattica-0.4.1.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="b90983ec5d79e5ddcbc9146fa23cab72" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd attica-0.4.1 cmake CMakeLists.txt make } -INSTALL { +INSTALL() +{ cd attica-0.4.1 make install } diff --git a/dev-libs/libcdio/libcdio-0.82.bep b/dev-libs/libcdio/libcdio-0.82.recipe similarity index 96% rename from dev-libs/libcdio/libcdio-0.82.bep rename to dev-libs/libcdio/libcdio-0.82.recipe index 1fb34ef75..cef7033b6 100644 --- a/dev-libs/libcdio/libcdio-0.82.bep +++ b/dev-libs/libcdio/libcdio-0.82.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libiconv >= 1.12" CHECKSUM_MD5="1c29b18e01ab2b966162bc727bf3c360" -BUILD { +BUILD() +{ cd libcdio-0.82 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libcdio-0.82 make install } diff --git a/dev-libs/libcdio/libcdio-0.83.bep b/dev-libs/libcdio/libcdio-0.83.recipe similarity index 96% rename from dev-libs/libcdio/libcdio-0.83.bep rename to dev-libs/libcdio/libcdio-0.83.recipe index 9c49fbacf..8de9b8fe9 100644 --- a/dev-libs/libcdio/libcdio-0.83.bep +++ b/dev-libs/libcdio/libcdio-0.83.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libiconv >= 1.12" CHECKSUM_MD5="b9e0f1bccb142e697cd834fe56b6e6fb" -BUILD { +BUILD() +{ cd libcdio-0.83 libtoolize --force --copy --install aclocal -I m4 @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libcdio-0.83 make install } diff --git a/dev-libs/libcdio/libcdio-0.90.bep b/dev-libs/libcdio/libcdio-0.90.recipe similarity index 96% rename from dev-libs/libcdio/libcdio-0.90.bep rename to dev-libs/libcdio/libcdio-0.90.recipe index ccb9b0931..21184f10c 100644 --- a/dev-libs/libcdio/libcdio-0.90.bep +++ b/dev-libs/libcdio/libcdio-0.90.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/libiconv >= 1.12 dev-util/pkgconfig" CHECKSUM_MD5="1b245b023fb03a58d030fd2800db3247" -BUILD { +BUILD() +{ cd libcdio-0.90 libtoolize --force --copy --install aclocal -I m4 @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libcdio-0.90 make install } diff --git a/dev-libs/libcss/libcss-0.1.2.bep b/dev-libs/libcss/libcss-0.1.2.recipe similarity index 95% rename from dev-libs/libcss/libcss-0.1.2.bep rename to dev-libs/libcss/libcss-0.1.2.recipe index 8a6a7596a..110740f12 100644 --- a/dev-libs/libcss/libcss-0.1.2.bep +++ b/dev-libs/libcss/libcss-0.1.2.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libparserutils >= 0.1.1" -BUILD { +BUILD() +{ cd libcss-0.1.2 make } -INSTALL { +INSTALL() +{ cd libcss-0.1.2 make install } diff --git a/dev-libs/libdwarf/libdwarf-20120410.bep b/dev-libs/libdwarf/libdwarf-20120410.recipe similarity index 97% rename from dev-libs/libdwarf/libdwarf-20120410.bep rename to dev-libs/libdwarf/libdwarf-20120410.recipe index 6ef959510..01c895b41 100644 --- a/dev-libs/libdwarf/libdwarf-20120410.bep +++ b/dev-libs/libdwarf/libdwarf-20120410.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="77c8b351f11738bc9fa50474a69d5b36" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libelf >= 0.8.13" -BUILD { +BUILD() +{ cd dwarf-20120410/libdwarf ./configure --enable-shared --prefix=$(finddir B_COMMON_DIRECTORY) make @@ -14,7 +15,8 @@ BUILD { LIBRARY_PATH=$LIBRARY_PATH:../libdwarf/ make } -INSTALL { +INSTALL() +{ cd dwarf-20120410/libdwarf make install cd ../dwarfdump diff --git a/dev-libs/libebml/libebml-1.0.0.bep b/dev-libs/libebml/libebml-1.0.0.recipe similarity index 95% rename from dev-libs/libebml/libebml-1.0.0.bep rename to dev-libs/libebml/libebml-1.0.0.recipe index b20b98fd2..4c79fea0c 100644 --- a/dev-libs/libebml/libebml-1.0.0.bep +++ b/dev-libs/libebml/libebml-1.0.0.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6d438f03d8928d83a2d120ed02705f03" -BUILD { +BUILD() +{ cd libebml-1.0.0/make/linux make } -INSTALL { +INSTALL() +{ cd libebml-1.0.0/make/linux if [ -n ${DESTDIR} ];then make install DESTDIR="${DESTDIR}" diff --git a/dev-libs/libedit/libedit-20090923.bep b/dev-libs/libedit/libedit-20090923.recipe similarity index 95% rename from dev-libs/libedit/libedit-20090923.bep rename to dev-libs/libedit/libedit-20090923.recipe index ccc9f99fd..bb2f281aa 100644 --- a/dev-libs/libedit/libedit-20090923.bep +++ b/dev-libs/libedit/libedit-20090923.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="1e6dad38e8499d71b9c78045e5536734" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libedit-20090923-3.0 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libedit-20090923-3.0 make install } diff --git a/dev-libs/libedit/libedit-20100424.bep b/dev-libs/libedit/libedit-20100424.recipe similarity index 96% rename from dev-libs/libedit/libedit-20100424.bep rename to dev-libs/libedit/libedit-20100424.recipe index f48954ddd..9618ab12f 100644 --- a/dev-libs/libedit/libedit-20100424.bep +++ b/dev-libs/libedit/libedit-20100424.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="" LICENSE="BSD (3-clause)" COPYRIGHT="1992-2010 The NetBSD Foundation, Inc." -BUILD { +BUILD() +{ cd libedit-20100424-3.0 autoreconf --force --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libedit-20100424-3.0 make install } diff --git a/dev-libs/libedit/libedit-20110802-3.0.bep b/dev-libs/libedit/libedit-20110802-3.0.recipe similarity index 96% rename from dev-libs/libedit/libedit-20110802-3.0.bep rename to dev-libs/libedit/libedit-20110802-3.0.recipe index 441ef480a..36fda7353 100644 --- a/dev-libs/libedit/libedit-20110802-3.0.bep +++ b/dev-libs/libedit/libedit-20110802-3.0.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="" LICENSE="BSD (3-clause)" COPYRIGHT="1992-2011 The NetBSD Foundation, Inc." -BUILD { +BUILD() +{ cd libedit-20110802-3.0 autoreconf --force --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libedit-20110802-3.0 make install } diff --git a/dev-libs/libedit/libedit-20120601-3.0.bep b/dev-libs/libedit/libedit-20120601-3.0.recipe similarity index 96% rename from dev-libs/libedit/libedit-20120601-3.0.bep rename to dev-libs/libedit/libedit-20120601-3.0.recipe index 27c02f8ce..e2482729a 100644 --- a/dev-libs/libedit/libedit-20120601-3.0.bep +++ b/dev-libs/libedit/libedit-20120601-3.0.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="" LICENSE="BSD (3-clause)" COPYRIGHT="1992-2012 The NetBSD Foundation, Inc." -BUILD { +BUILD() +{ cd libedit-20120601-3.0 autoreconf --force --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libedit-20120601-3.0 make install } diff --git a/dev-libs/libelf/libelf-0.8.13.bep b/dev-libs/libelf/libelf-0.8.13.recipe similarity index 96% rename from dev-libs/libelf/libelf-0.8.13.bep rename to dev-libs/libelf/libelf-0.8.13.recipe index d1a0c7ebb..ce1ff7e9d 100644 --- a/dev-libs/libelf/libelf-0.8.13.bep +++ b/dev-libs/libelf/libelf-0.8.13.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="4136d7b4c04df68b686570afa26988ac" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libelf-0.8.13 libtoolize -fci autoreconf @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libelf-0.8.13 make install instroot=$DESTDIR make install-compat instroot=$DESTDIR diff --git a/dev-libs/libevent/libevent-1.4.11.bep b/dev-libs/libevent/libevent-1.4.11.recipe similarity index 95% rename from dev-libs/libevent/libevent-1.4.11.bep rename to dev-libs/libevent/libevent-1.4.11.recipe index 6747e2dc5..adcc35f01 100644 --- a/dev-libs/libevent/libevent-1.4.11.bep +++ b/dev-libs/libevent/libevent-1.4.11.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libevent-1.4.11-stable autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libevent-1.4.11-stable make install } diff --git a/dev-libs/libevent/libevent-1.4.13.bep b/dev-libs/libevent/libevent-1.4.13.recipe similarity index 95% rename from dev-libs/libevent/libevent-1.4.13.bep rename to dev-libs/libevent/libevent-1.4.13.recipe index a7975f433..e20c33422 100644 --- a/dev-libs/libevent/libevent-1.4.13.bep +++ b/dev-libs/libevent/libevent-1.4.13.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libevent-1.4.13-stable autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libevent-1.4.13-stable make install } diff --git a/dev-libs/libevent/libevent-1.4.14b.bep b/dev-libs/libevent/libevent-1.4.14b.recipe similarity index 96% rename from dev-libs/libevent/libevent-1.4.14b.bep rename to dev-libs/libevent/libevent-1.4.14b.recipe index aff7ae9a7..91c655a79 100644 --- a/dev-libs/libevent/libevent-1.4.14b.bep +++ b/dev-libs/libevent/libevent-1.4.14b.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libevent-1.4.14b-stable autoreconf -vfi COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libevent-1.4.14b-stable make install } diff --git a/dev-libs/libevent/libevent-2.0.10.bep b/dev-libs/libevent/libevent-2.0.10.recipe similarity index 96% rename from dev-libs/libevent/libevent-2.0.10.bep rename to dev-libs/libevent/libevent-2.0.10.recipe index 87dc63adc..3ebdfec99 100644 --- a/dev-libs/libevent/libevent-2.0.10.bep +++ b/dev-libs/libevent/libevent-2.0.10.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libevent-2.0.10-stable autoreconf -vfi COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libevent-2.0.10-stable make install } diff --git a/dev-libs/libffi/libffi-3.0.11.bep b/dev-libs/libffi/libffi-3.0.11.recipe similarity index 96% rename from dev-libs/libffi/libffi-3.0.11.bep rename to dev-libs/libffi/libffi-3.0.11.recipe index 2b187d569..ad0a8b41c 100644 --- a/dev-libs/libffi/libffi-3.0.11.bep +++ b/dev-libs/libffi/libffi-3.0.11.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="stable" CHECKSUM_MD5="f69b9693227d976835b4857b1ba7d0e3" DEPEND="" -BUILD { +BUILD() +{ cd libffi-3.0.11 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --datarootdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libffi-3.0.11 make install } diff --git a/dev-libs/libffi/libffi-3.0.9.bep b/dev-libs/libffi/libffi-3.0.9.recipe similarity index 96% rename from dev-libs/libffi/libffi-3.0.9.bep rename to dev-libs/libffi/libffi-3.0.9.recipe index 1dfcf228a..784fae19e 100644 --- a/dev-libs/libffi/libffi-3.0.9.bep +++ b/dev-libs/libffi/libffi-3.0.9.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" CHECKSUM_MD5="1f300a7a7f975d4046f51c3022fa5ff1" DEPEND="" -BUILD { +BUILD() +{ cd libffi-3.0.9 cp /boot/common/share/libtool/config/config.* . libtoolize --force --copy @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libffi-3.0.9 make install } diff --git a/dev-libs/libgcrypt/libgcrypt-1.4.5.bep b/dev-libs/libgcrypt/libgcrypt-1.4.5.recipe similarity index 95% rename from dev-libs/libgcrypt/libgcrypt-1.4.5.bep rename to dev-libs/libgcrypt/libgcrypt-1.4.5.recipe index 549933e7a..cb42a44dd 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.4.5.bep +++ b/dev-libs/libgcrypt/libgcrypt-1.4.5.recipe @@ -4,7 +4,8 @@ SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.5.tar.gz" REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-libs/libgpg-error" -BUILD { +BUILD() +{ cd libgcrypt-1.4.5 libtoolize --force --copy --install autogen.sh @@ -12,7 +13,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libgcrypt-1.4.5 make install } diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.0.bep b/dev-libs/libgcrypt/libgcrypt-1.5.0.recipe similarity index 96% rename from dev-libs/libgcrypt/libgcrypt-1.5.0.bep rename to dev-libs/libgcrypt/libgcrypt-1.5.0.recipe index f22ea0cbf..a9b064944 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.5.0.bep +++ b/dev-libs/libgcrypt/libgcrypt-1.5.0.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libgpg-error > 1.8" CHECKSUM_MD5="693f9c64d50c908bc4d6e01da3ff76d8" -BUILD { +BUILD() +{ cd libgcrypt-1.5.0 libtoolize --force --copy --install autogen.sh @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libgcrypt-1.5.0 make install } diff --git a/dev-libs/libgpg-error/libgpg-error-1.10.bep b/dev-libs/libgpg-error/libgpg-error-1.10.recipe similarity index 96% rename from dev-libs/libgpg-error/libgpg-error-1.10.bep rename to dev-libs/libgpg-error/libgpg-error-1.10.recipe index 4b7149696..9f673b8c1 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.10.bep +++ b/dev-libs/libgpg-error/libgpg-error-1.10.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="gettext = 0.18.1.1-dev" CHECKSUM_MD5="736a03daa9dc5873047d4eb4a9c22a16" -BUILD { +BUILD() +{ cd libgpg-error-1.10 cd po touch t-cs.gmo t-de.gmo t-fr.gmo t-it.gmo t-nl.gmo \ @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libgpg-error-1.10 make install } diff --git a/dev-libs/libgpg-error/libgpg-error-1.7.bep b/dev-libs/libgpg-error/libgpg-error-1.7.recipe similarity index 95% rename from dev-libs/libgpg-error/libgpg-error-1.7.bep rename to dev-libs/libgpg-error/libgpg-error-1.7.recipe index d51596db0..22757c159 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.7.bep +++ b/dev-libs/libgpg-error/libgpg-error-1.7.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="untested" DEPEND="" CHECKSUM_MD5="62c0d09d1e76c5b6da8fff92314c4665" -BUILD { +BUILD() +{ cd libgpg-error-1.7 autoreconf -vfi -Im4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libgpg-error-1.7 make install } diff --git a/dev-libs/libiconv/libiconv-1.12.bep b/dev-libs/libiconv/libiconv-1.12.recipe similarity index 98% rename from dev-libs/libiconv/libiconv-1.12.bep rename to dev-libs/libiconv/libiconv-1.12.recipe index 7b40e7808..8f73b7a67 100644 --- a/dev-libs/libiconv/libiconv-1.12.bep +++ b/dev-libs/libiconv/libiconv-1.12.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="c2be282595751535a618ae0edeb8f648" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libiconv-1.12 rm -rf aclocal.m4 echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" @@ -33,7 +34,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libiconv-1.12 ACLOCALDIR=${DESTDIR}/`aclocal --print-ac-dir` mkdir -p ${ACLOCALDIR} diff --git a/dev-libs/libiconv/libiconv-1.13.1.bep b/dev-libs/libiconv/libiconv-1.13.1.recipe similarity index 98% rename from dev-libs/libiconv/libiconv-1.13.1.bep rename to dev-libs/libiconv/libiconv-1.13.1.recipe index 7eb525a76..68a18ae83 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.bep +++ b/dev-libs/libiconv/libiconv-1.13.1.recipe @@ -22,7 +22,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ rm -rf aclocal.m4 echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" libtoolize -fci @@ -45,7 +46,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ ACLOCALDIR=$prefix/data/aclocal mkdir -p ${ACLOCALDIR} cp -f srcm4/iconv.m4 ${ACLOCALDIR}/iconv.m4 diff --git a/dev-libs/liboil/liboil-0.3.17.bep b/dev-libs/liboil/liboil-0.3.17.recipe similarity index 96% rename from dev-libs/liboil/liboil-0.3.17.bep rename to dev-libs/liboil/liboil-0.3.17.recipe index a54643c8d..1ac563a5b 100644 --- a/dev-libs/liboil/liboil-0.3.17.bep +++ b/dev-libs/liboil/liboil-0.3.17.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="47dc734f82faeb2964d97771cfd2e701" -BUILD { +BUILD() +{ cd liboil-0.3.17 libtoolize --force --copy --install aclocal -I m4 @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd liboil-0.3.17 make install } diff --git a/dev-libs/libparserutils/libparserutils-0.1.1.bep b/dev-libs/libparserutils/libparserutils-0.1.1.recipe similarity index 95% rename from dev-libs/libparserutils/libparserutils-0.1.1.bep rename to dev-libs/libparserutils/libparserutils-0.1.1.recipe index 28738cbe1..79b17c7e9 100644 --- a/dev-libs/libparserutils/libparserutils-0.1.1.bep +++ b/dev-libs/libparserutils/libparserutils-0.1.1.recipe @@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/libparserutils-0.1.1- REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd libparserutils-0.1.1 make } -INSTALL { +INSTALL() +{ cd libparserutils-0.1.1 make install } diff --git a/dev-libs/libpcre/libpcre-8.00.bep b/dev-libs/libpcre/libpcre-8.00.recipe similarity index 96% rename from dev-libs/libpcre/libpcre-8.00.bep rename to dev-libs/libpcre/libpcre-8.00.recipe index 802fb405a..04040b1d7 100644 --- a/dev-libs/libpcre/libpcre-8.00.bep +++ b/dev-libs/libpcre/libpcre-8.00.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="c95500eeda12c8c7edc6b0926d60952c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pcre-8.00 libtoolize --force --copy aclocal @@ -16,7 +17,8 @@ BUILD { make check } -INSTALL { +INSTALL() +{ cd pcre-8.00 make install } diff --git a/dev-libs/libpcre/libpcre-8.02.bep b/dev-libs/libpcre/libpcre-8.02.recipe similarity index 96% rename from dev-libs/libpcre/libpcre-8.02.bep rename to dev-libs/libpcre/libpcre-8.02.recipe index c5e5b701c..c4d7c571d 100644 --- a/dev-libs/libpcre/libpcre-8.02.bep +++ b/dev-libs/libpcre/libpcre-8.02.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="27948c1b5f5c1eabc23cba1ebe4c316f" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pcre-8.02 LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` libtoolize --force --copy @@ -17,7 +18,8 @@ BUILD { make check } -INSTALL { +INSTALL() +{ cd pcre-8.02 make install } diff --git a/dev-libs/libpcre/libpcre-8.12.bep b/dev-libs/libpcre/libpcre-8.12.recipe similarity index 96% rename from dev-libs/libpcre/libpcre-8.12.bep rename to dev-libs/libpcre/libpcre-8.12.recipe index 1d1b9188d..3a1db3765 100644 --- a/dev-libs/libpcre/libpcre-8.12.bep +++ b/dev-libs/libpcre/libpcre-8.12.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="f14a9fef3c92f3fc6c5ac92d7a2c7eb3" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pcre-8.12 LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` libtoolize --force --copy @@ -23,12 +24,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pcre-8.12 make install } -TEST { +TEST() +{ cd pcre-8.12 make check } diff --git a/dev-libs/libpcre/libpcre-8.21.bep b/dev-libs/libpcre/libpcre-8.21.recipe similarity index 96% rename from dev-libs/libpcre/libpcre-8.21.bep rename to dev-libs/libpcre/libpcre-8.21.recipe index 429772017..f1f33acba 100644 --- a/dev-libs/libpcre/libpcre-8.21.bep +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pcre-8.21 LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` libtoolize --force --copy --install @@ -23,12 +24,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pcre-8.21 make install } -TEST { +TEST() +{ cd pcre-8.21 make check } diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.bep b/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.recipe similarity index 95% rename from dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.bep rename to dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.recipe index 7c8343203..7d65949e3 100644 --- a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.bep +++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a09d928c4af54fe5436002345ef71138" REVISION="1" STATUS_HAIKU="stable" DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd libpthread-stubs-0.3 libtoolize --force --copy --install autoreconf -i @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpthread-stubs-0.3 make install } diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.bep b/dev-libs/libpthread-stubs/libpthread-stubs-0.3.recipe similarity index 95% rename from dev-libs/libpthread-stubs/libpthread-stubs-0.3.bep rename to dev-libs/libpthread-stubs/libpthread-stubs-0.3.recipe index 7c8343203..7d65949e3 100644 --- a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.bep +++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.3.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a09d928c4af54fe5436002345ef71138" REVISION="1" STATUS_HAIKU="stable" DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd libpthread-stubs-0.3 libtoolize --force --copy --install autoreconf -i @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpthread-stubs-0.3 make install } diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.bep b/dev-libs/libsigc++/libsigc++-1.2.7.recipe similarity index 97% rename from dev-libs/libsigc++/libsigc++-1.2.7.bep rename to dev-libs/libsigc++/libsigc++-1.2.7.recipe index 1decbb7ed..246950f41 100644 --- a/dev-libs/libsigc++/libsigc++-1.2.7.bep +++ b/dev-libs/libsigc++/libsigc++-1.2.7.recipe @@ -5,7 +5,8 @@ REVISION="2" STATUS_HAIKU="stable" DEPEND="dev-cpp/mm-common >= 0.9.2" CHECKSUM_MD5="b939751dff0db9652c5dbfc9de685efa" -BUILD { +BUILD() +{ cd libsigc++-1.2.7 libtoolize --force --copy --install aclocal -I scripts @@ -18,7 +19,8 @@ BUILD { # those errors and we really don't need either one } -INSTALL { +INSTALL() +{ cd libsigc++-1.2.7 make -i install } diff --git a/dev-libs/libsigc++/libsigc++-2.2.7.bep b/dev-libs/libsigc++/libsigc++-2.2.7.recipe similarity index 96% rename from dev-libs/libsigc++/libsigc++-2.2.7.bep rename to dev-libs/libsigc++/libsigc++-2.2.7.recipe index 9a4accac8..8ab2d197f 100644 --- a/dev-libs/libsigc++/libsigc++-2.2.7.bep +++ b/dev-libs/libsigc++/libsigc++-2.2.7.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-cpp/mm-common >= 0.9.2" CHECKSUM_MD5="48afe53ba0e3958f6ac5f072afed1c53" -BUILD { +BUILD() +{ cd libsigc++-2.2.7 libtoolize --force --copy aclocal @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libsigc++-2.2.7 make install } diff --git a/dev-libs/libsigsegv/libsigsegv-2.8.bep b/dev-libs/libsigsegv/libsigsegv-2.8.recipe similarity index 95% rename from dev-libs/libsigsegv/libsigsegv-2.8.bep rename to dev-libs/libsigsegv/libsigsegv-2.8.recipe index 989c8e42c..43ca12414 100644 --- a/dev-libs/libsigsegv/libsigsegv-2.8.bep +++ b/dev-libs/libsigsegv/libsigsegv-2.8.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="ebe554e26870d8bc200ef3e3539ffd7c" -BUILD { +BUILD() +{ cd libsigsegv-2.8 libtoolize --force --copy --install aclocal -I m4 @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libsigsegv-2.8 make install } diff --git a/dev-libs/libunistring/libunistring-0.9.1.1.bep b/dev-libs/libunistring/libunistring-0.9.1.1.recipe similarity index 96% rename from dev-libs/libunistring/libunistring-0.9.1.1.bep rename to dev-libs/libunistring/libunistring-0.9.1.1.recipe index 0138a2f4e..c131742e8 100644 --- a/dev-libs/libunistring/libunistring-0.9.1.1.bep +++ b/dev-libs/libunistring/libunistring-0.9.1.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/git >= 1.6.5.3 dev-util/gperf >= 3.0.4" -BUILD { +BUILD() +{ cd libunistring-0.9.1.1 libtoolize --copy --force --install ./autogen.sh @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libunistring-0.9.1.1 make install } diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.bep b/dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.recipe similarity index 95% rename from dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.bep rename to dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.recipe index 8190c188a..42356bef8 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.bep +++ b/dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/buildsystem >= 0" -BUILD { +BUILD() +{ cd libwapcaplet-0.1.1-HEAD make PREFIX=/boot/common } -INSTALL { +INSTALL() +{ cd libwapcaplet-0.1.1-HEAD make install PREFIX=/boot/common } diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.1.1.bep b/dev-libs/libwapcaplet/libwapcaplet-0.1.1.recipe similarity index 94% rename from dev-libs/libwapcaplet/libwapcaplet-0.1.1.bep rename to dev-libs/libwapcaplet/libwapcaplet-0.1.1.recipe index 8d71ca25f..f754274f1 100644 --- a/dev-libs/libwapcaplet/libwapcaplet-0.1.1.bep +++ b/dev-libs/libwapcaplet/libwapcaplet-0.1.1.recipe @@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/libwapcaplet-0.1.1-sr REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd libwapcaplet-0.1.1 make } -INSTALL { +INSTALL() +{ cd libwapcaplet-0.1.1 make install } diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.bep b/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.recipe similarity index 95% rename from dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.bep rename to dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.recipe index 6e1d2a3c1..09547ecfd 100644 --- a/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.bep +++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="7c64a28b08c8fdf6c8a95b0d5f1497b0" -BUILD { +BUILD() +{ cd libxdg-basedir-1.1.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libxdg-basedir-1.1.1 make install } diff --git a/dev-libs/libxml2/libxml2-2.7.3.bep b/dev-libs/libxml2/libxml2-2.7.3.recipe similarity index 96% rename from dev-libs/libxml2/libxml2-2.7.3.bep rename to dev-libs/libxml2/libxml2-2.7.3.recipe index 5a7a0d4df..19024e0a9 100644 --- a/dev-libs/libxml2/libxml2-2.7.3.bep +++ b/dev-libs/libxml2/libxml2-2.7.3.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8f4fda3969237c2a33bdb1583b5d06b2" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libxml2-2.7.3 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libxml2-2.7.3 make install } diff --git a/dev-libs/libxml2/libxml2-2.7.6.bep b/dev-libs/libxml2/libxml2-2.7.6.recipe similarity index 96% rename from dev-libs/libxml2/libxml2-2.7.6.bep rename to dev-libs/libxml2/libxml2-2.7.6.recipe index aeb674eb8..f12282c3f 100644 --- a/dev-libs/libxml2/libxml2-2.7.6.bep +++ b/dev-libs/libxml2/libxml2-2.7.6.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="7740a8ec23878a2f50120e1faa2730f2" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libxml2-2.7.6 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libxml2-2.7.6 make install } diff --git a/dev-libs/libxml2/libxml2-2.7.7.bep b/dev-libs/libxml2/libxml2-2.7.7.recipe similarity index 95% rename from dev-libs/libxml2/libxml2-2.7.7.bep rename to dev-libs/libxml2/libxml2-2.7.7.recipe index f5205acd0..f30d0bad0 100644 --- a/dev-libs/libxml2/libxml2-2.7.7.bep +++ b/dev-libs/libxml2/libxml2-2.7.7.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="9abc9959823ca9ff904f1fbcf21df066" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libxml2-2.7.7 libtoolize --force --copy --install aclocal @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libxml2-2.7.7 make install } -TEST { +TEST() +{ cd libxml2-2.7.7 make tests } diff --git a/dev-libs/libxml2/libxml2-2.7.8.bep b/dev-libs/libxml2/libxml2-2.7.8.recipe similarity index 96% rename from dev-libs/libxml2/libxml2-2.7.8.bep rename to dev-libs/libxml2/libxml2-2.7.8.recipe index 446f12344..6b771096e 100644 --- a/dev-libs/libxml2/libxml2-2.7.8.bep +++ b/dev-libs/libxml2/libxml2-2.7.8.recipe @@ -20,7 +20,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ libtoolize --force --copy --install aclocal autoconf @@ -29,11 +30,13 @@ BUILD { make } -INSTALL { +INSTALL() +{ make install } -TEST { +TEST() +{ make tests } diff --git a/dev-libs/libxml2/libxml2-2.8.0.bep b/dev-libs/libxml2/libxml2-2.8.0.recipe similarity index 96% rename from dev-libs/libxml2/libxml2-2.8.0.bep rename to dev-libs/libxml2/libxml2-2.8.0.recipe index 49230b94f..f4a143cd6 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.bep +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libxml2-2.8.0 libtoolize --force --copy --install aclocal @@ -21,12 +22,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libxml2-2.8.0 make install } -TEST { +TEST() +{ cd libxml2-2.8.0 make tests } diff --git a/dev-libs/libxml2/libxml2-2.9.0.bep b/dev-libs/libxml2/libxml2-2.9.0.recipe similarity index 96% rename from dev-libs/libxml2/libxml2-2.9.0.bep rename to dev-libs/libxml2/libxml2-2.9.0.recipe index 70bf22569..bd26c3d12 100644 --- a/dev-libs/libxml2/libxml2-2.9.0.bep +++ b/dev-libs/libxml2/libxml2-2.9.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="5b9bebf4f5d2200ae2c4efe8fa6103f7" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libxml2-2.9.0 libtoolize --force --copy --install aclocal @@ -22,12 +23,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libxml2-2.9.0 make install } -TEST { +TEST() +{ cd libxml2-2.9.0 make tests } diff --git a/dev-libs/libxslt/libxslt-1.1.26.bep b/dev-libs/libxslt/libxslt-1.1.26.recipe similarity index 97% rename from dev-libs/libxslt/libxslt-1.1.26.bep rename to dev-libs/libxslt/libxslt-1.1.26.recipe index 2702fe367..9eb59b7bf 100644 --- a/dev-libs/libxslt/libxslt-1.1.26.bep +++ b/dev-libs/libxslt/libxslt-1.1.26.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e61d0364a30146aaa3001296f853b2b9" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libxslt-1.1.26 libtoolize --force --copy --install aclocal @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libxslt-1.1.26 make install } diff --git a/dev-libs/libxslt/libxslt-1.1.28.bep b/dev-libs/libxslt/libxslt-1.1.28.recipe similarity index 97% rename from dev-libs/libxslt/libxslt-1.1.28.bep rename to dev-libs/libxslt/libxslt-1.1.28.recipe index 759cc47f0..cd1fe0251 100644 --- a/dev-libs/libxslt/libxslt-1.1.28.bep +++ b/dev-libs/libxslt/libxslt-1.1.28.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="9667bf6f9310b957254fdcf6596600b7" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libxslt-1.1.28 libtoolize --force --copy --install aclocal @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libxslt-1.1.28 make install } diff --git a/dev-libs/libzip/libzip-0.10.1.bep b/dev-libs/libzip/libzip-0.10.1.recipe similarity index 96% rename from dev-libs/libzip/libzip-0.10.1.bep rename to dev-libs/libzip/libzip-0.10.1.recipe index f7500da45..11d333880 100644 --- a/dev-libs/libzip/libzip-0.10.1.bep +++ b/dev-libs/libzip/libzip-0.10.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="d3e933ae049204badccf605f20aaecde" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +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 @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libzip-0.10.1 make install } diff --git a/dev-libs/libzip/libzip-0.10.bep b/dev-libs/libzip/libzip-0.10.recipe similarity index 96% rename from dev-libs/libzip/libzip-0.10.bep rename to dev-libs/libzip/libzip-0.10.recipe index aa1f380ae..39214e8ec 100644 --- a/dev-libs/libzip/libzip-0.10.bep +++ b/dev-libs/libzip/libzip-0.10.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="663d79a9d299a61026d1860d52cdf6fc" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libzip-0.10 sed -i 's/MAN_PATH man/MAN_PATH documentation\/man/' man/CMakeLists.txt sed -i 's/DESTINATION lib\/libzip\/include/DESTINATION include/' CMakeLists.txt @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libzip-0.10 make install } diff --git a/dev-libs/lzo/lzo-2.06.bep b/dev-libs/lzo/lzo-2.06.recipe similarity index 94% rename from dev-libs/lzo/lzo-2.06.bep rename to dev-libs/lzo/lzo-2.06.recipe index 487c7facc..0828119ae 100644 --- a/dev-libs/lzo/lzo-2.06.bep +++ b/dev-libs/lzo/lzo-2.06.recipe @@ -5,18 +5,21 @@ CHECKSUM_MD5="95380bd4081f85ef08c5209f4107e9f8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd lzo-2.06 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd lzo-2.06 make install } -TEST { +TEST() +{ cd lzo-2.06 make check } diff --git a/dev-libs/mpc/mpc-1.0.1.bep b/dev-libs/mpc/mpc-1.0.1.recipe similarity index 95% rename from dev-libs/mpc/mpc-1.0.1.bep rename to dev-libs/mpc/mpc-1.0.1.recipe index b4dd82b82..f53eedff9 100644 --- a/dev-libs/mpc/mpc-1.0.1.bep +++ b/dev-libs/mpc/mpc-1.0.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/gmp = 5.0.5" CHECKSUM_SHA1="8c7e19ad0dd9b3b5cc652273403423d6cf0c5edf" -BUILD { +BUILD() +{ cd mpc-1.0.1 # libtoolize --force --copy --install # aclocal -I m4 @@ -17,12 +18,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd mpc-1.0.1 make install } -TEST { +TEST() +{ cd mpc-1.0.1 make check } diff --git a/dev-libs/mpfr/mpfr-3.0.0-7047.bep b/dev-libs/mpfr/mpfr-3.0.0-7047.recipe similarity index 95% rename from dev-libs/mpfr/mpfr-3.0.0-7047.bep rename to dev-libs/mpfr/mpfr-3.0.0-7047.recipe index e134e23d0..c72947f57 100644 --- a/dev-libs/mpfr/mpfr-3.0.0-7047.bep +++ b/dev-libs/mpfr/mpfr-3.0.0-7047.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-libs/gmp = ?.?.?" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd mpfr-3.0.0-7047 libtoolize --force --copy --install aclocal -I m4 @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd mpfr-3.0.0-7047 make install make check diff --git a/dev-libs/mpfr/mpfr-3.1.1.bep b/dev-libs/mpfr/mpfr-3.1.1.recipe similarity index 95% rename from dev-libs/mpfr/mpfr-3.1.1.bep rename to dev-libs/mpfr/mpfr-3.1.1.recipe index 791db9071..8f4a04c4b 100644 --- a/dev-libs/mpfr/mpfr-3.1.1.bep +++ b/dev-libs/mpfr/mpfr-3.1.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/gmp = 5.0.5" CHECKSUM_MD5="91d51c41fcf2799e4ee7a7126fc95c17" -BUILD { +BUILD() +{ cd mpfr-3.1.1 # libtoolize --force --copy --install # aclocal -I m4 @@ -17,12 +18,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd mpfr-3.1.1 make install } -TEST { +TEST() +{ cd mpfr-3.1.1 make check } diff --git a/dev-libs/oniguruma/oniguruma-5.9.2.bep b/dev-libs/oniguruma/oniguruma-5.9.2.recipe similarity index 94% rename from dev-libs/oniguruma/oniguruma-5.9.2.bep rename to dev-libs/oniguruma/oniguruma-5.9.2.recipe index d55211dcc..fc87ef1bd 100644 --- a/dev-libs/oniguruma/oniguruma-5.9.2.bep +++ b/dev-libs/oniguruma/oniguruma-5.9.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="0f4ad1b100a5f9a91623e04111707b84" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd onig-5.9.2 libtoolize --force --copy --install touch NEWS ChangeLog @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd onig-5.9.2 make install } -TEST { +TEST() +{ cd onig-5.9.2 make check } diff --git a/dev-libs/openssl/openssl-0.9.8l.bep b/dev-libs/openssl/openssl-0.9.8l.recipe similarity index 95% rename from dev-libs/openssl/openssl-0.9.8l.bep rename to dev-libs/openssl/openssl-0.9.8l.recipe index 1e9cdad01..3980d41e4 100644 --- a/dev-libs/openssl/openssl-0.9.8l.bep +++ b/dev-libs/openssl/openssl-0.9.8l.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="05a0ece1372392a2cf310ebb96333025" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd openssl-0.9.8l config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared make } -INSTALL { +INSTALL() +{ cd openssl-0.9.8l make install } diff --git a/dev-libs/openssl/openssl-0.9.8m.bep b/dev-libs/openssl/openssl-0.9.8m.recipe similarity index 95% rename from dev-libs/openssl/openssl-0.9.8m.bep rename to dev-libs/openssl/openssl-0.9.8m.recipe index 1048d6344..9b800b609 100644 --- a/dev-libs/openssl/openssl-0.9.8m.bep +++ b/dev-libs/openssl/openssl-0.9.8m.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="898bf125370926d5f692a2201124f8ec" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { +BUILD() +{ cd openssl-0.9.8m config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared make } -INSTALL { +INSTALL() +{ cd openssl-0.9.8m make install } diff --git a/dev-libs/openssl/openssl-1.0.0.bep b/dev-libs/openssl/openssl-1.0.0.recipe similarity index 95% rename from dev-libs/openssl/openssl-1.0.0.bep rename to dev-libs/openssl/openssl-1.0.0.recipe index 79c4511c3..b9bcf4c58 100644 --- a/dev-libs/openssl/openssl-1.0.0.bep +++ b/dev-libs/openssl/openssl-1.0.0.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="89eaa86e25b2845f920ec00ae4c864ed" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { +BUILD() +{ cd openssl-1.0.0 config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared make } -INSTALL { +INSTALL() +{ cd openssl-1.0.0 make install INSTALL_PREFIX="${DESTDIR}" } diff --git a/dev-libs/openssl/openssl-1.0.0a.bep b/dev-libs/openssl/openssl-1.0.0a.recipe similarity index 95% rename from dev-libs/openssl/openssl-1.0.0a.bep rename to dev-libs/openssl/openssl-1.0.0a.recipe index a0cd88932..eaea93655 100644 --- a/dev-libs/openssl/openssl-1.0.0a.bep +++ b/dev-libs/openssl/openssl-1.0.0a.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="e3873edfffc783624cfbdb65e2249cbd" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { +BUILD() +{ cd openssl-1.0.0a config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared make } -INSTALL { +INSTALL() +{ cd openssl-1.0.0a make install INSTALL_PREFIX="${DESTDIR}" } diff --git a/dev-libs/openssl/openssl-1.0.0c.bep b/dev-libs/openssl/openssl-1.0.0c.recipe similarity index 94% rename from dev-libs/openssl/openssl-1.0.0c.bep rename to dev-libs/openssl/openssl-1.0.0c.recipe index 81b78579e..7ddfa6214 100644 --- a/dev-libs/openssl/openssl-1.0.0c.bep +++ b/dev-libs/openssl/openssl-1.0.0c.recipe @@ -5,18 +5,21 @@ CHECKSUM_MD5="ff8fb85610aef328315a9decbb2712e4" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { +BUILD() +{ cd openssl-1.0.0c config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared make } -INSTALL { +INSTALL() +{ cd openssl-1.0.0c make install INSTALL_PREFIX="${DESTDIR}" } -TEST { +TEST() +{ cd openssl-1.0.0c make test } diff --git a/dev-libs/openssl/openssl-1.0.0d.bep b/dev-libs/openssl/openssl-1.0.0d.recipe similarity index 97% rename from dev-libs/openssl/openssl-1.0.0d.bep rename to dev-libs/openssl/openssl-1.0.0d.recipe index 469c670c3..128323468 100644 --- a/dev-libs/openssl/openssl-1.0.0d.bep +++ b/dev-libs/openssl/openssl-1.0.0d.recipe @@ -21,18 +21,21 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ sed -i "s@MANDIR=\$(OPENSSLDIR)\/man@MANDIR=$manDir@g" Make* ./config --prefix=$prefix zlib shared \ --openssldir=$dataRootDir/ssl make } -INSTALL { +INSTALL() +{ make install } -TEST { +TEST() +{ make test } diff --git a/dev-libs/openssl/openssl-1.0.0e.bep b/dev-libs/openssl/openssl-1.0.0e.recipe similarity index 95% rename from dev-libs/openssl/openssl-1.0.0e.bep rename to dev-libs/openssl/openssl-1.0.0e.recipe index d84ffb104..713f871ab 100644 --- a/dev-libs/openssl/openssl-1.0.0e.bep +++ b/dev-libs/openssl/openssl-1.0.0e.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="7040b89c4c58c7a1016c0dfa6e821c86" REVISION="2" STATUS_HAIKU="stable" DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { +BUILD() +{ cd openssl-1.0.0e sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make* config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \ @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssl-1.0.0e make install INSTALL_PREFIX="${DESTDIR}" } -TEST { +TEST() +{ cd openssl-1.0.0e make test } diff --git a/dev-libs/openssl/openssl-1.0.0g.bep b/dev-libs/openssl/openssl-1.0.0g.recipe similarity index 95% rename from dev-libs/openssl/openssl-1.0.0g.bep rename to dev-libs/openssl/openssl-1.0.0g.recipe index 5797ec087..98e450b49 100644 --- a/dev-libs/openssl/openssl-1.0.0g.bep +++ b/dev-libs/openssl/openssl-1.0.0g.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="07ecbe4324f140d157478637d6beccf1" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { +BUILD() +{ cd openssl-1.0.0g sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make* config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \ @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssl-1.0.0g make install INSTALL_PREFIX="${DESTDIR}" } -TEST { +TEST() +{ cd openssl-1.0.0g make test } diff --git a/dev-libs/openssl/openssl-1.0.0j.bep b/dev-libs/openssl/openssl-1.0.0j.recipe similarity index 95% rename from dev-libs/openssl/openssl-1.0.0j.bep rename to dev-libs/openssl/openssl-1.0.0j.recipe index a86acc668..8a5a30f01 100644 --- a/dev-libs/openssl/openssl-1.0.0j.bep +++ b/dev-libs/openssl/openssl-1.0.0j.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="cbe4ac0d8f598680f68a951e04b0996b" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { +BUILD() +{ cd openssl-1.0.0j sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make* config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \ @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssl-1.0.0j make install INSTALL_PREFIX="${DESTDIR}" } -TEST { +TEST() +{ cd openssl-1.0.0j make test } diff --git a/dev-libs/popt/popt-1.16.bep b/dev-libs/popt/popt-1.16.recipe similarity index 95% rename from dev-libs/popt/popt-1.16.bep rename to dev-libs/popt/popt-1.16.recipe index 1ff0dc764..c7b6f8b3f 100644 --- a/dev-libs/popt/popt-1.16.bep +++ b/dev-libs/popt/popt-1.16.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="3743beefa3dd6247a73f8f7a32c14c33" -BUILD { +BUILD() +{ cd popt-1.16 libtoolize --force --copy --install echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd popt-1.16 make install } diff --git a/dev-libs/protobuf/protobuf-2.4.1.bep b/dev-libs/protobuf/protobuf-2.4.1.recipe similarity index 94% rename from dev-libs/protobuf/protobuf-2.4.1.bep rename to dev-libs/protobuf/protobuf-2.4.1.recipe index c71c5f1cf..ef23ac899 100644 --- a/dev-libs/protobuf/protobuf-2.4.1.bep +++ b/dev-libs/protobuf/protobuf-2.4.1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd protobuf-2.4.1 libtoolize --force --copy --install ./autogen.sh @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd protobuf-2.4.1 make install } -TEST { +TEST() +{ cd protobuf-2.4.1 make check } diff --git a/dev-libs/raptor2/raptor2-2.0.8.bep b/dev-libs/raptor2/raptor2-2.0.8.recipe similarity index 95% rename from dev-libs/raptor2/raptor2-2.0.8.bep rename to dev-libs/raptor2/raptor2-2.0.8.recipe index 72941880d..201b1cf35 100644 --- a/dev-libs/raptor2/raptor2-2.0.8.bep +++ b/dev-libs/raptor2/raptor2-2.0.8.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="ac60858b875aab8fa7917f21a1237aa9" REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-util/gtk-doc>=1.3" -BUILD { +BUILD() +{ cd raptor2-2.0.8 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd raptor2-2.0.8 make install } -TEST { +TEST() +{ cd raptor2-2.0.8 make check } diff --git a/dev-libs/rasqal/rasqal-0.9.29.bep b/dev-libs/rasqal/rasqal-0.9.29.recipe similarity index 95% rename from dev-libs/rasqal/rasqal-0.9.29.bep rename to dev-libs/rasqal/rasqal-0.9.29.recipe index f8d4a3d38..c8fc0413e 100644 --- a/dev-libs/rasqal/rasqal-0.9.29.bep +++ b/dev-libs/rasqal/rasqal-0.9.29.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="49e4b75a0c67465edf55dd20606715fa" REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-libs/raptor2>=2.0.8" -BUILD { +BUILD() +{ cd rasqal-0.9.29 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd rasqal-0.9.29 make install } -TEST { +TEST() +{ cd rasqal-0.9.29 make check } diff --git a/dev-libs/redland/redland-1.0.15.bep b/dev-libs/redland/redland-1.0.15.recipe similarity index 95% rename from dev-libs/redland/redland-1.0.15.bep rename to dev-libs/redland/redland-1.0.15.recipe index 8aa04a56b..386fff5c7 100644 --- a/dev-libs/redland/redland-1.0.15.bep +++ b/dev-libs/redland/redland-1.0.15.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="b0deb87f3c7d3237a3d587c1e0f2f266" REVISION="1" STATUS_HAIKU="untested" DEPEND="rasqal>=0.9.29" -BUILD { +BUILD() +{ cd redland-1.0.15 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd redland-1.0.15 make install } -TEST { +TEST() +{ cd redland-1.0.15 make check } diff --git a/dev-libs/serd/serd-0.18.0.bep b/dev-libs/serd/serd-0.18.0.recipe similarity index 96% rename from dev-libs/serd/serd-0.18.0.bep rename to dev-libs/serd/serd-0.18.0.recipe index 7ae46de27..d48670c8d 100644 --- a/dev-libs/serd/serd-0.18.0.bep +++ b/dev-libs/serd/serd-0.18.0.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="96dbade2c81d6df8100a9ef605ce35f8" -BUILD { +BUILD() +{ cd serd-0.18.0 sed -i "s_#!/usr/bin/env python_#!/boot/common/bin/python_g" waf sed -i "s_#!/usr/bin/env python_#!/boot/common/bin/python_g" wscript @@ -15,7 +16,8 @@ BUILD { ./waf } -INSTALL { +INSTALL() +{ cd serd-0.18.0 ./waf install } diff --git a/dev-libs/tinyxml/tinyxml-2.6.2.bep b/dev-libs/tinyxml/tinyxml-2.6.2.recipe similarity index 95% rename from dev-libs/tinyxml/tinyxml-2.6.2.bep rename to dev-libs/tinyxml/tinyxml-2.6.2.recipe index 76ea6f7f2..8e6deeabf 100644 --- a/dev-libs/tinyxml/tinyxml-2.6.2.bep +++ b/dev-libs/tinyxml/tinyxml-2.6.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd tinyxml rm xmltest.cpp wget http://libtinyxml.googlecode.com/svn/trunk/CMakeLists.txt @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tinyxml make install mkdir -p ${DESTDIR}`finddir B_COMMON_DEVELOP_DIRECTORY`/tinyxml diff --git a/dev-libs/uriparser/uriparser-0.7.5.bep b/dev-libs/uriparser/uriparser-0.7.5.recipe similarity index 96% rename from dev-libs/uriparser/uriparser-0.7.5.bep rename to dev-libs/uriparser/uriparser-0.7.5.recipe index c808642ab..a65afc5c7 100644 --- a/dev-libs/uriparser/uriparser-0.7.5.bep +++ b/dev-libs/uriparser/uriparser-0.7.5.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="459c2786758929b92bfbd0cee25b5aa0" -BUILD { +BUILD() +{ cd uriparser-0.7.5 libtoolize --force --copy aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd uriparser-0.7.5 make install } diff --git a/dev-libs/xerces-c/xerces-c-3.1.1.bep b/dev-libs/xerces-c/xerces-c-3.1.1.recipe similarity index 96% rename from dev-libs/xerces-c/xerces-c-3.1.1.bep rename to dev-libs/xerces-c/xerces-c-3.1.1.recipe index 471c47293..6e0ce264f 100644 --- a/dev-libs/xerces-c/xerces-c-3.1.1.bep +++ b/dev-libs/xerces-c/xerces-c-3.1.1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/pkgconfig >= 0.23" -BUILD { +BUILD() +{ cd xerces-c-3.1.1 libtoolize --copy --force --install autoreconf -i @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd xerces-c-3.1.1 make install } diff --git a/dev-libs/zziplib/zziplib-0.13.59.bep b/dev-libs/zziplib/zziplib-0.13.59.recipe similarity index 97% rename from dev-libs/zziplib/zziplib-0.13.59.bep rename to dev-libs/zziplib/zziplib-0.13.59.recipe index 7812f068d..dfa96f4ec 100644 --- a/dev-libs/zziplib/zziplib-0.13.59.bep +++ b/dev-libs/zziplib/zziplib-0.13.59.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="14b5a6fc229afe9916d48358479568d3" -BUILD { +BUILD() +{ cd zziplib-0.13.59 sed -i 's/\--export-dynamic/\-export-dynamic/' configure.ac libtoolize --force --copy --install @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd zziplib-0.13.59 make install } diff --git a/dev-lua/luarocks/luarocks-2.0.4.1.bep b/dev-lua/luarocks/luarocks-2.0.4.1.recipe similarity index 95% rename from dev-lua/luarocks/luarocks-2.0.4.1.bep rename to dev-lua/luarocks/luarocks-2.0.4.1.recipe index 35715858a..96b10e818 100644 --- a/dev-lua/luarocks/luarocks-2.0.4.1.bep +++ b/dev-lua/luarocks/luarocks-2.0.4.1.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/lua >= 5.1" CHECKSUM_MD5="2c7caccce3cdf236e6f9aca7bec9bdea" -BUILD { +BUILD() +{ cd luarocks-2.0.4.1 configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd luarocks-2.0.4.1 make install DESTDIR=${DESTDIR} } diff --git a/dev-perl/XML-Parser/XML-Parser-2.36.bep b/dev-perl/XML-Parser/XML-Parser-2.36.recipe similarity index 96% rename from dev-perl/XML-Parser/XML-Parser-2.36.bep rename to dev-perl/XML-Parser/XML-Parser-2.36.recipe index 6067758ff..4bb691719 100644 --- a/dev-perl/XML-Parser/XML-Parser-2.36.bep +++ b/dev-perl/XML-Parser/XML-Parser-2.36.recipe @@ -11,13 +11,15 @@ CHECKSUM_MD5="1b868962b658bd87e1563ecd56498ded" # 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 { +BUILD() +{ cd XML-Parser-2.36 perl Makefile.PL make } -INSTALL { +INSTALL() +{ cd XML-Parser-2.36 make install DESTDIR="${DESTDIR}" } diff --git a/dev-python/cnf/cnf-1.0-git.bep b/dev-python/cnf/cnf-1.0-git.recipe similarity index 95% rename from dev-python/cnf/cnf-1.0-git.bep rename to dev-python/cnf/cnf-1.0-git.recipe index 85971864e..5b0f89989 100644 --- a/dev-python/cnf/cnf-1.0-git.bep +++ b/dev-python/cnf/cnf-1.0-git.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/python >= 2.6.4" -BUILD { +BUILD() +{ echo "No build step" } -INSTALL { +INSTALL() +{ cd cnf-1.0-git python install_cnf.py } diff --git a/dev-python/numpy/numpy-1.4.1.bep b/dev-python/numpy/numpy-1.4.1.recipe similarity index 95% rename from dev-python/numpy/numpy-1.4.1.bep rename to dev-python/numpy/numpy-1.4.1.recipe index 0a4917f13..776c39a1b 100644 --- a/dev-python/numpy/numpy-1.4.1.bep +++ b/dev-python/numpy/numpy-1.4.1.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="5c7b5349dc3161763f7f366ceb96516b" REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-lang/python >= 2.6.5" -BUILD { +BUILD() +{ cd numpy-1.4.1 python setup.py config python setup.py build } -INSTALL { +INSTALL() +{ cd numpy-1.4.1 python setup.py install } diff --git a/dev-python/numpy/numpy-1.5.0.bep b/dev-python/numpy/numpy-1.5.0.recipe similarity index 96% rename from dev-python/numpy/numpy-1.5.0.bep rename to dev-python/numpy/numpy-1.5.0.recipe index 14bb87b27..59be61f97 100644 --- a/dev-python/numpy/numpy-1.5.0.bep +++ b/dev-python/numpy/numpy-1.5.0.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="3a8bfdc434df782d647161c48943ee09" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/python >= 2.6.5" -BUILD { +BUILD() +{ cd numpy-1.5.0 python setup.py config python setup.py build } -INSTALL { +INSTALL() +{ cd numpy-1.5.0 python setup.py install --root=${DESTDIR} } diff --git a/dev-python/paramiko/paramiko-1.7.6.bep b/dev-python/paramiko/paramiko-1.7.6.recipe similarity index 96% rename from dev-python/paramiko/paramiko-1.7.6.bep rename to dev-python/paramiko/paramiko-1.7.6.recipe index 5a5289fdc..a1c21fd8d 100644 --- a/dev-python/paramiko/paramiko-1.7.6.bep +++ b/dev-python/paramiko/paramiko-1.7.6.recipe @@ -5,11 +5,13 @@ REVISION= "1" STATUS_HAIKU="stable" DEPEND="pycrypto >= 1.9" CHECKSUM_MD5="b1cfe0cd55772115f808a11c1baba8a0" -BUILD { +BUILD() +{ cd paramiko-1.7.6 python setup.py build } -INSTALL { +INSTALL() +{ cd paramiko-1.7.6 if [ -n "${DESTDIR}" ];then python setup.py install --root=${DESTDIR} diff --git a/dev-python/pychart/pychart-1.39-bzr.bep b/dev-python/pychart/pychart-1.39-bzr.recipe similarity index 94% rename from dev-python/pychart/pychart-1.39-bzr.bep rename to dev-python/pychart/pychart-1.39-bzr.recipe index 000a90264..a83bfdf4a 100644 --- a/dev-python/pychart/pychart-1.39-bzr.bep +++ b/dev-python/pychart/pychart-1.39-bzr.recipe @@ -5,19 +5,22 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="f1f509a1c4623056c8e780bb7c9a05c5" -BUILD { +BUILD() +{ cd pychart-1.39-bzr python setup.py config python setup.py build } -INSTALL { +INSTALL() +{ cd pychart-1.39-bzr python setup.py install --root=${DESTDIR} } -TEST { +TEST() +{ cd pychart-1.39-bzr/demos make } diff --git a/dev-python/pychart/pychart-1.39.bep b/dev-python/pychart/pychart-1.39.recipe similarity index 94% rename from dev-python/pychart/pychart-1.39.bep rename to dev-python/pychart/pychart-1.39.recipe index 0d4469f17..eda016918 100644 --- a/dev-python/pychart/pychart-1.39.bep +++ b/dev-python/pychart/pychart-1.39.recipe @@ -5,19 +5,22 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="f1f509a1c4623056c8e780bb7c9a05c5" -BUILD { +BUILD() +{ cd PyChart-1.39 python setup.py config python setup.py build } -INSTALL { +INSTALL() +{ cd PyChart-1.39 python setup.py install --root=${DESTDIR} } -TEST { +TEST() +{ cd PyChart-1.39/demos make } diff --git a/dev-python/pycrypto/pycrypto-2.3.bep b/dev-python/pycrypto/pycrypto-2.3.recipe similarity index 96% rename from dev-python/pycrypto/pycrypto-2.3.bep rename to dev-python/pycrypto/pycrypto-2.3.recipe index f34147622..27c9dc0bb 100644 --- a/dev-python/pycrypto/pycrypto-2.3.bep +++ b/dev-python/pycrypto/pycrypto-2.3.recipe @@ -5,11 +5,13 @@ REVISION= "1" STATUS_HAIKU="unstable" DEPEND="" CHECKSUM_MD5="2b811cfbfc342d83ee614097effb8101" -BUILD { +BUILD() +{ cd pycrypto-2.3 python setup.py build } -INSTALL { +INSTALL() +{ cd pycrypto-2.3 if [ -n "${DESTDIR}" ];then python setup.py install --root=${DESTDIR} diff --git a/dev-python/pydispatcher/pydispatcher-2.0.1.bep b/dev-python/pydispatcher/pydispatcher-2.0.1.recipe similarity index 96% rename from dev-python/pydispatcher/pydispatcher-2.0.1.bep rename to dev-python/pydispatcher/pydispatcher-2.0.1.recipe index 73788bc85..6b39e5a92 100644 --- a/dev-python/pydispatcher/pydispatcher-2.0.1.bep +++ b/dev-python/pydispatcher/pydispatcher-2.0.1.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="dev-python/setuptools >= 0.6" CHECKSUM_MD5="8b1695ed6f5bdbda8fbcde82b62d505c" -BUILD { +BUILD() +{ cd PyDispatcher-2.0.1 python setup.py build } -INSTALL { +INSTALL() +{ cd PyDispatcher-2.0.1 python setup.py install --root=${DESTDIR} diff --git a/dev-python/pygame/pygame-1.9.1.bep b/dev-python/pygame/pygame-1.9.1.recipe similarity index 96% rename from dev-python/pygame/pygame-1.9.1.bep rename to dev-python/pygame/pygame-1.9.1.recipe index 37d69521a..eb266e8ba 100644 --- a/dev-python/pygame/pygame-1.9.1.bep +++ b/dev-python/pygame/pygame-1.9.1.recipe @@ -9,13 +9,15 @@ DEPEND="dev-lang/python >= 2.6.4 media-libs/sdl-image >= 1.2.10 media-libs/smpeg >= 0.4.5" -BUILD { +BUILD() +{ cd pygame-1.9.1release LOCALBASE=/boot/common/ python setup.py build } -INSTALL { +INSTALL() +{ cd pygame-1.9.1release python setup.py install --root=${DESTDIR} } diff --git a/dev-python/pylzma/pylzma-0.4.4.bep b/dev-python/pylzma/pylzma-0.4.4.recipe similarity index 95% rename from dev-python/pylzma/pylzma-0.4.4.bep rename to dev-python/pylzma/pylzma-0.4.4.recipe index 72da8b4ea..1cf497c91 100644 --- a/dev-python/pylzma/pylzma-0.4.4.bep +++ b/dev-python/pylzma/pylzma-0.4.4.recipe @@ -7,12 +7,14 @@ DEPEND="dev-lang/python >= 2.6.4 REVISION="1" CHECKSUM_MD5="a2be89cb2288174ebb18bec68fa559fb" -BUILD { +BUILD() +{ cd pylzma-0.4.4 python setup.py build } -INSTALL { +INSTALL() +{ cd pylzma-0.4.4 python setup.py install } diff --git a/dev-python/pyopengl/pyopengl-3.0.1.bep b/dev-python/pyopengl/pyopengl-3.0.1.recipe similarity index 95% rename from dev-python/pyopengl/pyopengl-3.0.1.bep rename to dev-python/pyopengl/pyopengl-3.0.1.recipe index 4365428fc..90519f858 100644 --- a/dev-python/pyopengl/pyopengl-3.0.1.bep +++ b/dev-python/pyopengl/pyopengl-3.0.1.recipe @@ -7,12 +7,14 @@ STATUS_HAIKU="unstable" DEPEND="dev-lang/python >= 2.6.4 media-libs/freeglut" -BUILD { +BUILD() +{ cd PyOpenGL-3.0.1 python setup.py build } -INSTALL { +INSTALL() +{ cd PyOpenGL-3.0.1 python setup.py install --root=${DESTDIR} } diff --git a/dev-python/pyserial/pyserial-2.5.bep b/dev-python/pyserial/pyserial-2.5.recipe similarity index 96% rename from dev-python/pyserial/pyserial-2.5.bep rename to dev-python/pyserial/pyserial-2.5.recipe index 2529314bc..c17ff5e6b 100644 --- a/dev-python/pyserial/pyserial-2.5.bep +++ b/dev-python/pyserial/pyserial-2.5.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-lang/python >= 2.6.4" -BUILD { +BUILD() +{ cd pyserial-2.5 python setup.py build } -INSTALL { +INSTALL() +{ cd pyserial-2.5 python setup.py install --root=${DESTDIR} diff --git a/dev-python/pyxml/pyxml-0.8.4.bep b/dev-python/pyxml/pyxml-0.8.4.recipe similarity index 95% rename from dev-python/pyxml/pyxml-0.8.4.bep rename to dev-python/pyxml/pyxml-0.8.4.recipe index b833fc30f..b64ff72dd 100644 --- a/dev-python/pyxml/pyxml-0.8.4.bep +++ b/dev-python/pyxml/pyxml-0.8.4.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="1f7655050cebbb664db976405fdba209" REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-lang/python >= 2.6.4" -BUILD { +BUILD() +{ cd PyXML-0.8.4 python setup.py build } -INSTALL { +INSTALL() +{ cd PyXML-0.8.4 python setup.py install --root=${DESTDIR} } diff --git a/dev-python/rdflib/rdflib-3.2.0.bep b/dev-python/rdflib/rdflib-3.2.0.recipe similarity index 95% rename from dev-python/rdflib/rdflib-3.2.0.bep rename to dev-python/rdflib/rdflib-3.2.0.recipe index 60cadd742..1de760e0f 100644 --- a/dev-python/rdflib/rdflib-3.2.0.bep +++ b/dev-python/rdflib/rdflib-3.2.0.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="ab3d3a5f71ebb6fe4fd33539f5d5768e" REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-lang/python >= 2.6.4" -BUILD { +BUILD() +{ cd rdflib-3.2.0 python setup.py build } -INSTALL { +INSTALL() +{ cd rdflib-3.2.0 python setup.py install --root=${DESTDIR} } diff --git a/dev-python/setuptools/setuptools-0.6.bep b/dev-python/setuptools/setuptools-0.6.recipe similarity index 96% rename from dev-python/setuptools/setuptools-0.6.bep rename to dev-python/setuptools/setuptools-0.6.recipe index 6c6708db4..c57353d61 100644 --- a/dev-python/setuptools/setuptools-0.6.bep +++ b/dev-python/setuptools/setuptools-0.6.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="7df2a529a074f613b509fb44feefe74e" -BUILD { +BUILD() +{ cd setuptools-0.6c11 python setup.py build } -INSTALL { +INSTALL() +{ cd setuptools-0.6c11 if [ -n "${DESTDIR}" ];then python setup.py install --root=${DESTDIR} diff --git a/dev-python/simpleparse/simpleparse-2.1.1a2.bep b/dev-python/simpleparse/simpleparse-2.1.1a2.recipe similarity index 95% rename from dev-python/simpleparse/simpleparse-2.1.1a2.bep rename to dev-python/simpleparse/simpleparse-2.1.1a2.recipe index 5c4c5c2ea..673b4ba77 100644 --- a/dev-python/simpleparse/simpleparse-2.1.1a2.bep +++ b/dev-python/simpleparse/simpleparse-2.1.1a2.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="9c4e13b4f9b087442f76e7382ba97e3b" -BUILD { +BUILD() +{ cd SimpleParse-2.1.1a2 python setup.py build } -INSTALL { +INSTALL() +{ cd SimpleParse-2.1.1a2 python setup.py install --root=${DESTDIR} diff --git a/dev-qt/qtcore/qtcore-4.7.3.bep b/dev-qt/qtcore/qtcore-4.7.3.recipe similarity index 97% rename from dev-qt/qtcore/qtcore-4.7.3.bep rename to dev-qt/qtcore/qtcore-4.7.3.recipe index 2ac139579..5124291b7 100644 --- a/dev-qt/qtcore/qtcore-4.7.3.bep +++ b/dev-qt/qtcore/qtcore-4.7.3.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="49b96eefb1224cc529af6fe5608654fe" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd qt-everywhere-opensource-src-4.7.3 configure --prefix-install=no -no-pch -no-opengl -no-largefile \ -fast -nomake examples -nomake demos -release -opensource \ @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd qt-everywhere-opensource-src-4.7.3 make install INSTALL_ROOT=${DESTDIR} } diff --git a/dev-qt/qtcore/qtcore-4.8.x-git.bep b/dev-qt/qtcore/qtcore-4.8.x-git.recipe similarity index 97% rename from dev-qt/qtcore/qtcore-4.8.x-git.bep rename to dev-qt/qtcore/qtcore-4.8.x-git.recipe index eacedad16..5eddfd99a 100644 --- a/dev-qt/qtcore/qtcore-4.8.x-git.bep +++ b/dev-qt/qtcore/qtcore-4.8.x-git.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd qtcore-4.8.x-git configure --prefix-install=no -no-pch -no-opengl -no-largefile \ -fast -nomake examples -nomake demos -release -opensource \ @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd qtcore-4.8.x-git make install INSTALL_ROOT=${DESTDIR} } diff --git a/dev-qt/qtcore/qtcore-4.8.x.bep b/dev-qt/qtcore/qtcore-4.8.x.recipe similarity index 96% rename from dev-qt/qtcore/qtcore-4.8.x.bep rename to dev-qt/qtcore/qtcore-4.8.x.recipe index af23591c3..e427e3c4f 100644 --- a/dev-qt/qtcore/qtcore-4.8.x.bep +++ b/dev-qt/qtcore/qtcore-4.8.x.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd qtcore-4.8.x configure --prefix-install=no -no-pch -no-opengl -no-largefile \ -fast -nomake examples -nomake demos -release -opensource \ @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd qtcore-4.8.x make install INSTALL_ROOT=${DESTDIR} } diff --git a/dev-scheme/chicken/chicken-4.5.0.bep b/dev-scheme/chicken/chicken-4.5.0.recipe similarity index 95% rename from dev-scheme/chicken/chicken-4.5.0.bep rename to dev-scheme/chicken/chicken-4.5.0.recipe index 21c470309..60161bb62 100644 --- a/dev-scheme/chicken/chicken-4.5.0.bep +++ b/dev-scheme/chicken/chicken-4.5.0.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="753aea676a18c8dc0161dfb4d1717e20" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd chicken-4.5.0 make PLATFORM=haiku PREFIX=/boot/common } -INSTALL { +INSTALL() +{ cd chicken-4.5.0 make PLATFORM=haiku PREFIX=/boot/common install } diff --git a/dev-scheme/chicken/chicken-4.7.0.bep b/dev-scheme/chicken/chicken-4.7.0.recipe similarity index 97% rename from dev-scheme/chicken/chicken-4.7.0.bep rename to dev-scheme/chicken/chicken-4.7.0.recipe index a08075989..5a1e785f4 100644 --- a/dev-scheme/chicken/chicken-4.7.0.bep +++ b/dev-scheme/chicken/chicken-4.7.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="9389388fdf04c3c64de29633aae12539" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd chicken-4.7.0 if [ `gcc -dumpversion | cut -f1 -d.` -eq "2" ];then echo "Removing -fwrapv flag for gcc2 build" @@ -18,7 +19,8 @@ BUILD { } -INSTALL { +INSTALL() +{ cd chicken-4.7.0 make PLATFORM=haiku PREFIX=`finddir B_COMMON_DIRECTORY` install \ MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1 \ @@ -26,7 +28,8 @@ INSTALL { DATADIR=`finddir B_COMMON_DATA_DIRECTORY`/chicken } -TEST { +TEST() +{ if ! type -p csi > /dev/null;then echo "ERROR: Chicken must be installed before running the test suite" exit 1 diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.bep b/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.recipe similarity index 97% rename from dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.bep rename to dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.recipe index c16b203e5..3befe3f31 100644 --- a/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.bep +++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="e2ca96bf71b014eefa11fe10a6f7d1f6" -BUILD { +BUILD() +{ cd abi-compliance-checker-1.98.3 sed -i 's/linux|freebsd|openbsd|netbsd/linux|freebsd|openbsd|netbsd|haiku/' Makefile.pl sed -i 's/$PREFIX\/share\/$TOOL_SNAME/$PREFIX\/data\/$TOOL_SNAME/' Makefile.pl sed -i 's/..\/share\/$TOOL_SNAME/..\/data\/$TOOL_SNAME/' Makefile.pl } -INSTALL { +INSTALL() +{ cd abi-compliance-checker-1.98.3 mkdir -p $DESTDIR/`finddir B_COMMON_DIRECTORY`/example-descriptors perl Makefile.pl -install --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -21,7 +23,8 @@ INSTALL { $DESTDIR/`finddir B_COMMON_DIRECTORY`/data/abi-compliance-checker } -TEST { +TEST() +{ cd abi-compliance-checker-1.98.3 # make test # make check diff --git a/dev-util/astyle/astyle-r339.bep b/dev-util/astyle/astyle-r339.recipe similarity index 96% rename from dev-util/astyle/astyle-r339.bep rename to dev-util/astyle/astyle-r339.recipe index b7d557061..95757a163 100644 --- a/dev-util/astyle/astyle-r339.bep +++ b/dev-util/astyle/astyle-r339.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd astyle-r339/build/gcc make prefix=$(finddir B_COMMON_DIRECTORY) } -INSTALL { +INSTALL() +{ cd astyle-r339/build/gcc make install \ prefix="${DESTDIR}/$(finddir B_COMMON_DIRECTORY)" \ diff --git a/dev-util/astyle/astyle-r361.bep b/dev-util/astyle/astyle-r361.recipe similarity index 96% rename from dev-util/astyle/astyle-r361.bep rename to dev-util/astyle/astyle-r361.recipe index 820652fd6..7dcb35fff 100644 --- a/dev-util/astyle/astyle-r361.bep +++ b/dev-util/astyle/astyle-r361.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd astyle-r361/build/gcc make prefix=$(finddir B_COMMON_DIRECTORY) } -INSTALL { +INSTALL() +{ cd astyle-r361/build/gcc make install \ prefix="${DESTDIR}/$(finddir B_COMMON_DIRECTORY)" \ diff --git a/dev-util/automoc/automoc-4-git.bep b/dev-util/automoc/automoc-4-git.recipe similarity index 93% rename from dev-util/automoc/automoc-4-git.bep rename to dev-util/automoc/automoc-4-git.recipe index c05ae9b06..dc84eeb51 100644 --- a/dev-util/automoc/automoc-4-git.bep +++ b/dev-util/automoc/automoc-4-git.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="qt4, cmake" -BUILD { +BUILD() +{ cd automoc-4-git cmake CMakeLists.txt make } -INSTALL { +INSTALL() +{ cd automoc-4-git make install } diff --git a/dev-util/bakefile/bakefile-0.2.8.bep b/dev-util/bakefile/bakefile-0.2.8.recipe similarity index 95% rename from dev-util/bakefile/bakefile-0.2.8.bep rename to dev-util/bakefile/bakefile-0.2.8.recipe index e668d3760..562bee05f 100644 --- a/dev-util/bakefile/bakefile-0.2.8.bep +++ b/dev-util/bakefile/bakefile-0.2.8.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5 = "874da5c9035514366b7723bc7657c71c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bakefile-0.2.8 touch ./ChangeLog libtoolize --force --copy --install @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd bakefile-0.2.8 make install } diff --git a/dev-util/bsdbuild/bsdbuild-2.9.bep b/dev-util/bsdbuild/bsdbuild-2.9.recipe similarity index 97% rename from dev-util/bsdbuild/bsdbuild-2.9.bep rename to dev-util/bsdbuild/bsdbuild-2.9.recipe index e77108333..5503da2bb 100644 --- a/dev-util/bsdbuild/bsdbuild-2.9.bep +++ b/dev-util/bsdbuild/bsdbuild-2.9.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="broken" DEPEND="dev-lang/perl >= 5.10 dev-lang/lua >= 5.1" CHECKSUM_MD5="fd0d4a754024a39d9cf1f5e42f8075b5" -BUILD { +BUILD() +{ cd bsdbuild-2.9 cp mkconfigure.pl mkconfigure # cp gen-dotdepend.pl gen-dotdepend-tmp.pl @@ -24,12 +25,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd bsdbuild-2.9 make install } -TEST { +TEST() +{ cd bsdbuild-2.9 # make test # make check diff --git a/dev-util/buildsystem/buildsystem-0.bep b/dev-util/buildsystem/buildsystem-0.recipe similarity index 94% rename from dev-util/buildsystem/buildsystem-0.bep rename to dev-util/buildsystem/buildsystem-0.recipe index 3b3a51491..e8074bdb9 100644 --- a/dev-util/buildsystem/buildsystem-0.bep +++ b/dev-util/buildsystem/buildsystem-0.recipe @@ -4,12 +4,14 @@ SRC_URI="git://git.netsurf-browser.org/buildsystem" REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd buildsystem-0 make } -INSTALL { +INSTALL() +{ cd buildsystem-0 make install PREFIX=/boot/common/ } diff --git a/dev-util/ccache/ccache-3.0.1.bep b/dev-util/ccache/ccache-3.0.1.recipe similarity index 95% rename from dev-util/ccache/ccache-3.0.1.bep rename to dev-util/ccache/ccache-3.0.1.recipe index afd44e30a..c0b966fdc 100644 --- a/dev-util/ccache/ccache-3.0.1.bep +++ b/dev-util/ccache/ccache-3.0.1.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="223449f7891e5d6a15b25100eca5cca4" -BUILD { +BUILD() +{ cd ccache-3.0.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } -INSTALL { +INSTALL() +{ cd ccache-3.0.1 make install } diff --git a/dev-util/ccache/ccache-3.1.4.bep b/dev-util/ccache/ccache-3.1.4.recipe similarity index 95% rename from dev-util/ccache/ccache-3.1.4.bep rename to dev-util/ccache/ccache-3.1.4.recipe index 82185cdb3..430dbcedc 100644 --- a/dev-util/ccache/ccache-3.1.4.bep +++ b/dev-util/ccache/ccache-3.1.4.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="676fda8a9a5e02574435c32b22942abd" -BUILD { +BUILD() +{ cd ccache-3.1.4 sed -i 's/\-lm//g' Ma* ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } -INSTALL { +INSTALL() +{ cd ccache-3.1.4 make install } diff --git a/dev-util/ccache/ccache-3.1.7.bep b/dev-util/ccache/ccache-3.1.7.recipe similarity index 95% rename from dev-util/ccache/ccache-3.1.7.bep rename to dev-util/ccache/ccache-3.1.7.recipe index 88e8845fc..a999d612c 100644 --- a/dev-util/ccache/ccache-3.1.7.bep +++ b/dev-util/ccache/ccache-3.1.7.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="82257745eac54826527946e9e3d046f4" -BUILD { +BUILD() +{ cd ccache-3.1.7 sed -i 's/\-lm//g' Ma* ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } -INSTALL { +INSTALL() +{ cd ccache-3.1.7 make install } diff --git a/dev-util/cmake/cmake-2.6.4.bep b/dev-util/cmake/cmake-2.6.4.recipe similarity index 95% rename from dev-util/cmake/cmake-2.6.4.bep rename to dev-util/cmake/cmake-2.6.4.recipe index 58ad39107..e56b75190 100644 --- a/dev-util/cmake/cmake-2.6.4.bep +++ b/dev-util/cmake/cmake-2.6.4.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="50f387d0436696c4a68b5512a72c9cde" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cmake-2.6.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd cmake-2.6.4 make install } diff --git a/dev-util/cmake/cmake-2.8-git.bep b/dev-util/cmake/cmake-2.8-git.recipe similarity index 96% rename from dev-util/cmake/cmake-2.8-git.bep rename to dev-util/cmake/cmake-2.8-git.recipe index bb2e85396..6916936fb 100644 --- a/dev-util/cmake/cmake-2.8-git.bep +++ b/dev-util/cmake/cmake-2.8-git.recipe @@ -5,7 +5,8 @@ SRC_URI="git+http://cmake.org/cmake.git" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd cmake-2.8-git # cmake appends the prefix to mandir and datadir # so using ../../ to back that part out but for some reason @@ -19,12 +20,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cmake-2.8-git make install } -TEST { +TEST() +{ cd cmake-2.8-git make test } diff --git a/dev-util/cmake/cmake-2.8.0.bep b/dev-util/cmake/cmake-2.8.0.recipe similarity index 95% rename from dev-util/cmake/cmake-2.8.0.bep rename to dev-util/cmake/cmake-2.8.0.recipe index f35325ced..4c7fdcbbf 100644 --- a/dev-util/cmake/cmake-2.8.0.bep +++ b/dev-util/cmake/cmake-2.8.0.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="3b3679b8a6afaedc38a8c15dd7ff4fcf" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cmake-2.8.0 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd cmake-2.8.0 make install } diff --git a/dev-util/cmake/cmake-2.8.1.bep b/dev-util/cmake/cmake-2.8.1.recipe similarity index 95% rename from dev-util/cmake/cmake-2.8.1.bep rename to dev-util/cmake/cmake-2.8.1.recipe index 461a14f7b..80d31865e 100644 --- a/dev-util/cmake/cmake-2.8.1.bep +++ b/dev-util/cmake/cmake-2.8.1.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="feadc2e5ebbfed0efc90178583503725" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cmake-2.8.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd cmake-2.8.1 make install } diff --git a/dev-util/cmake/cmake-2.8.10.2.bep b/dev-util/cmake/cmake-2.8.10.2.recipe similarity index 97% rename from dev-util/cmake/cmake-2.8.10.2.bep rename to dev-util/cmake/cmake-2.8.10.2.recipe index 72db78d2a..3ab461703 100644 --- a/dev-util/cmake/cmake-2.8.10.2.bep +++ b/dev-util/cmake/cmake-2.8.10.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="097278785da7182ec0aea8769d06860c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cmake-2.8.10.2 # cmake assumes the aclocal dir is in share/aclocal sed -i 's/share\/aclocal/data\/aclocal/g' Source/cmakemain.cxx @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cmake-2.8.10.2 make install } diff --git a/dev-util/cmake/cmake-2.8.2.bep b/dev-util/cmake/cmake-2.8.2.recipe similarity index 95% rename from dev-util/cmake/cmake-2.8.2.bep rename to dev-util/cmake/cmake-2.8.2.recipe index 4d8645f05..34695a63f 100644 --- a/dev-util/cmake/cmake-2.8.2.bep +++ b/dev-util/cmake/cmake-2.8.2.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="8c967d5264657a798f22ee23976ff0d9" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cmake-2.8.2 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd cmake-2.8.2 make install } diff --git a/dev-util/cmake/cmake-2.8.3.bep b/dev-util/cmake/cmake-2.8.3.recipe similarity index 95% rename from dev-util/cmake/cmake-2.8.3.bep rename to dev-util/cmake/cmake-2.8.3.recipe index aa753fa5a..2b2f007af 100644 --- a/dev-util/cmake/cmake-2.8.3.bep +++ b/dev-util/cmake/cmake-2.8.3.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="a76a44b93acf5e3badda9de111385921" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cmake-2.8.3 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd cmake-2.8.3 make install } diff --git a/dev-util/cmake/cmake-2.8.4.bep b/dev-util/cmake/cmake-2.8.4.recipe similarity index 97% rename from dev-util/cmake/cmake-2.8.4.bep rename to dev-util/cmake/cmake-2.8.4.recipe index 7725b1668..628922d88 100644 --- a/dev-util/cmake/cmake-2.8.4.bep +++ b/dev-util/cmake/cmake-2.8.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="209b7d1d04b2e00986538d74ba764fcf" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cmake-2.8.4 # cmake appends the prefix to mandir and datadir # so using ../../ to back that part out but for some reason @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cmake-2.8.4 make install } diff --git a/dev-util/cmake/cmake-2.8.5.bep b/dev-util/cmake/cmake-2.8.5.recipe similarity index 97% rename from dev-util/cmake/cmake-2.8.5.bep rename to dev-util/cmake/cmake-2.8.5.recipe index b08109c16..dde87fa24 100644 --- a/dev-util/cmake/cmake-2.8.5.bep +++ b/dev-util/cmake/cmake-2.8.5.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cmake-2.8.5 # cmake appends the prefix to mandir and datadir # so using ../../ to back that part out but for some reason @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cmake-2.8.5 make install } diff --git a/dev-util/cppunit/cppunit-1.12.1.bep b/dev-util/cppunit/cppunit-1.12.1.recipe similarity index 95% rename from dev-util/cppunit/cppunit-1.12.1.bep rename to dev-util/cppunit/cppunit-1.12.1.recipe index b6acee2c0..f1d7044bf 100644 --- a/dev-util/cppunit/cppunit-1.12.1.bep +++ b/dev-util/cppunit/cppunit-1.12.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5 = "bd30e9cf5523cdfc019b94f5e1d7fd19" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cppunit-1.12.1 libtoolize --force --copy --install autoreconf -i @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cppunit-1.12.1 make install } diff --git a/dev-util/cscope/cscope-15.7a.bep b/dev-util/cscope/cscope-15.7a.recipe similarity index 95% rename from dev-util/cscope/cscope-15.7a.bep rename to dev-util/cscope/cscope-15.7a.recipe index de9159eb5..de04966d8 100644 --- a/dev-util/cscope/cscope-15.7a.bep +++ b/dev-util/cscope/cscope-15.7a.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="da43987622ace8c36bbf14c15a350ec1" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cscope-15.7a autoreconf -fvi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd cscope-15.7a make install } diff --git a/dev-util/ctags/ctags-5.8.bep b/dev-util/ctags/ctags-5.8.recipe similarity index 96% rename from dev-util/ctags/ctags-5.8.bep rename to dev-util/ctags/ctags-5.8.recipe index 409a72ab6..d00ceb3ff 100644 --- a/dev-util/ctags/ctags-5.8.bep +++ b/dev-util/ctags/ctags-5.8.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="c00f82ecdcc357434731913e5b48630d" -BUILD { +BUILD() +{ cd ctags-5.8 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } -INSTALL { +INSTALL() +{ cd ctags-5.8 make install prefix=${DESTDIR}`finddir B_COMMON_DIRECTORY` \ mandir=${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man diff --git a/dev-util/diffstat/diffstat-1.51.bep b/dev-util/diffstat/diffstat-1.51.recipe similarity index 95% rename from dev-util/diffstat/diffstat-1.51.bep rename to dev-util/diffstat/diffstat-1.51.recipe index d3a73f46f..2a1663405 100644 --- a/dev-util/diffstat/diffstat-1.51.bep +++ b/dev-util/diffstat/diffstat-1.51.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="a7d3fd1ba2a9a6c9e2b32e867b5e8792" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd diffstat-1.51 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd diffstat-1.51 make install DESTDIR="${DESTDIR}" } diff --git a/dev-util/fastdep/fastdep-0.16.bep b/dev-util/fastdep/fastdep-0.16.recipe similarity index 95% rename from dev-util/fastdep/fastdep-0.16.bep rename to dev-util/fastdep/fastdep-0.16.recipe index d299b7249..dee98f264 100644 --- a/dev-util/fastdep/fastdep-0.16.bep +++ b/dev-util/fastdep/fastdep-0.16.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="838c08b790a5dfe9a50a4aec7947bc54" -BUILD { +BUILD() +{ cd fastdep-0.16 ./configure make } -INSTALL { +INSTALL() +{ cd fastdep-0.16 mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` cp -f fastdep ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` diff --git a/dev-util/global/global-6.2.2.bep b/dev-util/global/global-6.2.2.recipe similarity index 97% rename from dev-util/global/global-6.2.2.bep rename to dev-util/global/global-6.2.2.recipe index 34cb8672f..3c44a3930 100644 --- a/dev-util/global/global-6.2.2.bep +++ b/dev-util/global/global-6.2.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8317d2d6914a8e18cd725f9cd7164b87" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/ctags >= 5.8" -BUILD { +BUILD() +{ cd global-6.2.2 autoreconf -fi ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd global-6.2.2 make install } diff --git a/dev-util/global/global-6.2.4.bep b/dev-util/global/global-6.2.4.recipe similarity index 97% rename from dev-util/global/global-6.2.4.bep rename to dev-util/global/global-6.2.4.recipe index 2fea5fdf7..b98c32ac6 100644 --- a/dev-util/global/global-6.2.4.bep +++ b/dev-util/global/global-6.2.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="c778d4e52a30706db7a02070cce1078c" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/ctags >= 5.8" -BUILD { +BUILD() +{ cd global-6.2.4 autoreconf -fi ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd global-6.2.4 make install } diff --git a/dev-util/gperf/gperf-3.0.4.bep b/dev-util/gperf/gperf-3.0.4.recipe similarity index 96% rename from dev-util/gperf/gperf-3.0.4.bep rename to dev-util/gperf/gperf-3.0.4.recipe index c4071044c..7a197d14c 100644 --- a/dev-util/gperf/gperf-3.0.4.bep +++ b/dev-util/gperf/gperf-3.0.4.recipe @@ -5,7 +5,8 @@ REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="c1f1db32fb6598d6a93e6e88796a8632" -BUILD { +BUILD() +{ cd gperf-3.0.4 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gperf-3.0.4 make install } diff --git a/dev-util/gtk-doc/gtk-doc-1.15.bep b/dev-util/gtk-doc/gtk-doc-1.15.recipe similarity index 95% rename from dev-util/gtk-doc/gtk-doc-1.15.bep rename to dev-util/gtk-doc/gtk-doc-1.15.recipe index dbb09f8c3..87f6e85b7 100644 --- a/dev-util/gtk-doc/gtk-doc-1.15.bep +++ b/dev-util/gtk-doc/gtk-doc-1.15.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="pkgconfig >= 0.23 dev-libs/libxslt >= 1.1.26" -BUILD { +BUILD() +{ cd gtk-doc-1.15 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd gtk-doc-1.15 make install } diff --git a/dev-util/idutils/idutils-20061208.bep b/dev-util/idutils/idutils-20061208.recipe similarity index 95% rename from dev-util/idutils/idutils-20061208.bep rename to dev-util/idutils/idutils-20061208.recipe index 680bf7356..6d0261204 100644 --- a/dev-util/idutils/idutils-20061208.bep +++ b/dev-util/idutils/idutils-20061208.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="75cd31c5401c329cdefc272c60c83422" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd idutils-cvs libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd idutils-cvs make install } diff --git a/dev-util/idutils/idutils-4.2.bep b/dev-util/idutils/idutils-4.2.recipe similarity index 95% rename from dev-util/idutils/idutils-4.2.bep rename to dev-util/idutils/idutils-4.2.recipe index 137fb9d96..8733badb2 100644 --- a/dev-util/idutils/idutils-4.2.bep +++ b/dev-util/idutils/idutils-4.2.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="4bbd2cb0d566ab29e41088cc028ad710" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd idutils-4.2 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd idutils-4.2 make install } diff --git a/dev-util/indent/indent-2.2.11.bep b/dev-util/indent/indent-2.2.11.recipe similarity index 96% rename from dev-util/indent/indent-2.2.11.bep rename to dev-util/indent/indent-2.2.11.recipe index b9649ad6d..aebc21acc 100644 --- a/dev-util/indent/indent-2.2.11.bep +++ b/dev-util/indent/indent-2.2.11.recipe @@ -7,7 +7,8 @@ DEPEND="sys-devel/gettext >= 0.17 net-misc/rsync >= 3.0.7 app-text/texi2html >= 1.82" CHECKSUM_MD5="98beafca62472805a3739d3867d5d70f" -BUILD { +BUILD() +{ cd indent-2.2.11 libtoolize --force --copy --install ./bootstrap @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd indent-2.2.11 make install DESTDIR=${DESTDIR} } -TEST { +TEST() +{ cd indent-2.2.11 # make test # make check diff --git a/dev-util/intltool/intltool-0.40.6.bep b/dev-util/intltool/intltool-0.40.6.recipe similarity index 96% rename from dev-util/intltool/intltool-0.40.6.bep rename to dev-util/intltool/intltool-0.40.6.recipe index 9b91877ea..05eb668c7 100644 --- a/dev-util/intltool/intltool-0.40.6.bep +++ b/dev-util/intltool/intltool-0.40.6.recipe @@ -6,7 +6,8 @@ REVISION="2" STATUS_HAIKU="stable" MESSAGE="Requires XML::Parser perl module installed" DEPEND="" -BUILD { +BUILD() +{ cd intltool-0.40.6 ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd intltool-0.40.6 make install make check diff --git a/dev-util/patchutils/patchutils-0.3.1.bep b/dev-util/patchutils/patchutils-0.3.1.recipe similarity index 95% rename from dev-util/patchutils/patchutils-0.3.1.bep rename to dev-util/patchutils/patchutils-0.3.1.recipe index 1e5a0f704..7a5547008 100644 --- a/dev-util/patchutils/patchutils-0.3.1.bep +++ b/dev-util/patchutils/patchutils-0.3.1.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="3fd9bca58a429fbbb1c2126f1b72aa23" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd patchutils-0.3.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd patchutils-0.3.1 make install } diff --git a/dev-util/patchutils/patchutils-0.3.2.bep b/dev-util/patchutils/patchutils-0.3.2.recipe similarity index 95% rename from dev-util/patchutils/patchutils-0.3.2.bep rename to dev-util/patchutils/patchutils-0.3.2.recipe index db1ed8e5e..7d7aba0f1 100644 --- a/dev-util/patchutils/patchutils-0.3.2.bep +++ b/dev-util/patchutils/patchutils-0.3.2.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="74607b4a28c9009c6aeeed0e91098917" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd patchutils-0.3.2 ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ --mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" make } -INSTALL { +INSTALL() +{ cd patchutils-0.3.2 make install } diff --git a/dev-util/pjdfstest/pjdfstest-20100807.bep b/dev-util/pjdfstest/pjdfstest-20100807.recipe similarity index 94% rename from dev-util/pjdfstest/pjdfstest-20100807.bep rename to dev-util/pjdfstest/pjdfstest-20100807.recipe index 878545588..be1098a1c 100644 --- a/dev-util/pjdfstest/pjdfstest-20100807.bep +++ b/dev-util/pjdfstest/pjdfstest-20100807.recipe @@ -6,17 +6,20 @@ REVISION="1" STATUS_HAIKU="broken" MESSAGE="This test suite requires expect, which hasn't been ported to Haiku, yet." DEPEND="" -BUILD { +BUILD() +{ cd pjdfstest-20100807 make } -INSTALL { +INSTALL() +{ cd pjdfstest-20100807 } -TEST { +TEST() +{ cd pjdfstest-20100807 } diff --git a/dev-util/pkgconfig/pkgconfig-0.23.bep b/dev-util/pkgconfig/pkgconfig-0.23.recipe similarity index 96% rename from dev-util/pkgconfig/pkgconfig-0.23.bep rename to dev-util/pkgconfig/pkgconfig-0.23.recipe index 2a71b584d..f5bd3a43d 100644 --- a/dev-util/pkgconfig/pkgconfig-0.23.bep +++ b/dev-util/pkgconfig/pkgconfig-0.23.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="d922a88782b64441d06547632fd85744" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pkg-config-0.23/glib-1.2.10 mkdir -p m4 libtoolize --force --copy --install @@ -22,7 +23,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pkg-config-0.23 make install } diff --git a/dev-util/pkgconfig/pkgconfig-0.25.bep b/dev-util/pkgconfig/pkgconfig-0.25.recipe similarity index 97% rename from dev-util/pkgconfig/pkgconfig-0.25.bep rename to dev-util/pkgconfig/pkgconfig-0.25.recipe index 6df116054..8c3067e73 100644 --- a/dev-util/pkgconfig/pkgconfig-0.25.bep +++ b/dev-util/pkgconfig/pkgconfig-0.25.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a3270bab3f4b69b7dc6dbdacbcae9745" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pkg-config-0.25/glib-1.2.10 mkdir -p m4 libtoolize --force --copy --install @@ -26,7 +27,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pkg-config-0.25 make install } diff --git a/dev-util/posixtestsuite/posixtestsuite-1.5.2.bep b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe similarity index 95% rename from dev-util/posixtestsuite/posixtestsuite-1.5.2.bep rename to dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe index 8343380ce..3a9eda09b 100644 --- a/dev-util/posixtestsuite/posixtestsuite-1.5.2.bep +++ b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe @@ -5,17 +5,20 @@ CHECKSUM_MD5="9a8e6516585c886fddc257270061b59c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd posixtestsuite make } -INSTALL { +INSTALL() +{ cd posixtestsuite make install } -TEST { +TEST() +{ cd posixtestsuite execute.sh } diff --git a/dev-util/premake/premake-4.3.bep b/dev-util/premake/premake-4.3.recipe similarity index 96% rename from dev-util/premake/premake-4.3.bep rename to dev-util/premake/premake-4.3.recipe index 823710ef2..d01ce86be 100644 --- a/dev-util/premake/premake-4.3.bep +++ b/dev-util/premake/premake-4.3.recipe @@ -6,12 +6,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd premake-4.3/build/gmake.unix make config=release } -INSTALL { +INSTALL() +{ cd premake-4.3/bin/release mkdir -p $DESTDIR`finddir B_COMMON_BIN_DIRECTORY` install -m 0755 premake4 $DESTDIR`finddir B_COMMON_BIN_DIRECTORY` diff --git a/dev-util/quilt/quilt-0.48.bep b/dev-util/quilt/quilt-0.48.recipe similarity index 96% rename from dev-util/quilt/quilt-0.48.bep rename to dev-util/quilt/quilt-0.48.recipe index ec42bbf25..ab9333581 100644 --- a/dev-util/quilt/quilt-0.48.bep +++ b/dev-util/quilt/quilt-0.48.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/diffstat >= 1.51 sys-apps/ed >= 1.4" -BUILD { +BUILD() +{ cd quilt-0.48 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` make EDITOR=nano } -INSTALL { +INSTALL() +{ cd quilt-0.48 make install BUILD_ROOT="${DESTDIR}" } diff --git a/dev-util/re2c/re2c-0.13.5.bep b/dev-util/re2c/re2c-0.13.5.recipe similarity index 95% rename from dev-util/re2c/re2c-0.13.5.bep rename to dev-util/re2c/re2c-0.13.5.recipe index 14ff7044c..949343943 100644 --- a/dev-util/re2c/re2c-0.13.5.bep +++ b/dev-util/re2c/re2c-0.13.5.recipe @@ -6,18 +6,21 @@ STATUS_HAIKU="broken" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." CHECKSUM_MD5="4a97d8f77ed6d2c76c8bd840a43f5633" -BUILD { +BUILD() +{ cd re2c-0.13.5 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd re2c-0.13.5 make install } -TEST { +TEST() +{ cd re2c-0.13.5 # make test # make check diff --git a/dev-util/scons/scons-1.0.1-python2.5.bep b/dev-util/scons/scons-1.0.1-python2.5.recipe similarity index 96% rename from dev-util/scons/scons-1.0.1-python2.5.bep rename to dev-util/scons/scons-1.0.1-python2.5.recipe index d3ac1ef58..35267247e 100644 --- a/dev-util/scons/scons-1.0.1-python2.5.bep +++ b/dev-util/scons/scons-1.0.1-python2.5.recipe @@ -7,12 +7,14 @@ CHECKSUM_MD5="139ef2e108789afe25ee0bdbb138b8c0" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/python <= 2.5.5" -BUILD { +BUILD() +{ cd scons-1.0.1 python2.5 setup.py build } -INSTALL { +INSTALL() +{ cd scons-1.0.1 if [ ! -z ${DESTDIR} ];then python2.5 setup.py install --root="${DESTDIR}" --prefix="/boot/common" --symlink-scons --standard-lib diff --git a/dev-util/scons/scons-1.0.1.bep b/dev-util/scons/scons-1.0.1.recipe similarity index 96% rename from dev-util/scons/scons-1.0.1.bep rename to dev-util/scons/scons-1.0.1.recipe index e007090ee..53279673d 100644 --- a/dev-util/scons/scons-1.0.1.bep +++ b/dev-util/scons/scons-1.0.1.recipe @@ -7,12 +7,14 @@ CHECKSUM_MD5="139ef2e108789afe25ee0bdbb138b8c0" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/python >= 2.5.4" -BUILD { +BUILD() +{ cd scons-1.0.1 python setup.py build } -INSTALL { +INSTALL() +{ cd scons-1.0.1 if [ ! -z ${DESTDIR} ];then python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --symlink-scons --standard-lib diff --git a/dev-util/scons/scons-2.0.1.bep b/dev-util/scons/scons-2.0.1.recipe similarity index 97% rename from dev-util/scons/scons-2.0.1.bep rename to dev-util/scons/scons-2.0.1.recipe index 6ec4b1a5e..b6c6f8453 100644 --- a/dev-util/scons/scons-2.0.1.bep +++ b/dev-util/scons/scons-2.0.1.recipe @@ -7,7 +7,8 @@ CHECKSUM_MD5="beca648b894cdbf85383fffc79516d18" REVISION="2" STATUS_HAIKU="stable" DEPEND="dev-lang/python >= 2.5.4" -BUILD { +BUILD() +{ cd scons-2.0.1 for f in "script/scons script/scons-time script/sconsign"; do sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f @@ -15,7 +16,8 @@ BUILD { python setup.py build } -INSTALL { +INSTALL() +{ if [ ! -z ${DESTDIR} ]; then options="${options} --root=${DESTDIR}" fi diff --git a/dev-util/scons/scons-2.2.0.bep b/dev-util/scons/scons-2.2.0.recipe similarity index 97% rename from dev-util/scons/scons-2.2.0.bep rename to dev-util/scons/scons-2.2.0.recipe index 8ecad51b5..007f389a7 100644 --- a/dev-util/scons/scons-2.2.0.bep +++ b/dev-util/scons/scons-2.2.0.recipe @@ -7,7 +7,8 @@ CHECKSUM_MD5="f737f474a02d08156c821bd2d4d4b632" REVISION="2" STATUS_HAIKU="stable" DEPEND="dev-lang/python >= 2.5.4" -BUILD { +BUILD() +{ cd scons-2.2.0 for f in "script/scons script/scons-time script/sconsign"; do sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f @@ -15,7 +16,8 @@ BUILD { python setup.py build } -INSTALL { +INSTALL() +{ if [ ! -z ${DESTDIR} ]; then options="${options} --root=${DESTDIR}" fi diff --git a/dev-vcs/bzr/bzr-2.2.0.bep b/dev-vcs/bzr/bzr-2.2.0.recipe similarity index 97% rename from dev-vcs/bzr/bzr-2.2.0.bep rename to dev-vcs/bzr/bzr-2.2.0.recipe index d2019e4ec..876b25b26 100644 --- a/dev-vcs/bzr/bzr-2.2.0.bep +++ b/dev-vcs/bzr/bzr-2.2.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bzr-2.2.0 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ cd bzr-2.2.0 COMMON_DIR=`finddir B_COMMON_DIRECTORY` COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` diff --git a/dev-vcs/bzr/bzr-2.2.1.bep b/dev-vcs/bzr/bzr-2.2.1.recipe similarity index 97% rename from dev-vcs/bzr/bzr-2.2.1.bep rename to dev-vcs/bzr/bzr-2.2.1.recipe index fd707fc9b..4823f24ec 100644 --- a/dev-vcs/bzr/bzr-2.2.1.bep +++ b/dev-vcs/bzr/bzr-2.2.1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bzr-2.2.1 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ cd bzr-2.2.1 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} diff --git a/dev-vcs/bzr/bzr-2.2.2.bep b/dev-vcs/bzr/bzr-2.2.2.recipe similarity index 97% rename from dev-vcs/bzr/bzr-2.2.2.bep rename to dev-vcs/bzr/bzr-2.2.2.recipe index 2fdd8947d..dc46f3f74 100644 --- a/dev-vcs/bzr/bzr-2.2.2.bep +++ b/dev-vcs/bzr/bzr-2.2.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bzr-2.2.2 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ cd bzr-2.2.2 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} diff --git a/dev-vcs/bzr/bzr-2.2b4.bep b/dev-vcs/bzr/bzr-2.2b4.recipe similarity index 97% rename from dev-vcs/bzr/bzr-2.2b4.bep rename to dev-vcs/bzr/bzr-2.2b4.recipe index d58e19065..aee57c6ba 100644 --- a/dev-vcs/bzr/bzr-2.2b4.bep +++ b/dev-vcs/bzr/bzr-2.2b4.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bzr-2.2b4 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ cd bzr-2.2b4 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} diff --git a/dev-vcs/bzr/bzr-2.5.1.bep b/dev-vcs/bzr/bzr-2.5.1.recipe similarity index 97% rename from dev-vcs/bzr/bzr-2.5.1.bep rename to dev-vcs/bzr/bzr-2.5.1.recipe index c13bb217c..e6fcbfd31 100644 --- a/dev-vcs/bzr/bzr-2.5.1.bep +++ b/dev-vcs/bzr/bzr-2.5.1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bzr-2.5.1 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ cd bzr-2.5.1 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} diff --git a/dev-vcs/bzr/bzr-2.6b1.bep b/dev-vcs/bzr/bzr-2.6b1.recipe similarity index 97% rename from dev-vcs/bzr/bzr-2.6b1.bep rename to dev-vcs/bzr/bzr-2.6b1.recipe index d7c6b572a..ea1c17639 100644 --- a/dev-vcs/bzr/bzr-2.6b1.bep +++ b/dev-vcs/bzr/bzr-2.6b1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bzr-2.6b1 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ cd bzr-2.6b1 if [ -n "$(setgcc | grep '2')" ]; then python setup.py build_ext --allow-python-fallback install --prefix=`finddir B_COMMON_DIRECTORY` --root=${DESTDIR} diff --git a/dev-vcs/cvs/cvs-1.12.13.1.bep b/dev-vcs/cvs/cvs-1.12.13.1.recipe similarity index 97% rename from dev-vcs/cvs/cvs-1.12.13.1.bep rename to dev-vcs/cvs/cvs-1.12.13.1.recipe index 94cf44780..172b2c168 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.bep +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -19,13 +19,15 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ libtoolize --force --copy --install ./configure $configureDirArgs --enable-rootcommit make } -INSTALL { +INSTALL() +{ make install } diff --git a/dev-vcs/cvs/cvs-1.12.13.bep b/dev-vcs/cvs/cvs-1.12.13.recipe similarity index 97% rename from dev-vcs/cvs/cvs-1.12.13.bep rename to dev-vcs/cvs/cvs-1.12.13.recipe index 2db43f73e..7fc26e23e 100644 --- a/dev-vcs/cvs/cvs-1.12.13.bep +++ b/dev-vcs/cvs/cvs-1.12.13.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="7a71a2e7a64973ecf255965956a1d338" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd cvs-1.12.13 libtoolize --force --copy --install autoconf @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cvs-1.12.13 make install } diff --git a/dev-vcs/fossil/fossil-1.22-fossil.bep b/dev-vcs/fossil/fossil-1.22-fossil.recipe similarity index 92% rename from dev-vcs/fossil/fossil-1.22-fossil.bep rename to dev-vcs/fossil/fossil-1.22-fossil.recipe index 5096cb997..fbf764793 100644 --- a/dev-vcs/fossil/fossil-1.22-fossil.bep +++ b/dev-vcs/fossil/fossil-1.22-fossil.recipe @@ -6,16 +6,19 @@ REVISION="3" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ make install } -TEST { +TEST() +{ make test } diff --git a/dev-vcs/fossil/fossil-1.22.bep b/dev-vcs/fossil/fossil-1.22.recipe similarity index 94% rename from dev-vcs/fossil/fossil-1.22.bep rename to dev-vcs/fossil/fossil-1.22.recipe index 2faffcee5..f06bf257a 100644 --- a/dev-vcs/fossil/fossil-1.22.bep +++ b/dev-vcs/fossil/fossil-1.22.recipe @@ -6,18 +6,21 @@ REVISION="3" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd fossil-src-20120317175325 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd fossil-src-20120317175325 make install } -TEST { +TEST() +{ cd fossil-src-20120317175325 make test } diff --git a/dev-vcs/git/git-1.7.10.2.bep b/dev-vcs/git/git-1.7.10.2.recipe similarity index 94% rename from dev-vcs/git/git-1.7.10.2.bep rename to dev-vcs/git/git-1.7.10.2.recipe index 16648b18e..0e7929703 100644 --- a/dev-vcs/git/git-1.7.10.2.bep +++ b/dev-vcs/git/git-1.7.10.2.recipe @@ -7,17 +7,20 @@ STATUS_HAIKU="stable" DEPEND="net-misc/curl >= 7.20.0 dev-lang/perl >= 5.10.1 dev-vcs/gitdoc == 1.7.10" -BUILD { +BUILD() +{ cd git-1.7.10.2 make strip } -INSTALL { +INSTALL() +{ cd git-1.7.10.2 make install } -TEST { +TEST() +{ cd git-1.7.10.2 make check } diff --git a/dev-vcs/git/git-1.7.11.3.bep b/dev-vcs/git/git-1.7.11.3.recipe similarity index 94% rename from dev-vcs/git/git-1.7.11.3.bep rename to dev-vcs/git/git-1.7.11.3.recipe index b7eb17c0a..e79806686 100644 --- a/dev-vcs/git/git-1.7.11.3.bep +++ b/dev-vcs/git/git-1.7.11.3.recipe @@ -7,17 +7,20 @@ STATUS_HAIKU="stable" DEPEND="net-misc/curl >= 7.20.0 dev-lang/perl >= 5.10.1 dev-vcs/gitdoc == 1.7.11.3" -BUILD { +BUILD() +{ cd git-1.7.11.3 make strip } -INSTALL { +INSTALL() +{ cd git-1.7.11.3 make install } -TEST { +TEST() +{ cd git-1.7.11.3 make check } diff --git a/dev-vcs/git/git-1.8.0.bep b/dev-vcs/git/git-1.8.0.recipe similarity index 93% rename from dev-vcs/git/git-1.8.0.bep rename to dev-vcs/git/git-1.8.0.recipe index 7f984a813..b96e28c7b 100644 --- a/dev-vcs/git/git-1.8.0.bep +++ b/dev-vcs/git/git-1.8.0.recipe @@ -7,17 +7,20 @@ STATUS_HAIKU="stable" DEPEND="net-misc/curl >= 7.20.0 dev-lang/perl >= 5.10.1 dev-vcs/gitdoc == 1.8.0" -BUILD { +BUILD() +{ cd git-1.8.0 make strip } -INSTALL { +INSTALL() +{ cd git-1.8.0 make install } -TEST { +TEST() +{ cd git-1.8.0 make check } diff --git a/dev-vcs/git/git-1.8.1.3.bep b/dev-vcs/git/git-1.8.1.3.recipe similarity index 94% rename from dev-vcs/git/git-1.8.1.3.bep rename to dev-vcs/git/git-1.8.1.3.recipe index ba37b6fe3..094ba2ef8 100644 --- a/dev-vcs/git/git-1.8.1.3.bep +++ b/dev-vcs/git/git-1.8.1.3.recipe @@ -7,17 +7,20 @@ STATUS_HAIKU="stable" DEPEND="net-misc/curl >= 7.20.0 dev-lang/perl >= 5.10.1 dev-vcs/gitdoc == 1.8.0" -BUILD { +BUILD() +{ cd git-1.8.1.3 make strip } -INSTALL { +INSTALL() +{ cd git-1.8.1.3 make install } -TEST { +TEST() +{ cd git-1.8.1.3 make check } diff --git a/dev-vcs/gitdoc/gitdoc-1.7.10.2.bep b/dev-vcs/gitdoc/gitdoc-1.7.10.2.recipe similarity index 97% rename from dev-vcs/gitdoc/gitdoc-1.7.10.2.bep rename to dev-vcs/gitdoc/gitdoc-1.7.10.2.recipe index 0eff3fdf2..a0fdaa334 100644 --- a/dev-vcs/gitdoc/gitdoc-1.7.10.2.bep +++ b/dev-vcs/gitdoc/gitdoc-1.7.10.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ echo "Attempting to download additional formats" wget http://git-core.googlecode.com/files/git-htmldocs-1.7.10.2.tar.gz if [ $? != 0 ];then @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man mkdir -p "${DESTDIR}/${MAN_DIR}" cp -afv man* "${DESTDIR}/${MAN_DIR}" diff --git a/dev-vcs/gitdoc/gitdoc-1.7.11.3.bep b/dev-vcs/gitdoc/gitdoc-1.7.11.3.recipe similarity index 97% rename from dev-vcs/gitdoc/gitdoc-1.7.11.3.bep rename to dev-vcs/gitdoc/gitdoc-1.7.11.3.recipe index 2299ff1a8..83b98f209 100644 --- a/dev-vcs/gitdoc/gitdoc-1.7.11.3.bep +++ b/dev-vcs/gitdoc/gitdoc-1.7.11.3.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ echo "Attempting to download additional formats" wget http://git-core.googlecode.com/files/git-htmldocs-1.7.11.3.tar.gz if [ $? != 0 ];then @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man mkdir -p "${DESTDIR}/${MAN_DIR}" cp -afv man* "${DESTDIR}/${MAN_DIR}" diff --git a/dev-vcs/gitdoc/gitdoc-1.8.0.bep b/dev-vcs/gitdoc/gitdoc-1.8.0.recipe similarity index 97% rename from dev-vcs/gitdoc/gitdoc-1.8.0.bep rename to dev-vcs/gitdoc/gitdoc-1.8.0.recipe index 01bf49658..de6ae1bfc 100644 --- a/dev-vcs/gitdoc/gitdoc-1.8.0.bep +++ b/dev-vcs/gitdoc/gitdoc-1.8.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ echo "Attempting to download additional formats" wget http://git-core.googlecode.com/files/git-htmldocs-1.8.0.tar.gz if [ $? != 0 ];then @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man mkdir -p "${DESTDIR}/${MAN_DIR}" cp -afv man* "${DESTDIR}/${MAN_DIR}" diff --git a/dev-vcs/gitdoc/gitdoc-1.8.1.3.bep b/dev-vcs/gitdoc/gitdoc-1.8.1.3.recipe similarity index 97% rename from dev-vcs/gitdoc/gitdoc-1.8.1.3.bep rename to dev-vcs/gitdoc/gitdoc-1.8.1.3.recipe index 743a2b073..545cb6c0b 100644 --- a/dev-vcs/gitdoc/gitdoc-1.8.1.3.bep +++ b/dev-vcs/gitdoc/gitdoc-1.8.1.3.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ echo "Attempting to download additional formats" wget http://git-core.googlecode.com/files/git-htmldocs-1.8.1.3.tar.gz if [ $? != 0 ];then @@ -15,7 +16,8 @@ BUILD { fi } -INSTALL { +INSTALL() +{ MAN_DIR=$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man mkdir -p "${DESTDIR}/${MAN_DIR}" cp -afv man* "${DESTDIR}/${MAN_DIR}" diff --git a/dev-vcs/mercurial/mercurial-2.2.2.bep b/dev-vcs/mercurial/mercurial-2.2.2.recipe similarity index 96% rename from dev-vcs/mercurial/mercurial-2.2.2.bep rename to dev-vcs/mercurial/mercurial-2.2.2.recipe index 7afde93e2..b63ab2c8f 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.bep +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/python >= 2.3" -BUILD { +BUILD() +{ cd mercurial-2.2.2 python setup.py build --force } -INSTALL { +INSTALL() +{ cd mercurial-2.2.2 if [ -n "${DESTDIR}" ];then python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force @@ -19,7 +21,8 @@ INSTALL { fi } -TEST { +TEST() +{ cd mercurial-2.2.2/tests shopt -s extglob sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) diff --git a/dev-vcs/mercurial/mercurial-2.2.3.bep b/dev-vcs/mercurial/mercurial-2.2.3.recipe similarity index 96% rename from dev-vcs/mercurial/mercurial-2.2.3.bep rename to dev-vcs/mercurial/mercurial-2.2.3.recipe index 9ea952ad0..58b946897 100644 --- a/dev-vcs/mercurial/mercurial-2.2.3.bep +++ b/dev-vcs/mercurial/mercurial-2.2.3.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="f4c70af3892d964b83b2718bde44c2f8" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/python >= 2.3" -BUILD { +BUILD() +{ cd mercurial-2.2.3 python setup.py build --force } -INSTALL { +INSTALL() +{ cd mercurial-2.2.3 if [ -n "${DESTDIR}" ];then python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force @@ -19,7 +21,8 @@ INSTALL { fi } -TEST { +TEST() +{ cd mercurial-2.2.3/tests shopt -s extglob sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) diff --git a/dev-vcs/mercurial/mercurial-2.3.bep b/dev-vcs/mercurial/mercurial-2.3.recipe similarity index 96% rename from dev-vcs/mercurial/mercurial-2.3.bep rename to dev-vcs/mercurial/mercurial-2.3.recipe index 3889beedc..e9b1f1743 100644 --- a/dev-vcs/mercurial/mercurial-2.3.bep +++ b/dev-vcs/mercurial/mercurial-2.3.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="8d9f776e432239571dfab2b5f88b3675" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/python >= 2.3" -BUILD { +BUILD() +{ cd mercurial-2.3 python setup.py build --force } -INSTALL { +INSTALL() +{ cd mercurial-2.3 if [ -n "${DESTDIR}" ];then python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force @@ -19,7 +21,8 @@ INSTALL { fi } -TEST { +TEST() +{ cd mercurial-2.3/tests shopt -s extglob sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) diff --git a/dev-vcs/mercurial/mercurial-2.4.bep b/dev-vcs/mercurial/mercurial-2.4.recipe similarity index 96% rename from dev-vcs/mercurial/mercurial-2.4.bep rename to dev-vcs/mercurial/mercurial-2.4.recipe index 70186e0c6..7fc62876f 100644 --- a/dev-vcs/mercurial/mercurial-2.4.bep +++ b/dev-vcs/mercurial/mercurial-2.4.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="c1fc9bec6951dd3c913092c3c72da014" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lang/python >= 2.4" -BUILD { +BUILD() +{ cd mercurial-2.4 python setup.py build --force } -INSTALL { +INSTALL() +{ cd mercurial-2.4 if [ -n "${DESTDIR}" ];then python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force @@ -19,7 +21,8 @@ INSTALL { fi } -TEST { +TEST() +{ cd mercurial-2.4/tests shopt -s extglob sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) diff --git a/dev-vcs/subversion/subversion-1.6.11.bep b/dev-vcs/subversion/subversion-1.6.11.recipe similarity index 97% rename from dev-vcs/subversion/subversion-1.6.11.bep rename to dev-vcs/subversion/subversion-1.6.11.recipe index 97693b80f..88c98644a 100644 --- a/dev-vcs/subversion/subversion-1.6.11.bep +++ b/dev-vcs/subversion/subversion-1.6.11.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="7331310fc786111899b305c6d141b02d" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd subversion-1.6.11 libtoolize --force --copy --install aclocal -I build -I build/ac-macros @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd subversion-1.6.11 make install } diff --git a/dev-vcs/subversion/subversion-1.6.12.bep b/dev-vcs/subversion/subversion-1.6.12.recipe similarity index 97% rename from dev-vcs/subversion/subversion-1.6.12.bep rename to dev-vcs/subversion/subversion-1.6.12.recipe index a6fe5aa74..a0bd512b1 100644 --- a/dev-vcs/subversion/subversion-1.6.12.bep +++ b/dev-vcs/subversion/subversion-1.6.12.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a4b1d0d7f3a4587c59da9c1acf9dedd0" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd subversion-1.6.12 libtoolize --force --copy --install aclocal -I build -I build/ac-macros @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd subversion-1.6.12 make install } diff --git a/dev-vcs/subversion/subversion-1.6.13.bep b/dev-vcs/subversion/subversion-1.6.13.recipe similarity index 97% rename from dev-vcs/subversion/subversion-1.6.13.bep rename to dev-vcs/subversion/subversion-1.6.13.recipe index b2fd911fb..87caf344b 100644 --- a/dev-vcs/subversion/subversion-1.6.13.bep +++ b/dev-vcs/subversion/subversion-1.6.13.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="7ae1c827689f21cf975804005be30aeb" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd subversion-1.6.13 libtoolize --force --copy --install aclocal -I build -I build/ac-macros @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd subversion-1.6.13 make install } diff --git a/dev-vcs/subversion/subversion-1.6.15.bep b/dev-vcs/subversion/subversion-1.6.15.recipe similarity index 98% rename from dev-vcs/subversion/subversion-1.6.15.bep rename to dev-vcs/subversion/subversion-1.6.15.recipe index 036a2146f..08127c925 100644 --- a/dev-vcs/subversion/subversion-1.6.15.bep +++ b/dev-vcs/subversion/subversion-1.6.15.recipe @@ -35,7 +35,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ libtoolize --force --copy --install aclocal -I build -I build/ac-macros autoconf @@ -50,7 +51,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ make install if type -p swig > /dev/null;then if type -p python > /dev/null;then diff --git a/dev-vcs/subversion/subversion-1.6.17.bep b/dev-vcs/subversion/subversion-1.6.17.recipe similarity index 98% rename from dev-vcs/subversion/subversion-1.6.17.bep rename to dev-vcs/subversion/subversion-1.6.17.recipe index cafa62e18..4a6a0fe54 100644 --- a/dev-vcs/subversion/subversion-1.6.17.bep +++ b/dev-vcs/subversion/subversion-1.6.17.recipe @@ -13,7 +13,8 @@ DEPEND="dev-libs/apr >= 1.4.4 dev-libs/openssl >= 1.0.0d dev-libs/libxml2 >= 2.7.8" -BUILD { +BUILD() +{ cd subversion-1.6.17 libtoolize --force --copy --install aclocal -I build -I build/ac-macros @@ -30,7 +31,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd subversion-1.6.17 make install if type -p swig > /dev/null;then @@ -47,7 +49,8 @@ INSTALL { fi } -TEST { +TEST() +{ cd subversion-1.6.17 make check } diff --git a/dev-vcs/subversion/subversion-1.6.18.bep b/dev-vcs/subversion/subversion-1.6.18.recipe similarity index 97% rename from dev-vcs/subversion/subversion-1.6.18.bep rename to dev-vcs/subversion/subversion-1.6.18.recipe index 5985c1fcd..d484a9bcd 100644 --- a/dev-vcs/subversion/subversion-1.6.18.bep +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -13,7 +13,8 @@ DEPEND="dev-libs/apr >= 1.4.4 dev-libs/openssl >= 1.0.0d dev-libs/libxml2 >= 2.7.8" -BUILD { +BUILD() +{ cd subversion-1.6.18 libtoolize --force --copy --install aclocal -I build -I build/ac-macros @@ -30,7 +31,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd subversion-1.6.18 make install if type -p swig > /dev/null;then @@ -47,7 +49,8 @@ INSTALL { fi } -TEST { +TEST() +{ cd subversion-1.6.18 make check } diff --git a/dev-vcs/subversion/subversion-1.6.6.bep b/dev-vcs/subversion/subversion-1.6.6.recipe similarity index 97% rename from dev-vcs/subversion/subversion-1.6.6.bep rename to dev-vcs/subversion/subversion-1.6.6.recipe index 969735f17..5822f2138 100644 --- a/dev-vcs/subversion/subversion-1.6.6.bep +++ b/dev-vcs/subversion/subversion-1.6.6.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e5109da756d74c7d98f683f004a539af" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd subversion-1.6.6 libtoolize --force --copy --install aclocal -I build -I build/ac-macros @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd subversion-1.6.6 make install } diff --git a/dev-vcs/subversion/subversion-1.6.9.bep b/dev-vcs/subversion/subversion-1.6.9.recipe similarity index 98% rename from dev-vcs/subversion/subversion-1.6.9.bep rename to dev-vcs/subversion/subversion-1.6.9.recipe index 858cd6a22..5688cb562 100644 --- a/dev-vcs/subversion/subversion-1.6.9.bep +++ b/dev-vcs/subversion/subversion-1.6.9.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="facaa0ee78c8f24b9af12c74662bbd24" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd subversion-1.6.9 libtoolize --force --copy --install aclocal -I build -I build/ac-macros @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd subversion-1.6.9 make install if type -p swig > /dev/null;then diff --git a/dev-vcs/subversion/subversion-1.7.0-rc2.bep b/dev-vcs/subversion/subversion-1.7.0-rc2.recipe similarity index 98% rename from dev-vcs/subversion/subversion-1.7.0-rc2.bep rename to dev-vcs/subversion/subversion-1.7.0-rc2.recipe index 06ea4070a..1f9c5c8d3 100644 --- a/dev-vcs/subversion/subversion-1.7.0-rc2.bep +++ b/dev-vcs/subversion/subversion-1.7.0-rc2.recipe @@ -13,7 +13,8 @@ DEPEND="dev-libs/apr >= 1.4.4 dev-libs/openssl >= 1.0.0d dev-libs/libxml2 >= 2.7.8" -BUILD { +BUILD() +{ cd subversion-1.7.0-rc2 libtoolize --force --copy --install aclocal -I build -I build/ac-macros @@ -30,7 +31,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd subversion-1.7.0-rc2 make install if type -p swig > /dev/null;then @@ -47,7 +49,8 @@ INSTALL { fi } -TEST { +TEST() +{ cd subversion-1.7.0-rc2 make check } diff --git a/dev-vcs/subversion/subversion-1.7.xx-svn.bep b/dev-vcs/subversion/subversion-1.7.xx-svn.recipe similarity index 97% rename from dev-vcs/subversion/subversion-1.7.xx-svn.bep rename to dev-vcs/subversion/subversion-1.7.xx-svn.recipe index 5e5fa165c..3a6829236 100644 --- a/dev-vcs/subversion/subversion-1.7.xx-svn.bep +++ b/dev-vcs/subversion/subversion-1.7.xx-svn.recipe @@ -5,7 +5,8 @@ SRC_URI="svn+http://svn.apache.org/repos/asf/subversion/trunk" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd subversion-1.7.xx-svn libtoolize --force --copy --install aclocal -I build -I build/ac-macros @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd subversion-1.7.xx-svn make install } diff --git a/dev-vcs/tig/tig-0.16.bep b/dev-vcs/tig/tig-0.16.recipe similarity index 95% rename from dev-vcs/tig/tig-0.16.bep rename to dev-vcs/tig/tig-0.16.recipe index cbd93d145..749d8fe8d 100644 --- a/dev-vcs/tig/tig-0.16.bep +++ b/dev-vcs/tig/tig-0.16.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="684572d93033d6cbfc5ee71cffe02935" REVISION="1" STATUS_HAIKU="untested" DEPEND="sys-libs/ncurses >= 5.7"" -BUILD { +BUILD() +{ cd tig-0.16 libtoolize --force --copy --install autoreconf -i @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tig-0.16 make install } diff --git a/games-action/bzflag/bzflag-2.0.14.bep b/games-action/bzflag/bzflag-2.0.14.recipe similarity index 96% rename from games-action/bzflag/bzflag-2.0.14.bep rename to games-action/bzflag/bzflag-2.0.14.recipe index b169244d9..3301851d6 100644 --- a/games-action/bzflag/bzflag-2.0.14.bep +++ b/games-action/bzflag/bzflag-2.0.14.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="libsdl >= 1.2.14" CHECKSUM_MD5="15a28cd55e46f0f39a7c8b8eea7464c6" -BUILD { +BUILD() +{ cd bzflag-2.0.14 mkdir -p m4 libtoolize --force --copy --install @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd bzflag-2.0.14 make install } diff --git a/games-action/cylindrix/cylindrix-1.0.bep b/games-action/cylindrix/cylindrix-1.0.recipe similarity index 94% rename from games-action/cylindrix/cylindrix-1.0.bep rename to games-action/cylindrix/cylindrix-1.0.recipe index 579964e86..ec4d718f2 100644 --- a/games-action/cylindrix/cylindrix-1.0.bep +++ b/games-action/cylindrix/cylindrix-1.0.recipe @@ -5,13 +5,15 @@ REVISION="1" CHECKSUM_MD5="914cf70b0a95f4a36cfdfde7edbaa240" STATUS_HAIKU="stable" DEPEND="media-libs/allegro >= 4.4.1.1" -BUILD { +BUILD() +{ cd cylindrix CFLAGS='-O2' ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd cylindrix make install } diff --git a/games-arcade/alienblaster/alienblaster-1.1.0.bep b/games-arcade/alienblaster/alienblaster-1.1.0.recipe similarity index 97% rename from games-arcade/alienblaster/alienblaster-1.1.0.bep rename to games-arcade/alienblaster/alienblaster-1.1.0.recipe index d8ebd7e39..d4c40c917 100644 --- a/games-arcade/alienblaster/alienblaster-1.1.0.bep +++ b/games-arcade/alienblaster/alienblaster-1.1.0.recipe @@ -7,12 +7,14 @@ STATUS_HAIKU="stable" REVISION="1" DEPEND="media-libs/libsdl >= 1.2.7 media-libs/sdl-mixer >= 1.2.5" -BUILD { +BUILD() +{ cd alienblaster make } -INSTALL { +INSTALL() +{ cd alienblaster GAMEDIR=`finddir B_APPS_DIRECTORY`/"AlienBlaster" mkdir -p ${DESTDIR}/${GAMEDIR} diff --git a/games-arcade/supertux/supertux-0.1.3.bep b/games-arcade/supertux/supertux-0.1.3.recipe similarity index 96% rename from games-arcade/supertux/supertux-0.1.3.bep rename to games-arcade/supertux/supertux-0.1.3.recipe index 159c000b3..ecd275ffe 100644 --- a/games-arcade/supertux/supertux-0.1.3.bep +++ b/games-arcade/supertux/supertux-0.1.3.recipe @@ -6,14 +6,16 @@ CHECKSUM_MD5="f2fc288459f33d5cd8f645fbca737a63" DEPEND=">=media-libs/libsdl-1.2.4" REVISION="1" -BUILD { +BUILD() +{ cd supertux-0.1.3 autoreconf --force --install ./configure --prefix="`finddir B_COMMON_DIRECTORY`" make } -INSTALL { +INSTALL() +{ cd supertux-0.1.3 make install } diff --git a/games-emulation/dosbox/dosbox-0.74-svn.bep b/games-emulation/dosbox/dosbox-0.74-svn.recipe similarity index 95% rename from games-emulation/dosbox/dosbox-0.74-svn.bep rename to games-emulation/dosbox/dosbox-0.74-svn.recipe index 0051b990a..e6b48bf79 100644 --- a/games-emulation/dosbox/dosbox-0.74-svn.bep +++ b/games-emulation/dosbox/dosbox-0.74-svn.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="unstable" DEPEND="media-libs/libsdl >= 1.2 < " -BUILD { +BUILD() +{ cd dosbox-0.74-svn libtoolize --force --copy --install ./autogen.sh @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd dosbox-0.74-svn make install } diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2.bep b/games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe similarity index 97% rename from games-emulation/visualboyadvance/visualboyadvance-1.7.2.bep rename to games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe index 68b9d2f0b..2cfddb434 100644 --- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2.bep +++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2.recipe @@ -8,7 +8,8 @@ DEPEND="dev-lang/nasm >= 2.03.01 media-libs/libsdl >= 1.2.14 media-libs/sdl-mixer >= 1.2.11" -BUILD { +BUILD() +{ cd VisualBoyAdvance-1.7.2 libtoolize --force --copy --install autoreconf -i @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd VisualBoyAdvance-1.7.2/src GAMEDIR=`finddir B_APPS_DIRECTORY`/Visualboyadvance mkdir -p ${DESTDIR}/${GAMEDIR} diff --git a/games-misc/sdljoytest/sdljoytest-11102003.bep b/games-misc/sdljoytest/sdljoytest-11102003.recipe similarity index 96% rename from games-misc/sdljoytest/sdljoytest-11102003.bep rename to games-misc/sdljoytest/sdljoytest-11102003.recipe index bd4f42bf0..2a83588e8 100644 --- a/games-misc/sdljoytest/sdljoytest-11102003.bep +++ b/games-misc/sdljoytest/sdljoytest-11102003.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDLJoytest-GL sed -i 's/\-lpthread/ /' Makefile make } -INSTALL { +INSTALL() +{ cd SDLJoytest-GL BINDIR=${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` MANDIR=${DESTDIR}`finddir B_COMMON_DATA_DIRECTORY`/man/man1 diff --git a/games-puzzle/abrick/abrick-1.12.bep b/games-puzzle/abrick/abrick-1.12.recipe similarity index 96% rename from games-puzzle/abrick/abrick-1.12.bep rename to games-puzzle/abrick/abrick-1.12.recipe index b15ac2326..f0ded688c 100644 --- a/games-puzzle/abrick/abrick-1.12.bep +++ b/games-puzzle/abrick/abrick-1.12.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" REVISION="1" DEPEND="media-libs/libsdl >= 1.2.14 media-libs/sdl-mixer >=1.2.0" -BUILD { +BUILD() +{ cd abrick-1.12-src make } -INSTALL { +INSTALL() +{ cd abrick-1.12-src GAMEDIR=`finddir B_APPS_DIRECTORY`/abrick mkdir -p ${DESTDIR}/${GAMEDIR} diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20.bep b/games-puzzle/flobopuyo/flobopuyo-0.20.recipe similarity index 94% rename from games-puzzle/flobopuyo/flobopuyo-0.20.bep rename to games-puzzle/flobopuyo/flobopuyo-0.20.recipe index 5c3743bed..a4b018125 100644 --- a/games-puzzle/flobopuyo/flobopuyo-0.20.bep +++ b/games-puzzle/flobopuyo/flobopuyo-0.20.recipe @@ -6,12 +6,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-lib/libsdl >= 1.2.14 media-lib/sdl-mixer >= 1.2.11" -BUILD { +BUILD() +{ cd flubopuyo-0.2.0 make } -INSTALL { +INSTALL() +{ cd flubopuyo-0.2.0 make install } diff --git a/games-puzzle/gnurobbo/gnurobbo-0.65.bep b/games-puzzle/gnurobbo/gnurobbo-0.65.recipe similarity index 97% rename from games-puzzle/gnurobbo/gnurobbo-0.65.bep rename to games-puzzle/gnurobbo/gnurobbo-0.65.recipe index dcc17c624..9e96c5ba6 100644 --- a/games-puzzle/gnurobbo/gnurobbo-0.65.bep +++ b/games-puzzle/gnurobbo/gnurobbo-0.65.recipe @@ -8,12 +8,14 @@ DEPEND="media-lib/libsdl >= 1.2.14 media-lib/sdl-mixer >= 1.2.11 media-lib/sdl-image >= 1.2.10 media-lib/sdl-ttf >= 2.0.10" -BUILD { +BUILD() +{ cd gnurobbo-0.65.6 make } -INSTALL { +INSTALL() +{ cd gnurobbo-0.65.6 APPS_DIR=`finddir B_APPS_DIRECTORY` mkdir -p ${DESTDIR}${APPS_DIR}/gnurobbo diff --git a/games-puzzle/numptyphysics/numptyphysics-0.2-157.bep b/games-puzzle/numptyphysics/numptyphysics-0.2-157.recipe similarity index 97% rename from games-puzzle/numptyphysics/numptyphysics-0.2-157.bep rename to games-puzzle/numptyphysics/numptyphysics-0.2-157.recipe index da4986095..66901eda6 100644 --- a/games-puzzle/numptyphysics/numptyphysics-0.2-157.bep +++ b/games-puzzle/numptyphysics/numptyphysics-0.2-157.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="unstable" DEPEND="media-libs/libsdl >= 1.2.14 dev-games/box2d >= 2.1.2" -BUILD { +BUILD() +{ cd numptyphysics-0.2-157 libtoolize --force --copy --install aclocal @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd numptyphysics-0.2-157 make install } diff --git a/games-puzzle/wizznic/wizznic-0.9.9.bep b/games-puzzle/wizznic/wizznic-0.9.9.recipe similarity index 97% rename from games-puzzle/wizznic/wizznic-0.9.9.bep rename to games-puzzle/wizznic/wizznic-0.9.9.recipe index f81063a12..fdf9bfd4e 100644 --- a/games-puzzle/wizznic/wizznic-0.9.9.bep +++ b/games-puzzle/wizznic/wizznic-0.9.9.recipe @@ -8,12 +8,14 @@ STATUS_HAIKU="stable" DEPEND="media-lib/libsdl >= 1.2.14 media-lib/sdl-mixer >= 1.2.11 media-lib/sdl-image >= 1.2.10" -BUILD { +BUILD() +{ cd wizznic-0.9.9-src make } -INSTALL { +INSTALL() +{ cd wizznic-0.9.9-src GAMEDIR=`finddir B_APPS_DIRECTORY`/"Wizznic" mkdir -p ${DESTDIR}/${GAMEDIR} diff --git a/games-puzzle/wizznic/wizznic-0.9.bep b/games-puzzle/wizznic/wizznic-0.9.recipe similarity index 96% rename from games-puzzle/wizznic/wizznic-0.9.bep rename to games-puzzle/wizznic/wizznic-0.9.recipe index a9437671b..60c45b509 100644 --- a/games-puzzle/wizznic/wizznic-0.9.bep +++ b/games-puzzle/wizznic/wizznic-0.9.recipe @@ -7,12 +7,14 @@ STATUS_HAIKU="stable" DEPEND="media-lib/libsdl >= 1.2.14 media-lib/sdl-mixer >= 1.2.11 media-lib/sdl-image >= 1.2.10" -BUILD { +BUILD() +{ cd wizznic-0.9_feedback_version-src make -f Makefile.haiku } -INSTALL { +INSTALL() +{ cd wizznic-0.9_feedback_version-src make Makefile.haiku install } diff --git a/games-rpg/freedroid/freedroid-1.0.2.bep b/games-rpg/freedroid/freedroid-1.0.2.recipe similarity index 96% rename from games-rpg/freedroid/freedroid-1.0.2.bep rename to games-rpg/freedroid/freedroid-1.0.2.recipe index 5feecf4fd..8f0dfd3f8 100644 --- a/games-rpg/freedroid/freedroid-1.0.2.bep +++ b/games-rpg/freedroid/freedroid-1.0.2.recipe @@ -4,7 +4,8 @@ SRC_URI="http://sourceforge.net/projects/freedroid/files/freedroidClassic/Freedr REVISION="1" DEPEND="SDL >= 1.2.3 " CHECKSUM_MD5="585a65f61c2cd308ab45d5c514f695dc" -BUILD { +BUILD() +{ cd freedroid-1.0.2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd freedroid-1.0.2 make install } diff --git a/games-simulation/openttd/openttd-1.2.3.bep b/games-simulation/openttd/openttd-1.2.3.recipe similarity index 96% rename from games-simulation/openttd/openttd-1.2.3.bep rename to games-simulation/openttd/openttd-1.2.3.recipe index e97ac9d7c..4f92f7b00 100644 --- a/games-simulation/openttd/openttd-1.2.3.bep +++ b/games-simulation/openttd/openttd-1.2.3.recipe @@ -11,13 +11,15 @@ DEPEND="media-libs/libsdl, pkgconfig, lzo" -BUILD { +BUILD() +{ cd openttd-1.2.3 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd openttd-1.2.3 make install cp -R bundle /boot/apps diff --git a/gnome-base/gnome-common/gnome-common-2.28.bep b/gnome-base/gnome-common/gnome-common-2.28.recipe similarity index 95% rename from gnome-base/gnome-common/gnome-common-2.28.bep rename to gnome-base/gnome-common/gnome-common-2.28.recipe index b5cdf1967..e3a6aa65d 100644 --- a/gnome-base/gnome-common/gnome-common-2.28.bep +++ b/gnome-base/gnome-common/gnome-common-2.28.recipe @@ -4,14 +4,16 @@ SRC_URI="git+git://git.gnome.org/gnome-common" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gnome-common-2.28 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd gnome-common-2.28 make install } diff --git a/gnome-extra/libgsf/libgsf-1.14.18.bep b/gnome-extra/libgsf/libgsf-1.14.18.recipe similarity index 96% rename from gnome-extra/libgsf/libgsf-1.14.18.bep rename to gnome-extra/libgsf/libgsf-1.14.18.recipe index f91ef5d09..927751361 100644 --- a/gnome-extra/libgsf/libgsf-1.14.18.bep +++ b/gnome-extra/libgsf/libgsf-1.14.18.recipe @@ -9,7 +9,8 @@ DEPEND="pkgconfig >= 0.23 dev-perl/XML-Parser >= 2.3.6 dev-util/intltool >= 0.40.6 dev-lib/glib >= 2.18.3" -BUILD { +BUILD() +{ cd libgsf-1.14.18 libtoolize --force --copy --install autoreconf -i @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libgsf-1.14.18 make install cd thumbnailer diff --git a/haiku-apps/W6/W6-1.7.bep b/haiku-apps/W6/W6-1.7.recipe similarity index 96% rename from haiku-apps/W6/W6-1.7.bep rename to haiku-apps/W6/W6-1.7.recipe index 70d7588e6..0a217b667 100644 --- a/haiku-apps/W6/W6-1.7.bep +++ b/haiku-apps/W6/W6-1.7.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd W6Haiku make cd ../ @@ -15,7 +16,8 @@ BUILD { cp -r W6/w6s W6Haiku } -INSTALL { +INSTALL() +{ cd W6Haiku mkdir -p $DESTDIR`finddir B_APPS_DIRECTORY`/W6 install -m 0755 objects.x86-gcc`setgcc | tail -c -2`-release/W6Haiku $DESTDIR`finddir B_APPS_DIRECTORY`/W6/W6 diff --git a/haiku-apps/album/album-0.9.2.bep b/haiku-apps/album/album-0.9.2.recipe similarity index 95% rename from haiku-apps/album/album-0.9.2.bep rename to haiku-apps/album/album-0.9.2.recipe index dd26abcd6..58c428455 100644 --- a/haiku-apps/album/album-0.9.2.bep +++ b/haiku-apps/album/album-0.9.2.recipe @@ -5,11 +5,13 @@ CHECKSUM_MD5="d22d1850ba5807c5da0432ecd530c372" STATUS_HAIKU="stable" REVISION="1" DEPEND=" " -BUILD { +BUILD() +{ cd album-0.9.2/src make } -INSTALL { +INSTALL() +{ cd album-0.9.2 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Album cp -a Album ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Album diff --git a/haiku-apps/aplayer/aplayer-4.0.1.bep b/haiku-apps/aplayer/aplayer-4.0.1.recipe similarity index 95% rename from haiku-apps/aplayer/aplayer-4.0.1.bep rename to haiku-apps/aplayer/aplayer-4.0.1.recipe index 5152ab11d..a6be885ac 100644 --- a/haiku-apps/aplayer/aplayer-4.0.1.bep +++ b/haiku-apps/aplayer/aplayer-4.0.1.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd aplayer-4.0.1/Master make } -INSTALL { +INSTALL() +{ mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/APlayer cp -a APlayer ${DESTDIR}/`finddir B_APPS_DIRECTORY`/APlayer } diff --git a/haiku-apps/armyknife/armyknife-61.bep b/haiku-apps/armyknife/armyknife-61.recipe similarity index 95% rename from haiku-apps/armyknife/armyknife-61.bep rename to haiku-apps/armyknife/armyknife-61.recipe index 252077a6a..b0628d81b 100644 --- a/haiku-apps/armyknife/armyknife-61.bep +++ b/haiku-apps/armyknife/armyknife-61.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/taglib >= 1.6.3" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd armyknife-61 make } -INSTALL { +INSTALL() +{ cd armyknife-61 make zipfile mkdir -p ${DESTDIR}/boot/apps diff --git a/haiku-apps/armyknife/armyknife-62.bep b/haiku-apps/armyknife/armyknife-62.recipe similarity index 95% rename from haiku-apps/armyknife/armyknife-62.bep rename to haiku-apps/armyknife/armyknife-62.recipe index 5bff3c87a..b76790c4b 100644 --- a/haiku-apps/armyknife/armyknife-62.bep +++ b/haiku-apps/armyknife/armyknife-62.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/taglib >= 1.6.3" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd armyknife-62 make } -INSTALL { +INSTALL() +{ cd armyknife-62 make zipfile mkdir -p ${DESTDIR}/boot/apps diff --git a/haiku-apps/armyknife/armyknife-63.bep b/haiku-apps/armyknife/armyknife-63.recipe similarity index 95% rename from haiku-apps/armyknife/armyknife-63.bep rename to haiku-apps/armyknife/armyknife-63.recipe index c8cd02afa..ba577daaa 100644 --- a/haiku-apps/armyknife/armyknife-63.bep +++ b/haiku-apps/armyknife/armyknife-63.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/taglib >= 1.6.3" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd armyknife-63 make } -INSTALL { +INSTALL() +{ cd armyknife-63 make zipfile mkdir -p ${DESTDIR}/boot/apps diff --git a/haiku-apps/armyknife/armyknife-999-git.bep b/haiku-apps/armyknife/armyknife-999-git.recipe similarity index 95% rename from haiku-apps/armyknife/armyknife-999-git.bep rename to haiku-apps/armyknife/armyknife-999-git.recipe index 6307acc63..cd2190074 100644 --- a/haiku-apps/armyknife/armyknife-999-git.bep +++ b/haiku-apps/armyknife/armyknife-999-git.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/taglib >= 1.6.3" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd armyknife-999-git make } -INSTALL { +INSTALL() +{ cd armyknife-999-git make zipfile mkdir -p ${DESTDIR}/boot/apps diff --git a/haiku-apps/artpaint/artpaint-339.bep b/haiku-apps/artpaint/artpaint-339.recipe similarity index 95% rename from haiku-apps/artpaint/artpaint-339.bep rename to haiku-apps/artpaint/artpaint-339.recipe index c0514179e..3a80a0bdb 100644 --- a/haiku-apps/artpaint/artpaint-339.bep +++ b/haiku-apps/artpaint/artpaint-339.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ echo "Need to figure out how to build this still" } -INSTALL { +INSTALL() +{ echo "Need to figure out how to install this still" } diff --git a/haiku-apps/beacon/beacon-27.bep b/haiku-apps/beacon/beacon-27.recipe similarity index 93% rename from haiku-apps/beacon/beacon-27.bep rename to haiku-apps/beacon/beacon-27.recipe index bb46aa7a4..929321d21 100644 --- a/haiku-apps/beacon/beacon-27.bep +++ b/haiku-apps/beacon/beacon-27.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="CLucene" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd beacon-27 jam } -INSTALL { +INSTALL() +{ cd beacon-27 jam } diff --git a/haiku-apps/beae/beae-20.bep b/haiku-apps/beae/beae-20.recipe similarity index 97% rename from haiku-apps/beae/beae-20.bep rename to haiku-apps/beae/beae-20.recipe index 1ec54472a..e8e81f9f3 100644 --- a/haiku-apps/beae/beae-20.bep +++ b/haiku-apps/beae/beae-20.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd beae-20 cmake . make } -INSTALL { +INSTALL() +{ cd beae-20 mkdir -p ${DESTDIR}/boot/apps cp -a BeAE ${DESTDIR}/boot/apps diff --git a/haiku-apps/beae/beae-22.bep b/haiku-apps/beae/beae-22.recipe similarity index 97% rename from haiku-apps/beae/beae-22.bep rename to haiku-apps/beae/beae-22.recipe index 63edcd51f..925c91399 100644 --- a/haiku-apps/beae/beae-22.bep +++ b/haiku-apps/beae/beae-22.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd beae-22 cmake . make } -INSTALL { +INSTALL() +{ cd beae-22 mkdir -p ${DESTDIR}/boot/apps cp -a BeAE ${DESTDIR}/boot/apps diff --git a/haiku-apps/beae/beae-25.bep b/haiku-apps/beae/beae-25.recipe similarity index 97% rename from haiku-apps/beae/beae-25.bep rename to haiku-apps/beae/beae-25.recipe index ae9d26e62..6eed421f7 100644 --- a/haiku-apps/beae/beae-25.bep +++ b/haiku-apps/beae/beae-25.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd beae-25 cmake . make } -INSTALL { +INSTALL() +{ cd beae-25 mkdir -p ${DESTDIR}/boot/apps cp -a BeAE ${DESTDIR}/boot/apps diff --git a/haiku-apps/beam/beam-1.2alpha.bep b/haiku-apps/beam/beam-1.2alpha.recipe similarity index 96% rename from haiku-apps/beam/beam-1.2alpha.bep rename to haiku-apps/beam/beam-1.2alpha.recipe index f8fe770d2..0237b5074 100644 --- a/haiku-apps/beam/beam-1.2alpha.bep +++ b/haiku-apps/beam/beam-1.2alpha.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="liblayout >= 1.4.0 libpcre >= 8.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd beam-1.2alpha jam } -INSTALL { +INSTALL() +{ cd beam-1.2alpha mkdir -p ${DESTDIR}/boot/apps/Beam cp -a generated/distro-haiku/* ${DESTDIR}/boot/apps/Beam diff --git a/haiku-apps/beezer/beezer-1.bep b/haiku-apps/beezer/beezer-1.recipe similarity index 97% rename from haiku-apps/beezer/beezer-1.bep rename to haiku-apps/beezer/beezer-1.recipe index bb215a60a..7b9dbb02f 100644 --- a/haiku-apps/beezer/beezer-1.bep +++ b/haiku-apps/beezer/beezer-1.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" CHECKSUM_MD5="b27479b8a8afc1bc105ad9a6d8911f74" DEPEND="cmake >= 2.8" -BUILD { +BUILD() +{ cd cpr-beezer-82199f683571/Source cmake . make } -INSTALL { +INSTALL() +{ cd cpr-beezer-82199f683571/Source/build BEEZER_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Beezer mkdir -p $BEEZER_DIR/add-ons diff --git a/haiku-apps/beget/beget-1.2.3.bep b/haiku-apps/beget/beget-1.2.3.recipe similarity index 96% rename from haiku-apps/beget/beget-1.2.3.bep rename to haiku-apps/beget/beget-1.2.3.recipe index c87a6858f..be90a33de 100644 --- a/haiku-apps/beget/beget-1.2.3.bep +++ b/haiku-apps/beget/beget-1.2.3.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="net-misc/wget" -BUILD { +BUILD() +{ cd beget-1.2.3 cmake . make } -INSTALL { +INSTALL() +{ cd beget-1.2.3 mkdir -p $DESTDIR`finddir B_APPS_DIRECTORY` cp BeGet $DESTDIR`finddir B_APPS_DIRECTORY` diff --git a/haiku-apps/behappy/behappy-16.bep b/haiku-apps/behappy/behappy-16.recipe similarity index 94% rename from haiku-apps/behappy/behappy-16.bep rename to haiku-apps/behappy/behappy-16.recipe index 82da09219..7c14ae33a 100644 --- a/haiku-apps/behappy/behappy-16.bep +++ b/haiku-apps/behappy/behappy-16.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="www-client/netsurf >= 2.6" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd "behappy-16" make } -INSTALL { +INSTALL() +{ cd "behappy-16" } diff --git a/haiku-apps/bepdf/bepdf-1.1.1b4.bep b/haiku-apps/bepdf/bepdf-1.1.1b4.recipe similarity index 96% rename from haiku-apps/bepdf/bepdf-1.1.1b4.bep rename to haiku-apps/bepdf/bepdf-1.1.1b4.recipe index 61df256e4..c2f2e10e8 100644 --- a/haiku-apps/bepdf/bepdf-1.1.1b4.bep +++ b/haiku-apps/bepdf/bepdf-1.1.1b4.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="app-text/htmldoc == 1.8.27" -BUILD { +BUILD() +{ export BEPDF_BUILD_GCC=`setgcc | cut -d/ -f2` cd bepdf-1.1.1b4 ./build.sh package } -INSTALL { +INSTALL() +{ cd bepdf-1.1.1b4 mkdir -p ${DESTDIR}/boot/apps unzip generated/BePDF-1.1.1b4.x86.zip -d ${DESTDIR}/boot/apps diff --git a/haiku-apps/beshare/beshare-4.bep b/haiku-apps/beshare/beshare-4.recipe similarity index 92% rename from haiku-apps/beshare/beshare-4.bep rename to haiku-apps/beshare/beshare-4.recipe index 70162a75d..cc82033ca 100644 --- a/haiku-apps/beshare/beshare-4.bep +++ b/haiku-apps/beshare/beshare-4.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="muscle >= 4.63" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd beshare-4/source make } -INSTALL { +INSTALL() +{ cd beshare-4 } diff --git a/haiku-apps/bowser/bowser-1.1.1-cvs.bep b/haiku-apps/bowser/bowser-1.1.1-cvs.recipe similarity index 91% rename from haiku-apps/bowser/bowser-1.1.1-cvs.bep rename to haiku-apps/bowser/bowser-1.1.1-cvs.recipe index 03e44cf2b..9d2af2a94 100644 --- a/haiku-apps/bowser/bowser-1.1.1-cvs.bep +++ b/haiku-apps/bowser/bowser-1.1.1-cvs.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ } -INSTALL { +INSTALL() +{ } diff --git a/haiku-apps/bsl/bsl-108.bep b/haiku-apps/bsl/bsl-108.recipe similarity index 94% rename from haiku-apps/bsl/bsl-108.bep rename to haiku-apps/bsl/bsl-108.recipe index a64ea3938..df2fcc8e3 100644 --- a/haiku-apps/bsl/bsl-108.bep +++ b/haiku-apps/bsl/bsl-108.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd bsl-108 make } -INSTALL { +INSTALL() +{ cd bsl-108 BIN_DIR=`finddir B_COMMON_BIN_DIRECTORY` mkdir -p ${DESTDIR}${BIN_DIR} diff --git a/haiku-apps/burnitnow/burnitnow-2-svn.bep b/haiku-apps/burnitnow/burnitnow-2-svn.recipe similarity index 96% rename from haiku-apps/burnitnow/burnitnow-2-svn.bep rename to haiku-apps/burnitnow/burnitnow-2-svn.recipe index 375b2f3d8..85423e314 100644 --- a/haiku-apps/burnitnow/burnitnow-2-svn.bep +++ b/haiku-apps/burnitnow/burnitnow-2-svn.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0 app-cdr/cdrtools > 3.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd burnitnow-2-svn cmake . make } -INSTALL { +INSTALL() +{ cd burnitnow-2-svn mkdir -p ${DESTDIR}/boot/apps/BurnItNow cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow diff --git a/haiku-apps/burnitnow/burnitnow-27.bep b/haiku-apps/burnitnow/burnitnow-27.recipe similarity index 97% rename from haiku-apps/burnitnow/burnitnow-27.bep rename to haiku-apps/burnitnow/burnitnow-27.recipe index 58815a665..7d9667d50 100644 --- a/haiku-apps/burnitnow/burnitnow-27.bep +++ b/haiku-apps/burnitnow/burnitnow-27.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0 app-cdr/cdrtools > 3.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd burnitnow-27 cmake . make } -INSTALL { +INSTALL() +{ cd burnitnow-27 mkdir -p ${DESTDIR}/boot/apps/BurnItNow cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow diff --git a/haiku-apps/burnitnow/burnitnow-38.bep b/haiku-apps/burnitnow/burnitnow-38.recipe similarity index 97% rename from haiku-apps/burnitnow/burnitnow-38.bep rename to haiku-apps/burnitnow/burnitnow-38.recipe index 08cc6c00d..22f906cb4 100644 --- a/haiku-apps/burnitnow/burnitnow-38.bep +++ b/haiku-apps/burnitnow/burnitnow-38.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0 app-cdr/cdrtools > 3.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd burnitnow-38 cmake . make } -INSTALL { +INSTALL() +{ cd burnitnow-38 mkdir -p ${DESTDIR}/boot/apps/BurnItNow cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow diff --git a/haiku-apps/burnitnow/burnitnow-39.bep b/haiku-apps/burnitnow/burnitnow-39.recipe similarity index 97% rename from haiku-apps/burnitnow/burnitnow-39.bep rename to haiku-apps/burnitnow/burnitnow-39.recipe index f02e42d17..4ed1fbf85 100644 --- a/haiku-apps/burnitnow/burnitnow-39.bep +++ b/haiku-apps/burnitnow/burnitnow-39.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0 app-cdr/cdrtools > 3.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd burnitnow-39 cmake . make } -INSTALL { +INSTALL() +{ cd burnitnow-39 mkdir -p ${DESTDIR}/boot/apps/BurnItNow cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow diff --git a/haiku-apps/burnitnow/burnitnow-43.bep b/haiku-apps/burnitnow/burnitnow-43.recipe similarity index 97% rename from haiku-apps/burnitnow/burnitnow-43.bep rename to haiku-apps/burnitnow/burnitnow-43.recipe index afb02e8fa..0d3dcdd90 100644 --- a/haiku-apps/burnitnow/burnitnow-43.bep +++ b/haiku-apps/burnitnow/burnitnow-43.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0 app-cdr/cdrtools > 3.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd burnitnow-43 cmake . make } -INSTALL { +INSTALL() +{ cd burnitnow-43 mkdir -p ${DESTDIR}/boot/apps/BurnItNow cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow diff --git a/haiku-apps/burnitnow/burnitnow-beta5-svn.bep b/haiku-apps/burnitnow/burnitnow-beta5-svn.recipe similarity index 97% rename from haiku-apps/burnitnow/burnitnow-beta5-svn.bep rename to haiku-apps/burnitnow/burnitnow-beta5-svn.recipe index 00ea2266f..d2c4e80e7 100644 --- a/haiku-apps/burnitnow/burnitnow-beta5-svn.bep +++ b/haiku-apps/burnitnow/burnitnow-beta5-svn.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0 app-cdr/cdrtools > 3.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd burnitnow-beta5-svn cmake . make } -INSTALL { +INSTALL() +{ cd burnitnow-beta5-svn mkdir -p ${DESTDIR}/boot/apps/BurnItNow cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow diff --git a/haiku-apps/burnitnow/burnitnow-beta6-git.bep b/haiku-apps/burnitnow/burnitnow-beta6-git.recipe similarity index 97% rename from haiku-apps/burnitnow/burnitnow-beta6-git.bep rename to haiku-apps/burnitnow/burnitnow-beta6-git.recipe index 99afe0ec0..9a3fe6948 100644 --- a/haiku-apps/burnitnow/burnitnow-beta6-git.bep +++ b/haiku-apps/burnitnow/burnitnow-beta6-git.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="app-cdr/cdrtools > 3.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd burnitnow-beta6-git/legacy cmake . make } -INSTALL { +INSTALL() +{ cd burnitnow-beta6-git/legacy BURNITNOWDIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/BurnItNow mkdir -p ${BURNITNOWDIR}/Docs diff --git a/haiku-apps/burnitnow/burnitnow-beta6.bep b/haiku-apps/burnitnow/burnitnow-beta6.recipe similarity index 97% rename from haiku-apps/burnitnow/burnitnow-beta6.bep rename to haiku-apps/burnitnow/burnitnow-beta6.recipe index cb0e31b32..08a74e2e1 100644 --- a/haiku-apps/burnitnow/burnitnow-beta6.bep +++ b/haiku-apps/burnitnow/burnitnow-beta6.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="app-cdr/cdrtools > 3.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd burnitnow-beta6/legacy cmake . make } -INSTALL { +INSTALL() +{ cd burnitnow-beta6/legacy BURNITNOWDIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/BurnItNow mkdir -p ${BURNITNOWDIR}/Docs diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.recipe similarity index 97% rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.bep rename to haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.recipe index 12cc49369..225624b42 100644 --- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.bep +++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="caya" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd caya-gpl-protocols-0.HEAD ./configure jam } -INSTALL { +INSTALL() +{ cd caya-gpl-protocols-0.HEAD mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols PLATFORM=`setgcc|tr / -|cut -f3 -d' '` diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.recipe similarity index 97% rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.bep rename to haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.recipe index 811ae698c..93816baed 100644 --- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.bep +++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="caya" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-gpl-protocols-19 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-gpl-protocols-19 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.recipe similarity index 97% rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.bep rename to haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.recipe index 7d9006de3..e6c00dd27 100644 --- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.bep +++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="caya" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-gpl-protocols-24 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-gpl-protocols-24 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.recipe similarity index 97% rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.bep rename to haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.recipe index af80c8f9b..f6df24bd5 100644 --- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.bep +++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="caya" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-gpl-protocols-35 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-gpl-protocols-35 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.bep b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.recipe similarity index 97% rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.bep rename to haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.recipe index e7b5d637e..52bc7407e 100644 --- a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.bep +++ b/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="caya" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-gpl-protocols-36 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-gpl-protocols-36 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols diff --git a/haiku-apps/caya/caya-0.HEAD.bep b/haiku-apps/caya/caya-0.HEAD.recipe similarity index 98% rename from haiku-apps/caya/caya-0.HEAD.bep rename to haiku-apps/caya/caya-0.HEAD.recipe index 4b0144ad6..4dd066ba6 100644 --- a/haiku-apps/caya/caya-0.HEAD.bep +++ b/haiku-apps/caya/caya-0.HEAD.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/expat >= 2.0.1" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd caya-0.HEAD ./configure jam } -INSTALL { +INSTALL() +{ cd caya-0.HEAD mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys diff --git a/haiku-apps/caya/caya-236.bep b/haiku-apps/caya/caya-236.recipe similarity index 98% rename from haiku-apps/caya/caya-236.bep rename to haiku-apps/caya/caya-236.recipe index e828b4871..adb7367fc 100644 --- a/haiku-apps/caya/caya-236.bep +++ b/haiku-apps/caya/caya-236.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="net-misc/curl >= 7.21.6" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-236 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-236 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys diff --git a/haiku-apps/caya/caya-240.bep b/haiku-apps/caya/caya-240.recipe similarity index 98% rename from haiku-apps/caya/caya-240.bep rename to haiku-apps/caya/caya-240.recipe index e18e4cf32..78f0e79d5 100644 --- a/haiku-apps/caya/caya-240.bep +++ b/haiku-apps/caya/caya-240.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="net-misc/curl >= 7.21.6" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-240 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-240 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys diff --git a/haiku-apps/caya/caya-264.bep b/haiku-apps/caya/caya-264.recipe similarity index 98% rename from haiku-apps/caya/caya-264.bep rename to haiku-apps/caya/caya-264.recipe index 98ebf5180..c7a92ce6d 100644 --- a/haiku-apps/caya/caya-264.bep +++ b/haiku-apps/caya/caya-264.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/expat >= 2.0.1" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-264 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-264 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys diff --git a/haiku-apps/caya/caya-278.bep b/haiku-apps/caya/caya-278.recipe similarity index 98% rename from haiku-apps/caya/caya-278.bep rename to haiku-apps/caya/caya-278.recipe index 7b717dae6..ced844436 100644 --- a/haiku-apps/caya/caya-278.bep +++ b/haiku-apps/caya/caya-278.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/expat >= 2.0.1" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-278 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-278 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys diff --git a/haiku-apps/caya/caya-279.bep b/haiku-apps/caya/caya-279.recipe similarity index 98% rename from haiku-apps/caya/caya-279.bep rename to haiku-apps/caya/caya-279.recipe index 17b1b63d6..87fce694e 100644 --- a/haiku-apps/caya/caya-279.bep +++ b/haiku-apps/caya/caya-279.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/expat >= 2.0.1" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd caya-279 ./configure jam } -INSTALL { +INSTALL() +{ cd caya-279 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys diff --git a/haiku-apps/clockwerk/clockwerk-78.bep b/haiku-apps/clockwerk/clockwerk-78.recipe similarity index 96% rename from haiku-apps/clockwerk/clockwerk-78.bep rename to haiku-apps/clockwerk/clockwerk-78.recipe index caa9ed8d3..85399a2e8 100644 --- a/haiku-apps/clockwerk/clockwerk-78.bep +++ b/haiku-apps/clockwerk/clockwerk-78.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd clockwerk-78 jam } -INSTALL { +INSTALL() +{ cd clockwerk-78 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk cp generated/distro-haiku/* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk diff --git a/haiku-apps/clockwerk/clockwerk-80.bep b/haiku-apps/clockwerk/clockwerk-80.recipe similarity index 96% rename from haiku-apps/clockwerk/clockwerk-80.bep rename to haiku-apps/clockwerk/clockwerk-80.recipe index 7da9b2836..b0fdc9f33 100644 --- a/haiku-apps/clockwerk/clockwerk-80.bep +++ b/haiku-apps/clockwerk/clockwerk-80.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd clockwerk-80 jam } -INSTALL { +INSTALL() +{ cd clockwerk-80 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk cp generated/distro-haiku/* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk diff --git a/haiku-apps/documentviewer/documentviewer-0.3.2.bep b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe similarity index 96% rename from haiku-apps/documentviewer/documentviewer-0.3.2.bep rename to haiku-apps/documentviewer/documentviewer-0.3.2.recipe index 510b358a2..40b750dbb 100644 --- a/haiku-apps/documentviewer/documentviewer-0.3.2.bep +++ b/haiku-apps/documentviewer/documentviewer-0.3.2.recipe @@ -8,12 +8,14 @@ DEPEND="media-libs/fitz >= 1.0 media-libs/djvulibre >= 3.5.25" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd documentviewer-0.3.2 jam } -INSTALL { +INSTALL() +{ cd documentviewer-0.3.2 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/DocumentViewer cp application/DocumentViewer ${DESTDIR}/`finddir B_APPS_DIRECTORY`/DocumentViewer diff --git a/haiku-apps/friss/friss-0.7-svn.bep b/haiku-apps/friss/friss-0.7-svn.recipe similarity index 97% rename from haiku-apps/friss/friss-0.7-svn.bep rename to haiku-apps/friss/friss-0.7-svn.recipe index 627e6cc41..4ab354445 100644 --- a/haiku-apps/friss/friss-0.7-svn.bep +++ b/haiku-apps/friss/friss-0.7-svn.recipe @@ -4,7 +4,8 @@ SRC_URI="svn://pulkomandy.tk/friss" REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd friss-0.7-svn/src if [ -n "$(setgcc | grep '4')" ]; then sed -i 's/lstdc++.r4/lstdc++/' Jamfile @@ -14,7 +15,8 @@ BUILD { chmod 755 ../bin/apps/friss/FRiSS } -INSTALL { +INSTALL() +{ cd friss-0.7-svn mkdir -p ${DESTDIR}/boot/apps/FRiSS cp -a bin/apps/friss/* ${DESTDIR}/boot/apps/FRiSS diff --git a/haiku-apps/globe/globe-0.4.bep b/haiku-apps/globe/globe-0.4.recipe similarity index 96% rename from haiku-apps/globe/globe-0.4.bep rename to haiku-apps/globe/globe-0.4.recipe index 69c8e3dbe..99039727e 100644 --- a/haiku-apps/globe/globe-0.4.bep +++ b/haiku-apps/globe/globe-0.4.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="61601576e59b0dc5ab6364f684a47236" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd globe0.4 make } -INSTALL { +INSTALL() +{ cd globe0.4 TARGET_DIR=${DESTDIR}`finddir B_APPS_DIRECTORY`/Globe mkdir -p $TARGET_DIR diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0-svn.bep b/haiku-apps/haikutwitter/haikutwitter-1.0-svn.recipe similarity index 95% rename from haiku-apps/haikutwitter/haikutwitter-1.0-svn.bep rename to haiku-apps/haikutwitter/haikutwitter-1.0-svn.recipe index 72c54af13..0696c3811 100644 --- a/haiku-apps/haikutwitter/haikutwitter-1.0-svn.bep +++ b/haiku-apps/haikutwitter/haikutwitter-1.0-svn.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKUE="broken" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="net-misc/curl >= 7.26.0" -BUILD { +BUILD() +{ cd haikutwitter-1.0-svn make } -INSTALL { +INSTALL() +{ cd haikutwitter-1.0-svn make install } diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0.bep b/haiku-apps/haikutwitter/haikutwitter-1.0.recipe similarity index 95% rename from haiku-apps/haikutwitter/haikutwitter-1.0.bep rename to haiku-apps/haikutwitter/haikutwitter-1.0.recipe index 008d6f9ba..69e242081 100644 --- a/haiku-apps/haikutwitter/haikutwitter-1.0.bep +++ b/haiku-apps/haikutwitter/haikutwitter-1.0.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKUE="broken" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="net-misc/curl >= 7.26.0" -BUILD { +BUILD() +{ cd haikutwitter-1.0 make } -INSTALL { +INSTALL() +{ cd haikutwitter-1.0 make install } diff --git a/haiku-apps/hare/hare-beta1-git.bep b/haiku-apps/hare/hare-beta1-git.recipe similarity index 96% rename from haiku-apps/hare/hare-beta1-git.bep rename to haiku-apps/hare/hare-beta1-git.recipe index d7ad0f796..5bb48106f 100644 --- a/haiku-apps/hare/hare-beta1-git.bep +++ b/haiku-apps/hare/hare-beta1-git.recipe @@ -9,13 +9,15 @@ DEPEND="media-libs/lame > 3.98.4 #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd hare-beta1-git cmake . make } -INSTALL { +INSTALL() +{ cd hare-beta1-git HARE_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Hare mkdir -p ${HARE_DIR} diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.bep b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.recipe similarity index 94% rename from haiku-apps/keymapswitcher/keymapswitcher-1.2.7.bep rename to haiku-apps/keymapswitcher/keymapswitcher-1.2.7.recipe index 79bb31fb2..bfc5da984 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.bep +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd keymapswitcher-1.2.7 make } -INSTALL { +INSTALL() +{ cd keymapswitcher-1.2.7 make package cp dist/*.zip ../.. diff --git a/haiku-apps/mkdepend/mkdepend-1.7.bep b/haiku-apps/mkdepend/mkdepend-1.7.recipe similarity index 96% rename from haiku-apps/mkdepend/mkdepend-1.7.bep rename to haiku-apps/mkdepend/mkdepend-1.7.recipe index eaa3d9d92..c1c6269a8 100644 --- a/haiku-apps/mkdepend/mkdepend-1.7.bep +++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="d4ec4fea9dd9b7292b52d780c8ee3387" -BUILD { +BUILD() +{ cd mkdepend-1.7 rc mkdepend.rdef xres mkdepend.rsrc gcc args.c getargs.c main.c nodes.c reader.c util.c -o mkdepend } -INSTALL { +INSTALL() +{ cd mkdepend-1.7 mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` cp -a mkdepend ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` diff --git a/haiku-apps/open-sum-it/open-sum-it-108.bep b/haiku-apps/open-sum-it/open-sum-it-108.recipe similarity index 96% rename from haiku-apps/open-sum-it/open-sum-it-108.bep rename to haiku-apps/open-sum-it/open-sum-it-108.recipe index f866edbdd..a37479aee 100644 --- a/haiku-apps/open-sum-it/open-sum-it-108.bep +++ b/haiku-apps/open-sum-it/open-sum-it-108.recipe @@ -7,12 +7,14 @@ DEPEND="bsl >= 108 rez >= 108" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd open-sum-it-108 make } -INSTALL { +INSTALL() +{ cd open-sum-it-108 APPS_DIR=`finddir B_APPS_DIRECTORY` mkdir -p ${DESTDIR}${APPS_DIR}/Open-Sum-It diff --git a/haiku-apps/paladin/paladin-1.3-hg.bep b/haiku-apps/paladin/paladin-1.3-hg.recipe similarity index 98% rename from haiku-apps/paladin/paladin-1.3-hg.bep rename to haiku-apps/paladin/paladin-1.3-hg.recipe index fccfd5c99..e107fa3fc 100644 --- a/haiku-apps/paladin/paladin-1.3-hg.bep +++ b/haiku-apps/paladin/paladin-1.3-hg.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd paladin-1.3-hg # ./buildsuite.sh 1 cd Paladin @@ -26,7 +27,8 @@ BUILD { jam } -INSTALL { +INSTALL() +{ cd paladin-1.3-hg mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin cp -f Paladin/Paladin ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/ diff --git a/haiku-apps/paladin/paladin-1.3.bep b/haiku-apps/paladin/paladin-1.3.recipe similarity index 98% rename from haiku-apps/paladin/paladin-1.3.bep rename to haiku-apps/paladin/paladin-1.3.recipe index cb7986d52..dc671765c 100644 --- a/haiku-apps/paladin/paladin-1.3.bep +++ b/haiku-apps/paladin/paladin-1.3.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libpcre >= 8.02" CHECKSUM_MD5="5cf4b445f77626f71956ccc325ed77dc" -BUILD { +BUILD() +{ cd Paladin-1.3.src/Paladin chmod 755 buildhaikugcc2.sh chmod 755 buildhaikugcc4.sh @@ -24,7 +25,8 @@ BUILD { jam } -INSTALL { +INSTALL() +{ cd Paladin-1.3.src mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin cp -f Paladin/Paladin ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Paladin/ diff --git a/haiku-apps/pe/pe-2.4.2-597.bep b/haiku-apps/pe/pe-2.4.2-597.recipe similarity index 96% rename from haiku-apps/pe/pe-2.4.2-597.bep rename to haiku-apps/pe/pe-2.4.2-597.recipe index d8700b6a1..8a9f558da 100644 --- a/haiku-apps/pe/pe-2.4.2-597.bep +++ b/haiku-apps/pe/pe-2.4.2-597.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libpcre >= 8.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd pe-2.4.2-597 jam } -INSTALL { +INSTALL() +{ cd pe-2.4.2-597/generated if [ -d distro ];then mv -f distro Pe diff --git a/haiku-apps/pe/pe-2.4.3-600.bep b/haiku-apps/pe/pe-2.4.3-600.recipe similarity index 96% rename from haiku-apps/pe/pe-2.4.3-600.bep rename to haiku-apps/pe/pe-2.4.3-600.recipe index bc857b363..a7ea93201 100644 --- a/haiku-apps/pe/pe-2.4.3-600.bep +++ b/haiku-apps/pe/pe-2.4.3-600.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libpcre >= 8.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd pe-2.4.3-600 jam } -INSTALL { +INSTALL() +{ cd pe-2.4.3-600 mkdir -p ${DESTDIR}/boot/apps cp -a generated/distro ${DESTDIR}/boot/apps/Pe diff --git a/haiku-apps/pe/pe-2.4.3-hg.bep b/haiku-apps/pe/pe-2.4.3-hg.recipe similarity index 96% rename from haiku-apps/pe/pe-2.4.3-hg.bep rename to haiku-apps/pe/pe-2.4.3-hg.recipe index ce5e6fc70..ea4271978 100644 --- a/haiku-apps/pe/pe-2.4.3-hg.bep +++ b/haiku-apps/pe/pe-2.4.3-hg.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libpcre >= 8.00" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd pe-2.4.3-hg jam } -INSTALL { +INSTALL() +{ cd pe-2.4.3-hg mkdir -p ${DESTDIR}/boot/apps cp -a generated/distro ${DESTDIR}/boot/apps/Pe diff --git a/haiku-apps/puri/puri-0.3.9.1.bep b/haiku-apps/puri/puri-0.3.9.1.recipe similarity index 96% rename from haiku-apps/puri/puri-0.3.9.1.bep rename to haiku-apps/puri/puri-0.3.9.1.recipe index 8f7f1d4e1..272c4df9d 100644 --- a/haiku-apps/puri/puri-0.3.9.1.bep +++ b/haiku-apps/puri/puri-0.3.9.1.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6e0a48e31dae972ccb010437a2d72dd8" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd puri-0.3.9.1 jam } -INSTALL { +INSTALL() +{ puri=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Puri mkdir -p ${puri} mkdir -p ${puri}/data/ diff --git a/haiku-apps/rez/rez-108.bep b/haiku-apps/rez/rez-108.recipe similarity index 94% rename from haiku-apps/rez/rez-108.bep rename to haiku-apps/rez/rez-108.recipe index d0cb76395..d4d1ce2c4 100644 --- a/haiku-apps/rez/rez-108.bep +++ b/haiku-apps/rez/rez-108.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd rez-108 make } -INSTALL { +INSTALL() +{ cd rez-108 BIN_DIR=`finddir B_COMMON_BIN_DIRECTORY` mkdir -p ${DESTDIR}${BIN_DIR} diff --git a/haiku-apps/sawteeth/sawteeth-1.3.bep b/haiku-apps/sawteeth/sawteeth-1.3.recipe similarity index 97% rename from haiku-apps/sawteeth/sawteeth-1.3.bep rename to haiku-apps/sawteeth/sawteeth-1.3.recipe index 3155d4445..ef0d7ce6c 100644 --- a/haiku-apps/sawteeth/sawteeth-1.3.bep +++ b/haiku-apps/sawteeth/sawteeth-1.3.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd sawteeth-1.3 cmake . make } -INSTALL { +INSTALL() +{ cd sawteeth-1.3 SAWTEETH_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Sawteeth mkdir -p ${SAWTEETH_DIR}/sounds diff --git a/haiku-apps/thememanager/thememanager-0-svn.bep b/haiku-apps/thememanager/thememanager-0-svn.recipe similarity index 92% rename from haiku-apps/thememanager/thememanager-0-svn.bep rename to haiku-apps/thememanager/thememanager-0-svn.recipe index 49ca68421..69eb763d7 100644 --- a/haiku-apps/thememanager/thememanager-0-svn.bep +++ b/haiku-apps/thememanager/thememanager-0-svn.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd trunk make } -INSTALL { +INSTALL() +{ cd trunk } diff --git a/haiku-apps/vision/vision-908.bep b/haiku-apps/vision/vision-908.recipe similarity index 97% rename from haiku-apps/vision/vision-908.bep rename to haiku-apps/vision/vision-908.recipe index 6e8b0d45b..63a723983 100644 --- a/haiku-apps/vision/vision-908.bep +++ b/haiku-apps/vision/vision-908.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd vision-908 if [ -n "$(setgcc | grep '4')" ]; then patch -p0 -ui ../../patches/vision-908-gcc4.patch @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ VISIONSETTINGSDIR=${DESTDIR}/`finddir B_USER_SETTINGS_DIRECTORY`/Vision mkdir -p ${VISIONSETTINGSDIR} cd vision-908 diff --git a/haiku-apps/vision/vision-933.bep b/haiku-apps/vision/vision-933.recipe similarity index 96% rename from haiku-apps/vision/vision-933.bep rename to haiku-apps/vision/vision-933.recipe index 020a494dd..41876b723 100644 --- a/haiku-apps/vision/vision-933.bep +++ b/haiku-apps/vision/vision-933.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd vision-933 cd Vision if [ -n "$(setgcc | grep '2')" ]; then @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd vision-933 cd Vision mkdir -p ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision diff --git a/haiku-apps/yab/yab-1.6.bep b/haiku-apps/yab/yab-1.6.recipe similarity index 97% rename from haiku-apps/yab/yab-1.6.bep rename to haiku-apps/yab/yab-1.6.recipe index 3c8340fa3..3cf2e5014 100644 --- a/haiku-apps/yab/yab-1.6.bep +++ b/haiku-apps/yab/yab-1.6.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="071e8653265a60fea96cceab46f67e5b" -BUILD { +BUILD() +{ cd yab-1.6/src make clean make } -INSTALL { +INSTALL() +{ cd yab-1.6 mkdir -p ${DESTDIR}/boot/apps/yab cp -a src/yab ${DESTDIR}/boot/apps/yab diff --git a/haiku-libs/libwalter/libwalter-97.bep b/haiku-libs/libwalter/libwalter-97.recipe similarity index 97% rename from haiku-libs/libwalter/libwalter-97.bep rename to haiku-libs/libwalter/libwalter-97.recipe index 577ee47f0..e90d86b06 100644 --- a/haiku-libs/libwalter/libwalter-97.bep +++ b/haiku-libs/libwalter/libwalter-97.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd libwalter-97 configure jam } -INSTALL { +INSTALL() +{ cd libwalter-97 mkdir -p ${DESTDIR}/`finddir B_COMMON_LIB_DIRECTORY` mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/libwalter @@ -19,7 +21,8 @@ INSTALL { cp -a include/. ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/libwalter } -TEST { +TEST() +{ cd tests ColorWellTest ComboBoxTest diff --git a/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.bep b/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.recipe similarity index 96% rename from media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.bep rename to media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.recipe index 4d1dde0d9..ee6aef5cd 100644 --- a/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.bep +++ b/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="11000a74da50b461b374f711392f1d46" -BUILD { +BUILD() +{ cd ae_fonts1-1.1 } -INSTALL { +INSTALL() +{ cd ae_fonts1-1.1 FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/arabeyes mkdir -p ${FONTDIR} diff --git a/media-fonts/courier-prime/courier-prime-1.0.bep b/media-fonts/courier-prime/courier-prime-1.0.recipe similarity index 96% rename from media-fonts/courier-prime/courier-prime-1.0.bep rename to media-fonts/courier-prime/courier-prime-1.0.recipe index 91be0bec0..26fa8a9fb 100644 --- a/media-fonts/courier-prime/courier-prime-1.0.bep +++ b/media-fonts/courier-prime/courier-prime-1.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="cf79336ce1cf439560a5364ab7856738" -BUILD { +BUILD() +{ echo "No building required." } -INSTALL { +INSTALL() +{ cd "Courier Prime" FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/courier-prime mkdir -p ${FONTDIR} diff --git a/media-fonts/droid/droid-113.bep b/media-fonts/droid/droid-113.recipe similarity index 97% rename from media-fonts/droid/droid-113.bep rename to media-fonts/droid/droid-113.recipe index b875f1f8d..cce5cff0d 100644 --- a/media-fonts/droid/droid-113.bep +++ b/media-fonts/droid/droid-113.recipe @@ -6,11 +6,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="4e11069eedc2ceda6b1cec7fd5939039" -BUILD { +BUILD() +{ cd base } -INSTALL { +INSTALL() +{ cd base FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/droid mkdir -p ${FONTDIR} diff --git a/media-fonts/farsi-fonts/farsi-fonts-0.4.bep b/media-fonts/farsi-fonts/farsi-fonts-0.4.recipe similarity index 89% rename from media-fonts/farsi-fonts/farsi-fonts-0.4.bep rename to media-fonts/farsi-fonts/farsi-fonts-0.4.recipe index 103144133..33d8e94a8 100644 --- a/media-fonts/farsi-fonts/farsi-fonts-0.4.bep +++ b/media-fonts/farsi-fonts/farsi-fonts-0.4.recipe @@ -5,14 +5,17 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="65a78975c923fd9db7b9441c32559c1b" -BUILD { +BUILD() +{ echo "No building required." } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ mkdir -p ${FONTDIR} - cp -r *.ttf {FONTDIR} + cp -r *.ttf() +{FONTDIR} } LICENSE="GNU GPL v2" diff --git a/media-fonts/inconsolata/inconsolata-1.0.bep b/media-fonts/inconsolata/inconsolata-1.0.recipe similarity index 96% rename from media-fonts/inconsolata/inconsolata-1.0.bep rename to media-fonts/inconsolata/inconsolata-1.0.recipe index d531ce2ef..23cce1f39 100644 --- a/media-fonts/inconsolata/inconsolata-1.0.bep +++ b/media-fonts/inconsolata/inconsolata-1.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8510443343f43382566511e73abc06f8" -BUILD { +BUILD() +{ echo "No building required." } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/inconsolata mkdir -p ${FONTDIR} wget http://levien.com/type/myfonts/Inconsolata.otf diff --git a/media-fonts/kacst-fonts/kacst-fonts-5.0.bep b/media-fonts/kacst-fonts/kacst-fonts-5.0.recipe similarity index 96% rename from media-fonts/kacst-fonts/kacst-fonts-5.0.bep rename to media-fonts/kacst-fonts/kacst-fonts-5.0.recipe index 2c773bcf1..c2a34ed0e 100644 --- a/media-fonts/kacst-fonts/kacst-fonts-5.0.bep +++ b/media-fonts/kacst-fonts/kacst-fonts-5.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="0a7ad4538d3b97adfbefa4c5cf8c2660" -BUILD { +BUILD() +{ cd kacst_one_5.0 } -INSTALL { +INSTALL() +{ cd kacst_one_5.0 FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/arabeyes mkdir -p ${FONTDIR} diff --git a/media-fonts/lateef-font/lateef-font-1.001.bep b/media-fonts/lateef-font/lateef-font-1.001.recipe similarity index 95% rename from media-fonts/lateef-font/lateef-font-1.001.bep rename to media-fonts/lateef-font/lateef-font-1.001.recipe index bc38efee9..0de1633c9 100644 --- a/media-fonts/lateef-font/lateef-font-1.001.bep +++ b/media-fonts/lateef-font/lateef-font-1.001.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="c060ab84ab33ae8f991103258b8e7f22" -BUILD { +BUILD() +{ echo "No building required." } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR} diff --git a/media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.bep b/media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.recipe similarity index 96% rename from media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.bep rename to media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.recipe index 95a836d80..226727d72 100644 --- a/media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.bep +++ b/media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="fontforge" CHECKSUM_MD5="2f45bd873ab48cf0c3a00fbd350c0e80" -BUILD { +BUILD() +{ cd liberation-fonts-1.06.0.20100721 make } -INSTALL { +INSTALL() +{ cd liberation-fonts-1.06.0.20100721 FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/liberation mkdir -p ${FONTDIR} diff --git a/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.bep b/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.recipe similarity index 97% rename from media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.bep rename to media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.recipe index dd201fb6f..fc56440a3 100644 --- a/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.bep +++ b/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="34ca164ce011b682522431fc332c0cb6" -BUILD { +BUILD() +{ echo "Nothing to be done. To install this font, run haikuporter with -i option" } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nafees-nastaleeq mkdir -p ${FONTDIR} cp "Nafees Nastaleeq v1.02.ttf" ${FONTDIR} diff --git a/media-fonts/nafees-riqa/nafees-riqa-1.00.bep b/media-fonts/nafees-riqa/nafees-riqa-1.00.recipe similarity index 96% rename from media-fonts/nafees-riqa/nafees-riqa-1.00.bep rename to media-fonts/nafees-riqa/nafees-riqa-1.00.recipe index 805653aed..ca16a2cf9 100644 --- a/media-fonts/nafees-riqa/nafees-riqa-1.00.bep +++ b/media-fonts/nafees-riqa/nafees-riqa-1.00.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="504c6ada41a408575a120daf2a110b6f" -BUILD { +BUILD() +{ echo "Nothing to be done. To install this font, run haikuporter with -i option" } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nafees-riqa mkdir -p ${FONTDIR} cp "Nafees Riqa v1.0.ttf" ${FONTDIR} diff --git a/media-fonts/nanumfont/nanumfont-2.0.bep b/media-fonts/nanumfont/nanumfont-2.0.recipe similarity index 95% rename from media-fonts/nanumfont/nanumfont-2.0.bep rename to media-fonts/nanumfont/nanumfont-2.0.recipe index 8f0cc9baf..afa82f449 100644 --- a/media-fonts/nanumfont/nanumfont-2.0.bep +++ b/media-fonts/nanumfont/nanumfont-2.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6214a5844454c96faeac9a60539c7daf" -BUILD { +BUILD() +{ echo "No building required." } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nanumfont mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR}/ diff --git a/media-fonts/scheherazade-font/scheherazade-font-1.005.bep b/media-fonts/scheherazade-font/scheherazade-font-1.005.recipe similarity index 96% rename from media-fonts/scheherazade-font/scheherazade-font-1.005.bep rename to media-fonts/scheherazade-font/scheherazade-font-1.005.recipe index 307e71ece..2d438f87a 100644 --- a/media-fonts/scheherazade-font/scheherazade-font-1.005.bep +++ b/media-fonts/scheherazade-font/scheherazade-font-1.005.recipe @@ -6,11 +6,13 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="3c7e7d7f93802162effe2b517af98be0" -BUILD { +BUILD() +{ echo "No building required." } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/scheherazade mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR} diff --git a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.bep b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe similarity index 96% rename from media-fonts/ukijorgfonts/ukijorgfonts-1.0.bep rename to media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe index 5620593ce..05e2c6a67 100644 --- a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.bep +++ b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e50ed1b90f96cad12e31f8769bd598dc" -BUILD { +BUILD() +{ echo "Nothing to be done. To install this font, run haikuporter with -i option" } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ukijorgfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.bep b/media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.recipe similarity index 96% rename from media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.bep rename to media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.recipe index 459d3138d..06a576b38 100644 --- a/media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.bep +++ b/media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="a124c5c6606f4f3b733d3477380e9d2f" -BUILD { +BUILD() +{ cd wqy-microhei } -INSTALL { +INSTALL() +{ cd wqy-microhei FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/wenquanyi mkdir -p ${FONTDIR} diff --git a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.bep b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.recipe similarity index 96% rename from media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.bep rename to media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.recipe index 87777cc52..c95a82a32 100644 --- a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.bep +++ b/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="4c6c3f4e902dd5ee0a121e8c41d040bd" -BUILD { +BUILD() +{ cd wqy-zenhei } -INSTALL { +INSTALL() +{ cd wqy-zenhei FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/wenquanyi mkdir -p ${FONTDIR} diff --git a/media-fonts/x-series-fonts/x-series-fonts-2.0.bep b/media-fonts/x-series-fonts/x-series-fonts-2.0.recipe similarity index 99% rename from media-fonts/x-series-fonts/x-series-fonts-2.0.bep rename to media-fonts/x-series-fonts/x-series-fonts-2.0.recipe index 93c2f2064..c63036006 100644 --- a/media-fonts/x-series-fonts/x-series-fonts-2.0.bep +++ b/media-fonts/x-series-fonts/x-series-fonts-2.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="1e45723ebad5e748d4b5f6f28074833f" -BUILD { +BUILD() +{ cd Zar } -INSTALL { +INSTALL() +{ FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/x-series mkdir -p ${FONTDIR} wget http://irmug.com/downloads/dl.php?id=21 diff --git a/media-gfx/blender/blender-2.49b.bep b/media-gfx/blender/blender-2.49b.recipe similarity index 95% rename from media-gfx/blender/blender-2.49b.bep rename to media-gfx/blender/blender-2.49b.recipe index cb93d13d3..10b445702 100644 --- a/media-gfx/blender/blender-2.49b.bep +++ b/media-gfx/blender/blender-2.49b.recipe @@ -8,12 +8,14 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="dev-util/scons >= 1.0.1 dev-lang/python >= 2.6.0" -BUILD { +BUILD() +{ cd blender-2.49b scons } -INSTALL { +INSTALL() +{ # TODO exit 1 } diff --git a/media-gfx/flam3/flam3-3.0.bep b/media-gfx/flam3/flam3-3.0.recipe similarity index 96% rename from media-gfx/flam3/flam3-3.0.bep rename to media-gfx/flam3/flam3-3.0.recipe index 3f3aa7c32..e5f209772 100644 --- a/media-gfx/flam3/flam3-3.0.bep +++ b/media-gfx/flam3/flam3-3.0.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="dev-util/pkconfig >= 0.23" -BUILD { +BUILD() +{ cd flam3-3.0/src if [ -n "$(setgcc | grep '2')" ]; then patch -p0 -ui ../../../patches/flam3-3.0-gcc2.patch @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd flam3-3.0/src make install } diff --git a/media-gfx/fontforge/fontforge-201005010.bep b/media-gfx/fontforge/fontforge-201005010.recipe similarity index 95% rename from media-gfx/fontforge/fontforge-201005010.bep rename to media-gfx/fontforge/fontforge-201005010.recipe index d4cadf981..f358a4973 100644 --- a/media-gfx/fontforge/fontforge-201005010.bep +++ b/media-gfx/fontforge/fontforge-201005010.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="5f3d20d645ec1aa2b7b4876386df8717" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd fontforge-20100501 libtoolize --force --copy --install aclocal @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd fontforge-20100501 make install } diff --git a/media-gfx/graphviz/graphviz-2.24.bep b/media-gfx/graphviz/graphviz-2.24.recipe similarity index 96% rename from media-gfx/graphviz/graphviz-2.24.bep rename to media-gfx/graphviz/graphviz-2.24.recipe index 2285c4260..6ad367337 100644 --- a/media-gfx/graphviz/graphviz-2.24.bep +++ b/media-gfx/graphviz/graphviz-2.24.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="806a30dbc3f8deb219216f35be0e7a40" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd graphviz-2.24.0 libtoolize -fci aclocal -I m4 @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd graphviz-2.24.0 make install cd `finddir B_COMMON_BIN_DIRECTORY` diff --git a/media-gfx/graphviz/graphviz-2.26.3.bep b/media-gfx/graphviz/graphviz-2.26.3.recipe similarity index 96% rename from media-gfx/graphviz/graphviz-2.26.3.bep rename to media-gfx/graphviz/graphviz-2.26.3.recipe index 702281e4d..ca426fd62 100644 --- a/media-gfx/graphviz/graphviz-2.26.3.bep +++ b/media-gfx/graphviz/graphviz-2.26.3.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="6f45946fa622770c45609778c0a982ee" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd graphviz-2.26.3 libtoolize -fci autoconf @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd graphviz-2.26.3 make install } diff --git a/media-gfx/hqx/hqx-1.1.bep b/media-gfx/hqx/hqx-1.1.recipe similarity index 96% rename from media-gfx/hqx/hqx-1.1.bep rename to media-gfx/hqx/hqx-1.1.recipe index ba9a5e07f..83976d146 100644 --- a/media-gfx/hqx/hqx-1.1.bep +++ b/media-gfx/hqx/hqx-1.1.recipe @@ -7,14 +7,16 @@ DEPEND="media-libs/devil >= 1.7.8" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." CHECKSUM_MD5="e4d3132b5f3614a75975b62fe6a066bb" -BUILD { +BUILD() +{ cd hqx-1.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd hqx-1.1 make install diff --git a/media-gfx/imagemagick/imagemagick-6.6.1-10.bep b/media-gfx/imagemagick/imagemagick-6.6.1-10.recipe similarity index 97% rename from media-gfx/imagemagick/imagemagick-6.6.1-10.bep rename to media-gfx/imagemagick/imagemagick-6.6.1-10.recipe index 21b575066..a6bf12c1a 100644 --- a/media-gfx/imagemagick/imagemagick-6.6.1-10.bep +++ b/media-gfx/imagemagick/imagemagick-6.6.1-10.recipe @@ -13,7 +13,8 @@ DEPEND="media-libs/libpng, media-libs/lcms, media-libs/freetype" CHECKSUM_MD5="fa42577f4d9ab23171bc6824b515ca13" -BUILD { +BUILD() +{ cd ImageMagick-6.6.1-10 libtoolize --force aclocal -I m4 @@ -27,7 +28,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ImageMagick-6.6.1-10 make install } diff --git a/media-gfx/pngcrush/pngcrush-1.7.11.bep b/media-gfx/pngcrush/pngcrush-1.7.11.recipe similarity index 96% rename from media-gfx/pngcrush/pngcrush-1.7.11.bep rename to media-gfx/pngcrush/pngcrush-1.7.11.recipe index 4f86224ef..30ebeadd0 100644 --- a/media-gfx/pngcrush/pngcrush-1.7.11.bep +++ b/media-gfx/pngcrush/pngcrush-1.7.11.recipe @@ -6,11 +6,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pngcrush-1.7.11-nolib make } -INSTALL { +INSTALL() +{ cd pngcrush-1.7.11-nolib mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` cp -a -f pngcrush ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` diff --git a/media-gfx/pngcrush/pngcrush-1.7.12.bep b/media-gfx/pngcrush/pngcrush-1.7.12.recipe similarity index 96% rename from media-gfx/pngcrush/pngcrush-1.7.12.bep rename to media-gfx/pngcrush/pngcrush-1.7.12.recipe index 5564d42cc..67391fe1f 100644 --- a/media-gfx/pngcrush/pngcrush-1.7.12.bep +++ b/media-gfx/pngcrush/pngcrush-1.7.12.recipe @@ -6,11 +6,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pngcrush-1.7.12-nolib make } -INSTALL { +INSTALL() +{ cd pngcrush-1.7.12-nolib mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` cp -a -f pngcrush ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` diff --git a/media-gfx/pngcrush/pngcrush-1.7.6.bep b/media-gfx/pngcrush/pngcrush-1.7.6.recipe similarity index 95% rename from media-gfx/pngcrush/pngcrush-1.7.6.bep rename to media-gfx/pngcrush/pngcrush-1.7.6.recipe index 20dcd81d1..cf2825ac6 100644 --- a/media-gfx/pngcrush/pngcrush-1.7.6.bep +++ b/media-gfx/pngcrush/pngcrush-1.7.6.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="79fdedccf761f6391c11aa851c9fc6b2" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pngcrush-1.7.6-nolib make } -INSTALL { +INSTALL() +{ cd pngcrush-1.7.6-nolib cp -a -f pngcrush `finddir B_COMMON_BIN_DIRECTORY` } diff --git a/media-gfx/potrace/potrace-1.8.bep b/media-gfx/potrace/potrace-1.8.recipe similarity index 95% rename from media-gfx/potrace/potrace-1.8.bep rename to media-gfx/potrace/potrace-1.8.recipe index a9c35063c..973ae7e68 100644 --- a/media-gfx/potrace/potrace-1.8.bep +++ b/media-gfx/potrace/potrace-1.8.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd potrace-1.8 libtoolize --force --copy --install aclocal @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd potrace-1.8 make install } diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21.bep b/media-gfx/tuxpaint/tuxpaint-0.9.21.recipe similarity index 96% rename from media-gfx/tuxpaint/tuxpaint-0.9.21.bep rename to media-gfx/tuxpaint/tuxpaint-0.9.21.recipe index afcd11f6d..192f3bb24 100644 --- a/media-gfx/tuxpaint/tuxpaint-0.9.21.bep +++ b/media-gfx/tuxpaint/tuxpaint-0.9.21.recipe @@ -15,12 +15,14 @@ DEPEND="media-libs/libsdl >= 1.2.14 dev-util/pkgconfig >= 0.23 sys-devel/gettext >= 0.17" -BUILD { +BUILD() +{ cd tuxpaint-0.9.21 make } -INSTALL { +INSTALL() +{ cd tuxpaint-0.9.21 make install } diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.bep b/media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.recipe similarity index 97% rename from media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.bep rename to media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.recipe index 6dc3f1daf..f0893b193 100644 --- a/media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.bep +++ b/media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.recipe @@ -15,7 +15,8 @@ DEPEND="media-libs/libsdl >= 1.2.14 sys-devel/gettext >= 0.17 dev-utils/gperf >= 3.0.4" -BUILD { +BUILD() +{ cd tuxpaint-0.9.2x-cvs if [ ! -f /boot/common/lib/libstdc++.so ] then @@ -24,7 +25,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tuxpaint-0.9.2x-cvs make install DESTDIR=${DESTDIR} } diff --git a/media-libs/a52dec/a52dec-0.7.4.bep b/media-libs/a52dec/a52dec-0.7.4.recipe similarity index 95% rename from media-libs/a52dec/a52dec-0.7.4.bep rename to media-libs/a52dec/a52dec-0.7.4.recipe index ca528ac3c..b062a6fbd 100644 --- a/media-libs/a52dec/a52dec-0.7.4.bep +++ b/media-libs/a52dec/a52dec-0.7.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="caa9f5bc44232dc8aeea773fea56be80" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd a52dec-0.7.4 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd a52dec-0.7.4 make install DESTDIR=${DESTDIR} } diff --git a/media-libs/aalib/aalib-1.4rc4.bep b/media-libs/aalib/aalib-1.4rc4.recipe similarity index 96% rename from media-libs/aalib/aalib-1.4rc4.bep rename to media-libs/aalib/aalib-1.4rc4.recipe index 34b9d7925..29a13d8cb 100644 --- a/media-libs/aalib/aalib-1.4rc4.bep +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -5,7 +5,8 @@ SRC_URI="http://prdownloads.sourceforge.net/aa-project/aalib-1.4rc4.tar.gz" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd aalib-1.4.0 libtoolize --force --copy --install # aclocal @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd aalib-1.4.0 make install } diff --git a/media-libs/agar/agar-1.4.1.bep b/media-libs/agar/agar-1.4.1.recipe similarity index 94% rename from media-libs/agar/agar-1.4.1.bep rename to media-libs/agar/agar-1.4.1.recipe index 5c13d6e2d..e88afa4c9 100644 --- a/media-libs/agar/agar-1.4.1.bep +++ b/media-libs/agar/agar-1.4.1.recipe @@ -5,18 +5,21 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="ce71fb11ad79c926a968a4ed29053820" -BUILD { +BUILD() +{ cd agar-1.4.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd agar-1.4.1 make install } -TEST { +TEST() +{ cd agar-1.4.1 # make test # make check diff --git a/media-libs/allegro/allegro-4.4.0.bep b/media-libs/allegro/allegro-4.4.0.recipe similarity index 95% rename from media-libs/allegro/allegro-4.4.0.bep rename to media-libs/allegro/allegro-4.4.0.recipe index c78f14bc2..7a3ff42b1 100644 --- a/media-libs/allegro/allegro-4.4.0.bep +++ b/media-libs/allegro/allegro-4.4.0.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="8a0bd73f5225ba8961211a5c440ff45d" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libvorbis >= 1.2.3" -BUILD { +BUILD() +{ cd allegro-4.4.0 cmake . make } -INSTALL { +INSTALL() +{ cd allegro-4.4.0 make install } diff --git a/media-libs/allegro/allegro-4.4.1.1.bep b/media-libs/allegro/allegro-4.4.1.1.recipe similarity index 97% rename from media-libs/allegro/allegro-4.4.1.1.bep rename to media-libs/allegro/allegro-4.4.1.1.recipe index c4a2019cd..925c2c10a 100644 --- a/media-libs/allegro/allegro-4.4.1.1.bep +++ b/media-libs/allegro/allegro-4.4.1.1.recipe @@ -8,7 +8,8 @@ DEPEND="dev-util/cmake >= 2.6.0 media-libs/libvorbis >= 1.2.3 media-libs/libogg >= 1.1.4" -BUILD { +BUILD() +{ cd allegro-4.4.1.1 mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd allegro-4.4.1.1 make install } diff --git a/media-libs/allegro/allegro-4.4.x-svn.bep b/media-libs/allegro/allegro-4.4.x-svn.recipe similarity index 96% rename from media-libs/allegro/allegro-4.4.x-svn.bep rename to media-libs/allegro/allegro-4.4.x-svn.recipe index ca03a5837..e114b9ab5 100644 --- a/media-libs/allegro/allegro-4.4.x-svn.bep +++ b/media-libs/allegro/allegro-4.4.x-svn.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.6.0 media-libs/libvorbis >= 1.2.3 media-libs/libogg >= 1.1.4" -BUILD { +BUILD() +{ cd allegro-4.4.x-svn mkdir -p `finddir B_COMMON_DIRECTORY`/share/info mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd allegro-4.4.x-svn make install } diff --git a/media-libs/almp3/almp3-2.0.4.bep b/media-libs/almp3/almp3-2.0.4.recipe similarity index 96% rename from media-libs/almp3/almp3-2.0.4.bep rename to media-libs/almp3/almp3-2.0.4.recipe index e86b5a825..7e5cfe81a 100644 --- a/media-libs/almp3/almp3-2.0.4.bep +++ b/media-libs/almp3/almp3-2.0.4.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/allegro >= 4.4" CHECKSUM_MD5="8fe1517750acf23c07442b31447791a8" -BUILD { +BUILD() +{ cd almp3 mkdir -p obj/haiku/dynamic mkdir -p obj/haiku/static @@ -14,7 +15,8 @@ BUILD { make TARGET=HAIKU_SHARED } -INSTALL { +INSTALL() +{ cd almp3 make install prefix=/boot/common \ diff --git a/media-libs/cal3d/cal3d-0.11.0.bep b/media-libs/cal3d/cal3d-0.11.0.recipe similarity index 95% rename from media-libs/cal3d/cal3d-0.11.0.bep rename to media-libs/cal3d/cal3d-0.11.0.recipe index 1522e449d..37460b671 100644 --- a/media-libs/cal3d/cal3d-0.11.0.bep +++ b/media-libs/cal3d/cal3d-0.11.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="82ad09c1c28e73bc9596aec47237bfba" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd cal3d-0.11.0 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cal3d-0.11.0 make install } diff --git a/media-libs/devil/devil-1.7.8.bep b/media-libs/devil/devil-1.7.8.recipe similarity index 96% rename from media-libs/devil/devil-1.7.8.bep rename to media-libs/devil/devil-1.7.8.recipe index 29a5e75d9..8734b2381 100644 --- a/media-libs/devil/devil-1.7.8.bep +++ b/media-libs/devil/devil-1.7.8.recipe @@ -10,7 +10,8 @@ DEPEND="media-libs/jasper >= 1.900.1 openexr >= 1.5.0 dev-util/pkg-config >= 0.23 media-libs/tiff >= 3.8.2" -BUILD { +BUILD() +{ cd devil-1.7.8 libtoolize --force --copy --install autoreconf -i @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd devil-1.7.8 make install } diff --git a/media-libs/djvulibre/djvulibre-3.5.25.bep b/media-libs/djvulibre/djvulibre-3.5.25.recipe similarity index 97% rename from media-libs/djvulibre/djvulibre-3.5.25.bep rename to media-libs/djvulibre/djvulibre-3.5.25.recipe index a4355f690..7cf3da398 100644 --- a/media-libs/djvulibre/djvulibre-3.5.25.bep +++ b/media-libs/djvulibre/djvulibre-3.5.25.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd djvulibre-3.5.25 COMMON_DIR=`finddir B_COMMON_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd djvulibre-3.5.25 make install } diff --git a/media-libs/dumb/dumb-0.9.3.bep b/media-libs/dumb/dumb-0.9.3.recipe similarity index 97% rename from media-libs/dumb/dumb-0.9.3.bep rename to media-libs/dumb/dumb-0.9.3.recipe index 133679aa6..187e82fb2 100644 --- a/media-libs/dumb/dumb-0.9.3.bep +++ b/media-libs/dumb/dumb-0.9.3.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/allegro >= 4.4.1.1" CHECKSUM_MD5="f48da5b990aa8aa822d3b6a951baf5c2" -BUILD { +BUILD() +{ if [ ! -f dumb-0.9.3-autotools.tar.gz ]; then # get the autotools to help in building dumb wget http://prdownloads.sourceforge.net/dumb/dumb-0.9.3-autotools.tar.gz?download @@ -23,7 +24,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd dumb-0.9.3 make install DESTDIR=${DESTDIR} } diff --git a/media-libs/faac/faac-1.28.bep b/media-libs/faac/faac-1.28.recipe similarity index 97% rename from media-libs/faac/faac-1.28.bep rename to media-libs/faac/faac-1.28.recipe index 5d03c0a98..85ace122a 100644 --- a/media-libs/faac/faac-1.28.bep +++ b/media-libs/faac/faac-1.28.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="c5dde68840cefe46532089c9392d1df0" MESSAGE="See FAAC file in licenses directory for restrictions on binary releases. Binary releases may require a patent license in some countries." -BUILD { +BUILD() +{ cd faac-1.28 libtoolize --force --copy --install aclocal @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd faac-1.28 make install } diff --git a/media-libs/faad2/faad2-2.7.bep b/media-libs/faad2/faad2-2.7.recipe similarity index 96% rename from media-libs/faad2/faad2-2.7.bep rename to media-libs/faad2/faad2-2.7.recipe index 215d00dbb..9f84734f3 100644 --- a/media-libs/faad2/faad2-2.7.bep +++ b/media-libs/faad2/faad2-2.7.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="ee1b4d67ea2d76ee52c5621bc6dbf61e" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd faad2-2.7 libtoolize --force --copy --install aclocal @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd faad2-2.7 make install } diff --git a/media-libs/fblend/fblend-0.4.bep b/media-libs/fblend/fblend-0.4.recipe similarity index 96% rename from media-libs/fblend/fblend-0.4.bep rename to media-libs/fblend/fblend-0.4.recipe index 513feb254..6150e6298 100644 --- a/media-libs/fblend/fblend-0.4.bep +++ b/media-libs/fblend/fblend-0.4.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="broken" DEPEND="media-libs/allegro >= 4.4 app-text/dos2unix >= 1.0" CHECKSUM_MD5="e252ae521e099793fe6caa0fb7d048f3" -BUILD { +BUILD() +{ cd fblend dos2unix * dos2unix src/* @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd fblend make install INSTALL_DIR=/boot/common } diff --git a/media-libs/fitz/fitz-1.0.bep b/media-libs/fitz/fitz-1.0.recipe similarity index 97% rename from media-libs/fitz/fitz-1.0.bep rename to media-libs/fitz/fitz-1.0.recipe index aab114c98..85c20222f 100644 --- a/media-libs/fitz/fitz-1.0.bep +++ b/media-libs/fitz/fitz-1.0.recipe @@ -9,12 +9,14 @@ DEPEND="jbig2dec >= 0.11 jpeg >= 8d zlib >= 1.2.5 freetype >=2.4.9" -BUILD { +BUILD() +{ cd mupdf-1.0-source make libs } -INSTALL { +INSTALL() +{ cd mupdf-1.0-source make install \ prefix=${DESTDIR}/`finddir B_COMMON_DIRECTORY` \ diff --git a/media-libs/flac/flac-1.2.1.bep b/media-libs/flac/flac-1.2.1.recipe similarity index 98% rename from media-libs/flac/flac-1.2.1.bep rename to media-libs/flac/flac-1.2.1.recipe index 1a5b26f0a..df7717403 100644 --- a/media-libs/flac/flac-1.2.1.bep +++ b/media-libs/flac/flac-1.2.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="153c8b15a54da428d1f0fadc756c22c7" REVISION="1" STATUS_HAIKU="stable" DEPEND="gettext >= 0.17" -BUILD { +BUILD() +{ cd flac-1.2.1 haikuporter -b libiconv-1.13.1 cp -a `haikuporter -t`/dev-libs/libiconv/work/libiconv-1.13.1/srcm4/. m4 @@ -24,7 +25,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd flac-1.2.1 make install } diff --git a/media-libs/fontconfig/fontconfig-2.10.0.bep b/media-libs/fontconfig/fontconfig-2.10.0.recipe similarity index 98% rename from media-libs/fontconfig/fontconfig-2.10.0.bep rename to media-libs/fontconfig/fontconfig-2.10.0.recipe index 271be1d39..27a33a18c 100644 --- a/media-libs/fontconfig/fontconfig-2.10.0.bep +++ b/media-libs/fontconfig/fontconfig-2.10.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/pkgconfig >= 0.23 media-libs/freetype >= 2.4.9" -BUILD { +BUILD() +{ cd fontconfig-2.10.0 mkdir -p `finddir B_USER_CACHE_DIRECTORY` libtoolize --force --copy --install @@ -31,7 +32,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd fontconfig-2.10.0 make install } diff --git a/media-libs/fontconfig/fontconfig-2.10.2.bep b/media-libs/fontconfig/fontconfig-2.10.2.recipe similarity index 98% rename from media-libs/fontconfig/fontconfig-2.10.2.bep rename to media-libs/fontconfig/fontconfig-2.10.2.recipe index b082b6fd1..d7510c929 100644 --- a/media-libs/fontconfig/fontconfig-2.10.2.bep +++ b/media-libs/fontconfig/fontconfig-2.10.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/pkgconfig >= 0.23 media-libs/freetype >= 2.4.9" -BUILD { +BUILD() +{ cd fontconfig-2.10.2 mkdir -p `finddir B_USER_CACHE_DIRECTORY` libtoolize --force --copy --install @@ -31,7 +32,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd fontconfig-2.10.2 make install } diff --git a/media-libs/freealut/freealut-1.1.0.bep b/media-libs/freealut/freealut-1.1.0.recipe similarity index 96% rename from media-libs/freealut/freealut-1.1.0.bep rename to media-libs/freealut/freealut-1.1.0.recipe index 33cdd225b..b234c477b 100644 --- a/media-libs/freealut/freealut-1.1.0.bep +++ b/media-libs/freealut/freealut-1.1.0.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="media-libs/openal >= 1.6.372 dev-util/cmake >= 2.8.1" -BUILD { +BUILD() +{ cd freealut-1.1.0 libtoolize --force --copy --install ./autogen.sh @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd freealut-1.1.0 make install } diff --git a/media-libs/freeimage/freeimage-3.15.3.bep b/media-libs/freeimage/freeimage-3.15.3.recipe similarity index 97% rename from media-libs/freeimage/freeimage-3.15.3.bep rename to media-libs/freeimage/freeimage-3.15.3.recipe index a24b5c2f4..31acb2cf8 100644 --- a/media-libs/freeimage/freeimage-3.15.3.bep +++ b/media-libs/freeimage/freeimage-3.15.3.recipe @@ -6,14 +6,16 @@ CHECKSUM_MD5="6c305b4086500ff8541c596ea6fc7cd7" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd FreeImage make -f Makefile.gnu \ INCDIR=`finddir B_COMMON_HEADERS_DIRECTORY` \ INSTALLDIR=`finddir B_COMMON_LIB_DIRECTORY` } -INSTALL { +INSTALL() +{ cd FreeImage make -f Makefile.gnu install \ INCDIR=${DESTDIR}/`finddir B_COMMON_HEADERS_DIRECTORY` \ diff --git a/media-libs/freetype/freetype-2.3.11.bep b/media-libs/freetype/freetype-2.3.11.recipe similarity index 96% rename from media-libs/freetype/freetype-2.3.11.bep rename to media-libs/freetype/freetype-2.3.11.recipe index d3cf73bb5..adf60d5fe 100644 --- a/media-libs/freetype/freetype-2.3.11.bep +++ b/media-libs/freetype/freetype-2.3.11.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="a693c9a4b0121890ca71e39364ffea4a" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd freetype-2.3.11 sh ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty make } -INSTALL { +INSTALL() +{ cd freetype-2.3.11 make install } diff --git a/media-libs/freetype/freetype-2.4.11.bep b/media-libs/freetype/freetype-2.4.11.recipe similarity index 96% rename from media-libs/freetype/freetype-2.4.11.bep rename to media-libs/freetype/freetype-2.4.11.recipe index eba796d93..ff524a88f 100644 --- a/media-libs/freetype/freetype-2.4.11.bep +++ b/media-libs/freetype/freetype-2.4.11.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="b93435488942486c8d0ca22e8f768034" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd freetype-2.4.11 sh ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd freetype-2.4.11 make install } diff --git a/media-libs/freetype/freetype-2.4.2.bep b/media-libs/freetype/freetype-2.4.2.recipe similarity index 96% rename from media-libs/freetype/freetype-2.4.2.bep rename to media-libs/freetype/freetype-2.4.2.recipe index a8b96329f..346cd16fc 100644 --- a/media-libs/freetype/freetype-2.4.2.bep +++ b/media-libs/freetype/freetype-2.4.2.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="647ee8ed266f9a4117c8d0a4855b3d3e" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd freetype-2.4.2 sh ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty make } -INSTALL { +INSTALL() +{ cd freetype-2.4.2 make install } diff --git a/media-libs/freetype/freetype-2.4.4.bep b/media-libs/freetype/freetype-2.4.4.recipe similarity index 96% rename from media-libs/freetype/freetype-2.4.4.bep rename to media-libs/freetype/freetype-2.4.4.recipe index ea267c28f..684f2c221 100644 --- a/media-libs/freetype/freetype-2.4.4.bep +++ b/media-libs/freetype/freetype-2.4.4.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="b3e2b6e2f1c3e0dffa1fd2a0f848b671" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd freetype-2.4.4 sh ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty make } -INSTALL { +INSTALL() +{ cd freetype-2.4.4 make install } diff --git a/media-libs/freetype/freetype-2.4.6.bep b/media-libs/freetype/freetype-2.4.6.recipe similarity index 96% rename from media-libs/freetype/freetype-2.4.6.bep rename to media-libs/freetype/freetype-2.4.6.recipe index fc759031f..7c19c245a 100644 --- a/media-libs/freetype/freetype-2.4.6.bep +++ b/media-libs/freetype/freetype-2.4.6.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="5e6510613f612809d2d7862592b92ab7" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd freetype-2.4.6 sh ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd freetype-2.4.6 make install } diff --git a/media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.bep b/media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.recipe similarity index 96% rename from media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.bep rename to media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.recipe index 088c810cf..5c2a3adf1 100644 --- a/media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.bep +++ b/media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="77a893dae81fd5b896632715ca041179" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd freetype-2.4.9 sh ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd freetype-2.4.9 make install } diff --git a/media-libs/freetype/freetype-2.4.9.bep b/media-libs/freetype/freetype-2.4.9.recipe similarity index 96% rename from media-libs/freetype/freetype-2.4.9.bep rename to media-libs/freetype/freetype-2.4.9.recipe index 088c810cf..5c2a3adf1 100644 --- a/media-libs/freetype/freetype-2.4.9.bep +++ b/media-libs/freetype/freetype-2.4.9.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="77a893dae81fd5b896632715ca041179" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd freetype-2.4.9 sh ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd freetype-2.4.9 make install } diff --git a/media-libs/ftgl/ftgl-2.1-svn.bep b/media-libs/ftgl/ftgl-2.1-svn.recipe similarity index 96% rename from media-libs/ftgl/ftgl-2.1-svn.bep rename to media-libs/ftgl/ftgl-2.1-svn.recipe index 4c482e482..a2cbd0a4f 100644 --- a/media-libs/ftgl/ftgl-2.1-svn.bep +++ b/media-libs/ftgl/ftgl-2.1-svn.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="pkgconfig >= 0.23" -BUILD { +BUILD() +{ cd ftgl-2.1-svn libtoolize --copy --force --install aclocal --install -I m4 @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ftgl-2.1-svn make install DESTDIR=${DESTDIR} } diff --git a/media-libs/ftgl/ftgl-2.1.3.bep b/media-libs/ftgl/ftgl-2.1.3.recipe similarity index 97% rename from media-libs/ftgl/ftgl-2.1.3.bep rename to media-libs/ftgl/ftgl-2.1.3.recipe index 83126fce8..e9c2e2ec4 100644 --- a/media-libs/ftgl/ftgl-2.1.3.bep +++ b/media-libs/ftgl/ftgl-2.1.3.recipe @@ -6,7 +6,8 @@ REVISION="3" STATUS_HAIKU="stable" DEPEND="pkgconfig >= 0.23" -BUILD { +BUILD() +{ cd ftgl-2.1.3~rc5 echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.in" libtoolize --copy --force --install @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ftgl-2.1.3~rc5 make install } diff --git a/media-libs/gd/gd-2.0.36rc1.bep b/media-libs/gd/gd-2.0.36rc1.recipe similarity index 96% rename from media-libs/gd/gd-2.0.36rc1.bep rename to media-libs/gd/gd-2.0.36rc1.recipe index a6190b52f..4fc6c7b1e 100644 --- a/media-libs/gd/gd-2.0.36rc1.bep +++ b/media-libs/gd/gd-2.0.36rc1.recipe @@ -8,7 +8,8 @@ DEPEND="media-libs/libpng >= 1.2.44 media-libs/giflib >= 4.1.6" CHECKSUM_MD5="39ac48e6d5e0012a3bd2248a0102f209" -BUILD { +BUILD() +{ cd gd-2.0.36RC1 libtoolize --force --copy --install aclocal -I config @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gd-2.0.36RC1 make install } diff --git a/media-libs/giflib/giflib-4.1.6.bep b/media-libs/giflib/giflib-4.1.6.recipe similarity index 96% rename from media-libs/giflib/giflib-4.1.6.bep rename to media-libs/giflib/giflib-4.1.6.recipe index 886c54f3f..137b9a547 100644 --- a/media-libs/giflib/giflib-4.1.6.bep +++ b/media-libs/giflib/giflib-4.1.6.recipe @@ -6,7 +6,8 @@ REVISION="3" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd giflib-4.1.6 sed -i 's#gl/gl.h#GL/gl.h#' configure.ac sed -i 's#gl.gl.h#GL/gl.h#' lib/dev2gif.c @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd giflib-4.1.6 make install } diff --git a/media-libs/glew/glew-1.5.7.bep b/media-libs/glew/glew-1.5.7.recipe similarity index 94% rename from media-libs/glew/glew-1.5.7.bep rename to media-libs/glew/glew-1.5.7.recipe index 8374fc9dd..d3a352eb2 100644 --- a/media-libs/glew/glew-1.5.7.bep +++ b/media-libs/glew/glew-1.5.7.recipe @@ -6,17 +6,20 @@ STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="f913ce9dbde4cd250b932731b3534ded" -BUILD { +BUILD() +{ cd glew-1.5.7 make } -INSTALL { +INSTALL() +{ cd glew-1.5.7 make install } -TEST { +TEST() +{ cd glew-1.5.7/bin glewinfo visualinfo diff --git a/media-libs/glpng/glpng-1.4.5.bep b/media-libs/glpng/glpng-1.4.5.recipe similarity index 94% rename from media-libs/glpng/glpng-1.4.5.bep rename to media-libs/glpng/glpng-1.4.5.recipe index 386babf10..d30cd4c31 100644 --- a/media-libs/glpng/glpng-1.4.5.bep +++ b/media-libs/glpng/glpng-1.4.5.recipe @@ -6,12 +6,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd src make -f Makefile.HAIKU } -INSTALL { +INSTALL() +{ cd src make install -f Makefile.HAIKU } diff --git a/media-libs/guilib/guilib-1.2.1.bep b/media-libs/guilib/guilib-1.2.1.recipe similarity index 96% rename from media-libs/guilib/guilib-1.2.1.bep rename to media-libs/guilib/guilib-1.2.1.recipe index c04395032..f95c87490 100644 --- a/media-libs/guilib/guilib-1.2.1.bep +++ b/media-libs/guilib/guilib-1.2.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a0114b925d79d6c66161e24cbeaa88b1" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd GUIlib-1.2.1 rm aclocal.m4 rm acinclude.m4 @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd GUIlib-1.2.1 make install } diff --git a/media-libs/ilmbase/ilmbase-1.0.1.bep b/media-libs/ilmbase/ilmbase-1.0.1.recipe similarity index 95% rename from media-libs/ilmbase/ilmbase-1.0.1.bep rename to media-libs/ilmbase/ilmbase-1.0.1.recipe index 72cc3fdff..14c7f90b9 100644 --- a/media-libs/ilmbase/ilmbase-1.0.1.bep +++ b/media-libs/ilmbase/ilmbase-1.0.1.recipe @@ -5,7 +5,8 @@ REVISION="1" CHECKSUM_MD5="f76f094e69a6079b0beb93d97e2a217e" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ilmbase-1.0.1 libtoolize --copy --force --install ./bootstrap @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ilmbase-1.0.1 make install } diff --git a/media-libs/ilmbase/ilmbase-1.0.2.bep b/media-libs/ilmbase/ilmbase-1.0.2.recipe similarity index 96% rename from media-libs/ilmbase/ilmbase-1.0.2.bep rename to media-libs/ilmbase/ilmbase-1.0.2.recipe index 23c6197f2..a9ae4fa91 100644 --- a/media-libs/ilmbase/ilmbase-1.0.2.bep +++ b/media-libs/ilmbase/ilmbase-1.0.2.recipe @@ -6,7 +6,8 @@ CHECKSUM_MD5="26c133ee8ca48e1196fbfb3ffe292ab4" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ilmbase-1.0.2 libtoolize --copy --force --install ./bootstrap @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ilmbase-1.0.2 make install } diff --git a/media-libs/jasper/jasper-1.900.1.bep b/media-libs/jasper/jasper-1.900.1.recipe similarity index 96% rename from media-libs/jasper/jasper-1.900.1.bep rename to media-libs/jasper/jasper-1.900.1.recipe index 9c8c58270..dee1e1aec 100644 --- a/media-libs/jasper/jasper-1.900.1.bep +++ b/media-libs/jasper/jasper-1.900.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" CHECKSUM_MD5="a342b2b4495b3e1394e161eb5d85d754" DEPEND="" -BUILD { +BUILD() +{ cd jasper-1.900.1 libtoolize --force --copy --install aclocal -I acaux @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jasper-1.900.1 make install } diff --git a/media-libs/jbig2dec/jbig2dec-0.11.bep b/media-libs/jbig2dec/jbig2dec-0.11.recipe similarity index 96% rename from media-libs/jbig2dec/jbig2dec-0.11.bep rename to media-libs/jbig2dec/jbig2dec-0.11.recipe index 96224f0ff..3103fbe4f 100644 --- a/media-libs/jbig2dec/jbig2dec-0.11.bep +++ b/media-libs/jbig2dec/jbig2dec-0.11.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="1f61e144852c86563fee6e5ddced63f1" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd jbig2dec-0.11 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jbig2dec-0.11 make install } diff --git a/media-libs/jbigkit/jbigkit-1.6.bep b/media-libs/jbigkit/jbigkit-1.6.recipe similarity index 92% rename from media-libs/jbigkit/jbigkit-1.6.bep rename to media-libs/jbigkit/jbigkit-1.6.recipe index a2219b351..c6d8ea142 100644 --- a/media-libs/jbigkit/jbigkit-1.6.bep +++ b/media-libs/jbigkit/jbigkit-1.6.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="ce196e45f293d40ba76af3dc981ccfd7" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd jbigkit make } -INSTALL { +INSTALL() +{ cd jbigkit make test } diff --git a/media-libs/jbigkit/jbigkit-2.0.bep b/media-libs/jbigkit/jbigkit-2.0.recipe similarity index 96% rename from media-libs/jbigkit/jbigkit-2.0.bep rename to media-libs/jbigkit/jbigkit-2.0.recipe index ec96ef2a2..579a0da09 100644 --- a/media-libs/jbigkit/jbigkit-2.0.bep +++ b/media-libs/jbigkit/jbigkit-2.0.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="3dd87f605abb1a97a22dc79d8b3e8f6c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd jbigkit make cd libjbig make -f Makefile-libjbig_so } -INSTALL { +INSTALL() +{ cd jbigkit make test cd libjbig diff --git a/media-libs/jgmod/jgmod-0.99.bep b/media-libs/jgmod/jgmod-0.99.recipe similarity index 97% rename from media-libs/jgmod/jgmod-0.99.bep rename to media-libs/jgmod/jgmod-0.99.recipe index 07dedc4f6..a5b1bcb32 100644 --- a/media-libs/jgmod/jgmod-0.99.bep +++ b/media-libs/jgmod/jgmod-0.99.recipe @@ -8,7 +8,8 @@ STATUS_HAIKU="stable" DEPEND="media-libs/allegro >= 4.4" CHECKSUM_MD5="0e6e540ffadced9283251a7f86c106fe" -BUILD { +BUILD() +{ cd jgmod chmod 777 ./fixbe.sh ./fixbe.sh @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jgmod/src if [ -n ${DESTDIR} ];then mkdir -p ${DESTDIR}/boot/common/lib diff --git a/media-libs/jpeg/jpeg-7.bep b/media-libs/jpeg/jpeg-7.recipe similarity index 94% rename from media-libs/jpeg/jpeg-7.bep rename to media-libs/jpeg/jpeg-7.recipe index 119a1b211..3fbb5277d 100644 --- a/media-libs/jpeg/jpeg-7.bep +++ b/media-libs/jpeg/jpeg-7.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="382ef33b339c299b56baf1296cda9785" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd jpeg-7 aclocal libtoolize --force --copy --install @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jpeg-7 make install } diff --git a/media-libs/jpeg/jpeg-8b.bep b/media-libs/jpeg/jpeg-8b.recipe similarity index 94% rename from media-libs/jpeg/jpeg-8b.bep rename to media-libs/jpeg/jpeg-8b.recipe index d25212bf5..96add2dd1 100644 --- a/media-libs/jpeg/jpeg-8b.bep +++ b/media-libs/jpeg/jpeg-8b.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e022acbc5b36cd2cb70785f5b575661e" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd jpeg-8b aclocal libtoolize --force --copy --install @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jpeg-8b make install } diff --git a/media-libs/jpeg/jpeg-8c.bep b/media-libs/jpeg/jpeg-8c.recipe similarity index 96% rename from media-libs/jpeg/jpeg-8c.bep rename to media-libs/jpeg/jpeg-8c.recipe index 95a9958ce..eb4f28643 100644 --- a/media-libs/jpeg/jpeg-8c.bep +++ b/media-libs/jpeg/jpeg-8c.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a2c10c04f396a9ce72894beb18b4e1f9" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd jpeg-8c aclocal libtoolize --force --copy --install @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jpeg-8c make install } diff --git a/media-libs/jpeg/jpeg-8d.bep b/media-libs/jpeg/jpeg-8d.recipe similarity index 96% rename from media-libs/jpeg/jpeg-8d.bep rename to media-libs/jpeg/jpeg-8d.recipe index 5a6db9b8a..400231715 100644 --- a/media-libs/jpeg/jpeg-8d.bep +++ b/media-libs/jpeg/jpeg-8d.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="52654eb3b2e60c35731ea8fc87f1bd29" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd jpeg-8d aclocal libtoolize --force --copy --install @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd jpeg-8d make install } diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13.bep b/media-libs/ladspa-sdk/ladspa-sdk-1.13.recipe similarity index 94% rename from media-libs/ladspa-sdk/ladspa-sdk-1.13.bep rename to media-libs/ladspa-sdk/ladspa-sdk-1.13.recipe index 196f9d5ba..39bd1ae7f 100644 --- a/media-libs/ladspa-sdk/ladspa-sdk-1.13.bep +++ b/media-libs/ladspa-sdk/ladspa-sdk-1.13.recipe @@ -6,11 +6,13 @@ COPYRIGHT="Copyright (C) 2000-2002 Richard W.E. Furse, Paul Barton-Davis, Stefan LICENSE="GNU LGPL v2.1" REVISION="1" CHECKSUM_MD5="671be3e1021d0722cadc7fb27054628e" -BUILD { +BUILD() +{ cd ladspa_sdk/src make } -INSTALL { +INSTALL() +{ cd ladspa_sdk/src make install } diff --git a/media-libs/lcms/lcms-1.18a.bep b/media-libs/lcms/lcms-1.18a.recipe similarity index 95% rename from media-libs/lcms/lcms-1.18a.bep rename to media-libs/lcms/lcms-1.18a.recipe index 00157df16..5db51c5b9 100644 --- a/media-libs/lcms/lcms-1.18a.bep +++ b/media-libs/lcms/lcms-1.18a.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="f4abfe1c57ea3f633c2e9d034e74e3e8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd lcms-1.18 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd lcms-1.18 make install } diff --git a/media-libs/lcms/lcms-1.19.bep b/media-libs/lcms/lcms-1.19.recipe similarity index 96% rename from media-libs/lcms/lcms-1.19.bep rename to media-libs/lcms/lcms-1.19.recipe index 3b1a1421e..e5a20d3c1 100644 --- a/media-libs/lcms/lcms-1.19.bep +++ b/media-libs/lcms/lcms-1.19.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8af94611baf20d9646c7c2c285859818" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd lcms-1.19 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd lcms-1.19 make install } diff --git a/media-libs/lcms/lcms-2.0a.bep b/media-libs/lcms/lcms-2.0a.recipe similarity index 96% rename from media-libs/lcms/lcms-2.0a.bep rename to media-libs/lcms/lcms-2.0a.recipe index 44fc0404c..ac5ed7205 100644 --- a/media-libs/lcms/lcms-2.0a.bep +++ b/media-libs/lcms/lcms-2.0a.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="c4f115462a7a5b306c247d018d7a8982" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd lcms-2.0 libtoolize --force --copy --install aclocal @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd lcms-2.0 make install } diff --git a/media-libs/lcms/lcms-2.1.bep b/media-libs/lcms/lcms-2.1.recipe similarity index 96% rename from media-libs/lcms/lcms-2.1.bep rename to media-libs/lcms/lcms-2.1.recipe index 556745787..653e69863 100644 --- a/media-libs/lcms/lcms-2.1.bep +++ b/media-libs/lcms/lcms-2.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="08036edb115ad74456dfa20b1998b5f4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd lcms2-2.1 libtoolize --force --copy --install aclocal @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd lcms2-2.1 make install } diff --git a/media-libs/leptonica/leptonica-1.68.bep b/media-libs/leptonica/leptonica-1.68.recipe similarity index 94% rename from media-libs/leptonica/leptonica-1.68.bep rename to media-libs/leptonica/leptonica-1.68.recipe index 979d047af..9006867da 100644 --- a/media-libs/leptonica/leptonica-1.68.bep +++ b/media-libs/leptonica/leptonica-1.68.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="5cd7092f9ff2ca7e3f3e73bfcd556403" -BUILD { +BUILD() +{ cd leptonica-1.68 libtoolize aclocal @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd leptonica-1.68 make install } -TEST { +TEST() +{ cd leptonica-1.68 # make test # make check diff --git a/media-libs/libao/libao-1.0.0.bep b/media-libs/libao/libao-1.0.0.recipe similarity index 97% rename from media-libs/libao/libao-1.0.0.bep rename to media-libs/libao/libao-1.0.0.recipe index 65c91b962..83b3ba5f3 100644 --- a/media-libs/libao/libao-1.0.0.bep +++ b/media-libs/libao/libao-1.0.0.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="08283fbe1f587619053a156254afecec" -BUILD { +BUILD() +{ cd libao-1.0.0 libtoolize --force --copy --install aclocal @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libao-1.0.0 make install } diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.bep b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe similarity index 96% rename from media-libs/libart_lgpl/libart_lgpl-2.3.21.bep rename to media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe index e5590ac61..5be103f43 100644 --- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.bep +++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="722471ec8ae084af4293126d06b60880" -BUILD { +BUILD() +{ cd libart_lgpl-2.3.21 libtoolize --force --copy --install autoreconf -i @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libart_lgpl-2.3.21 make install } diff --git a/media-libs/libass/libass-0.10.1.bep b/media-libs/libass/libass-0.10.1.recipe similarity index 96% rename from media-libs/libass/libass-0.10.1.bep rename to media-libs/libass/libass-0.10.1.recipe index 99767580b..8c668db6b 100644 --- a/media-libs/libass/libass-0.10.1.bep +++ b/media-libs/libass/libass-0.10.1.recipe @@ -8,13 +8,15 @@ CHECKSUM_MD5="6cace482a013a3c4bf3b31a68ac66026" DEPEND="pkgconfig >= 0.23 freetype >= 2.0" -BUILD { +BUILD() +{ cd libass-0.10.1 configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libass-0.10.1 make install } diff --git a/media-libs/libass/libass-0.9.11.bep b/media-libs/libass/libass-0.9.11.recipe similarity index 96% rename from media-libs/libass/libass-0.9.11.bep rename to media-libs/libass/libass-0.9.11.recipe index f86497901..70930cc41 100644 --- a/media-libs/libass/libass-0.9.11.bep +++ b/media-libs/libass/libass-0.9.11.recipe @@ -8,13 +8,15 @@ CHECKSUM_MD5="f9042884397002ba40aa89dc7d34f59f" DEPEND="pkgconfig >= 0.23 freetype >= 2.0" -BUILD { +BUILD() +{ cd libass-0.9.11 configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libass-0.9.11 make install } diff --git a/media-libs/libbluray/libbluray-0.2.2.bep b/media-libs/libbluray/libbluray-0.2.2.recipe similarity index 96% rename from media-libs/libbluray/libbluray-0.2.2.bep rename to media-libs/libbluray/libbluray-0.2.2.recipe index 2484d3694..1a001d1fb 100644 --- a/media-libs/libbluray/libbluray-0.2.2.bep +++ b/media-libs/libbluray/libbluray-0.2.2.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd libbluray-0.2.2 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libbluray-0.2.2 make install } diff --git a/media-libs/libcddb/libcddb-1.3.2.bep b/media-libs/libcddb/libcddb-1.3.2.recipe similarity index 95% rename from media-libs/libcddb/libcddb-1.3.2.bep rename to media-libs/libcddb/libcddb-1.3.2.recipe index 43eb3b6db..4e88f2272 100644 --- a/media-libs/libcddb/libcddb-1.3.2.bep +++ b/media-libs/libcddb/libcddb-1.3.2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="gettext >= 0.18.1.1-dev" CHECKSUM_MD5="8bb4a6f542197e8e9648ae597cd6bc8a" -BUILD { +BUILD() +{ cd libcddb-1.3.2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libcddb-1.3.2 make install } diff --git a/media-libs/libcoverart/libcoverart-1.0.0.bep b/media-libs/libcoverart/libcoverart-1.0.0.recipe similarity index 95% rename from media-libs/libcoverart/libcoverart-1.0.0.bep rename to media-libs/libcoverart/libcoverart-1.0.0.recipe index 6fce1e477..3cba4dded 100644 --- a/media-libs/libcoverart/libcoverart-1.0.0.bep +++ b/media-libs/libcoverart/libcoverart-1.0.0.recipe @@ -6,18 +6,21 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/jansson >= 2.4 net-misc/neon >= 0.29.6" CHECKSUM_MD5="6380056bb4bc1a69790e706b4d506f50" -BUILD { +BUILD() +{ cd libcoverart-{PROJECT_VERSION} cmake . make } -INSTALL { +INSTALL() +{ cd libcoverart-{PROJECT_VERSION} make install } -TEST { +TEST() +{ cd libcoverart-{PROJECT_VERSION} make test cd tests diff --git a/media-libs/libdca/libdca-0.0.5.bep b/media-libs/libdca/libdca-0.0.5.recipe similarity index 96% rename from media-libs/libdca/libdca-0.0.5.bep rename to media-libs/libdca/libdca-0.0.5.recipe index e76da1d66..aafd99eab 100644 --- a/media-libs/libdca/libdca-0.0.5.bep +++ b/media-libs/libdca/libdca-0.0.5.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="dab6b2795c66a82a6fcd4f8343343021" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libdca-0.0.5 ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libdca-0.0.5 make install } diff --git a/media-libs/libdiscid/libdiscid-0.3.0.bep b/media-libs/libdiscid/libdiscid-0.3.0.recipe similarity index 94% rename from media-libs/libdiscid/libdiscid-0.3.0.bep rename to media-libs/libdiscid/libdiscid-0.3.0.recipe index 8c64d1bed..53a53d0e2 100644 --- a/media-libs/libdiscid/libdiscid-0.3.0.bep +++ b/media-libs/libdiscid/libdiscid-0.3.0.recipe @@ -7,18 +7,21 @@ DEPEND="" CHECKSUM_MD5="17e51260062b7583e5981c82cf618127" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd libdiscid-0.3.0 cmake . make } -INSTALL { +INSTALL() +{ cd libdiscid-0.3.0 make install } -TEST { +TEST() +{ cd libdiscid-0.3.0 make test } diff --git a/media-libs/libdvbpsi/libdvbpsi-0.1.7.bep b/media-libs/libdvbpsi/libdvbpsi-0.1.7.recipe similarity index 94% rename from media-libs/libdvbpsi/libdvbpsi-0.1.7.bep rename to media-libs/libdvbpsi/libdvbpsi-0.1.7.recipe index 64663e387..aeddf2a5f 100644 --- a/media-libs/libdvbpsi/libdvbpsi-0.1.7.bep +++ b/media-libs/libdvbpsi/libdvbpsi-0.1.7.recipe @@ -5,19 +5,22 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="af419575719e356b908b0c6946499052" -BUILD { +BUILD() +{ cd libdvbpsi-0.1.7 ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` LDFLAGS="-lnetwork" make } -INSTALL { +INSTALL() +{ cd libdvbpsi-0.1.7 make install } -TEST { +TEST() +{ cd libdvbpsi-0.1.7 # make test # make check diff --git a/media-libs/libdvdcss/libdvdcss-1.2.10.bep b/media-libs/libdvdcss/libdvdcss-1.2.10.recipe similarity index 95% rename from media-libs/libdvdcss/libdvdcss-1.2.10.bep rename to media-libs/libdvdcss/libdvdcss-1.2.10.recipe index fe0d6ef85..74e037a57 100644 --- a/media-libs/libdvdcss/libdvdcss-1.2.10.bep +++ b/media-libs/libdvdcss/libdvdcss-1.2.10.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="7b03a9571c3a85d801330c7772cd69c4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libdvdcss-1.2.10 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdvdcss-1.2.10 make install } diff --git a/media-libs/libdvdcss/libdvdcss-1.2.12.bep b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe similarity index 95% rename from media-libs/libdvdcss/libdvdcss-1.2.12.bep rename to media-libs/libdvdcss/libdvdcss-1.2.12.recipe index 2b69402a5..d2b3df7ec 100644 --- a/media-libs/libdvdcss/libdvdcss-1.2.12.bep +++ b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="2218a193900e3203aa10dc24cdf54275" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libdvdcss-1.2.12 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdvdcss-1.2.12 make install } diff --git a/media-libs/libdvdnav/libdvdnav-4.1.3.bep b/media-libs/libdvdnav/libdvdnav-4.1.3.recipe similarity index 96% rename from media-libs/libdvdnav/libdvdnav-4.1.3.bep rename to media-libs/libdvdnav/libdvdnav-4.1.3.recipe index ec98982b9..31ec8bbc1 100644 --- a/media-libs/libdvdnav/libdvdnav-4.1.3.bep +++ b/media-libs/libdvdnav/libdvdnav-4.1.3.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libdvdcss >= 1.20.10 media-libs/libdvdread >= 4.1.3" -BUILD { +BUILD() +{ cd libdvdnav-4.1.3 ./autogen.sh CFLAGS="-I/boot/common/include -DHAVE_DVDCSS_DVDCSS_H " \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdvdnav-4.1.3 make install } diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.bep b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe similarity index 96% rename from media-libs/libdvdnav/libdvdnav-4.2.0.bep rename to media-libs/libdvdnav/libdvdnav-4.2.0.recipe index 99a06b297..acd52cd0d 100644 --- a/media-libs/libdvdnav/libdvdnav-4.2.0.bep +++ b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libdvdcss >= 1.20.10 media-libs/libdvdread >= 4.2.0" -BUILD { +BUILD() +{ cd libdvdnav-4.2.0 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdvdnav-4.2.0 make install } diff --git a/media-libs/libdvdread/libdvdread-4.1.3.bep b/media-libs/libdvdread/libdvdread-4.1.3.recipe similarity index 94% rename from media-libs/libdvdread/libdvdread-4.1.3.bep rename to media-libs/libdvdread/libdvdread-4.1.3.recipe index 44e410dff..b016206fe 100644 --- a/media-libs/libdvdread/libdvdread-4.1.3.bep +++ b/media-libs/libdvdread/libdvdread-4.1.3.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="6dc068d442c85a3cdd5ad3da75f6c6e8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libdvdread-4.1.3 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libdvdread-4.1.3 make install } diff --git a/media-libs/libdvdread/libdvdread-4.2.0.bep b/media-libs/libdvdread/libdvdread-4.2.0.recipe similarity index 96% rename from media-libs/libdvdread/libdvdread-4.2.0.bep rename to media-libs/libdvdread/libdvdread-4.2.0.recipe index 20479a269..0b149a165 100644 --- a/media-libs/libdvdread/libdvdread-4.2.0.bep +++ b/media-libs/libdvdread/libdvdread-4.2.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="ab7a19d3ab1a437ae754ef477d6231a4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libdvdread-4.2.0 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdvdread-4.2.0 make install } diff --git a/media-libs/libdvdread/libdvdread-svn1168.bep b/media-libs/libdvdread/libdvdread-svn1168.recipe similarity index 95% rename from media-libs/libdvdread/libdvdread-svn1168.bep rename to media-libs/libdvdread/libdvdread-svn1168.recipe index 01b1a3b6c..2c9bfcf7d 100644 --- a/media-libs/libdvdread/libdvdread-svn1168.bep +++ b/media-libs/libdvdread/libdvdread-svn1168.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="39cb0b27cc6b05e4f5c849dececf1f7a" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libdvdread libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdvdread make install } diff --git a/media-libs/libdvdread/libdvdread-svn1226.bep b/media-libs/libdvdread/libdvdread-svn1226.recipe similarity index 95% rename from media-libs/libdvdread/libdvdread-svn1226.bep rename to media-libs/libdvdread/libdvdread-svn1226.recipe index 3315cd103..f40b24a82 100644 --- a/media-libs/libdvdread/libdvdread-svn1226.bep +++ b/media-libs/libdvdread/libdvdread-svn1226.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="39cb0b27cc6b05e4f5c849dececf1f7a" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libdvdread svn up -r 1226 libtoolize --force --copy --install @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libdvdread make install } diff --git a/media-libs/libharu/libharu-2.1.0.bep b/media-libs/libharu/libharu-2.1.0.recipe similarity index 95% rename from media-libs/libharu/libharu-2.1.0.bep rename to media-libs/libharu/libharu-2.1.0.recipe index 4d16209e5..95b94accc 100644 --- a/media-libs/libharu/libharu-2.1.0.bep +++ b/media-libs/libharu/libharu-2.1.0.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="app-arch/zlib >= 1.25 media-libs/libpng >= 1.2.44" CHECKSUM_MD5="0623b8fb08ae1b28af08b2cdbd66b662" -BUILD { +BUILD() +{ cd libharu-2.1.0 libtoolize --force --install --copy aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libharu-2.1.0 make install } diff --git a/media-libs/libid3tag/libid3tag-0.15.1b.bep b/media-libs/libid3tag/libid3tag-0.15.1b.recipe similarity index 94% rename from media-libs/libid3tag/libid3tag-0.15.1b.bep rename to media-libs/libid3tag/libid3tag-0.15.1b.recipe index 8fa5ca2ba..207c25f23 100644 --- a/media-libs/libid3tag/libid3tag-0.15.1b.bep +++ b/media-libs/libid3tag/libid3tag-0.15.1b.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e5808ad997ba32c498803822078748c3" -BUILD { +BUILD() +{ cd libid3tag-0.15.1b libtoolize --force --copy --install aclocal @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libid3tag-0.15.1b make install } -TEST { +TEST() +{ cd libid3tag-0.15.1b # make test # make check diff --git a/media-libs/liblo/liblo-0.26.bep b/media-libs/liblo/liblo-0.26.recipe similarity index 96% rename from media-libs/liblo/liblo-0.26.bep rename to media-libs/liblo/liblo-0.26.recipe index 7463fae96..8a661854b 100644 --- a/media-libs/liblo/liblo-0.26.bep +++ b/media-libs/liblo/liblo-0.26.recipe @@ -4,7 +4,8 @@ SRC_URI="http://downloads.sourceforge.net/liblo/liblo-0.26.tar.gz" REVISION="1" STATUS_HAIKU="stable" CHECKSUM_MD5="5351de14262560e15e7f23865293b16f" -BUILD { +BUILD() +{ cd liblo-0.26 libtoolize --force --copy --install aclocal @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd liblo-0.26 make install DESTDIR="${DESTDIR}" } diff --git a/media-libs/libmad/libmad-0.15.1b.bep b/media-libs/libmad/libmad-0.15.1b.recipe similarity index 96% rename from media-libs/libmad/libmad-0.15.1b.bep rename to media-libs/libmad/libmad-0.15.1b.recipe index ce4468e5c..6fa4adfb6 100644 --- a/media-libs/libmad/libmad-0.15.1b.bep +++ b/media-libs/libmad/libmad-0.15.1b.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" CHECKSUM_MD5="1be543bc30c56fb6bea1d7bf6a64e66c" DEPEND="" -BUILD { +BUILD() +{ cd libmad-0.15.1b libtoolize --force --copy --install aclocal @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libmad-0.15.1b make install } diff --git a/media-libs/libmatroska/libmatroska-1.0.0.bep b/media-libs/libmatroska/libmatroska-1.0.0.recipe similarity index 96% rename from media-libs/libmatroska/libmatroska-1.0.0.bep rename to media-libs/libmatroska/libmatroska-1.0.0.recipe index 0f406830e..4db5ffdc4 100644 --- a/media-libs/libmatroska/libmatroska-1.0.0.bep +++ b/media-libs/libmatroska/libmatroska-1.0.0.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/libebml >= 1.0.0" CHECKSUM_MD5="4efcf3945b17a6f0320cf1aaa326a4de" -BUILD { +BUILD() +{ cd libmatroska-1.0.0/make/linux make PREFIX=/boot/common } -INSTALL { +INSTALL() +{ cd libmatroska-1.0.0/make/linux if [ -n ${DESTDIR} ];then make install DESTDIR="${DESTDIR}" diff --git a/media-libs/libmikmod/libmikmod-3.1.11.bep b/media-libs/libmikmod/libmikmod-3.1.11.recipe similarity index 97% rename from media-libs/libmikmod/libmikmod-3.1.11.bep rename to media-libs/libmikmod/libmikmod-3.1.11.recipe index 086377bf7..7768c5702 100644 --- a/media-libs/libmikmod/libmikmod-3.1.11.bep +++ b/media-libs/libmikmod/libmikmod-3.1.11.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="705106da305e8de191549f1e7393185c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libmikmod-3.1.11 rm aclocal.m4 echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in @@ -25,7 +26,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libmikmod-3.1.11 make install } diff --git a/media-libs/libmms/libmms-0.5.bep b/media-libs/libmms/libmms-0.5.recipe similarity index 95% rename from media-libs/libmms/libmms-0.5.bep rename to media-libs/libmms/libmms-0.5.recipe index 9b8ec7c26..41e701a92 100644 --- a/media-libs/libmms/libmms-0.5.bep +++ b/media-libs/libmms/libmms-0.5.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/glib >= 2.0" -BUILD { +BUILD() +{ cd libmms-0.5 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libmms-0.5 make install } diff --git a/media-libs/libmng/libmng-1.0.10.bep b/media-libs/libmng/libmng-1.0.10.recipe similarity index 97% rename from media-libs/libmng/libmng-1.0.10.bep rename to media-libs/libmng/libmng-1.0.10.recipe index 1b61ed321..a720984a3 100644 --- a/media-libs/libmng/libmng-1.0.10.bep +++ b/media-libs/libmng/libmng-1.0.10.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a464ae7d679781beebdf7440d144b7bd" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libmng-1.0.10 cp unmaintained/autogen.sh . cp makefiles/configure.in . @@ -24,7 +25,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libmng-1.0.10 make install } diff --git a/media-libs/libmodplug/libmodplug-0.8.7.bep b/media-libs/libmodplug/libmodplug-0.8.7.recipe similarity index 96% rename from media-libs/libmodplug/libmodplug-0.8.7.bep rename to media-libs/libmodplug/libmodplug-0.8.7.recipe index e10ce86ed..a2ff0c2b0 100644 --- a/media-libs/libmodplug/libmodplug-0.8.7.bep +++ b/media-libs/libmodplug/libmodplug-0.8.7.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="d2d9ccd8da22412999caed076140f786" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libmodplug-0.8.7 libtoolize --force --copy --install aclocal @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libmodplug-0.8.7 make install } diff --git a/media-libs/libmodplug/libmodplug-0.8.8.1.bep b/media-libs/libmodplug/libmodplug-0.8.8.1.recipe similarity index 96% rename from media-libs/libmodplug/libmodplug-0.8.8.1.bep rename to media-libs/libmodplug/libmodplug-0.8.8.1.recipe index c692b6826..001ac0887 100644 --- a/media-libs/libmodplug/libmodplug-0.8.8.1.bep +++ b/media-libs/libmodplug/libmodplug-0.8.8.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="f7fa53a60c650024ff51cca88341776b" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libmodplug-0.8.8.1 libtoolize --force --copy --install aclocal @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libmodplug-0.8.8.1 make install } diff --git a/media-libs/libmodplug/libmodplug-0.8.8.4.bep b/media-libs/libmodplug/libmodplug-0.8.8.4.recipe similarity index 96% rename from media-libs/libmodplug/libmodplug-0.8.8.4.bep rename to media-libs/libmodplug/libmodplug-0.8.8.4.recipe index 183c2df62..4846cd459 100644 --- a/media-libs/libmodplug/libmodplug-0.8.8.4.bep +++ b/media-libs/libmodplug/libmodplug-0.8.8.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="fddc3c704c5489de2a3cf0fedfec59db" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libmodplug-0.8.8.4 libtoolize --force --copy --install aclocal @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libmodplug-0.8.8.4 make install } diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1.bep b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe similarity index 95% rename from media-libs/libmpeg2/libmpeg2-0.5.1.bep rename to media-libs/libmpeg2/libmpeg2-0.5.1.recipe index 71b8d295f..b23630399 100644 --- a/media-libs/libmpeg2/libmpeg2-0.5.1.bep +++ b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="0f92c7454e58379b4a5a378485bbd8ef" -BUILD { +BUILD() +{ cd libmpeg2-0.5.1 rm aclocal.m4 libtoolize --force --copy --install @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libmpeg2-0.5.1 make install } diff --git a/media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.bep b/media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.recipe similarity index 95% rename from media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.bep rename to media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.recipe index 21da355c1..23564b564 100644 --- a/media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.bep +++ b/media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/buildsystem >= 0" -BUILD { +BUILD() +{ cd libnsbmp-0.0.3-HEAD make PREFIX=/boot/common } -INSTALL { +INSTALL() +{ cd libnsbmp-0.0.3-HEAD make install PREFIX=/boot/common } diff --git a/media-libs/libnsbmp/libnsbmp-0.0.3.bep b/media-libs/libnsbmp/libnsbmp-0.0.3.recipe similarity index 94% rename from media-libs/libnsbmp/libnsbmp-0.0.3.bep rename to media-libs/libnsbmp/libnsbmp-0.0.3.recipe index dea51e029..667f0b108 100644 --- a/media-libs/libnsbmp/libnsbmp-0.0.3.bep +++ b/media-libs/libnsbmp/libnsbmp-0.0.3.recipe @@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-0.0.3-src.ta REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd libnsbmp-0.0.3 make } -INSTALL { +INSTALL() +{ cd libnsbmp-0.0.3 make install } diff --git a/media-libs/libnsgif/libnsgif-0.0.3.bep b/media-libs/libnsgif/libnsgif-0.0.3.recipe similarity index 94% rename from media-libs/libnsgif/libnsgif-0.0.3.bep rename to media-libs/libnsgif/libnsgif-0.0.3.recipe index e5598c573..7b5fa0c2b 100644 --- a/media-libs/libnsgif/libnsgif-0.0.3.bep +++ b/media-libs/libnsgif/libnsgif-0.0.3.recipe @@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-0.0.3-src.ta REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd libnsgif-0.0.3 make } -INSTALL { +INSTALL() +{ cd libnsgif-0.0.3 make install } diff --git a/media-libs/libogg/libogg-1.1.3.bep b/media-libs/libogg/libogg-1.1.3.recipe similarity index 94% rename from media-libs/libogg/libogg-1.1.3.bep rename to media-libs/libogg/libogg-1.1.3.recipe index a7d06d6ee..161b2f857 100644 --- a/media-libs/libogg/libogg-1.1.3.bep +++ b/media-libs/libogg/libogg-1.1.3.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="eaf7dc6ebbff30975de7527a80831585" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libogg-1.1.3 ./configure --prefix=/boot/home/config make } -INSTALL { +INSTALL() +{ cd libogg-1.1.3 make install } diff --git a/media-libs/libogg/libogg-1.1.4.bep b/media-libs/libogg/libogg-1.1.4.recipe similarity index 95% rename from media-libs/libogg/libogg-1.1.4.bep rename to media-libs/libogg/libogg-1.1.4.recipe index 2859a806d..0e30cbddb 100644 --- a/media-libs/libogg/libogg-1.1.4.bep +++ b/media-libs/libogg/libogg-1.1.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="10200ec22543841d9d1c23e0aed4e5e9" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libogg-1.1.4 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libogg-1.1.4 make install } diff --git a/media-libs/libogg/libogg-1.2.0.bep b/media-libs/libogg/libogg-1.2.0.recipe similarity index 96% rename from media-libs/libogg/libogg-1.2.0.bep rename to media-libs/libogg/libogg-1.2.0.recipe index b82d6c503..35b05a421 100644 --- a/media-libs/libogg/libogg-1.2.0.bep +++ b/media-libs/libogg/libogg-1.2.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="c95b73759acfc30712beef6ce4e88efa" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libogg-1.2.0 rm aclocal.m4 mkdir -p m4 @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libogg-1.2.0 make install } diff --git a/media-libs/libogg/libogg-1.2.2.bep b/media-libs/libogg/libogg-1.2.2.recipe similarity index 97% rename from media-libs/libogg/libogg-1.2.2.bep rename to media-libs/libogg/libogg-1.2.2.recipe index f1828f98e..7348503a7 100644 --- a/media-libs/libogg/libogg-1.2.2.bep +++ b/media-libs/libogg/libogg-1.2.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="5a9fcabc9a1b7c6f1cd75ddc78f36c56" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libogg-1.2.2 rm aclocal.m4 mkdir -p m4 @@ -23,7 +24,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libogg-1.2.2 make install } diff --git a/media-libs/libogg/libogg-1.3.0.bep b/media-libs/libogg/libogg-1.3.0.recipe similarity index 95% rename from media-libs/libogg/libogg-1.3.0.bep rename to media-libs/libogg/libogg-1.3.0.recipe index ed2ac6726..9cc92e61c 100644 --- a/media-libs/libogg/libogg-1.3.0.bep +++ b/media-libs/libogg/libogg-1.3.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="0a7eb40b86ac050db3a789ab65fe21c2" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libogg-1.3.0 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libogg-1.3.0 make install } diff --git a/media-libs/libpng/libpng-1.2.29.bep b/media-libs/libpng/libpng-1.2.29.recipe similarity index 95% rename from media-libs/libpng/libpng-1.2.29.bep rename to media-libs/libpng/libpng-1.2.29.recipe index 3115d3d32..7c21c5353 100644 --- a/media-libs/libpng/libpng-1.2.29.bep +++ b/media-libs/libpng/libpng-1.2.29.recipe @@ -4,14 +4,16 @@ SRC_URI="http://superb-east.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.29. REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.2.29 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libpng-1.2.29 make install } diff --git a/media-libs/libpng/libpng-1.2.30.bep b/media-libs/libpng/libpng-1.2.30.recipe similarity index 96% rename from media-libs/libpng/libpng-1.2.30.bep rename to media-libs/libpng/libpng-1.2.30.recipe index bed0800f5..bc79c0eac 100644 --- a/media-libs/libpng/libpng-1.2.30.bep +++ b/media-libs/libpng/libpng-1.2.30.recipe @@ -4,7 +4,8 @@ SRC_URI="http://superb-east.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.30. REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.2.30 cp /boot/common/share/libtool/config.guess . cp /boot/common/share/libtool/config.sub @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.2.30 make install } diff --git a/media-libs/libpng/libpng-1.2.40.bep b/media-libs/libpng/libpng-1.2.40.recipe similarity index 95% rename from media-libs/libpng/libpng-1.2.40.bep rename to media-libs/libpng/libpng-1.2.40.recipe index e43975616..207338d34 100644 --- a/media-libs/libpng/libpng-1.2.40.bep +++ b/media-libs/libpng/libpng-1.2.40.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a2f6808735bf404967f81519a967fb2a" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.2.40 libtoolize --force --copy ./autogen.sh @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.2.40 make install } diff --git a/media-libs/libpng/libpng-1.2.41.bep b/media-libs/libpng/libpng-1.2.41.recipe similarity index 95% rename from media-libs/libpng/libpng-1.2.41.bep rename to media-libs/libpng/libpng-1.2.41.recipe index f18fd1c07..df4cef202 100644 --- a/media-libs/libpng/libpng-1.2.41.bep +++ b/media-libs/libpng/libpng-1.2.41.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="82ab87818fb22961620aac7eca9fea14" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.2.41 libtoolize --force --copy ./autogen.sh @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.2.41 make install } diff --git a/media-libs/libpng/libpng-1.2.43.bep b/media-libs/libpng/libpng-1.2.43.recipe similarity index 95% rename from media-libs/libpng/libpng-1.2.43.bep rename to media-libs/libpng/libpng-1.2.43.recipe index 869e467ce..9d846cffa 100644 --- a/media-libs/libpng/libpng-1.2.43.bep +++ b/media-libs/libpng/libpng-1.2.43.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="00f3f6bfadbd4f83e351558ad6bb46b5" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.2.43 libtoolize --force --copy ./autogen.sh @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.2.43 make install } diff --git a/media-libs/libpng/libpng-1.2.44.bep b/media-libs/libpng/libpng-1.2.44.recipe similarity index 95% rename from media-libs/libpng/libpng-1.2.44.bep rename to media-libs/libpng/libpng-1.2.44.recipe index 2a9d84070..b45fbe8fe 100644 --- a/media-libs/libpng/libpng-1.2.44.bep +++ b/media-libs/libpng/libpng-1.2.44.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="89b62f8daaeeab1342e307d6d1411ff1" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.2.44 libtoolize --force --copy ./autogen.sh @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.2.44 make install } diff --git a/media-libs/libpng/libpng-1.2.46.bep b/media-libs/libpng/libpng-1.2.46.recipe similarity index 95% rename from media-libs/libpng/libpng-1.2.46.bep rename to media-libs/libpng/libpng-1.2.46.recipe index 9917b9c14..747808949 100644 --- a/media-libs/libpng/libpng-1.2.46.bep +++ b/media-libs/libpng/libpng-1.2.46.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="03ddfc17ad321db93f984581e9415d22" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.2.46 libtoolize --force --copy ./autogen.sh @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.2.46 make install } diff --git a/media-libs/libpng/libpng-1.4.1.bep b/media-libs/libpng/libpng-1.4.1.recipe similarity index 95% rename from media-libs/libpng/libpng-1.4.1.bep rename to media-libs/libpng/libpng-1.4.1.recipe index d5c4a7bc7..3f14ced79 100644 --- a/media-libs/libpng/libpng-1.4.1.bep +++ b/media-libs/libpng/libpng-1.4.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="fa0b2a84733463f90d3ac9f43ccafabc" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.4.1 libtoolize --force --copy ./autogen.sh @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.4.1 make install } diff --git a/media-libs/libpng/libpng-1.4.2.bep b/media-libs/libpng/libpng-1.4.2.recipe similarity index 95% rename from media-libs/libpng/libpng-1.4.2.bep rename to media-libs/libpng/libpng-1.4.2.recipe index 72bb98aae..f89b98f20 100644 --- a/media-libs/libpng/libpng-1.4.2.bep +++ b/media-libs/libpng/libpng-1.4.2.recipe @@ -10,7 +10,8 @@ CHECKSUM_MD5="89fd334dc5fc84ff146b9269c4fa452f" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.4.2 libtoolize --force --copy ./autogen.sh @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.4.2 make install } diff --git a/media-libs/libpng/libpng-1.4.3.bep b/media-libs/libpng/libpng-1.4.3.recipe similarity index 95% rename from media-libs/libpng/libpng-1.4.3.bep rename to media-libs/libpng/libpng-1.4.3.recipe index dd7d1af3f..e6c7e4978 100644 --- a/media-libs/libpng/libpng-1.4.3.bep +++ b/media-libs/libpng/libpng-1.4.3.recipe @@ -10,7 +10,8 @@ CHECKSUM_MD5="df3521f61a1b8b69489d297c0ca8c1f8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.4.3 libtoolize --force --copy ./autogen.sh @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.4.3 make install } diff --git a/media-libs/libpng/libpng-1.4.4.bep b/media-libs/libpng/libpng-1.4.4.recipe similarity index 95% rename from media-libs/libpng/libpng-1.4.4.bep rename to media-libs/libpng/libpng-1.4.4.recipe index 7950fef2c..bbbd67ae6 100644 --- a/media-libs/libpng/libpng-1.4.4.bep +++ b/media-libs/libpng/libpng-1.4.4.recipe @@ -10,7 +10,8 @@ CHECKSUM_MD5="297b38f925e745061489b41b1f7c4bb1" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.4.4 libtoolize --force --copy ./autogen.sh @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.4.4 make install } diff --git a/media-libs/libpng/libpng-1.5.0.bep b/media-libs/libpng/libpng-1.5.0.recipe similarity index 96% rename from media-libs/libpng/libpng-1.5.0.bep rename to media-libs/libpng/libpng-1.5.0.recipe index e8a1f7ac7..57f886d83 100644 --- a/media-libs/libpng/libpng-1.5.0.bep +++ b/media-libs/libpng/libpng-1.5.0.recipe @@ -10,7 +10,8 @@ CHECKSUM_MD5="32a9f9c8f7f020bf7867a453d81fcb51" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.5.0 libtoolize --force --copy ./autogen.sh @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.5.0 make install } diff --git a/media-libs/libpng/libpng-1.5.12.bep b/media-libs/libpng/libpng-1.5.12.recipe similarity index 96% rename from media-libs/libpng/libpng-1.5.12.bep rename to media-libs/libpng/libpng-1.5.12.recipe index 6afaf8263..ea6a3db26 100644 --- a/media-libs/libpng/libpng-1.5.12.bep +++ b/media-libs/libpng/libpng-1.5.12.recipe @@ -10,7 +10,8 @@ CHECKSUM_MD5="8ea7f60347a306c5faf70b977fa80e28" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.5.12 libtoolize --force --copy ./autogen.sh @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.5.12 make install } diff --git a/media-libs/libpng/libpng-1.5.13.bep b/media-libs/libpng/libpng-1.5.13.recipe similarity index 95% rename from media-libs/libpng/libpng-1.5.13.bep rename to media-libs/libpng/libpng-1.5.13.recipe index 89333093c..99bfdb083 100644 --- a/media-libs/libpng/libpng-1.5.13.bep +++ b/media-libs/libpng/libpng-1.5.13.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="9c5a584d4eb5fe40d0f1bc2090112c65" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.5.13 libtoolize --force --copy ./autogen.sh @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.5.13 make install } -TEST { +TEST() +{ cd libpng-1.5.13 make test } diff --git a/media-libs/libpng/libpng-1.5.2.bep b/media-libs/libpng/libpng-1.5.2.recipe similarity index 96% rename from media-libs/libpng/libpng-1.5.2.bep rename to media-libs/libpng/libpng-1.5.2.recipe index ceba7bf1a..fe9daef1a 100644 --- a/media-libs/libpng/libpng-1.5.2.bep +++ b/media-libs/libpng/libpng-1.5.2.recipe @@ -10,7 +10,8 @@ CHECKSUM_MD5="31d448eb93a1646359a23f1b23434ab3" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.5.2 libtoolize --force --copy ./autogen.sh @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.5.2 make install } diff --git a/media-libs/libpng/libpng-1.5.4.bep b/media-libs/libpng/libpng-1.5.4.recipe similarity index 96% rename from media-libs/libpng/libpng-1.5.4.bep rename to media-libs/libpng/libpng-1.5.4.recipe index 3cec3fe68..82b9201c0 100644 --- a/media-libs/libpng/libpng-1.5.4.bep +++ b/media-libs/libpng/libpng-1.5.4.recipe @@ -10,7 +10,8 @@ CHECKSUM_MD5="dea4d1fd671160424923e92ff0cdda78" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.5.4 libtoolize --force --copy ./autogen.sh @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.5.4 make install } diff --git a/media-libs/libpng/libpng-1.5.7.bep b/media-libs/libpng/libpng-1.5.7.recipe similarity index 96% rename from media-libs/libpng/libpng-1.5.7.bep rename to media-libs/libpng/libpng-1.5.7.recipe index 5c86a6209..dd3e2263d 100644 --- a/media-libs/libpng/libpng-1.5.7.bep +++ b/media-libs/libpng/libpng-1.5.7.recipe @@ -10,7 +10,8 @@ CHECKSUM_MD5="944b56a84b65d94054cc73d7ff965de8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libpng-1.5.7 libtoolize --force --copy ./autogen.sh @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libpng-1.5.7 make install } diff --git a/media-libs/libsamplerate/libsamplerate-0.1.8.bep b/media-libs/libsamplerate/libsamplerate-0.1.8.recipe similarity index 95% rename from media-libs/libsamplerate/libsamplerate-0.1.8.bep rename to media-libs/libsamplerate/libsamplerate-0.1.8.recipe index fb08c551e..14a344eba 100644 --- a/media-libs/libsamplerate/libsamplerate-0.1.8.bep +++ b/media-libs/libsamplerate/libsamplerate-0.1.8.recipe @@ -8,14 +8,16 @@ CHECKSUM_MD5="1c7fb25191b4e6e3628d198a66a84f47" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libsamplerate-0.1.8 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } -INSTALL { +INSTALL() +{ cd libsamplerate-0.1.8 make install } diff --git a/media-libs/libsdl/libsdl-1.2-hg.bep b/media-libs/libsdl/libsdl-1.2-hg.recipe similarity index 98% rename from media-libs/libsdl/libsdl-1.2-hg.bep rename to media-libs/libsdl/libsdl-1.2-hg.recipe index 217a36dae..830489f2e 100644 --- a/media-libs/libsdl/libsdl-1.2-hg.bep +++ b/media-libs/libsdl/libsdl-1.2-hg.recipe @@ -5,7 +5,8 @@ SRC_URI="hg+http://hg.libsdl.org/SDL#SDL-1.2" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libsdl-1.2-hg cp `aclocal --print-ac-dir`/libtool.m4 acinclude ./autogen.sh @@ -19,13 +20,15 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libsdl-1.2-hg make install cp ../../sdl-config `which sdl-config` } -TEST { +TEST() +{ cd libsdl-1.2-hg/test ./configure make diff --git a/media-libs/libsdl/libsdl-1.2.12.bep b/media-libs/libsdl/libsdl-1.2.12.recipe similarity index 94% rename from media-libs/libsdl/libsdl-1.2.12.bep rename to media-libs/libsdl/libsdl-1.2.12.recipe index f65d7263e..602fc6123 100644 --- a/media-libs/libsdl/libsdl-1.2.12.bep +++ b/media-libs/libsdl/libsdl-1.2.12.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="544b4554986e51eed6d34435cf9c5f3f" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd SDL-1.2.12 ./configure --prefix=/boot/home/config make } -INSTALL { +INSTALL() +{ cd SDL-1.2.12 make install } diff --git a/media-libs/libsdl/libsdl-1.2.13.bep b/media-libs/libsdl/libsdl-1.2.13.recipe similarity index 94% rename from media-libs/libsdl/libsdl-1.2.13.bep rename to media-libs/libsdl/libsdl-1.2.13.recipe index 3e8c4c0a9..e75b3534d 100644 --- a/media-libs/libsdl/libsdl-1.2.13.bep +++ b/media-libs/libsdl/libsdl-1.2.13.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="c6660feea2a6834de10bc71b2f8e4d88" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL-1.2.13 ./configure --prefix=/boot/home/config make } -INSTALL { +INSTALL() +{ cd SDL-1.2.13 make install } diff --git a/media-libs/libsdl/libsdl-1.2.14.bep b/media-libs/libsdl/libsdl-1.2.14.recipe similarity index 96% rename from media-libs/libsdl/libsdl-1.2.14.bep rename to media-libs/libsdl/libsdl-1.2.14.recipe index 68e0ae7dd..30554ec8d 100644 --- a/media-libs/libsdl/libsdl-1.2.14.bep +++ b/media-libs/libsdl/libsdl-1.2.14.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e52086d1b508fa0b76c52ee30b55bec4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL-1.2.14 ./autogen.sh rm aclocal.m4 @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL-1.2.14 make install diff --git a/media-libs/libsdl/libsdl-1.2.15.bep b/media-libs/libsdl/libsdl-1.2.15.recipe similarity index 98% rename from media-libs/libsdl/libsdl-1.2.15.bep rename to media-libs/libsdl/libsdl-1.2.15.recipe index 7618b080a..8b6cae981 100644 --- a/media-libs/libsdl/libsdl-1.2.15.bep +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL-1.2.15 ./autogen.sh rm aclocal.m4 @@ -22,12 +23,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL-1.2.15 make install } -TEST { +TEST() +{ cd SDL-1.2.15/test ./configure make diff --git a/media-libs/libsdl/libsdl-1.3-gsoc.bep b/media-libs/libsdl/libsdl-1.3-gsoc.recipe similarity index 95% rename from media-libs/libsdl/libsdl-1.3-gsoc.bep rename to media-libs/libsdl/libsdl-1.3-gsoc.recipe index 7d5af823c..1ae926ca8 100644 --- a/media-libs/libsdl/libsdl-1.3-gsoc.bep +++ b/media-libs/libsdl/libsdl-1.3-gsoc.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="broken" MESSAGE="This is a work in progress and not ready for release." DEPEND="" -BUILD { +BUILD() +{ cd libsdl-1.3-gsoc ./autogen.sh MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man @@ -17,12 +18,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libsdl-1.3-gsoc make install } -TEST { +TEST() +{ cd libsdl-1.3-gsoc/test ./autogen ./configure diff --git a/media-libs/libsdl/libsdl-2.0-hg-cmake.bep b/media-libs/libsdl/libsdl-2.0-hg-cmake.recipe similarity index 96% rename from media-libs/libsdl/libsdl-2.0-hg-cmake.bep rename to media-libs/libsdl/libsdl-2.0-hg-cmake.recipe index 5ff197a01..c421c0e28 100644 --- a/media-libs/libsdl/libsdl-2.0-hg-cmake.bep +++ b/media-libs/libsdl/libsdl-2.0-hg-cmake.recipe @@ -5,7 +5,8 @@ SRC_URI="hg+http://hg.libsdl.org/SDL" REVISION="1" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd libsdl-2.0-hg-cmake # MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man # LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libsdl-2.0-hg-cmake make install } diff --git a/media-libs/libsdl/libsdl-2.0-hg.bep b/media-libs/libsdl/libsdl-2.0-hg.recipe similarity index 96% rename from media-libs/libsdl/libsdl-2.0-hg.bep rename to media-libs/libsdl/libsdl-2.0-hg.recipe index 502f3163f..b2300d2b4 100644 --- a/media-libs/libsdl/libsdl-2.0-hg.bep +++ b/media-libs/libsdl/libsdl-2.0-hg.recipe @@ -5,7 +5,8 @@ SRC_URI="hg+http://hg.libsdl.org/SDL" REVISION="1" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd libsdl-2.0-hg MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libsdl-2.0-hg/build_haiku make install } diff --git a/media-libs/libsndfile/libsndfile-1.0.21.bep b/media-libs/libsndfile/libsndfile-1.0.21.recipe similarity index 98% rename from media-libs/libsndfile/libsndfile-1.0.21.bep rename to media-libs/libsndfile/libsndfile-1.0.21.recipe index 9558dd293..56901f30a 100644 --- a/media-libs/libsndfile/libsndfile-1.0.21.bep +++ b/media-libs/libsndfile/libsndfile-1.0.21.recipe @@ -10,7 +10,8 @@ DEPEND="media-libs/flac >= 1.2.1 media-libs/libogg >= 1.2.0 media-libs/libvorbis >= 1.3.1" -BUILD { +BUILD() +{ cd libsndfile-1.0.21 rm aclocal.m4 echo "AC_CONFIG_MACRO_DIR([M4]) >> configure.in" @@ -27,7 +28,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libsndfile-1.0.21 make install } diff --git a/media-libs/libsvgtiny/libsvgtiny-0-HEAD.bep b/media-libs/libsvgtiny/libsvgtiny-0-HEAD.recipe similarity index 96% rename from media-libs/libsvgtiny/libsvgtiny-0-HEAD.bep rename to media-libs/libsvgtiny/libsvgtiny-0-HEAD.recipe index 341c1439c..c6db21792 100644 --- a/media-libs/libsvgtiny/libsvgtiny-0-HEAD.bep +++ b/media-libs/libsvgtiny/libsvgtiny-0-HEAD.recipe @@ -9,12 +9,14 @@ DEPEND="dev-libs/libxml2 >= 2.7.7 dev-libs/libwapcaplet >= 0.1.1-HEAD net-libs/libdom >= 0" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd libsvgtiny-0-HEAD make PREFIX=/boot/common } -INSTALL { +INSTALL() +{ cd libsvgtiny-0-HEAD make install PREFIX=/boot/common } diff --git a/media-libs/libsvgtiny/libsvgtiny-10856.bep b/media-libs/libsvgtiny/libsvgtiny-10856.recipe similarity index 95% rename from media-libs/libsvgtiny/libsvgtiny-10856.bep rename to media-libs/libsvgtiny/libsvgtiny-10856.recipe index d4a28bff6..b902f7b8c 100644 --- a/media-libs/libsvgtiny/libsvgtiny-10856.bep +++ b/media-libs/libsvgtiny/libsvgtiny-10856.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/libxml2 >= 2.7.7 dev-util/gperf >= 3.0.4" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd libsvgtiny-10856 make make install PREFIX=/boot/common } -INSTALL { +INSTALL() +{ cd libsvgtiny-10856 make install } diff --git a/media-libs/libtheora/libtheora-1.1.1.bep b/media-libs/libtheora/libtheora-1.1.1.recipe similarity index 96% rename from media-libs/libtheora/libtheora-1.1.1.bep rename to media-libs/libtheora/libtheora-1.1.1.recipe index 922a87a52..3af046122 100644 --- a/media-libs/libtheora/libtheora-1.1.1.bep +++ b/media-libs/libtheora/libtheora-1.1.1.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="media-libs/libogg >= 1.2.0 media-libs/libvorbis >= 1.3.0" CHECKSUM_MD5="292ab65cedd5021d6b7ddd117e07cd8e" -BUILD { +BUILD() +{ cd libtheora-1.1.1 libtoolize --force --copy --install aclocal -I m4 @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libtheora-1.1.1 make install } diff --git a/media-libs/libvorbis/libvorbis-1.2.3.bep b/media-libs/libvorbis/libvorbis-1.2.3.recipe similarity index 96% rename from media-libs/libvorbis/libvorbis-1.2.3.bep rename to media-libs/libvorbis/libvorbis-1.2.3.recipe index cf406657e..17e3e87eb 100644 --- a/media-libs/libvorbis/libvorbis-1.2.3.bep +++ b/media-libs/libvorbis/libvorbis-1.2.3.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="5aa77f55c0e0aab8eb8ed982335daac8" REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/pkgconfig >= 0.23" -BUILD { +BUILD() +{ cd libvorbis-1.2.3 libtoolize --force --copy --install mkdir -p m4 @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libvorbis-1.2.3 make install } diff --git a/media-libs/libvorbis/libvorbis-1.3.1.bep b/media-libs/libvorbis/libvorbis-1.3.1.recipe similarity index 96% rename from media-libs/libvorbis/libvorbis-1.3.1.bep rename to media-libs/libvorbis/libvorbis-1.3.1.recipe index b618fa7a6..1fb63be62 100644 --- a/media-libs/libvorbis/libvorbis-1.3.1.bep +++ b/media-libs/libvorbis/libvorbis-1.3.1.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/pkgconfig >= 0.23 media-libs/libogg >= 1.2.0" -BUILD { +BUILD() +{ cd libvorbis-1.3.1 libtoolize --force --copy --install mkdir -p m4 @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libvorbis-1.3.1 make install } diff --git a/media-libs/libvorbis/libvorbis-1.3.2.bep b/media-libs/libvorbis/libvorbis-1.3.2.recipe similarity index 96% rename from media-libs/libvorbis/libvorbis-1.3.2.bep rename to media-libs/libvorbis/libvorbis-1.3.2.recipe index b2c084782..2d6e23cc6 100644 --- a/media-libs/libvorbis/libvorbis-1.3.2.bep +++ b/media-libs/libvorbis/libvorbis-1.3.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/pkgconfig >= 0.23 media-libs/libogg >= 1.2.0" -BUILD { +BUILD() +{ cd libvorbis-1.3.2 libtoolize -fci mkdir -p m4 @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libvorbis-1.3.2 make install } diff --git a/media-libs/libvpx/libvpx-0.9.2-git.bep b/media-libs/libvpx/libvpx-0.9.2-git.recipe similarity index 95% rename from media-libs/libvpx/libvpx-0.9.2-git.bep rename to media-libs/libvpx/libvpx-0.9.2-git.recipe index 9eb7d31d4..eb598448f 100644 --- a/media-libs/libvpx/libvpx-0.9.2-git.bep +++ b/media-libs/libvpx/libvpx-0.9.2-git.recipe @@ -4,7 +4,8 @@ SRC_URI="git+git://review.webmproject.org/libvpx.git" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libvpx-0.9.2-git ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --enable-pic \ @@ -12,7 +13,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libvpx-0.9.2-git make install } diff --git a/media-libs/libvpx/libvpx-1.0.0.bep b/media-libs/libvpx/libvpx-1.0.0.recipe similarity index 96% rename from media-libs/libvpx/libvpx-1.0.0.bep rename to media-libs/libvpx/libvpx-1.0.0.recipe index ce97faebd..0d1488c3a 100644 --- a/media-libs/libvpx/libvpx-1.0.0.bep +++ b/media-libs/libvpx/libvpx-1.0.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="d987b5140412edd37d2c6b10c29ad484" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libvpx-v1.0.0 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --enable-pic \ @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libvpx-v1.0.0 make install } diff --git a/media-libs/libwebm/libwebm-0.9.2-git.bep b/media-libs/libwebm/libwebm-0.9.2-git.recipe similarity index 95% rename from media-libs/libwebm/libwebm-0.9.2-git.bep rename to media-libs/libwebm/libwebm-0.9.2-git.recipe index 3688b9542..109c6e7d5 100644 --- a/media-libs/libwebm/libwebm-0.9.2-git.bep +++ b/media-libs/libwebm/libwebm-0.9.2-git.recipe @@ -4,12 +4,14 @@ SRC_URI="git+git://review.webmproject.org/libwebm.git" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libwebm-0.9.2-git make } -INSTALL { +INSTALL() +{ cd libwebm-0.9.2-git LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` echo "cp libmkvparser.a " ${LIBDIR} diff --git a/media-libs/libwebp/libwebp-0.1.2-git.bep b/media-libs/libwebp/libwebp-0.1.2-git.recipe similarity index 95% rename from media-libs/libwebp/libwebp-0.1.2-git.bep rename to media-libs/libwebp/libwebp-0.1.2-git.recipe index 7ee89fb3a..86b78e0c9 100644 --- a/media-libs/libwebp/libwebp-0.1.2-git.bep +++ b/media-libs/libwebp/libwebp-0.1.2-git.recipe @@ -4,7 +4,8 @@ SRC_URI="git+git://review.webmproject.org/libwebp.git" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libwebp-0.1.2-git ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -12,7 +13,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libwebp-0.1.2-git make install } diff --git a/media-libs/libwebp/libwebp-0.1.3.bep b/media-libs/libwebp/libwebp-0.1.3.recipe similarity index 95% rename from media-libs/libwebp/libwebp-0.1.3.bep rename to media-libs/libwebp/libwebp-0.1.3.recipe index 061e805d0..44b614dd6 100644 --- a/media-libs/libwebp/libwebp-0.1.3.bep +++ b/media-libs/libwebp/libwebp-0.1.3.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="254d4670e14e9ed881f0536b006ab336" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libwebp-0.1.3 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libwebp-0.1.3 make install } diff --git a/media-libs/loadpng/loadpng-1.5.bep b/media-libs/loadpng/loadpng-1.5.recipe similarity index 97% rename from media-libs/loadpng/loadpng-1.5.bep rename to media-libs/loadpng/loadpng-1.5.recipe index b5245c3b9..005b91d34 100644 --- a/media-libs/loadpng/loadpng-1.5.bep +++ b/media-libs/loadpng/loadpng-1.5.recipe @@ -7,12 +7,14 @@ DEPEND="media-libs/allegro >= 4.4 media-libs/libpng >=1.2" MESSAGE="This might not build with libpng >= 1.4" CHECKSUM_MD5="5e9ecdf1762c3fca47477bf0263b96ba" -BUILD { +BUILD() +{ cd loadpng-1.5 make } -INSTALL { +INSTALL() +{ cd loadpng-1.5 if [ -n ${DESTDIR} ];then mkdir -p ${DESTDIR}/boot/common/lib diff --git a/media-libs/lv2/lv2-1.2.0.bep b/media-libs/lv2/lv2-1.2.0.recipe similarity index 97% rename from media-libs/lv2/lv2-1.2.0.bep rename to media-libs/lv2/lv2-1.2.0.recipe index d422249be..840e2ae60 100644 --- a/media-libs/lv2/lv2-1.2.0.bep +++ b/media-libs/lv2/lv2-1.2.0.recipe @@ -10,7 +10,8 @@ DEPEND="app-doc/doxygen>=1.6.1 media-libs/libsndfile>=1.0.21 dev-python/rdflib>=3.2.0 dev-python/pyxml>=0.8.4" -BUILD { +BUILD() +{ cd lv2-1.2.0 sed -e '1,2s:/usr/bin/env:/bin/env:g' waf > waf2 cp waf2 waf @@ -21,7 +22,8 @@ BUILD { ./waf build } -INSTALL { +INSTALL() +{ cd lv2-1.2.0 ./waf install } diff --git a/media-libs/mediainfo/mediainfo-0.7.61.bep b/media-libs/mediainfo/mediainfo-0.7.61.recipe similarity index 97% rename from media-libs/mediainfo/mediainfo-0.7.61.bep rename to media-libs/mediainfo/mediainfo-0.7.61.recipe index ba77d79b4..5c0ddf1c4 100644 --- a/media-libs/mediainfo/mediainfo-0.7.61.bep +++ b/media-libs/mediainfo/mediainfo-0.7.61.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd MediaInfo_CLI_GNU_FromSource cp `finddir B_COMMON_DATA_DIRECTORY`/libtool/config/config.* ZenLib/Project/GNU/Library @@ -16,7 +17,8 @@ BUILD { ./CLI_Compile.sh } -INSTALL { +INSTALL() +{ cd MediaInfo_CLI_GNU_FromSource/MediaInfo/Project/GNU/CLI make install prefix=`finddir B_COMMON_DIRECTORY` } diff --git a/media-libs/musicbrainz/musicbrainz-5.0.1.bep b/media-libs/musicbrainz/musicbrainz-5.0.1.recipe similarity index 95% rename from media-libs/musicbrainz/musicbrainz-5.0.1.bep rename to media-libs/musicbrainz/musicbrainz-5.0.1.recipe index 3f00634d5..b8a85c876 100644 --- a/media-libs/musicbrainz/musicbrainz-5.0.1.bep +++ b/media-libs/musicbrainz/musicbrainz-5.0.1.recipe @@ -7,18 +7,21 @@ DEPEND="" CHECKSUM_MD5="a0406b94c341c2b52ec0fe98f57cadf3" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd libmusicbrainz-5.0.1 cmake . make } -INSTALL { +INSTALL() +{ cd libmusicbrainz-5.0.1 make install } -TEST { +TEST() +{ cd libmusicbrainz-5.0.1 make test } diff --git a/media-libs/openal/openal-1.12-git.bep b/media-libs/openal/openal-1.12-git.recipe similarity index 95% rename from media-libs/openal/openal-1.12-git.bep rename to media-libs/openal/openal-1.12-git.recipe index 1e2fd7b74..fc6f589e0 100644 --- a/media-libs/openal/openal-1.12-git.bep +++ b/media-libs/openal/openal-1.12-git.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0" -BUILD { +BUILD() +{ cd openal-1.12-git cmake . make } -INSTALL { +INSTALL() +{ cd openal-1.12-git make install } diff --git a/media-libs/openal/openal-1.12.854.bep b/media-libs/openal/openal-1.12.854.recipe similarity index 95% rename from media-libs/openal/openal-1.12.854.bep rename to media-libs/openal/openal-1.12.854.recipe index 939c448f4..7d0674383 100644 --- a/media-libs/openal/openal-1.12.854.bep +++ b/media-libs/openal/openal-1.12.854.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0" -BUILD { +BUILD() +{ cd openal-soft-1.12.854 cmake . make } -INSTALL { +INSTALL() +{ cd openal-soft-1.12.854 make install } diff --git a/media-libs/openal/openal-1.13.bep b/media-libs/openal/openal-1.13.recipe similarity index 95% rename from media-libs/openal/openal-1.13.bep rename to media-libs/openal/openal-1.13.recipe index 466527faa..b5633603d 100644 --- a/media-libs/openal/openal-1.13.bep +++ b/media-libs/openal/openal-1.13.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.0" -BUILD { +BUILD() +{ cd openal-soft-1.13 cmake . make } -INSTALL { +INSTALL() +{ cd openal-soft-1.13 make install } diff --git a/media-libs/openjpeg/openjpeg-1.5.0.bep b/media-libs/openjpeg/openjpeg-1.5.0.recipe similarity index 97% rename from media-libs/openjpeg/openjpeg-1.5.0.bep rename to media-libs/openjpeg/openjpeg-1.5.0.recipe index 63604c945..6f6b1f48f 100644 --- a/media-libs/openjpeg/openjpeg-1.5.0.bep +++ b/media-libs/openjpeg/openjpeg-1.5.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e5d66193ddfa59a87da1eb08ea86293b" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd openjpeg-1.5.0 ./bootstrap.sh COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openjpeg-1.5.0 make install } diff --git a/media-libs/plib/plib-1.8.5.bep b/media-libs/plib/plib-1.8.5.recipe similarity index 95% rename from media-libs/plib/plib-1.8.5.bep rename to media-libs/plib/plib-1.8.5.recipe index 460ce966e..c95d99ace 100644 --- a/media-libs/plib/plib-1.8.5.bep +++ b/media-libs/plib/plib-1.8.5.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd plib-1.8.5 libtoolize --force --copy --install ./autogen.sh @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd plib-1.8.5 make install } diff --git a/media-libs/schroedinger/schroedinger-1.0.11.bep b/media-libs/schroedinger/schroedinger-1.0.11.recipe similarity index 96% rename from media-libs/schroedinger/schroedinger-1.0.11.bep rename to media-libs/schroedinger/schroedinger-1.0.11.recipe index 94cee4162..31bdc5fbb 100644 --- a/media-libs/schroedinger/schroedinger-1.0.11.bep +++ b/media-libs/schroedinger/schroedinger-1.0.11.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-util/pkg-config >= 0.23 dev-lang/orc >= 0.4.16" CHECKSUM_MD5="da6af08e564ca1157348fb8d92efc891" -BUILD { +BUILD() +{ cd schroedinger-1.0.11 autoconf COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd schroedinger-1.0.11 make install } diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep b/media-libs/sdl-gfx/sdl-gfx-2.0.20.recipe similarity index 97% rename from media-libs/sdl-gfx/sdl-gfx-2.0.20.bep rename to media-libs/sdl-gfx/sdl-gfx-2.0.20.recipe index f32b9e0ef..e7c5561df 100644 --- a/media-libs/sdl-gfx/sdl-gfx-2.0.20.bep +++ b/media-libs/sdl-gfx/sdl-gfx-2.0.20.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8a787e538a8e4d80d4927535be5af083" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2.14" -BUILD { +BUILD() +{ cd SDL_gfx-2.0.20 libtoolize --force --copy --install aclocal @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_gfx-2.0.20 make install } diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.22.bep b/media-libs/sdl-gfx/sdl-gfx-2.0.22.recipe similarity index 97% rename from media-libs/sdl-gfx/sdl-gfx-2.0.22.bep rename to media-libs/sdl-gfx/sdl-gfx-2.0.22.recipe index 57cf26491..a2401bf20 100644 --- a/media-libs/sdl-gfx/sdl-gfx-2.0.22.bep +++ b/media-libs/sdl-gfx/sdl-gfx-2.0.22.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="330f291f1f09a1bdf397c9b40d92ca41" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2.14" -BUILD { +BUILD() +{ cd SDL_gfx-2.0.22 libtoolize --force --copy --install aclocal @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_gfx-2.0.22 make install } diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.23.bep b/media-libs/sdl-gfx/sdl-gfx-2.0.23.recipe similarity index 97% rename from media-libs/sdl-gfx/sdl-gfx-2.0.23.bep rename to media-libs/sdl-gfx/sdl-gfx-2.0.23.recipe index 44752b346..c5cc83e8b 100644 --- a/media-libs/sdl-gfx/sdl-gfx-2.0.23.bep +++ b/media-libs/sdl-gfx/sdl-gfx-2.0.23.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="fcc3c4f2d1b4943409bf7e67dd65d03a" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2.14" -BUILD { +BUILD() +{ cd SDL_gfx-2.0.23 libtoolize --force --copy --install aclocal @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_gfx-2.0.23 make install } diff --git a/media-libs/sdl-image/sdl-image-1.2-hg.bep b/media-libs/sdl-image/sdl-image-1.2-hg.recipe similarity index 97% rename from media-libs/sdl-image/sdl-image-1.2-hg.bep rename to media-libs/sdl-image/sdl-image-1.2-hg.recipe index 5ab8e0d40..370b1e1d9 100644 --- a/media-libs/sdl-image/sdl-image-1.2-hg.bep +++ b/media-libs/sdl-image/sdl-image-1.2-hg.recipe @@ -10,7 +10,8 @@ DEPEND="media-libs/libsdl >= 1.2.14 media-libs/tiff >= 3.8.2 media-libs/giflib >= 4.1.6 media-libs/libwebp >= 0.1.3" -BUILD { +BUILD() +{ cd sdl-image-1.2-hg libtoolize --force --copy --install aclocal --install -I acinclude @@ -26,7 +27,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sdl-image-1.2-hg make install } diff --git a/media-libs/sdl-image/sdl-image-1.2.10.bep b/media-libs/sdl-image/sdl-image-1.2.10.recipe similarity index 97% rename from media-libs/sdl-image/sdl-image-1.2.10.bep rename to media-libs/sdl-image/sdl-image-1.2.10.recipe index 49613d96e..c298649cc 100644 --- a/media-libs/sdl-image/sdl-image-1.2.10.bep +++ b/media-libs/sdl-image/sdl-image-1.2.10.recipe @@ -8,7 +8,8 @@ DEPEND="media-libs/jpeg >= 8b media-libs/libpng >= 1.2.44 < 1.4.0 media-libs/tiff >= 3.8.2 media-libs/giflib >= 4.1.6" -BUILD { +BUILD() +{ cd SDL_image-1.2.10 libtoolize --force --copy --install aclocal --install -I acinclude @@ -24,7 +25,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_image-1.2.10 make install } diff --git a/media-libs/sdl-image/sdl-image-1.2.12.bep b/media-libs/sdl-image/sdl-image-1.2.12.recipe similarity index 97% rename from media-libs/sdl-image/sdl-image-1.2.12.bep rename to media-libs/sdl-image/sdl-image-1.2.12.recipe index 8641128f6..f430b555d 100644 --- a/media-libs/sdl-image/sdl-image-1.2.12.bep +++ b/media-libs/sdl-image/sdl-image-1.2.12.recipe @@ -10,7 +10,8 @@ DEPEND="media-libs/libsdl >= 1.2.14 media-libs/tiff >= 3.8.2 media-libs/giflib >= 4.1.6 media-libs/libwebp >= 0.1.3" -BUILD { +BUILD() +{ cd SDL_image-1.2.12 libtoolize --force --copy --install aclocal --install -I acinclude @@ -26,7 +27,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_image-1.2.12 make install } diff --git a/media-libs/sdl-image/sdl-image-1.2.6.bep b/media-libs/sdl-image/sdl-image-1.2.6.recipe similarity index 96% rename from media-libs/sdl-image/sdl-image-1.2.6.bep rename to media-libs/sdl-image/sdl-image-1.2.6.recipe index d52989c78..3e79c65b7 100644 --- a/media-libs/sdl-image/sdl-image-1.2.6.bep +++ b/media-libs/sdl-image/sdl-image-1.2.6.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="b866dc4f647517bdaf57f6ffdefd013e" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd sdl-image-1.2.6 cat acinclude/libtool.m4 >> aclocal.m4 cat acinclude/sdl.m4 >> aclocal.m4 @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sdl-image-1.2.6 make install } diff --git a/media-libs/sdl-image/sdl-image-1.2.8.bep b/media-libs/sdl-image/sdl-image-1.2.8.recipe similarity index 95% rename from media-libs/sdl-image/sdl-image-1.2.8.bep rename to media-libs/sdl-image/sdl-image-1.2.8.recipe index 3f0fd1054..d9f80df59 100644 --- a/media-libs/sdl-image/sdl-image-1.2.8.bep +++ b/media-libs/sdl-image/sdl-image-1.2.8.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="2e7c3efa0ec2acc039c46960e27c0792" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL_image-1.2.8 libtoolize --force --copy --install aclocal --install -I acinclude @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_image-1.2.8 make install } diff --git a/media-libs/sdl-image/sdl-image-1.2.9.bep b/media-libs/sdl-image/sdl-image-1.2.9.recipe similarity index 95% rename from media-libs/sdl-image/sdl-image-1.2.9.bep rename to media-libs/sdl-image/sdl-image-1.2.9.recipe index 3318cb3db..eb781ba26 100644 --- a/media-libs/sdl-image/sdl-image-1.2.9.bep +++ b/media-libs/sdl-image/sdl-image-1.2.9.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="793eb3e7bbbf396f83fc6cd031842aa3" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL_image-1.2.9 libtoolize --force --copy --install aclocal --install -I acinclude @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_image-1.2.9 make install } diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep b/media-libs/sdl-mixer/sdl-mixer-1.2-hg.recipe similarity index 97% rename from media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep rename to media-libs/sdl-mixer/sdl-mixer-1.2-hg.recipe index c25d1478c..670953ed7 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2-hg.bep +++ b/media-libs/sdl-mixer/sdl-mixer-1.2-hg.recipe @@ -12,7 +12,8 @@ DEPEND="libsdl >= 1.2.14 media-libs/libogg >= 1.2.0 media-libs/smpeg >= 0.4.5" -BUILD { +BUILD() +{ cd sdl-mixer-1.2-hg MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` @@ -23,7 +24,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sdl-mixer-1.2-hg make install } diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.10.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.10.recipe similarity index 96% rename from media-libs/sdl-mixer/sdl-mixer-1.2.10.bep rename to media-libs/sdl-mixer/sdl-mixer-1.2.10.recipe index 930a94ac7..e9d30d1d9 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.10.bep +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.10.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="a357558552436b0b5ea0333b3e2327df" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL_mixer-1.2.10 libtoolize --force --copy --install cp ltmain.sh build-scripts/ltmain.sh @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_mixer-1.2.10 make install } diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.11.recipe similarity index 97% rename from media-libs/sdl-mixer/sdl-mixer-1.2.11.bep rename to media-libs/sdl-mixer/sdl-mixer-1.2.11.recipe index 964492470..f4a205f2f 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.11.bep +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.11.recipe @@ -11,7 +11,8 @@ DEPEND="libsdl >= 1.2.14 media-libs/libmikmod >= 3.1.11 media-libs/libogg >= 1.2.0 media-libs/smpeg >= 0.4.5" -BUILD { +BUILD() +{ cd SDL_mixer-1.2.11 libtoolize --force --copy --install cp ltmain.sh build-scripts/ltmain.sh @@ -26,7 +27,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_mixer-1.2.11 make install } diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.12.recipe similarity index 97% rename from media-libs/sdl-mixer/sdl-mixer-1.2.12.bep rename to media-libs/sdl-mixer/sdl-mixer-1.2.12.recipe index a884056b7..18c50b697 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.12.bep +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12.recipe @@ -12,7 +12,8 @@ DEPEND="libsdl >= 1.2.14 media-libs/libogg >= 1.2.0 media-libs/smpeg >= 0.4.5" -BUILD { +BUILD() +{ cd SDL_mixer-1.2.12 libtoolize --force --copy --install aclocal --install -I acinclude @@ -26,7 +27,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_mixer-1.2.12 make install } diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.9.bep b/media-libs/sdl-mixer/sdl-mixer-1.2.9.recipe similarity index 96% rename from media-libs/sdl-mixer/sdl-mixer-1.2.9.bep rename to media-libs/sdl-mixer/sdl-mixer-1.2.9.recipe index c9bf5b91b..b1e9c4e91 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.9.bep +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.9.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="09eb4585f46d3527fe7fce8af8f9e591" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL_mixer-1.2.9 libtoolize --force --copy --install cp ltmain.sh build-scripts/ltmain.sh @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_mixer-1.2.9 make install } diff --git a/media-libs/sdl-net/sdl-net-1.2-hg.bep b/media-libs/sdl-net/sdl-net-1.2-hg.recipe similarity index 96% rename from media-libs/sdl-net/sdl-net-1.2-hg.bep rename to media-libs/sdl-net/sdl-net-1.2-hg.recipe index 30f868251..bbea0675b 100644 --- a/media-libs/sdl-net/sdl-net-1.2-hg.bep +++ b/media-libs/sdl-net/sdl-net-1.2-hg.recipe @@ -5,7 +5,8 @@ SRC_URI="hg+http://hg.libsdl.org/SDL_net" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd sdl-net-1.2-hg aclocal --force --install -I acinclude libtoolize -fci @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sdl-net-1.2-hg make install } diff --git a/media-libs/sdl-net/sdl-net-1.2.7.bep b/media-libs/sdl-net/sdl-net-1.2.7.recipe similarity index 96% rename from media-libs/sdl-net/sdl-net-1.2.7.bep rename to media-libs/sdl-net/sdl-net-1.2.7.recipe index fbc4fe049..3ba48eb2b 100644 --- a/media-libs/sdl-net/sdl-net-1.2.7.bep +++ b/media-libs/sdl-net/sdl-net-1.2.7.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="6bd4662d1423810f3140d4da21b6d912" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL_net-1.2.7 aclocal --force --install -I acinclude libtoolize -fci @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_net-1.2.7 make install } diff --git a/media-libs/sdl-net/sdl-net-1.2.8.bep b/media-libs/sdl-net/sdl-net-1.2.8.recipe similarity index 96% rename from media-libs/sdl-net/sdl-net-1.2.8.bep rename to media-libs/sdl-net/sdl-net-1.2.8.recipe index 7a5dfd4a8..c43a9b14d 100644 --- a/media-libs/sdl-net/sdl-net-1.2.8.bep +++ b/media-libs/sdl-net/sdl-net-1.2.8.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="20e64e61d65662db66c379034f11f718" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL_net-1.2.8 aclocal --force --install -I acinclude libtoolize -fci @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_net-1.2.8 make install } diff --git a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep b/media-libs/sdl-rtf/sdl-rtf-0.1.0.recipe similarity index 97% rename from media-libs/sdl-rtf/sdl-rtf-0.1.0.bep rename to media-libs/sdl-rtf/sdl-rtf-0.1.0.recipe index 9b81a0285..ce2f2658e 100644 --- a/media-libs/sdl-rtf/sdl-rtf-0.1.0.bep +++ b/media-libs/sdl-rtf/sdl-rtf-0.1.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="fe36733167b5c89f128414f32612121a" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/sdl-ttf >= 2.0.9" -BUILD { +BUILD() +{ cd SDL_rtf-0.1.0 rm aclocal.m4 rm acinclude.m4 @@ -22,7 +23,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_rtf-0.1.0 make install } diff --git a/media-libs/sdl-sound/sdl-sound-1.0-hg.bep b/media-libs/sdl-sound/sdl-sound-1.0-hg.recipe similarity index 96% rename from media-libs/sdl-sound/sdl-sound-1.0-hg.bep rename to media-libs/sdl-sound/sdl-sound-1.0-hg.recipe index 275fb2fca..86fe30fca 100644 --- a/media-libs/sdl-sound/sdl-sound-1.0-hg.bep +++ b/media-libs/sdl-sound/sdl-sound-1.0-hg.recipe @@ -4,7 +4,8 @@ SRC_URI="hg+http://hg.icculus.org/icculus/SDL_sound" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libogg >= 1.1.4" -BUILD { +BUILD() +{ cd sdl-sound-1.0-hg libtoolize --copy --force --install ./bootstrap @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sdl-sound-1.0-hg make install } diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3.bep b/media-libs/sdl-sound/sdl-sound-1.0.3.recipe similarity index 96% rename from media-libs/sdl-sound/sdl-sound-1.0.3.bep rename to media-libs/sdl-sound/sdl-sound-1.0.3.recipe index 6432c7014..4f5b773e0 100644 --- a/media-libs/sdl-sound/sdl-sound-1.0.3.bep +++ b/media-libs/sdl-sound/sdl-sound-1.0.3.recipe @@ -4,7 +4,8 @@ SRC_URI="hg+http://hg.icculus.org/icculus/SDL_sound#release-1.0.3" REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libogg >= 1.1.4" -BUILD { +BUILD() +{ cd sdl-sound-1.0.3 libtoolize --copy --force --install ./bootstrap @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sdl-sound-1.0.3 make install } diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0-hg.bep b/media-libs/sdl-ttf/sdl-ttf-2.0-hg.recipe similarity index 97% rename from media-libs/sdl-ttf/sdl-ttf-2.0-hg.bep rename to media-libs/sdl-ttf/sdl-ttf-2.0-hg.recipe index df5fda109..b6bec4fe4 100644 --- a/media-libs/sdl-ttf/sdl-ttf-2.0-hg.bep +++ b/media-libs/sdl-ttf/sdl-ttf-2.0-hg.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2.12 dev-util/pkgconfig >= 0.9" -BUILD { +BUILD() +{ cd sdl-ttf-2.0-hg rm -f acinclude.m4 libtoolize --copy --force --install @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sdl-ttf-2.0-hg make install } diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep b/media-libs/sdl-ttf/sdl-ttf-2.0.10.recipe similarity index 97% rename from media-libs/sdl-ttf/sdl-ttf-2.0.10.bep rename to media-libs/sdl-ttf/sdl-ttf-2.0.10.recipe index 15cd7c98e..7fd96a9d8 100644 --- a/media-libs/sdl-ttf/sdl-ttf-2.0.10.bep +++ b/media-libs/sdl-ttf/sdl-ttf-2.0.10.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2.12 dev-util/pkgconfig >= 0.9" -BUILD { +BUILD() +{ cd SDL_ttf-2.0.10 rm -f acinclude.m4 libtoolize --copy --force --install @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_ttf-2.0.10 make install } diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11.bep b/media-libs/sdl-ttf/sdl-ttf-2.0.11.recipe similarity index 97% rename from media-libs/sdl-ttf/sdl-ttf-2.0.11.bep rename to media-libs/sdl-ttf/sdl-ttf-2.0.11.recipe index 28f407403..8e2d5fb59 100644 --- a/media-libs/sdl-ttf/sdl-ttf-2.0.11.bep +++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2.12 dev-util/pkgconfig >= 0.9" -BUILD { +BUILD() +{ cd SDL_ttf-2.0.11 rm -f acinclude.m4 libtoolize --copy --force --install @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_ttf-2.0.11 make install } diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.9.bep b/media-libs/sdl-ttf/sdl-ttf-2.0.9.recipe similarity index 96% rename from media-libs/sdl-ttf/sdl-ttf-2.0.9.bep rename to media-libs/sdl-ttf/sdl-ttf-2.0.9.recipe index 18f5cb80d..b068d6603 100644 --- a/media-libs/sdl-ttf/sdl-ttf-2.0.9.bep +++ b/media-libs/sdl-ttf/sdl-ttf-2.0.9.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="6dd5a85e4924689a35a5fb1cb3336156" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd SDL_ttf-2.0.9 rm aclocal.m4 echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd SDL_ttf-2.0.9 make install } diff --git a/media-libs/sge/sge-030809.bep b/media-libs/sge/sge-030809.recipe similarity index 94% rename from media-libs/sge/sge-030809.bep rename to media-libs/sge/sge-030809.recipe index 2b05bbd16..d8b9f38b5 100644 --- a/media-libs/sge/sge-030809.bep +++ b/media-libs/sge/sge-030809.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="a76975665b6a2bf189130fa2c8821caf" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd sge030809 make } -INSTALL { +INSTALL() +{ cd sge030809 make install } diff --git a/media-libs/smjpeg/smjpeg-0.2.1.bep b/media-libs/smjpeg/smjpeg-0.2.1.recipe similarity index 96% rename from media-libs/smjpeg/smjpeg-0.2.1.bep rename to media-libs/smjpeg/smjpeg-0.2.1.recipe index 2208d923a..62199881e 100644 --- a/media-libs/smjpeg/smjpeg-0.2.1.bep +++ b/media-libs/smjpeg/smjpeg-0.2.1.recipe @@ -4,7 +4,8 @@ SRC_URI="svn://svn.icculus.org/smjpeg/trunk/" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd smjpeg-0.2.1 rm -f acinclude.m4 rm -f aclocal.m4 @@ -22,7 +23,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd smjpeg-0.2.1 make install } diff --git a/media-libs/smpeg/smpeg-0.4.5.bep b/media-libs/smpeg/smpeg-0.4.5.recipe similarity index 97% rename from media-libs/smpeg/smpeg-0.4.5.bep rename to media-libs/smpeg/smpeg-0.4.5.recipe index 76a86a1ff..87e4d3872 100644 --- a/media-libs/smpeg/smpeg-0.4.5.bep +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -4,7 +4,8 @@ SRC_URI="svn://svn.icculus.org/smpeg/trunk/" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd smpeg-0.4.5 rm -f acinclude.m4 rm -f aclocal.m4 @@ -22,7 +23,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd smpeg-0.4.5 make install } diff --git a/media-libs/speex/speex-1.2-git.bep b/media-libs/speex/speex-1.2-git.recipe similarity index 97% rename from media-libs/speex/speex-1.2-git.bep rename to media-libs/speex/speex-1.2-git.recipe index 320e8878a..1cc925689 100644 --- a/media-libs/speex/speex-1.2-git.bep +++ b/media-libs/speex/speex-1.2-git.recipe @@ -5,7 +5,8 @@ SRC_URI="git+http://git.xiph.org/speex.git" REVISION="1" STATUS_HAIKU="stable" DEPEND="libogg >= 1.2.0" -BUILD { +BUILD() +{ cd speex-1.2-git libtoolize --copy --force --install echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd speex-1.2-git make install } diff --git a/media-libs/speex/speex-1.2rc1.bep b/media-libs/speex/speex-1.2rc1.recipe similarity index 97% rename from media-libs/speex/speex-1.2rc1.bep rename to media-libs/speex/speex-1.2rc1.recipe index e8d06c9ed..489052c8c 100644 --- a/media-libs/speex/speex-1.2rc1.bep +++ b/media-libs/speex/speex-1.2rc1.recipe @@ -6,7 +6,8 @@ REVISION="2" STATUS_HAIKU="stable" DEPEND="pkgconfig >= 0.25 libogg > 1.3.0" -BUILD { +BUILD() +{ cd speex-1.2rc1 libtoolize --copy --force --install aclocal @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd speex-1.2rc1 make install } diff --git a/media-libs/taglib/taglib-1.6.1.bep b/media-libs/taglib/taglib-1.6.1.recipe similarity index 94% rename from media-libs/taglib/taglib-1.6.1.bep rename to media-libs/taglib/taglib-1.6.1.recipe index 62ca47242..08a332fbf 100644 --- a/media-libs/taglib/taglib-1.6.1.bep +++ b/media-libs/taglib/taglib-1.6.1.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="db0502b3c3448ff1f1f9b090c1daa5f7" -BUILD { +BUILD() +{ cd taglib-1.6.1 cmake . make } -INSTALL { +INSTALL() +{ cd taglib-1.6.1 make install } diff --git a/media-libs/taglib/taglib-1.6.2.bep b/media-libs/taglib/taglib-1.6.2.recipe similarity index 94% rename from media-libs/taglib/taglib-1.6.2.bep rename to media-libs/taglib/taglib-1.6.2.recipe index d9235c09f..bf9d09163 100644 --- a/media-libs/taglib/taglib-1.6.2.bep +++ b/media-libs/taglib/taglib-1.6.2.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="7c936a07acfc53b2beda4151a0f66336" -BUILD { +BUILD() +{ cd taglib-1.6.2 cmake . make } -INSTALL { +INSTALL() +{ cd taglib-1.6.2 make install } diff --git a/media-libs/taglib/taglib-1.6.3.bep b/media-libs/taglib/taglib-1.6.3.recipe similarity index 94% rename from media-libs/taglib/taglib-1.6.3.bep rename to media-libs/taglib/taglib-1.6.3.recipe index 14b6ed2c5..3395ffa3d 100644 --- a/media-libs/taglib/taglib-1.6.3.bep +++ b/media-libs/taglib/taglib-1.6.3.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="ddf02f4e1d2dc30f76734df806e613eb" -BUILD { +BUILD() +{ cd taglib-1.6.3 cmake . make } -INSTALL { +INSTALL() +{ cd taglib-1.6.3 make install } diff --git a/media-libs/taglib/taglib-1.7.1.bep b/media-libs/taglib/taglib-1.7.1.recipe similarity index 94% rename from media-libs/taglib/taglib-1.7.1.bep rename to media-libs/taglib/taglib-1.7.1.recipe index d8a160ffd..0eb629e5c 100644 --- a/media-libs/taglib/taglib-1.7.1.bep +++ b/media-libs/taglib/taglib-1.7.1.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="aa0f7e2d9700bbb78c5f990ed2f5d9b6" -BUILD { +BUILD() +{ cd taglib-1.7.1 cmake . make } -INSTALL { +INSTALL() +{ cd taglib-1.7.1 make install } diff --git a/media-libs/taglib/taglib-1.7.2.bep b/media-libs/taglib/taglib-1.7.2.recipe similarity index 94% rename from media-libs/taglib/taglib-1.7.2.bep rename to media-libs/taglib/taglib-1.7.2.recipe index d8aba64fd..a71332c80 100644 --- a/media-libs/taglib/taglib-1.7.2.bep +++ b/media-libs/taglib/taglib-1.7.2.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="cmake" CHECKSUM_MD5="b0a9e797d3833fb933c7c3176de3d720" -BUILD { +BUILD() +{ cd taglib-1.7.2 cmake . make } -INSTALL { +INSTALL() +{ cd taglib-1.7.2 make install } diff --git a/media-libs/taglib/taglib-1.7.bep b/media-libs/taglib/taglib-1.7.recipe similarity index 94% rename from media-libs/taglib/taglib-1.7.bep rename to media-libs/taglib/taglib-1.7.recipe index 0716bb487..862ebbe76 100644 --- a/media-libs/taglib/taglib-1.7.bep +++ b/media-libs/taglib/taglib-1.7.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6a7e312668f153fa905a81714aebc257" -BUILD { +BUILD() +{ cd taglib-1.7 cmake . make } -INSTALL { +INSTALL() +{ cd taglib-1.7 make install } diff --git a/media-libs/taglib/taglib-1.8.bep b/media-libs/taglib/taglib-1.8.recipe similarity index 94% rename from media-libs/taglib/taglib-1.8.bep rename to media-libs/taglib/taglib-1.8.recipe index a7abbd2ff..7c6b5e78a 100644 --- a/media-libs/taglib/taglib-1.8.bep +++ b/media-libs/taglib/taglib-1.8.recipe @@ -5,13 +5,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="dcb8bd1b756f2843e18b1fdf3aaeee15" -BUILD { +BUILD() +{ cd taglib-1.8 cmake . make } -INSTALL { +INSTALL() +{ cd taglib-1.8 make install } diff --git a/media-libs/tiff/tiff-3.8.2.bep b/media-libs/tiff/tiff-3.8.2.recipe similarity index 96% rename from media-libs/tiff/tiff-3.8.2.bep rename to media-libs/tiff/tiff-3.8.2.recipe index 4a2338e42..5e5826c88 100644 --- a/media-libs/tiff/tiff-3.8.2.bep +++ b/media-libs/tiff/tiff-3.8.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="fbb6f446ea4ed18955e2714934e5b698" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd tiff-3.8.2 cp /boot/home/config/share/libtool/config.guess config.guess cp /boot/home/config/share/libtool/config.sub config.sub @@ -20,6 +21,7 @@ BUILD { make } -INSTALL { +INSTALL() +{ make install } diff --git a/media-libs/tiff/tiff-3.9.1.bep b/media-libs/tiff/tiff-3.9.1.recipe similarity index 94% rename from media-libs/tiff/tiff-3.9.1.bep rename to media-libs/tiff/tiff-3.9.1.recipe index d0aa4e446..d1b0b6a18 100644 --- a/media-libs/tiff/tiff-3.9.1.bep +++ b/media-libs/tiff/tiff-3.9.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="63c59a44f34ae0787f2d71de3d256e20" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd tiff-3.9.1 libtoolize --force --copy --install aclocal -I m4 @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tiff-3.9.1 make install } diff --git a/media-libs/tiff/tiff-3.9.4.bep b/media-libs/tiff/tiff-3.9.4.recipe similarity index 94% rename from media-libs/tiff/tiff-3.9.4.bep rename to media-libs/tiff/tiff-3.9.4.recipe index 4718a9b5f..8e13c6bb1 100644 --- a/media-libs/tiff/tiff-3.9.4.bep +++ b/media-libs/tiff/tiff-3.9.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="2006c1bdd12644dbf02956955175afd6" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd tiff-3.9.4 libtoolize --force --copy --install aclocal -I m4 @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tiff-3.9.4 make install } diff --git a/media-libs/tiff/tiff-3.9.6.bep b/media-libs/tiff/tiff-3.9.6.recipe similarity index 94% rename from media-libs/tiff/tiff-3.9.6.bep rename to media-libs/tiff/tiff-3.9.6.recipe index a8fc84aaa..1305cc483 100644 --- a/media-libs/tiff/tiff-3.9.6.bep +++ b/media-libs/tiff/tiff-3.9.6.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="6920f3bf628d791d49f268b83612ed23" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd tiff-3.9.6 libtoolize --force --copy --install aclocal -I m4 @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tiff-3.9.6 make install } diff --git a/media-libs/tiff/tiff-4.0.2.bep b/media-libs/tiff/tiff-4.0.2.recipe similarity index 94% rename from media-libs/tiff/tiff-4.0.2.bep rename to media-libs/tiff/tiff-4.0.2.recipe index c94a19245..c625630a0 100644 --- a/media-libs/tiff/tiff-4.0.2.bep +++ b/media-libs/tiff/tiff-4.0.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="04a08fa1e07e696e820a0c3f32465a13" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd tiff-4.0.2 libtoolize --force --copy --install aclocal -I m4 @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tiff-4.0.2 make install } diff --git a/media-libs/vigra/vigra-1.8.0.bep b/media-libs/vigra/vigra-1.8.0.recipe similarity index 96% rename from media-libs/vigra/vigra-1.8.0.bep rename to media-libs/vigra/vigra-1.8.0.recipe index dee691ec6..e05e7b3c5 100644 --- a/media-libs/vigra/vigra-1.8.0.bep +++ b/media-libs/vigra/vigra-1.8.0.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="cmake" -BUILD { +BUILD() +{ cd vigra-1.8.0 cmake CMakelists.txt make } -INSTALL { +INSTALL() +{ cd vigra-1.8.0 make install } diff --git a/media-libs/waave/waave-1.01.bep b/media-libs/waave/waave-1.01.recipe similarity index 94% rename from media-libs/waave/waave-1.01.bep rename to media-libs/waave/waave-1.01.recipe index 2c42eff3f..262d8426f 100644 --- a/media-libs/waave/waave-1.01.bep +++ b/media-libs/waave/waave-1.01.recipe @@ -6,18 +6,21 @@ STATUS_HAIKU="broken" DEPEND="media-libs/libsdl >= 1.2.15 media-video/ffmeg >= 0.10.2" CHECKSUM_MD5="7f168d3122a3889ee6da3a380cfe1c99" -BUILD { +BUILD() +{ cd waave-1.01 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd waave-1.01 make install } -TEST { +TEST() +{ cd waave-1.01/test make } diff --git a/media-libs/x264/x264-20120803.bep b/media-libs/x264/x264-20120803.recipe similarity index 96% rename from media-libs/x264/x264-20120803.bep rename to media-libs/x264/x264-20120803.recipe index 21aed8d29..e0881ff35 100644 --- a/media-libs/x264/x264-20120803.bep +++ b/media-libs/x264/x264-20120803.recipe @@ -6,13 +6,15 @@ REVISION="1" MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building." STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd x264-snapshot-20120803-2245 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd x264-snapshot-20120803-2245 make install-lib-static } diff --git a/media-sound/bladeenc/bladeenc-0.94.2.bep b/media-sound/bladeenc/bladeenc-0.94.2.recipe similarity index 96% rename from media-sound/bladeenc/bladeenc-0.94.2.bep rename to media-sound/bladeenc/bladeenc-0.94.2.recipe index dd03383d4..24e084884 100644 --- a/media-sound/bladeenc/bladeenc-0.94.2.bep +++ b/media-sound/bladeenc/bladeenc-0.94.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="9b9f6eafe1637a48a67f0a0f8f6e71ad" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bladeenc-0.94.2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd bladeenc-0.94.2 make install } diff --git a/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep b/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.recipe similarity index 96% rename from media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep rename to media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.recipe index 093c96677..e76b7af16 100644 --- a/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.bep +++ b/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.recipe @@ -7,14 +7,16 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/glib >= 2.24.1 media-libs/libsndfile >= 1.0.18" -BUILD { +BUILD() +{ cd fluidsynth-1.1-midi-buffer cd fluidsynth cmake . make } -INSTALL { +INSTALL() +{ cd fluidsynth-1.1-midi-buffer cd fluidsynth make install diff --git a/media-sound/fluidsynth/fluidsynth-1.1.3.bep b/media-sound/fluidsynth/fluidsynth-1.1.3.recipe similarity index 96% rename from media-sound/fluidsynth/fluidsynth-1.1.3.bep rename to media-sound/fluidsynth/fluidsynth-1.1.3.recipe index d4792455e..9b759f617 100644 --- a/media-sound/fluidsynth/fluidsynth-1.1.3.bep +++ b/media-sound/fluidsynth/fluidsynth-1.1.3.recipe @@ -7,13 +7,15 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/glib >= 2.24.1 media-libs/libsndfile >= 1.0.18" -BUILD { +BUILD() +{ cd fluidsynth-1.1.3 cmake . make } -INSTALL { +INSTALL() +{ cd fluidsynth-1.1.3 make install } diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.bep b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe similarity index 96% rename from media-sound/fluidsynth/fluidsynth-1.1.6.bep rename to media-sound/fluidsynth/fluidsynth-1.1.6.recipe index 86ea54247..d4b900964 100644 --- a/media-sound/fluidsynth/fluidsynth-1.1.6.bep +++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe @@ -8,13 +8,15 @@ DEPEND="dev-libs/glib >= 2.26.1 media-libs/libsndfile >= 1.0.21 sys-libs/readline >= 6.0" -BUILD { +BUILD() +{ cd fluidsynth-1.1.6 cmake . make } -INSTALL { +INSTALL() +{ cd fluidsynth-1.1.6 make install prefix=`finddir B_COMMON_DIRECTORY` } diff --git a/media-sound/gogo-no-coda/gogo-no-coda-3.13.bep b/media-sound/gogo-no-coda/gogo-no-coda-3.13.recipe similarity index 96% rename from media-sound/gogo-no-coda/gogo-no-coda-3.13.bep rename to media-sound/gogo-no-coda/gogo-no-coda-3.13.recipe index a69303f3f..21443ce70 100644 --- a/media-sound/gogo-no-coda/gogo-no-coda-3.13.bep +++ b/media-sound/gogo-no-coda/gogo-no-coda-3.13.recipe @@ -7,12 +7,14 @@ STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc2. Use 'setgcc gcc2' before building." DEPEND="dev-lang/nasm" -BUILD { +BUILD() +{ cd gogo-no-coda-master/linux make } -INSTALL { +INSTALL() +{ cd gogo-no-coda-master/linux make install prefix=`finddir B_COMMON_DIRECTORY` } diff --git a/media-sound/jack2/jack2-1.9.8.bep b/media-sound/jack2/jack2-1.9.8.recipe similarity index 96% rename from media-sound/jack2/jack2-1.9.8.bep rename to media-sound/jack2/jack2-1.9.8.recipe index 9f83969e5..a19991b37 100644 --- a/media-sound/jack2/jack2-1.9.8.bep +++ b/media-sound/jack2/jack2-1.9.8.recipe @@ -7,13 +7,15 @@ DEPEND="media-libs/libsamplerate >= 0.1.8 media-libs/libsndfile >= 1.0.21" #CHECKSUM_MD5="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd jack2-1.9.8 python ./waf configure --prefix=/boot/common/ python ./waf build } -INSTALL { +INSTALL() +{ cd jack2-1.9.8 python ./waf build install } diff --git a/media-sound/lame/lame-3.98.4.bep b/media-sound/lame/lame-3.98.4.recipe similarity index 96% rename from media-sound/lame/lame-3.98.4.bep rename to media-sound/lame/lame-3.98.4.recipe index d5f82fbe4..232777e1f 100644 --- a/media-sound/lame/lame-3.98.4.bep +++ b/media-sound/lame/lame-3.98.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8e9866ad6b570c6c95c8cba48060473f" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd lame-3.98.4 mkdir -p m4 # configure checks for gtk, but they didn't include the gtk.m4 so we need to. @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd lame-3.98.4 make install } diff --git a/media-sound/lame/lame-3.99.bep b/media-sound/lame/lame-3.99.recipe similarity index 96% rename from media-sound/lame/lame-3.99.bep rename to media-sound/lame/lame-3.99.recipe index 79a54d80d..079bb19ce 100644 --- a/media-sound/lame/lame-3.99.bep +++ b/media-sound/lame/lame-3.99.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="7abacd1d0a65a63733335786015626db" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd lame-3.99 mkdir -p m4 # configure checks for gtk, but they didn't include the gtk.m4 so we need to. @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd lame-3.99 make install } diff --git a/media-sound/lame/lame-398-2.bep b/media-sound/lame/lame-398-2.recipe similarity index 95% rename from media-sound/lame/lame-398-2.bep rename to media-sound/lame/lame-398-2.recipe index 35b0cb71b..e53af5d43 100644 --- a/media-sound/lame/lame-398-2.bep +++ b/media-sound/lame/lame-398-2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="719dae0ee675d0c16e0e89952930ed35" REVISION="1" STATUS_HAIKU="untested" DEPEND="dev-lang/nasm >= 2.03.01" -BUILD { +BUILD() +{ cd lame-398-2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd lame-398-2 make install } diff --git a/media-sound/milkytracker/milkytracker-0.90.85.bep b/media-sound/milkytracker/milkytracker-0.90.85.recipe similarity index 97% rename from media-sound/milkytracker/milkytracker-0.90.85.bep rename to media-sound/milkytracker/milkytracker-0.90.85.recipe index 6a8dd7a64..a5835b041 100644 --- a/media-sound/milkytracker/milkytracker-0.90.85.bep +++ b/media-sound/milkytracker/milkytracker-0.90.85.recipe @@ -7,14 +7,16 @@ REVISION="1" DEPEND="media-libs/libsdl >= 1.2 sys-libs/zlib >= 1.2.5" -BUILD { +BUILD() +{ cd 'MilkyTracker Source Code'/platforms/haiku bash ./Add_Jamfiles.sh cd ../.. jam } -INSTALL { +INSTALL() +{ cd 'MilkyTracker Source Code'/src/tracker APPDIR=`finddir B_APPS_DIRECTORY`/MilkyTracker APPSETTINGSDIR=`finddir B_USER_SETTINGS_DIRECTORY`/MilkyTracker/ diff --git a/media-sound/mpg123/mpg123-1.12.1.bep b/media-sound/mpg123/mpg123-1.12.1.recipe similarity index 96% rename from media-sound/mpg123/mpg123-1.12.1.bep rename to media-sound/mpg123/mpg123-1.12.1.recipe index 361107799..753a9e082 100644 --- a/media-sound/mpg123/mpg123-1.12.1.bep +++ b/media-sound/mpg123/mpg123-1.12.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="media-libs/libsdl >= 1.2" CHECKSUM_MD5="e7d810a75d22954169f1530a436aca4c" -BUILD { +BUILD() +{ cd mpg123-1.12.1 libtoolize --force --copy --install aclocal @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd mpg123-1.12.1 make install } diff --git a/media-sound/naspro/naspro-0.2.9-hg.bep b/media-sound/naspro/naspro-0.2.9-hg.recipe similarity index 95% rename from media-sound/naspro/naspro-0.2.9-hg.bep rename to media-sound/naspro/naspro-0.2.9-hg.recipe index 7129d2e0f..468000b09 100644 --- a/media-sound/naspro/naspro-0.2.9-hg.bep +++ b/media-sound/naspro/naspro-0.2.9-hg.recipe @@ -5,14 +5,16 @@ SRC_URI="hg+http://hg.atheme.org/naspro" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd naspro-0.2.9-hg/naspro-core ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd naspro-0.2.9-hg-core make install } diff --git a/media-sound/ocp/ocp-0.1.21-git.bep b/media-sound/ocp/ocp-0.1.21-git.recipe similarity index 96% rename from media-sound/ocp/ocp-0.1.21-git.bep rename to media-sound/ocp/ocp-0.1.21-git.recipe index f300ccc3b..0abc28e07 100644 --- a/media-sound/ocp/ocp-0.1.21-git.bep +++ b/media-sound/ocp/ocp-0.1.21-git.recipe @@ -10,14 +10,16 @@ DEPEND="media-libs/libvorbis >= 1.3.1 # media-libs/flac >= 1.2.1" # ncurses zlib ... cf. ocp.spec MESSAGE="This port requires gcc4" -BUILD { +BUILD() +{ cd code autoconf CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd code make install } diff --git a/media-sound/ocp/ocp-snapshot20110319.bep b/media-sound/ocp/ocp-snapshot20110319.recipe similarity index 97% rename from media-sound/ocp/ocp-snapshot20110319.bep rename to media-sound/ocp/ocp-snapshot20110319.recipe index 1998800f0..5884c5770 100644 --- a/media-sound/ocp/ocp-snapshot20110319.bep +++ b/media-sound/ocp/ocp-snapshot20110319.recipe @@ -11,14 +11,16 @@ DEPEND="media-libs/libvorbis >= 1.3.1 # media-libs/flac >= 1.2.1" # ncurses zlib ... cf. ocp.spec MESSAGE="This port requires gcc4" -BUILD { +BUILD() +{ cd ocp-snapshot-20110319 autoconf CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd ocp-snapshot-20110319 make install } diff --git a/media-sound/ocp/ocp-snapshot20110320.bep b/media-sound/ocp/ocp-snapshot20110320.recipe similarity index 97% rename from media-sound/ocp/ocp-snapshot20110320.bep rename to media-sound/ocp/ocp-snapshot20110320.recipe index 0df6d4339..5fb1ed52c 100644 --- a/media-sound/ocp/ocp-snapshot20110320.bep +++ b/media-sound/ocp/ocp-snapshot20110320.recipe @@ -11,14 +11,16 @@ DEPEND="media-libs/libvorbis >= 1.3.1 # media-libs/flac >= 1.2.1" # ncurses zlib ... cf. ocp.spec MESSAGE="This port requires gcc4" -BUILD { +BUILD() +{ cd ocp-snapshot-20110320 autoconf CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd ocp-snapshot-20110320 make install } diff --git a/media-sound/opensound/opensound-232d0de71550.bep b/media-sound/opensound/opensound-232d0de71550.recipe similarity index 96% rename from media-sound/opensound/opensound-232d0de71550.bep rename to media-sound/opensound/opensound-232d0de71550.recipe index 7b6582407..21c69c1f3 100644 --- a/media-sound/opensound/opensound-232d0de71550.bep +++ b/media-sound/opensound/opensound-232d0de71550.recipe @@ -4,7 +4,8 @@ SRC_URI="hg+http://opensound.hg.sourceforge.net:8000/hgroot/opensound/opensound/ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd opensound-232d0de71550 mkdir -p build cd build @@ -12,7 +13,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd opensound-232d0de71550/build if [ -n "${DESTDIR}" ];then make package diff --git a/media-sound/opensound/opensound-4.2.bep b/media-sound/opensound/opensound-4.2.recipe similarity index 96% rename from media-sound/opensound/opensound-4.2.bep rename to media-sound/opensound/opensound-4.2.recipe index bfcc02c84..d5e2e0ff7 100644 --- a/media-sound/opensound/opensound-4.2.bep +++ b/media-sound/opensound/opensound-4.2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="da28b1fea261554a1480fcd3c5509cb5" -BUILD { +BUILD() +{ cd oss-v4.2-build2002-src-bsd mkdir -p build cd build @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd oss-v4.2-build2002-src-bsd/build if [ -n "${DESTDIR}" ];then make package diff --git a/media-sound/opensound/opensound-cac211efd60d.bep b/media-sound/opensound/opensound-cac211efd60d.recipe similarity index 95% rename from media-sound/opensound/opensound-cac211efd60d.bep rename to media-sound/opensound/opensound-cac211efd60d.recipe index 452abdbed..149d67b74 100644 --- a/media-sound/opensound/opensound-cac211efd60d.bep +++ b/media-sound/opensound/opensound-cac211efd60d.recipe @@ -4,7 +4,8 @@ SRC_URI="hg+http://mercurial.opensound.com/#cac211efd60d" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd opensound-cac211efd60d mkdir -p build cd build @@ -12,7 +13,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd opensound-cac211efd60d/build if [ -n "${DESTDIR}" ];then make package diff --git a/media-sound/schismtracker/schismtracker-20100713.bep b/media-sound/schismtracker/schismtracker-20100713.recipe similarity index 96% rename from media-sound/schismtracker/schismtracker-20100713.bep rename to media-sound/schismtracker/schismtracker-20100713.recipe index d1c10a5d2..bc19e05ae 100644 --- a/media-sound/schismtracker/schismtracker-20100713.bep +++ b/media-sound/schismtracker/schismtracker-20100713.recipe @@ -7,7 +7,8 @@ MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="libsdl >= 1.2.14 gcc >= 4" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd schismtracker-20100713 aclocal autoconf @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd schismtracker-20100713 make install } diff --git a/media-sound/twolame/twolame-0.3.13.bep b/media-sound/twolame/twolame-0.3.13.recipe similarity index 96% rename from media-sound/twolame/twolame-0.3.13.bep rename to media-sound/twolame/twolame-0.3.13.recipe index 4fc7b7d54..2afb81b4b 100644 --- a/media-sound/twolame/twolame-0.3.13.bep +++ b/media-sound/twolame/twolame-0.3.13.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="4113d8aa80194459b45b83d4dbde8ddb" -BUILD { +BUILD() +{ cd twolame-0.3.13 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd twolame-0.3.13 make install } diff --git a/media-sound/vorbis-tools/vorbis-tools-1.2.0.bep b/media-sound/vorbis-tools/vorbis-tools-1.2.0.recipe similarity index 96% rename from media-sound/vorbis-tools/vorbis-tools-1.2.0.bep rename to media-sound/vorbis-tools/vorbis-tools-1.2.0.recipe index 6e314d7c3..ae10bc5fc 100644 --- a/media-sound/vorbis-tools/vorbis-tools-1.2.0.bep +++ b/media-sound/vorbis-tools/vorbis-tools-1.2.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="df976d24e51ef3d87cd462edf747bf9a" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd vorbis-tools-1.2.0 libtoolize --force --copy --install aclocal -I m4 @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd vorbis-tools-1.2.0 make install } diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0.bep b/media-sound/vorbis-tools/vorbis-tools-1.4.0.recipe similarity index 97% rename from media-sound/vorbis-tools/vorbis-tools-1.4.0.bep rename to media-sound/vorbis-tools/vorbis-tools-1.4.0.recipe index 9ee4fdad5..d16c1b2f3 100644 --- a/media-sound/vorbis-tools/vorbis-tools-1.4.0.bep +++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0.recipe @@ -8,7 +8,8 @@ DEPEND="media-libs/libvorbis >= 1.3.1 media-libs/flac >= 1.2.1 media-libs/libao >= 1.0.0 media-libs/speex >1.2" -BUILD { +BUILD() +{ cd vorbis-tools-1.4.0 libtoolize --force --copy --install aclocal -I m4 @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd vorbis-tools-1.4.0 make install } diff --git a/media-video/ffmpeg/ffmpeg-0.10.2-vlc.bep b/media-video/ffmpeg/ffmpeg-0.10.2-vlc.recipe similarity index 97% rename from media-video/ffmpeg/ffmpeg-0.10.2-vlc.bep rename to media-video/ffmpeg/ffmpeg-0.10.2-vlc.recipe index 9d69e0e65..75c5d9949 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.2-vlc.bep +++ b/media-video/ffmpeg/ffmpeg-0.10.2-vlc.recipe @@ -9,7 +9,8 @@ DEPEND="media-libs/libogg >= 1.3.0 media-libs/libtheora >= 1.1.0 media-libs/libvorbis >= 1.3.2 media-libs/libvpx >= 1.0.0" -BUILD { +BUILD() +{ cd ffmpeg-0.10.2 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \ @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ffmpeg-0.10.2 make install } diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.bep b/media-video/ffmpeg/ffmpeg-0.10.2.recipe similarity index 97% rename from media-video/ffmpeg/ffmpeg-0.10.2.bep rename to media-video/ffmpeg/ffmpeg-0.10.2.recipe index 30b0122b7..8016d4281 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.2.bep +++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe @@ -9,7 +9,8 @@ DEPEND="media-libs/libogg >= 1.3.0 media-libs/libtheora >= 1.1.0 media-libs/libvorbis >= 1.3.2 media-libs/libvpx >= 1.0.0" -BUILD { +BUILD() +{ cd ffmpeg-0.10.2 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \ @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ffmpeg-0.10.2 make install } diff --git a/media-video/ffmpeg/ffmpeg-0.10.bep b/media-video/ffmpeg/ffmpeg-0.10.recipe similarity index 97% rename from media-video/ffmpeg/ffmpeg-0.10.bep rename to media-video/ffmpeg/ffmpeg-0.10.recipe index 0df10e0e6..95f5fe931 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.bep +++ b/media-video/ffmpeg/ffmpeg-0.10.recipe @@ -9,14 +9,16 @@ DEPEND="media-libs/libogg >= 1.3.0 media-libs/libtheora >= 1.1.0 media-libs/libvorbis >= 1.3.2 media-libs/libvpx >= 1.0.0" -BUILD { +BUILD() +{ cd ffmpeg-0.10 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx make } -INSTALL { +INSTALL() +{ cd ffmpeg-0.10 make install } diff --git a/media-video/ffmpeg/ffmpeg-0.11.1.bep b/media-video/ffmpeg/ffmpeg-0.11.1.recipe similarity index 97% rename from media-video/ffmpeg/ffmpeg-0.11.1.bep rename to media-video/ffmpeg/ffmpeg-0.11.1.recipe index d1921cc63..5397f247f 100644 --- a/media-video/ffmpeg/ffmpeg-0.11.1.bep +++ b/media-video/ffmpeg/ffmpeg-0.11.1.recipe @@ -9,7 +9,8 @@ DEPEND="media-libs/libogg >= 1.3.0 media-libs/libtheora >= 1.1.0 media-libs/libvorbis >= 1.3.2 media-libs/libvpx >= 1.0.0" -BUILD { +BUILD() +{ cd ffmpeg-0.11.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \ @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ffmpeg-0.11.1 make install } diff --git a/media-video/ffmpeg/ffmpeg-0.5.bep b/media-video/ffmpeg/ffmpeg-0.5.recipe similarity index 95% rename from media-video/ffmpeg/ffmpeg-0.5.bep rename to media-video/ffmpeg/ffmpeg-0.5.recipe index 8cd65dcd9..d06e4376a 100644 --- a/media-video/ffmpeg/ffmpeg-0.5.bep +++ b/media-video/ffmpeg/ffmpeg-0.5.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="be8503f15c3b81ba00eb8379ca8dcf33" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ffmpeg-0.5 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared make } -INSTALL { +INSTALL() +{ cd ffmpeg-0.5 make install } diff --git a/media-video/ffmpeg/ffmpeg-0.6.bep b/media-video/ffmpeg/ffmpeg-0.6.recipe similarity index 96% rename from media-video/ffmpeg/ffmpeg-0.6.bep rename to media-video/ffmpeg/ffmpeg-0.6.recipe index 861154286..a538f342c 100644 --- a/media-video/ffmpeg/ffmpeg-0.6.bep +++ b/media-video/ffmpeg/ffmpeg-0.6.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="d6142a9a5821d6a6262a6edb903faa24" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ffmpeg-0.6 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared make } -INSTALL { +INSTALL() +{ cd ffmpeg-0.6 make install } diff --git a/media-video/ffmpeg/ffmpeg-23081.bep b/media-video/ffmpeg/ffmpeg-23081.recipe similarity index 95% rename from media-video/ffmpeg/ffmpeg-23081.bep rename to media-video/ffmpeg/ffmpeg-23081.recipe index 6a0cbb238..f423a2a47 100644 --- a/media-video/ffmpeg/ffmpeg-23081.bep +++ b/media-video/ffmpeg/ffmpeg-23081.recipe @@ -5,14 +5,16 @@ SRC_URI="svn://svn.ffmpeg.org/ffmpeg/trunk#23081" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ffmpeg-23081 chmod 777 configure ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared --enable-gpl make } -INSTALL { +INSTALL() +{ cd ffmpeg-23081 make install } diff --git a/media-video/ffmpeg/ffmpeg-7407.bep b/media-video/ffmpeg/ffmpeg-7407.recipe similarity index 95% rename from media-video/ffmpeg/ffmpeg-7407.bep rename to media-video/ffmpeg/ffmpeg-7407.recipe index 2f2d3e0d2..832de1171 100644 --- a/media-video/ffmpeg/ffmpeg-7407.bep +++ b/media-video/ffmpeg/ffmpeg-7407.recipe @@ -5,14 +5,16 @@ SRC_URI="svn://svn.ffmpeg.org/ffmpeg/trunk#7407" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd ffmpeg-7407 chmod 777 configure ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared --enable-gpl --enable-pp make } -INSTALL { +INSTALL() +{ cd ffmpeg-7407 make install } diff --git a/media-video/gnash/gnash-0.bep b/media-video/gnash/gnash-0.recipe similarity index 99% rename from media-video/gnash/gnash-0.bep rename to media-video/gnash/gnash-0.recipe index 3c1644d43..f523e4159 100644 --- a/media-video/gnash/gnash-0.bep +++ b/media-video/gnash/gnash-0.recipe @@ -23,7 +23,8 @@ DEPEND="media-video/ffmpeg >= 0.5 # -BUILD { +BUILD() +{ if test ! -e gnash; then bzr branch http://bzr.savannah.gnu.org/r/gnash/trunk/ gnash || true; fi @@ -67,7 +68,8 @@ BUILD { popd } -INSTALL { +INSTALL() +{ cd gnash setgcc gcc4 make install "CXXFLAGS=-I/boot/common/include/boost-1_38/" diff --git a/media-video/handbrake/handbrake-0.9.5.bep b/media-video/handbrake/handbrake-0.9.5.recipe similarity index 98% rename from media-video/handbrake/handbrake-0.9.5.bep rename to media-video/handbrake/handbrake-0.9.5.recipe index ba4f05613..ff4aca03a 100644 --- a/media-video/handbrake/handbrake-0.9.5.bep +++ b/media-video/handbrake/handbrake-0.9.5.recipe @@ -14,7 +14,8 @@ DEPEND="dev-libs/libxml2 >= 2.7.7 media-libs/libass >= 0.9.9 media-libs/dvdread >= 4.1.3" -BUILD { +BUILD() +{ cd HandBrake-0.9.5 cp make/variant/linux.defs make/variant/haiku.defs @@ -35,7 +36,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd HandBrake-0.9.5 make install } diff --git a/media-video/mplayer/mplayer-1.0.bep b/media-video/mplayer/mplayer-1.0.recipe similarity index 97% rename from media-video/mplayer/mplayer-1.0.bep rename to media-video/mplayer/mplayer-1.0.recipe index f36c5081e..7950db12e 100644 --- a/media-video/mplayer/mplayer-1.0.bep +++ b/media-video/mplayer/mplayer-1.0.recipe @@ -16,7 +16,8 @@ DEPEND="pkgconfig >= 0.23 media-libs/libdvdread >= 4.1.3 media-libs/libdvdnav >= 4.1.3" -BUILD { +BUILD() +{ cd mplayer-1.0 cp /boot/common/share/libtool/config/config.* . libtoolize --force --copy --install @@ -28,7 +29,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd mplayer-1.0 make install } diff --git a/media-video/vlc/vlc-0.8.6i.bep b/media-video/vlc/vlc-0.8.6i.recipe similarity index 96% rename from media-video/vlc/vlc-0.8.6i.bep rename to media-video/vlc/vlc-0.8.6i.recipe index 0cc7f3333..8b1e4981e 100644 --- a/media-video/vlc/vlc-0.8.6i.bep +++ b/media-video/vlc/vlc-0.8.6i.recipe @@ -12,14 +12,16 @@ DEPEND="pkgconfig >= 0.23, libmad ffmpeg = 7407" CHECKSUM_MD5="fd852166d1705573cd7768a06117ed51" -BUILD { +BUILD() +{ cd vlc-0.8.6i libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd vlc-0.8.6i make install } diff --git a/media-video/vlc/vlc-1.1.5-20101107.bep b/media-video/vlc/vlc-1.1.5-20101107.recipe similarity index 96% rename from media-video/vlc/vlc-1.1.5-20101107.bep rename to media-video/vlc/vlc-1.1.5-20101107.recipe index 53aca8ef8..f949fcd33 100644 --- a/media-video/vlc/vlc-1.1.5-20101107.bep +++ b/media-video/vlc/vlc-1.1.5-20101107.recipe @@ -16,14 +16,16 @@ DEPEND="pkgconfig >= 0.23 libdca ffmpeg >= 0.6" CHECKSUM_MD5="9ab7d8218ff37e362f996fd7d8879dbc" -BUILD { +BUILD() +{ cd vlc-1.1.5 ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-postproc --disable-xcb --disable-skins2 --disable-qt4 --disable-libgcrypt --disable-remoteosd make } -INSTALL { +INSTALL() +{ cd vlc-1.1.5 make install } diff --git a/media-video/vlc/vlc-2.0.5.bep b/media-video/vlc/vlc-2.0.5.recipe similarity index 97% rename from media-video/vlc/vlc-2.0.5.bep rename to media-video/vlc/vlc-2.0.5.recipe index 8fc3003ea..f8376144c 100644 --- a/media-video/vlc/vlc-2.0.5.bep +++ b/media-video/vlc/vlc-2.0.5.recipe @@ -24,14 +24,16 @@ DEPEND="faad2, libsdl sdl-image" CHECKSUM_MD5="4f959c0766ada8cea5a72c65fce94ebe" -BUILD { +BUILD() +{ cd vlc-2.0.5 bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-kde-solid=no --disable-xcb --enable-run-as-root --enable-static make } -INSTALL { +INSTALL() +{ cd vlc-2.0.5 make install } diff --git a/net-ftp/tnftp/tnftp-20091122.bep b/net-ftp/tnftp/tnftp-20091122.recipe similarity index 96% rename from net-ftp/tnftp/tnftp-20091122.bep rename to net-ftp/tnftp/tnftp-20091122.recipe index 44df64778..548a015ae 100644 --- a/net-ftp/tnftp/tnftp-20091122.bep +++ b/net-ftp/tnftp/tnftp-20091122.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="e7f86e7680648b675ee27c94655de494" -BUILD { +BUILD() +{ cd tnftpd-20091122 libtoolize --force --copy --install aclocal @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tnftpd-20091122 make install } diff --git a/net-irc/irssi/irssi-0.8.15.bep b/net-irc/irssi/irssi-0.8.15.recipe similarity index 96% rename from net-irc/irssi/irssi-0.8.15.bep rename to net-irc/irssi/irssi-0.8.15.recipe index 6399e319a..8018d3fc9 100644 --- a/net-irc/irssi/irssi-0.8.15.bep +++ b/net-irc/irssi/irssi-0.8.15.recipe @@ -9,7 +9,8 @@ DEPEND="sys-devel/gettext >= 0.18.1 dev-util/pkgconfig >= 0.25 dev-libs/glib >= 2.24.2" -BUILD { +BUILD() +{ cd irssi-0.8.15 libtoolize --force --copy --install autoreconf -i @@ -19,7 +20,8 @@ BUILD { } -INSTALL { +INSTALL() +{ cd irssi-0.8.15 make install } diff --git a/net-irc/rhapsody-irc/rhapsody-irc-0.28b.bep b/net-irc/rhapsody-irc/rhapsody-irc-0.28b.recipe similarity index 95% rename from net-irc/rhapsody-irc/rhapsody-irc-0.28b.bep rename to net-irc/rhapsody-irc/rhapsody-irc-0.28b.recipe index 922b8640b..36f23e23e 100644 --- a/net-irc/rhapsody-irc/rhapsody-irc-0.28b.bep +++ b/net-irc/rhapsody-irc/rhapsody-irc-0.28b.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="untested" DEPEND="" CHECKSUM_MD5="0792de636a2625a826491e387fcb1305" -BUILD { +BUILD() +{ cd rhapsody-0.28b ./configure make } -INSTALL { +INSTALL() +{ cd rhapsody-0.28b make install } diff --git a/net-libs/enet/enet-1.2.2.bep b/net-libs/enet/enet-1.2.2.recipe similarity index 94% rename from net-libs/enet/enet-1.2.2.bep rename to net-libs/enet/enet-1.2.2.recipe index 0cca6af8c..cb333e94b 100644 --- a/net-libs/enet/enet-1.2.2.bep +++ b/net-libs/enet/enet-1.2.2.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd enet-1.2.2 libtoolize --force --copy --install autoreconf -i ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd enet-1.2.2 make install } diff --git a/net-libs/enet/enet-1.3.0.bep b/net-libs/enet/enet-1.3.0.recipe similarity index 94% rename from net-libs/enet/enet-1.3.0.bep rename to net-libs/enet/enet-1.3.0.recipe index 6373d6cee..4d50c2c85 100644 --- a/net-libs/enet/enet-1.3.0.bep +++ b/net-libs/enet/enet-1.3.0.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd enet-1.3.0 libtoolize --force --copy --install autoreconf -i ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd enet-1.3.0 make install } diff --git a/net-libs/gnutls/gnutls-2.8.6.bep b/net-libs/gnutls/gnutls-2.8.6.recipe similarity index 97% rename from net-libs/gnutls/gnutls-2.8.6.bep rename to net-libs/gnutls/gnutls-2.8.6.recipe index 274b38205..5555e8d64 100644 --- a/net-libs/gnutls/gnutls-2.8.6.bep +++ b/net-libs/gnutls/gnutls-2.8.6.recipe @@ -10,7 +10,8 @@ LICENSE="GNU LGPL v2.1" COPYRIGHT="2009-2010 Free Software Fundation Inc. 2004-2008 Simon Josefsson 2000-2004 Nikos Mavrogiannopoulos" -BUILD { +BUILD() +{ cd gnutls-2.8.6 libtoolize --force --copy --install autoreconf @@ -25,7 +26,8 @@ BUILD { ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd gnutls-2.8.6 make install } diff --git a/net-libs/hubbub/hubbub-0.1.2-HEAD.bep b/net-libs/hubbub/hubbub-0.1.2-HEAD.recipe similarity index 95% rename from net-libs/hubbub/hubbub-0.1.2-HEAD.bep rename to net-libs/hubbub/hubbub-0.1.2-HEAD.recipe index f39828ea1..32617af60 100644 --- a/net-libs/hubbub/hubbub-0.1.2-HEAD.bep +++ b/net-libs/hubbub/hubbub-0.1.2-HEAD.recipe @@ -6,12 +6,14 @@ STATUS_HAIKU="stable" DEPEND="dev-util/buildsystem >= 0 dev-libs/libparserutils >= 0.1.1" -BUILD { +BUILD() +{ cd hubbub-0.1.2-HEAD make PREFIX=/boot/common } -INSTALL { +INSTALL() +{ cd hubbub-0.1.2-HEAD make install PREFIX=/boot/common } diff --git a/net-libs/hubbub/hubbub-0.1.2.bep b/net-libs/hubbub/hubbub-0.1.2.recipe similarity index 94% rename from net-libs/hubbub/hubbub-0.1.2.bep rename to net-libs/hubbub/hubbub-0.1.2.recipe index 18e4c6314..46bb76916 100644 --- a/net-libs/hubbub/hubbub-0.1.2.bep +++ b/net-libs/hubbub/hubbub-0.1.2.recipe @@ -4,12 +4,14 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/hubbub-0.1.2-src.tar. REVISION="1" STATUS_HAIKU="stable" -BUILD { +BUILD() +{ cd hubbub-0.1.2 make } -INSTALL { +INSTALL() +{ cd hubbub-0.1.2 make install } diff --git a/net-libs/libdom/libdom-0.bep b/net-libs/libdom/libdom-0.recipe similarity index 94% rename from net-libs/libdom/libdom-0.bep rename to net-libs/libdom/libdom-0.recipe index a7992f9d9..c40feeb05 100644 --- a/net-libs/libdom/libdom-0.bep +++ b/net-libs/libdom/libdom-0.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-lib/hubbub >= 0.1.2-HEAD" -BUILD { +BUILD() +{ cd libdom-0 make PREFIX=/boot/common } -INSTALL { +INSTALL() +{ cd libdom-0 make install PREFIX=/boot/common } diff --git a/net-libs/libs3/libs3-2.0.bep b/net-libs/libs3/libs3-2.0.recipe similarity index 95% rename from net-libs/libs3/libs3-2.0.bep rename to net-libs/libs3/libs3-2.0.recipe index 7d2683e9c..b17e948e3 100644 --- a/net-libs/libs3/libs3-2.0.bep +++ b/net-libs/libs3/libs3-2.0.recipe @@ -7,12 +7,14 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/libxml2>=2.7.3 net-misc/curl>=7.18.2" -BUILD { +BUILD() +{ cd libs3-2.0 make DESTDIR=${DESTDIR}/`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd libs3-2.0 make install DESTDIR=${DESTDIR}/`finddir B_COMMON_DIRECTORY` } diff --git a/net-libs/libtorrent/libtorrent-0.12.5.bep b/net-libs/libtorrent/libtorrent-0.12.5.recipe similarity index 96% rename from net-libs/libtorrent/libtorrent-0.12.5.bep rename to net-libs/libtorrent/libtorrent-0.12.5.recipe index cb29cf3cb..fa8156d4b 100644 --- a/net-libs/libtorrent/libtorrent-0.12.5.bep +++ b/net-libs/libtorrent/libtorrent-0.12.5.recipe @@ -10,14 +10,16 @@ DEPEND="dev-util/pkgconfig >= 0.23 dev-libs/openssl >= 0.9.8l libsigc++ >= ??" -BUILD { +BUILD() +{ cd libtorrent-0.12.5 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-mincore make } -INSTALL { +INSTALL() +{ cd libtorrent-0.12.5 make install } diff --git a/net-libs/libyahoo2/libyahoo2-1.0.1.bep b/net-libs/libyahoo2/libyahoo2-1.0.1.recipe similarity index 96% rename from net-libs/libyahoo2/libyahoo2-1.0.1.bep rename to net-libs/libyahoo2/libyahoo2-1.0.1.recipe index 73e0b396a..5ffba2e85 100644 --- a/net-libs/libyahoo2/libyahoo2-1.0.1.bep +++ b/net-libs/libyahoo2/libyahoo2-1.0.1.recipe @@ -4,7 +4,8 @@ SRC_URI="http://sourceforge.net/projects/libyahoo2/files/libyahoo2/1.0.1/libyaho DEPEND="glib >= 1.2.8" REVISION="1" CHECKSUM_MD5="e62dd7bc2dd77622cc0987a4dbf9b38c" -BUILD { +BUILD() +{ cd libyahoo2-1.0.1 libtoolize --force --copy --install aclocal @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libyahoo2-1.0.1 make install } diff --git a/net-misc/axel/axel-2.4.bep b/net-misc/axel/axel-2.4.recipe similarity index 95% rename from net-misc/axel/axel-2.4.bep rename to net-misc/axel/axel-2.4.recipe index f8a7e1722..367d54498 100644 --- a/net-misc/axel/axel-2.4.bep +++ b/net-misc/axel/axel-2.4.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="a2a762fce0c96781965c8f9786a3d09d" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd axel-2.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --i18n=0 make } -INSTALL { +INSTALL() +{ cd axel-2.4 make install DESTDIR="${DESTDIR}" } diff --git a/net-misc/curl/curl-7.18.2.bep b/net-misc/curl/curl-7.18.2.recipe similarity index 95% rename from net-misc/curl/curl-7.18.2.bep rename to net-misc/curl/curl-7.18.2.recipe index 2dfa3a06c..5c903e97f 100644 --- a/net-misc/curl/curl-7.18.2.bep +++ b/net-misc/curl/curl-7.18.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="c389be5b0525276e58865956b7465562" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.18.2 libtoolize --force --copy aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.18.2 make install } diff --git a/net-misc/curl/curl-7.19.1.bep b/net-misc/curl/curl-7.19.1.recipe similarity index 95% rename from net-misc/curl/curl-7.19.1.bep rename to net-misc/curl/curl-7.19.1.recipe index 2aa33457c..5210c9985 100644 --- a/net-misc/curl/curl-7.19.1.bep +++ b/net-misc/curl/curl-7.19.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="6c4921e55ad276154065052c9e34e1cb" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.19.1 libtoolize --force --copy aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.19.1 make install } diff --git a/net-misc/curl/curl-7.19.2.bep b/net-misc/curl/curl-7.19.2.recipe similarity index 95% rename from net-misc/curl/curl-7.19.2.bep rename to net-misc/curl/curl-7.19.2.recipe index a5aec318b..806c637a5 100644 --- a/net-misc/curl/curl-7.19.2.bep +++ b/net-misc/curl/curl-7.19.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="3a461b145a4a31fe7d5a44684e7fbdbc" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.19.2 libtoolize --force --copy aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.19.2 make install } diff --git a/net-misc/curl/curl-7.19.5.bep b/net-misc/curl/curl-7.19.5.recipe similarity index 95% rename from net-misc/curl/curl-7.19.5.bep rename to net-misc/curl/curl-7.19.5.recipe index 00a363fbe..8cda1fcf2 100644 --- a/net-misc/curl/curl-7.19.5.bep +++ b/net-misc/curl/curl-7.19.5.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="426d161661dce70c8ea9ad8f553363a3" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.19.5 libtoolize --force --copy aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.19.5 make install } diff --git a/net-misc/curl/curl-7.19.7.bep b/net-misc/curl/curl-7.19.7.recipe similarity index 95% rename from net-misc/curl/curl-7.19.7.bep rename to net-misc/curl/curl-7.19.7.recipe index 8f1b9aab4..5ef534c41 100644 --- a/net-misc/curl/curl-7.19.7.bep +++ b/net-misc/curl/curl-7.19.7.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="ecb2e37e45c9933e2a963cabe03670ab" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.19.7 cmake -DCMAKE_INSTALL_PREFIX=`finddir B_COMMON_DIRECTORY` -DCURL_DISABLE_LDAP=ON . make } -INSTALL { +INSTALL() +{ cd curl-7.19.7 make install } diff --git a/net-misc/curl/curl-7.20.0.bep b/net-misc/curl/curl-7.20.0.recipe similarity index 95% rename from net-misc/curl/curl-7.20.0.bep rename to net-misc/curl/curl-7.20.0.recipe index 904bc0e74..d65fac283 100644 --- a/net-misc/curl/curl-7.20.0.bep +++ b/net-misc/curl/curl-7.20.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="3dda78c4a808d9a779dc3a2ae81b47d8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.20.0 libtoolize --force --copy --install autoconf @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.20.0 make install } diff --git a/net-misc/curl/curl-7.20.1.bep b/net-misc/curl/curl-7.20.1.recipe similarity index 95% rename from net-misc/curl/curl-7.20.1.bep rename to net-misc/curl/curl-7.20.1.recipe index 56a82aeb8..3042ce4a0 100644 --- a/net-misc/curl/curl-7.20.1.bep +++ b/net-misc/curl/curl-7.20.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="244b16b2a38c70e47130c8494b7371b9" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.20.1 libtoolize --force --copy --install autoconf @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.20.1 make install } diff --git a/net-misc/curl/curl-7.21.1.bep b/net-misc/curl/curl-7.21.1.recipe similarity index 95% rename from net-misc/curl/curl-7.21.1.bep rename to net-misc/curl/curl-7.21.1.recipe index eb7349259..18ef3caf8 100644 --- a/net-misc/curl/curl-7.21.1.bep +++ b/net-misc/curl/curl-7.21.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="eafde5b933bce1c1dca82d1054c8d967" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.21.1 libtoolize --force --copy --install autoconf @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.21.1 make install } diff --git a/net-misc/curl/curl-7.21.2.bep b/net-misc/curl/curl-7.21.2.recipe similarity index 95% rename from net-misc/curl/curl-7.21.2.bep rename to net-misc/curl/curl-7.21.2.recipe index 1a0e915f9..2afa1f2cc 100644 --- a/net-misc/curl/curl-7.21.2.bep +++ b/net-misc/curl/curl-7.21.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="ca96df88e044c7c25d19692ec8b250b2" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.21.2 libtoolize --force --copy --install autoconf @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.21.2 make install } diff --git a/net-misc/curl/curl-7.21.3.bep b/net-misc/curl/curl-7.21.3.recipe similarity index 94% rename from net-misc/curl/curl-7.21.3.bep rename to net-misc/curl/curl-7.21.3.recipe index 8d4c718da..59cc61d4d 100644 --- a/net-misc/curl/curl-7.21.3.bep +++ b/net-misc/curl/curl-7.21.3.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="5b57fee22090b5c43a6886fdd35af2ce" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.21.3 libtoolize --force --copy --install autoconf @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.21.3 make install } -TEST { +TEST() +{ cd curl-7.21.3 make check } diff --git a/net-misc/curl/curl-7.21.4.bep b/net-misc/curl/curl-7.21.4.recipe similarity index 94% rename from net-misc/curl/curl-7.21.4.bep rename to net-misc/curl/curl-7.21.4.recipe index 255a593ed..ea31867da 100644 --- a/net-misc/curl/curl-7.21.4.bep +++ b/net-misc/curl/curl-7.21.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e2dd20c88a7d01c745af9d788545ab2a" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.21.4 libtoolize --force --copy --install autoconf @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.21.4 make install } -TEST { +TEST() +{ cd curl-7.21.4 make check } diff --git a/net-misc/curl/curl-7.21.6.bep b/net-misc/curl/curl-7.21.6.recipe similarity index 94% rename from net-misc/curl/curl-7.21.6.bep rename to net-misc/curl/curl-7.21.6.recipe index 117f23860..85ee980e4 100644 --- a/net-misc/curl/curl-7.21.6.bep +++ b/net-misc/curl/curl-7.21.6.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="6611989a81ebd7b03a35adc3001ddee0" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.21.6 libtoolize --force --copy --install autoconf @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.21.6 make install } -TEST { +TEST() +{ cd curl-7.21.6 make check } diff --git a/net-misc/curl/curl-7.21.7.bep b/net-misc/curl/curl-7.21.7.recipe similarity index 95% rename from net-misc/curl/curl-7.21.7.bep rename to net-misc/curl/curl-7.21.7.recipe index a06380a11..c3b091d38 100644 --- a/net-misc/curl/curl-7.21.7.bep +++ b/net-misc/curl/curl-7.21.7.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="5f6d50c4d4ee38c57fe37e3cff75adbd" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.21.7 libtoolize --force --copy --install autoconf @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.21.7 make install } -TEST { +TEST() +{ cd curl-7.21.7 make check } diff --git a/net-misc/curl/curl-7.22.0.bep b/net-misc/curl/curl-7.22.0.recipe similarity index 95% rename from net-misc/curl/curl-7.22.0.bep rename to net-misc/curl/curl-7.22.0.recipe index 50d927213..ad9fd6a90 100644 --- a/net-misc/curl/curl-7.22.0.bep +++ b/net-misc/curl/curl-7.22.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="bdb5c226d37c4a6082c70e7ef6f63060" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.22.0 libtoolize --force --copy --install autoconf @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.22.0 make install } -TEST { +TEST() +{ cd curl-7.22.0 make check } diff --git a/net-misc/curl/curl-7.24.0.bep b/net-misc/curl/curl-7.24.0.recipe similarity index 95% rename from net-misc/curl/curl-7.24.0.bep rename to net-misc/curl/curl-7.24.0.recipe index 2510ae640..2c8816086 100644 --- a/net-misc/curl/curl-7.24.0.bep +++ b/net-misc/curl/curl-7.24.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="f912221d75eb8d8fe08900eaf011b023" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.24.0 libtoolize --force --copy --install autoconf @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.24.0 make install } -TEST { +TEST() +{ cd curl-7.24.0 make check } diff --git a/net-misc/curl/curl-7.25.0.bep b/net-misc/curl/curl-7.25.0.recipe similarity index 95% rename from net-misc/curl/curl-7.25.0.bep rename to net-misc/curl/curl-7.25.0.recipe index 63d578dd4..f613065c8 100644 --- a/net-misc/curl/curl-7.25.0.bep +++ b/net-misc/curl/curl-7.25.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="f0303d47d9d3e6e4f08c2863c6504823" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.25.0 libtoolize --force --copy --install autoconf @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.25.0 make install } -TEST { +TEST() +{ cd curl-7.25.0 make check } diff --git a/net-misc/curl/curl-7.26.0.bep b/net-misc/curl/curl-7.26.0.recipe similarity index 95% rename from net-misc/curl/curl-7.26.0.bep rename to net-misc/curl/curl-7.26.0.recipe index 6159dc157..1e3eac980 100644 --- a/net-misc/curl/curl-7.26.0.bep +++ b/net-misc/curl/curl-7.26.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="bfa80f01b3d300359cfb4d409b6136a3" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.26.0 libtoolize --force --copy --install autoconf @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.26.0 make install } -TEST { +TEST() +{ cd curl-7.26.0 make check } diff --git a/net-misc/curl/curl-7.28.1.bep b/net-misc/curl/curl-7.28.1.recipe similarity index 95% rename from net-misc/curl/curl-7.28.1.bep rename to net-misc/curl/curl-7.28.1.recipe index db5cc8c17..4edbc9429 100644 --- a/net-misc/curl/curl-7.28.1.bep +++ b/net-misc/curl/curl-7.28.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="26eb081c999b0e203770869427e9a93d" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd curl-7.28.1 libtoolize --force --copy --install autoconf @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd curl-7.28.1 make install } -TEST { +TEST() +{ cd curl-7.28.1 make check } diff --git a/net-misc/mediatomb/mediatomb-0.12.1.bep b/net-misc/mediatomb/mediatomb-0.12.1.recipe similarity index 97% rename from net-misc/mediatomb/mediatomb-0.12.1.bep rename to net-misc/mediatomb/mediatomb-0.12.1.recipe index 4fcad94e2..2d39714bb 100644 --- a/net-misc/mediatomb/mediatomb-0.12.1.bep +++ b/net-misc/mediatomb/mediatomb-0.12.1.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." CHECKSUM_MD5="e927dd5dc52d3cfcebd8ca1af6f0d3c2" -BUILD { +BUILD() +{ cd mediatomb-0.12.1 libtoolize --force --copy --install aclocal @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd mediatomb-0.12.1 make install } diff --git a/net-misc/minidlna/minidlna-1.0.21.bep b/net-misc/minidlna/minidlna-1.0.21.recipe similarity index 97% rename from net-misc/minidlna/minidlna-1.0.21.bep rename to net-misc/minidlna/minidlna-1.0.21.recipe index 03bf74f5f..8839d9911 100644 --- a/net-misc/minidlna/minidlna-1.0.21.bep +++ b/net-misc/minidlna/minidlna-1.0.21.recipe @@ -12,12 +12,14 @@ DEPEND="dev-db/sqlite >= 3.0 media-lib/libid3tag >= 0.15.1b" CHECKSUM_MD5="a53e0008ad225843a1782e4af6e5bf0b" -BUILD { +BUILD() +{ cd minidlna-1.0.21 make } -INSTALL { +INSTALL() +{ cd minidlna-1.0.21 make install } diff --git a/net-misc/neon/neon-0.29.1.bep b/net-misc/neon/neon-0.29.1.recipe similarity index 96% rename from net-misc/neon/neon-0.29.1.bep rename to net-misc/neon/neon-0.29.1.recipe index 1736b67db..950c45d2c 100644 --- a/net-misc/neon/neon-0.29.1.bep +++ b/net-misc/neon/neon-0.29.1.recipe @@ -6,14 +6,16 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 0.9.8l dev-libs/libxml2 >= 2.7.3" CHECKSUM_MD5="eb4eac0499cb6fced6e3b11e4b720ebb" -BUILD { +BUILD() +{ cd neon-0.29.1 autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared make } -INSTALL { +INSTALL() +{ cd neon-0.29.1 make install } diff --git a/net-misc/neon/neon-0.29.3.bep b/net-misc/neon/neon-0.29.3.recipe similarity index 96% rename from net-misc/neon/neon-0.29.3.bep rename to net-misc/neon/neon-0.29.3.recipe index 074fcef9e..b3c3da7a5 100644 --- a/net-misc/neon/neon-0.29.3.bep +++ b/net-misc/neon/neon-0.29.3.recipe @@ -6,14 +6,16 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libxml2 >= 2.7.7" CHECKSUM_MD5="ba1015b59c112d44d7797b62fe7bee51" -BUILD { +BUILD() +{ cd neon-0.29.3 autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared make } -INSTALL { +INSTALL() +{ cd neon-0.29.3 make install } diff --git a/net-misc/neon/neon-0.29.4.bep b/net-misc/neon/neon-0.29.4.recipe similarity index 96% rename from net-misc/neon/neon-0.29.4.bep rename to net-misc/neon/neon-0.29.4.recipe index 8634d568f..dd059582c 100644 --- a/net-misc/neon/neon-0.29.4.bep +++ b/net-misc/neon/neon-0.29.4.recipe @@ -6,14 +6,16 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libxml2 >= 2.7.7" CHECKSUM_MD5="29438dbdaee84db2d7fbc73248a92d93" -BUILD { +BUILD() +{ cd neon-0.29.4 autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl --with-libxml2 --enable-shared make } -INSTALL { +INSTALL() +{ cd neon-0.29.4 make install } diff --git a/net-misc/neon/neon-0.29.5.bep b/net-misc/neon/neon-0.29.5.recipe similarity index 97% rename from net-misc/neon/neon-0.29.5.bep rename to net-misc/neon/neon-0.29.5.recipe index 89d0f5957..1cd36b5e1 100644 --- a/net-misc/neon/neon-0.29.5.bep +++ b/net-misc/neon/neon-0.29.5.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libxml2 >= 2.7.7" CHECKSUM_MD5="ff369e69ef0f0143beb5626164e87ae2" -BUILD { +BUILD() +{ cd neon-0.29.5 echo 'LT_INIT' >> configure.in. echo 'AC_CONFIG_MACRO_DIR([macros])' >> configure.in @@ -28,7 +29,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd neon-0.29.5 make install } diff --git a/net-misc/neon/neon-0.29.6.bep b/net-misc/neon/neon-0.29.6.recipe similarity index 97% rename from net-misc/neon/neon-0.29.6.bep rename to net-misc/neon/neon-0.29.6.recipe index 53911385f..a51d30e38 100644 --- a/net-misc/neon/neon-0.29.6.bep +++ b/net-misc/neon/neon-0.29.6.recipe @@ -20,7 +20,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ echo 'LT_INIT' >> configure.in echo 'AC_CONFIG_MACRO_DIR([macros])' >> configure.in ./autogen.sh @@ -39,7 +40,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ make install } diff --git a/net-misc/ntp/ntp-4.2.6p2.bep b/net-misc/ntp/ntp-4.2.6p2.recipe similarity index 96% rename from net-misc/ntp/ntp-4.2.6p2.bep rename to net-misc/ntp/ntp-4.2.6p2.recipe index a49f06770..b35017e6c 100644 --- a/net-misc/ntp/ntp-4.2.6p2.bep +++ b/net-misc/ntp/ntp-4.2.6p2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="cf73cd85f248232c62f8029e6eb05938" -BUILD { +BUILD() +{ cd ntp-4.2.6p2 libtoolize --force --copy --install ./bootstrap @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ntp-4.2.6p2 make install } diff --git a/net-misc/openssh/openssh-5.4p1.bep b/net-misc/openssh/openssh-5.4p1.recipe similarity index 98% rename from net-misc/openssh/openssh-5.4p1.bep rename to net-misc/openssh/openssh-5.4p1.recipe index 50854a365..7aa9d7b30 100644 --- a/net-misc/openssh/openssh-5.4p1.bep +++ b/net-misc/openssh/openssh-5.4p1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 0.9.8l" CHECKSUM_MD5="da10af8a789fa2e83e3635f3a1b76f5e" -BUILD { +BUILD() +{ cp ../patches/pathnames-haiku.h openssh-5.4p1/pathnames.h cd openssh-5.4p1 mkdir -p m4 @@ -29,7 +30,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssh-5.4p1 make install DESTDIR="${DESTDIR}" mkdir -p ${DESTDIR}/boot/common/boot/post_install diff --git a/net-misc/openssh/openssh-5.5p1.bep b/net-misc/openssh/openssh-5.5p1.recipe similarity index 98% rename from net-misc/openssh/openssh-5.5p1.bep rename to net-misc/openssh/openssh-5.5p1.recipe index c07b09b58..67445c6f8 100644 --- a/net-misc/openssh/openssh-5.5p1.bep +++ b/net-misc/openssh/openssh-5.5p1.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libedit >= 20090923" CHECKSUM_MD5="88633408f4cb1eb11ec7e2ec58b519eb" -BUILD { +BUILD() +{ cd openssh-5.5p1 autoconf mkdir -p m4 @@ -32,7 +33,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssh-5.5p1 make install DESTDIR="${DESTDIR}" mkdir -p ${DESTDIR}/boot/common/boot/post_install diff --git a/net-misc/openssh/openssh-5.6p1.bep b/net-misc/openssh/openssh-5.6p1.recipe similarity index 97% rename from net-misc/openssh/openssh-5.6p1.bep rename to net-misc/openssh/openssh-5.6p1.recipe index e2691ddfe..bbcdc33f3 100644 --- a/net-misc/openssh/openssh-5.6p1.bep +++ b/net-misc/openssh/openssh-5.6p1.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libedit >= 20090923" CHECKSUM_MD5="e6ee52e47c768bf0ec42a232b5d18fb0" -BUILD { +BUILD() +{ cd openssh-5.6p1 autoconf mkdir -p m4 @@ -32,14 +33,16 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssh-5.6p1 make install DESTDIR="${DESTDIR}" mkdir -p ${DESTDIR}/boot/common/boot/post_install cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install } -TEST { +TEST() +{ cd openssh-5.6p1 make tests } diff --git a/net-misc/openssh/openssh-5.7p1.bep b/net-misc/openssh/openssh-5.7p1.recipe similarity index 97% rename from net-misc/openssh/openssh-5.7p1.bep rename to net-misc/openssh/openssh-5.7p1.recipe index 6763b784f..314979133 100644 --- a/net-misc/openssh/openssh-5.7p1.bep +++ b/net-misc/openssh/openssh-5.7p1.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libedit >= 20090923" CHECKSUM_MD5="50231fa257219791fa41b84a16c9df04" -BUILD { +BUILD() +{ cd openssh-5.7p1 autoconf mkdir -p m4 @@ -33,14 +34,16 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssh-5.7p1 make install DESTDIR="${DESTDIR}" mkdir -p ${DESTDIR}/boot/common/boot/post_install cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install } -TEST { +TEST() +{ cd openssh-5.7p1 make tests } diff --git a/net-misc/openssh/openssh-5.8p1.bep b/net-misc/openssh/openssh-5.8p1.recipe similarity index 97% rename from net-misc/openssh/openssh-5.8p1.bep rename to net-misc/openssh/openssh-5.8p1.recipe index 07b4d6461..bb0142c14 100644 --- a/net-misc/openssh/openssh-5.8p1.bep +++ b/net-misc/openssh/openssh-5.8p1.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libedit >= 20090923" CHECKSUM_MD5="86f5e1c23b4c4845f23b9b7b493fb53d" -BUILD { +BUILD() +{ cd openssh-5.8p1 autoconf mkdir -p m4 @@ -34,14 +35,16 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssh-5.8p1 make install DESTDIR="${DESTDIR}" mkdir -p ${DESTDIR}/boot/common/boot/post_install cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install } -TEST { +TEST() +{ cd openssh-5.8p1 make tests } diff --git a/net-misc/openssh/openssh-5.8p2.bep b/net-misc/openssh/openssh-5.8p2.recipe similarity index 97% rename from net-misc/openssh/openssh-5.8p2.bep rename to net-misc/openssh/openssh-5.8p2.recipe index d5d99c515..5fd558387 100644 --- a/net-misc/openssh/openssh-5.8p2.bep +++ b/net-misc/openssh/openssh-5.8p2.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libedit >= 20090923" CHECKSUM_MD5="0541579adf9d55abb15ef927048d372e" -BUILD { +BUILD() +{ cd openssh-5.8p2 autoconf mkdir -p m4 @@ -36,14 +37,16 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssh-5.8p2 make install DESTDIR="${DESTDIR}" mkdir -p ${DESTDIR}/boot/common/boot/post_install cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install } -TEST { +TEST() +{ cd openssh-5.8p2 make tests } diff --git a/net-misc/openssh/openssh-5.9p1.bep b/net-misc/openssh/openssh-5.9p1.recipe similarity index 97% rename from net-misc/openssh/openssh-5.9p1.bep rename to net-misc/openssh/openssh-5.9p1.recipe index b99bf3fd4..d37389f50 100644 --- a/net-misc/openssh/openssh-5.9p1.bep +++ b/net-misc/openssh/openssh-5.9p1.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libedit >= 20090923" CHECKSUM_MD5="afe17eee7e98d3b8550cc349834a85d0" -BUILD { +BUILD() +{ cd openssh-5.9p1 autoconf mkdir -p m4 @@ -36,14 +37,16 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssh-5.9p1 make install DESTDIR="${DESTDIR}" mkdir -p ${DESTDIR}/boot/common/boot/post_install cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install } -TEST { +TEST() +{ cd openssh-5.9p1 make tests } diff --git a/net-misc/openssh/openssh-6.0p1.bep b/net-misc/openssh/openssh-6.0p1.recipe similarity index 97% rename from net-misc/openssh/openssh-6.0p1.bep rename to net-misc/openssh/openssh-6.0p1.recipe index dfc6c758d..2781d3495 100644 --- a/net-misc/openssh/openssh-6.0p1.bep +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libedit >= 20090923" CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b" -BUILD { +BUILD() +{ cd openssh-6.0p1 autoconf mkdir -p m4 @@ -35,14 +36,16 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssh-6.0p1 make install DESTDIR="${DESTDIR}" mkdir -p ${DESTDIR}/boot/common/boot/post_install cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install } -TEST { +TEST() +{ cd openssh make tests } diff --git a/net-misc/openssh/openssh-6.1p1.bep b/net-misc/openssh/openssh-6.1p1.recipe similarity index 97% rename from net-misc/openssh/openssh-6.1p1.bep rename to net-misc/openssh/openssh-6.1p1.recipe index 774fd80b5..42e495aa7 100644 --- a/net-misc/openssh/openssh-6.1p1.bep +++ b/net-misc/openssh/openssh-6.1p1.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libedit >= 20090923" CHECKSUM_MD5="3345cbf4efe90ffb06a78670ab2d05d5" -BUILD { +BUILD() +{ cd openssh-6.1p1 autoconf mkdir -p m4 @@ -35,14 +36,16 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssh-6.1p1 make install DESTDIR="${DESTDIR}" mkdir -p ${DESTDIR}/boot/common/boot/post_install cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install } -TEST { +TEST() +{ cd openssh-6.1p1 make tests diff --git a/net-misc/openssh/openssh-6.2p1.bep b/net-misc/openssh/openssh-6.2p1.recipe similarity index 97% rename from net-misc/openssh/openssh-6.2p1.bep rename to net-misc/openssh/openssh-6.2p1.recipe index 478b6ea04..6ae4454c7 100644 --- a/net-misc/openssh/openssh-6.2p1.bep +++ b/net-misc/openssh/openssh-6.2p1.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 1.0.0 dev-libs/libedit >= 20090923" CHECKSUM_MD5="7b2d9dd75b5cf267ea1737ec75500316" -BUILD { +BUILD() +{ cd openssh-6.2p1 # sed -i 's/"\$(PRIVSEP_PATH)\\" \\/\"$(PRIVSEP_PATH)\"/g' #Makefile.in @@ -37,14 +38,16 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd openssh-6.2p1 make install DESTDIR="${DESTDIR}" mkdir -p ${DESTDIR}/boot/common/boot/post_install cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install } -TEST { +TEST() +{ cd openssh-6.2p1 make tests } diff --git a/net-misc/putty/putty-0.60.bep b/net-misc/putty/putty-0.60.recipe similarity index 95% rename from net-misc/putty/putty-0.60.bep rename to net-misc/putty/putty-0.60.recipe index b3d5378bd..560513fb6 100644 --- a/net-misc/putty/putty-0.60.bep +++ b/net-misc/putty/putty-0.60.recipe @@ -5,14 +5,16 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="07e65fd98b16d115ae38a180bfb242e2" -BUILD { +BUILD() +{ cd putty-0.60/unix autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` make all-cli } -INSTALL { +INSTALL() +{ cd putty-0.60/unix make install } diff --git a/net-misc/rsync/rsync-3.0.6.bep b/net-misc/rsync/rsync-3.0.6.recipe similarity index 96% rename from net-misc/rsync/rsync-3.0.6.bep rename to net-misc/rsync/rsync-3.0.6.recipe index 05957249e..a6f65b494 100644 --- a/net-misc/rsync/rsync-3.0.6.bep +++ b/net-misc/rsync/rsync-3.0.6.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e9865d093a18e4668b9d31b635dc8e99" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd rsync-3.0.6 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-ipv6 --disable-locale --disable-debug @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd rsync-3.0.6 make install make test diff --git a/net-misc/rsync/rsync-3.0.7.bep b/net-misc/rsync/rsync-3.0.7.recipe similarity index 95% rename from net-misc/rsync/rsync-3.0.7.bep rename to net-misc/rsync/rsync-3.0.7.recipe index 8870b43cc..f41741b4c 100644 --- a/net-misc/rsync/rsync-3.0.7.bep +++ b/net-misc/rsync/rsync-3.0.7.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="b53525900817cf1ba7ad3a516ab5bfe9" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd rsync-3.0.7 libtoolize --force --copy --install aclocal @@ -21,12 +22,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd rsync-3.0.7 make install } -TEST { +TEST() +{ cd rsync-3.0.7 make test } diff --git a/net-misc/tor/tor-0.2.2.35.bep b/net-misc/tor/tor-0.2.2.35.recipe similarity index 94% rename from net-misc/tor/tor-0.2.2.35.bep rename to net-misc/tor/tor-0.2.2.35.recipe index d55bb8c24..25429e380 100644 --- a/net-misc/tor/tor-0.2.2.35.bep +++ b/net-misc/tor/tor-0.2.2.35.recipe @@ -6,19 +6,22 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/openssl >= 0.9.8 dev-libs/libevent >= 2.0.10" CHECKSUM_MD5="dcecf699c4b929319d5f1ce0358d4835" -BUILD { +BUILD() +{ cd tor-0.2.2.35 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd tor-0.2.2.35 make install } -TEST { +TEST() +{ cd tor-0.2.2.35 make test } diff --git a/net-misc/tor/tor-0.2.3.25.bep b/net-misc/tor/tor-0.2.3.25.recipe similarity index 96% rename from net-misc/tor/tor-0.2.3.25.bep rename to net-misc/tor/tor-0.2.3.25.recipe index e94e06d86..5ad986a9d 100644 --- a/net-misc/tor/tor-0.2.3.25.bep +++ b/net-misc/tor/tor-0.2.3.25.recipe @@ -7,7 +7,8 @@ DEPEND="dev-libs/openssl >= 0.9.8 dev-libs/libevent >= 2.0.10" CHECKSUM_MD5="a1c364189a9a66ed9daa8e6436489daf" -BUILD { +BUILD() +{ cd tor-0.2.3.25 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd tor-0.2.3.25 make install } -TEST { +TEST() +{ cd tor-0.2.3.25 make test } diff --git a/net-misc/wget/wget-1.12.bep b/net-misc/wget/wget-1.12.recipe similarity index 95% rename from net-misc/wget/wget-1.12.bep rename to net-misc/wget/wget-1.12.recipe index 8954800d9..88030be1d 100644 --- a/net-misc/wget/wget-1.12.bep +++ b/net-misc/wget/wget-1.12.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="141461b9c04e454dc8933c9d1f2abf83" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd wget-1.12 libtoolize --force --copy --install aclocal -I m4 @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd wget-1.12 make install } diff --git a/net-misc/wget/wget-1.13.4.bep b/net-misc/wget/wget-1.13.4.recipe similarity index 94% rename from net-misc/wget/wget-1.13.4.bep rename to net-misc/wget/wget-1.13.4.recipe index 673ebc9ea..8b3a0e2f3 100644 --- a/net-misc/wget/wget-1.13.4.bep +++ b/net-misc/wget/wget-1.13.4.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="1df489976a118b9cbe1b03502adbfc27" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd wget-1.13.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-ssl=openssl make } -INSTALL { +INSTALL() +{ cd wget-1.13.4 make install } diff --git a/net-misc/wput/wput-0.6.1.bep b/net-misc/wput/wput-0.6.1.recipe similarity index 96% rename from net-misc/wput/wput-0.6.1.bep rename to net-misc/wput/wput-0.6.1.recipe index 063e55f5b..0d1884ebf 100644 --- a/net-misc/wput/wput-0.6.1.bep +++ b/net-misc/wput/wput-0.6.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="92b41efed4db8eb4f3443c23bf7ceecf" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd wput-0.6.1 echo 'LT_INIT' >> configure.in echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd wput-0.6.1 make install } diff --git a/net-p2p/rtorrent/rtorrent-0.8.5.bep b/net-p2p/rtorrent/rtorrent-0.8.5.recipe similarity index 96% rename from net-p2p/rtorrent/rtorrent-0.8.5.bep rename to net-p2p/rtorrent/rtorrent-0.8.5.recipe index b5f3f8eee..60b24ccb1 100644 --- a/net-p2p/rtorrent/rtorrent-0.8.5.bep +++ b/net-p2p/rtorrent/rtorrent-0.8.5.recipe @@ -11,14 +11,16 @@ DEPEND="pkgconfig >= 0.23 libsigc++ >= ?? net-libs/libtorrent >= 0.12.5" -BUILD { +BUILD() +{ cd rtorrent-0.8.5 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd rtorrent-0.8.5 make install } diff --git a/net-p2p/seeks/seeks-0.x-git.bep b/net-p2p/seeks/seeks-0.x-git.recipe similarity index 96% rename from net-p2p/seeks/seeks-0.x-git.bep rename to net-p2p/seeks/seeks-0.x-git.recipe index 0b074c7a6..71ce8179b 100644 --- a/net-p2p/seeks/seeks-0.x-git.bep +++ b/net-p2p/seeks/seeks-0.x-git.recipe @@ -8,14 +8,16 @@ STATUS_HAIKU="untested" # pkgconfig is only a build dependency DEPEND="pkgconfig >= 0.25" -BUILD { +BUILD() +{ cd seeks-0.x-git ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd seeks-0.x-git make install } diff --git a/net-p2p/transmission/transmission-1.72.bep b/net-p2p/transmission/transmission-1.72.recipe similarity index 96% rename from net-p2p/transmission/transmission-1.72.bep rename to net-p2p/transmission/transmission-1.72.recipe index 7bad2285c..09e7cdb9c 100644 --- a/net-p2p/transmission/transmission-1.72.bep +++ b/net-p2p/transmission/transmission-1.72.recipe @@ -10,14 +10,16 @@ DEPEND="dev-util/pkgconfig >= 0.23 net-misc/curl >= 7.20.1 dev-libs/libevent >= 1.4.11" -BUILD { +BUILD() +{ cd transmission-1.72 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd transmission-1.72 make install } diff --git a/net-p2p/transmission/transmission-1.73.bep b/net-p2p/transmission/transmission-1.73.recipe similarity index 96% rename from net-p2p/transmission/transmission-1.73.bep rename to net-p2p/transmission/transmission-1.73.recipe index 1b0aef828..a52a5c4ff 100644 --- a/net-p2p/transmission/transmission-1.73.bep +++ b/net-p2p/transmission/transmission-1.73.recipe @@ -10,14 +10,16 @@ DEPEND="dev-util/pkgconfig >= 0.23 net-misc/curl >= 7.20.1 dev-libs/libevent >= 1.4.11" -BUILD { +BUILD() +{ cd transmission-1.73 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd transmission-1.73 make install } diff --git a/net-p2p/transmission/transmission-1.93.bep b/net-p2p/transmission/transmission-1.93.recipe similarity index 97% rename from net-p2p/transmission/transmission-1.93.bep rename to net-p2p/transmission/transmission-1.93.recipe index 1c00284ba..edda11292 100644 --- a/net-p2p/transmission/transmission-1.93.bep +++ b/net-p2p/transmission/transmission-1.93.recipe @@ -12,14 +12,16 @@ DEPEND="dev-util/pkgconfig >= 0.23 net-misc/curl >= 7.20.1 dev-libs/libevent >= 1.4.11" -BUILD { +BUILD() +{ cd transmission-1.93 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd transmission-1.93 make install } diff --git a/net-p2p/transmission/transmission-2.01.bep b/net-p2p/transmission/transmission-2.01.recipe similarity index 97% rename from net-p2p/transmission/transmission-2.01.bep rename to net-p2p/transmission/transmission-2.01.recipe index 432836baf..51c142d8e 100644 --- a/net-p2p/transmission/transmission-2.01.bep +++ b/net-p2p/transmission/transmission-2.01.recipe @@ -12,14 +12,16 @@ DEPEND="dev-util/pkgconfig >= 0.23 net-misc/curl >= 7.20.1 dev-libs/libevent >= 1.4.11" -BUILD { +BUILD() +{ cd transmission-2.01 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd transmission-2.01 make install } diff --git a/net-p2p/transmission/transmission-2.12.bep b/net-p2p/transmission/transmission-2.12.recipe similarity index 97% rename from net-p2p/transmission/transmission-2.12.bep rename to net-p2p/transmission/transmission-2.12.recipe index 125121a95..46c99ffde 100644 --- a/net-p2p/transmission/transmission-2.12.bep +++ b/net-p2p/transmission/transmission-2.12.recipe @@ -12,14 +12,16 @@ DEPEND="dev-util/pkgconfig >= 0.23 net-misc/curl >= 7.20.1 dev-libs/libevent >= 1.4.11" -BUILD { +BUILD() +{ cd transmission-2.12 autoreconf -vfi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd transmission-2.12 make install } diff --git a/net-p2p/transmission/transmission-2.21.bep b/net-p2p/transmission/transmission-2.21.recipe similarity index 97% rename from net-p2p/transmission/transmission-2.21.bep rename to net-p2p/transmission/transmission-2.21.recipe index 5609c0d99..20c92b794 100644 --- a/net-p2p/transmission/transmission-2.21.bep +++ b/net-p2p/transmission/transmission-2.21.recipe @@ -11,7 +11,8 @@ DEPEND="dev-util/pkgconfig >= 0.23 net-misc/curl >= 7.20.1 dev-libs/libevent >= 2.0.10" -BUILD { +BUILD() +{ cd transmission-2.21 autoreconf -vfi @@ -26,7 +27,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd transmission-2.21 make install } diff --git a/net-p2p/transmission/transmission-2.73.bep b/net-p2p/transmission/transmission-2.73.recipe similarity index 97% rename from net-p2p/transmission/transmission-2.73.bep rename to net-p2p/transmission/transmission-2.73.recipe index 6033b9893..5170abbcb 100644 --- a/net-p2p/transmission/transmission-2.73.bep +++ b/net-p2p/transmission/transmission-2.73.recipe @@ -13,7 +13,8 @@ DEPEND="dev-util/pkgconfig >= 0.23 dev-libs/libevent >= 2.0.10 dev-libs/openssl >= 0.9.8" -BUILD { +BUILD() +{ cd transmission-2.73 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -24,7 +25,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd transmission-2.73 make install } diff --git a/net-p2p/transmission/transmission-2.75.bep b/net-p2p/transmission/transmission-2.75.recipe similarity index 97% rename from net-p2p/transmission/transmission-2.75.bep rename to net-p2p/transmission/transmission-2.75.recipe index 7252e2e99..047f0d56e 100644 --- a/net-p2p/transmission/transmission-2.75.bep +++ b/net-p2p/transmission/transmission-2.75.recipe @@ -13,7 +13,8 @@ DEPEND="dev-util/pkgconfig >= 0.23 dev-libs/libevent >= 2.0.10 dev-libs/openssl >= 0.9.8" -BUILD { +BUILD() +{ cd transmission-2.75 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -24,7 +25,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd transmission-2.75 make install } diff --git a/net-proxy/privoxy/privoxy-3.0.19.bep b/net-proxy/privoxy/privoxy-3.0.19.recipe similarity index 97% rename from net-proxy/privoxy/privoxy-3.0.19.bep rename to net-proxy/privoxy/privoxy-3.0.19.recipe index d7dc1ebac..c862b36a9 100644 --- a/net-proxy/privoxy/privoxy-3.0.19.bep +++ b/net-proxy/privoxy/privoxy-3.0.19.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="57acc79059565cc42eda67982842785d" -BUILD { +BUILD() +{ cd privoxy-3.0.19-stable autoheader autoconf @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd privoxy-3.0.19-stable make install } diff --git a/net-wireless/b43-fwcutter/b43-fwcutter-012.bep b/net-wireless/b43-fwcutter/b43-fwcutter-012.recipe similarity index 97% rename from net-wireless/b43-fwcutter/b43-fwcutter-012.bep rename to net-wireless/b43-fwcutter/b43-fwcutter-012.recipe index 3f5bf8b68..43d1a74d7 100644 --- a/net-wireless/b43-fwcutter/b43-fwcutter-012.bep +++ b/net-wireless/b43-fwcutter/b43-fwcutter-012.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="69eadf67b459f313a8d6b37aaabef96c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd b43-fwcutter-012 wget http://cgit.haiku-os.org/haiku/plain/src/system/libroot/posix/glibc/string/byteswap.h mkdir bits @@ -13,7 +14,8 @@ BUILD { make PREFIX=`finddir B_COMMON_DIRECTORY` CFLAGS="-I. -Wall -D_BSD_SOURCE" } -INSTALL { +INSTALL() +{ cd b43-fwcutter-012 make PREFIX=$DESTDIR/`finddir B_COMMON_DIRECTORY` install } diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.bep b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe similarity index 96% rename from net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.bep rename to net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe index ac9dcb041..6374d8267 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.bep +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe @@ -5,11 +5,13 @@ CHECKSUM_MD5="f516f191384a9a546e3f5145c08addda" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd wpa_supplicant-0.7.3/wpa_supplicant CFLAGS="-MMD -O2 -Wall" make wpa_supplicant } -INSTALL { +INSTALL() +{ cd wpa_supplicant-0.7.3/wpa_supplicant mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` cp -v wpa_supplicant ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/ diff --git a/packs/libpak/libpak-0.9.1.bep b/packs/libpak/libpak-0.9.1.recipe similarity index 99% rename from packs/libpak/libpak-0.9.1.bep rename to packs/libpak/libpak-0.9.1.recipe index a71ef6ef9..d78b19c27 100644 --- a/packs/libpak/libpak-0.9.1.bep +++ b/packs/libpak/libpak-0.9.1.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/mercurial >= 1.6 dev-libs/libedit >= 20100424" CHECKSUM_MD5="16c697819a60958a4aaaef772a46c726" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` cd libpak-0.9.1 @@ -99,7 +100,8 @@ BUILD { ## mv ${HPLOC}/media-libs/fblend/*.zip . } -INSTALL { +INSTALL() +{ cd libpak-0.9.1 mkdir -p ${DESTDIR}/boot echo "" > ${DESTDIR}/boot/.opd diff --git a/packs/libpak/libpak-0.9.2.bep b/packs/libpak/libpak-0.9.2.recipe similarity index 99% rename from packs/libpak/libpak-0.9.2.bep rename to packs/libpak/libpak-0.9.2.recipe index 7e58d2d67..7f012e8c9 100644 --- a/packs/libpak/libpak-0.9.2.bep +++ b/packs/libpak/libpak-0.9.2.recipe @@ -7,7 +7,8 @@ DEPEND="dev-vcs/mercurial >= 1.6 dev-vcs/git >= 1.7.1 dev-libs/libedit >= 20100424" CHECKSUM_MD5="7c42abb8d837ead79bf64e3c276b1170" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` cd libpak-0.9.2 @@ -103,7 +104,8 @@ BUILD { ## mv ${HPLOC}/media-libs/fblend/*.zip . } -INSTALL { +INSTALL() +{ cd libpak-0.9.2 mkdir -p ${DESTDIR}/boot echo "" > ${DESTDIR}/boot/.opd diff --git a/packs/libpak/libpak-0.9.3.bep b/packs/libpak/libpak-0.9.3.recipe similarity index 99% rename from packs/libpak/libpak-0.9.3.bep rename to packs/libpak/libpak-0.9.3.recipe index 34378d9db..03778310c 100644 --- a/packs/libpak/libpak-0.9.3.bep +++ b/packs/libpak/libpak-0.9.3.recipe @@ -11,7 +11,8 @@ DEPEND="dev-libs/libedit >= 20100424 sys-devel/gettext >= 0.17" CHECKSUM_MD5="f183eb4b0b6ac2282a9f1c7fd41ac282" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` cd libpak-0.9.3 @@ -147,7 +148,8 @@ BUILD { ## mv ${HPLOC}/media-libs/fblend/*.zip . } -INSTALL { +INSTALL() +{ cd libpak-0.9.3 mkdir -p ${DESTDIR}/boot echo "" > ${DESTDIR}/boot/.opd diff --git a/packs/libpak/libpak-0.9.4-gcc2.bep b/packs/libpak/libpak-0.9.4-gcc2.recipe similarity index 99% rename from packs/libpak/libpak-0.9.4-gcc2.bep rename to packs/libpak/libpak-0.9.4-gcc2.recipe index d105198fa..1d807bb85 100644 --- a/packs/libpak/libpak-0.9.4-gcc2.bep +++ b/packs/libpak/libpak-0.9.4-gcc2.recipe @@ -11,7 +11,8 @@ DEPEND="dev-libs/libedit >= 20100424 sys-devel/gettext >= 0.17" CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` mkdir -p ../zips mkdir -p ../sources @@ -124,7 +125,8 @@ BUILD { #b mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips } -INSTALL { +INSTALL() +{ cd libpak-0.9.4 cd . echo "Done. Zipped files are in the zips directory." diff --git a/packs/libpak/libpak-0.9.4-gcc4.bep b/packs/libpak/libpak-0.9.4-gcc4.recipe similarity index 99% rename from packs/libpak/libpak-0.9.4-gcc4.bep rename to packs/libpak/libpak-0.9.4-gcc4.recipe index c6d34055c..5765db9e2 100644 --- a/packs/libpak/libpak-0.9.4-gcc4.bep +++ b/packs/libpak/libpak-0.9.4-gcc4.recipe @@ -11,7 +11,8 @@ DEPEND="dev-libs/libedit >= 20100424 sys-devel/gettext >= 0.17" CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` mkdir -p ../zips mkdir -p ../sources @@ -131,7 +132,8 @@ BUILD { ## mv ${HPLOC}/media-libs/fblend/*.zip ${HPLOC}/packs/libpak/zips } -INSTALL { +INSTALL() +{ cd libpak-0.9.4 cd . echo "Done. Zipped files are in the zips directory." diff --git a/packs/libpak/libpak-0.9.4.bep b/packs/libpak/libpak-0.9.4.recipe similarity index 99% rename from packs/libpak/libpak-0.9.4.bep rename to packs/libpak/libpak-0.9.4.recipe index 630bfa5f3..aa6779909 100644 --- a/packs/libpak/libpak-0.9.4.bep +++ b/packs/libpak/libpak-0.9.4.recipe @@ -11,7 +11,8 @@ DEPEND="dev-libs/libedit >= 20100424 sys-devel/gettext >= 0.17" CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` mkdir -p ../zips mkdir -p ../sources @@ -247,7 +248,8 @@ BUILD { ## mv ${HPLOC}/media-libs/fblend/*.zip ${HPLOC}/packs/libpak/zips } -INSTALL { +INSTALL() +{ cd libpak-0.9.4 cd . echo "Done. Zipped files are in the zips directory." diff --git a/packs/libpak/libpak-0.9.5-gcc2.bep b/packs/libpak/libpak-0.9.5-gcc2.recipe similarity index 99% rename from packs/libpak/libpak-0.9.5-gcc2.bep rename to packs/libpak/libpak-0.9.5-gcc2.recipe index a6c22aa88..a9606619f 100644 --- a/packs/libpak/libpak-0.9.5-gcc2.bep +++ b/packs/libpak/libpak-0.9.5-gcc2.recipe @@ -11,7 +11,8 @@ DEPEND="dev-libs/libedit >= 20100424 sys-devel/gettext >= 0.17" CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` mkdir -p ../zips mkdir -p ../sources @@ -127,7 +128,8 @@ BUILD { mv ${HPLOC}/media-video/ffmpeg/*.zip ${HPLOC}/packs/libpak/zips } -INSTALL { +INSTALL() +{ cd libpak-0.9.5 cd . echo "Done. Zipped files are in the zips directory." diff --git a/packs/libpak/libpak-0.9.6-gcc2.bep b/packs/libpak/libpak-0.9.6-gcc2.recipe similarity index 99% rename from packs/libpak/libpak-0.9.6-gcc2.bep rename to packs/libpak/libpak-0.9.6-gcc2.recipe index 4355acd4e..5518cccb1 100644 --- a/packs/libpak/libpak-0.9.6-gcc2.bep +++ b/packs/libpak/libpak-0.9.6-gcc2.recipe @@ -11,7 +11,8 @@ DEPEND="dev-libs/libedit >= 20100424 sys-devel/gettext >= 0.17" CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` mkdir -p ../zips mkdir -p ../sources @@ -138,7 +139,8 @@ BUILD { mv ${HPLOC}/media-video/ffmpeg/*.zip ${HPLOC}/packs/libpak/zips } -INSTALL { +INSTALL() +{ echo "Done. Zipped files are in the zips directory." echo "GPL/LGPL sources are in the source directory." #No need to install these, diff --git a/packs/libpak/libpak-0.9.6-gcc4.bep b/packs/libpak/libpak-0.9.6-gcc4.recipe similarity index 99% rename from packs/libpak/libpak-0.9.6-gcc4.bep rename to packs/libpak/libpak-0.9.6-gcc4.recipe index 508433dc2..2ad1ecbf7 100644 --- a/packs/libpak/libpak-0.9.6-gcc4.bep +++ b/packs/libpak/libpak-0.9.6-gcc4.recipe @@ -11,7 +11,8 @@ DEPEND="dev-libs/libedit >= 20100424 sys-devel/gettext >= 0.17" CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` mkdir -p ../zips mkdir -p ../sources @@ -145,7 +146,8 @@ BUILD { ## mv ${HPLOC}/media-libs/fblend/*.zip ${HPLOC}/packs/libpak/zips } -INSTALL { +INSTALL() +{ echo "Done. Zipped files are in the zips directory." echo "GPL/LGPL sources are in the source directory." #No need to install these, diff --git a/packs/libpak/libpak-0.9.bep b/packs/libpak/libpak-0.9.recipe similarity index 99% rename from packs/libpak/libpak-0.9.bep rename to packs/libpak/libpak-0.9.recipe index 5c15c47b1..8f890f10b 100644 --- a/packs/libpak/libpak-0.9.bep +++ b/packs/libpak/libpak-0.9.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/mercurial >= 1.6 dev-libs/libedit >= 20100424" CHECKSUM_MD5="59bc51118c6be6ef40f4fe681ef783a0" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` cd libpak-0.9 ## these are needed for building package in the libpak @@ -94,7 +95,8 @@ BUILD { ## mv ${HPLOC}/media-libs/fblend/*.zip . } -INSTALL { +INSTALL() +{ cd libpak-0.9 mkdir -p ${DESTDIR} echo "" > ${DESTDIR}/.opd diff --git a/packs/optionalpackages/optionalpackages-0.5.bep b/packs/optionalpackages/optionalpackages-0.5.recipe similarity index 99% rename from packs/optionalpackages/optionalpackages-0.5.bep rename to packs/optionalpackages/optionalpackages-0.5.recipe index dca30b895..0614a9e28 100644 --- a/packs/optionalpackages/optionalpackages-0.5.bep +++ b/packs/optionalpackages/optionalpackages-0.5.recipe @@ -7,7 +7,8 @@ DEPEND="gcc-2.95.3 gcc-4.4.4" CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` mkdir -p ../zips mkdir -p ../sources @@ -245,7 +246,8 @@ BUILD { mv ${HPLOC}/app-arch/xz-utils/*.xz ${HPLOC}/packs/optionalpackages/sources } -INSTALL { +INSTALL() +{ cd . echo "Done. Zipped files are in the zips directory." echo "GPL/LGPL sources are in the source directory." diff --git a/packs/optionalpackages/optionalpackages-0.6-gcc2.bep b/packs/optionalpackages/optionalpackages-0.6-gcc2.recipe similarity index 99% rename from packs/optionalpackages/optionalpackages-0.6-gcc2.bep rename to packs/optionalpackages/optionalpackages-0.6-gcc2.recipe index 946bdc58c..aa284f6ce 100644 --- a/packs/optionalpackages/optionalpackages-0.6-gcc2.bep +++ b/packs/optionalpackages/optionalpackages-0.6-gcc2.recipe @@ -7,7 +7,8 @@ DEPEND="gcc-2.95.3 gcc-4.4.4" CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` mkdir -p ../zips mkdir -p ../sources @@ -164,7 +165,8 @@ BUILD { } -INSTALL { +INSTALL() +{ cd . echo "Done. Zipped files are in the zips directory." echo "GPL/LGPL sources are in the source directory." diff --git a/packs/optionalpackages/optionalpackages-0.6-gcc4.bep b/packs/optionalpackages/optionalpackages-0.6-gcc4.recipe similarity index 99% rename from packs/optionalpackages/optionalpackages-0.6-gcc4.bep rename to packs/optionalpackages/optionalpackages-0.6-gcc4.recipe index 4a7196378..3be4faab5 100644 --- a/packs/optionalpackages/optionalpackages-0.6-gcc4.bep +++ b/packs/optionalpackages/optionalpackages-0.6-gcc4.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="sys-devel/gcc >= 4.4.4" CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` mkdir -p ../zips mkdir -p ../sources @@ -164,7 +165,8 @@ BUILD { } -INSTALL { +INSTALL() +{ cd . echo "Done. Zipped files are in the zips directory." echo "GPL/LGPL sources are in the source directory." diff --git a/packs/optionalpackages/optionalpackages-0.6.bep b/packs/optionalpackages/optionalpackages-0.6.recipe similarity index 99% rename from packs/optionalpackages/optionalpackages-0.6.bep rename to packs/optionalpackages/optionalpackages-0.6.recipe index 7bfb26aef..892e22c35 100644 --- a/packs/optionalpackages/optionalpackages-0.6.bep +++ b/packs/optionalpackages/optionalpackages-0.6.recipe @@ -7,7 +7,8 @@ DEPEND="gcc-2.95.3 gcc-4.4.4" CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` mkdir -p ../zips mkdir -p ../sources @@ -247,7 +248,8 @@ BUILD { mv ${HPLOC}/app-arch/xz-utils/*.xz ${HPLOC}/packs/optionalpackages/sources } -INSTALL { +INSTALL() +{ cd . echo "Done. Zipped files are in the zips directory." echo "GPL/LGPL sources are in the source directory." diff --git a/packs/optionalpackages/optionalpackages-0.7-gcc2.bep b/packs/optionalpackages/optionalpackages-0.7-gcc2.recipe similarity index 99% rename from packs/optionalpackages/optionalpackages-0.7-gcc2.bep rename to packs/optionalpackages/optionalpackages-0.7-gcc2.recipe index e024c32dc..010dae572 100644 --- a/packs/optionalpackages/optionalpackages-0.7-gcc2.bep +++ b/packs/optionalpackages/optionalpackages-0.7-gcc2.recipe @@ -8,7 +8,8 @@ DEPEND="gcc == 2.95.3 dev-util/cmake >= 2.8.4" CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` mkdir -p ../zips mkdir -p ../sources @@ -169,7 +170,8 @@ BUILD { } -INSTALL { +INSTALL() +{ cd . echo "Done. Zipped files are in the zips directory." echo "GPL/LGPL sources are in the source directory." diff --git a/packs/optionalpackages/optionalpackages-0.7-gcc4.bep b/packs/optionalpackages/optionalpackages-0.7-gcc4.recipe similarity index 99% rename from packs/optionalpackages/optionalpackages-0.7-gcc4.bep rename to packs/optionalpackages/optionalpackages-0.7-gcc4.recipe index 2661a45e2..78bca54b0 100644 --- a/packs/optionalpackages/optionalpackages-0.7-gcc4.bep +++ b/packs/optionalpackages/optionalpackages-0.7-gcc4.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="sys-devel/gcc >= 4.6.2" CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD { +BUILD() +{ HPLOC=`haikuporter -t` mkdir -p ../zips mkdir -p ../sources @@ -163,7 +164,8 @@ BUILD { } -INSTALL { +INSTALL() +{ cd . echo "Done. Zipped files are in the zips directory." echo "GPL/LGPL sources are in the source directory." diff --git a/sci-astronomy/celestia/celestia-1.6.0.bep b/sci-astronomy/celestia/celestia-1.6.0.recipe similarity index 96% rename from sci-astronomy/celestia/celestia-1.6.0.bep rename to sci-astronomy/celestia/celestia-1.6.0.recipe index b49b90048..f7d34d146 100644 --- a/sci-astronomy/celestia/celestia-1.6.0.bep +++ b/sci-astronomy/celestia/celestia-1.6.0.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="unstable" DEPEND="dev-lang/lua >= 5.1.4 sys-devel/gettext >= 0.17" -BUILD { +BUILD() +{ cd celestia-1.6.0 libtoolize --force --copy --install autoreconf -i @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd celestia-1.6.0 make install } diff --git a/sci-libs/cln/cln-1.3.2.bep b/sci-libs/cln/cln-1.3.2.recipe similarity index 96% rename from sci-libs/cln/cln-1.3.2.bep rename to sci-libs/cln/cln-1.3.2.recipe index f1cd7d57a..bbde965c6 100644 --- a/sci-libs/cln/cln-1.3.2.bep +++ b/sci-libs/cln/cln-1.3.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4." -BUILD { +BUILD() +{ cd cln-1.3.2 autoreconf -i ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cln-1.3.2 make install } diff --git a/sci-libs/fftw/fftw-3.2.2.bep b/sci-libs/fftw/fftw-3.2.2.recipe similarity index 95% rename from sci-libs/fftw/fftw-3.2.2.bep rename to sci-libs/fftw/fftw-3.2.2.recipe index abd185311..78768e63d 100644 --- a/sci-libs/fftw/fftw-3.2.2.bep +++ b/sci-libs/fftw/fftw-3.2.2.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="b616e5c91218cc778b5aa735fefb61ae" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd fftw-3.2.2 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd fftw-3.2.2 make install } diff --git a/sci-libs/gdal/gdal-1.7.2.bep b/sci-libs/gdal/gdal-1.7.2.recipe similarity index 96% rename from sci-libs/gdal/gdal-1.7.2.bep rename to sci-libs/gdal/gdal-1.7.2.recipe index 5e0bbc0c8..be839a25e 100644 --- a/sci-libs/gdal/gdal-1.7.2.bep +++ b/sci-libs/gdal/gdal-1.7.2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd gdal-1.7.2 libtoolize --force --copy --install ./autogen.sh @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gdal-1.7.2 make install } diff --git a/sci-libs/gsl/gsl-1.13.bep b/sci-libs/gsl/gsl-1.13.recipe similarity index 94% rename from sci-libs/gsl/gsl-1.13.bep rename to sci-libs/gsl/gsl-1.13.recipe index c388c8e58..95070ad2f 100644 --- a/sci-libs/gsl/gsl-1.13.bep +++ b/sci-libs/gsl/gsl-1.13.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="d9fcfa367c44ab68a25b4edf34c3c5f7" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gsl-1.13 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gsl-1.13 make install } diff --git a/sci-libs/gsl/gsl-1.14.bep b/sci-libs/gsl/gsl-1.14.recipe similarity index 97% rename from sci-libs/gsl/gsl-1.14.bep rename to sci-libs/gsl/gsl-1.14.recipe index 93efa709b..cd9d6e3ac 100644 --- a/sci-libs/gsl/gsl-1.14.bep +++ b/sci-libs/gsl/gsl-1.14.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="d55e7b141815412a072a3f0e12442042" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gsl-1.14 libtoolize --force --copy --install aclocal @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gsl-1.14 make install } diff --git a/sci-physics/bullet/bullet-2.78.bep b/sci-physics/bullet/bullet-2.78.recipe similarity index 95% rename from sci-physics/bullet/bullet-2.78.bep rename to sci-physics/bullet/bullet-2.78.recipe index b49bedd4f..b4ffe6c11 100644 --- a/sci-physics/bullet/bullet-2.78.bep +++ b/sci-physics/bullet/bullet-2.78.recipe @@ -6,13 +6,15 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-util/cmake >= 2.8.3" -BUILD { +BUILD() +{ cd bullet-2.78 cmake -DBUILD_DEMOS=ON . make } -INSTALL { +INSTALL() +{ cd bullet-2.78 make install } diff --git a/sys-apps/coreutils/coreutils-8.5.bep b/sys-apps/coreutils/coreutils-8.5.recipe similarity index 95% rename from sys-apps/coreutils/coreutils-8.5.bep rename to sys-apps/coreutils/coreutils-8.5.recipe index b01781390..23abb5040 100644 --- a/sys-apps/coreutils/coreutils-8.5.bep +++ b/sys-apps/coreutils/coreutils-8.5.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="c1ffe586d001e87d66cd80c4536ee823" -BUILD { +BUILD() +{ cd coreutils-8.5 MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd coreutils-8.5 make install } -TEST { +TEST() +{ cd coreutils-8.5 make check } diff --git a/sys-apps/dbus/dbus-1.6.8.bep b/sys-apps/dbus/dbus-1.6.8.recipe similarity index 95% rename from sys-apps/dbus/dbus-1.6.8.bep rename to sys-apps/dbus/dbus-1.6.8.recipe index 6eafcc6a8..9ee5b2dbe 100644 --- a/sys-apps/dbus/dbus-1.6.8.bep +++ b/sys-apps/dbus/dbus-1.6.8.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="untested" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd dbus-1.6.8 ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd dbus-1.6.8 make install } -TEST { +TEST() +{ cd dbus-1.6.8 make check } diff --git a/sys-apps/diffutils/diffutils-2.9.bep b/sys-apps/diffutils/diffutils-2.9.recipe similarity index 95% rename from sys-apps/diffutils/diffutils-2.9.bep rename to sys-apps/diffutils/diffutils-2.9.recipe index bf83c0540..0f2e94ede 100644 --- a/sys-apps/diffutils/diffutils-2.9.bep +++ b/sys-apps/diffutils/diffutils-2.9.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="d6bc1bdc874ddb14cfed4d1655a0dbbe" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd diffutils-2.9 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd diffutils-2.9 make install } diff --git a/sys-apps/diffutils/diffutils-3.0.bep b/sys-apps/diffutils/diffutils-3.0.recipe similarity index 94% rename from sys-apps/diffutils/diffutils-3.0.bep rename to sys-apps/diffutils/diffutils-3.0.recipe index 9912eb089..9f729b672 100644 --- a/sys-apps/diffutils/diffutils-3.0.bep +++ b/sys-apps/diffutils/diffutils-3.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="684aaba1baab743a2a90e52162ff07da" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd diffutils-3.0 MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd diffutils-3.0 make install } -TEST { +TEST() +{ cd diffutils-3.0 make check } diff --git a/sys-apps/diffutils/diffutils-3.2.bep b/sys-apps/diffutils/diffutils-3.2.recipe similarity index 95% rename from sys-apps/diffutils/diffutils-3.2.bep rename to sys-apps/diffutils/diffutils-3.2.recipe index 9e9e9c088..1c047549b 100644 --- a/sys-apps/diffutils/diffutils-3.2.bep +++ b/sys-apps/diffutils/diffutils-3.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="22e4deef5d8949a727b159d6bc65c1cc" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd diffutils-3.2 ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd diffutils-3.2 make install } -TEST { +TEST() +{ cd diffutils-3.2 make check } diff --git a/sys-apps/dmidecode/dmidecode-2.11.bep b/sys-apps/dmidecode/dmidecode-2.11.recipe similarity index 97% rename from sys-apps/dmidecode/dmidecode-2.11.bep rename to sys-apps/dmidecode/dmidecode-2.11.recipe index 1810d2489..2fa3b81b2 100644 --- a/sys-apps/dmidecode/dmidecode-2.11.bep +++ b/sys-apps/dmidecode/dmidecode-2.11.recipe @@ -5,12 +5,14 @@ CHECKSUM_MD5="9fddbbc3e330bee5950b8b5d424a57cb" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd dmidecode-2.11 make } -INSTALL { +INSTALL() +{ cd dmidecode-2.11 make install prefix=`finddir B_COMMON_DIRECTORY` \ sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ diff --git a/sys-apps/dtc/dtc-1.3.0-git.bep b/sys-apps/dtc/dtc-1.3.0-git.recipe similarity index 94% rename from sys-apps/dtc/dtc-1.3.0-git.bep rename to sys-apps/dtc/dtc-1.3.0-git.recipe index 08edd3315..d29ddcb4f 100644 --- a/sys-apps/dtc/dtc-1.3.0-git.bep +++ b/sys-apps/dtc/dtc-1.3.0-git.recipe @@ -7,17 +7,20 @@ DEPEND="sys-devel/bison >= 2.5" # TODO: test gcc2 build MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd dtc-1.3.0-git make PREFIX=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd dtc-1.3.0-git make install PREFIX=`finddir B_COMMON_DIRECTORY` } -TEST { +TEST() +{ cd dtc-1.3.0-git make tests } diff --git a/sys-apps/ed/ed-1.4.bep b/sys-apps/ed/ed-1.4.recipe similarity index 95% rename from sys-apps/ed/ed-1.4.bep rename to sys-apps/ed/ed-1.4.recipe index 5284c8e06..ba94d9645 100644 --- a/sys-apps/ed/ed-1.4.bep +++ b/sys-apps/ed/ed-1.4.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="da0ddc0e0b0bec2da4b13b0d0d1bce2b" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ed-1.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd ed-1.4 make install } diff --git a/sys-apps/file/file-5.04.bep b/sys-apps/file/file-5.04.recipe similarity index 95% rename from sys-apps/file/file-5.04.bep rename to sys-apps/file/file-5.04.recipe index ebeca7087..f209cef63 100644 --- a/sys-apps/file/file-5.04.bep +++ b/sys-apps/file/file-5.04.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="accade81ff1cc774904b47c72c8aeea0" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd file-5.04 autoreconf -fvi ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd file-5.04 make install } diff --git a/sys-apps/file/file-5.11.bep b/sys-apps/file/file-5.11.recipe similarity index 96% rename from sys-apps/file/file-5.11.bep rename to sys-apps/file/file-5.11.recipe index d2af82c38..a4c0c9db7 100644 --- a/sys-apps/file/file-5.11.bep +++ b/sys-apps/file/file-5.11.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="16a407bd66d6c7a832f3a5c0d609c27b" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd file-5.11 autoreconf -fvi ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd file-5.11 make install } diff --git a/sys-apps/findutils/findutils-4.4.2.bep b/sys-apps/findutils/findutils-4.4.2.recipe similarity index 95% rename from sys-apps/findutils/findutils-4.4.2.bep rename to sys-apps/findutils/findutils-4.4.2.recipe index df895eda2..cb8b14ff4 100644 --- a/sys-apps/findutils/findutils-4.4.2.bep +++ b/sys-apps/findutils/findutils-4.4.2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="351cc4adb07d54877fa15f75fb77d39f" -BUILD { +BUILD() +{ cd findutils-4.4.2 ./import-gnulib.sh libtoolize --force --copy --install @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd findutils-4.4.2 make install } -TEST { +TEST() +{ cd findutils-4.4.2 make install } diff --git a/sys-apps/gawk/gawk-3.1.8.bep b/sys-apps/gawk/gawk-3.1.8.recipe similarity index 95% rename from sys-apps/gawk/gawk-3.1.8.bep rename to sys-apps/gawk/gawk-3.1.8.recipe index b3c8cdc4e..75cf770e1 100644 --- a/sys-apps/gawk/gawk-3.1.8.bep +++ b/sys-apps/gawk/gawk-3.1.8.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="52b41c6c4418b3226dfb8f82076193bb" -BUILD { +BUILD() +{ cd gawk-3.1.8 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gawk-3.1.8 make install } -TEST { +TEST() +{ cd gawk-3.1.8 make check } diff --git a/sys-apps/gawk/gawk-4.0.1.bep b/sys-apps/gawk/gawk-4.0.1.recipe similarity index 96% rename from sys-apps/gawk/gawk-4.0.1.bep rename to sys-apps/gawk/gawk-4.0.1.recipe index 798af1565..2ae99b32d 100644 --- a/sys-apps/gawk/gawk-4.0.1.bep +++ b/sys-apps/gawk/gawk-4.0.1.recipe @@ -4,7 +4,8 @@ SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-4.0.1.tar.gz" CHECKSUM_MD5="bab2bda483e9f32be65b43b8dab39fa5" STATUS_HAIKU="stable" REVISION="1" -BUILD { +BUILD() +{ cd gawk-4.0.1 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gawk-4.0.1 make install } diff --git a/sys-apps/grep/grep-2.12.bep b/sys-apps/grep/grep-2.12.recipe similarity index 95% rename from sys-apps/grep/grep-2.12.bep rename to sys-apps/grep/grep-2.12.recipe index 15fa46273..e80283c2b 100644 --- a/sys-apps/grep/grep-2.12.bep +++ b/sys-apps/grep/grep-2.12.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-devel/gettext >= 0.17 sys-devel/libiconv >= 1.13.1" -BUILD { +BUILD() +{ cd grep-2.12 libtoolize --force --copy --install aclocal -I m4 @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd grep-2.12 make install } -TEST { +TEST() +{ cd grep-2.12 make check } diff --git a/sys-apps/grep/grep-2.14-bz2.bep b/sys-apps/grep/grep-2.14-bz2.recipe similarity index 97% rename from sys-apps/grep/grep-2.14-bz2.bep rename to sys-apps/grep/grep-2.14-bz2.recipe index fafecfa4a..b2b487fdf 100644 --- a/sys-apps/grep/grep-2.14-bz2.bep +++ b/sys-apps/grep/grep-2.14-bz2.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-devel/gettext >= 0.17 sys-devel/libiconv >= 1.13.1" -BUILD { +BUILD() +{ cd grep-2.14 libtoolize --force --copy --install @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd grep-2.14 make install } diff --git a/sys-apps/grep/grep-2.14.bep b/sys-apps/grep/grep-2.14.recipe similarity index 96% rename from sys-apps/grep/grep-2.14.bep rename to sys-apps/grep/grep-2.14.recipe index cde4042d8..6a045db54 100644 --- a/sys-apps/grep/grep-2.14.bep +++ b/sys-apps/grep/grep-2.14.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="sys-devel/gettext >= 0.17 sys-devel/libiconv >= 1.13.1" -BUILD { +BUILD() +{ cd grep-2.14 libtoolize --force --copy --install aclocal -I m4 @@ -20,12 +21,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd grep-2.14 make install } -TEST { +TEST() +{ cd grep-2.14 make check } diff --git a/sys-apps/grep/grep-2.5.4.bep b/sys-apps/grep/grep-2.5.4.recipe similarity index 94% rename from sys-apps/grep/grep-2.5.4.bep rename to sys-apps/grep/grep-2.5.4.recipe index 6b60cb53b..995eee96c 100644 --- a/sys-apps/grep/grep-2.5.4.bep +++ b/sys-apps/grep/grep-2.5.4.recipe @@ -5,19 +5,22 @@ CHECKSUM_MD5="5650ee2ae6ea4b39e9459d7d0585b315" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd grep-2.5.4 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd grep-2.5.4 make install } -TEST { +TEST() +{ cd grep-2.5.4 make check } diff --git a/sys-apps/grep/grep-2.6.1.bep b/sys-apps/grep/grep-2.6.1.recipe similarity index 94% rename from sys-apps/grep/grep-2.6.1.bep rename to sys-apps/grep/grep-2.6.1.recipe index ec6be1fb0..59fdaac05 100644 --- a/sys-apps/grep/grep-2.6.1.bep +++ b/sys-apps/grep/grep-2.6.1.recipe @@ -5,19 +5,22 @@ CHECKSUM_MD5="8d1496da11029112a4d0986cbf09e26f" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd grep-2.6.1 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd grep-2.6.1 make install } -TEST { +TEST() +{ cd grep-2.6.1 make check } diff --git a/sys-apps/grep/grep-2.6.3.bep b/sys-apps/grep/grep-2.6.3.recipe similarity index 94% rename from sys-apps/grep/grep-2.6.3.bep rename to sys-apps/grep/grep-2.6.3.recipe index dfbd623d2..b28c35d7b 100644 --- a/sys-apps/grep/grep-2.6.3.bep +++ b/sys-apps/grep/grep-2.6.3.recipe @@ -5,19 +5,22 @@ CHECKSUM_MD5="3095b57837b312f087c0680559de7f13" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd grep-2.6.3 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd grep-2.6.3 make install } -TEST { +TEST() +{ cd grep-2.6.3 make check } diff --git a/sys-apps/grep/grep-2.7.bep b/sys-apps/grep/grep-2.7.recipe similarity index 95% rename from sys-apps/grep/grep-2.7.bep rename to sys-apps/grep/grep-2.7.recipe index b3db2cf09..484684bc3 100644 --- a/sys-apps/grep/grep-2.7.bep +++ b/sys-apps/grep/grep-2.7.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-devel/gettext >= 0.17 sys-devel/libiconv >= 1.13.1" -BUILD { +BUILD() +{ cd grep-2.7 libtoolize --force --copy --install aclocal -I m4 @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd grep-2.7 make install } -TEST { +TEST() +{ cd grep-2.7 make check } diff --git a/sys-apps/groff/groff-1.20.1.bep b/sys-apps/groff/groff-1.20.1.recipe similarity index 96% rename from sys-apps/groff/groff-1.20.1.bep rename to sys-apps/groff/groff-1.20.1.recipe index fb330f71b..5fe7f0c9c 100644 --- a/sys-apps/groff/groff-1.20.1.bep +++ b/sys-apps/groff/groff-1.20.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="48fa768dd6fdeb7968041dd5ae8e2b02" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd groff-1.20.1 libtoolize --force --copy --install aclocal -I m4 @@ -19,12 +20,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd groff-1.20.1 make install } -TEST { +TEST() +{ cd groff-1.20.1 make check } diff --git a/sys-apps/hgrep/hgrep-1.0.1.bep b/sys-apps/hgrep/hgrep-1.0.1.recipe similarity index 95% rename from sys-apps/hgrep/hgrep-1.0.1.bep rename to sys-apps/hgrep/hgrep-1.0.1.recipe index 5e94a7b5a..b4ad651a2 100644 --- a/sys-apps/hgrep/hgrep-1.0.1.bep +++ b/sys-apps/hgrep/hgrep-1.0.1.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="1c11724bc9fedd058fde03b5a9f242c2" -BUILD { +BUILD() +{ cd hgrep-1.0.1 } -INSTALL { +INSTALL() +{ cd hgrep-1.0.1 BINDIR=`finddir B_COMMON_BIN_DIRECTORY` mkdir -p $DESTDIR/$BINDIR diff --git a/sys-apps/hgrep/hgrep-1.0.bep b/sys-apps/hgrep/hgrep-1.0.recipe similarity index 95% rename from sys-apps/hgrep/hgrep-1.0.bep rename to sys-apps/hgrep/hgrep-1.0.recipe index c4cf23569..0aa95c571 100644 --- a/sys-apps/hgrep/hgrep-1.0.bep +++ b/sys-apps/hgrep/hgrep-1.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e909cea8f7ae7f6c73fe75a691b0440f" -BUILD { +BUILD() +{ cd hgrep-1.0 } -INSTALL { +INSTALL() +{ cd hgrep-1.0 BINDIR=`finddir B_COMMON_BIN_DIRECTORY` mkdir -p $DESTDIR/$BINDIR diff --git a/sys-apps/less/less-436.bep b/sys-apps/less/less-436.recipe similarity index 96% rename from sys-apps/less/less-436.bep rename to sys-apps/less/less-436.recipe index b0199b2d6..734ed9dac 100644 --- a/sys-apps/less/less-436.bep +++ b/sys-apps/less/less-436.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="817bf051953ad2dea825a1cdf460caa4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd less-436 autoreconf -fvi ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-editor=nano \ @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd less-436 make install DESTDIR="${DESTDIR}" } diff --git a/sys-apps/less/less-451.bep b/sys-apps/less/less-451.recipe similarity index 96% rename from sys-apps/less/less-451.bep rename to sys-apps/less/less-451.recipe index 1927de598..030b4844f 100644 --- a/sys-apps/less/less-451.bep +++ b/sys-apps/less/less-451.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="765f082658002b2b46b86af4a0da1842" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd less-451 autoreconf -fvi ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-editor=nano \ @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd less-451 make install DESTDIR="${DESTDIR}" } diff --git a/sys-apps/lgrep/lgrep-1.0.bep b/sys-apps/lgrep/lgrep-1.0.recipe similarity index 95% rename from sys-apps/lgrep/lgrep-1.0.bep rename to sys-apps/lgrep/lgrep-1.0.recipe index 1abb6f3fe..eeda1bc24 100644 --- a/sys-apps/lgrep/lgrep-1.0.bep +++ b/sys-apps/lgrep/lgrep-1.0.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="2a699321a362a64d0999bf883be21452" -BUILD { +BUILD() +{ cd lgrep-1.0 } -INSTALL { +INSTALL() +{ cd lgrep-1.0 BINDIR=`finddir B_COMMON_BIN_DIRECTORY` mkdir -p $DESTDIR/$BINDIR diff --git a/sys-apps/man/man-1.6f.bep b/sys-apps/man/man-1.6f.recipe similarity index 96% rename from sys-apps/man/man-1.6f.bep rename to sys-apps/man/man-1.6f.recipe index 3f91d74ee..c4797f0fd 100644 --- a/sys-apps/man/man-1.6f.bep +++ b/sys-apps/man/man-1.6f.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="67aaaa6df35215e812fd7d89472c44b6" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-apps/groff >= 1.20.1" -BUILD { +BUILD() +{ cd man-1.6f ./configure -prefix=`finddir B_COMMON_DIRECTORY` -sbindir=`finddir B_COMMON_BIN_DIRECTORY` -confdir=`finddir B_COMMON_SETTINGS_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd man-1.6f make install } diff --git a/sys-apps/man/man-1.6g.bep b/sys-apps/man/man-1.6g.recipe similarity index 96% rename from sys-apps/man/man-1.6g.bep rename to sys-apps/man/man-1.6g.recipe index 593d7f308..812c21cd4 100644 --- a/sys-apps/man/man-1.6g.bep +++ b/sys-apps/man/man-1.6g.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660" REVISION="1" STATUS_HAIKU="stable" DEPEND="sys-apps/groff >= 1.20.1" -BUILD { +BUILD() +{ cd man-1.6g ./configure -prefix=`finddir B_COMMON_DIRECTORY` \ -sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd man-1.6g make install } diff --git a/sys-apps/sed/sed-4.2.1.bep b/sys-apps/sed/sed-4.2.1.recipe similarity index 97% rename from sys-apps/sed/sed-4.2.1.bep rename to sys-apps/sed/sed-4.2.1.recipe index 97fad8c84..9b2dc4cdd 100644 --- a/sys-apps/sed/sed-4.2.1.bep +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd sed-4.2.1 autoconf prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/sed-4.2.1 @@ -22,7 +23,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd sed-4.2.1 make install make check diff --git a/sys-apps/texinfo/texinfo-4.13a.bep b/sys-apps/texinfo/texinfo-4.13a.recipe similarity index 97% rename from sys-apps/texinfo/texinfo-4.13a.bep rename to sys-apps/texinfo/texinfo-4.13a.recipe index 74e817a85..b6dba1cc4 100644 --- a/sys-apps/texinfo/texinfo-4.13a.bep +++ b/sys-apps/texinfo/texinfo-4.13a.recipe @@ -25,13 +25,15 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion SOURCE_DIR="texinfo-4.13" -BUILD { +BUILD() +{ libtoolize --force --copy --install ./configure $configureDirArgs make } -INSTALL { +INSTALL() +{ make install } diff --git a/sys-apps/xinetd/xinetd-2.3.14.bep b/sys-apps/xinetd/xinetd-2.3.14.recipe similarity index 98% rename from sys-apps/xinetd/xinetd-2.3.14.bep rename to sys-apps/xinetd/xinetd-2.3.14.recipe index 4957efced..cc3d0868b 100644 --- a/sys-apps/xinetd/xinetd-2.3.14.bep +++ b/sys-apps/xinetd/xinetd-2.3.14.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="567382d7972613090215c6c54f9b82d9" -BUILD { +BUILD() +{ cd xinetd-2.3.14 # if we don't have rpc/rpc.h then why does it still try to use it?? @@ -30,7 +31,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd xinetd-2.3.14 mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` mkdir -p ${DESTDIR}/`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man5 diff --git a/sys-devel/autoconf/autoconf-2.65.bep b/sys-devel/autoconf/autoconf-2.65.recipe similarity index 95% rename from sys-devel/autoconf/autoconf-2.65.bep rename to sys-devel/autoconf/autoconf-2.65.recipe index 17def4b3b..f3bcfcf3c 100644 --- a/sys-devel/autoconf/autoconf-2.65.bep +++ b/sys-devel/autoconf/autoconf-2.65.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="46cfb40e0babf4c64f8325f03da81c9b" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd autoconf-2.65 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd autoconf-2.65 make install } diff --git a/sys-devel/autoconf/autoconf-2.66.bep b/sys-devel/autoconf/autoconf-2.66.recipe similarity index 95% rename from sys-devel/autoconf/autoconf-2.66.bep rename to sys-devel/autoconf/autoconf-2.66.recipe index fafe8e8c8..c2c2d6ff4 100644 --- a/sys-devel/autoconf/autoconf-2.66.bep +++ b/sys-devel/autoconf/autoconf-2.66.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="d2d22a532ee0e4d6d86a02e6425ecfce" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd autoconf-2.66 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd autoconf-2.66 make install } diff --git a/sys-devel/autoconf/autoconf-2.67.bep b/sys-devel/autoconf/autoconf-2.67.recipe similarity index 95% rename from sys-devel/autoconf/autoconf-2.67.bep rename to sys-devel/autoconf/autoconf-2.67.recipe index 8930dea1b..ac2f75749 100644 --- a/sys-devel/autoconf/autoconf-2.67.bep +++ b/sys-devel/autoconf/autoconf-2.67.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="3fbf92eb8eaca1e0d33dff9710edb5f0" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd autoconf-2.67 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd autoconf-2.67 make install } diff --git a/sys-devel/autoconf/autoconf-2.67xz.bep b/sys-devel/autoconf/autoconf-2.67xz.recipe similarity index 95% rename from sys-devel/autoconf/autoconf-2.67xz.bep rename to sys-devel/autoconf/autoconf-2.67xz.recipe index a2bda5564..f83fde14b 100644 --- a/sys-devel/autoconf/autoconf-2.67xz.bep +++ b/sys-devel/autoconf/autoconf-2.67xz.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="1da24eebe4e6a774e4039242a4f06aad" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd autoconf-2.67 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd autoconf-2.67 make install } diff --git a/sys-devel/autoconf/autoconf-2.68.bep b/sys-devel/autoconf/autoconf-2.68.recipe similarity index 97% rename from sys-devel/autoconf/autoconf-2.68.bep rename to sys-devel/autoconf/autoconf-2.68.recipe index e38df7694..32f17f3c3 100644 --- a/sys-devel/autoconf/autoconf-2.68.bep +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -32,18 +32,21 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ autoreconf PERL="perl" M4="m4" SED="sed" \ ./configure $configureDirArgs make -j$jobs } -INSTALL { +INSTALL() +{ make install } -TEST { +TEST() +{ make check } diff --git a/sys-devel/autoconf/autoconf-2.69.bep b/sys-devel/autoconf/autoconf-2.69.recipe similarity index 95% rename from sys-devel/autoconf/autoconf-2.69.bep rename to sys-devel/autoconf/autoconf-2.69.recipe index 73321003d..223b78f20 100644 --- a/sys-devel/autoconf/autoconf-2.69.bep +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="50f97f4159805e374639a73e2636f22e" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd autoconf-2.69 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd autoconf-2.69 make install } -TEST { +TEST() +{ cd autoconf-2.69 make check } diff --git a/sys-devel/automake/automake-1.10.3.bep b/sys-devel/automake/automake-1.10.3.recipe similarity index 95% rename from sys-devel/automake/automake-1.10.3.bep rename to sys-devel/automake/automake-1.10.3.recipe index fbf875cae..0fa193e63 100644 --- a/sys-devel/automake/automake-1.10.3.bep +++ b/sys-devel/automake/automake-1.10.3.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="03bc9ebfa805f9ee5635f1f53fa1fa5f" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd automake-1.10.3 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd automake-1.10.3 make install } diff --git a/sys-devel/automake/automake-1.11.1.bep b/sys-devel/automake/automake-1.11.1.recipe similarity index 97% rename from sys-devel/automake/automake-1.11.1.bep rename to sys-devel/automake/automake-1.11.1.recipe index 601e4dc80..6afc2948f 100644 --- a/sys-devel/automake/automake-1.11.1.bep +++ b/sys-devel/automake/automake-1.11.1.recipe @@ -26,16 +26,19 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ PERL="/bin/env perl" ./configure $configureDirArgs make -j$jobs } -INSTALL { +INSTALL() +{ make install } -TEST { +TEST() +{ make check } diff --git a/sys-devel/automake/automake-1.12.2.bep b/sys-devel/automake/automake-1.12.2.recipe similarity index 95% rename from sys-devel/automake/automake-1.12.2.bep rename to sys-devel/automake/automake-1.12.2.recipe index 491853e4b..f54777222 100644 --- a/sys-devel/automake/automake-1.12.2.bep +++ b/sys-devel/automake/automake-1.12.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="e620cb9e0259159341c0e0d6b712b67a" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd automake-1.12.2 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` @@ -17,12 +18,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd automake-1.12.2 make install } -TEST { +TEST() +{ cd automake-1.12.2 make check } diff --git a/sys-devel/automake/automake-1.12.5.bep b/sys-devel/automake/automake-1.12.5.recipe similarity index 95% rename from sys-devel/automake/automake-1.12.5.bep rename to sys-devel/automake/automake-1.12.5.recipe index 2d8fc54b8..46843dcbe 100644 --- a/sys-devel/automake/automake-1.12.5.bep +++ b/sys-devel/automake/automake-1.12.5.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="674f6d28f8723e0f478cb03de30f36f1" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd automake-1.12.5 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` @@ -17,12 +18,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd automake-1.12.5 make install } -TEST { +TEST() +{ cd automake-1.12.5 make check } diff --git a/sys-devel/automake/automake-1.13.1.bep b/sys-devel/automake/automake-1.13.1.recipe similarity index 96% rename from sys-devel/automake/automake-1.13.1.bep rename to sys-devel/automake/automake-1.13.1.recipe index e59db8f10..11395f3b4 100644 --- a/sys-devel/automake/automake-1.13.1.bep +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd automake-1.13.1 libtoolize --force --copy --install COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd automake-1.13.1 make install } -TEST { +TEST() +{ cd automake-1.13.1 make check } diff --git a/sys-devel/automake/automake-1.13.bep b/sys-devel/automake/automake-1.13.recipe similarity index 95% rename from sys-devel/automake/automake-1.13.bep rename to sys-devel/automake/automake-1.13.recipe index d31d5c63c..2169760e4 100644 --- a/sys-devel/automake/automake-1.13.bep +++ b/sys-devel/automake/automake-1.13.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="255661c7729d04ef2f8f58d076c89ecc" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd automake-1.13 COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` @@ -17,12 +18,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd automake-1.13 make install } -TEST { +TEST() +{ cd automake-1.13 make check } diff --git a/sys-devel/bc/bc-1.06.bep b/sys-devel/bc/bc-1.06.recipe similarity index 95% rename from sys-devel/bc/bc-1.06.bep rename to sys-devel/bc/bc-1.06.recipe index 67808119b..cf88b843d 100644 --- a/sys-devel/bc/bc-1.06.bep +++ b/sys-devel/bc/bc-1.06.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="d44b5dddebd8a7a7309aea6c36fda117" -BUILD { +BUILD() +{ cd bc-1.06 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd bc-1.06 make install DESTDIR=${DESTDIR} } -TEST { +TEST() +{ cd bc-1.06/Test timetest } diff --git a/sys-devel/bison/bison-2.4.1.bep b/sys-devel/bison/bison-2.4.1.recipe similarity index 94% rename from sys-devel/bison/bison-2.4.1.bep rename to sys-devel/bison/bison-2.4.1.recipe index a537c49e8..ca29bc406 100644 --- a/sys-devel/bison/bison-2.4.1.bep +++ b/sys-devel/bison/bison-2.4.1.recipe @@ -5,18 +5,21 @@ CHECKSUM_MD5="c58aa1da418dc9704070872489e89bf5" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bison-2.4.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-nls make } -INSTALL { +INSTALL() +{ cd bison-2.4.1 make install } -TEST { +TEST() +{ cd bison-2.4.1 make check } diff --git a/sys-devel/bison/bison-2.4.3.bep b/sys-devel/bison/bison-2.4.3.recipe similarity index 97% rename from sys-devel/bison/bison-2.4.3.bep rename to sys-devel/bison/bison-2.4.3.recipe index 2c99d2368..92392ee5f 100644 --- a/sys-devel/bison/bison-2.4.3.bep +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -27,7 +27,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ # bison looks for m4 in an absolute path, but uses that only within # its own testsuite, so we let it be ... ./configure $configureDirArgs \ @@ -35,11 +36,13 @@ BUILD { make -j$jobs } -INSTALL { +INSTALL() +{ make install } -TEST { +TEST() +{ make check } diff --git a/sys-devel/bison/bison-2.4.bep b/sys-devel/bison/bison-2.4.recipe similarity index 95% rename from sys-devel/bison/bison-2.4.bep rename to sys-devel/bison/bison-2.4.recipe index 5e6b68cc2..03195f317 100644 --- a/sys-devel/bison/bison-2.4.bep +++ b/sys-devel/bison/bison-2.4.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="2b9b088b46271c7fa902a7e85f503e1e" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd bison-2.4 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-nls make } -INSTALL { +INSTALL() +{ cd bison-2.4 make install make check diff --git a/sys-devel/bison/bison-2.5.bep b/sys-devel/bison/bison-2.5.recipe similarity index 95% rename from sys-devel/bison/bison-2.5.bep rename to sys-devel/bison/bison-2.5.recipe index 002b5e015..fd0151916 100644 --- a/sys-devel/bison/bison-2.5.bep +++ b/sys-devel/bison/bison-2.5.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd bison-2.5 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd bison-2.5 make install } -TEST { +TEST() +{ cd bison-2.5 make check } diff --git a/sys-devel/bison/bison-2.6.2.bep b/sys-devel/bison/bison-2.6.2.recipe similarity index 96% rename from sys-devel/bison/bison-2.6.2.bep rename to sys-devel/bison/bison-2.6.2.recipe index be4759628..e6414b836 100644 --- a/sys-devel/bison/bison-2.6.2.bep +++ b/sys-devel/bison/bison-2.6.2.recipe @@ -6,7 +6,8 @@ REVISION="15" STATUS_HAIKU="stable" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd bison-2.6.2 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ @@ -16,12 +17,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd bison-2.6.2 make install } -TEST { +TEST() +{ cd bison-2.6.2 make check } diff --git a/sys-devel/clang/clang-3.0.bep b/sys-devel/clang/clang-3.0.recipe similarity index 96% rename from sys-devel/clang/clang-3.0.bep rename to sys-devel/clang/clang-3.0.recipe index 1b9813895..19d1c2497 100644 --- a/sys-devel/clang/clang-3.0.bep +++ b/sys-devel/clang/clang-3.0.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="groff" CHECKSUM_MD5="a8e5f5f1c1adebae7b4a654c376a6005" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd llvm-3.0.src/tools wget "http://llvm.org/releases/3.0/clang-3.0.tar.gz" echo "Extracting clang llvm tool..." @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd llvm-3.0.src make install } diff --git a/sys-devel/clang/clang-3.2.bep b/sys-devel/clang/clang-3.2.recipe similarity index 96% rename from sys-devel/clang/clang-3.2.bep rename to sys-devel/clang/clang-3.2.recipe index 56f007d2d..9ed169501 100644 --- a/sys-devel/clang/clang-3.2.bep +++ b/sys-devel/clang/clang-3.2.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="untested" DEPEND="groff" CHECKSUM_MD5="71610289bbc819e3e15fdd562809a2d7" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ if [ ! -L /usr ]; then ln -s /boot/system/ /usr fi @@ -22,12 +23,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd llvm-3.2.src make install } -TEST { +TEST() +{ cd llvm-3.2.src make check } diff --git a/sys-devel/flex/flex-2.5.35.bep b/sys-devel/flex/flex-2.5.35.recipe similarity index 98% rename from sys-devel/flex/flex-2.5.35.bep rename to sys-devel/flex/flex-2.5.35.recipe index 2b77fbc15..89e5022d2 100644 --- a/sys-devel/flex/flex-2.5.35.bep +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -23,7 +23,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ rm aclocal.m4 libtoolize --force --copy --install aclocal -I m4 @@ -34,7 +35,8 @@ BUILD { make -j$jobs } -INSTALL { +INSTALL() +{ make install } diff --git a/sys-devel/gcc/gcc-2.95.3_110711.bep b/sys-devel/gcc/gcc-2.95.3_110711.recipe similarity index 99% rename from sys-devel/gcc/gcc-2.95.3_110711.bep rename to sys-devel/gcc/gcc-2.95.3_110711.recipe index 1b2bf7bc0..0c0f6aa31 100644 --- a/sys-devel/gcc/gcc-2.95.3_110711.bep +++ b/sys-devel/gcc/gcc-2.95.3_110711.recipe @@ -37,7 +37,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ gccDate=110711 gccInstallDir="$prefix/develop/tools/gcc-2.95.3-${gccDate}" objectsDir=$(pwd)/../${portVersionedName}-obj @@ -76,7 +77,8 @@ BUILD { # anyway. } -INSTALL { +INSTALL() +{ # TODO: Avoid the duplication by defining the variables globally once we've # moved the bep-format to shell. gccDate=110711 diff --git a/sys-devel/gettext/gettext-0.17.bep b/sys-devel/gettext/gettext-0.17.recipe similarity index 97% rename from sys-devel/gettext/gettext-0.17.bep rename to sys-devel/gettext/gettext-0.17.recipe index da33c7509..f3ccbea5f 100644 --- a/sys-devel/gettext/gettext-0.17.bep +++ b/sys-devel/gettext/gettext-0.17.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="58a2bc6d39c0ba57823034d55d65d606" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gettext-0.17 rm ./gettext-tools/gnulib-m4/openmp.m4 libtoolize --force --copy --install @@ -33,12 +34,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gettext-0.17 make install } -TEST { +TEST() +{ cd gettext-0.17 make check } diff --git a/sys-devel/gettext/gettext-0.18.1.1-dev.bep b/sys-devel/gettext/gettext-0.18.1.1-dev.recipe similarity index 96% rename from sys-devel/gettext/gettext-0.18.1.1-dev.bep rename to sys-devel/gettext/gettext-0.18.1.1-dev.recipe index dc485e35a..c4964c6b9 100644 --- a/sys-devel/gettext/gettext-0.18.1.1-dev.bep +++ b/sys-devel/gettext/gettext-0.18.1.1-dev.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gettext-0.18.1.1 libtoolize --force --copy --install ./autogen.sh --quick --skip-gnulib @@ -19,12 +20,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gettext-0.18.1.1 make install } -TEST { +TEST() +{ cd gettext-0.18.1.1/gettext-runtime/tests make check } diff --git a/sys-devel/gettext/gettext-0.18.1.1.bep b/sys-devel/gettext/gettext-0.18.1.1.recipe similarity index 97% rename from sys-devel/gettext/gettext-0.18.1.1.bep rename to sys-devel/gettext/gettext-0.18.1.1.recipe index 9254ac9b2..f544bb76d 100644 --- a/sys-devel/gettext/gettext-0.18.1.1.bep +++ b/sys-devel/gettext/gettext-0.18.1.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd gettext-0.18.1.1 libtoolize --force --copy --install sed -i 's/AC_INIT/AC_INIT([gettext],[0.18.1.1])/' configure.ac @@ -31,12 +32,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd gettext-0.18.1.1/gettext-runtime make install } -TEST { +TEST() +{ cd gettext-0.18.1.1/gettext-runtime make check } diff --git a/sys-devel/jam/jam-2.5.bep b/sys-devel/jam/jam-2.5.recipe similarity index 94% rename from sys-devel/jam/jam-2.5.bep rename to sys-devel/jam/jam-2.5.recipe index 42d0b0c75..4d4295ee5 100644 --- a/sys-devel/jam/jam-2.5.bep +++ b/sys-devel/jam/jam-2.5.recipe @@ -5,12 +5,14 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" #CHECKSUM_MD5="" -BUILD { +BUILD() +{ cd jam-2.5/jam make } -INSTALL { +INSTALL() +{ cd jam-2.5/jam mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` cp -a bin.haikux86/jam ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/jam diff --git a/sys-devel/lemon/lemon-3.7.5.bep b/sys-devel/lemon/lemon-3.7.5.recipe similarity index 95% rename from sys-devel/lemon/lemon-3.7.5.bep rename to sys-devel/lemon/lemon-3.7.5.recipe index af7eeb1f6..d10849a5a 100644 --- a/sys-devel/lemon/lemon-3.7.5.bep +++ b/sys-devel/lemon/lemon-3.7.5.recipe @@ -5,11 +5,13 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="612fa38f920df9b588ce90006eb4b53a" -BUILD { +BUILD() +{ gcc lemon.c -o lemon } -INSTALL { +INSTALL() +{ mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` cp lemon ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/lemon } diff --git a/sys-devel/libtool/libtool-2.2.10.bep b/sys-devel/libtool/libtool-2.2.10.recipe similarity index 93% rename from sys-devel/libtool/libtool-2.2.10.bep rename to sys-devel/libtool/libtool-2.2.10.recipe index 186945748..d1c5f448c 100644 --- a/sys-devel/libtool/libtool-2.2.10.bep +++ b/sys-devel/libtool/libtool-2.2.10.recipe @@ -5,19 +5,22 @@ CHECKSUM_MD5="b745d220e88163fcd9eea0a90ccf21b0" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libtool-2.2.10 ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libtool-2.2.10 make install } -TEST { +TEST() +{ make check } diff --git a/sys-devel/libtool/libtool-2.2.6.bep b/sys-devel/libtool/libtool-2.2.6.recipe similarity index 95% rename from sys-devel/libtool/libtool-2.2.6.bep rename to sys-devel/libtool/libtool-2.2.6.recipe index edfbbcdae..25796d1ae 100644 --- a/sys-devel/libtool/libtool-2.2.6.bep +++ b/sys-devel/libtool/libtool-2.2.6.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="8ca1ea241cd27ff9832e045fe9afe4fd" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libtool-2.2.6 ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libtool-2.2.6 make install make check diff --git a/sys-devel/libtool/libtool-2.2.6b.bep b/sys-devel/libtool/libtool-2.2.6b.recipe similarity index 95% rename from sys-devel/libtool/libtool-2.2.6b.bep rename to sys-devel/libtool/libtool-2.2.6b.recipe index 20e87fecc..5e883a244 100644 --- a/sys-devel/libtool/libtool-2.2.6b.bep +++ b/sys-devel/libtool/libtool-2.2.6b.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="07da460450490148c6d2df0f21481a25" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libtool-2.2.6b ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libtool-2.2.6b make install # make check diff --git a/sys-devel/libtool/libtool-2.2.7b.bep b/sys-devel/libtool/libtool-2.2.7b.recipe similarity index 95% rename from sys-devel/libtool/libtool-2.2.7b.bep rename to sys-devel/libtool/libtool-2.2.7b.recipe index bbc0f7af6..59e86ce63 100644 --- a/sys-devel/libtool/libtool-2.2.7b.bep +++ b/sys-devel/libtool/libtool-2.2.7b.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="9f66a85efaeed0d9652f647986f6ad5b" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libtool-2.2.7b ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libtool-2.2.7b make install # make check diff --git a/sys-devel/libtool/libtool-2.2.8.bep b/sys-devel/libtool/libtool-2.2.8.recipe similarity index 93% rename from sys-devel/libtool/libtool-2.2.8.bep rename to sys-devel/libtool/libtool-2.2.8.recipe index 58dadb83a..6f6212797 100644 --- a/sys-devel/libtool/libtool-2.2.8.bep +++ b/sys-devel/libtool/libtool-2.2.8.recipe @@ -5,19 +5,22 @@ CHECKSUM_MD5="cad2a7188242bc8dbab0645532ae3d6f" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libtool-2.2.8 ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libtool-2.2.8 make install } -TEST { +TEST() +{ make check } diff --git a/sys-devel/libtool/libtool-2.2.x.bep b/sys-devel/libtool/libtool-2.2.x.recipe similarity index 95% rename from sys-devel/libtool/libtool-2.2.x.bep rename to sys-devel/libtool/libtool-2.2.x.recipe index 6ba36a6ad..882c40316 100644 --- a/sys-devel/libtool/libtool-2.2.x.bep +++ b/sys-devel/libtool/libtool-2.2.x.recipe @@ -6,14 +6,16 @@ REVISION="1" MESSAGE="This is for building and testing of unreleased libtool" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd libtool-2.2.x ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd libtool-2.2.x make install make check diff --git a/sys-devel/libtool/libtool-2.4.2.bep b/sys-devel/libtool/libtool-2.4.2.recipe similarity index 95% rename from sys-devel/libtool/libtool-2.4.2.bep rename to sys-devel/libtool/libtool-2.4.2.recipe index ffb7ebf6b..a81f7819f 100644 --- a/sys-devel/libtool/libtool-2.4.2.bep +++ b/sys-devel/libtool/libtool-2.4.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="d2f3b7d4627e69e13514a40e72a24d50" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd libtool-2.4.2 ./bootstrap ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -15,12 +16,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libtool-2.4.2 make install } -TEST { +TEST() +{ cd libtool-2.4.2 make check } diff --git a/sys-devel/libtool/libtool-2.4.bep b/sys-devel/libtool/libtool-2.4.recipe similarity index 98% rename from sys-devel/libtool/libtool-2.4.bep rename to sys-devel/libtool/libtool-2.4.recipe index 0c21d9366..a6e0a3c3d 100644 --- a/sys-devel/libtool/libtool-2.4.bep +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -26,7 +26,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ ./bootstrap SED='sed' NM='nm' LD=ld ./configure $configureDirArgs --with-gnu-ld make -j$jobs @@ -44,11 +45,13 @@ BUILD { libtool } -INSTALL { +INSTALL() +{ make install } -TEST { +TEST() +{ make check } diff --git a/sys-devel/llvm/llvm-3.0.bep b/sys-devel/llvm/llvm-3.0.recipe similarity index 96% rename from sys-devel/llvm/llvm-3.0.bep rename to sys-devel/llvm/llvm-3.0.recipe index 63e4b04b7..229634d29 100644 --- a/sys-devel/llvm/llvm-3.0.bep +++ b/sys-devel/llvm/llvm-3.0.recipe @@ -6,13 +6,15 @@ STATUS_HAIKU="untested" DEPEND="" CHECKSUM_MD5="a8e5f5f1c1adebae7b4a654c376a6005" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd llvm-3.0.src ./configure --enable-optimized --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd llvm-3.0.src make install } diff --git a/sys-devel/llvm/llvm-3.2.bep b/sys-devel/llvm/llvm-3.2.recipe similarity index 97% rename from sys-devel/llvm/llvm-3.2.bep rename to sys-devel/llvm/llvm-3.2.recipe index 1fdabddd4..14a31f213 100644 --- a/sys-devel/llvm/llvm-3.2.bep +++ b/sys-devel/llvm/llvm-3.2.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="71610289bbc819e3e15fdd562809a2d7" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ if [ ! -L /usr ]; then ln -s /boot/system/ /usr fi @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd llvm-3.2.src make install } diff --git a/sys-devel/m4/m4-1.4.14.bep b/sys-devel/m4/m4-1.4.14.recipe similarity index 96% rename from sys-devel/m4/m4-1.4.14.bep rename to sys-devel/m4/m4-1.4.14.recipe index 6584ca424..8d4435360 100644 --- a/sys-devel/m4/m4-1.4.14.bep +++ b/sys-devel/m4/m4-1.4.14.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="unstable" DEPEND="" -BUILD { +BUILD() +{ cd m4-1.4.14 prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/m4-1.4.14 ./configure --prefix=$prefix \ @@ -22,12 +23,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd m4-1.4.14 make install } -TEST { +TEST() +{ cd m4-1.4.14 makecheck } diff --git a/sys-devel/m4/m4-1.4.15.bep b/sys-devel/m4/m4-1.4.15.recipe similarity index 96% rename from sys-devel/m4/m4-1.4.15.bep rename to sys-devel/m4/m4-1.4.15.recipe index 25fff6c84..8e141440e 100644 --- a/sys-devel/m4/m4-1.4.15.bep +++ b/sys-devel/m4/m4-1.4.15.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd m4-1.4.15 echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac echo >> configure.ac @@ -29,12 +30,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd m4-1.4.15 make install } -TEST { +TEST() +{ cd m4-1.4.15 make check } diff --git a/sys-devel/m4/m4-1.4.16.bep b/sys-devel/m4/m4-1.4.16.recipe similarity index 95% rename from sys-devel/m4/m4-1.4.16.bep rename to sys-devel/m4/m4-1.4.16.recipe index 257c5db60..83f900e7f 100644 --- a/sys-devel/m4/m4-1.4.16.bep +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -16,18 +16,21 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ ./configure $configureDirArgs \ --disable-rpath --with-gnu-ld \ --enable-changeword make -j$jobs } -INSTALL { +INSTALL() +{ make install } -TEST { +TEST() +{ make check } diff --git a/sys-devel/make/make-3.81.bep b/sys-devel/make/make-3.81.recipe similarity index 97% rename from sys-devel/make/make-3.81.bep rename to sys-devel/make/make-3.81.recipe index 33fafa9b7..f3efec007 100644 --- a/sys-devel/make/make-3.81.bep +++ b/sys-devel/make/make-3.81.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="354853e0b2da90c527e35aabb8d6f1e6" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd make-3.81 libtoolize -fci prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/make-3.81 @@ -20,7 +21,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd make-3.81 make install } diff --git a/sys-devel/make/make-3.82.bep b/sys-devel/make/make-3.82.recipe similarity index 97% rename from sys-devel/make/make-3.82.bep rename to sys-devel/make/make-3.82.recipe index 029333bbe..fa0f3634a 100644 --- a/sys-devel/make/make-3.82.bep +++ b/sys-devel/make/make-3.82.recipe @@ -18,14 +18,16 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion SOURCE_DIR="$portVersionedName" -BUILD { +BUILD() +{ libtoolize --force --copy --install ./configure $configureDirArgs \ --disable-rpath --with-gnu-ld ./build.sh } -INSTALL { +INSTALL() +{ ./make install } diff --git a/sys-devel/patch/patch-2.6.1.bep b/sys-devel/patch/patch-2.6.1.recipe similarity index 97% rename from sys-devel/patch/patch-2.6.1.bep rename to sys-devel/patch/patch-2.6.1.recipe index 87002778c..869ed1002 100644 --- a/sys-devel/patch/patch-2.6.1.bep +++ b/sys-devel/patch/patch-2.6.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="0818d1763ae0c4281bcdc63cdac0b2c0" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd patch-2.6.1 prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/patch-2.6.1 ./configure --prefix=$prefix \ @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd patch-2.6.1 make install } diff --git a/sys-devel/patch/patch-2.7.1.bep b/sys-devel/patch/patch-2.7.1.recipe similarity index 95% rename from sys-devel/patch/patch-2.7.1.bep rename to sys-devel/patch/patch-2.7.1.recipe index ce005d780..5be2da908 100644 --- a/sys-devel/patch/patch-2.7.1.bep +++ b/sys-devel/patch/patch-2.7.1.recipe @@ -4,14 +4,16 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/patch/patch-2.7.1.tar.bz2" CHECKSUM_MD5="0881a7c6477862fc395f373ada0ec6b6" STATUS_HAIKU="stable" REVISION="1" -BUILD { +BUILD() +{ cd patch-2.7.1 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } -INSTALL { +INSTALL() +{ cd patch-2.7.1 make install } diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43-git.bep b/sys-fs/e2fsprogs/e2fsprogs-1.43-git.recipe similarity index 96% rename from sys-fs/e2fsprogs/e2fsprogs-1.43-git.bep rename to sys-fs/e2fsprogs/e2fsprogs-1.43-git.recipe index cc5b02d07..5adffe854 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43-git.bep +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43-git.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd e2fsprogs autoconf libdir=`finddir B_COMMON_LIB_DIRECTORY` @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd e2fsprogs make install-libs } diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.bep b/sys-fs/e2fsprogs/e2fsprogs-1.43.recipe similarity index 97% rename from sys-fs/e2fsprogs/e2fsprogs-1.43.bep rename to sys-fs/e2fsprogs/e2fsprogs-1.43.recipe index 298212606..9531f3103 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.bep +++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="broken" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." DEPEND="" -BUILD { +BUILD() +{ cd e2fsprogs-1.43 autoconf libdir=`finddir B_COMMON_LIB_DIRECTORY` @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd e2fsprogs-1.43 make install-libs } diff --git a/sys-libs/glu/glu-9.0.bep b/sys-libs/glu/glu-9.0.recipe similarity index 96% rename from sys-libs/glu/glu-9.0.bep rename to sys-libs/glu/glu-9.0.recipe index 1f6601b29..a8a380c00 100644 --- a/sys-libs/glu/glu-9.0.bep +++ b/sys-libs/glu/glu-9.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="bbc57d4fe3bd3fb095bdbef6fcb977c4" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd glu-9.0.0 ./configure --prefix=`finddir B_SYSTEM_DIRECTORY` \ --datadir=`finddir B_COMMON_DATA_DIRECTORY`/ \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd glu-9.0.0 make install DESTDIR="${DESTDIR}" } diff --git a/sys-libs/mesa/mesa-7.8.2.bep b/sys-libs/mesa/mesa-7.8.2.recipe similarity index 98% rename from sys-libs/mesa/mesa-7.8.2.bep rename to sys-libs/mesa/mesa-7.8.2.recipe index 0fbc12615..e908cd79a 100644 --- a/sys-libs/mesa/mesa-7.8.2.bep +++ b/sys-libs/mesa/mesa-7.8.2.recipe @@ -12,7 +12,8 @@ STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6be2d343a0089bfd395ce02aaf8adb57" MESSAGE="This port only builds with gcc2. Not for general use." -BUILD { +BUILD() +{ export DEBUG=0 cd Mesa-7.8.2 make diff --git a/sys-libs/mesa/mesa-9.0.1.bep b/sys-libs/mesa/mesa-9.0.1.recipe similarity index 98% rename from sys-libs/mesa/mesa-9.0.1.bep rename to sys-libs/mesa/mesa-9.0.1.recipe index d03000d46..5568ca758 100644 --- a/sys-libs/mesa/mesa-9.0.1.bep +++ b/sys-libs/mesa/mesa-9.0.1.recipe @@ -12,7 +12,8 @@ STATUS_HAIKU="stable" DEPEND="scons" CHECKSUM_MD5="97d6554c05ea7449398afe3a0ede7018" MESSAGE="This port only builds with gcc4. Not for general use." -BUILD { +BUILD() +{ export DEBUG=0 cd Mesa-9.0.1 scons debug=$DEBUG diff --git a/sys-libs/mesa/mesa-9.0.2.bep b/sys-libs/mesa/mesa-9.0.2.recipe similarity index 99% rename from sys-libs/mesa/mesa-9.0.2.bep rename to sys-libs/mesa/mesa-9.0.2.recipe index 6bc915411..45fec2387 100644 --- a/sys-libs/mesa/mesa-9.0.2.bep +++ b/sys-libs/mesa/mesa-9.0.2.recipe @@ -12,7 +12,8 @@ STATUS_HAIKU="stable" DEPEND="scons, llvm >= 3.2" CHECKSUM_MD5="dc45d1192203e418163e0017640e1cfc" MESSAGE="This port only builds with gcc4. Not for general use." -BUILD { +BUILD() +{ export DEBUG=0 echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" echo "This generates a Mesa3D build package for Haiku... not for general use" diff --git a/sys-libs/mesa/mesa-9.0.bep b/sys-libs/mesa/mesa-9.0.recipe similarity index 98% rename from sys-libs/mesa/mesa-9.0.bep rename to sys-libs/mesa/mesa-9.0.recipe index 768707c1e..99f182f27 100644 --- a/sys-libs/mesa/mesa-9.0.bep +++ b/sys-libs/mesa/mesa-9.0.recipe @@ -12,7 +12,8 @@ STATUS_HAIKU="stable" DEPEND="scons" CHECKSUM_MD5="60e557ce407be3732711da484ab3db6c" MESSAGE="This port only builds with gcc4. Not for general use." -BUILD { +BUILD() +{ export DEBUG=0 cd Mesa-9.0 scons debug=$DEBUG diff --git a/sys-libs/mesa/mesa-9.1.0.bep b/sys-libs/mesa/mesa-9.1.0.recipe similarity index 99% rename from sys-libs/mesa/mesa-9.1.0.bep rename to sys-libs/mesa/mesa-9.1.0.recipe index e35967ffc..812de0624 100644 --- a/sys-libs/mesa/mesa-9.1.0.bep +++ b/sys-libs/mesa/mesa-9.1.0.recipe @@ -12,7 +12,8 @@ STATUS_HAIKU="unstable" DEPEND="scons, llvm >= 3.2" CHECKSUM_MD5="d3891e02215422e120271d976ff1947e" MESSAGE="This port only builds with gcc4. Not for general use." -BUILD { +BUILD() +{ export DEBUG=0 echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" echo "This generates a Mesa3D build package for Haiku... not for general use" diff --git a/sys-libs/mesa/mesa-9.1.1.bep b/sys-libs/mesa/mesa-9.1.1.recipe similarity index 99% rename from sys-libs/mesa/mesa-9.1.1.bep rename to sys-libs/mesa/mesa-9.1.1.recipe index 573804871..d663f81c9 100644 --- a/sys-libs/mesa/mesa-9.1.1.bep +++ b/sys-libs/mesa/mesa-9.1.1.recipe @@ -12,7 +12,8 @@ STATUS_HAIKU="unstable" DEPEND="scons, llvm >= 3.2" CHECKSUM_MD5="6ea2bdc3b7ecfb4257b39814b4182580" MESSAGE="This port only builds with gcc4. Not for general use." -BUILD { +BUILD() +{ export DEBUG=1 echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" echo "This generates a Mesa3D build package for Haiku... not for general use" diff --git a/sys-libs/ncurses/ncurses-5.6.bep b/sys-libs/ncurses/ncurses-5.6.recipe similarity index 94% rename from sys-libs/ncurses/ncurses-5.6.bep rename to sys-libs/ncurses/ncurses-5.6.recipe index 69ec76766..f04e2b6b5 100644 --- a/sys-libs/ncurses/ncurses-5.6.bep +++ b/sys-libs/ncurses/ncurses-5.6.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="b6593abe1089d6aab1551c105c9300e3" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ncurses-5.6 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd ncurses-5.6 make install } diff --git a/sys-libs/ncurses/ncurses-5.7.bep b/sys-libs/ncurses/ncurses-5.7.recipe similarity index 95% rename from sys-libs/ncurses/ncurses-5.7.bep rename to sys-libs/ncurses/ncurses-5.7.recipe index 06d53abd4..704df8033 100644 --- a/sys-libs/ncurses/ncurses-5.7.bep +++ b/sys-libs/ncurses/ncurses-5.7.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="cce05daf61a64501ef6cd8da1f727ec6" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ncurses-5.7 ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-libtool make } -INSTALL { +INSTALL() +{ cd ncurses-5.7 ./misc/shlib make install DESTDIR="${DESTDIR}" } diff --git a/sys-libs/ncurses/ncurses-5.8.bep b/sys-libs/ncurses/ncurses-5.8.recipe similarity index 96% rename from sys-libs/ncurses/ncurses-5.8.bep rename to sys-libs/ncurses/ncurses-5.8.recipe index 8679d2720..1511c5ce7 100644 --- a/sys-libs/ncurses/ncurses-5.8.bep +++ b/sys-libs/ncurses/ncurses-5.8.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="20ed3fa7599937f0ca268d9088837a64" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ncurses-5.8 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --datadir=`finddir B_COMMON_DATA_DIRECTORY`/ \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ncurses-5.8 ./misc/shlib make install DESTDIR="${DESTDIR}" } diff --git a/sys-libs/ncurses/ncurses-5.9.bep b/sys-libs/ncurses/ncurses-5.9.recipe similarity index 96% rename from sys-libs/ncurses/ncurses-5.9.bep rename to sys-libs/ncurses/ncurses-5.9.recipe index 392f126e2..d4f2696ad 100644 --- a/sys-libs/ncurses/ncurses-5.9.bep +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd ncurses-5.9 ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd ncurses-5.9 ./misc/shlib make install DESTDIR="${DESTDIR}" } diff --git a/sys-libs/readline/readline-5.2.bep b/sys-libs/readline/readline-5.2.recipe similarity index 95% rename from sys-libs/readline/readline-5.2.bep rename to sys-libs/readline/readline-5.2.recipe index b2fbf3746..e8d97ae75 100644 --- a/sys-libs/readline/readline-5.2.bep +++ b/sys-libs/readline/readline-5.2.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="e39331f32ad14009b9ff49cc10c5e751" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd readline-5.2 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd readline-5.2 make install } diff --git a/sys-libs/readline/readline-6.0.bep b/sys-libs/readline/readline-6.0.recipe similarity index 96% rename from sys-libs/readline/readline-6.0.bep rename to sys-libs/readline/readline-6.0.recipe index 77b1ff870..3cc6001b9 100644 --- a/sys-libs/readline/readline-6.0.bep +++ b/sys-libs/readline/readline-6.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="b7f65a48add447693be6e86f04a63019" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd readline-6.0 libtoolize --force --copy --install aclocal @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd readline-6.0 make install DESTDIR="${DESTDIR}" } diff --git a/sys-libs/readline/readline-6.1.bep b/sys-libs/readline/readline-6.1.recipe similarity index 97% rename from sys-libs/readline/readline-6.1.bep rename to sys-libs/readline/readline-6.1.recipe index 90bbcff1c..5e38331a9 100644 --- a/sys-libs/readline/readline-6.1.bep +++ b/sys-libs/readline/readline-6.1.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="fc2f7e714fe792db1ce6ddc4c9fb4ef3" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd readline-6.1 libtoolize --force --copy --install aclocal @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd readline-6.1 make install DESTDIR="${DESTDIR}" } diff --git a/sys-libs/readline/readline-6.2.bep b/sys-libs/readline/readline-6.2.recipe similarity index 96% rename from sys-libs/readline/readline-6.2.bep rename to sys-libs/readline/readline-6.2.recipe index b1725633f..f53a06d9e 100644 --- a/sys-libs/readline/readline-6.2.bep +++ b/sys-libs/readline/readline-6.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c" REVISION="2" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd readline-6.2 libtoolize --force --copy --install aclocal @@ -18,7 +19,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd readline-6.2 make install DESTDIR="${DESTDIR}" } diff --git a/sys-libs/slang/slang-2.2.2.bep b/sys-libs/slang/slang-2.2.2.recipe similarity index 96% rename from sys-libs/slang/slang-2.2.2.bep rename to sys-libs/slang/slang-2.2.2.recipe index 2f452ce71..c65383837 100644 --- a/sys-libs/slang/slang-2.2.2.bep +++ b/sys-libs/slang/slang-2.2.2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e7183d0acab9cc35fae12849f8b848e2" -BUILD { +BUILD() +{ cd slang-2.2.2/autoconf libtoolize --force --copy --install cp autoconf/config.guess config.guess @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd slang-2.2.2 make install DESTDIR="${DESTDIR}" } diff --git a/sys-libs/zlib/zlib-1.2.3.bep b/sys-libs/zlib/zlib-1.2.3.recipe similarity index 94% rename from sys-libs/zlib/zlib-1.2.3.bep rename to sys-libs/zlib/zlib-1.2.3.recipe index d74407c3d..388677748 100644 --- a/sys-libs/zlib/zlib-1.2.3.bep +++ b/sys-libs/zlib/zlib-1.2.3.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="dee233bf288ee795ac96a98cc2e369b6" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd zlib-1.2.3 ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd zlib-1.2.3 make install } diff --git a/sys-libs/zlib/zlib-1.2.5.bep b/sys-libs/zlib/zlib-1.2.5.recipe similarity index 94% rename from sys-libs/zlib/zlib-1.2.5.bep rename to sys-libs/zlib/zlib-1.2.5.recipe index 03f91d8b2..e5a947a9e 100644 --- a/sys-libs/zlib/zlib-1.2.5.bep +++ b/sys-libs/zlib/zlib-1.2.5.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="be1e89810e66150f5b0327984d8625a0" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd zlib-1.2.5 sed -i 's/share\/man/documentation\/man/' CMakeLists.txt cmake . make } -INSTALL { +INSTALL() +{ cd zlib-1.2.5 make install } diff --git a/sys-libs/zlib/zlib-1.2.7.bep b/sys-libs/zlib/zlib-1.2.7.recipe similarity index 95% rename from sys-libs/zlib/zlib-1.2.7.bep rename to sys-libs/zlib/zlib-1.2.7.recipe index 6210e8655..f3b1b8ad9 100644 --- a/sys-libs/zlib/zlib-1.2.7.bep +++ b/sys-libs/zlib/zlib-1.2.7.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="60df6a37c56e7c1366cca812414f7b85" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd zlib-1.2.7 sed -i 's/share\/man/documentation\/man/' CMakeLists.txt sed -i 's/share\/pkgconfig/lib\/pkgconfig/' CMakeLists.txt @@ -13,7 +14,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd zlib-1.2.7 make install } diff --git a/sys-libs/zopfli/zopfli-999.bep b/sys-libs/zopfli/zopfli-999.recipe similarity index 96% rename from sys-libs/zopfli/zopfli-999.bep rename to sys-libs/zopfli/zopfli-999.recipe index 9efa227a0..5679ad437 100644 --- a/sys-libs/zopfli/zopfli-999.bep +++ b/sys-libs/zopfli/zopfli-999.recipe @@ -7,13 +7,15 @@ STATUS_HAIKU="stable" DEPEND="" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD { +BUILD() +{ cd zopfli-999 sed -i 's/\-lm//' makefile make } -INSTALL { +INSTALL() +{ cd zopfli-999 BINDIR=${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` mkdir -p ${BINDIR} diff --git a/sys-process/htop/htop-1.0.2.bep b/sys-process/htop/htop-1.0.2.recipe similarity index 96% rename from sys-process/htop/htop-1.0.2.bep rename to sys-process/htop/htop-1.0.2.recipe index 5b4c800ed..9ba195434 100644 --- a/sys-process/htop/htop-1.0.2.bep +++ b/sys-process/htop/htop-1.0.2.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="0d01cca8df3349c74569cefebbd9919e" REVISION="1" STATUS_HAIKU="broken" DEPEND="" -BUILD { +BUILD() +{ cd htop-1.0.2 ./configure --disable-unicode --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd htop-1.0.2 make install } diff --git a/www-client/links/links-2.3pre2.bep b/www-client/links/links-2.3pre2.recipe similarity index 96% rename from www-client/links/links-2.3pre2.bep rename to www-client/links/links-2.3pre2.recipe index 15bb7a6f7..c2882b221 100644 --- a/www-client/links/links-2.3pre2.bep +++ b/www-client/links/links-2.3pre2.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="bb2a4e058c88b8ec0c9f6c0e1640555c" -BUILD { +BUILD() +{ cd links-2.3pre2 autoconf ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -19,7 +20,8 @@ BUILD { mimeset links } -INSTALL { +INSTALL() +{ cd links-2.3pre2 make install DESTDIR=${DESTDIR} } diff --git a/www-client/netsurf/netsurf-10380.bep b/www-client/netsurf/netsurf-10380.recipe similarity index 97% rename from www-client/netsurf/netsurf-10380.bep rename to www-client/netsurf/netsurf-10380.recipe index 53a10d09f..1d850b1a9 100644 --- a/www-client/netsurf/netsurf-10380.bep +++ b/www-client/netsurf/netsurf-10380.recipe @@ -7,7 +7,8 @@ DEPEND="dev-util/pkgconfig >= 0.23 dev-util/gperf >= 3.0.4 media-libs/libpng >= 1.4.1" #CHECKSUM_MD5="f73fdd2a9e29cf7200bdc521590d4592" -BUILD { +BUILD() +{ export GCCVER=2 cp ../scanner.c netsurf-10380/netsurf/css/scanner.c cd netsurf-10380 @@ -29,7 +30,8 @@ BUILD { make beos } -INSTALL { +INSTALL() +{ cd netsurf-10380 make install } diff --git a/www-client/netsurf/netsurf-2.1.bep b/www-client/netsurf/netsurf-2.1.recipe similarity index 98% rename from www-client/netsurf/netsurf-2.1.bep rename to www-client/netsurf/netsurf-2.1.recipe index f1fd077b1..9005480f2 100644 --- a/www-client/netsurf/netsurf-2.1.bep +++ b/www-client/netsurf/netsurf-2.1.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="f0a34fd076b492c1a13b45432e8d7e49" -BUILD { +BUILD() +{ cd netsurf svn co svn://svn.netsurf-browser.org/trunk/libparserutils svn co svn://svn.netsurf-browser.org/trunk/libwapcaplet @@ -45,7 +46,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd netsurf make install } diff --git a/www-client/netsurf/netsurf-2.6.bep b/www-client/netsurf/netsurf-2.6.recipe similarity index 98% rename from www-client/netsurf/netsurf-2.6.bep rename to www-client/netsurf/netsurf-2.6.recipe index 8285bec06..a4d406fc4 100644 --- a/www-client/netsurf/netsurf-2.6.bep +++ b/www-client/netsurf/netsurf-2.6.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8653789d2ede6dbbfe79882afc7538fc" -BUILD { +BUILD() +{ cd netsurf svn co svn://svn.netsurf-browser.org/trunk/libparserutils svn co svn://svn.netsurf-browser.org/trunk/libwapcaplet @@ -45,7 +46,8 @@ BUILD { make beos } -INSTALL { +INSTALL() +{ cd netsurf make install } diff --git a/www-client/netsurf/netsurf-2.7-svn.bep b/www-client/netsurf/netsurf-2.7-svn.recipe similarity index 98% rename from www-client/netsurf/netsurf-2.7-svn.bep rename to www-client/netsurf/netsurf-2.7-svn.recipe index fd2d8c123..9b8719291 100644 --- a/www-client/netsurf/netsurf-2.7-svn.bep +++ b/www-client/netsurf/netsurf-2.7-svn.recipe @@ -7,7 +7,8 @@ DEPEND="dev-util/gperf >= 3.0.4 media-libs/libmng > 1.0.10 dev-libs/pkgconfig >= 0.25 net-misc/curl >= 7.21.6" -BUILD { +BUILD() +{ cd netsurf-2.7-svn sed -i 's/B_TOOLTIP_/B_TOOL_TIP_/g' beos/system_colour.cpp @@ -49,7 +50,8 @@ BUILD { make beos } -INSTALL { +INSTALL() +{ cd netsurf-2.7-svn make install } diff --git a/www-client/netsurf/netsurf-2.7.bep b/www-client/netsurf/netsurf-2.7.recipe similarity index 98% rename from www-client/netsurf/netsurf-2.7.bep rename to www-client/netsurf/netsurf-2.7.recipe index 8394fd42d..12ac7f385 100644 --- a/www-client/netsurf/netsurf-2.7.bep +++ b/www-client/netsurf/netsurf-2.7.recipe @@ -9,7 +9,8 @@ DEPEND="dev-util/gperf >= 3.0.4 net-misc/curl >= 7.21.6" CHECKSUM_MD5="52939f2e2319269d7d758ec665f6cb8e" -BUILD { +BUILD() +{ cd netsurf sed -i 's/B_TOOLTIP_/B_TOOL_TIP_/g' beos/system_colour.cpp svn co svn://svn.netsurf-browser.org/trunk/libparserutils -r12456 @@ -49,7 +50,8 @@ BUILD { make beos } -INSTALL { +INSTALL() +{ cd netsurf make install } diff --git a/www-client/netsurf/netsurf-2.9.bep b/www-client/netsurf/netsurf-2.9.recipe similarity index 96% rename from www-client/netsurf/netsurf-2.9.bep rename to www-client/netsurf/netsurf-2.9.recipe index 95d70633f..4d6d9ed8e 100644 --- a/www-client/netsurf/netsurf-2.9.bep +++ b/www-client/netsurf/netsurf-2.9.recipe @@ -13,12 +13,14 @@ DEPEND="dev-util/gperf >= 3.0.4 media-libs/lcms >= 2.1" CHECKSUM_MD5="cfc2789997b356f2ea9d9f7694c4c909" -BUILD { +BUILD() +{ cd netsurf-2.9 make } -INSTALL { +INSTALL() +{ cd netsurf-2.9 make install } diff --git a/www-client/netsurf/netsurf-2.HEAD.bep b/www-client/netsurf/netsurf-2.HEAD.recipe similarity index 97% rename from www-client/netsurf/netsurf-2.HEAD.bep rename to www-client/netsurf/netsurf-2.HEAD.recipe index c13cdb423..fc3f5ef8c 100644 --- a/www-client/netsurf/netsurf-2.HEAD.bep +++ b/www-client/netsurf/netsurf-2.HEAD.recipe @@ -19,12 +19,14 @@ DEPEND="dev-util/gperf >= 3.0.4 net-libs/libdom >= 0 " -BUILD { +BUILD() +{ cd netsurf-2.HEAD make } -INSTALL { +INSTALL() +{ cd netsurf-2.HEAD make install } diff --git a/www-client/netsurf/netsurf-9799.bep b/www-client/netsurf/netsurf-9799.recipe similarity index 98% rename from www-client/netsurf/netsurf-9799.bep rename to www-client/netsurf/netsurf-9799.recipe index 5870ed123..b988044f0 100644 --- a/www-client/netsurf/netsurf-9799.bep +++ b/www-client/netsurf/netsurf-9799.recipe @@ -7,7 +7,8 @@ DEPEND="dev-util/pkgconfig >= 0.23 dev-util/gperf >= 3.0.4 media-libs/libpng >= 1.4.1" CHECKSUM_MD5="f73fdd2a9e29cf7200bdc521590d4592" -BUILD { +BUILD() +{ cd netsurf svn co svn://svn.netsurf-browser.org/trunk/libparserutils svn co svn://svn.netsurf-browser.org/trunk/libwapcaplet @@ -46,7 +47,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd netsurf make install } diff --git a/www-client/netsurf/netsurf-9872.bep b/www-client/netsurf/netsurf-9872.recipe similarity index 97% rename from www-client/netsurf/netsurf-9872.bep rename to www-client/netsurf/netsurf-9872.recipe index 7f61719e1..e7f033c11 100644 --- a/www-client/netsurf/netsurf-9872.bep +++ b/www-client/netsurf/netsurf-9872.recipe @@ -7,7 +7,8 @@ DEPEND="dev-util/pkgconfig >= 0.23 dev-util/gperf >= 3.0.4 media-libs/libpng >= 1.4.1" #CHECKSUM_MD5="f73fdd2a9e29cf7200bdc521590d4592" -BUILD { +BUILD() +{ export GCCVER=2 cp ../scanner.c netsurf-9872/netsurf/css/scanner.c cd netsurf-9872 @@ -29,7 +30,8 @@ BUILD { make beos } -INSTALL { +INSTALL() +{ cd netsurf-9872 make install } diff --git a/www-client/w3m/w3m-0.5.3.bep b/www-client/w3m/w3m-0.5.3.recipe similarity index 97% rename from www-client/w3m/w3m-0.5.3.bep rename to www-client/w3m/w3m-0.5.3.recipe index fc8b1b292..8742a33a6 100644 --- a/www-client/w3m/w3m-0.5.3.bep +++ b/www-client/w3m/w3m-0.5.3.recipe @@ -8,7 +8,8 @@ DEPEND="dev-libs/boehm-gc >= 7.2_alpha6 dev-libs/openssl >= 0.9.8l sys-devel/gettext >= 0.17" CHECKSUM_MD5="1b845a983a50b8dec0169ac48479eacc" -BUILD { +BUILD() +{ cd w3m-0.5.3 libtoolize -fci autoconf @@ -19,7 +20,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd w3m-0.5.3 make install } diff --git a/www-servers/apache/apache-2.2.17.bep b/www-servers/apache/apache-2.2.17.recipe similarity index 95% rename from www-servers/apache/apache-2.2.17.bep rename to www-servers/apache/apache-2.2.17.recipe index 201911275..03f0586e4 100644 --- a/www-servers/apache/apache-2.2.17.bep +++ b/www-servers/apache/apache-2.2.17.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/apr >= 1.4 2 dev-libs/apr-utils >= 1.3.9" CHECKSUM_MD5="66d8e107f85acc039fd5e624e85728a9" -BUILD { +BUILD() +{ cd httpd-2.2.17 libtoolize --force --copy --install aclocal @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd httpd-2.2.17 make install } -TEST { +TEST() +{ cd httpd-2.2.17 make test } diff --git a/www-servers/apache/apache-2.2.22.bep b/www-servers/apache/apache-2.2.22.recipe similarity index 95% rename from www-servers/apache/apache-2.2.22.bep rename to www-servers/apache/apache-2.2.22.recipe index 66ac4713a..24d867e0e 100644 --- a/www-servers/apache/apache-2.2.22.bep +++ b/www-servers/apache/apache-2.2.22.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/apr >= 1.4 2 dev-libs/apr-utils >= 1.3.9" CHECKSUM_MD5="d77fa5af23df96a8af68ea8114fa6ce1" -BUILD { +BUILD() +{ cd httpd-2.2.22 libtoolize --force --copy --install aclocal @@ -18,12 +19,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd httpd-2.2.22 make install } -TEST { +TEST() +{ cd httpd-2.2.22 make test } diff --git a/www-servers/apache/apache-2.4.3.bep b/www-servers/apache/apache-2.4.3.recipe similarity index 96% rename from www-servers/apache/apache-2.4.3.bep rename to www-servers/apache/apache-2.4.3.recipe index 10bc209c9..58bceb591 100644 --- a/www-servers/apache/apache-2.4.3.bep +++ b/www-servers/apache/apache-2.4.3.recipe @@ -6,7 +6,8 @@ STATUS_HAIKU="stable" DEPEND="dev-libs/apr >= 1.4 2 dev-libs/apr-util >= 1.3.9" CHECKSUM_MD5="538dccd22dd18466fff3ec7948495417" -BUILD { +BUILD() +{ cd httpd-2.4.3 libtoolize --force --copy --install aclocal @@ -19,12 +20,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd httpd-2.4.3 make install } -TEST { +TEST() +{ cd httpd-2.4.3 make test } diff --git a/www-servers/cherokee/cherokee-1.2.101.bep b/www-servers/cherokee/cherokee-1.2.101.recipe similarity index 95% rename from www-servers/cherokee/cherokee-1.2.101.bep rename to www-servers/cherokee/cherokee-1.2.101.recipe index 468b11357..82a05810a 100644 --- a/www-servers/cherokee/cherokee-1.2.101.bep +++ b/www-servers/cherokee/cherokee-1.2.101.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="broken" DEPEND="" CHECKSUM_MD5="ef47003355a2e368e4d9596cd070ef23" -BUILD { +BUILD() +{ cd cherokee-1.2.101 libtoolize --force --copy --install aclocal -I m4 @@ -17,12 +18,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cherokee-1.2.101 make install } -TEST { +TEST() +{ cd cherokee-1.2.101 # make test # make check diff --git a/www-servers/haproxy/haproxy-1.4.22.bep b/www-servers/haproxy/haproxy-1.4.22.recipe similarity index 97% rename from www-servers/haproxy/haproxy-1.4.22.bep rename to www-servers/haproxy/haproxy-1.4.22.recipe index fa1d3ce35..854d047dc 100644 --- a/www-servers/haproxy/haproxy-1.4.22.bep +++ b/www-servers/haproxy/haproxy-1.4.22.recipe @@ -4,14 +4,16 @@ SRC_URI="http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz" CHECKSUM_MD5="a0b007c76f6a78524f3b3dd5e704979c" STATUS_HAIKU="stable" REVISION="1" -BUILD { +BUILD() +{ cd haproxy-1.4.22 make TARGET=haiku PREFIX= SBINDIR=`finddir B_COMMON_BIN_DIRECTORY` \ MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` } -INSTALL { +INSTALL() +{ cd haproxy-1.4.22 make install DESTDIR=$DESTDIR PREFIX= SBINDIR=`finddir B_COMMON_BIN_DIRECTORY` \ MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ diff --git a/x11-libs/agg/agg-2.5.bep b/x11-libs/agg/agg-2.5.recipe similarity index 96% rename from x11-libs/agg/agg-2.5.bep rename to x11-libs/agg/agg-2.5.recipe index 6d243794d..e5d686489 100644 --- a/x11-libs/agg/agg-2.5.bep +++ b/x11-libs/agg/agg-2.5.recipe @@ -5,7 +5,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="0229a488bc47be10a2fee6cf0b2febd6" -BUILD { +BUILD() +{ cd agg-2.5 libtoolize --force --copy --install aclocal @@ -16,7 +17,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd agg-2.5 make install DESTDIR=${DESTDIR} } diff --git a/x11-libs/cairo/cairo-1.10.0.bep b/x11-libs/cairo/cairo-1.10.0.recipe similarity index 97% rename from x11-libs/cairo/cairo-1.10.0.bep rename to x11-libs/cairo/cairo-1.10.0.recipe index b23acc8b0..776d8bdfb 100644 --- a/x11-libs/cairo/cairo-1.10.0.bep +++ b/x11-libs/cairo/cairo-1.10.0.recipe @@ -7,7 +7,8 @@ DEPEND="freetype >= 2.3.11 fontconfig >= 2.8.0 pixman >= 0.18.4" CHECKSUM_MD5="70a2ece66cf473d976e2db0f75bf199e" -BUILD { +BUILD() +{ cd cairo-1.10.0 libtoolize --force --copy --install aclocal -I build @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cairo-1.10.0 make install } diff --git a/x11-libs/cairo/cairo-1.8.10.bep b/x11-libs/cairo/cairo-1.8.10.recipe similarity index 97% rename from x11-libs/cairo/cairo-1.8.10.bep rename to x11-libs/cairo/cairo-1.8.10.recipe index 69bfa28fd..571c35752 100644 --- a/x11-libs/cairo/cairo-1.8.10.bep +++ b/x11-libs/cairo/cairo-1.8.10.recipe @@ -7,7 +7,8 @@ DEPEND="freetype >= 2.3.11 fontconfig >= 2.8.0 pixman >= 0.17.2" CHECKSUM_MD5="b60a82f405f9400bbfdcf850b1728d25" -BUILD { +BUILD() +{ cd cairo-1.8.10 libtoolize --force --copy --install aclocal -I build @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd cairo-1.8.10 make install } diff --git a/x11-libs/libX11/libX11-1.3.3.bep b/x11-libs/libX11/libX11-1.3.3.recipe similarity index 97% rename from x11-libs/libX11/libX11-1.3.3.bep rename to x11-libs/libX11/libX11-1.3.3.recipe index d5d0199d2..2616a1939 100644 --- a/x11-libs/libX11/libX11-1.3.3.bep +++ b/x11-libs/libX11/libX11-1.3.3.recipe @@ -15,7 +15,8 @@ DEPEND="x11-misc/util-macros >= 1.7.0 x11-libs/libxcb >= 1.6 x11-libs/libXau >= 1.0.5 x11-proto/xextproto >= 7.1.1" -BUILD { +BUILD() +{ cd libX11-1.3.3 libtoolize --force --copy --install autoreconf -i @@ -23,7 +24,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libX11-1.3.3 make install } diff --git a/x11-libs/libXau/libXau-1.0.5.bep b/x11-libs/libXau/libXau-1.0.5.recipe similarity index 95% rename from x11-libs/libXau/libXau-1.0.5.bep rename to x11-libs/libXau/libXau-1.0.5.recipe index fd8eee947..262bf426b 100644 --- a/x11-libs/libXau/libXau-1.0.5.bep +++ b/x11-libs/libXau/libXau-1.0.5.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="pkgconfig >= 0.23 x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd libXau-1.0.5 libtoolize --force --copy --install autoreconf -i @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd libXau-1.0.5 make install } diff --git a/x11-libs/libxcb/libxcb-1.6.bep b/x11-libs/libxcb/libxcb-1.6.recipe similarity index 96% rename from x11-libs/libxcb/libxcb-1.6.bep rename to x11-libs/libxcb/libxcb-1.6.recipe index 4ecfc01c2..8d316acf2 100644 --- a/x11-libs/libxcb/libxcb-1.6.bep +++ b/x11-libs/libxcb/libxcb-1.6.recipe @@ -10,14 +10,16 @@ DEPEND="pkgconfig >= 0.23 x11-proto/xcb-proto >= 1.6 x11-libs/libXau >= 1.0.5" -BUILD { +BUILD() +{ cd libxcb-1.6 libtoolize --force --copy --install ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd libxcb-1.6 make install } diff --git a/x11-libs/pango/pango-1.28.1.bep b/x11-libs/pango/pango-1.28.1.recipe similarity index 96% rename from x11-libs/pango/pango-1.28.1.bep rename to x11-libs/pango/pango-1.28.1.recipe index 0f68809d9..a783d46ad 100644 --- a/x11-libs/pango/pango-1.28.1.bep +++ b/x11-libs/pango/pango-1.28.1.recipe @@ -12,14 +12,16 @@ DEPEND="pkgconfig >= 0.23 media-libs/fontconfig >= 2.8.0 x11-libs/cairo >= 1.8.10" -BUILD { +BUILD() +{ cd pango-1.28.1 ./autogen.sh ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd pango-1.28.1 make install } diff --git a/x11-libs/pixman/pixman-0.17.2.bep b/x11-libs/pixman/pixman-0.17.2.recipe similarity index 95% rename from x11-libs/pixman/pixman-0.17.2.bep rename to x11-libs/pixman/pixman-0.17.2.recipe index db949ba89..e4d9efc2d 100644 --- a/x11-libs/pixman/pixman-0.17.2.bep +++ b/x11-libs/pixman/pixman-0.17.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="006c74f1450e5ed2e1bdaf88e9806faa" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pixman-0.17.2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pixman-0.17.2 make install } diff --git a/x11-libs/pixman/pixman-0.18.2.bep b/x11-libs/pixman/pixman-0.18.2.recipe similarity index 95% rename from x11-libs/pixman/pixman-0.18.2.bep rename to x11-libs/pixman/pixman-0.18.2.recipe index 0141d1aef..3207fc846 100644 --- a/x11-libs/pixman/pixman-0.18.2.bep +++ b/x11-libs/pixman/pixman-0.18.2.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="5d1378fa61610dd5d3c7e0111b2c5253" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pixman-0.18.2 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pixman-0.18.2 make install } diff --git a/x11-libs/pixman/pixman-0.18.4.bep b/x11-libs/pixman/pixman-0.18.4.recipe similarity index 95% rename from x11-libs/pixman/pixman-0.18.4.bep rename to x11-libs/pixman/pixman-0.18.4.recipe index 8a8d9f5f1..c2fd8770b 100644 --- a/x11-libs/pixman/pixman-0.18.4.bep +++ b/x11-libs/pixman/pixman-0.18.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="532db4194e18c108d0b7dd85f20d39b8" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pixman-0.18.4 libtoolize --force --copy --install aclocal @@ -15,7 +16,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pixman-0.18.4 make install } diff --git a/x11-libs/pixman/pixman-0.19-master.bep b/x11-libs/pixman/pixman-0.19-master.recipe similarity index 95% rename from x11-libs/pixman/pixman-0.19-master.bep rename to x11-libs/pixman/pixman-0.19-master.recipe index 620b4c6ef..e0af5913a 100644 --- a/x11-libs/pixman/pixman-0.19-master.bep +++ b/x11-libs/pixman/pixman-0.19-master.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="c53466dc2e6145afdb80b5a74491a2de" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pixman-master libtoolize --force --copy --install ./autogen.sh @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pixman-master make install } -TEST { +TEST() +{ cd pixman-master make check } diff --git a/x11-libs/pixman/pixman-0.19.4.bep b/x11-libs/pixman/pixman-0.19.4.recipe similarity index 95% rename from x11-libs/pixman/pixman-0.19.4.bep rename to x11-libs/pixman/pixman-0.19.4.recipe index c97b06ae6..d40a8126f 100644 --- a/x11-libs/pixman/pixman-0.19.4.bep +++ b/x11-libs/pixman/pixman-0.19.4.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="100a2d23f1d5683fdaa5d7ca71a0182b" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pixman-0.19.4 libtoolize --force --copy --install ./autogen.sh @@ -13,12 +14,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pixman-0.19.4 make install } -TEST { +TEST() +{ cd pixman-0.19.4 make check } diff --git a/x11-libs/pixman/pixman-0.20.0.bep b/x11-libs/pixman/pixman-0.20.0.recipe similarity index 95% rename from x11-libs/pixman/pixman-0.20.0.bep rename to x11-libs/pixman/pixman-0.20.0.recipe index d93ac2db0..ffa1be8dd 100644 --- a/x11-libs/pixman/pixman-0.20.0.bep +++ b/x11-libs/pixman/pixman-0.20.0.recipe @@ -5,7 +5,8 @@ CHECKSUM_MD5="c1a31d5cedfa97c5af7148a2d1fd4356" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd pixman-0.20.0 libtoolize --force --copy --install aclocal @@ -14,12 +15,14 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd pixman-0.20.0 make install } -TEST { +TEST() +{ cd pixman-0.20.0 make check } diff --git a/x11-libs/xtrans/xtrans-1.2.5.bep b/x11-libs/xtrans/xtrans-1.2.5.recipe similarity index 96% rename from x11-libs/xtrans/xtrans-1.2.5.bep rename to x11-libs/xtrans/xtrans-1.2.5.recipe index dabe29737..fb109065a 100644 --- a/x11-libs/xtrans/xtrans-1.2.5.bep +++ b/x11-libs/xtrans/xtrans-1.2.5.recipe @@ -7,7 +7,8 @@ STATUS_HAIKU="stable" DEPEND="pkgconfig >= 0.23 x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd xtrans-1.2.5 libtoolize --force --copy --install autoreconf -i @@ -15,7 +16,8 @@ BUILD { --datadir=`finddir B_COMMON_DATA_DIRECTORY` } -INSTALL { +INSTALL() +{ cd xtrans-1.2.5 make install } diff --git a/x11-misc/makedepend/makedepend-1.0.2.bep b/x11-misc/makedepend/makedepend-1.0.2.recipe similarity index 96% rename from x11-misc/makedepend/makedepend-1.0.2.bep rename to x11-misc/makedepend/makedepend-1.0.2.recipe index 58fb5b71b..b6319037a 100644 --- a/x11-misc/makedepend/makedepend-1.0.2.bep +++ b/x11-misc/makedepend/makedepend-1.0.2.recipe @@ -7,14 +7,16 @@ STATUS_HAIKU="stable" DEPEND="dev-util/pkgconfig >= 0.9 x11-misc/util-macros >= 1.7.0 x11-proto/xproto >= 7.0.16" -BUILD { +BUILD() +{ cd makedepend-1.0.2 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` make } -INSTALL { +INSTALL() +{ cd makedepend-1.0.2 make install } diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.0.bep b/x11-misc/shared-mime-info/shared-mime-info-1.0.recipe similarity index 96% rename from x11-misc/shared-mime-info/shared-mime-info-1.0.bep rename to x11-misc/shared-mime-info/shared-mime-info-1.0.recipe index 0c61c66ad..ac8adccf1 100644 --- a/x11-misc/shared-mime-info/shared-mime-info-1.0.bep +++ b/x11-misc/shared-mime-info/shared-mime-info-1.0.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="untested" DEPEND="intltool, glib" -BUILD { +BUILD() +{ cd shared-mime-info-1.0 ./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \ --datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \ @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd shared-mime-info-1.0 make install } diff --git a/x11-misc/util-macros/util-macros-1.17.0-git.bep b/x11-misc/util-macros/util-macros-1.17.0-git.recipe similarity index 95% rename from x11-misc/util-macros/util-macros-1.17.0-git.bep rename to x11-misc/util-macros/util-macros-1.17.0-git.recipe index ea93fa92c..8f7f416d5 100644 --- a/x11-misc/util-macros/util-macros-1.17.0-git.bep +++ b/x11-misc/util-macros/util-macros-1.17.0-git.recipe @@ -9,7 +9,8 @@ SRC_URI="git://anongit.freedesktop.org/xorg/util/macros" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd util-macros-1.17.0-git ./autogen.sh -V ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -17,7 +18,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd util-macros-1.17.0-git make install } diff --git a/x11-misc/util-macros/util-macros-1.7.0.bep b/x11-misc/util-macros/util-macros-1.7.0.recipe similarity index 95% rename from x11-misc/util-macros/util-macros-1.7.0.bep rename to x11-misc/util-macros/util-macros-1.7.0.recipe index 13a30101a..6144a32f7 100644 --- a/x11-misc/util-macros/util-macros-1.7.0.bep +++ b/x11-misc/util-macros/util-macros-1.7.0.recipe @@ -5,13 +5,15 @@ CHECKSUM_MD5="8a8d208f24672e7a37d1aa4d2ffcef8e" REVISION="1" STATUS_HAIKU="stable" DEPEND="" -BUILD { +BUILD() +{ cd util-macros-1.7.0 libtoolize --force --copy --install ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd util-macros-1.7.0 make install } diff --git a/x11-proto/inputproto/inputproto-2.0.bep b/x11-proto/inputproto/inputproto-2.0.recipe similarity index 95% rename from x11-proto/inputproto/inputproto-2.0.bep rename to x11-proto/inputproto/inputproto-2.0.recipe index 8428ac375..6d461f68d 100644 --- a/x11-proto/inputproto/inputproto-2.0.bep +++ b/x11-proto/inputproto/inputproto-2.0.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd inputproto-2.0 libtoolize --force --copy --install autoreconf -i ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd inputproto-2.0 make install } diff --git a/x11-proto/kbproto/kbproto-1.0.4.bep b/x11-proto/kbproto/kbproto-1.0.4.recipe similarity index 95% rename from x11-proto/kbproto/kbproto-1.0.4.bep rename to x11-proto/kbproto/kbproto-1.0.4.recipe index aa6a56080..970e88e87 100644 --- a/x11-proto/kbproto/kbproto-1.0.4.bep +++ b/x11-proto/kbproto/kbproto-1.0.4.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd kbproto-1.0.4 libtoolize --force --copy --install autoreconf -i ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd kbproto-1.0.4 make install } diff --git a/x11-proto/xcb-proto/xcb-proto-1.6.bep b/x11-proto/xcb-proto/xcb-proto-1.6.recipe similarity index 94% rename from x11-proto/xcb-proto/xcb-proto-1.6.bep rename to x11-proto/xcb-proto/xcb-proto-1.6.recipe index ab77c5e0e..6573458f7 100644 --- a/x11-proto/xcb-proto/xcb-proto-1.6.bep +++ b/x11-proto/xcb-proto/xcb-proto-1.6.recipe @@ -6,7 +6,8 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd xcb-proto-1.6 libtoolize --force --copy --install autoreconf -i @@ -14,7 +15,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd xcb-proto-1.6 make install } diff --git a/x11-proto/xextproto/xextproto-7.1.1.bep b/x11-proto/xextproto/xextproto-7.1.1.recipe similarity index 95% rename from x11-proto/xextproto/xextproto-7.1.1.bep rename to x11-proto/xextproto/xextproto-7.1.1.recipe index 79bbbd807..224d93786 100644 --- a/x11-proto/xextproto/xextproto-7.1.1.bep +++ b/x11-proto/xextproto/xextproto-7.1.1.recipe @@ -6,14 +6,16 @@ REVISION="1" STATUS_HAIKU="stable" DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd xextproto-7.1.1 libtoolize --force --copy --install autoreconf -i ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd xextproto-7.1.1 make install } diff --git a/x11-proto/xproto/xproto-7.0.16.bep b/x11-proto/xproto/xproto-7.0.16.recipe similarity index 95% rename from x11-proto/xproto/xproto-7.0.16.bep rename to x11-proto/xproto/xproto-7.0.16.recipe index d3ab77900..cd13a63fb 100644 --- a/x11-proto/xproto/xproto-7.0.16.bep +++ b/x11-proto/xproto/xproto-7.0.16.recipe @@ -5,14 +5,16 @@ CHECKSUM_MD5="6e6b6510ccd568f82093ebd7ae58700b" REVISION="1" STATUS_HAIKU="stable" DEPEND="x11-misc/util-macros >= 1.7.0" -BUILD { +BUILD() +{ cd xproto-7.0.16 libtoolize --force --copy --install autoreconf -i ./configure --prefix=`finddir B_COMMON_DIRECTORY` } -INSTALL { +INSTALL() +{ cd xproto-7.0.16 make install } diff --git a/x11-proto/xproto/xproto-7.0.23-git.bep b/x11-proto/xproto/xproto-7.0.23-git.recipe similarity index 97% rename from x11-proto/xproto/xproto-7.0.23-git.bep rename to x11-proto/xproto/xproto-7.0.23-git.recipe index 643668b5a..1d808c8c7 100644 --- a/x11-proto/xproto/xproto-7.0.23-git.bep +++ b/x11-proto/xproto/xproto-7.0.23-git.recipe @@ -13,7 +13,8 @@ SRC_URI="git://anongit.freedesktop.org/xorg/proto/xproto" REVISION="1" STATUS_HAIKU="untested" DEPEND="" -BUILD { +BUILD() +{ cd xproto-7.0.23-git ./autogen.sh -V ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ @@ -21,7 +22,8 @@ BUILD { make } -INSTALL { +INSTALL() +{ cd xproto-7.0.23-git make install } From a477cb45a45b89a55f9c1b466817579039698ce7 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 29 Mar 2013 17:15:07 +0000 Subject: [PATCH 047/587] * adjust autoconf-2.68 and perl-5.10.1 to activate the build package only in the INSTALL phase, as they won't build otherwise --- dev-lang/perl/perl-5.10.1.recipe | 1 + sys-devel/autoconf/autoconf-2.68.recipe | 1 + 2 files changed, 2 insertions(+) diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe index 6896166aa..a1eb8bb6c 100644 --- a/dev-lang/perl/perl-5.10.1.recipe +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -16,6 +16,7 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" SOURCE_DIR="$portVersionedName" +BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL" BUILD() { diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index 32f17f3c3..7ea79bb71 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -31,6 +31,7 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion cmd:sed" SOURCE_DIR="$portVersionedName" +BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL" BUILD() { From 8b640ecacc1d312989f3b2975b65af11a1c67a47 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 29 Mar 2013 22:13:14 +0000 Subject: [PATCH 048/587] arc-5.21o.recipe: Revert incorrect part of r2363 Apparently the script converting to shell syntax was a bit too greedy. Not that matters much; the install section looks like it is completely broken anyway. --- app-arch/arc/arc-5.21o.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app-arch/arc/arc-5.21o.recipe b/app-arch/arc/arc-5.21o.recipe index f1f238dfe..7da918287 100644 --- a/app-arch/arc/arc-5.21o.recipe +++ b/app-arch/arc/arc-5.21o.recipe @@ -16,8 +16,7 @@ INSTALL() cd arc-5.21o install arc --prefix={$DESTDIR}`finddir B_COMMON_DIRECTORY` install marc --prefix={$DESTDIR}`finddir B_COMMON_DIRECTORY` - install arc.1() -{$DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1 + install arc.1 {$DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1 } LICENSE="GNU GPL v2" From 37404c8730a65d029489f63cbf7cd04fa48f96ed Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 30 Mar 2013 18:58:47 +0000 Subject: [PATCH 049/587] * fix all syntactical problems in recipe files --- app-benchmarks/bonnie++/bonnie++-1.03e.recipe | 2 +- app-text/enchant/enchant-1.6.0.recipe | 2 +- app-text/tree/tree-1.6.0.recipe | 5 ---- dev-db/redis/redis-2.2.11.recipe | 10 +++---- dev-db/redis/redis-2.9.0-git.recipe | 8 ++--- dev-libs/libiconv/libiconv-1.12.recipe | 3 +- dev-libs/libiconv/libiconv-1.13.1.recipe | 3 +- dev-libs/tinyxml/tinyxml-2.6.2.recipe | 30 +++++++++---------- dev-python/paramiko/paramiko-1.7.6.recipe | 4 +-- dev-python/pycrypto/pycrypto-2.3.recipe | 4 +-- .../pydispatcher/pydispatcher-2.0.1.recipe | 4 +-- dev-python/setuptools/setuptools-0.6.recipe | 2 +- dev-util/bakefile/bakefile-0.2.8.recipe | 2 +- dev-util/cppunit/cppunit-1.12.1.recipe | 2 +- dev-vcs/mercurial/mercurial-2.2.2.recipe | 2 +- dev-vcs/mercurial/mercurial-2.2.3.recipe | 2 +- dev-vcs/mercurial/mercurial-2.3.recipe | 2 +- dev-vcs/mercurial/mercurial-2.4.recipe | 2 +- dev-vcs/tig/tig-0.16.recipe | 4 +-- haiku-apps/bowser/bowser-1.1.1-cvs.recipe | 4 +-- .../farsi-fonts/farsi-fonts-0.4.recipe | 3 +- media-libs/libmodplug/libmodplug-0.8.7.recipe | 2 +- sci-libs/gsl/gsl-1.14.recipe | 2 +- 23 files changed, 50 insertions(+), 54 deletions(-) diff --git a/app-benchmarks/bonnie++/bonnie++-1.03e.recipe b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe index 0f26cfcf9..d6ecb6b1a 100644 --- a/app-benchmarks/bonnie++/bonnie++-1.03e.recipe +++ b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism in python" HOMEPAGE="http://www.coker.com.au/bonnie++/" SRC_URI="http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz" -REVISION= "1" +REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="750aa5b5051263a99c6c195888c74968" diff --git a/app-text/enchant/enchant-1.6.0.recipe b/app-text/enchant/enchant-1.6.0.recipe index 3c88d288b..2cf91f8be 100644 --- a/app-text/enchant/enchant-1.6.0.recipe +++ b/app-text/enchant/enchant-1.6.0.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Generic spell-checking dictionary library" HOMEPAGE="http://abisource.com/projects/enchant/" SRC_URI="http://www.abisource.com/downloads/enchant/1.6.0/enchant-1.6.0.tar.gz" -REVISION= "2" +REVISION="2" STATUS_HAIKU="broken" diff --git a/app-text/tree/tree-1.6.0.recipe b/app-text/tree/tree-1.6.0.recipe index b21079d37..4f1f9ab9e 100644 --- a/app-text/tree/tree-1.6.0.recipe +++ b/app-text/tree/tree-1.6.0.recipe @@ -19,10 +19,5 @@ INSTALL() MANDIR=${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man } -TEST() -{ - # none -} - LICENSE="GNU GPL v2" COPYRIGHT="1996-2011 Steve Baker" diff --git a/dev-db/redis/redis-2.2.11.recipe b/dev-db/redis/redis-2.2.11.recipe index 65e74444d..fb63186b5 100644 --- a/dev-db/redis/redis-2.2.11.recipe +++ b/dev-db/redis/redis-2.2.11.recipe @@ -1,9 +1,9 @@ -HOMEPAGE= "http://redis.io/" +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." -SRC_URI= "http://redis.googlecode.com/files/redis-2.2.11.tar.gz" -REVISION = "1" +SRC_URI="http://redis.googlecode.com/files/redis-2.2.11.tar.gz" +REVISION="1" DEPEND="" -CHECKSUM_MD5= "5501c90ca02ae7ea93c34f067b3e0619" +CHECKSUM_MD5="5501c90ca02ae7ea93c34f067b3e0619" STATUS_HAIKU="broken" MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." BUILD() @@ -19,4 +19,4 @@ INSTALL() } LICENSE="BSD (3-clause)" -COPYRIGHT="2006-2010 Salvatore Sanfilippo" \ No newline at end of file +COPYRIGHT="2006-2010 Salvatore Sanfilippo" diff --git a/dev-db/redis/redis-2.9.0-git.recipe b/dev-db/redis/redis-2.9.0-git.recipe index e6d5a43be..66322690b 100644 --- a/dev-db/redis/redis-2.9.0-git.recipe +++ b/dev-db/redis/redis-2.9.0-git.recipe @@ -1,7 +1,7 @@ -HOMEPAGE= "http://redis.io/" +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." -SRC_URI= "git://github.com/antirez/redis.git" -REVISION = "1" +SRC_URI="git://github.com/antirez/redis.git" +REVISION="1" DEPEND="" STATUS_HAIKU="stable" # CHECKSUM_MD5= "5501c90ca02ae7ea93c34f067b3e0619" @@ -19,4 +19,4 @@ INSTALL() } LICENSE="BSD (3-clause)" -COPYRIGHT="2006-2010 Salvatore Sanfilippo" \ No newline at end of file +COPYRIGHT="2006-2010 Salvatore Sanfilippo" diff --git a/dev-libs/libiconv/libiconv-1.12.recipe b/dev-libs/libiconv/libiconv-1.12.recipe index 8f73b7a67..06ce5c699 100644 --- a/dev-libs/libiconv/libiconv-1.12.recipe +++ b/dev-libs/libiconv/libiconv-1.12.recipe @@ -43,7 +43,8 @@ INSTALL() make install } -TEST{ +TEST() +{ cd libiconv-1.12 make check } diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe index 68a18ae83..af0719110 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.recipe +++ b/dev-libs/libiconv/libiconv-1.13.1.recipe @@ -54,7 +54,8 @@ INSTALL() make install } -TEST{ +TEST() +{ make check } diff --git a/dev-libs/tinyxml/tinyxml-2.6.2.recipe b/dev-libs/tinyxml/tinyxml-2.6.2.recipe index 8e6deeabf..0bcaeec8b 100644 --- a/dev-libs/tinyxml/tinyxml-2.6.2.recipe +++ b/dev-libs/tinyxml/tinyxml-2.6.2.recipe @@ -1,11 +1,11 @@ -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" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" - +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" +REVISION="1" +STATUS_HAIKU="untested" +DEPEND="" + BUILD() { cd tinyxml @@ -13,17 +13,17 @@ BUILD() wget http://libtinyxml.googlecode.com/svn/trunk/CMakeLists.txt cmake ./ make -} - +} + INSTALL() -{ +{ cd tinyxml make install mkdir -p ${DESTDIR}`finddir B_COMMON_DEVELOP_DIRECTORY`/tinyxml cp ./*.cpp ${DESTDIR}`finddir B_COMMON_DEVELOP_DIRECTORY`/tinyxml mkdir -p ${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/tinyxml cp ./docs/* ${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/tinyxml -} - -LICENSE="Zlib" -COPYRIGHT="2001-2010 Lee Thomason" +} + +LICENSE="Zlib" +COPYRIGHT="2001-2010 Lee Thomason" diff --git a/dev-python/paramiko/paramiko-1.7.6.recipe b/dev-python/paramiko/paramiko-1.7.6.recipe index a1c21fd8d..7dc55604a 100644 --- a/dev-python/paramiko/paramiko-1.7.6.recipe +++ b/dev-python/paramiko/paramiko-1.7.6.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Pure python SSH implementation" HOMEPAGE="http://www.lag.net/paramiko/" SRC_URI="http://pypi.python.org/packages/source/p/paramiko/paramiko-1.7.6.zip" -REVISION= "1" +REVISION="1" STATUS_HAIKU="stable" DEPEND="pycrypto >= 1.9" CHECKSUM_MD5="b1cfe0cd55772115f808a11c1baba8a0" @@ -21,4 +21,4 @@ INSTALL() } LICENSE="GNU LGPL v2.1" -COPYRIGHT="2003-2009 Robey Pointer" \ No newline at end of file +COPYRIGHT="2003-2009 Robey Pointer" diff --git a/dev-python/pycrypto/pycrypto-2.3.recipe b/dev-python/pycrypto/pycrypto-2.3.recipe index 27c9dc0bb..70209d8cb 100644 --- a/dev-python/pycrypto/pycrypto-2.3.recipe +++ b/dev-python/pycrypto/pycrypto-2.3.recipe @@ -1,7 +1,7 @@ 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" +REVISION="1" STATUS_HAIKU="unstable" DEPEND="" CHECKSUM_MD5="2b811cfbfc342d83ee614097effb8101" @@ -20,4 +20,4 @@ INSTALL() fi } LICENSE="pycrypto" -COPYRIGHT="2010 Dwayne C. Litzenberger" \ No newline at end of file +COPYRIGHT="2010 Dwayne C. Litzenberger" diff --git a/dev-python/pydispatcher/pydispatcher-2.0.1.recipe b/dev-python/pydispatcher/pydispatcher-2.0.1.recipe index 6b39e5a92..48c54d4f0 100644 --- a/dev-python/pydispatcher/pydispatcher-2.0.1.recipe +++ b/dev-python/pydispatcher/pydispatcher-2.0.1.recipe @@ -1,7 +1,7 @@ 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" +REVISION="1" STATUS_HAIKU="stable" DEPEND="dev-python/setuptools >= 0.6" CHECKSUM_MD5="8b1695ed6f5bdbda8fbcde82b62d505c" @@ -20,4 +20,4 @@ INSTALL() } LICENSE="BSD (3-clause)" -COPYRIGHT="2001-2006, Patrick K. O'Brien and Contributors" \ No newline at end of file +COPYRIGHT="2001-2006, Patrick K. O'Brien and Contributors" diff --git a/dev-python/setuptools/setuptools-0.6.recipe b/dev-python/setuptools/setuptools-0.6.recipe index c57353d61..1f274cae1 100644 --- a/dev-python/setuptools/setuptools-0.6.recipe +++ b/dev-python/setuptools/setuptools-0.6.recipe @@ -1,7 +1,7 @@ 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" +REVISION="1" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="7df2a529a074f613b509fb44feefe74e" diff --git a/dev-util/bakefile/bakefile-0.2.8.recipe b/dev-util/bakefile/bakefile-0.2.8.recipe index 562bee05f..3c075665b 100644 --- a/dev-util/bakefile/bakefile-0.2.8.recipe +++ b/dev-util/bakefile/bakefile-0.2.8.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Native makefiles generator" HOMEPAGE="http://www.bakefile.org" SRC_URI="http://sourceforge.net/projects/bakefile/files/bakefile/0.2.8/bakefile-0.2.8.tar.gz/download" -CHECKSUM_MD5 = "874da5c9035514366b7723bc7657c71c" +CHECKSUM_MD5="874da5c9035514366b7723bc7657c71c" REVISION="1" STATUS_HAIKU="stable" DEPEND="" diff --git a/dev-util/cppunit/cppunit-1.12.1.recipe b/dev-util/cppunit/cppunit-1.12.1.recipe index f1d7044bf..ccad5254c 100644 --- a/dev-util/cppunit/cppunit-1.12.1.recipe +++ b/dev-util/cppunit/cppunit-1.12.1.recipe @@ -1,7 +1,7 @@ DESCRIPTION="C++ port of the famous JUnit framework for unit testing" HOMEPAGE="http://cppunit.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/cppunit-1.12.1.tar.gz/download" -CHECKSUM_MD5 = "bd30e9cf5523cdfc019b94f5e1d7fd19" +CHECKSUM_MD5="bd30e9cf5523cdfc019b94f5e1d7fd19" REVISION="1" STATUS_HAIKU="stable" DEPEND="" diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe index b63ab2c8f..fc13e661d 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -21,10 +21,10 @@ INSTALL() fi } +shopt -s extglob TEST() { cd mercurial-2.2.2/tests - shopt -s extglob sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) python run-tests.py } diff --git a/dev-vcs/mercurial/mercurial-2.2.3.recipe b/dev-vcs/mercurial/mercurial-2.2.3.recipe index 58b946897..c7d8c2dab 100644 --- a/dev-vcs/mercurial/mercurial-2.2.3.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.3.recipe @@ -21,10 +21,10 @@ INSTALL() fi } +shopt -s extglob TEST() { cd mercurial-2.2.3/tests - shopt -s extglob sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) python run-tests.py } diff --git a/dev-vcs/mercurial/mercurial-2.3.recipe b/dev-vcs/mercurial/mercurial-2.3.recipe index e9b1f1743..d6e062095 100644 --- a/dev-vcs/mercurial/mercurial-2.3.recipe +++ b/dev-vcs/mercurial/mercurial-2.3.recipe @@ -21,10 +21,10 @@ INSTALL() fi } +shopt -s extglob TEST() { cd mercurial-2.3/tests - shopt -s extglob sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) python run-tests.py } diff --git a/dev-vcs/mercurial/mercurial-2.4.recipe b/dev-vcs/mercurial/mercurial-2.4.recipe index 7fc62876f..b3a628780 100644 --- a/dev-vcs/mercurial/mercurial-2.4.recipe +++ b/dev-vcs/mercurial/mercurial-2.4.recipe @@ -21,10 +21,10 @@ INSTALL() fi } +shopt -s extglob TEST() { cd mercurial-2.4/tests - shopt -s extglob sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) python run-tests.py } diff --git a/dev-vcs/tig/tig-0.16.recipe b/dev-vcs/tig/tig-0.16.recipe index 749d8fe8d..53e29959a 100644 --- a/dev-vcs/tig/tig-0.16.recipe +++ b/dev-vcs/tig/tig-0.16.recipe @@ -4,7 +4,7 @@ SRC_URI="http://jonas.nitro.dk/tig/releases/tig-0.16.tar.gz" CHECKSUM_MD5="684572d93033d6cbfc5ee71cffe02935" REVISION="1" STATUS_HAIKU="untested" -DEPEND="sys-libs/ncurses >= 5.7"" +DEPEND="sys-libs/ncurses >= 5.7" BUILD() { cd tig-0.16 @@ -20,4 +20,4 @@ INSTALL() make install } LICENSE="GNU GPL v2" -COPYRIGHT="2006-2010 Jonas Fonseca" \ No newline at end of file +COPYRIGHT="2006-2010 Jonas Fonseca" diff --git a/haiku-apps/bowser/bowser-1.1.1-cvs.recipe b/haiku-apps/bowser/bowser-1.1.1-cvs.recipe index 9d2af2a94..4a127a126 100644 --- a/haiku-apps/bowser/bowser-1.1.1-cvs.recipe +++ b/haiku-apps/bowser/bowser-1.1.1-cvs.recipe @@ -7,12 +7,12 @@ DEPEND="" BUILD() { - + true } INSTALL() { - + true } #COPYRIGHT="" diff --git a/media-fonts/farsi-fonts/farsi-fonts-0.4.recipe b/media-fonts/farsi-fonts/farsi-fonts-0.4.recipe index 33d8e94a8..0ad6033be 100644 --- a/media-fonts/farsi-fonts/farsi-fonts-0.4.recipe +++ b/media-fonts/farsi-fonts/farsi-fonts-0.4.recipe @@ -14,8 +14,7 @@ INSTALL() { FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ mkdir -p ${FONTDIR} - cp -r *.ttf() -{FONTDIR} + cp -r *.ttf ${FONTDIR} } LICENSE="GNU GPL v2" diff --git a/media-libs/libmodplug/libmodplug-0.8.7.recipe b/media-libs/libmodplug/libmodplug-0.8.7.recipe index a2ff0c2b0..b42df20f2 100644 --- a/media-libs/libmodplug/libmodplug-0.8.7.recipe +++ b/media-libs/libmodplug/libmodplug-0.8.7.recipe @@ -27,4 +27,4 @@ INSTALL() make install } LICENSE="Public Domain" -COPYRIGHT=" +#COPYRIGHT="" diff --git a/sci-libs/gsl/gsl-1.14.recipe b/sci-libs/gsl/gsl-1.14.recipe index cd9d6e3ac..899dfb251 100644 --- a/sci-libs/gsl/gsl-1.14.recipe +++ b/sci-libs/gsl/gsl-1.14.recipe @@ -26,4 +26,4 @@ INSTALL() } LICENSE="GNU GPL v3" -COPYRIGHT="1996-2000, 2007 Brian Gough, Gerard Jungman, Mark Galassi, James Theiler, Reid Priedhorsky, Jim Davies and others. +COPYRIGHT="1996-2000, 2007 Brian Gough, Gerard Jungman, Mark Galassi, James Theiler, Reid Priedhorsky, Jim Davies and others." From fee11484cfd64f0565533f49ab5750f33f5ca5ba Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 1 Apr 2013 17:52:42 +0000 Subject: [PATCH 050/587] * replace STATUS_HAIKU with appropriate ARCHITECTURES specification --- dev-db/sqlite/sqlite-3.7.5.recipe | 2 +- dev-lang/perl/perl-5.10.1.recipe | 2 +- dev-libs/apr-util/apr-util-1.3.10.recipe | 2 +- dev-libs/apr/apr-1.4.2.recipe | 2 +- dev-libs/expat/expat-2.0.1.recipe | 2 +- dev-libs/libiconv/libiconv-1.13.1.recipe | 2 +- dev-libs/libxml2/libxml2-2.7.8.recipe | 2 +- dev-libs/openssl/openssl-1.0.0d.recipe | 2 +- dev-vcs/cvs/cvs-1.12.13.1.recipe | 2 +- dev-vcs/subversion/subversion-1.6.15.recipe | 2 +- net-misc/neon/neon-0.29.6.recipe | 2 +- sys-apps/texinfo/texinfo-4.13a.recipe | 2 +- sys-devel/autoconf/autoconf-2.68.recipe | 2 +- sys-devel/automake/automake-1.11.1.recipe | 2 +- sys-devel/bison/bison-2.4.3.recipe | 2 +- sys-devel/flex/flex-2.5.35.recipe | 2 +- sys-devel/gcc/gcc-2.95.3_110711.recipe | 2 +- sys-devel/libtool/libtool-2.4.recipe | 2 +- sys-devel/m4/m4-1.4.16.recipe | 2 +- sys-devel/make/make-3.82.recipe | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dev-db/sqlite/sqlite-3.7.5.recipe b/dev-db/sqlite/sqlite-3.7.5.recipe index ba99e8c15..bdf72b3a0 100644 --- a/dev-db/sqlite/sqlite-3.7.5.recipe +++ b/dev-db/sqlite/sqlite-3.7.5.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://www.sqlite.org/" SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz" CHECKSUM_MD5="a9604a82613ade2e7f4c303f233e477f" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="sqlite = $portVersion compat >= 3.7 cmd:sqlite3 = $portVersion compat >= 3.7 diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe index a1eb8bb6c..5cdc0cd60 100644 --- a/dev-lang/perl/perl-5.10.1.recipe +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Larry Wall's Practical Extraction and Report Language." HOMEPAGE="http://www.perl.org/" SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="perl = $portVersion compat >= 5 cmd:perl = $portVersion compat >= 5 lib:libperl = $portVersion compat >= 5" 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 1ee3e329a..9067c8950 100644 --- a/dev-libs/apr-util/apr-util-1.3.10.recipe +++ b/dev-libs/apr-util/apr-util-1.3.10.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://apr.apache.org/" SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz" CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="apr-util = $portVersion compat >= 1 lib:libaprutil = $portVersion compat >= 1 diff --git a/dev-libs/apr/apr-1.4.2.recipe b/dev-libs/apr/apr-1.4.2.recipe index 6032068bc..1cc5fff37 100644 --- a/dev-libs/apr/apr-1.4.2.recipe +++ b/dev-libs/apr/apr-1.4.2.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://apr.apache.org/" SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz" CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="apr = $portVersion compat >= 1 lib:libapr = $portVersion compat >= 1 diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe index a73cccda6..ab622f8a9 100644 --- a/dev-libs/expat/expat-2.0.1.recipe +++ b/dev-libs/expat/expat-2.0.1.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://expat.sourceforge.net/" SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz" CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="expat = $portVersion compat >= 2.0 lib:libexpat = $portVersion compat >= 1.5" diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe index af0719110..09dd10de8 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.recipe +++ b/dev-libs/libiconv/libiconv-1.13.1.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://www.gnu.org/software/libiconv/" SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz" CHECKSUM_MD5="7ab33ebd26687c744a37264a330bbe9a" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="iconv = $portVersion compat >= 1.13 cmd:iconv = 2.5.0 compat >= 2 diff --git a/dev-libs/libxml2/libxml2-2.7.8.recipe b/dev-libs/libxml2/libxml2-2.7.8.recipe index 6b771096e..8d956ecee 100644 --- a/dev-libs/libxml2/libxml2-2.7.8.recipe +++ b/dev-libs/libxml2/libxml2-2.7.8.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://www.xmlsoft.org/" SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz" CHECKSUM_MD5="8127a65e8c3b08856093099b52599c86" REVISION="2" -STATUS_HAIKU="broken" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="libxml2 = $portVersion compat >= 2.7 lib:libxml2 = $portVersion compat >= 2.7" diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe index 128323468..d86f61bcd 100644 --- a/dev-libs/openssl/openssl-1.0.0d.recipe +++ b/dev-libs/openssl/openssl-1.0.0d.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://www.openssl.org/" SRC_URI="http://www.openssl.org/source/openssl-1.0.0d.tar.gz" CHECKSUM_MD5="40b6ea380cc8a5bf9734c2f8bf7e701e" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="openssl = $portVersion compat >= 1 cmd:c_rehash = $portVersion compat >= 1 diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe index 172b2c168..ee3b4f102 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.recipe +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://www.nongnu.org/cvs/" SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2" CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="cvs = $portVersion compat >= 1.12 cmd:cvs = $portVersion compat >= 1.12" diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe index 08127c925..047556d58 100644 --- a/dev-vcs/subversion/subversion-1.6.15.recipe +++ b/dev-vcs/subversion/subversion-1.6.15.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://subversion.apache.org" SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.15.tar.bz2" CHECKSUM_MD5="113fca1d9e4aa389d7dc2b210010fa69" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="subversion = $portVersion compat >= 1.6 cmd:svn = $portVersion compat >= 1.6 diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe index a51d30e38..8aa8370c9 100644 --- a/net-misc/neon/neon-0.29.6.recipe +++ b/net-misc/neon/neon-0.29.6.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://www.webdav.org/neon/" SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz" CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="neon = $portVersion compat >= 0.29 lib:libneon = 27.2.6 compat >= 27.2" diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe index b6dba1cc4..c0dcd5d92 100644 --- a/sys-apps/texinfo/texinfo-4.13a.recipe +++ b/sys-apps/texinfo/texinfo-4.13a.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://www.gnu.org/software/texinfo/" SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz" CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="texinfo = $portVersion compat >= 4.13 cmd:info = $portVersion compat >= 4.13 diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index 7ea79bb71..0faa897e0 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -7,7 +7,7 @@ HOMEPAGE="http://www.gnu.org/software/autoconf/" SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2" CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="autoconf = $portVersion compat >= 2.68 cmd:autoconf = $portVersion compat >= 2.68 diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe index 6afc2948f..21358f476 100644 --- a/sys-devel/automake/automake-1.11.1.recipe +++ b/sys-devel/automake/automake-1.11.1.recipe @@ -7,7 +7,7 @@ HOMEPAGE="http://www.gnu.org/software/automake/" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz" CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="automake = $portVersion compat >= 1.11 cmd:automake = $portVersion compat >= 1.11 diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe index 92392ee5f..b08590afd 100644 --- a/sys-devel/bison/bison-2.4.3.recipe +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnu.org/software/bison/bison.html" SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz" CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="bison = $portVersion compat >= 2.4 cmd:bison = $portVersion compat >= 2.4 diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index 89e5022d2..043051895 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -5,7 +5,7 @@ HOMEPAGE="http://flex.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download" CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="flex = $portVersion compat >= 2.5 cmd:flex = $portVersion compat >= 2.5 diff --git a/sys-devel/gcc/gcc-2.95.3_110711.recipe b/sys-devel/gcc/gcc-2.95.3_110711.recipe index 0c0f6aa31..0826530d5 100644 --- a/sys-devel/gcc/gcc-2.95.3_110711.recipe +++ b/sys-devel/gcc/gcc-2.95.3_110711.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://gcc.gnu.org" # TODO: Also: http://www.gnu.org/software/binutils SRC_URI="git+git://github.com/weinhold/buildtools.git#ba94fdf309096bd9bbf432ad53efba62bc47f98e" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="gcc = $portVersion compat >= 2.95.3 cmd:cpp = $portVersion compat >= 2.95.3 diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index a6e0a3c3d..947d62452 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -5,7 +5,7 @@ HOMEPAGE="http://www.gnu.org/software/libtool" SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz" CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="libtool = $portVersion compat >= 2.4 cmd:libtool = $portVersion compat >= 2.4 diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe index 83f900e7f..7c5ada088 100644 --- a/sys-devel/m4/m4-1.4.16.recipe +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://www.gnu.org/software/m4/" SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz" CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" REVISION="2" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="m4 = $portVersion compat >= 1.4 cmd:m4 = $portVersion compat >= 1.4" diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index fa0f3634a..689f493a5 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://www.gnu.org/software/make/" SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2" CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f" REVISION="2" -STATUS_HAIKU="broken" +ARCHITECTURES="x86_gcc2 ?x86" # make-3.82 has problems/incompatibilities when doing 'make install DESTDIR' # on other packages (e.g. perl) From 8cc5b19ad556259ead8893b7a41255e58ba16a91 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 2 Apr 2013 05:14:25 +0000 Subject: [PATCH 051/587] Update curl to 7.29.0 --- net-misc/curl/curl-7.29.0.recipe | 33 ++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 net-misc/curl/curl-7.29.0.recipe diff --git a/net-misc/curl/curl-7.29.0.recipe b/net-misc/curl/curl-7.29.0.recipe new file mode 100644 index 000000000..c9ffc72c0 --- /dev/null +++ b/net-misc/curl/curl-7.29.0.recipe @@ -0,0 +1,33 @@ +DESCRIPTION="curl and libcurl" +HOMEPAGE="http://curl.haxx.se" +SRC_URI="http://curl.haxx.se/download/curl-7.29.0.tar.bz2" +CHECKSUM_MD5="fa5f37f38a8042020e292ce7ec5341ce" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD() +{ + cd curl-7.29.0 + libtoolize --force --copy --install + autoconf + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --enable-ipv6 \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem + make +} + +INSTALL() +{ + cd curl-7.29.0 + make install +} + +TEST() +{ + cd curl-7.29.0 + make check +} + +LICENSE="Curl" +COPYRIGHT="1996-2013, Daniel Stenberg, . All rights reserved." From f0a5b24ee4d93a44db975965ec378f6359c8e0bf Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 2 Apr 2013 05:25:50 +0000 Subject: [PATCH 052/587] Converted autoconf-2.69 and automake-1.13.1 to .recipe format. --- sys-devel/autoconf/autoconf-2.69.recipe | 49 +++++++++++++++++------ sys-devel/automake/automake-1.13.1.recipe | 43 ++++++++++++-------- 2 files changed, 63 insertions(+), 29 deletions(-) diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index 223b78f20..56be3cca7 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -1,30 +1,53 @@ -DESCRIPTION="autoconf - Used to create autoconfiguration files" +SUMMARY="A GNU tool for automatically configuring source code" +DESCRIPTION="GNU Autoconf is a tool for configuring source code and makefiles. Using + autoconf, programmers can create portable and configurable packages, + because the person building the package is allowed to specify various + configuration options." HOMEPAGE="http://www.gnu.org/software/autoconf/" SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz" CHECKSUM_MD5="50f97f4159805e374639a73e2636f22e" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES="autoconf = $portVersion compat >= 2.69 + cmd:autoconf = $portVersion compat >= 2.69 + cmd:autoheader = $portVersion compat >= 2.69 + cmd:autom4te = $portVersion compat >= 2.69 + cmd:autoreconf = $portVersion compat >= 2.69 + cmd:autoscan = $portVersion compat >= 2.69 + cmd:autoupdate = $portVersion compat >= 2.69 + cmd:ifnames = $portVersion compat >= 2.69" +REQUIRES="haiku >= $haikuVersion + cmd:awk + coreutils + diffutils + cmd:m4 >= 1.4 + cmd:make + cmd:perl >= 5 + cmd:sh" +BUILD_REQUIRES="cmd:automake >= 1.13.1" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + cmd:autoreconf >= 2.69 + cmd:sed" + +SOURCE_DIR="$portVersionedName" +BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL" + BUILD() { - cd autoconf-2.69 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` - make + autoreconf + PERL="perl" M4="m4" SED="sed" \ + ./configure $configureDirArgs + make -j$jobs } INSTALL() { - cd autoconf-2.69 make install } TEST() { - cd autoconf-2.69 make check } diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index 11395f3b4..66d5fae9e 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -1,33 +1,44 @@ -DESCRIPTION="automake - Used to generate Makefile.in from Makefile.am" +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." HOMEPAGE="http://www.gnu.org/software/automake/" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz" CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES="automake = $portVersion compat >= 1.11 + cmd:automake = $portVersion compat >= 1.11 + cmd:automake-1.11 = $portVersion compat >= 1.11 + cmd:aclocal = $portVersion compat >= 1.11 + cmd:aclocal-1.11 = $portVersion compat >= 1.11" +REQUIRES="haiku >= $haikuVersion + cmd:awk + coreutils + diffutils + cmd:m4 >= 1.4 + cmd:perl >= 5 + cmd:sh" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + cmd:make" + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd automake-1.13.1 - libtoolize --force --copy --install - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=$COMMON_DATA \ - --docdir=$COMMON_DOCS/doc/automake \ - --infodir=$COMMON_DOCS/info \ - --mandir=$COMMON_DOCS/man - make + PERL="/bin/env perl" ./configure $configureDirArgs + make -j$jobs } INSTALL() { - cd automake-1.13.1 make install } TEST() { - cd automake-1.13.1 make check } From e90db8275db28077174f045a4830f6428827a5d1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 2 Apr 2013 12:13:50 +0000 Subject: [PATCH 053/587] Add a recipe for libsolv Gentoo Portage doesn't know it, so I just picked the dev-libs category. --- .../libsolv-0.3.0_haiku_2013_04_01.recipe | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_01.recipe diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_01.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_01.recipe new file mode 100644 index 000000000..8069e7d01 --- /dev/null +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_01.recipe @@ -0,0 +1,39 @@ +SUMMARY="Library for solving packages and reading repositories" +DESCRIPTION="Library for solving packages and reading repositories." +HOMEPAGE="http://github.com/openSUSE/libsolv" +SRC_URI="git+git://github.com/weinhold/libsolv.git#21ca29f8f21fa05384fe3fd095652b7999fec759" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES="libsolv = $portVersion + lib:libsolv = $portVersion + lib:libsolvext = $portVersion" +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + cmd:cmake + cmd:gcc + cmd:ld + cmd:make" + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix .. + make +} + +INSTALL() +{ + cd build + make install + + # We don't wont the executables. + rm -r $prefix/bin +} + +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2013, Novell Inc." From e73e25f6e49da65955026fb2add74c0c24f6d622 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 5 Apr 2013 15:43:33 +0000 Subject: [PATCH 054/587] Update sqlite to 3.7.16.1 --- dev-db/sqlite/sqlite-3.7.16.1.recipe | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 dev-db/sqlite/sqlite-3.7.16.1.recipe diff --git a/dev-db/sqlite/sqlite-3.7.16.1.recipe b/dev-db/sqlite/sqlite-3.7.16.1.recipe new file mode 100644 index 000000000..021d16a6f --- /dev/null +++ b/dev-db/sqlite/sqlite-3.7.16.1.recipe @@ -0,0 +1,28 @@ +DESCRIPTION="Software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." +HOMEPAGE="http://www.sqlite.org/" +SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071601.tar.gz" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="8860d1a1ed26d40f07e3c7ae035b644a" +BUILD() +{ + cd sqlite-autoconf-3071601 + libtoolize --force --copy --install + aclocal + autoconf + automake + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --mandir=$COMMON_DOCS/man + make +} + +INSTALL() +{ + cd sqlite-autoconf-3071601 + make install +} + +LICENSE="SQLite" +COPYRIGHT="2013 Public Domain" From 6ce69995779081296235d18c13ed44ab47e09978 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 6 Apr 2013 13:09:20 +0000 Subject: [PATCH 055/587] Added top-level folders: - 'packages' is where built packages are being collected - 'repository' will be populated by haikuporter with the package-info files required for dependency resolution via pkgman From 9597a02f4012819e050313aa57760e92ab735e90 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 7 Apr 2013 21:43:33 +0000 Subject: [PATCH 056/587] Add cmd:tar as requirement of libtool * libtool uses tar to copy files, so it is a runtime requirement --- sys-devel/libtool/libtool-2.4.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index 947d62452..94efe4f42 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -14,7 +14,8 @@ PROVIDES="libtool = $portVersion compat >= 2.4 lib:libltdl = 7.3.0 compat >= 7" REQUIRES="haiku >= $haikuVersion cmd:aclocal >= 1.11.1 - cmd:automake >= 1.11.1" + cmd:automake >= 1.11.1 + cmd:tar" BUILD_REQUIRES="cmd:autoconf >= 2.68 cmd:autoheader >= 2.68" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion From 84781ee68a1942e20424c7058624c2c562b40c36 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 9 Apr 2013 18:02:13 +0000 Subject: [PATCH 057/587] libiconv: Fix provides The main provides must be "libiconv", not "iconv". --- dev-libs/libiconv/libiconv-1.13.1.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe index 09dd10de8..35eb8e5a7 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.recipe +++ b/dev-libs/libiconv/libiconv-1.13.1.recipe @@ -3,10 +3,10 @@ DESCRIPTION="GNU iconv implementation." HOMEPAGE="http://www.gnu.org/software/libiconv/" SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz" CHECKSUM_MD5="7ab33ebd26687c744a37264a330bbe9a" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="iconv = $portVersion compat >= 1.13 +PROVIDES="libiconv = $portVersion compat >= 1.13 cmd:iconv = 2.5.0 compat >= 2 lib:libiconv = 2.5.0 compat >= 2 lib:libcharset = 1.0.0 compat >= 1" From a035e90844b119c2622166da8f576b023a2eabc5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 9 Apr 2013 18:05:35 +0000 Subject: [PATCH 058/587] sqlite: Relax compat version from 3.7 to 3 The subversion requires is >= 3.4, so things didn't quite fit before. --- dev-db/sqlite/sqlite-3.7.5.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-db/sqlite/sqlite-3.7.5.recipe b/dev-db/sqlite/sqlite-3.7.5.recipe index bdf72b3a0..223e6b399 100644 --- a/dev-db/sqlite/sqlite-3.7.5.recipe +++ b/dev-db/sqlite/sqlite-3.7.5.recipe @@ -3,13 +3,13 @@ DESCRIPTION="SQLite is a software library that implements a self-contained, serv HOMEPAGE="http://www.sqlite.org/" SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz" CHECKSUM_MD5="a9604a82613ade2e7f4c303f233e477f" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="sqlite = $portVersion compat >= 3.7 - cmd:sqlite3 = $portVersion compat >= 3.7 - lib:libsqlite = $portVersion compat >= 3.7 - lib:libsqlite3 = $portVersion compat >= 3.7" +PROVIDES="sqlite = $portVersion compat >= 3 + cmd:sqlite3 = $portVersion compat >= 3 + lib:libsqlite = $portVersion compat >= 3 + lib:libsqlite3 = $portVersion compat >= 3" REQUIRES="haiku >= $haikuVersion" BUILD_REQUIRES="cmd:aclocal cmd:autoconf From 3ca9eb8d5e8faaf7409de408076e17d5d6314e5c Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 10 Apr 2013 10:41:19 +0000 Subject: [PATCH 059/587] Changed recipe for sqlite-3.7.16.1 based on the updated one for sqlite-3.7.5 --- dev-db/sqlite/sqlite-3.7.16.1.recipe | 47 ++++++++++++++++++---------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/dev-db/sqlite/sqlite-3.7.16.1.recipe b/dev-db/sqlite/sqlite-3.7.16.1.recipe index 021d16a6f..8ea40afe3 100644 --- a/dev-db/sqlite/sqlite-3.7.16.1.recipe +++ b/dev-db/sqlite/sqlite-3.7.16.1.recipe @@ -1,28 +1,41 @@ -DESCRIPTION="Software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" +SUMMARY="A 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." +HOMEPAGE="http://www.sqlite.org/" SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071601.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="8860d1a1ed26d40f07e3c7ae035b644a" +REVISION="3" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES="sqlite = $portVersion compat >= 3 + cmd:sqlite3 = $portVersion compat >= 3 + lib:libsqlite = $portVersion compat >= 3 + lib:libsqlite3 = $portVersion compat >= 3" +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES="cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + +SOURCE_DIR="sqlite-autoconf-3071601" + BUILD() { - cd sqlite-autoconf-3071601 - libtoolize --force --copy --install - aclocal - autoconf - automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man - make + libtoolize --force --copy --install + aclocal + autoconf + automake + ./configure $configureDirArgs + make } INSTALL() { - cd sqlite-autoconf-3071601 - make install + make install } LICENSE="SQLite" -COPYRIGHT="2013 Public Domain" +COPYRIGHT="Public Domain" From a085212a2eda525e1736d24fb84734cf1a1f63d5 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 11 Apr 2013 11:24:15 +0000 Subject: [PATCH 060/587] Dropped packages- and repository-folders again, as keeping them under version control makes things more difficult than needed. From 2c784482c24e52d6386205461b403a0cbde4642c Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 11 Apr 2013 20:19:37 +0000 Subject: [PATCH 061/587] Convert sed-4.2.1 to recipe format and adjust the patch to no longer require fuzz. --- sys-apps/sed/patches/sed-4.2.1.patch | 8 +++--- sys-apps/sed/sed-4.2.1.recipe | 37 +++++++++++++++++----------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/sys-apps/sed/patches/sed-4.2.1.patch b/sys-apps/sed/patches/sed-4.2.1.patch index cd8b63ea3..a4b6c52f0 100644 --- a/sys-apps/sed/patches/sed-4.2.1.patch +++ b/sys-apps/sed/patches/sed-4.2.1.patch @@ -1,12 +1,12 @@ diff -urN sed-4.2.1.orig/lib/regexec.c sed-4.2.1/lib/regexec.c --- sed-4.2.1.orig/lib/regexec.c 2008-06-04 18:23:17.189401740 +0000 +++ sed-4.2.1/lib/regexec.c 2008-06-04 18:26:00.994736475 +0000 -@@ -18,6 +18,8 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ +@@ -20,6 +20,8 @@ + with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "stdbool.h" + static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, - int n) internal_function; + Idx n) internal_function; static void match_ctx_clean (re_match_context_t *mctx) internal_function; diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe index 9b2dc4cdd..df21864b3 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -1,23 +1,31 @@ -DESCRIPTION="sed - a stream editor" +SUMMARY="sed - a stream editor" +DESCRIPTION="Sed is a stream editor. A stream editor is 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" SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz" CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES="sed = $portVersion compat >= 4 + cmd:sed = $portVersion compat >= 4" +REQUIRES="haiku >= $haikuVersion" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + cmd:autoconf >= 2.68" + + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd sed-4.2.1 autoconf - prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/sed-4.2.1 - ./configure --prefix=$prefix \ - --datarootdir=$prefix/data \ - --sbindir=$prefix/bin \ - --includedir=$prefix/develop/headers \ - --sysconfdir=$prefix/settings \ - --docdir=$prefix/documentation/sed \ - --infodir=$prefix/documentation/info \ - --mandir=$prefix/documentation/man \ + ./configure $configureDirArgs \ --enable-regex-tests --without-included-regex \ --disable-rpath --with-gnu-ld make @@ -25,9 +33,8 @@ BUILD() INSTALL() { - cd sed-4.2.1 make install - make check } + LICENSE="GNU GPL v3" COPYRIGHT="1989-2009 Free Software Foundation, Inc." From 131b195e6bdbde528d801a2d7fe5c8759d803994 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 11 Apr 2013 20:20:11 +0000 Subject: [PATCH 062/587] Convert tar-1.26 to recipe format. --- app-arch/tar/tar-1.26.recipe | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index 4f52f7bb9..68facc8f3 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -1,18 +1,24 @@ +SUMMARY="tar saves and restores files from a tape or disk archive." DESCRIPTION="tar saves and restores files from a tape or disk archive." HOMEPAGE="http://www.gnu.org/software/tar/" SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2" CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES="tar = $portVersion compat >= 1 + cmd:tar = $portVersion compat >= 1" +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES="cmd:automake >= 1.11 + cmd:autoreconf >= 2.68 + cmd:sed" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd tar-1.26 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --infodir=$COMMON_DOCS/info \ - --libexecdir=`finddir B_COMMON_LIB_DIRECTORY`/exec \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ + ./configure $configureDirArgs \ --disable-nls \ LDFLAGS="-lnetwork" \ FORCE_UNSAFE_CONFIGURE=1 @@ -21,8 +27,8 @@ BUILD() INSTALL() { - cd tar-1.26 make install } + LICENSE="GNU GPL v3" COPYRIGHT="1990-2011 Free Software Foundation, Inc." From 0e4b1914bf2413e0839214dc2ec01335c27f393e Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 11 Apr 2013 20:21:55 +0000 Subject: [PATCH 063/587] Move cmd:make from build_requires to build_prerequires in all autoconf recipes. --- sys-devel/autoconf/autoconf-2.68.recipe | 2 +- sys-devel/autoconf/autoconf-2.69.recipe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index 0faa897e0..2ee01fec2 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -22,12 +22,12 @@ REQUIRES="haiku >= $haikuVersion coreutils diffutils cmd:m4 >= 1.4 - cmd:make cmd:perl >= 5 cmd:sh" BUILD_REQUIRES="cmd:automake >= 1.11" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion cmd:autoreconf >= 2.68 + cmd:make cmd:sed" SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index 56be3cca7..e40836506 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -22,12 +22,12 @@ REQUIRES="haiku >= $haikuVersion coreutils diffutils cmd:m4 >= 1.4 - cmd:make cmd:perl >= 5 cmd:sh" BUILD_REQUIRES="cmd:automake >= 1.13.1" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion cmd:autoreconf >= 2.69 + cmd:make cmd:sed" SOURCE_DIR="$portVersionedName" From 434016e7419774430318a86c0604da45430bd41a Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 11 Apr 2013 20:24:14 +0000 Subject: [PATCH 064/587] Take short route of fixing problems in requires of gcc: * there's no cmd:binutils, it's just a package * there's no cmd:texinfo, it's just a package Later, all the required commands should be put here instead of requiring packages. --- sys-devel/gcc/gcc-2.95.3_110711.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-devel/gcc/gcc-2.95.3_110711.recipe b/sys-devel/gcc/gcc-2.95.3_110711.recipe index 0826530d5..c70297739 100644 --- a/sys-devel/gcc/gcc-2.95.3_110711.recipe +++ b/sys-devel/gcc/gcc-2.95.3_110711.recipe @@ -30,10 +30,10 @@ PROVIDES="gcc = $portVersion compat >= 2.95.3 REQUIRES="haiku >= $haikuVersion" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - cmd:binutils - cmd:gcc + binutils + gcc cmd:make - cmd:texinfo" + texinfo" SOURCE_DIR="$portVersionedName" From fa9e20eb9becbb5dc4cf59caca485e7897a1c2ef Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 12 Apr 2013 22:59:22 +0000 Subject: [PATCH 065/587] Add folders 'packages' and 'repository' to svn:ignore From 9324df8ddc05232cda40f5ec99a70a62941ade03 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 12 Apr 2013 23:04:28 +0000 Subject: [PATCH 066/587] Revision 2 of sed-4.2.1: * add missing prerequisites cmd:gcc, cmd:make and cmd:sed * switch build stage to use autoreconf instead of autoconf, as was hinted by a message during the build before, however that doesn't seem to help much with respect to getting rid of warning messages --- sys-apps/sed/sed-4.2.1.recipe | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe index df21864b3..1d96a77c8 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -10,21 +10,26 @@ DESCRIPTION="Sed is a stream editor. A stream editor is used to perform HOMEPAGE="http://www.gnu.org/software/sed" SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz" CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="sed = $portVersion compat >= 4 cmd:sed = $portVersion compat >= 4" REQUIRES="haiku >= $haikuVersion" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - cmd:autoconf >= 2.68" + cmd:gcc + cmd:ld + cmd:aclocal >= 1.11 + cmd:autoreconf >= 2.68 + cmd:make + cmd:sed" SOURCE_DIR="$portVersionedName" BUILD() { - autoconf + autoreconf ./configure $configureDirArgs \ --enable-regex-tests --without-included-regex \ --disable-rpath --with-gnu-ld From afb58916acab9a3765f3a8a93f470e5307b48c2b Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 12 Apr 2013 23:06:04 +0000 Subject: [PATCH 067/587] Revision 3 of texinfo-4.13a: * add missing build-prerequisite cmd:sed --- sys-apps/texinfo/texinfo-4.13a.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe index c0dcd5d92..9fad43770 100644 --- a/sys-apps/texinfo/texinfo-4.13a.recipe +++ b/sys-apps/texinfo/texinfo-4.13a.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Texinfo is the official documentation format of the GNU project." HOMEPAGE="http://www.gnu.org/software/texinfo/" SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz" CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="texinfo = $portVersion compat >= 4.13 @@ -21,7 +21,8 @@ BUILD_PREREQUIRES="haiku-devel >= $haikuVersion cmd:gcc cmd:ld cmd:libtoolize - cmd:make" + cmd:make + cmd:sed" SOURCE_DIR="texinfo-4.13" From 37ce81518626f9f6b24c95482beb582f9e5d0205 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 12 Apr 2013 23:07:44 +0000 Subject: [PATCH 068/587] Revision 3 of perl-5.10.1: * move cmd:sed from build-prerequires to build-requires --- dev-lang/perl/perl-5.10.1.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe index 5cdc0cd60..cfa671d1c 100644 --- a/dev-lang/perl/perl-5.10.1.recipe +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -2,17 +2,17 @@ SUMMARY="Larry Wall's Practical Extraction and Report Language" DESCRIPTION="Larry Wall's Practical Extraction and Report Language." HOMEPAGE="http://www.perl.org/" SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="perl = $portVersion compat >= 5 cmd:perl = $portVersion compat >= 5 lib:libperl = $portVersion compat >= 5" REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES="cmd:sed" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion cmd:gcc cmd:ld - cmd:make - cmd:sed" + cmd:make" CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" SOURCE_DIR="$portVersionedName" From 3a9b7d180882bbb00ecf27a3fbfacd84ee954d92 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 12 Apr 2013 23:09:21 +0000 Subject: [PATCH 069/587] Revision 2 of tar-1.26: * add missing build-prerequires cmd:make, cmd:gcc and cmd:ld --- app-arch/tar/tar-1.26.recipe | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index 68facc8f3..998a81597 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -3,7 +3,7 @@ DESCRIPTION="tar saves and restores files from a tape or disk archive." HOMEPAGE="http://www.gnu.org/software/tar/" SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2" CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="tar = $portVersion compat >= 1 @@ -12,7 +12,10 @@ REQUIRES="haiku >= $haikuVersion" BUILD_REQUIRES="cmd:automake >= 1.11 cmd:autoreconf >= 2.68 cmd:sed" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + cmd:make + cmd:gcc + cmd:ld" SOURCE_DIR="$portVersionedName" From 01383b538da84d725a91ff5c00516566e19058e0 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 12 Apr 2013 23:11:39 +0000 Subject: [PATCH 070/587] Revision 1 of sqlite-3.7.16.1: * declared as untested on all architectures, such that it won't be tried by haikuporter yet --- dev-db/sqlite/sqlite-3.7.16.1.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-db/sqlite/sqlite-3.7.16.1.recipe b/dev-db/sqlite/sqlite-3.7.16.1.recipe index 8ea40afe3..5e7a48a2a 100644 --- a/dev-db/sqlite/sqlite-3.7.16.1.recipe +++ b/dev-db/sqlite/sqlite-3.7.16.1.recipe @@ -3,8 +3,8 @@ DESCRIPTION="SQLite is a software library that implements a self-contained, serv HOMEPAGE="http://www.sqlite.org/" SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071601.tar.gz" CHECKSUM_MD5="8860d1a1ed26d40f07e3c7ae035b644a" -REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="1" +ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES="sqlite = $portVersion compat >= 3 cmd:sqlite3 = $portVersion compat >= 3 From 71bf6f9e949a4a3b1a35e380a467897475a61770 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 12 Apr 2013 23:12:29 +0000 Subject: [PATCH 071/587] Revision 3 of m4-1.4.16: * add cmd:sed as build-requires --- sys-devel/m4/m4-1.4.16.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe index 7c5ada088..c506adb16 100644 --- a/sys-devel/m4/m4-1.4.16.recipe +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -3,12 +3,13 @@ DESCRIPTION="m4 - GNU macro processor." HOMEPAGE="http://www.gnu.org/software/m4/" SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz" CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="m4 = $portVersion compat >= 1.4 cmd:m4 = $portVersion compat >= 1.4" REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES="cmd:sed" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion cmd:gcc cmd:ld From 02490389f55f5830188cd9fd6be3e538f6e740db Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 12 Apr 2013 23:14:46 +0000 Subject: [PATCH 072/587] Revision 3 of flex-2.5.35: * specify to be compatible with autoconf >= 2.60 --- sys-devel/flex/flex-2.5.35.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index 043051895..22a9de705 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -4,7 +4,7 @@ DESCRIPTION="Flex is a fast lexical analyser generator. It is a tool for generat HOMEPAGE="http://flex.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download" CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="flex = $portVersion compat >= 2.5 @@ -13,7 +13,7 @@ PROVIDES="flex = $portVersion compat >= 2.5 lib:libfl_pic.a = $portVersion compat >= 2.5" REQUIRES="haiku >= $haikuVersion" BUILD_REQUIRES="aclocal >= 1.11 - cmd:autoconf >= 2.68 + cmd:autoconf >= 2.60 cmd:automake >= 1.11 cmd:libtoolize >= 2.4" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion From 91b3bbf55bdb70359b7ed8ea4b17457f735a8b48 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 12 Apr 2013 23:17:04 +0000 Subject: [PATCH 073/587] Revision 3 of libtool-2.4: * move cmd:sed from build_prereq to build_req * adjust compatibility declarations for autoconf and automake to match their documented behaviour --- sys-devel/libtool/libtool-2.4.recipe | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index 94efe4f42..e780297c8 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -4,7 +4,7 @@ DESCRIPTION="GNU libtool is a set of shell scripts to automatically configure UN HOMEPAGE="http://www.gnu.org/software/libtool" SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz" CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="libtool = $portVersion compat >= 2.4 @@ -13,17 +13,18 @@ PROVIDES="libtool = $portVersion compat >= 2.4 lib:libltdl.a = 7.3.0 compat >= 7 lib:libltdl = 7.3.0 compat >= 7" REQUIRES="haiku >= $haikuVersion - cmd:aclocal >= 1.11.1 - cmd:automake >= 1.11.1 + cmd:aclocal >= 1.11 + cmd:automake >= 1.11 cmd:tar" -BUILD_REQUIRES="cmd:autoconf >= 2.68 - cmd:autoheader >= 2.68" +BUILD_REQUIRES="cmd:autoconf >= 2.60 + cmd:aclocal >= 1.11 + cmd:autoheader >= 2.60 + cmd:sed" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion cmd:gcc cmd:ld cmd:make - cmd:nm - cmd:sed" + cmd:nm" SOURCE_DIR="$portVersionedName" From 22b1f1519fbd12fe704a247bf8abae4eab233cfc Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 12 Apr 2013 23:18:14 +0000 Subject: [PATCH 074/587] Revision 3 of automake-1.11.1: * add cmd:autoconf and cmd:perl as build_prereqs --- sys-devel/automake/automake-1.11.1.recipe | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe index 21358f476..3353b69a2 100644 --- a/sys-devel/automake/automake-1.11.1.recipe +++ b/sys-devel/automake/automake-1.11.1.recipe @@ -6,7 +6,7 @@ DESCRIPTION="Automake is a tool for automatically generating 'Makefile.in' files HOMEPAGE="http://www.gnu.org/software/automake/" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz" CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="automake = $portVersion compat >= 1.11 @@ -21,8 +21,11 @@ REQUIRES="haiku >= $haikuVersion cmd:m4 >= 1.4 cmd:perl >= 5 cmd:sh" +BUILD_REQUIRES="cmd:sed" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - cmd:make" + cmd:autoconf >= 2.60 + cmd:make + cmd:perl >= 5.8" SOURCE_DIR="$portVersionedName" From 4bee30e63b688f4045ffc7bef353ed77033590cc Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 12 Apr 2013 23:20:02 +0000 Subject: [PATCH 075/587] Revision 1 of automake-1.13.1: * add cmd:autoconf and cmd:perl as build-prereqs * declare as untested on all architectures to make it inactive for haikuporter --- sys-devel/automake/automake-1.13.1.recipe | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index 66d5fae9e..cf419d472 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -6,8 +6,8 @@ DESCRIPTION="Automake is a tool for automatically generating 'Makefile.in' files HOMEPAGE="http://www.gnu.org/software/automake/" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz" CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847" -REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="1" +ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES="automake = $portVersion compat >= 1.11 cmd:automake = $portVersion compat >= 1.11 @@ -21,8 +21,11 @@ REQUIRES="haiku >= $haikuVersion cmd:m4 >= 1.4 cmd:perl >= 5 cmd:sh" +BUILD_REQUIRES="cmd:sed" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - cmd:make" + cmd:autoconf >= 2.60 + cmd:make + cmd:perl >= 5.8" SOURCE_DIR="$portVersionedName" From 77afbd02989c6d42ff7280235ea6c6fced747cb4 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 12 Apr 2013 23:21:48 +0000 Subject: [PATCH 076/587] Revision 3 of make-3.82: * remove comment that no longer applies to how we do "install"s * insert description from homepage * add cmd:sed as build_req --- sys-devel/make/make-3.82.recipe | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index 689f493a5..4216f59ae 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -1,17 +1,23 @@ SUMMARY="Standard tool to compile source trees" -DESCRIPTION="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." HOMEPAGE="http://www.gnu.org/software/make/" SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2" CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" - # make-3.82 has problems/incompatibilities when doing 'make install DESTDIR' - # on other packages (e.g. perl) PROVIDES="make = $portVersion compat >= 3.82 cmd:make = $portVersion compat >= 3.82" REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="cmd:libtoolize" +BUILD_REQUIRES="cmd:libtoolize + cmd:sed" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion cmd:gcc cmd:ld" From 02403b7dab20f1630b543444570078ebcb343b97 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 12 Apr 2013 23:23:38 +0000 Subject: [PATCH 077/587] Revision 3 of autoconf-2.68: * specify compatibility as >= 2.60, matching the documentation * move cmd:sed from build_prereq to build_req --- sys-devel/autoconf/autoconf-2.68.recipe | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index 2ee01fec2..852677aa4 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -6,17 +6,17 @@ DESCRIPTION="GNU Autoconf is a tool for configuring source code and makefiles. U HOMEPAGE="http://www.gnu.org/software/autoconf/" SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2" CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="autoconf = $portVersion compat >= 2.68 - cmd:autoconf = $portVersion compat >= 2.68 - cmd:autoheader = $portVersion compat >= 2.68 - cmd:autom4te = $portVersion compat >= 2.68 - cmd:autoreconf = $portVersion compat >= 2.68 - cmd:autoscan = $portVersion compat >= 2.68 - cmd:autoupdate = $portVersion compat >= 2.68 - cmd:ifnames = $portVersion compat >= 2.68" +PROVIDES="autoconf = $portVersion compat >= 2.60 + cmd:autoconf = $portVersion compat >= 2.60 + cmd:autoheader = $portVersion compat >= 2.60 + cmd:autom4te = $portVersion compat >= 2.60 + cmd:autoreconf = $portVersion compat >= 2.60 + cmd:autoscan = $portVersion compat >= 2.60 + cmd:autoupdate = $portVersion compat >= 2.60 + cmd:ifnames = $portVersion compat >= 2.60" REQUIRES="haiku >= $haikuVersion cmd:awk coreutils @@ -24,11 +24,11 @@ REQUIRES="haiku >= $haikuVersion cmd:m4 >= 1.4 cmd:perl >= 5 cmd:sh" -BUILD_REQUIRES="cmd:automake >= 1.11" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - cmd:autoreconf >= 2.68 - cmd:make +BUILD_REQUIRES="cmd:automake >= 1.11 cmd:sed" +BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + cmd:autoreconf >= 2.60 + cmd:make" SOURCE_DIR="$portVersionedName" BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL" From 5a00b8acf0f73c1b6d7bd61281ebcd7a6f0ed82f Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 12 Apr 2013 23:25:15 +0000 Subject: [PATCH 078/587] Revision 1 of autoconf-2.69: * specify compatibility as >= 2.60, matching the documentation * move cmd:sed from build_prereq to build_req * inactivate on all architectures --- sys-devel/autoconf/autoconf-2.69.recipe | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index e40836506..aec8de442 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -6,17 +6,17 @@ DESCRIPTION="GNU Autoconf is a tool for configuring source code and makefiles. U HOMEPAGE="http://www.gnu.org/software/autoconf/" SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz" CHECKSUM_MD5="50f97f4159805e374639a73e2636f22e" -REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="1" +ARCHITECTURES="?x86_gcc2 ?x86" -PROVIDES="autoconf = $portVersion compat >= 2.69 - cmd:autoconf = $portVersion compat >= 2.69 - cmd:autoheader = $portVersion compat >= 2.69 - cmd:autom4te = $portVersion compat >= 2.69 - cmd:autoreconf = $portVersion compat >= 2.69 - cmd:autoscan = $portVersion compat >= 2.69 - cmd:autoupdate = $portVersion compat >= 2.69 - cmd:ifnames = $portVersion compat >= 2.69" +PROVIDES="autoconf = $portVersion compat >= 2.60 + cmd:autoconf = $portVersion compat >= 2.60 + cmd:autoheader = $portVersion compat >= 2.60 + cmd:autom4te = $portVersion compat >= 2.60 + cmd:autoreconf = $portVersion compat >= 2.60 + cmd:autoscan = $portVersion compat >= 2.60 + cmd:autoupdate = $portVersion compat >= 2.60 + cmd:ifnames = $portVersion compat >= 2.60" REQUIRES="haiku >= $haikuVersion cmd:awk coreutils @@ -26,9 +26,8 @@ REQUIRES="haiku >= $haikuVersion cmd:sh" BUILD_REQUIRES="cmd:automake >= 1.13.1" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - cmd:autoreconf >= 2.69 - cmd:make - cmd:sed" + cmd:autoreconf >= 2.60 + cmd:make" SOURCE_DIR="$portVersionedName" BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL" From 2fb46053f18eb19278157be3fd6247054de80c57 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 13 Apr 2013 14:55:49 +0000 Subject: [PATCH 079/587] * one more round of requirements shuffling, the base packages seem to be declared properly, now * improve formatting of recipe files for better readability and better compatibility with showing diffs (when moving specification lines) * add/improve DESCRIPTION where it was just a copy of SUMMARY --- app-arch/tar/tar-1.26.recipe | 39 ++++++++++++---- dev-lang/perl/perl-5.10.1.recipe | 38 +++++++++++---- sys-apps/gawk/gawk-3.1.8.recipe | 49 +++++++++++++++----- sys-apps/sed/sed-4.2.1.recipe | 37 +++++++++------ sys-devel/autoconf/autoconf-2.68.recipe | 32 ++++++++----- sys-devel/automake/automake-1.11.1.recipe | 32 ++++++++----- sys-devel/flex/flex-2.5.35.recipe | 30 ++++++++---- sys-devel/gcc/gcc-2.95.3_110711.recipe | 56 +++++++++++++---------- sys-devel/libtool/libtool-2.4.recipe | 31 +++++++++---- sys-devel/m4/m4-1.4.16.recipe | 40 ++++++++++++---- sys-devel/make/make-3.82.recipe | 30 ++++++++---- 11 files changed, 286 insertions(+), 128 deletions(-) diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index 998a81597..b920a1403 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -1,21 +1,40 @@ -SUMMARY="tar saves and restores files from a tape or disk archive." -DESCRIPTION="tar saves and restores files from a tape or disk archive." +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). + " HOMEPAGE="http://www.gnu.org/software/tar/" SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2" CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519" REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="tar = $portVersion compat >= 1 - cmd:tar = $portVersion compat >= 1" -REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="cmd:automake >= 1.11 +PROVIDES=" + tar = $portVersion compat >= 1 + cmd:tar = $portVersion compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:automake >= 1.11 cmd:autoreconf >= 2.68 - cmd:sed" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion cmd:gcc - cmd:ld" + cmd:ld + cmd:make + " SOURCE_DIR="$portVersionedName" diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe index cfa671d1c..09fcbfcc0 100644 --- a/dev-lang/perl/perl-5.10.1.recipe +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -1,19 +1,41 @@ SUMMARY="Larry Wall's Practical Extraction and Report Language" -DESCRIPTION="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 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'. + " HOMEPAGE="http://www.perl.org/" SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz" +CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="perl = $portVersion compat >= 5 +PROVIDES=" + perl = $portVersion compat >= 5 cmd:perl = $portVersion compat >= 5 - lib:libperl = $portVersion compat >= 5" -REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="cmd:sed" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + lib:libperl = $portVersion compat >= 5 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:sed + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion cmd:gcc cmd:ld - cmd:make" -CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" + cmd:make + " SOURCE_DIR="$portVersionedName" BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL" diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe index 75cf770e1..d1e704637 100644 --- a/sys-apps/gawk/gawk-3.1.8.recipe +++ b/sys-apps/gawk/gawk-3.1.8.recipe @@ -1,30 +1,57 @@ -DESCRIPTION="standard GNU file utilities" +SUMMARY="A pattern scanning and processing language" +DESCRIPTION=" + If you are like many computer users, you would frequently like to make + changes in various text files wherever certain patterns appear, or + extract data from parts of certain lines while discarding the rest. To + write a program to do this in a language such as C or Pascal is a + time-consuming inconvenience that may take many lines of code. The job + is easy with awk, especially the GNU implementation: gawk. + + The awk utility interprets a special-purpose programming language that + makes it possible to handle simple data-reformatting jobs with just a + few lines of code. + " HOMEPAGE="http://www.gnu.org/software/coreutils" SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-3.1.8.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="52b41c6c4418b3226dfb8f82076193bb" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + gawk = $portVersion compat >= 3 + cmd:awk = $portVersion compat >= 3 + cmd:gawk = $portVersion compat >= 3 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:libtoolize + cmd:sed + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd gawk-3.1.8 libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + ./configure $configureDirArgs make } INSTALL() { - cd gawk-3.1.8 make install } TEST() { - cd gawk-3.1.8 make check } diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe index 1d96a77c8..a1a3eba63 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -1,29 +1,36 @@ -SUMMARY="sed - a stream editor" -DESCRIPTION="Sed is a stream editor. A stream editor is 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." +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. + " HOMEPAGE="http://www.gnu.org/software/sed" SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz" CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86" REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="sed = $portVersion compat >= 4 - cmd:sed = $portVersion compat >= 4" -REQUIRES="haiku >= $haikuVersion" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion +PROVIDES=" + sed = $portVersion compat >= 4 + cmd:sed = $portVersion compat >= 4 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion cmd:gcc cmd:ld cmd:aclocal >= 1.11 cmd:autoreconf >= 2.68 cmd:make - cmd:sed" - + cmd:sed + " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index 852677aa4..98c1c86f5 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -1,34 +1,44 @@ -SUMMARY="A GNU tool for automatically configuring source code" -DESCRIPTION="GNU Autoconf is a tool for configuring source code and makefiles. Using +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." + 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" REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="autoconf = $portVersion compat >= 2.60 +PROVIDES=" + autoconf = $portVersion compat >= 2.60 cmd:autoconf = $portVersion compat >= 2.60 cmd:autoheader = $portVersion compat >= 2.60 cmd:autom4te = $portVersion compat >= 2.60 cmd:autoreconf = $portVersion compat >= 2.60 cmd:autoscan = $portVersion compat >= 2.60 cmd:autoupdate = $portVersion compat >= 2.60 - cmd:ifnames = $portVersion compat >= 2.60" -REQUIRES="haiku >= $haikuVersion + cmd:ifnames = $portVersion compat >= 2.60 + " +REQUIRES=" + haiku >= $haikuVersion cmd:awk coreutils diffutils cmd:m4 >= 1.4 cmd:perl >= 5 - cmd:sh" -BUILD_REQUIRES="cmd:automake >= 1.11 - cmd:sed" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + cmd:sh + " +BUILD_REQUIRES=" + cmd:automake >= 1.11 + cmd:sed + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion cmd:autoreconf >= 2.60 - cmd:make" + cmd:make + " SOURCE_DIR="$portVersionedName" BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL" diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe index 3353b69a2..f6866ec11 100644 --- a/sys-devel/automake/automake-1.11.1.recipe +++ b/sys-devel/automake/automake-1.11.1.recipe @@ -1,31 +1,41 @@ SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'" -DESCRIPTION="Automake is a tool for automatically generating 'Makefile.in' files +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." + 'Makefile.in' files are compatible with the GNU Makefile standards. + " HOMEPAGE="http://www.gnu.org/software/automake/" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz" CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74" REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="automake = $portVersion compat >= 1.11 +PROVIDES=" + automake = $portVersion compat >= 1.11 cmd:automake = $portVersion compat >= 1.11 cmd:automake-1.11 = $portVersion compat >= 1.11 cmd:aclocal = $portVersion compat >= 1.11 - cmd:aclocal-1.11 = $portVersion compat >= 1.11" -REQUIRES="haiku >= $haikuVersion + cmd:aclocal-1.11 = $portVersion compat >= 1.11 + " +REQUIRES=" + haiku >= $haikuVersion cmd:awk coreutils diffutils cmd:m4 >= 1.4 cmd:perl >= 5 - cmd:sh" -BUILD_REQUIRES="cmd:sed" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion - cmd:autoconf >= 2.60 - cmd:make - cmd:perl >= 5.8" + cmd:sh + " +BUILD_REQUIRES=" + cmd:perl >= 5.8 + cmd:sed + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion + cmd:autoconf >= 2.60 + cmd:make + " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index 22a9de705..2cc467a6b 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -1,25 +1,35 @@ -SUMMARY="Flex is 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." +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. + " HOMEPAGE="http://flex.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download" CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57" REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="flex = $portVersion compat >= 2.5 +PROVIDES=" + flex = $portVersion compat >= 2.5 cmd:flex = $portVersion compat >= 2.5 lib:libfl.a = $portVersion compat >= 2.5 - lib:libfl_pic.a = $portVersion compat >= 2.5" -REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="aclocal >= 1.11 + lib:libfl_pic.a = $portVersion compat >= 2.5 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:aclocal >= 1.11 cmd:autoconf >= 2.60 cmd:automake >= 1.11 - cmd:libtoolize >= 2.4" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + cmd:libtoolize >= 2.4 + cmd:make + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion cmd:gcc cmd:ld - cmd:make" + " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/gcc/gcc-2.95.3_110711.recipe b/sys-devel/gcc/gcc-2.95.3_110711.recipe index c70297739..02d735256 100644 --- a/sys-devel/gcc/gcc-2.95.3_110711.recipe +++ b/sys-devel/gcc/gcc-2.95.3_110711.recipe @@ -1,12 +1,15 @@ 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" # TODO: Also: http://www.gnu.org/software/binutils -SRC_URI="git+git://github.com/weinhold/buildtools.git#ba94fdf309096bd9bbf432ad53efba62bc47f98e" -REVISION="2" +SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#ba94fdf309096bd9bbf432ad53efba62bc47f98e" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="gcc = $portVersion compat >= 2.95.3 +PROVIDES=" + gcc = $portVersion compat >= 2.95.3 cmd:cpp = $portVersion compat >= 2.95.3 cmd:gcc = $portVersion compat >= 2.95.3 cmd:g++ = $portVersion compat >= 2.95.3 @@ -26,26 +29,37 @@ PROVIDES="gcc = $portVersion compat >= 2.95.3 cmd:size = 2.17_110711 compat >= 2.17 cmd:strings = 2.17_110711 compat >= 2.17 cmd:strip = 2.17_110711 compat >= 2.17 - cmd:unprotoize = 2.17_110711 compat >= 2.17" + cmd:unprotoize = 2.17_110711 compat >= 2.17 + " -REQUIRES="haiku >= $haikuVersion" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion + cmd:autoconf binutils gcc + cmd:flex cmd:make - texinfo" + cmd:sed + cmd:tar + texinfo + " SOURCE_DIR="$portVersionedName" +gccDate=110711 +gccInstallDir="$prefix/develop/tools/gcc-2.95.3-${gccDate}" +objectsDir=$(pwd)/../${portVersionedName}-obj +binutilsObjectsDir=$objectsDir/binutils +gccObjectsDir=$objectsDir/gcc +buildtoolsDir=$(pwd)/legacy + BUILD() { - gccDate=110711 - gccInstallDir="$prefix/develop/tools/gcc-2.95.3-${gccDate}" - objectsDir=$(pwd)/../${portVersionedName}-obj - binutilsObjectsDir=$objectsDir/binutils - gccObjectsDir=$objectsDir/gcc - buildtoolsDir=$(pwd)/legacy - rm -rf $objectsDir # Touch some files generated by bison, so that bison won't run to update @@ -54,6 +68,9 @@ BUILD() (cd $buildtoolsDir/gcc/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ cp/parse.h c-gperf.h) + # Touch all *.info files, as newer texinfos don't like their format + (cd $buildtoolsDir; find . -name \*.info | xargs touch) + # build binutils mkdir -p $binutilsObjectsDir cd $binutilsObjectsDir @@ -79,15 +96,6 @@ BUILD() INSTALL() { - # TODO: Avoid the duplication by defining the variables globally once we've - # moved the bep-format to shell. - gccDate=110711 - gccInstallDir="$prefix/develop/tools/gcc-2.95.3-${gccDate}" - objectsDir=$(pwd)/../${portVersionedName}-obj - binutilsObjectsDir=$objectsDir/binutils - gccObjectsDir=$objectsDir/gcc - buildtoolsDir=$(pwd)/legacy - cd $binutilsObjectsDir make install diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index e780297c8..61c47131e 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -1,30 +1,41 @@ SUMMARY="A generic library support script" -DESCRIPTION="GNU libtool is a set of shell scripts to automatically configure UNIX - architectures to build shared libraries in a generic fashion." +DESCRIPTION=" + GNU libtool is a set of shell scripts to automatically configure UNIX + architectures to build shared libraries in a generic fashion. + " HOMEPAGE="http://www.gnu.org/software/libtool" SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz" CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="libtool = $portVersion compat >= 2.4 +PROVIDES=" + libtool = $portVersion compat >= 2.4 cmd:libtool = $portVersion compat >= 2.4 cmd:libtoolize = $portVersion compat >= 2.4 lib:libltdl.a = 7.3.0 compat >= 7 - lib:libltdl = 7.3.0 compat >= 7" -REQUIRES="haiku >= $haikuVersion + lib:libltdl = 7.3.0 compat >= 7 + " +REQUIRES=" + haiku >= $haikuVersion cmd:aclocal >= 1.11 cmd:automake >= 1.11 - cmd:tar" -BUILD_REQUIRES="cmd:autoconf >= 2.60 + cmd:sed + cmd:tar + " +BUILD_REQUIRES=" + cmd:autoconf >= 2.60 cmd:aclocal >= 1.11 cmd:autoheader >= 2.60 - cmd:sed" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion + cmd:sed + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion cmd:gcc cmd:ld cmd:make - cmd:nm" + cmd:nm + " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe index c506adb16..6ab48137e 100644 --- a/sys-devel/m4/m4-1.4.16.recipe +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -1,19 +1,43 @@ -SUMMARY="m4 - GNU macro processor" -DESCRIPTION="m4 - GNU macro processor." +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. + " HOMEPAGE="http://www.gnu.org/software/m4/" SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz" CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="m4 = $portVersion compat >= 1.4 - cmd:m4 = $portVersion compat >= 1.4" -REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="cmd:sed" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion +PROVIDES=" + m4 = $portVersion compat >= 1.4 + cmd:m4 = $portVersion compat >= 1.4 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:sed + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion cmd:gcc cmd:ld - cmd:make" + cmd:make + " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index 4216f59ae..d7a7eea3c 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -1,26 +1,36 @@ 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. +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." + program. + " HOMEPAGE="http://www.gnu.org/software/make/" SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2" CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f" REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="make = $portVersion compat >= 3.82 - cmd:make = $portVersion compat >= 3.82" -REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="cmd:libtoolize - cmd:sed" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion +PROVIDES=" + make = $portVersion compat >= 3.82 + cmd:make = $portVersion compat >= 3.82 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:libtoolize + cmd:sed + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion cmd:gcc - cmd:ld" + cmd:ld + " SOURCE_DIR="$portVersionedName" From b5cfbf400ee36f9d16aefe0b8ca11304cfa09c28 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 13 Apr 2013 16:08:46 +0000 Subject: [PATCH 080/587] * Add symlinks for all binaries into $prefix/bin/, making all the tools available via standard paths. This makes only sense for the default compiler, but we currently can't tell haikuporter if the one being built is such a beast. I suppose we need some kind of feature mechanism for ports in order to be able to enable/disable stuff like this from the outside. --- sys-devel/gcc/gcc-2.95.3_110711.recipe | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys-devel/gcc/gcc-2.95.3_110711.recipe b/sys-devel/gcc/gcc-2.95.3_110711.recipe index 02d735256..40b95ffba 100644 --- a/sys-devel/gcc/gcc-2.95.3_110711.recipe +++ b/sys-devel/gcc/gcc-2.95.3_110711.recipe @@ -103,7 +103,7 @@ INSTALL() make install base=$gccInstallDir - + ### HTML documentation #################################### html_base=$base/html-docs @@ -160,7 +160,7 @@ INSTALL() rm -f $base/lib/gcc-lib/i586-pc-haiku/2.95.3-haiku-$gccDate/include/math.h - ### C++ includes ###################################### + ### C++ includes ########################################## echo "Install C++ includes & library" @@ -169,6 +169,12 @@ INSTALL() ln -snf /boot/system/lib/libstdc++.r4.so $base/lib/ ln -snf /boot/system/lib/libstdc++.so $base/lib/ + + ### Symlink all binaries to $prefix/bin ################### + + mkdir -p $prefix/bin + cd $prefix/bin + ln -sfn $base/bin/* . } LICENSE="GNU GPL v2 From e494b43bda4aef1f6d0334f7bc0469657fb8d6f8 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 14 Apr 2013 15:41:22 +0000 Subject: [PATCH 081/587] Revision 4 of gcc-2.95.3_110711: * strip debug info from all binaries * based on architecture, decide whether or not to link the tools into the default path * use relative symlinks instead of absolute ones, as the latter won't work when building gcc with itself (in which case the .self-symlink in the /packages folder will point to the packaging path, where no binaries exist yet) --- sys-devel/gcc/gcc-2.95.3_110711.recipe | 49 +++++++++++++++++++------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/sys-devel/gcc/gcc-2.95.3_110711.recipe b/sys-devel/gcc/gcc-2.95.3_110711.recipe index 40b95ffba..3d4a570f4 100644 --- a/sys-devel/gcc/gcc-2.95.3_110711.recipe +++ b/sys-devel/gcc/gcc-2.95.3_110711.recipe @@ -5,7 +5,7 @@ DESCRIPTION=" HOMEPAGE="http://gcc.gnu.org" # TODO: Also: http://www.gnu.org/software/binutils SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#ba94fdf309096bd9bbf432ad53efba62bc47f98e" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -52,7 +52,8 @@ BUILD_PREREQUIRES=" SOURCE_DIR="$portVersionedName" gccDate=110711 -gccInstallDir="$prefix/develop/tools/gcc-2.95.3-${gccDate}" +relativeGccInstallDir="develop/tools/gcc-2.95.3-${gccDate}" +gccInstallDir="$prefix/$relativeGccInstallDir" objectsDir=$(pwd)/../${portVersionedName}-obj binutilsObjectsDir=$objectsDir/binutils gccObjectsDir=$objectsDir/gcc @@ -142,16 +143,44 @@ INSTALL() echo "binutils HTML documentation missing, see" \ "INSTALL-gcc2-from-source-Haiku." fi - - ### Cleanup ############################################### - - echo "Cleanup" - + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # create symlinks to binutils binaries cd $base/bin for binary in ../i586-pc-haiku/bin/*; do ln -sfn $binary . done + # convert to absolute links to relative ones + ln -sfn g++ c++ + ln -sfn gcc i586-pc-haiku-gcc + + # make all tools available via default paths if this is the system + # compiler + if [ $architecture = 'x86_gcc2' ]; then + echo "Symlinking binaries into default path" + mkdir -p $prefix/bin + cd $prefix/bin + ln -sfn ../$relativeGccInstallDir/bin/* . + fi + + ### Strip ################################################# + + echo "Strip debug info" + + cd $base + strip --strip-debug bin/* + strip --strip-debug i586-pc-haiku/bin/* + strip --strip-debug lib/gcc-lib/i586-pc-haiku/2.95.3-${gccDate}/* \ + &>/dev/null || true + + ### Cleanup ############################################### + + echo "Cleanup" + if [ -d $base/man -o -d $base/info -o -d $base/share ]; then rm -rf $base/man rm -rf $base/info @@ -169,12 +198,6 @@ INSTALL() ln -snf /boot/system/lib/libstdc++.r4.so $base/lib/ ln -snf /boot/system/lib/libstdc++.so $base/lib/ - - ### Symlink all binaries to $prefix/bin ################### - - mkdir -p $prefix/bin - cd $prefix/bin - ln -sfn $base/bin/* . } LICENSE="GNU GPL v2 From 93daa4e0272d397368bbf5a75f8f8002e1b6b6f4 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 14 Apr 2013 17:56:59 +0000 Subject: [PATCH 082/587] * apparently, libtool may invoke ranlib --- sys-devel/libtool/libtool-2.4.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index 61c47131e..b3e77bb23 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -35,6 +35,7 @@ BUILD_PREREQUIRES=" cmd:ld cmd:make cmd:nm + cmd:ranlib " SOURCE_DIR="$portVersionedName" From 66cce01b0c32f705232d39a3a362c6f73676bf8f Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 14 Apr 2013 22:06:31 +0000 Subject: [PATCH 083/587] Work towards getting subversion with all dependencies built. The remaining problem is that apr-util won't build yet, due to it relying on the sources of apr being around. We need support for source packages to solve that, so that will be the next step. --- dev-db/sqlite/sqlite-3.7.5.recipe | 32 ++++++--- dev-libs/apr/apr-1.4.2.recipe | 52 +++++++++++--- dev-libs/expat/expat-2.0.1.recipe | 34 ++++++--- dev-libs/libxml2/libxml2-2.7.8.recipe | 80 ++++++++++++++++++--- dev-libs/openssl/openssl-1.0.0d.recipe | 51 +++++++++---- dev-vcs/subversion/subversion-1.6.15.recipe | 34 ++++++--- net-misc/neon/neon-0.29.6.recipe | 45 +++++++++--- 7 files changed, 258 insertions(+), 70 deletions(-) diff --git a/dev-db/sqlite/sqlite-3.7.5.recipe b/dev-db/sqlite/sqlite-3.7.5.recipe index 223e6b399..5e4984c3a 100644 --- a/dev-db/sqlite/sqlite-3.7.5.recipe +++ b/dev-db/sqlite/sqlite-3.7.5.recipe @@ -1,24 +1,38 @@ -SUMMARY="A 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." +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. + " HOMEPAGE="http://www.sqlite.org/" SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz" CHECKSUM_MD5="a9604a82613ade2e7f4c303f233e477f" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="sqlite = $portVersion compat >= 3 +PROVIDES=" + sqlite = $portVersion compat >= 3 cmd:sqlite3 = $portVersion compat >= 3 lib:libsqlite = $portVersion compat >= 3 - lib:libsqlite3 = $portVersion compat >= 3" -REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="cmd:aclocal + lib:libsqlite3 = $portVersion compat >= 3 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:aclocal cmd:autoconf cmd:automake cmd:gcc cmd:ld cmd:libtoolize - cmd:make" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + cmd:make + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion + " SOURCE_DIR="sqlite-autoconf-3070500" diff --git a/dev-libs/apr/apr-1.4.2.recipe b/dev-libs/apr/apr-1.4.2.recipe index 1cc5fff37..ceaec12a4 100644 --- a/dev-libs/apr/apr-1.4.2.recipe +++ b/dev-libs/apr/apr-1.4.2.recipe @@ -1,22 +1,54 @@ SUMMARY="Apache Portable Runtime Library" -DESCRIPTION="The Apache Portable Runtime Library." +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) + " HOMEPAGE="http://apr.apache.org/" SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz" CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="apr = $portVersion compat >= 1 +PROVIDES=" + apr = $portVersion compat >= 1 lib:libapr = $portVersion compat >= 1 - lib:libapr-1 = $portVersion compat >= 1" -REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="cmd:aclocal + lib:libapr-1 = $portVersion compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:aclocal cmd:autoconf cmd:gcc cmd:ld cmd:libtoolize - cmd:make" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + cmd:make + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion + " SOURCE_DIR="$portVersionedName" @@ -24,10 +56,11 @@ BUILD() { libtoolize --force --copy --install touch libtool.m4 -# ./buildconf aclocal -I build autoconf ./configure $configureDirArgs + # TODO: fix this hack (by finding out why top_builddir seems to be unset)! + ln -sfn $sourceDir/libtool /libtool make } @@ -38,7 +71,6 @@ INSTALL() TEST() { - cd apr-1.4.2 make test } diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe index ab622f8a9..1288bdef6 100644 --- a/dev-libs/expat/expat-2.0.1.recipe +++ b/dev-libs/expat/expat-2.0.1.recipe @@ -1,21 +1,31 @@ -SUMMARY="XML Parser Toolkit" -DESCRIPTION="XML Parser Toolkit" +SUMMARY="XML parser toolkit" +DESCRIPTION=" + XML Parser Toolkit + " HOMEPAGE="http://expat.sourceforge.net/" SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz" CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="expat = $portVersion compat >= 2.0 - lib:libexpat = $portVersion compat >= 1.5" -REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="cmd:aclocal +PROVIDES=" + expat = $portVersion compat >= 2.0 + lib:libexpat = $portVersion compat >= 1.5 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:aclocal cmd:autoconf cmd:gcc cmd:ld cmd:libtoolize - cmd:make" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + cmd:make + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion + " SOURCE_DIR="$portVersionedName" @@ -37,5 +47,7 @@ INSTALL() } LICENSE="MIT" -COPYRIGHT="1998-2000 Thai Open Source Software Center Ltd and Clark Cooper - 2001-2006 Expat maintainers." +COPYRIGHT=" + 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper + 2001-2006 Expat maintainers. + " diff --git a/dev-libs/libxml2/libxml2-2.7.8.recipe b/dev-libs/libxml2/libxml2-2.7.8.recipe index 8d956ecee..ba2f2cf6e 100644 --- a/dev-libs/libxml2/libxml2-2.7.8.recipe +++ b/dev-libs/libxml2/libxml2-2.7.8.recipe @@ -1,22 +1,84 @@ SUMMARY="The XML C parser and toolkit of Gnome" -DESCRIPTION="The XML C parser and toolkit of Gnome." +DESCRIPTION=" + Libxml2 is the XML C parser and toolkit developed for the Gnome project + (but usable outside of the Gnome platform), it is free software available + under the MIT License. XML itself is a metalanguage to design markup + languages, i.e. text language where semantic and structure are added to + the content using extra "markup" information enclosed between angle + brackets. HTML is the most well-known markup language. Though the library + is written in C a variety of language bindings make it available in other + environments. + + Libxml2 implements a number of existing standards related to markup + languages: + + - the XML standard: http://www.w3.org/TR/REC-xml + - Namespaces in XML: http://www.w3.org/TR/REC-xml-names/ + - XML Base: http://www.w3.org/TR/xmlbase/ + - RFC 2396 : Uniform Resource Identifiers + - XML Path Language (XPath) 1.0: http://www.w3.org/TR/xpath + - HTML4 parser: http://www.w3.org/TR/html401/ + - XML Pointer Language (XPointer) Version 1.0: http://www.w3.org/TR/xptr + - XML Inclusions (XInclude) Version 1.0: http://www.w3.org/TR/xinclude/ + - ISO-8859-x encodings, as well as rfc2044 [UTF-8] and rfc2781 [UTF-16] + Unicode encodings, and more if using iconv support part of SGML Open + Technical Resolution TR9401:1997 + - XML Catalogs Working Draft 06 August 2001: + http://www.oasis-open.org/committees/entity/spec-2001-08-06.html + - Canonical XML Version 1.0: + http://www.w3.org/TR/xml-c14n and the Exclusive XML Canonicalization + CR draft http://www.w3.org/TR/xml-exc-c14n + - Relax NG, ISO/IEC 19757-2:2003, + http://www.oasis-open.org/committees/relax-ng/spec-20011203.html + - W3C XML Schemas Part 2: Datatypes REC 02 May 2001 + - W3C xml:id Working Draft 7 April 2004 + + In most cases libxml2 tries to implement the specifications in a + relatively strictly compliant way. As of release 2.4.16, libxml2 passed + all 1800+ tests from the OASIS XML Tests Suite. + + To some extent libxml2 provides support for the following additional + specifications but doesn't claim to implement them completely: + + - Document Object Model (DOM) http://www.w3.org/TR/DOM-Level-2-Core/ + the document model, but it doesn't implement the API itself, gdome2 + does this on top of libxml2 + - RFC 959 : libxml2 implements a basic FTP client code + - RFC 1945 : HTTP/1.0, again a basic HTTP client code + - SAX: a SAX2 like interface and a minimal SAX1 implementation compatible + with early expat versions + + A partial implementation of XML Schemas Part 1: Structure is being worked + on but it would be far too early to make any conformance statement about + it at the moment. + " HOMEPAGE="http://www.xmlsoft.org/" SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz" CHECKSUM_MD5="8127a65e8c3b08856093099b52599c86" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="libxml2 = $portVersion compat >= 2.7 - lib:libxml2 = $portVersion compat >= 2.7" -REQUIRES="haiku >= $haikuVersion - zlib" -BUILD_REQUIRES="cmd:aclocal +PROVIDES=" + libxml2 = $portVersion compat >= 2.7 + lib:libxml2 = $portVersion compat >= 2.7 + " +REQUIRES=" + haiku >= $haikuVersion + zlib + " +BUILD_REQUIRES=" + $REQUIRES + cmd:aclocal cmd:autoconf cmd:automake cmd:gcc cmd:ld - cmd:make" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion + " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe index d86f61bcd..2fb63d280 100644 --- a/dev-libs/openssl/openssl-1.0.0d.recipe +++ b/dev-libs/openssl/openssl-1.0.0d.recipe @@ -1,31 +1,56 @@ -SUMMARY="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)" -DESCRIPTION="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)" +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. + " HOMEPAGE="http://www.openssl.org/" SRC_URI="http://www.openssl.org/source/openssl-1.0.0d.tar.gz" CHECKSUM_MD5="40b6ea380cc8a5bf9734c2f8bf7e701e" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="openssl = $portVersion compat >= 1 +PROVIDES=" + openssl = $portVersion compat >= 1 cmd:c_rehash = $portVersion compat >= 1 cmd:openssl = $portVersion compat >= 1 lib:libcrypto = $portVersion compat >= 1 - lib:libssl = $portVersion compat >= 1" -REQUIRES="haiku >= $haikuVersion - zlib >= 1.2.3" -BUILD_REQUIRES="cmd:gcc + lib:libssl = $portVersion compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + zlib >= 1.2.3 + " +BUILD_REQUIRES=" + $REQUIRES + cmd:gcc cmd:ld cmd:make - cmd:sed" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + cmd:perl >= 5 + cmd:sed + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion + " SOURCE_DIR="$portVersionedName" BUILD() { - sed -i "s@MANDIR=\$(OPENSSLDIR)\/man@MANDIR=$manDir@g" Make* - ./config --prefix=$prefix zlib shared \ - --openssldir=$dataRootDir/ssl + # Fix hardcoded directory for manpages + sed -i "s@MANDIR=.*\$@MANDIR=$manDir@g" Make* + + ./config --prefix=$prefix zlib shared --openssldir=$dataRootDir/ssl make } diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe index 047556d58..26a60ffe9 100644 --- a/dev-vcs/subversion/subversion-1.6.15.recipe +++ b/dev-vcs/subversion/subversion-1.6.15.recipe @@ -1,12 +1,20 @@ SUMMARY="Open source version control system" -DESCRIPTION="Subversion is an 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. + " HOMEPAGE="http://subversion.apache.org" SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.15.tar.bz2" CHECKSUM_MD5="113fca1d9e4aa389d7dc2b210010fa69" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="subversion = $portVersion compat >= 1.6 +PROVIDES=" + subversion = $portVersion compat >= 1.6 cmd:svn = $portVersion compat >= 1.6 cmd:svnadmin = $portVersion compat >= 1.6 cmd:svndumpfilter = $portVersion compat >= 1.6 @@ -15,8 +23,10 @@ PROVIDES="subversion = $portVersion compat >= 1.6 cmd:svnsync = $portVersion compat >= 1.6 cmd:svnversion = $portVersion compat >= 1.6 lib:libiconv = 2.5.0 compat >= 2 - lib:libcharset = 1.0.0 compat >= 1" -REQUIRES="haiku >= $haikuVersion + lib:libcharset = 1.0.0 compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion apr >= 1.3 apr-util >= 1.3 expat >= 2.0 @@ -24,14 +34,20 @@ REQUIRES="haiku >= $haikuVersion libxml2 >= 2.7 neon >= 0.29 sqlite >= 3.4 - zlib" -BUILD_REQUIRES="cmd:aclocal + zlib + " +BUILD_REQUIRES=" + $REQUIRES + cmd:aclocal cmd:autoconf cmd:gcc cmd:ld cmd:libtoolize - cmd:make" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + cmd:make + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion + " SOURCE_DIR="$portVersionedName" diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe index 8aa8370c9..bcfcd82be 100644 --- a/net-misc/neon/neon-0.29.6.recipe +++ b/net-misc/neon/neon-0.29.6.recipe @@ -1,22 +1,49 @@ SUMMARY="HTTP and WebDAV client library, with a C interface" -DESCRIPTION="neon is an 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. + " HOMEPAGE="http://www.webdav.org/neon/" SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz" CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="neon = $portVersion compat >= 0.29 - lib:libneon = 27.2.6 compat >= 27.2" -REQUIRES="haiku >= $haikuVersion +PROVIDES=" + neon = $portVersion compat >= 0.29 + lib:libneon = 27.2.6 compat >= 27.2 + " +REQUIRES=" + haiku >= $haikuVersion openssl >= 1.0.0 - libxml2 >= 2.7.8" -BUILD_REQUIRES="cmd:aclocal + libxml2 >= 2.7.8 + " +BUILD_REQUIRES=" + $REQUIRES + cmd:aclocal cmd:autoconf + cmd:libtoolize cmd:gcc cmd:ld - cmd:make" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + cmd:make + " +BUILD_PREREQUIRES=" + haiku-devel >= $haikuVersion + " SOURCE_DIR="$portVersionedName" From e81058822cbf96996a6d5097fcde47e822f2a0db Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 15 Apr 2013 21:45:51 +0000 Subject: [PATCH 084/587] Update to current libsolv version * Includes recent OpenSUSE/libsolv changes and sync with package kit changes (BPackageVersion::release -> revision). * Add missing expat [build_]requires. * BUILD(): Remove "build" directory before re-creating it. --- ...01.recipe => libsolv-0.3.0_haiku_2013_04_15.recipe} | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) rename dev-libs/libsolv/{libsolv-0.3.0_haiku_2013_04_01.recipe => libsolv-0.3.0_haiku_2013_04_15.recipe} (73%) diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_01.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_15.recipe similarity index 73% rename from dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_01.recipe rename to dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_15.recipe index 8069e7d01..e917385ba 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_01.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_15.recipe @@ -1,15 +1,16 @@ SUMMARY="Library for solving packages and reading repositories" DESCRIPTION="Library for solving packages and reading repositories." HOMEPAGE="http://github.com/openSUSE/libsolv" -SRC_URI="git+git://github.com/weinhold/libsolv.git#21ca29f8f21fa05384fe3fd095652b7999fec759" +SRC_URI="git+git://github.com/weinhold/libsolv.git#2fbe38d5d38facee568f24b19b51e03ad2e9e3a9" REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="libsolv = $portVersion lib:libsolv = $portVersion lib:libsolvext = $portVersion" -REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="" +REQUIRES="haiku >= $haikuVersion + lib:libexpat >= 1.5" +BUILD_REQUIRES="lib:libexpat >= 1.5" BUILD_PREREQUIRES="haiku-devel >= $haikuVersion cmd:cmake cmd:gcc @@ -20,6 +21,7 @@ SOURCE_DIR="$portVersionedName" BUILD() { + rm -rf build mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix .. @@ -31,7 +33,7 @@ INSTALL() cd build make install - # We don't wont the executables. + # We don't want the executables. rm -r $prefix/bin } From 4b80857c5e1eb8c90435636985b5173963a1c732 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 16 Apr 2013 15:10:25 +0000 Subject: [PATCH 085/587] Update libsolv --- ..._2013_04_15.recipe => libsolv-0.3.0_haiku_2013_04_16.recipe} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename dev-libs/libsolv/{libsolv-0.3.0_haiku_2013_04_15.recipe => libsolv-0.3.0_haiku_2013_04_16.recipe} (89%) diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_15.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_16.recipe similarity index 89% rename from dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_15.recipe rename to dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_16.recipe index e917385ba..e79372947 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_15.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_16.recipe @@ -1,7 +1,7 @@ SUMMARY="Library for solving packages and reading repositories" DESCRIPTION="Library for solving packages and reading repositories." HOMEPAGE="http://github.com/openSUSE/libsolv" -SRC_URI="git+git://github.com/weinhold/libsolv.git#2fbe38d5d38facee568f24b19b51e03ad2e9e3a9" +SRC_URI="git+git://github.com/weinhold/libsolv.git#34635b4c57aec5ebb7eea1677de2a3dc2e288c79" REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" From 46ef9167ab122f1a033bf3c5ea59ebe662227ae5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 18 Apr 2013 23:36:11 +0000 Subject: [PATCH 086/587] libsolv: Update to new version Includes pre-release separator change. --- ...013_04_16.recipe => libsolv-0.3.0_haiku_2013_04_18.recipe} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename dev-libs/libsolv/{libsolv-0.3.0_haiku_2013_04_16.recipe => libsolv-0.3.0_haiku_2013_04_18.recipe} (83%) diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_16.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe similarity index 83% rename from dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_16.recipe rename to dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe index e79372947..5ff6c2b70 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_16.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe @@ -1,7 +1,7 @@ SUMMARY="Library for solving packages and reading repositories" DESCRIPTION="Library for solving packages and reading repositories." HOMEPAGE="http://github.com/openSUSE/libsolv" -SRC_URI="git+git://github.com/weinhold/libsolv.git#34635b4c57aec5ebb7eea1677de2a3dc2e288c79" +SRC_URI="git+git://github.com/weinhold/libsolv.git#85dcb683b0c705c1789a3f688bd0d02368107824" REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" @@ -11,7 +11,7 @@ PROVIDES="libsolv = $portVersion REQUIRES="haiku >= $haikuVersion lib:libexpat >= 1.5" BUILD_REQUIRES="lib:libexpat >= 1.5" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion +BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:cmake cmd:gcc cmd:ld From 8139b1c0634b171299682d0390a940c82fa344e9 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 19 Apr 2013 22:23:29 +0000 Subject: [PATCH 087/587] * commit incomplete conversion of pe-2.4.3_hg to recipe format --- haiku-apps/pe/pe-2.4.3_hg.recipe | 53 ++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 haiku-apps/pe/pe-2.4.3_hg.recipe diff --git a/haiku-apps/pe/pe-2.4.3_hg.recipe b/haiku-apps/pe/pe-2.4.3_hg.recipe new file mode 100644 index 000000000..e2d3f9352 --- /dev/null +++ b/haiku-apps/pe/pe-2.4.3_hg.recipe @@ -0,0 +1,53 @@ +SUMMARY="A programmer's editor" +DESCRIPTION="A programmer's editor" +HOMEPAGE="http://pe-editor.berlios.de/" +LICENSE=" + BSD (4-clause) + MIT + " +COPYRIGHT=" + 1996-2002 Maarteen Hekkelman + 2003-2012 Team Pe + " +SRC_URI="hg+http://hg.berlios.de/repos/pe-editor" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +DEPEND="dev-libs/libpcre >= 8.00" +PROVIDES=" + pe = $portVersion + cmd:Pe = $portVersion compat >= 2 + cmd:lpe = $portVersion compat >= 2 + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libpcre >= 8 + lib:libpcreposix >= 8 + " +BUILD_REQUIRES=" + cmd:gcc + cmd:jam + cmd:ld + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + jam +} + +INSTALL() +{ + mkdir -p ${DESTDIR}/boot/apps + cp -a generated/distro ${DESTDIR}/boot/apps/Pe + cp -a doc ${DESTDIR}/boot/apps/Pe/Documentation + rm -f ${DESTDIR}/boot/apps/Pe/.OptionalPackageDescription + if [ -z "${DESTDIR}" ];then + find /boot/apps/Pe -type d -name ".svn" | xargs rm -rf + fi +} From 4baa9ad46a0c0812609936ab532d285b268bb7d5 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 19 Apr 2013 22:25:46 +0000 Subject: [PATCH 088/587] * drop old recipe of pe-2.4.3-hg (names with dashes are no longer allowed) --- haiku-apps/pe/pe-2.4.3-hg.recipe | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 haiku-apps/pe/pe-2.4.3-hg.recipe diff --git a/haiku-apps/pe/pe-2.4.3-hg.recipe b/haiku-apps/pe/pe-2.4.3-hg.recipe deleted file mode 100644 index ea4271978..000000000 --- a/haiku-apps/pe/pe-2.4.3-hg.recipe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="Pe - Programmer's Editor" -HOMEPAGE="http://pe-editor.berlios.de/" -SRC_URI="hg+http://hg.berlios.de/repos/pe-editor" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libpcre >= 8.00" -#CHECKSUM_MD5="" -BUILD() -{ - cd pe-2.4.3-hg - jam -} - -INSTALL() -{ - cd pe-2.4.3-hg - mkdir -p ${DESTDIR}/boot/apps - cp -a generated/distro ${DESTDIR}/boot/apps/Pe - cp -a doc ${DESTDIR}/boot/apps/Pe/Documentation - rm -f ${DESTDIR}/boot/apps/Pe/.OptionalPackageDescription - if [ -z "${DESTDIR}" ];then - find /boot/apps/Pe -type d -name ".svn" | xargs rm -rf - fi -} -LICENSE="BSD (4-clause) - MIT" -COPYRIGHT="1996-2002 Maarteen Hekkelman - 2003-2012 Team Pe" From fcb60a8b6d726e68713783e4c692edb61632e6a1 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 19 Apr 2013 22:51:27 +0000 Subject: [PATCH 089/587] * converted libiconv to recipe format --- dev-libs/libiconv/libiconv-1.13.1.recipe | 124 +++++++++++++++++++++-- 1 file changed, 115 insertions(+), 9 deletions(-) diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe index 35eb8e5a7..7e90fec31 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.recipe +++ b/dev-libs/libiconv/libiconv-1.13.1.recipe @@ -1,24 +1,32 @@ SUMMARY="GNU iconv implementation" -DESCRIPTION="GNU iconv implementation." HOMEPAGE="http://www.gnu.org/software/libiconv/" +LICENSE="GNU GPL v3" +COPYRIGHT="2000-2009 Free Software Foundation, Inc." SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz" CHECKSUM_MD5="7ab33ebd26687c744a37264a330bbe9a" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="libiconv = $portVersion compat >= 1.13 +PROVIDES=" + libiconv = $portVersion compat >= 1.13 cmd:iconv = 2.5.0 compat >= 2 lib:libiconv = 2.5.0 compat >= 2 lib:libcharset = 1.0.0 compat >= 1" -REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="cmd:aclocal +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:aclocal cmd:autoconf cmd:autoheader cmd:gcc cmd:ld cmd:libtoolize - cmd:make" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " SOURCE_DIR="$portVersionedName" @@ -59,5 +67,103 @@ TEST() make check } -LICENSE="GNU GPL v3" -COPYRIGHT="2000-2009 Free Software Foundation, Inc." +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. + " From a704dbf9a72b836e49ee169b81ba565e5652e73a Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 19 Apr 2013 23:06:59 +0000 Subject: [PATCH 090/587] * adjust several recipes to our new naming conventions --- app-arch/tar/tar-1.26.recipe | 4 +- dev-db/sqlite/sqlite-3.7.16.1.recipe | 4 +- dev-db/sqlite/sqlite-3.7.5.recipe | 4 +- dev-lang/perl/perl-5.10.1.recipe | 6 +- dev-libs/apr-util/apr-util-1.3.10.recipe | 68 ------- dev-libs/apr-util/apr_util-1.3.10.recipe | 96 +++++++++ dev-libs/apr/apr-1.4.2.recipe | 112 ++++++----- dev-libs/expat/expat-2.0.1.recipe | 4 +- dev-libs/libxml2/libxml2-2.7.8.recipe | 104 +++++----- dev-libs/openssl/openssl-1.0.0d.recipe | 4 +- dev-vcs/cvs/cvs-1.12.13.1.recipe | 6 +- dev-vcs/subversion/subversion-1.6.15.recipe | 8 +- net-misc/neon/neon-0.29.6.recipe | 4 +- sys-apps/gawk/gawk-3.1.8.recipe | 4 +- sys-apps/sed/sed-4.2.1.recipe | 4 +- sys-apps/texinfo/texinfo-4.13a.recipe | 6 +- sys-devel/autoconf/autoconf-2.68.recipe | 16 +- sys-devel/autoconf/autoconf-2.69.recipe | 6 +- sys-devel/automake/automake-1.11.1.recipe | 8 +- sys-devel/automake/automake-1.13.1.recipe | 8 +- .../binutils/binutils-2.17_110711.recipe | 186 ++++++++++++++++++ sys-devel/bison/bison-2.4.3.recipe | 4 +- sys-devel/flex/flex-2.5.35.recipe | 4 +- sys-devel/gcc/gcc-2.95.3_110711.recipe | 109 +++------- sys-devel/libtool/libtool-2.4.recipe | 4 +- sys-devel/m4/m4-1.4.16.recipe | 4 +- sys-devel/make/make-3.82.recipe | 4 +- 27 files changed, 480 insertions(+), 311 deletions(-) delete mode 100644 dev-libs/apr-util/apr-util-1.3.10.recipe create mode 100644 dev-libs/apr-util/apr_util-1.3.10.recipe create mode 100644 sys-devel/binutils/binutils-2.17_110711.recipe diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index b920a1403..c9d58597d 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -14,7 +14,7 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/tar/" SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2" CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -30,7 +30,7 @@ BUILD_REQUIRES=" cmd:sed " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make diff --git a/dev-db/sqlite/sqlite-3.7.16.1.recipe b/dev-db/sqlite/sqlite-3.7.16.1.recipe index 5e7a48a2a..15a40b833 100644 --- a/dev-db/sqlite/sqlite-3.7.16.1.recipe +++ b/dev-db/sqlite/sqlite-3.7.16.1.recipe @@ -3,7 +3,7 @@ DESCRIPTION="SQLite is a software library that implements a self-contained, serv HOMEPAGE="http://www.sqlite.org/" SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071601.tar.gz" CHECKSUM_MD5="8860d1a1ed26d40f07e3c7ae035b644a" -REVISION="1" +REVISION="2" ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES="sqlite = $portVersion compat >= 3 @@ -18,7 +18,7 @@ BUILD_REQUIRES="cmd:aclocal cmd:ld cmd:libtoolize cmd:make" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" +BUILD_PREREQUIRES="haiku_devel >= $haikuVersion" SOURCE_DIR="sqlite-autoconf-3071601" diff --git a/dev-db/sqlite/sqlite-3.7.5.recipe b/dev-db/sqlite/sqlite-3.7.5.recipe index 5e4984c3a..cfc47cb59 100644 --- a/dev-db/sqlite/sqlite-3.7.5.recipe +++ b/dev-db/sqlite/sqlite-3.7.5.recipe @@ -9,7 +9,7 @@ DESCRIPTION=" HOMEPAGE="http://www.sqlite.org/" SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz" CHECKSUM_MD5="a9604a82613ade2e7f4c303f233e477f" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -31,7 +31,7 @@ BUILD_REQUIRES=" cmd:make " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion " SOURCE_DIR="sqlite-autoconf-3070500" diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe index 09fcbfcc0..66ebd3c7a 100644 --- a/dev-lang/perl/perl-5.10.1.recipe +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -17,7 +17,7 @@ DESCRIPTION=" HOMEPAGE="http://www.perl.org/" SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz" CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" perl = $portVersion compat >= 5 @@ -31,14 +31,14 @@ BUILD_REQUIRES=" cmd:sed " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make " SOURCE_DIR="$portVersionedName" -BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL 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 deleted file mode 100644 index 9067c8950..000000000 --- a/dev-libs/apr-util/apr-util-1.3.10.recipe +++ /dev/null @@ -1,68 +0,0 @@ -SUMMARY="Apache Portable Runtime Utility Library" -DESCRIPTION="Apache Portable Runtime Utility Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz" -CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19" -REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" - -PROVIDES="apr-util = $portVersion compat >= 1 - lib:libaprutil = $portVersion compat >= 1 - lib:libaprutil-1 = $portVersion compat >= 1" -REQUIRES="haiku >= $haikuVersion - apr >= 1.3.9 - expat >= 2.0" -BUILD_REQUIRES="cmd:aclocal - cmd:autoconf - cmd:autoheader - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion" - -SOURCE_DIR="$portVersionedName" - -# TODO: The hard-coded reference to the apr work directory isn't good at all. -# We should declare a build dependency on the APR sources instead. - -BUILD() -{ - aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName - aprInstallDir=$aprUtilPackageLinksDir/apr - - # We need the APR sources to build APR-Util. - haikuporter -b -y apr-1.4.2 - aprSourceDir=$(haikuporter -t)/dev-libs/apr/work/apr-1.4.2 - - rm -rf aclocal.m4 - mkdir -p m4 - haikuporter -b -y apr-1.4.2 - libtoolize -fci - aclocal --install -I m4 - autoconf -f - cd xml/expat - mkdir -p m4 - echo 'AM_INIT_AUTOMAKE' >> configure.in - libtoolize -fci - aclocal --install -I m4 - autoconf --force - autoheader - touch libtool.m4 - cd ../.. - sed -i 's/\/usr\/bin\/env/\/bin\/env/' $aprSourceDir/build/gen-build.py - buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.2 \ - --prefix=$prefix - ln -sf $(which libtool) ./libtool - ./configure $configureDirArgs \ - --with-apr=$aprInstallDir/bin/apr-1-config - make -} - -INSTALL() -{ - make install -} - -LICENSE="Apache v2" -COPYRIGHT="2010 The Apache Software Foundation." diff --git a/dev-libs/apr-util/apr_util-1.3.10.recipe b/dev-libs/apr-util/apr_util-1.3.10.recipe new file mode 100644 index 000000000..9a0e4cbd4 --- /dev/null +++ b/dev-libs/apr-util/apr_util-1.3.10.recipe @@ -0,0 +1,96 @@ +SUMMARY="Apache Portable Runtime Utility Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.10.tar.gz" +LICENSE="Apache v2" +COPYRIGHT="2010 The Apache Software Foundation." +CHECKSUM_MD5="82acd25cf3df8c72eba44eaee8b80c19" +REVISION="4" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + apr_util = $portVersion compat >= 1 + lib:libaprutil = $portVersion compat >= 1 + lib:libaprutil_1 = $portVersion compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + apr >= 1.3.9 + expat >= 2.0 + " +BUILD_REQUIRES=" + $REQUIRES + cmd:aclocal + cmd:autoconf + cmd:autoheader + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName + aprInstallDir=$aprUtilPackageLinksDir/apr + expatInstallDir=$aprUtilPackageLinksDir/expat + + rm -rf aclocal.m4 + mkdir -p m4 + libtoolize -fci + aclocal --install -I m4 + autoconf -f + cd xml/expat + mkdir -p m4 + echo 'AM_INIT_AUTOMAKE' >> configure.in + libtoolize -fci + aclocal --install -I m4 + autoconf --force + autoheader + touch libtool.m4 + cd ../.. + + # TODO: fix this hack! + cp /boot/common/bin/libtool . + ln -sfn $sourceDir/libtool /libtool + + ./configure $configureDirArgs \ + --with-apr=$aprInstallDir \ + --with-expat=$expatInstallDir + make +} + +INSTALL() +{ + make 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) + " diff --git a/dev-libs/apr/apr-1.4.2.recipe b/dev-libs/apr/apr-1.4.2.recipe index ceaec12a4..7a6c33b5f 100644 --- a/dev-libs/apr/apr-1.4.2.recipe +++ b/dev-libs/apr/apr-1.4.2.recipe @@ -1,4 +1,64 @@ SUMMARY="Apache Portable Runtime Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz" +CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd" +LICENSE="Apache v2" +COPYRIGHT="2010 The Apache Software Foundation." +REVISION="5" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + apr = $portVersion compat >= 1 + lib:libapr = $portVersion compat >= 1 + lib:libapr_1 = $portVersion compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + libtoolize --force --copy --install + touch libtool.m4 + aclocal -I build + autoconf + ./configure $configureDirArgs + + # TODO: fix this hack (by finding out why top_builddir seems to be unset)! + ln -sfn $sourceDir/libtool /libtool + + make +} + +INSTALL() +{ + make install +} + +TEST() +{ + make test +} + + +# ----- source package ------------------------------------------------------- + +PROVIDES_source="apr_source = $portVersion compat = $portVersion" + + DESCRIPTION=" The mission of the Apache Portable Runtime (APR) project is to create and maintain software libraries that provide a predictable and consistent @@ -24,55 +84,3 @@ DESCRIPTION=" - thread and Process management - various data structures (tables, hashes, priority queues, etc) " -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz" -CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd" -REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" - -PROVIDES=" - apr = $portVersion compat >= 1 - lib:libapr = $portVersion compat >= 1 - lib:libapr-1 = $portVersion compat >= 1 - " -REQUIRES=" - haiku >= $haikuVersion - " -BUILD_REQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make - " -BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion - " - -SOURCE_DIR="$portVersionedName" - -BUILD() -{ - libtoolize --force --copy --install - touch libtool.m4 - aclocal -I build - autoconf - ./configure $configureDirArgs - # TODO: fix this hack (by finding out why top_builddir seems to be unset)! - ln -sfn $sourceDir/libtool /libtool - make -} - -INSTALL() -{ - make install -} - -TEST() -{ - make test -} - -LICENSE="Apache v2" -COPYRIGHT="2010 The Apache Software Foundation." diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe index 1288bdef6..34348d6ad 100644 --- a/dev-libs/expat/expat-2.0.1.recipe +++ b/dev-libs/expat/expat-2.0.1.recipe @@ -5,7 +5,7 @@ DESCRIPTION=" HOMEPAGE="http://expat.sourceforge.net/" SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz" CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -24,7 +24,7 @@ BUILD_REQUIRES=" cmd:make " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/libxml2/libxml2-2.7.8.recipe b/dev-libs/libxml2/libxml2-2.7.8.recipe index ba2f2cf6e..4c33f4674 100644 --- a/dev-libs/libxml2/libxml2-2.7.8.recipe +++ b/dev-libs/libxml2/libxml2-2.7.8.recipe @@ -1,4 +1,56 @@ SUMMARY="The XML C parser and toolkit of Gnome" +HOMEPAGE="http://www.xmlsoft.org/" +LICENSE="MIT" +COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." +SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz" +CHECKSUM_MD5="8127a65e8c3b08856093099b52599c86" +REVISION="4" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + libxml2 = $portVersion compat >= 2.7 + lib:libxml2 = $portVersion compat >= 2.7 + " +REQUIRES=" + haiku >= $haikuVersion + zlib + " +BUILD_REQUIRES=" + $REQUIRES + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + ./configure $configureDirArgs --enable-ipv6=no LDFLAGS="-lnetwork" + make +} + +INSTALL() +{ + make install +} + +TEST() +{ + make tests +} + DESCRIPTION=" Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform), it is free software available @@ -52,55 +104,3 @@ DESCRIPTION=" on but it would be far too early to make any conformance statement about it at the moment. " -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz" -CHECKSUM_MD5="8127a65e8c3b08856093099b52599c86" -REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" - -PROVIDES=" - libxml2 = $portVersion compat >= 2.7 - lib:libxml2 = $portVersion compat >= 2.7 - " -REQUIRES=" - haiku >= $haikuVersion - zlib - " -BUILD_REQUIRES=" - $REQUIRES - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make - " -BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion - " - -SOURCE_DIR="$portVersionedName" - -BUILD() -{ - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure $configureDirArgs --enable-ipv6=no LDFLAGS="-lnetwork" - make -} - -INSTALL() -{ - make install -} - -TEST() -{ - make tests -} - -LICENSE="MIT" -COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe index 2fb63d280..8822d6de8 100644 --- a/dev-libs/openssl/openssl-1.0.0d.recipe +++ b/dev-libs/openssl/openssl-1.0.0d.recipe @@ -17,7 +17,7 @@ DESCRIPTION=" HOMEPAGE="http://www.openssl.org/" SRC_URI="http://www.openssl.org/source/openssl-1.0.0d.tar.gz" CHECKSUM_MD5="40b6ea380cc8a5bf9734c2f8bf7e701e" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -40,7 +40,7 @@ BUILD_REQUIRES=" cmd:sed " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe index ee3b4f102..51f245058 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.recipe +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -3,15 +3,15 @@ DESCRIPTION="CVS is a version control system." HOMEPAGE="http://www.nongnu.org/cvs/" SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2" CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="cvs = $portVersion compat >= 1.12 cmd:cvs = $portVersion compat >= 1.12" -REQUIRES="haiku-devel >= $haikuVersion +REQUIRES="haiku_devel >= $haikuVersion zlib >= 1.1.4" BUILD_REQUIRES="" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion +BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:libtoolize diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe index 26a60ffe9..2ba1d878a 100644 --- a/dev-vcs/subversion/subversion-1.6.15.recipe +++ b/dev-vcs/subversion/subversion-1.6.15.recipe @@ -10,7 +10,7 @@ DESCRIPTION=" HOMEPAGE="http://subversion.apache.org" SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.15.tar.bz2" CHECKSUM_MD5="113fca1d9e4aa389d7dc2b210010fa69" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -28,7 +28,7 @@ PROVIDES=" REQUIRES=" haiku >= $haikuVersion apr >= 1.3 - apr-util >= 1.3 + apr_util >= 1.3 expat >= 2.0 libiconv >= 1.13 libxml2 >= 2.7 @@ -46,7 +46,7 @@ BUILD_REQUIRES=" cmd:make " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" @@ -59,7 +59,7 @@ BUILD() subversionPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName ./configure $configureDirArgs \ --with-apr=$subversionPackageLinksDir/apr/bin/apr-1-config \ - --with-apr-util=$subversionPackageLinksDir/apr-util/bin/apu-1-config \ + --with-apr-util=$subversionPackageLinksDir/apr_util/bin/apu-1-config \ --with-neon=$subversionPackageLinksDir/neon \ --with-zlib=$subversionPackageLinksDir/zlib \ --with-editor=nano \ diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe index bcfcd82be..fcbdb9e17 100644 --- a/net-misc/neon/neon-0.29.6.recipe +++ b/net-misc/neon/neon-0.29.6.recipe @@ -20,7 +20,7 @@ DESCRIPTION=" HOMEPAGE="http://www.webdav.org/neon/" SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz" CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -42,7 +42,7 @@ BUILD_REQUIRES=" cmd:make " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe index d1e704637..ccc6d99ba 100644 --- a/sys-apps/gawk/gawk-3.1.8.recipe +++ b/sys-apps/gawk/gawk-3.1.8.recipe @@ -14,7 +14,7 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/coreutils" SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-3.1.8.tar.bz2" CHECKSUM_MD5="52b41c6c4418b3226dfb8f82076193bb" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -30,7 +30,7 @@ BUILD_REQUIRES=" cmd:sed " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe index a1a3eba63..40de789b0 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -12,7 +12,7 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/sed" SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz" CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -23,7 +23,7 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:aclocal >= 1.11 diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe index 9fad43770..f080a7726 100644 --- a/sys-apps/texinfo/texinfo-4.13a.recipe +++ b/sys-apps/texinfo/texinfo-4.13a.recipe @@ -3,13 +3,13 @@ DESCRIPTION="Texinfo is the official documentation format of the GNU project." HOMEPAGE="http://www.gnu.org/software/texinfo/" SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz" CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="texinfo = $portVersion compat >= 4.13 cmd:info = $portVersion compat >= 4.13 cmd:makeinfo = $portVersion compat >= 4.13 - cmd:install-info = $portVersion compat >= 4.13 + cmd:install_info = $portVersion compat >= 4.13 cmd:texi2dvi = $portVersion compat >= 4.13 cmd:texi2pdf = $portVersion compat >= 4.13 cmd:texindex = $portVersion compat >= 4.13 @@ -17,7 +17,7 @@ PROVIDES="texinfo = $portVersion compat >= 4.13 cmd:pdftexi2dvi = $portVersion compat >= 4.13" REQUIRES="" BUILD_REQUIRES="" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion +BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:libtoolize diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index 98c1c86f5..94892a1aa 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -8,8 +8,12 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/autoconf/" SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2" CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" +LICENSE=" + GNU GPL v2 + GNU GPL v3" +COPYRIGHT="1992-2010 Free Software Foundation, Inc." PROVIDES=" autoconf = $portVersion compat >= 2.60 @@ -35,13 +39,13 @@ BUILD_REQUIRES=" cmd:sed " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion cmd:autoreconf >= 2.60 cmd:make " +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL SOURCE_DIR="$portVersionedName" -BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL" BUILD() { @@ -61,6 +65,6 @@ TEST() make check } -LICENSE="GNU GPL v2 - GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." +# ----- source package ------------------------------------------------------- + +PROVIDES_source="autoconf_source = $portVersion" diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index aec8de442..b418af8bd 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -6,7 +6,7 @@ DESCRIPTION="GNU Autoconf is a tool for configuring source code and makefiles. U HOMEPAGE="http://www.gnu.org/software/autoconf/" SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz" CHECKSUM_MD5="50f97f4159805e374639a73e2636f22e" -REVISION="1" +REVISION="2" ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES="autoconf = $portVersion compat >= 2.60 @@ -25,12 +25,12 @@ REQUIRES="haiku >= $haikuVersion cmd:perl >= 5 cmd:sh" BUILD_REQUIRES="cmd:automake >= 1.13.1" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion +BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:autoreconf >= 2.60 cmd:make" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL SOURCE_DIR="$portVersionedName" -BUILD_PACKAGE_ACTIVATION_PHASE="INSTALL" BUILD() { diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe index f6866ec11..77bbbef50 100644 --- a/sys-devel/automake/automake-1.11.1.recipe +++ b/sys-devel/automake/automake-1.11.1.recipe @@ -8,15 +8,15 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/automake/" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz" CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" automake = $portVersion compat >= 1.11 cmd:automake = $portVersion compat >= 1.11 - cmd:automake-1.11 = $portVersion compat >= 1.11 + cmd:automake_1.11 = $portVersion compat >= 1.11 cmd:aclocal = $portVersion compat >= 1.11 - cmd:aclocal-1.11 = $portVersion compat >= 1.11 + cmd:aclocal_1.11 = $portVersion compat >= 1.11 " REQUIRES=" haiku >= $haikuVersion @@ -32,7 +32,7 @@ BUILD_REQUIRES=" cmd:sed " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion cmd:autoconf >= 2.60 cmd:make " diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index cf419d472..eb4ff4580 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -6,14 +6,14 @@ DESCRIPTION="Automake is a tool for automatically generating 'Makefile.in' files HOMEPAGE="http://www.gnu.org/software/automake/" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz" CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847" -REVISION="1" +REVISION="2" ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES="automake = $portVersion compat >= 1.11 cmd:automake = $portVersion compat >= 1.11 - cmd:automake-1.11 = $portVersion compat >= 1.11 + cmd:automake_1.11 = $portVersion compat >= 1.11 cmd:aclocal = $portVersion compat >= 1.11 - cmd:aclocal-1.11 = $portVersion compat >= 1.11" + cmd:aclocal_1.11 = $portVersion compat >= 1.11" REQUIRES="haiku >= $haikuVersion cmd:awk coreutils @@ -22,7 +22,7 @@ REQUIRES="haiku >= $haikuVersion cmd:perl >= 5 cmd:sh" BUILD_REQUIRES="cmd:sed" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion +BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:autoconf >= 2.60 cmd:make cmd:perl >= 5.8" diff --git a/sys-devel/binutils/binutils-2.17_110711.recipe b/sys-devel/binutils/binutils-2.17_110711.recipe new file mode 100644 index 000000000..c89557682 --- /dev/null +++ b/sys-devel/binutils/binutils-2.17_110711.recipe @@ -0,0 +1,186 @@ +SUMMARY="The GNU assembler, linker and binary utilities" +HOMEPAGE="http://www.gnu.org/software/binutils" +SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#9f9e588ceb7baa6bc5ac0193fb90212fc7fd667c" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2006 Free Software Foundation, Inc." + + +PROVIDES=" + binutils = $portVersion compat >= 2.17 + cmd:addr2line = $portVersion compat >= 2.17 + cmd:ar = $portVersion compat >= 2.17 + cmd:as = $portVersion compat >= 2.17 + cmd:c++filt = $portVersion compat >= 2.17 + cmd:gprof = $portVersion compat >= 2.17 + cmd:ld = $portVersion compat >= 2.17 + cmd:nm = $portVersion compat >= 2.17 + cmd:objcopy = $portVersion compat >= 2.17 + cmd:objdump = $portVersion compat >= 2.17 + cmd:ranlib = $portVersion compat >= 2.17 + cmd:readelf = $portVersion compat >= 2.17 + cmd:size = $portVersion compat >= 2.17 + cmd:strings = $portVersion compat >= 2.17 + cmd:strip = $portVersion compat >= 2.17 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoconf + binutils + gcc + cmd:flex + cmd:make + cmd:sed + cmd:tar + texinfo + " + +SOURCE_DIR="$portVersionedName" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +binutilsDir=$(pwd)/legacy/binutils +relativeArchInstallDir="develop/tools/${portVersionedName}" +archInstallDir="$prefix/$relativeArchInstallDir" +objectsDir=$(pwd)/../${portVersionedName}-obj +binutilsObjectsDir=$objectsDir/binutils + +BUILD() +{ + rm -rf $objectsDir + + # Touch all *.info files, as newer texinfos don't like their format + (cd $binutilsDir; find . -name \*.info | xargs touch) + + # build binutils + mkdir -p $binutilsObjectsDir + cd $binutilsObjectsDir + CFLAGS="-O2" CXXFLAGS="-O2" "$binutilsDir/configure" \ + --prefix=$prefix --exec-prefix=$archInstallDir \ + --bindir=$prefix/bin --libdir=$prefix/lib \ + --includedir=$prefix/develop/headers/binutils \ + --mandir=$prefix/documentation/man \ + --with-docdir=$prefix/documentation/binutils \ + --with-htmldir=$prefix/documentation/binutils \ + --disable-nls --enable-shared=yes + make +} + +INSTALL() +{ + cd $binutilsObjectsDir + archName=$(grep '^target_alias' Makefile | cut -d= -f2) + + make install + make install-html + + base=$prefix + + ### HTML documentation #################################### + + echo "Organizing HTML documentation..." + html_base=$base/documentation/binutils/html + mkdir -p $html_base + cd $html_base + + # libiberty + makeinfo --html "$binutilsDir/libiberty/libiberty.texi" + ln -sf libiberty/index.html $html_base/libiberty.html + + # bfd + mv $binutilsObjectsDir/bfd/doc/bfd.html $html_base/bfd + ln -sf bfd/index.html $html_base/bfd.html + + # binutils + mv $binutilsObjectsDir/binutils/doc/binutils.html $html_base/binutils + ln -sf binutils/index.html $html_base/binutils.html + + # gas + mv $binutilsObjectsDir/gas/doc/as.html $html_base/as + ln -sf as/index.html $html_base/as.html + + # gprof + mv $binutilsObjectsDir/gprof/gprof.html $html_base/gprof + ln -sf gprof/index.html $html_base/gprof.html + + # ld + mv $binutilsObjectsDir/ld/ld.html $html_base/ld + ln -sf ld/index.html $html_base/ld.html + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # remove duplicate architecture-dependent binaries from $prefix/bin + cd $prefix/bin + rm ar as ld nm objdump ranlib strip + + # make all tools available via default paths if these are + # the system binutils + if [ $architecture = 'x86_gcc2' ]; then + echo "Symlinking binaries into default path" + mkdir -p $prefix/bin + ln -sfn ../$relativeArchInstallDir/$archName/bin/* . + fi + + ### Strip ################################################# + + echo "Strip debug info" + + cd $base + strip --strip-debug i586-pc-haiku/bin/* + + ### Cleanup ############################################### + + echo "Cleanup" + + if [ -d $base/man -o -d $base/info -o -d $base/share ]; then + rm -rf $base/man + rm -rf $base/info + rm -rf $base/share + fi +} + +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. + " diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe index b08590afd..f3e420f0a 100644 --- a/sys-devel/bison/bison-2.4.3.recipe +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -12,7 +12,7 @@ DESCRIPTION="Bison is a general-purpose parser generator that converts an annota HOMEPAGE="http://www.gnu.org/software/bison/bison.html" SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz" CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="bison = $portVersion compat >= 2.4 @@ -20,7 +20,7 @@ PROVIDES="bison = $portVersion compat >= 2.4 cmd:yacc lib:liby.a = $portVersion compat >= 2.4" REQUIRES="haiku >= $haikuVersion" -BUILD_PREREQUIRES="haiku-devel >= $haikuVersion +BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make" diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index 2cc467a6b..86cc33e7a 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -6,7 +6,7 @@ DESCRIPTION=" HOMEPAGE="http://flex.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download" CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -26,7 +26,7 @@ BUILD_REQUIRES=" cmd:make " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion cmd:gcc cmd:ld " diff --git a/sys-devel/gcc/gcc-2.95.3_110711.recipe b/sys-devel/gcc/gcc-2.95.3_110711.recipe index 3d4a570f4..2f3b5ac81 100644 --- a/sys-devel/gcc/gcc-2.95.3_110711.recipe +++ b/sys-devel/gcc/gcc-2.95.3_110711.recipe @@ -1,63 +1,52 @@ 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" -# TODO: Also: http://www.gnu.org/software/binutils -SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#ba94fdf309096bd9bbf432ad53efba62bc47f98e" -REVISION="4" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2000 Free Software Foundation, Inc." +SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#9f9e588ceb7baa6bc5ac0193fb90212fc7fd667c" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" gcc = $portVersion compat >= 2.95.3 + cmd:c++ = $portVersion compat >= 2.95.3 cmd:cpp = $portVersion compat >= 2.95.3 - cmd:gcc = $portVersion compat >= 2.95.3 cmd:g++ = $portVersion compat >= 2.95.3 - binutils = 2.17_110711 compat >= 2.17 - cmd:ar = 2.17_110711 compat >= 2.17 - cmd:as = 2.17_110711 compat >= 2.17 - cmd:c++filt = 2.17_110711 compat >= 2.17 + cmd:gcc = $portVersion compat >= 2.95.3 cmd:gcov = 1.5 compat >= 1.5 - cmd:gprof = 2.17_110711 compat >= 2.17 - cmd:ld = 2.17_110711 compat >= 2.17 - cmd:nm = 2.17_110711 compat >= 2.17 - cmd:objcopy = 2.17_110711 compat >= 2.17 - cmd:objdump = 2.17_110711 compat >= 2.17 - cmd:protoize = 2.17_110711 compat >= 2.17 - cmd:ranlib = 2.17_110711 compat >= 2.17 - cmd:readelf = 2.17_110711 compat >= 2.17 - cmd:size = 2.17_110711 compat >= 2.17 - cmd:strings = 2.17_110711 compat >= 2.17 - cmd:strip = 2.17_110711 compat >= 2.17 - cmd:unprotoize = 2.17_110711 compat >= 2.17 + cmd:protoize = $portVersion compat >= 2.95.3 + cmd:unprotoize = $portVersion compat >= 2.95.3 " REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + binutils " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion cmd:autoconf - binutils gcc cmd:flex cmd:make cmd:sed cmd:tar - texinfo + cmd:makeinfo " SOURCE_DIR="$portVersionedName" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL +gccDir=$(pwd)/legacy/gcc gccDate=110711 relativeGccInstallDir="develop/tools/gcc-2.95.3-${gccDate}" gccInstallDir="$prefix/$relativeGccInstallDir" objectsDir=$(pwd)/../${portVersionedName}-obj -binutilsObjectsDir=$objectsDir/binutils gccObjectsDir=$objectsDir/gcc -buildtoolsDir=$(pwd)/legacy BUILD() { @@ -66,27 +55,13 @@ BUILD() # Touch some files generated by bison, so that bison won't run to update # them. Fixes issues with newer bison versions. # And while at it, touch gperf target, too (as gperf may not be installed). - (cd $buildtoolsDir/gcc/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + (cd $gccDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ cp/parse.h c-gperf.h) - # Touch all *.info files, as newer texinfos don't like their format - (cd $buildtoolsDir; find . -name \*.info | xargs touch) - - # build binutils - mkdir -p $binutilsObjectsDir - cd $binutilsObjectsDir - CFLAGS="-O2" CXXFLAGS="-O2" "$buildtoolsDir/binutils/configure" \ - --prefix=$gccInstallDir \ - --disable-nls --enable-shared=yes - make - - # install binutils before building gcc - make install - # build gcc - mkdir $gccObjectsDir + mkdir -p $gccObjectsDir cd $gccObjectsDir - CFLAGS="-O2" CXXFLAGS="-O2" "$buildtoolsDir/gcc/configure" \ + CFLAGS="-O2" CXXFLAGS="-O2" "$gccDir/configure" \ --prefix=$gccInstallDir \ --disable-nls --enable-shared=yes --enable-languages=c,c++ make bootstrap || true @@ -97,9 +72,6 @@ BUILD() INSTALL() { - cd $binutilsObjectsDir - make install - cd $gccObjectsDir make install @@ -107,54 +79,29 @@ INSTALL() ### HTML documentation #################################### - html_base=$base/html-docs + html_base=$prefix/documentation/packages/$portVersionedName if [ ! -d "$html_base" ]; then echo "Building HTML documentation..." - mkdir $html_base + mkdir -p $html_base cd $html_base - makeinfo --html "$buildtoolsDir/gcc/gcc/cpp.texi" - makeinfo --html "$buildtoolsDir/gcc/gcc/gcc.texi" - makeinfo --html "$buildtoolsDir/binutils/libiberty/libiberty.texi" - makeinfo --force --html "$buildtoolsDir/gcc/libio/iostream.texi" \ + makeinfo --html "$gccDir/gcc/cpp.texi" + makeinfo --html "$gccDir/gcc/gcc.texi" + makeinfo --force --html "$gccDir/libio/iostream.texi" \ && true # some errors ln -sf cpp/index.html $html_base/cpp.html ln -sf gcc/index.html $html_base/gcc.html - ln -sf libiberty/index.html $html_base/libiberty.html ln -sf iostream/index.html $html_base/iostream.html fi - if [ -d "$base/share/doc" ]; then - echo "Adding binutils HTML documentation..." - - mv $base/share/doc/as.html $html_base/as - mv $base/share/doc/binutils.html $html_base/binutils - mv $base/share/doc/gprof.html $html_base/gprof - mv $base/share/doc/ld.html $html_base/ld - #mv $base/share/doc/configure.html $html_base/ - - ln -sf as/index.html $html_base/as.html - ln -sf binutils/index.html $html_base/binutils.html - ln -sf gprof/index.html $html_base/gprof.html - ln -sf ld/index.html $html_base/ld.html - fi - if [ ! -e "$html_base/as.html" ]; then - echo "binutils HTML documentation missing, see" \ - "INSTALL-gcc2-from-source-Haiku." - fi ### Symlinks ############################################## echo "Creating required symlinks" - # create symlinks to binutils binaries - cd $base/bin - for binary in ../i586-pc-haiku/bin/*; do - ln -sfn $binary . - done - # convert to absolute links to relative ones + cd $base/bin ln -sfn g++ c++ ln -sfn gcc i586-pc-haiku-gcc @@ -199,7 +146,3 @@ INSTALL() ln -snf /boot/system/lib/libstdc++.r4.so $base/lib/ ln -snf /boot/system/lib/libstdc++.so $base/lib/ } - -LICENSE="GNU GPL v2 - GNU LGPL v2" -COPYRIGHT="1988-2000 Free Software Foundation, Inc." diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index b3e77bb23..b5306ea85 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -6,7 +6,7 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/libtool" SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz" CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -30,7 +30,7 @@ BUILD_REQUIRES=" cmd:sed " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe index 6ab48137e..6ebdc1889 100644 --- a/sys-devel/m4/m4-1.4.16.recipe +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -19,7 +19,7 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/m4/" SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz" CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -33,7 +33,7 @@ BUILD_REQUIRES=" cmd:sed " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index d7a7eea3c..723658692 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -12,7 +12,7 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/make/" SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2" CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -27,7 +27,7 @@ BUILD_REQUIRES=" cmd:sed " BUILD_PREREQUIRES=" - haiku-devel >= $haikuVersion + haiku_devel >= $haikuVersion cmd:gcc cmd:ld " From c74c8c9f4d31eb8197aaed68ce97410c53d1aaa1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 21 Apr 2013 16:51:31 +0200 Subject: [PATCH 091/587] Rename xz-utils recipes Going to have a closer look... --- .../xz-utils/{xz-utils-5.0.1.recipe => xz_utils-5.0.1.recipe} | 0 .../xz-utils/{xz-utils-5.0.4.recipe => xz_utils-5.0.4.recipe} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename app-arch/xz-utils/{xz-utils-5.0.1.recipe => xz_utils-5.0.1.recipe} (100%) rename app-arch/xz-utils/{xz-utils-5.0.4.recipe => xz_utils-5.0.4.recipe} (100%) diff --git a/app-arch/xz-utils/xz-utils-5.0.1.recipe b/app-arch/xz-utils/xz_utils-5.0.1.recipe similarity index 100% rename from app-arch/xz-utils/xz-utils-5.0.1.recipe rename to app-arch/xz-utils/xz_utils-5.0.1.recipe diff --git a/app-arch/xz-utils/xz-utils-5.0.4.recipe b/app-arch/xz-utils/xz_utils-5.0.4.recipe similarity index 100% rename from app-arch/xz-utils/xz-utils-5.0.4.recipe rename to app-arch/xz-utils/xz_utils-5.0.4.recipe From b0fe332599ee80d7bcfa49a9d64dcf8ea1fa5157 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 20 Apr 2013 14:05:29 +0200 Subject: [PATCH 092/587] Populate .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..15aca119b --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +packages +repository +*/*/download +*/*/work-* From db8f9fa6db9d9fb76bc19a486957b259267f11eb Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 20 Apr 2013 14:06:54 +0200 Subject: [PATCH 093/587] Cleanup binutils package. --- .../binutils/binutils-2.17_110711.recipe | 69 +++++++------------ 1 file changed, 26 insertions(+), 43 deletions(-) diff --git a/sys-devel/binutils/binutils-2.17_110711.recipe b/sys-devel/binutils/binutils-2.17_110711.recipe index c89557682..0ecdbe42c 100644 --- a/sys-devel/binutils/binutils-2.17_110711.recipe +++ b/sys-devel/binutils/binutils-2.17_110711.recipe @@ -1,7 +1,7 @@ SUMMARY="The GNU assembler, linker and binary utilities" HOMEPAGE="http://www.gnu.org/software/binutils" SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#9f9e588ceb7baa6bc5ac0193fb90212fc7fd667c" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" LICENSE=" GNU GPL v2 @@ -69,8 +69,7 @@ BUILD() --bindir=$prefix/bin --libdir=$prefix/lib \ --includedir=$prefix/develop/headers/binutils \ --mandir=$prefix/documentation/man \ - --with-docdir=$prefix/documentation/binutils \ - --with-htmldir=$prefix/documentation/binutils \ + --with-htmldir=documentation/html/binutils \ --disable-nls --enable-shared=yes make } @@ -79,43 +78,37 @@ INSTALL() { cd $binutilsObjectsDir archName=$(grep '^target_alias' Makefile | cut -d= -f2) - + make install make install-html - base=$prefix - ### HTML documentation #################################### echo "Organizing HTML documentation..." - html_base=$base/documentation/binutils/html - mkdir -p $html_base + html_base=$prefix/documentation/html/binutils cd $html_base - # libiberty - makeinfo --html "$binutilsDir/libiberty/libiberty.texi" - ln -sf libiberty/index.html $html_base/libiberty.html + mv as.html as + ln -sf as/index.html as.html + mv bfd.html bfd + ln -sf bfd/index.html bfd.html + mv binutils.html binutils + ln -sf binutils/index.html binutils.html + mv gprof.html gprof + ln -sf gprof/index.html gprof.html + mv ld.html ld + ln -sf ld/index.html ld.html + rm standards.html - # bfd - mv $binutilsObjectsDir/bfd/doc/bfd.html $html_base/bfd - ln -sf bfd/index.html $html_base/bfd.html - - # binutils - mv $binutilsObjectsDir/binutils/doc/binutils.html $html_base/binutils - ln -sf binutils/index.html $html_base/binutils.html + ### Strip ################################################# - # gas - mv $binutilsObjectsDir/gas/doc/as.html $html_base/as - ln -sf as/index.html $html_base/as.html - - # gprof - mv $binutilsObjectsDir/gprof/gprof.html $html_base/gprof - ln -sf gprof/index.html $html_base/gprof.html - - # ld - mv $binutilsObjectsDir/ld/ld.html $html_base/ld - ln -sf ld/index.html $html_base/ld.html + echo "Strip debug info" + cd $prefix + find bin -type f | xargs -r strip --strip-debug + strip --strip-debug lib/*.a + strip --strip-debug $archInstallDir/$archName/bin/* + ### Symlinks ############################################## echo "Creating required symlinks" @@ -131,23 +124,13 @@ INSTALL() mkdir -p $prefix/bin ln -sfn ../$relativeArchInstallDir/$archName/bin/* . fi - - ### Strip ################################################# - - echo "Strip debug info" - cd $base - strip --strip-debug i586-pc-haiku/bin/* - - ### Cleanup ############################################### + ### Cleanup ################################################# echo "Cleanup" - - if [ -d $base/man -o -d $base/info -o -d $base/share ]; then - rm -rf $base/man - rm -rf $base/info - rm -rf $base/share - fi + + cd $prefix + rm -rf info } DESCRIPTION=" From 2191f6611f69170bf492e9b304bc014875df5b06 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 21 Apr 2013 18:52:53 +0200 Subject: [PATCH 094/587] Rename all port folders containing '-' to use '_' instead. * haikuporter relies on the recipe file sharing the name with the port folder --- .../{xz-utils => xz_utils}/xz-utils-4.999.9.recipe | 0 .../{xz-utils => xz_utils}/xz_utils-5.0.1.recipe | 0 .../{xz-utils => xz_utils}/xz_utils-5.0.4.recipe | 0 .../ebook-tools-0.2.1.recipe | 0 .../{mm-common => mm_common}/mm-common-0.9.2.recipe | 0 .../patches/u-boot-tools-2012.10.patch | 0 .../u-boot-tools-2012.10.recipe | 0 .../gnu-classpath-0.98.recipe | 0 .../licenses/GNU GPL v2 with classpath exceptions | 0 .../patches/gnu-classpath-0.98.patch | 0 dev-lang/{dmd-bin => dmd_bin}/dmd-bin-1.064.recipe | 0 dev-lang/{dmd-bin => dmd_bin}/licenses/Digital Mars | 0 .../patches/dmd-bin-1.064.patch | 0 .../{swi-prolog => swi_prolog}/licenses/SWI-Prolog | 0 .../patches/swi-prolog-6.0.2.patch | 0 .../patches/swi-prolog-6.2.0.patch | 0 .../swi-prolog-6.0.2.recipe | 0 .../swi-prolog-6.2.0.recipe | 0 .../{apr-util => apr_util}/apr-util-1.3.11.recipe | 0 .../{apr-util => apr_util}/apr-util-1.3.12.recipe | 0 .../{apr-util => apr_util}/apr-util-1.3.9.recipe | 0 .../{apr-util => apr_util}/apr-util-1.4.1.recipe | 0 .../{apr-util => apr_util}/apr_util-1.3.10.recipe | 0 .../patches/apr-util-0.9.x-haiku.diff | 0 .../patches/apr-util-0.9.x.diff | 0 .../patches/apr-util-1.3.10.patch | 0 .../patches/apr-util-1.3.11.patch | 0 .../patches/apr-util-1.3.12.patch | 0 .../patches/apr-util-1.4.1.patch | 0 .../boehm-gc-7.2_alpha6.recipe | 0 .../{boehm-gc => boehm_gc}/boehm-gc-7.2d.recipe | 0 dev-libs/{boehm-gc => boehm_gc}/licenses/BOEHM | 0 .../patches/boehm-gc-7.2_alpha6.patch | 0 .../patches/boehm-gc-7.2d.patch | 0 dev-libs/{json-c => json_c}/json-c-0.9.recipe | 0 .../{json-c => json_c}/patches/json-c-0.9.patch | 0 .../libgpg-error-1.10.recipe | 0 .../libgpg-error-1.7.recipe | 0 .../patches/libgpg-error-1.10.patch | 0 .../patches/libgpg-error-1.7.patch | 0 .../libpthread-stubs-0.3.2.recipe | 0 .../libpthread-stubs-0.3.recipe | 0 .../libxdg-basedir-1.1.1.recipe | 0 .../patches/libxdg-basedir-1.1.1.patch | 0 .../{xerces-c => xerces_c}/xerces-c-3.1.1.recipe | 0 .../XML-Parser-2.36.recipe | 0 .../abi-compliance-checker-1.98.3.recipe | 0 .../example-descriptors/README | 0 .../example-descriptors/libjpeg-6.2.desc | 0 .../example-descriptors/libjpeg-7.desc | 0 .../example-descriptors/libjpeg-8.desc | 0 .../example-descriptors/libpng-1.2.42.desc | 0 .../example-descriptors/libpng-1.4.0.desc | 0 .../example-descriptors/zlib-1.1.4.desc | 0 .../example-descriptors/zlib-1.2.2.desc | 0 .../example-descriptors/zlib-1.2.3.desc | 0 dev-util/{gtk-doc => gtk_doc}/gtk-doc-1.15.recipe | 0 .../{gtk-doc => gtk_doc}/patches/gtk-doc-1.15.patch | 0 .../gnome-common-2.28.recipe | 0 .../caya-gpl-protocols-0.HEAD.recipe | 0 .../caya-gpl-protocols-19.recipe | 0 .../caya-gpl-protocols-24.recipe | 0 .../caya-gpl-protocols-35.recipe | 0 .../caya-gpl-protocols-36.recipe | 0 .../patches/caya-gpl-protocols-0.HEAD.patch | 0 .../open-sum-it-108.recipe | 0 .../arabeyes-fonts-1.1.recipe | 0 .../courier-prime-1.0.recipe | 0 .../licenses/SIL Open Font License v1.1 | 0 .../farsi-fonts-0.4.recipe | 0 .../kacst-fonts-5.0.recipe | 0 .../lateef-font-1.001.recipe | 0 .../licenses/SIL Open Font License v1.1 | 0 .../liberation-fonts-1.06.0.20100721.recipe | 0 .../licenses/Liberation Exceptions | 0 .../licenses/CRULP | 0 .../nafees-nastaleeq-1.02.recipe | 0 .../{nafees-riqa => nafees_riqa}/licenses/CRULP | 0 .../nafees-riqa-1.00.recipe | 0 .../licenses/SIL Open Font License v1.1 | 0 .../scheherazade-font-1.005.recipe | 0 .../wqy-microhei-0.2.0-beta.recipe | 0 .../GNU GPL v2 with font embedding exception | 0 .../wqy-zenhei-0.9.45.recipe | 0 .../x-series-fonts-2.0.recipe | 0 .../patches/sane-backends-1.0.21.patch | 0 .../ladspa-sdk-1.13.recipe | 0 .../patches/ladspa-sdk-1.13.patch | 0 .../patches/sdl-gfx-2.0.20.patch | 0 .../{sdl-gfx => sdl_gfx}/sdl-gfx-2.0.20.recipe | 0 .../{sdl-gfx => sdl_gfx}/sdl-gfx-2.0.22.recipe | 0 .../{sdl-gfx => sdl_gfx}/sdl-gfx-2.0.23.recipe | 0 .../sdl-image-1.2-hg.recipe | 0 .../sdl-image-1.2.10.recipe | 0 .../sdl-image-1.2.12.recipe | 0 .../{sdl-image => sdl_image}/sdl-image-1.2.6.recipe | 0 .../{sdl-image => sdl_image}/sdl-image-1.2.8.recipe | 0 .../{sdl-image => sdl_image}/sdl-image-1.2.9.recipe | 0 .../sdl-image.OptionalPackageDescription | 0 .../sdl-libpak.OptionalPackageDescription | 0 .../patches/sdl-mixer-1.2.11.patch | 0 .../sdl-mixer-1.2-hg.recipe | 0 .../sdl-mixer-1.2.10.recipe | 0 .../sdl-mixer-1.2.11.recipe | 0 .../sdl-mixer-1.2.12.recipe | 0 .../{sdl-mixer => sdl_mixer}/sdl-mixer-1.2.9.recipe | 0 .../patches/sdl-net-1.2.7.patch | 0 .../patches/sdl-net-1.2.8.patch | 0 .../{sdl-net => sdl_net}/sdl-net-1.2-hg.recipe | 0 .../{sdl-net => sdl_net}/sdl-net-1.2.7.recipe | 0 .../{sdl-net => sdl_net}/sdl-net-1.2.8.recipe | 0 .../{sdl-rtf => sdl_rtf}/sdl-rtf-0.1.0.recipe | 0 .../sdl-sound-1.0-hg.recipe | 0 .../{sdl-sound => sdl_sound}/sdl-sound-1.0.3.recipe | 0 .../{sdl-ttf => sdl_ttf}/sdl-ttf-2.0-hg.recipe | 0 .../{sdl-ttf => sdl_ttf}/sdl-ttf-2.0.10.recipe | 0 .../{sdl-ttf => sdl_ttf}/sdl-ttf-2.0.11.recipe | 0 .../{sdl-ttf => sdl_ttf}/sdl-ttf-2.0.9.recipe | 0 .../gogo-no-coda-3.13.recipe | 0 .../patches/gogo-no-coda-3.13.patch | 0 .../patches/vorbis-tools-1.2.0.patch | 0 .../patches/vorbis-tools-1.4.0.patch | 0 .../vorbis-tools-1.2.0.recipe | 0 .../vorbis-tools-1.4.0.recipe | 0 .../patches/rhapsody-irc-0.28b.patch | 0 .../rhapsody-irc-0.28b.recipe | 0 .../b43-fwcutter-012.recipe | 0 .../patches/b43-fwcutter-012.patch | 0 .../TinnyTim.sh | 0 .../bezilla-patches-2009-07-07.diff | 0 .../bookmarks.html | 0 .../classic.jar | Bin .../browser/app/apprunner-beos.rdef | 0 .../browser/base/content/dynamic-bebook-v1.html | 0 .../browser/base/content/dynamic-bebook-v2.html | 0 .../browser/base/content/dynamic-userguide-v1.html | 0 .../browser/base/content/dynamic-userguide-v2.html | 0 .../browser/base/content/dynamic-welcome-v1.html | 0 .../browser/base/content/dynamic-welcome-v2.html | 0 .../browser/installer/beos/packages-static | 0 .../calendar/sunbird/app/apprunner-beos.rdef | 0 .../calendar/sunbird/app/apprunner-beos.rsrc | Bin .../mail/app/apprunner-beos.rdef | 0 .../xpfe/bootstrap/apprunner-beos.rdef | 0 .../hvif-icons/BeZilla-Browser-l | Bin .../hvif-icons/BeZilla-Browser-r | Bin .../hvif-icons/BeZilla-MailNews | Bin .../hvif-icons/BeZilla-MailNews-r | Bin .../hvif-icons/BeZilla-Suite-l | Bin .../hvif-icons/BeZilla-Suite-r | Bin .../hvif-icons/BeZilla-calendar-l | Bin .../hvif-icons/BeZilla-calendar-r | Bin .../hvif-icons/bezilla-1 copy | Bin .../hvif-icons/icon_copyright/copyleft.txt | 0 .../hvif-icons/icon_copyright/copyright_info.txt | 0 .../old-patches/allO1.patch | 0 .../old-patches/allO3.patch | 0 .../old-patches/configure-sunbird-nspr-reorder.diff | 0 .../old-patches/firstrun-default-page.diff | 0 .../old-patches/forReorderPatches-browser.zip | Bin .../old-patches/greyMenuSelection.patch | 0 .../old-patches/launch-kill-dowhile.patch | 0 .../old-patches/mozilla-rdefs.zip | Bin .../old-patches/nsAppRunner.patch | 0 .../old-patches/prpolevt-fix.patch | 0 .../old-patches/sunbird-makefile-apprunner-rsrc.zip | Bin .../patches/2009-09-27/bezilla.step-by-step.txt | 0 .../patches/2009-09-27/r01-config-star.patch | 0 .../r02-configure-in-withGCC4andCrossCompile.patch | 0 .../patches/2009-09-27/r03a-makefile-in.patch | 0 .../patches/2009-09-27/r03b-starmk.patch | 0 .../2009-09-27/r04a-rdef-support-in-Makefile.patch | 0 .../2009-09-27/r04b-just-rdefs-no-Makefile.patch | 0 .../patches/2009-09-27/r05-fix-shlibsign.README | 0 .../patches/2009-09-27/r05-fix-shlibsign.patch | 0 .../patches/2009-09-27/r06-nss-gcc4.patch | 0 .../r07-working-nspr-from-haikuports.patch | 0 .../patches/2009-09-27/r08-misc.patch | 0 .../2009-09-27/r09-sunbird-options-fix.patch | 0 .../patches/2009-09-27/r10-grey-menu-color.patch | 0 .../patches/2009-09-27/r11-bookmarks-v2.patch | 0 .../patches/2009-09-27/r12-releasenotes.patch | 0 .../persdict.dat | 0 .../select-a-mozconfig/browser-debug.mozconfig | 0 .../select-a-mozconfig/browser.mozconfig | 0 .../select-a-mozconfig/calendar.mozconfig | 0 .../select-a-mozconfig/mailnews.mozconfig | 0 .../select-a-mozconfig/suite-debug.mozconfig | 0 .../select-a-mozconfig/suite-just-browser.mozconfig | 0 .../select-a-mozconfig/suite.mozconfig | 0 .../shared-mime-info-1.0.recipe | 0 .../util-macros-1.17.0-git.recipe | 0 .../util-macros-1.7.0.recipe | 0 .../{xcb-proto => xcb_proto}/xcb-proto-1.6.recipe | 0 194 files changed, 0 insertions(+), 0 deletions(-) rename app-arch/{xz-utils => xz_utils}/xz-utils-4.999.9.recipe (100%) rename app-arch/{xz-utils => xz_utils}/xz_utils-5.0.1.recipe (100%) rename app-arch/{xz-utils => xz_utils}/xz_utils-5.0.4.recipe (100%) rename app-text/{ebook-tools => ebook_tools}/ebook-tools-0.2.1.recipe (100%) rename dev-cpp/{mm-common => mm_common}/mm-common-0.9.2.recipe (100%) rename dev-embedded/{u-boot-tools => u_boot_tools}/patches/u-boot-tools-2012.10.patch (100%) rename dev-embedded/{u-boot-tools => u_boot_tools}/u-boot-tools-2012.10.recipe (100%) rename dev-java/{gnu-classpath => gnu_classpath}/gnu-classpath-0.98.recipe (100%) rename dev-java/{gnu-classpath => gnu_classpath}/licenses/GNU GPL v2 with classpath exceptions (100%) rename dev-java/{gnu-classpath => gnu_classpath}/patches/gnu-classpath-0.98.patch (100%) rename dev-lang/{dmd-bin => dmd_bin}/dmd-bin-1.064.recipe (100%) rename dev-lang/{dmd-bin => dmd_bin}/licenses/Digital Mars (100%) rename dev-lang/{dmd-bin => dmd_bin}/patches/dmd-bin-1.064.patch (100%) rename dev-lang/{swi-prolog => swi_prolog}/licenses/SWI-Prolog (100%) rename dev-lang/{swi-prolog => swi_prolog}/patches/swi-prolog-6.0.2.patch (100%) rename dev-lang/{swi-prolog => swi_prolog}/patches/swi-prolog-6.2.0.patch (100%) rename dev-lang/{swi-prolog => swi_prolog}/swi-prolog-6.0.2.recipe (100%) rename dev-lang/{swi-prolog => swi_prolog}/swi-prolog-6.2.0.recipe (100%) rename dev-libs/{apr-util => apr_util}/apr-util-1.3.11.recipe (100%) rename dev-libs/{apr-util => apr_util}/apr-util-1.3.12.recipe (100%) rename dev-libs/{apr-util => apr_util}/apr-util-1.3.9.recipe (100%) rename dev-libs/{apr-util => apr_util}/apr-util-1.4.1.recipe (100%) rename dev-libs/{apr-util => apr_util}/apr_util-1.3.10.recipe (100%) rename dev-libs/{apr-util => apr_util}/patches/apr-util-0.9.x-haiku.diff (100%) rename dev-libs/{apr-util => apr_util}/patches/apr-util-0.9.x.diff (100%) rename dev-libs/{apr-util => apr_util}/patches/apr-util-1.3.10.patch (100%) rename dev-libs/{apr-util => apr_util}/patches/apr-util-1.3.11.patch (100%) rename dev-libs/{apr-util => apr_util}/patches/apr-util-1.3.12.patch (100%) rename dev-libs/{apr-util => apr_util}/patches/apr-util-1.4.1.patch (100%) rename dev-libs/{boehm-gc => boehm_gc}/boehm-gc-7.2_alpha6.recipe (100%) rename dev-libs/{boehm-gc => boehm_gc}/boehm-gc-7.2d.recipe (100%) rename dev-libs/{boehm-gc => boehm_gc}/licenses/BOEHM (100%) rename dev-libs/{boehm-gc => boehm_gc}/patches/boehm-gc-7.2_alpha6.patch (100%) rename dev-libs/{boehm-gc => boehm_gc}/patches/boehm-gc-7.2d.patch (100%) rename dev-libs/{json-c => json_c}/json-c-0.9.recipe (100%) rename dev-libs/{json-c => json_c}/patches/json-c-0.9.patch (100%) rename dev-libs/{libgpg-error => libgpg_error}/libgpg-error-1.10.recipe (100%) rename dev-libs/{libgpg-error => libgpg_error}/libgpg-error-1.7.recipe (100%) rename dev-libs/{libgpg-error => libgpg_error}/patches/libgpg-error-1.10.patch (100%) rename dev-libs/{libgpg-error => libgpg_error}/patches/libgpg-error-1.7.patch (100%) rename dev-libs/{libpthread-stubs => libpthread_stubs}/libpthread-stubs-0.3.2.recipe (100%) rename dev-libs/{libpthread-stubs => libpthread_stubs}/libpthread-stubs-0.3.recipe (100%) rename dev-libs/{libxdg-basedir => libxdg_basedir}/libxdg-basedir-1.1.1.recipe (100%) rename dev-libs/{libxdg-basedir => libxdg_basedir}/patches/libxdg-basedir-1.1.1.patch (100%) rename dev-libs/{xerces-c => xerces_c}/xerces-c-3.1.1.recipe (100%) rename dev-perl/{XML-Parser => XML_Parser}/XML-Parser-2.36.recipe (100%) rename dev-util/{abi-compliance-checker => abi_compliance_checker}/abi-compliance-checker-1.98.3.recipe (100%) rename dev-util/{abi-compliance-checker => abi_compliance_checker}/example-descriptors/README (100%) rename dev-util/{abi-compliance-checker => abi_compliance_checker}/example-descriptors/libjpeg-6.2.desc (100%) rename dev-util/{abi-compliance-checker => abi_compliance_checker}/example-descriptors/libjpeg-7.desc (100%) rename dev-util/{abi-compliance-checker => abi_compliance_checker}/example-descriptors/libjpeg-8.desc (100%) rename dev-util/{abi-compliance-checker => abi_compliance_checker}/example-descriptors/libpng-1.2.42.desc (100%) rename dev-util/{abi-compliance-checker => abi_compliance_checker}/example-descriptors/libpng-1.4.0.desc (100%) rename dev-util/{abi-compliance-checker => abi_compliance_checker}/example-descriptors/zlib-1.1.4.desc (100%) rename dev-util/{abi-compliance-checker => abi_compliance_checker}/example-descriptors/zlib-1.2.2.desc (100%) rename dev-util/{abi-compliance-checker => abi_compliance_checker}/example-descriptors/zlib-1.2.3.desc (100%) rename dev-util/{gtk-doc => gtk_doc}/gtk-doc-1.15.recipe (100%) rename dev-util/{gtk-doc => gtk_doc}/patches/gtk-doc-1.15.patch (100%) rename gnome-base/{gnome-common => gnome_common}/gnome-common-2.28.recipe (100%) rename haiku-apps/{caya-gpl-protocols => caya_gpl_protocols}/caya-gpl-protocols-0.HEAD.recipe (100%) rename haiku-apps/{caya-gpl-protocols => caya_gpl_protocols}/caya-gpl-protocols-19.recipe (100%) rename haiku-apps/{caya-gpl-protocols => caya_gpl_protocols}/caya-gpl-protocols-24.recipe (100%) rename haiku-apps/{caya-gpl-protocols => caya_gpl_protocols}/caya-gpl-protocols-35.recipe (100%) rename haiku-apps/{caya-gpl-protocols => caya_gpl_protocols}/caya-gpl-protocols-36.recipe (100%) rename haiku-apps/{caya-gpl-protocols => caya_gpl_protocols}/patches/caya-gpl-protocols-0.HEAD.patch (100%) rename haiku-apps/{open-sum-it => open_sum_it}/open-sum-it-108.recipe (100%) rename media-fonts/{arabeyes-fonts => arabeyes_fonts}/arabeyes-fonts-1.1.recipe (100%) rename media-fonts/{courier-prime => courier_prime}/courier-prime-1.0.recipe (100%) rename media-fonts/{courier-prime => courier_prime}/licenses/SIL Open Font License v1.1 (100%) rename media-fonts/{farsi-fonts => farsi_fonts}/farsi-fonts-0.4.recipe (100%) rename media-fonts/{kacst-fonts => kacst_fonts}/kacst-fonts-5.0.recipe (100%) rename media-fonts/{lateef-font => lateef_font}/lateef-font-1.001.recipe (100%) rename media-fonts/{lateef-font => lateef_font}/licenses/SIL Open Font License v1.1 (100%) rename media-fonts/{liberation-fonts => liberation_fonts}/liberation-fonts-1.06.0.20100721.recipe (100%) rename media-fonts/{liberation-fonts => liberation_fonts}/licenses/Liberation Exceptions (100%) rename media-fonts/{nafees-nastaleeq => nafees_nastaleeq}/licenses/CRULP (100%) rename media-fonts/{nafees-nastaleeq => nafees_nastaleeq}/nafees-nastaleeq-1.02.recipe (100%) rename media-fonts/{nafees-riqa => nafees_riqa}/licenses/CRULP (100%) rename media-fonts/{nafees-riqa => nafees_riqa}/nafees-riqa-1.00.recipe (100%) rename media-fonts/{scheherazade-font => scheherazade_font}/licenses/SIL Open Font License v1.1 (100%) rename media-fonts/{scheherazade-font => scheherazade_font}/scheherazade-font-1.005.recipe (100%) rename media-fonts/{wqy-microhei => wqy_microhei}/wqy-microhei-0.2.0-beta.recipe (100%) rename media-fonts/{wqy-zenhei => wqy_zenhei}/licenses/GNU GPL v2 with font embedding exception (100%) rename media-fonts/{wqy-zenhei => wqy_zenhei}/wqy-zenhei-0.9.45.recipe (100%) rename media-fonts/{x-series-fonts => x_series_fonts}/x-series-fonts-2.0.recipe (100%) rename media-gfx/{sane-backends => sane_backends}/patches/sane-backends-1.0.21.patch (100%) rename media-libs/{ladspa-sdk => ladspa_sdk}/ladspa-sdk-1.13.recipe (100%) rename media-libs/{ladspa-sdk => ladspa_sdk}/patches/ladspa-sdk-1.13.patch (100%) rename media-libs/{sdl-gfx => sdl_gfx}/patches/sdl-gfx-2.0.20.patch (100%) rename media-libs/{sdl-gfx => sdl_gfx}/sdl-gfx-2.0.20.recipe (100%) rename media-libs/{sdl-gfx => sdl_gfx}/sdl-gfx-2.0.22.recipe (100%) rename media-libs/{sdl-gfx => sdl_gfx}/sdl-gfx-2.0.23.recipe (100%) rename media-libs/{sdl-image => sdl_image}/sdl-image-1.2-hg.recipe (100%) rename media-libs/{sdl-image => sdl_image}/sdl-image-1.2.10.recipe (100%) rename media-libs/{sdl-image => sdl_image}/sdl-image-1.2.12.recipe (100%) rename media-libs/{sdl-image => sdl_image}/sdl-image-1.2.6.recipe (100%) rename media-libs/{sdl-image => sdl_image}/sdl-image-1.2.8.recipe (100%) rename media-libs/{sdl-image => sdl_image}/sdl-image-1.2.9.recipe (100%) rename media-libs/{sdl-image => sdl_image}/sdl-image.OptionalPackageDescription (100%) rename media-libs/{sdl-libpak => sdl_libpak}/sdl-libpak.OptionalPackageDescription (100%) rename media-libs/{sdl-mixer => sdl_mixer}/patches/sdl-mixer-1.2.11.patch (100%) rename media-libs/{sdl-mixer => sdl_mixer}/sdl-mixer-1.2-hg.recipe (100%) rename media-libs/{sdl-mixer => sdl_mixer}/sdl-mixer-1.2.10.recipe (100%) rename media-libs/{sdl-mixer => sdl_mixer}/sdl-mixer-1.2.11.recipe (100%) rename media-libs/{sdl-mixer => sdl_mixer}/sdl-mixer-1.2.12.recipe (100%) rename media-libs/{sdl-mixer => sdl_mixer}/sdl-mixer-1.2.9.recipe (100%) rename media-libs/{sdl-net => sdl_net}/patches/sdl-net-1.2.7.patch (100%) rename media-libs/{sdl-net => sdl_net}/patches/sdl-net-1.2.8.patch (100%) rename media-libs/{sdl-net => sdl_net}/sdl-net-1.2-hg.recipe (100%) rename media-libs/{sdl-net => sdl_net}/sdl-net-1.2.7.recipe (100%) rename media-libs/{sdl-net => sdl_net}/sdl-net-1.2.8.recipe (100%) rename media-libs/{sdl-rtf => sdl_rtf}/sdl-rtf-0.1.0.recipe (100%) rename media-libs/{sdl-sound => sdl_sound}/sdl-sound-1.0-hg.recipe (100%) rename media-libs/{sdl-sound => sdl_sound}/sdl-sound-1.0.3.recipe (100%) rename media-libs/{sdl-ttf => sdl_ttf}/sdl-ttf-2.0-hg.recipe (100%) rename media-libs/{sdl-ttf => sdl_ttf}/sdl-ttf-2.0.10.recipe (100%) rename media-libs/{sdl-ttf => sdl_ttf}/sdl-ttf-2.0.11.recipe (100%) rename media-libs/{sdl-ttf => sdl_ttf}/sdl-ttf-2.0.9.recipe (100%) rename media-sound/{gogo-no-coda => gogo_no_coda}/gogo-no-coda-3.13.recipe (100%) rename media-sound/{gogo-no-coda => gogo_no_coda}/patches/gogo-no-coda-3.13.patch (100%) rename media-sound/{vorbis-tools => vorbis_tools}/patches/vorbis-tools-1.2.0.patch (100%) rename media-sound/{vorbis-tools => vorbis_tools}/patches/vorbis-tools-1.4.0.patch (100%) rename media-sound/{vorbis-tools => vorbis_tools}/vorbis-tools-1.2.0.recipe (100%) rename media-sound/{vorbis-tools => vorbis_tools}/vorbis-tools-1.4.0.recipe (100%) rename net-irc/{rhapsody-irc => rhapsody_irc}/patches/rhapsody-irc-0.28b.patch (100%) rename net-irc/{rhapsody-irc => rhapsody_irc}/rhapsody-irc-0.28b.recipe (100%) rename net-wireless/{b43-fwcutter => b43_fwcutter}/b43-fwcutter-012.recipe (100%) rename net-wireless/{b43-fwcutter => b43_fwcutter}/patches/b43-fwcutter-012.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/TinnyTim.sh (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/bezilla-patches-2009-07-07.diff (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/bookmarks.html (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/classic.jar (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/copy-to-mozilla-src-dir/browser/app/apprunner-beos.rdef (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v1.html (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v2.html (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v1.html (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v2.html (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v1.html (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v2.html (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/copy-to-mozilla-src-dir/browser/installer/beos/packages-static (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rdef (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rsrc (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/copy-to-mozilla-src-dir/mail/app/apprunner-beos.rdef (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/copy-to-mozilla-src-dir/xpfe/bootstrap/apprunner-beos.rdef (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/hvif-icons/BeZilla-Browser-l (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/hvif-icons/BeZilla-Browser-r (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/hvif-icons/BeZilla-MailNews (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/hvif-icons/BeZilla-MailNews-r (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/hvif-icons/BeZilla-Suite-l (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/hvif-icons/BeZilla-Suite-r (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/hvif-icons/BeZilla-calendar-l (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/hvif-icons/BeZilla-calendar-r (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/hvif-icons/bezilla-1 copy (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/hvif-icons/icon_copyright/copyleft.txt (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/hvif-icons/icon_copyright/copyright_info.txt (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/old-patches/allO1.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/old-patches/allO3.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/old-patches/configure-sunbird-nspr-reorder.diff (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/old-patches/firstrun-default-page.diff (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/old-patches/forReorderPatches-browser.zip (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/old-patches/greyMenuSelection.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/old-patches/launch-kill-dowhile.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/old-patches/mozilla-rdefs.zip (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/old-patches/nsAppRunner.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/old-patches/prpolevt-fix.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/old-patches/sunbird-makefile-apprunner-rsrc.zip (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/bezilla.step-by-step.txt (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r01-config-star.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r02-configure-in-withGCC4andCrossCompile.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r03a-makefile-in.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r03b-starmk.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r04a-rdef-support-in-Makefile.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r04b-just-rdefs-no-Makefile.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r05-fix-shlibsign.README (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r05-fix-shlibsign.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r06-nss-gcc4.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r07-working-nspr-from-haikuports.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r08-misc.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r09-sunbird-options-fix.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r10-grey-menu-color.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r11-bookmarks-v2.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/patches/2009-09-27/r12-releasenotes.patch (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/persdict.dat (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/select-a-mozconfig/browser-debug.mozconfig (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/select-a-mozconfig/browser.mozconfig (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/select-a-mozconfig/calendar.mozconfig (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/select-a-mozconfig/mailnews.mozconfig (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/select-a-mozconfig/suite-debug.mozconfig (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/select-a-mozconfig/suite-just-browser.mozconfig (100%) rename www-client/{mozilla-firefox => mozilla_firefox}/select-a-mozconfig/suite.mozconfig (100%) rename x11-misc/{shared-mime-info => shared_mime_info}/shared-mime-info-1.0.recipe (100%) rename x11-misc/{util-macros => util_macros}/util-macros-1.17.0-git.recipe (100%) rename x11-misc/{util-macros => util_macros}/util-macros-1.7.0.recipe (100%) rename x11-proto/{xcb-proto => xcb_proto}/xcb-proto-1.6.recipe (100%) diff --git a/app-arch/xz-utils/xz-utils-4.999.9.recipe b/app-arch/xz_utils/xz-utils-4.999.9.recipe similarity index 100% rename from app-arch/xz-utils/xz-utils-4.999.9.recipe rename to app-arch/xz_utils/xz-utils-4.999.9.recipe diff --git a/app-arch/xz-utils/xz_utils-5.0.1.recipe b/app-arch/xz_utils/xz_utils-5.0.1.recipe similarity index 100% rename from app-arch/xz-utils/xz_utils-5.0.1.recipe rename to app-arch/xz_utils/xz_utils-5.0.1.recipe diff --git a/app-arch/xz-utils/xz_utils-5.0.4.recipe b/app-arch/xz_utils/xz_utils-5.0.4.recipe similarity index 100% rename from app-arch/xz-utils/xz_utils-5.0.4.recipe rename to app-arch/xz_utils/xz_utils-5.0.4.recipe diff --git a/app-text/ebook-tools/ebook-tools-0.2.1.recipe b/app-text/ebook_tools/ebook-tools-0.2.1.recipe similarity index 100% rename from app-text/ebook-tools/ebook-tools-0.2.1.recipe rename to app-text/ebook_tools/ebook-tools-0.2.1.recipe diff --git a/dev-cpp/mm-common/mm-common-0.9.2.recipe b/dev-cpp/mm_common/mm-common-0.9.2.recipe similarity index 100% rename from dev-cpp/mm-common/mm-common-0.9.2.recipe rename to dev-cpp/mm_common/mm-common-0.9.2.recipe diff --git a/dev-embedded/u-boot-tools/patches/u-boot-tools-2012.10.patch b/dev-embedded/u_boot_tools/patches/u-boot-tools-2012.10.patch similarity index 100% rename from dev-embedded/u-boot-tools/patches/u-boot-tools-2012.10.patch rename to dev-embedded/u_boot_tools/patches/u-boot-tools-2012.10.patch diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2012.10.recipe b/dev-embedded/u_boot_tools/u-boot-tools-2012.10.recipe similarity index 100% rename from dev-embedded/u-boot-tools/u-boot-tools-2012.10.recipe rename to dev-embedded/u_boot_tools/u-boot-tools-2012.10.recipe diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98.recipe b/dev-java/gnu_classpath/gnu-classpath-0.98.recipe similarity index 100% rename from dev-java/gnu-classpath/gnu-classpath-0.98.recipe rename to dev-java/gnu_classpath/gnu-classpath-0.98.recipe diff --git a/dev-java/gnu-classpath/licenses/GNU GPL v2 with classpath exceptions b/dev-java/gnu_classpath/licenses/GNU GPL v2 with classpath exceptions similarity index 100% rename from dev-java/gnu-classpath/licenses/GNU GPL v2 with classpath exceptions rename to dev-java/gnu_classpath/licenses/GNU GPL v2 with classpath exceptions diff --git a/dev-java/gnu-classpath/patches/gnu-classpath-0.98.patch b/dev-java/gnu_classpath/patches/gnu-classpath-0.98.patch similarity index 100% rename from dev-java/gnu-classpath/patches/gnu-classpath-0.98.patch rename to dev-java/gnu_classpath/patches/gnu-classpath-0.98.patch diff --git a/dev-lang/dmd-bin/dmd-bin-1.064.recipe b/dev-lang/dmd_bin/dmd-bin-1.064.recipe similarity index 100% rename from dev-lang/dmd-bin/dmd-bin-1.064.recipe rename to dev-lang/dmd_bin/dmd-bin-1.064.recipe diff --git a/dev-lang/dmd-bin/licenses/Digital Mars b/dev-lang/dmd_bin/licenses/Digital Mars similarity index 100% rename from dev-lang/dmd-bin/licenses/Digital Mars rename to dev-lang/dmd_bin/licenses/Digital Mars diff --git a/dev-lang/dmd-bin/patches/dmd-bin-1.064.patch b/dev-lang/dmd_bin/patches/dmd-bin-1.064.patch similarity index 100% rename from dev-lang/dmd-bin/patches/dmd-bin-1.064.patch rename to dev-lang/dmd_bin/patches/dmd-bin-1.064.patch diff --git a/dev-lang/swi-prolog/licenses/SWI-Prolog b/dev-lang/swi_prolog/licenses/SWI-Prolog similarity index 100% rename from dev-lang/swi-prolog/licenses/SWI-Prolog rename to dev-lang/swi_prolog/licenses/SWI-Prolog diff --git a/dev-lang/swi-prolog/patches/swi-prolog-6.0.2.patch b/dev-lang/swi_prolog/patches/swi-prolog-6.0.2.patch similarity index 100% rename from dev-lang/swi-prolog/patches/swi-prolog-6.0.2.patch rename to dev-lang/swi_prolog/patches/swi-prolog-6.0.2.patch diff --git a/dev-lang/swi-prolog/patches/swi-prolog-6.2.0.patch b/dev-lang/swi_prolog/patches/swi-prolog-6.2.0.patch similarity index 100% rename from dev-lang/swi-prolog/patches/swi-prolog-6.2.0.patch rename to dev-lang/swi_prolog/patches/swi-prolog-6.2.0.patch diff --git a/dev-lang/swi-prolog/swi-prolog-6.0.2.recipe b/dev-lang/swi_prolog/swi-prolog-6.0.2.recipe similarity index 100% rename from dev-lang/swi-prolog/swi-prolog-6.0.2.recipe rename to dev-lang/swi_prolog/swi-prolog-6.0.2.recipe diff --git a/dev-lang/swi-prolog/swi-prolog-6.2.0.recipe b/dev-lang/swi_prolog/swi-prolog-6.2.0.recipe similarity index 100% rename from dev-lang/swi-prolog/swi-prolog-6.2.0.recipe rename to dev-lang/swi_prolog/swi-prolog-6.2.0.recipe diff --git a/dev-libs/apr-util/apr-util-1.3.11.recipe b/dev-libs/apr_util/apr-util-1.3.11.recipe similarity index 100% rename from dev-libs/apr-util/apr-util-1.3.11.recipe rename to dev-libs/apr_util/apr-util-1.3.11.recipe diff --git a/dev-libs/apr-util/apr-util-1.3.12.recipe b/dev-libs/apr_util/apr-util-1.3.12.recipe similarity index 100% rename from dev-libs/apr-util/apr-util-1.3.12.recipe rename to dev-libs/apr_util/apr-util-1.3.12.recipe diff --git a/dev-libs/apr-util/apr-util-1.3.9.recipe b/dev-libs/apr_util/apr-util-1.3.9.recipe similarity index 100% rename from dev-libs/apr-util/apr-util-1.3.9.recipe rename to dev-libs/apr_util/apr-util-1.3.9.recipe diff --git a/dev-libs/apr-util/apr-util-1.4.1.recipe b/dev-libs/apr_util/apr-util-1.4.1.recipe similarity index 100% rename from dev-libs/apr-util/apr-util-1.4.1.recipe rename to dev-libs/apr_util/apr-util-1.4.1.recipe diff --git a/dev-libs/apr-util/apr_util-1.3.10.recipe b/dev-libs/apr_util/apr_util-1.3.10.recipe similarity index 100% rename from dev-libs/apr-util/apr_util-1.3.10.recipe rename to dev-libs/apr_util/apr_util-1.3.10.recipe diff --git a/dev-libs/apr-util/patches/apr-util-0.9.x-haiku.diff b/dev-libs/apr_util/patches/apr-util-0.9.x-haiku.diff similarity index 100% rename from dev-libs/apr-util/patches/apr-util-0.9.x-haiku.diff rename to dev-libs/apr_util/patches/apr-util-0.9.x-haiku.diff diff --git a/dev-libs/apr-util/patches/apr-util-0.9.x.diff b/dev-libs/apr_util/patches/apr-util-0.9.x.diff similarity index 100% rename from dev-libs/apr-util/patches/apr-util-0.9.x.diff rename to dev-libs/apr_util/patches/apr-util-0.9.x.diff diff --git a/dev-libs/apr-util/patches/apr-util-1.3.10.patch b/dev-libs/apr_util/patches/apr-util-1.3.10.patch similarity index 100% rename from dev-libs/apr-util/patches/apr-util-1.3.10.patch rename to dev-libs/apr_util/patches/apr-util-1.3.10.patch diff --git a/dev-libs/apr-util/patches/apr-util-1.3.11.patch b/dev-libs/apr_util/patches/apr-util-1.3.11.patch similarity index 100% rename from dev-libs/apr-util/patches/apr-util-1.3.11.patch rename to dev-libs/apr_util/patches/apr-util-1.3.11.patch diff --git a/dev-libs/apr-util/patches/apr-util-1.3.12.patch b/dev-libs/apr_util/patches/apr-util-1.3.12.patch similarity index 100% rename from dev-libs/apr-util/patches/apr-util-1.3.12.patch rename to dev-libs/apr_util/patches/apr-util-1.3.12.patch diff --git a/dev-libs/apr-util/patches/apr-util-1.4.1.patch b/dev-libs/apr_util/patches/apr-util-1.4.1.patch similarity index 100% rename from dev-libs/apr-util/patches/apr-util-1.4.1.patch rename to dev-libs/apr_util/patches/apr-util-1.4.1.patch diff --git a/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.recipe b/dev-libs/boehm_gc/boehm-gc-7.2_alpha6.recipe similarity index 100% rename from dev-libs/boehm-gc/boehm-gc-7.2_alpha6.recipe rename to dev-libs/boehm_gc/boehm-gc-7.2_alpha6.recipe diff --git a/dev-libs/boehm-gc/boehm-gc-7.2d.recipe b/dev-libs/boehm_gc/boehm-gc-7.2d.recipe similarity index 100% rename from dev-libs/boehm-gc/boehm-gc-7.2d.recipe rename to dev-libs/boehm_gc/boehm-gc-7.2d.recipe diff --git a/dev-libs/boehm-gc/licenses/BOEHM b/dev-libs/boehm_gc/licenses/BOEHM similarity index 100% rename from dev-libs/boehm-gc/licenses/BOEHM rename to dev-libs/boehm_gc/licenses/BOEHM diff --git a/dev-libs/boehm-gc/patches/boehm-gc-7.2_alpha6.patch b/dev-libs/boehm_gc/patches/boehm-gc-7.2_alpha6.patch similarity index 100% rename from dev-libs/boehm-gc/patches/boehm-gc-7.2_alpha6.patch rename to dev-libs/boehm_gc/patches/boehm-gc-7.2_alpha6.patch diff --git a/dev-libs/boehm-gc/patches/boehm-gc-7.2d.patch b/dev-libs/boehm_gc/patches/boehm-gc-7.2d.patch similarity index 100% rename from dev-libs/boehm-gc/patches/boehm-gc-7.2d.patch rename to dev-libs/boehm_gc/patches/boehm-gc-7.2d.patch diff --git a/dev-libs/json-c/json-c-0.9.recipe b/dev-libs/json_c/json-c-0.9.recipe similarity index 100% rename from dev-libs/json-c/json-c-0.9.recipe rename to dev-libs/json_c/json-c-0.9.recipe diff --git a/dev-libs/json-c/patches/json-c-0.9.patch b/dev-libs/json_c/patches/json-c-0.9.patch similarity index 100% rename from dev-libs/json-c/patches/json-c-0.9.patch rename to dev-libs/json_c/patches/json-c-0.9.patch diff --git a/dev-libs/libgpg-error/libgpg-error-1.10.recipe b/dev-libs/libgpg_error/libgpg-error-1.10.recipe similarity index 100% rename from dev-libs/libgpg-error/libgpg-error-1.10.recipe rename to dev-libs/libgpg_error/libgpg-error-1.10.recipe diff --git a/dev-libs/libgpg-error/libgpg-error-1.7.recipe b/dev-libs/libgpg_error/libgpg-error-1.7.recipe similarity index 100% rename from dev-libs/libgpg-error/libgpg-error-1.7.recipe rename to dev-libs/libgpg_error/libgpg-error-1.7.recipe diff --git a/dev-libs/libgpg-error/patches/libgpg-error-1.10.patch b/dev-libs/libgpg_error/patches/libgpg-error-1.10.patch similarity index 100% rename from dev-libs/libgpg-error/patches/libgpg-error-1.10.patch rename to dev-libs/libgpg_error/patches/libgpg-error-1.10.patch diff --git a/dev-libs/libgpg-error/patches/libgpg-error-1.7.patch b/dev-libs/libgpg_error/patches/libgpg-error-1.7.patch similarity index 100% rename from dev-libs/libgpg-error/patches/libgpg-error-1.7.patch rename to dev-libs/libgpg_error/patches/libgpg-error-1.7.patch diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.recipe b/dev-libs/libpthread_stubs/libpthread-stubs-0.3.2.recipe similarity index 100% rename from dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.recipe rename to dev-libs/libpthread_stubs/libpthread-stubs-0.3.2.recipe diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.recipe b/dev-libs/libpthread_stubs/libpthread-stubs-0.3.recipe similarity index 100% rename from dev-libs/libpthread-stubs/libpthread-stubs-0.3.recipe rename to dev-libs/libpthread_stubs/libpthread-stubs-0.3.recipe diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.recipe b/dev-libs/libxdg_basedir/libxdg-basedir-1.1.1.recipe similarity index 100% rename from dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.recipe rename to dev-libs/libxdg_basedir/libxdg-basedir-1.1.1.recipe diff --git a/dev-libs/libxdg-basedir/patches/libxdg-basedir-1.1.1.patch b/dev-libs/libxdg_basedir/patches/libxdg-basedir-1.1.1.patch similarity index 100% rename from dev-libs/libxdg-basedir/patches/libxdg-basedir-1.1.1.patch rename to dev-libs/libxdg_basedir/patches/libxdg-basedir-1.1.1.patch diff --git a/dev-libs/xerces-c/xerces-c-3.1.1.recipe b/dev-libs/xerces_c/xerces-c-3.1.1.recipe similarity index 100% rename from dev-libs/xerces-c/xerces-c-3.1.1.recipe rename to dev-libs/xerces_c/xerces-c-3.1.1.recipe 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 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 similarity index 100% rename from dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.recipe rename to dev-util/abi_compliance_checker/abi-compliance-checker-1.98.3.recipe diff --git a/dev-util/abi-compliance-checker/example-descriptors/README b/dev-util/abi_compliance_checker/example-descriptors/README similarity index 100% rename from dev-util/abi-compliance-checker/example-descriptors/README rename to dev-util/abi_compliance_checker/example-descriptors/README diff --git a/dev-util/abi-compliance-checker/example-descriptors/libjpeg-6.2.desc b/dev-util/abi_compliance_checker/example-descriptors/libjpeg-6.2.desc similarity index 100% rename from dev-util/abi-compliance-checker/example-descriptors/libjpeg-6.2.desc rename to dev-util/abi_compliance_checker/example-descriptors/libjpeg-6.2.desc diff --git a/dev-util/abi-compliance-checker/example-descriptors/libjpeg-7.desc b/dev-util/abi_compliance_checker/example-descriptors/libjpeg-7.desc similarity index 100% rename from dev-util/abi-compliance-checker/example-descriptors/libjpeg-7.desc rename to dev-util/abi_compliance_checker/example-descriptors/libjpeg-7.desc diff --git a/dev-util/abi-compliance-checker/example-descriptors/libjpeg-8.desc b/dev-util/abi_compliance_checker/example-descriptors/libjpeg-8.desc similarity index 100% rename from dev-util/abi-compliance-checker/example-descriptors/libjpeg-8.desc rename to dev-util/abi_compliance_checker/example-descriptors/libjpeg-8.desc diff --git a/dev-util/abi-compliance-checker/example-descriptors/libpng-1.2.42.desc b/dev-util/abi_compliance_checker/example-descriptors/libpng-1.2.42.desc similarity index 100% rename from dev-util/abi-compliance-checker/example-descriptors/libpng-1.2.42.desc rename to dev-util/abi_compliance_checker/example-descriptors/libpng-1.2.42.desc diff --git a/dev-util/abi-compliance-checker/example-descriptors/libpng-1.4.0.desc b/dev-util/abi_compliance_checker/example-descriptors/libpng-1.4.0.desc similarity index 100% rename from dev-util/abi-compliance-checker/example-descriptors/libpng-1.4.0.desc rename to dev-util/abi_compliance_checker/example-descriptors/libpng-1.4.0.desc diff --git a/dev-util/abi-compliance-checker/example-descriptors/zlib-1.1.4.desc b/dev-util/abi_compliance_checker/example-descriptors/zlib-1.1.4.desc similarity index 100% rename from dev-util/abi-compliance-checker/example-descriptors/zlib-1.1.4.desc rename to dev-util/abi_compliance_checker/example-descriptors/zlib-1.1.4.desc diff --git a/dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.2.desc b/dev-util/abi_compliance_checker/example-descriptors/zlib-1.2.2.desc similarity index 100% rename from dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.2.desc rename to dev-util/abi_compliance_checker/example-descriptors/zlib-1.2.2.desc diff --git a/dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.3.desc b/dev-util/abi_compliance_checker/example-descriptors/zlib-1.2.3.desc similarity index 100% rename from dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.3.desc rename to dev-util/abi_compliance_checker/example-descriptors/zlib-1.2.3.desc diff --git a/dev-util/gtk-doc/gtk-doc-1.15.recipe b/dev-util/gtk_doc/gtk-doc-1.15.recipe similarity index 100% rename from dev-util/gtk-doc/gtk-doc-1.15.recipe rename to dev-util/gtk_doc/gtk-doc-1.15.recipe diff --git a/dev-util/gtk-doc/patches/gtk-doc-1.15.patch b/dev-util/gtk_doc/patches/gtk-doc-1.15.patch similarity index 100% rename from dev-util/gtk-doc/patches/gtk-doc-1.15.patch rename to dev-util/gtk_doc/patches/gtk-doc-1.15.patch diff --git a/gnome-base/gnome-common/gnome-common-2.28.recipe b/gnome-base/gnome_common/gnome-common-2.28.recipe similarity index 100% rename from gnome-base/gnome-common/gnome-common-2.28.recipe rename to gnome-base/gnome_common/gnome-common-2.28.recipe diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.recipe b/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-0.HEAD.recipe similarity index 100% rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.recipe rename to haiku-apps/caya_gpl_protocols/caya-gpl-protocols-0.HEAD.recipe diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.recipe b/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-19.recipe similarity index 100% rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.recipe rename to haiku-apps/caya_gpl_protocols/caya-gpl-protocols-19.recipe diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.recipe b/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-24.recipe similarity index 100% rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.recipe rename to haiku-apps/caya_gpl_protocols/caya-gpl-protocols-24.recipe diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.recipe b/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-35.recipe similarity index 100% rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.recipe rename to haiku-apps/caya_gpl_protocols/caya-gpl-protocols-35.recipe diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.recipe b/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-36.recipe similarity index 100% rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.recipe rename to haiku-apps/caya_gpl_protocols/caya-gpl-protocols-36.recipe diff --git a/haiku-apps/caya-gpl-protocols/patches/caya-gpl-protocols-0.HEAD.patch b/haiku-apps/caya_gpl_protocols/patches/caya-gpl-protocols-0.HEAD.patch similarity index 100% rename from haiku-apps/caya-gpl-protocols/patches/caya-gpl-protocols-0.HEAD.patch rename to haiku-apps/caya_gpl_protocols/patches/caya-gpl-protocols-0.HEAD.patch diff --git a/haiku-apps/open-sum-it/open-sum-it-108.recipe b/haiku-apps/open_sum_it/open-sum-it-108.recipe similarity index 100% rename from haiku-apps/open-sum-it/open-sum-it-108.recipe rename to haiku-apps/open_sum_it/open-sum-it-108.recipe diff --git a/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.recipe b/media-fonts/arabeyes_fonts/arabeyes-fonts-1.1.recipe similarity index 100% rename from media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.recipe rename to media-fonts/arabeyes_fonts/arabeyes-fonts-1.1.recipe diff --git a/media-fonts/courier-prime/courier-prime-1.0.recipe b/media-fonts/courier_prime/courier-prime-1.0.recipe similarity index 100% rename from media-fonts/courier-prime/courier-prime-1.0.recipe rename to media-fonts/courier_prime/courier-prime-1.0.recipe diff --git a/media-fonts/courier-prime/licenses/SIL Open Font License v1.1 b/media-fonts/courier_prime/licenses/SIL Open Font License v1.1 similarity index 100% rename from media-fonts/courier-prime/licenses/SIL Open Font License v1.1 rename to media-fonts/courier_prime/licenses/SIL Open Font License v1.1 diff --git a/media-fonts/farsi-fonts/farsi-fonts-0.4.recipe b/media-fonts/farsi_fonts/farsi-fonts-0.4.recipe similarity index 100% rename from media-fonts/farsi-fonts/farsi-fonts-0.4.recipe rename to media-fonts/farsi_fonts/farsi-fonts-0.4.recipe diff --git a/media-fonts/kacst-fonts/kacst-fonts-5.0.recipe b/media-fonts/kacst_fonts/kacst-fonts-5.0.recipe similarity index 100% rename from media-fonts/kacst-fonts/kacst-fonts-5.0.recipe rename to media-fonts/kacst_fonts/kacst-fonts-5.0.recipe diff --git a/media-fonts/lateef-font/lateef-font-1.001.recipe b/media-fonts/lateef_font/lateef-font-1.001.recipe similarity index 100% rename from media-fonts/lateef-font/lateef-font-1.001.recipe rename to media-fonts/lateef_font/lateef-font-1.001.recipe diff --git a/media-fonts/lateef-font/licenses/SIL Open Font License v1.1 b/media-fonts/lateef_font/licenses/SIL Open Font License v1.1 similarity index 100% rename from media-fonts/lateef-font/licenses/SIL Open Font License v1.1 rename to media-fonts/lateef_font/licenses/SIL Open Font License v1.1 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 similarity index 100% rename from media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.recipe rename to media-fonts/liberation_fonts/liberation-fonts-1.06.0.20100721.recipe diff --git a/media-fonts/liberation-fonts/licenses/Liberation Exceptions b/media-fonts/liberation_fonts/licenses/Liberation Exceptions similarity index 100% rename from media-fonts/liberation-fonts/licenses/Liberation Exceptions rename to media-fonts/liberation_fonts/licenses/Liberation Exceptions diff --git a/media-fonts/nafees-nastaleeq/licenses/CRULP b/media-fonts/nafees_nastaleeq/licenses/CRULP similarity index 100% rename from media-fonts/nafees-nastaleeq/licenses/CRULP rename to media-fonts/nafees_nastaleeq/licenses/CRULP diff --git a/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.recipe b/media-fonts/nafees_nastaleeq/nafees-nastaleeq-1.02.recipe similarity index 100% rename from media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.recipe rename to media-fonts/nafees_nastaleeq/nafees-nastaleeq-1.02.recipe diff --git a/media-fonts/nafees-riqa/licenses/CRULP b/media-fonts/nafees_riqa/licenses/CRULP similarity index 100% rename from media-fonts/nafees-riqa/licenses/CRULP rename to media-fonts/nafees_riqa/licenses/CRULP diff --git a/media-fonts/nafees-riqa/nafees-riqa-1.00.recipe b/media-fonts/nafees_riqa/nafees-riqa-1.00.recipe similarity index 100% rename from media-fonts/nafees-riqa/nafees-riqa-1.00.recipe rename to media-fonts/nafees_riqa/nafees-riqa-1.00.recipe diff --git a/media-fonts/scheherazade-font/licenses/SIL Open Font License v1.1 b/media-fonts/scheherazade_font/licenses/SIL Open Font License v1.1 similarity index 100% rename from media-fonts/scheherazade-font/licenses/SIL Open Font License v1.1 rename to media-fonts/scheherazade_font/licenses/SIL Open Font License v1.1 diff --git a/media-fonts/scheherazade-font/scheherazade-font-1.005.recipe b/media-fonts/scheherazade_font/scheherazade-font-1.005.recipe similarity index 100% rename from media-fonts/scheherazade-font/scheherazade-font-1.005.recipe rename to media-fonts/scheherazade_font/scheherazade-font-1.005.recipe 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 similarity index 100% rename from media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.recipe rename to media-fonts/wqy_microhei/wqy-microhei-0.2.0-beta.recipe diff --git a/media-fonts/wqy-zenhei/licenses/GNU GPL v2 with font embedding exception b/media-fonts/wqy_zenhei/licenses/GNU GPL v2 with font embedding exception similarity index 100% rename from media-fonts/wqy-zenhei/licenses/GNU GPL v2 with font embedding exception rename to media-fonts/wqy_zenhei/licenses/GNU GPL v2 with font embedding exception diff --git a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.recipe b/media-fonts/wqy_zenhei/wqy-zenhei-0.9.45.recipe similarity index 100% rename from media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.recipe rename to media-fonts/wqy_zenhei/wqy-zenhei-0.9.45.recipe 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 similarity index 100% rename from media-fonts/x-series-fonts/x-series-fonts-2.0.recipe rename to media-fonts/x_series_fonts/x-series-fonts-2.0.recipe diff --git a/media-gfx/sane-backends/patches/sane-backends-1.0.21.patch b/media-gfx/sane_backends/patches/sane-backends-1.0.21.patch similarity index 100% rename from media-gfx/sane-backends/patches/sane-backends-1.0.21.patch rename to media-gfx/sane_backends/patches/sane-backends-1.0.21.patch diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13.recipe b/media-libs/ladspa_sdk/ladspa-sdk-1.13.recipe similarity index 100% rename from media-libs/ladspa-sdk/ladspa-sdk-1.13.recipe rename to media-libs/ladspa_sdk/ladspa-sdk-1.13.recipe diff --git a/media-libs/ladspa-sdk/patches/ladspa-sdk-1.13.patch b/media-libs/ladspa_sdk/patches/ladspa-sdk-1.13.patch similarity index 100% rename from media-libs/ladspa-sdk/patches/ladspa-sdk-1.13.patch rename to media-libs/ladspa_sdk/patches/ladspa-sdk-1.13.patch diff --git a/media-libs/sdl-gfx/patches/sdl-gfx-2.0.20.patch b/media-libs/sdl_gfx/patches/sdl-gfx-2.0.20.patch similarity index 100% rename from media-libs/sdl-gfx/patches/sdl-gfx-2.0.20.patch rename to media-libs/sdl_gfx/patches/sdl-gfx-2.0.20.patch diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.20.recipe b/media-libs/sdl_gfx/sdl-gfx-2.0.20.recipe similarity index 100% rename from media-libs/sdl-gfx/sdl-gfx-2.0.20.recipe rename to media-libs/sdl_gfx/sdl-gfx-2.0.20.recipe diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.22.recipe b/media-libs/sdl_gfx/sdl-gfx-2.0.22.recipe similarity index 100% rename from media-libs/sdl-gfx/sdl-gfx-2.0.22.recipe rename to media-libs/sdl_gfx/sdl-gfx-2.0.22.recipe diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.23.recipe b/media-libs/sdl_gfx/sdl-gfx-2.0.23.recipe similarity index 100% rename from media-libs/sdl-gfx/sdl-gfx-2.0.23.recipe rename to media-libs/sdl_gfx/sdl-gfx-2.0.23.recipe diff --git a/media-libs/sdl-image/sdl-image-1.2-hg.recipe b/media-libs/sdl_image/sdl-image-1.2-hg.recipe similarity index 100% rename from media-libs/sdl-image/sdl-image-1.2-hg.recipe rename to media-libs/sdl_image/sdl-image-1.2-hg.recipe diff --git a/media-libs/sdl-image/sdl-image-1.2.10.recipe b/media-libs/sdl_image/sdl-image-1.2.10.recipe similarity index 100% rename from media-libs/sdl-image/sdl-image-1.2.10.recipe rename to media-libs/sdl_image/sdl-image-1.2.10.recipe diff --git a/media-libs/sdl-image/sdl-image-1.2.12.recipe b/media-libs/sdl_image/sdl-image-1.2.12.recipe similarity index 100% rename from media-libs/sdl-image/sdl-image-1.2.12.recipe rename to media-libs/sdl_image/sdl-image-1.2.12.recipe diff --git a/media-libs/sdl-image/sdl-image-1.2.6.recipe b/media-libs/sdl_image/sdl-image-1.2.6.recipe similarity index 100% rename from media-libs/sdl-image/sdl-image-1.2.6.recipe rename to media-libs/sdl_image/sdl-image-1.2.6.recipe diff --git a/media-libs/sdl-image/sdl-image-1.2.8.recipe b/media-libs/sdl_image/sdl-image-1.2.8.recipe similarity index 100% rename from media-libs/sdl-image/sdl-image-1.2.8.recipe rename to media-libs/sdl_image/sdl-image-1.2.8.recipe diff --git a/media-libs/sdl-image/sdl-image-1.2.9.recipe b/media-libs/sdl_image/sdl-image-1.2.9.recipe similarity index 100% rename from media-libs/sdl-image/sdl-image-1.2.9.recipe rename to media-libs/sdl_image/sdl-image-1.2.9.recipe diff --git a/media-libs/sdl-image/sdl-image.OptionalPackageDescription b/media-libs/sdl_image/sdl-image.OptionalPackageDescription similarity index 100% rename from media-libs/sdl-image/sdl-image.OptionalPackageDescription rename to media-libs/sdl_image/sdl-image.OptionalPackageDescription diff --git a/media-libs/sdl-libpak/sdl-libpak.OptionalPackageDescription b/media-libs/sdl_libpak/sdl-libpak.OptionalPackageDescription similarity index 100% rename from media-libs/sdl-libpak/sdl-libpak.OptionalPackageDescription rename to media-libs/sdl_libpak/sdl-libpak.OptionalPackageDescription diff --git a/media-libs/sdl-mixer/patches/sdl-mixer-1.2.11.patch b/media-libs/sdl_mixer/patches/sdl-mixer-1.2.11.patch similarity index 100% rename from media-libs/sdl-mixer/patches/sdl-mixer-1.2.11.patch rename to media-libs/sdl_mixer/patches/sdl-mixer-1.2.11.patch diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2-hg.recipe b/media-libs/sdl_mixer/sdl-mixer-1.2-hg.recipe similarity index 100% rename from media-libs/sdl-mixer/sdl-mixer-1.2-hg.recipe rename to media-libs/sdl_mixer/sdl-mixer-1.2-hg.recipe diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.10.recipe b/media-libs/sdl_mixer/sdl-mixer-1.2.10.recipe similarity index 100% rename from media-libs/sdl-mixer/sdl-mixer-1.2.10.recipe rename to media-libs/sdl_mixer/sdl-mixer-1.2.10.recipe diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.11.recipe b/media-libs/sdl_mixer/sdl-mixer-1.2.11.recipe similarity index 100% rename from media-libs/sdl-mixer/sdl-mixer-1.2.11.recipe rename to media-libs/sdl_mixer/sdl-mixer-1.2.11.recipe diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl-mixer-1.2.12.recipe similarity index 100% rename from media-libs/sdl-mixer/sdl-mixer-1.2.12.recipe rename to media-libs/sdl_mixer/sdl-mixer-1.2.12.recipe diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.9.recipe b/media-libs/sdl_mixer/sdl-mixer-1.2.9.recipe similarity index 100% rename from media-libs/sdl-mixer/sdl-mixer-1.2.9.recipe rename to media-libs/sdl_mixer/sdl-mixer-1.2.9.recipe diff --git a/media-libs/sdl-net/patches/sdl-net-1.2.7.patch b/media-libs/sdl_net/patches/sdl-net-1.2.7.patch similarity index 100% rename from media-libs/sdl-net/patches/sdl-net-1.2.7.patch rename to media-libs/sdl_net/patches/sdl-net-1.2.7.patch diff --git a/media-libs/sdl-net/patches/sdl-net-1.2.8.patch b/media-libs/sdl_net/patches/sdl-net-1.2.8.patch similarity index 100% rename from media-libs/sdl-net/patches/sdl-net-1.2.8.patch rename to media-libs/sdl_net/patches/sdl-net-1.2.8.patch diff --git a/media-libs/sdl-net/sdl-net-1.2-hg.recipe b/media-libs/sdl_net/sdl-net-1.2-hg.recipe similarity index 100% rename from media-libs/sdl-net/sdl-net-1.2-hg.recipe rename to media-libs/sdl_net/sdl-net-1.2-hg.recipe diff --git a/media-libs/sdl-net/sdl-net-1.2.7.recipe b/media-libs/sdl_net/sdl-net-1.2.7.recipe similarity index 100% rename from media-libs/sdl-net/sdl-net-1.2.7.recipe rename to media-libs/sdl_net/sdl-net-1.2.7.recipe diff --git a/media-libs/sdl-net/sdl-net-1.2.8.recipe b/media-libs/sdl_net/sdl-net-1.2.8.recipe similarity index 100% rename from media-libs/sdl-net/sdl-net-1.2.8.recipe rename to media-libs/sdl_net/sdl-net-1.2.8.recipe diff --git a/media-libs/sdl-rtf/sdl-rtf-0.1.0.recipe b/media-libs/sdl_rtf/sdl-rtf-0.1.0.recipe similarity index 100% rename from media-libs/sdl-rtf/sdl-rtf-0.1.0.recipe rename to media-libs/sdl_rtf/sdl-rtf-0.1.0.recipe diff --git a/media-libs/sdl-sound/sdl-sound-1.0-hg.recipe b/media-libs/sdl_sound/sdl-sound-1.0-hg.recipe similarity index 100% rename from media-libs/sdl-sound/sdl-sound-1.0-hg.recipe rename to media-libs/sdl_sound/sdl-sound-1.0-hg.recipe diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3.recipe b/media-libs/sdl_sound/sdl-sound-1.0.3.recipe similarity index 100% rename from media-libs/sdl-sound/sdl-sound-1.0.3.recipe rename to media-libs/sdl_sound/sdl-sound-1.0.3.recipe diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0-hg.recipe b/media-libs/sdl_ttf/sdl-ttf-2.0-hg.recipe similarity index 100% rename from media-libs/sdl-ttf/sdl-ttf-2.0-hg.recipe rename to media-libs/sdl_ttf/sdl-ttf-2.0-hg.recipe diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.10.recipe b/media-libs/sdl_ttf/sdl-ttf-2.0.10.recipe similarity index 100% rename from media-libs/sdl-ttf/sdl-ttf-2.0.10.recipe rename to media-libs/sdl_ttf/sdl-ttf-2.0.10.recipe diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl-ttf-2.0.11.recipe similarity index 100% rename from media-libs/sdl-ttf/sdl-ttf-2.0.11.recipe rename to media-libs/sdl_ttf/sdl-ttf-2.0.11.recipe diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.9.recipe b/media-libs/sdl_ttf/sdl-ttf-2.0.9.recipe similarity index 100% rename from media-libs/sdl-ttf/sdl-ttf-2.0.9.recipe rename to media-libs/sdl_ttf/sdl-ttf-2.0.9.recipe 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 similarity index 100% rename from media-sound/gogo-no-coda/gogo-no-coda-3.13.recipe rename to media-sound/gogo_no_coda/gogo-no-coda-3.13.recipe diff --git a/media-sound/gogo-no-coda/patches/gogo-no-coda-3.13.patch b/media-sound/gogo_no_coda/patches/gogo-no-coda-3.13.patch similarity index 100% rename from media-sound/gogo-no-coda/patches/gogo-no-coda-3.13.patch rename to media-sound/gogo_no_coda/patches/gogo-no-coda-3.13.patch diff --git a/media-sound/vorbis-tools/patches/vorbis-tools-1.2.0.patch b/media-sound/vorbis_tools/patches/vorbis-tools-1.2.0.patch similarity index 100% rename from media-sound/vorbis-tools/patches/vorbis-tools-1.2.0.patch rename to media-sound/vorbis_tools/patches/vorbis-tools-1.2.0.patch diff --git a/media-sound/vorbis-tools/patches/vorbis-tools-1.4.0.patch b/media-sound/vorbis_tools/patches/vorbis-tools-1.4.0.patch similarity index 100% rename from media-sound/vorbis-tools/patches/vorbis-tools-1.4.0.patch rename to media-sound/vorbis_tools/patches/vorbis-tools-1.4.0.patch diff --git a/media-sound/vorbis-tools/vorbis-tools-1.2.0.recipe b/media-sound/vorbis_tools/vorbis-tools-1.2.0.recipe similarity index 100% rename from media-sound/vorbis-tools/vorbis-tools-1.2.0.recipe rename to media-sound/vorbis_tools/vorbis-tools-1.2.0.recipe diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis-tools-1.4.0.recipe similarity index 100% rename from media-sound/vorbis-tools/vorbis-tools-1.4.0.recipe rename to media-sound/vorbis_tools/vorbis-tools-1.4.0.recipe diff --git a/net-irc/rhapsody-irc/patches/rhapsody-irc-0.28b.patch b/net-irc/rhapsody_irc/patches/rhapsody-irc-0.28b.patch similarity index 100% rename from net-irc/rhapsody-irc/patches/rhapsody-irc-0.28b.patch rename to net-irc/rhapsody_irc/patches/rhapsody-irc-0.28b.patch diff --git a/net-irc/rhapsody-irc/rhapsody-irc-0.28b.recipe b/net-irc/rhapsody_irc/rhapsody-irc-0.28b.recipe similarity index 100% rename from net-irc/rhapsody-irc/rhapsody-irc-0.28b.recipe rename to net-irc/rhapsody_irc/rhapsody-irc-0.28b.recipe diff --git a/net-wireless/b43-fwcutter/b43-fwcutter-012.recipe b/net-wireless/b43_fwcutter/b43-fwcutter-012.recipe similarity index 100% rename from net-wireless/b43-fwcutter/b43-fwcutter-012.recipe rename to net-wireless/b43_fwcutter/b43-fwcutter-012.recipe diff --git a/net-wireless/b43-fwcutter/patches/b43-fwcutter-012.patch b/net-wireless/b43_fwcutter/patches/b43-fwcutter-012.patch similarity index 100% rename from net-wireless/b43-fwcutter/patches/b43-fwcutter-012.patch rename to net-wireless/b43_fwcutter/patches/b43-fwcutter-012.patch diff --git a/www-client/mozilla-firefox/TinnyTim.sh b/www-client/mozilla_firefox/TinnyTim.sh similarity index 100% rename from www-client/mozilla-firefox/TinnyTim.sh rename to www-client/mozilla_firefox/TinnyTim.sh diff --git a/www-client/mozilla-firefox/bezilla-patches-2009-07-07.diff b/www-client/mozilla_firefox/bezilla-patches-2009-07-07.diff similarity index 100% rename from www-client/mozilla-firefox/bezilla-patches-2009-07-07.diff rename to www-client/mozilla_firefox/bezilla-patches-2009-07-07.diff diff --git a/www-client/mozilla-firefox/bookmarks.html b/www-client/mozilla_firefox/bookmarks.html similarity index 100% rename from www-client/mozilla-firefox/bookmarks.html rename to www-client/mozilla_firefox/bookmarks.html diff --git a/www-client/mozilla-firefox/classic.jar b/www-client/mozilla_firefox/classic.jar similarity index 100% rename from www-client/mozilla-firefox/classic.jar rename to www-client/mozilla_firefox/classic.jar diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/app/apprunner-beos.rdef b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/app/apprunner-beos.rdef similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/app/apprunner-beos.rdef rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/app/apprunner-beos.rdef diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v1.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v1.html similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v1.html rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v1.html diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v2.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v2.html similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v2.html rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v2.html diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v1.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v1.html similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v1.html rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v1.html diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v2.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v2.html similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v2.html rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v2.html diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v1.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v1.html similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v1.html rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v1.html diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v2.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v2.html similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v2.html rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v2.html diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/installer/beos/packages-static b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/installer/beos/packages-static similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/installer/beos/packages-static rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/installer/beos/packages-static diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rdef b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rdef similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rdef rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rdef diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rsrc b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rsrc similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rsrc rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rsrc diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/mail/app/apprunner-beos.rdef b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/mail/app/apprunner-beos.rdef similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/mail/app/apprunner-beos.rdef rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/mail/app/apprunner-beos.rdef diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/xpfe/bootstrap/apprunner-beos.rdef b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/xpfe/bootstrap/apprunner-beos.rdef similarity index 100% rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/xpfe/bootstrap/apprunner-beos.rdef rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/xpfe/bootstrap/apprunner-beos.rdef diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-Browser-l b/www-client/mozilla_firefox/hvif-icons/BeZilla-Browser-l similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-Browser-l rename to www-client/mozilla_firefox/hvif-icons/BeZilla-Browser-l diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-Browser-r b/www-client/mozilla_firefox/hvif-icons/BeZilla-Browser-r similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-Browser-r rename to www-client/mozilla_firefox/hvif-icons/BeZilla-Browser-r diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-MailNews b/www-client/mozilla_firefox/hvif-icons/BeZilla-MailNews similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-MailNews rename to www-client/mozilla_firefox/hvif-icons/BeZilla-MailNews diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-MailNews-r b/www-client/mozilla_firefox/hvif-icons/BeZilla-MailNews-r similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-MailNews-r rename to www-client/mozilla_firefox/hvif-icons/BeZilla-MailNews-r diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-Suite-l b/www-client/mozilla_firefox/hvif-icons/BeZilla-Suite-l similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-Suite-l rename to www-client/mozilla_firefox/hvif-icons/BeZilla-Suite-l diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-Suite-r b/www-client/mozilla_firefox/hvif-icons/BeZilla-Suite-r similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-Suite-r rename to www-client/mozilla_firefox/hvif-icons/BeZilla-Suite-r diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-calendar-l b/www-client/mozilla_firefox/hvif-icons/BeZilla-calendar-l similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-calendar-l rename to www-client/mozilla_firefox/hvif-icons/BeZilla-calendar-l diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-calendar-r b/www-client/mozilla_firefox/hvif-icons/BeZilla-calendar-r similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/BeZilla-calendar-r rename to www-client/mozilla_firefox/hvif-icons/BeZilla-calendar-r diff --git a/www-client/mozilla-firefox/hvif-icons/bezilla-1 copy b/www-client/mozilla_firefox/hvif-icons/bezilla-1 copy similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/bezilla-1 copy rename to www-client/mozilla_firefox/hvif-icons/bezilla-1 copy diff --git a/www-client/mozilla-firefox/hvif-icons/icon_copyright/copyleft.txt b/www-client/mozilla_firefox/hvif-icons/icon_copyright/copyleft.txt similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/icon_copyright/copyleft.txt rename to www-client/mozilla_firefox/hvif-icons/icon_copyright/copyleft.txt diff --git a/www-client/mozilla-firefox/hvif-icons/icon_copyright/copyright_info.txt b/www-client/mozilla_firefox/hvif-icons/icon_copyright/copyright_info.txt similarity index 100% rename from www-client/mozilla-firefox/hvif-icons/icon_copyright/copyright_info.txt rename to www-client/mozilla_firefox/hvif-icons/icon_copyright/copyright_info.txt diff --git a/www-client/mozilla-firefox/old-patches/allO1.patch b/www-client/mozilla_firefox/old-patches/allO1.patch similarity index 100% rename from www-client/mozilla-firefox/old-patches/allO1.patch rename to www-client/mozilla_firefox/old-patches/allO1.patch diff --git a/www-client/mozilla-firefox/old-patches/allO3.patch b/www-client/mozilla_firefox/old-patches/allO3.patch similarity index 100% rename from www-client/mozilla-firefox/old-patches/allO3.patch rename to www-client/mozilla_firefox/old-patches/allO3.patch diff --git a/www-client/mozilla-firefox/old-patches/configure-sunbird-nspr-reorder.diff b/www-client/mozilla_firefox/old-patches/configure-sunbird-nspr-reorder.diff similarity index 100% rename from www-client/mozilla-firefox/old-patches/configure-sunbird-nspr-reorder.diff rename to www-client/mozilla_firefox/old-patches/configure-sunbird-nspr-reorder.diff diff --git a/www-client/mozilla-firefox/old-patches/firstrun-default-page.diff b/www-client/mozilla_firefox/old-patches/firstrun-default-page.diff similarity index 100% rename from www-client/mozilla-firefox/old-patches/firstrun-default-page.diff rename to www-client/mozilla_firefox/old-patches/firstrun-default-page.diff diff --git a/www-client/mozilla-firefox/old-patches/forReorderPatches-browser.zip b/www-client/mozilla_firefox/old-patches/forReorderPatches-browser.zip similarity index 100% rename from www-client/mozilla-firefox/old-patches/forReorderPatches-browser.zip rename to www-client/mozilla_firefox/old-patches/forReorderPatches-browser.zip diff --git a/www-client/mozilla-firefox/old-patches/greyMenuSelection.patch b/www-client/mozilla_firefox/old-patches/greyMenuSelection.patch similarity index 100% rename from www-client/mozilla-firefox/old-patches/greyMenuSelection.patch rename to www-client/mozilla_firefox/old-patches/greyMenuSelection.patch diff --git a/www-client/mozilla-firefox/old-patches/launch-kill-dowhile.patch b/www-client/mozilla_firefox/old-patches/launch-kill-dowhile.patch similarity index 100% rename from www-client/mozilla-firefox/old-patches/launch-kill-dowhile.patch rename to www-client/mozilla_firefox/old-patches/launch-kill-dowhile.patch diff --git a/www-client/mozilla-firefox/old-patches/mozilla-rdefs.zip b/www-client/mozilla_firefox/old-patches/mozilla-rdefs.zip similarity index 100% rename from www-client/mozilla-firefox/old-patches/mozilla-rdefs.zip rename to www-client/mozilla_firefox/old-patches/mozilla-rdefs.zip diff --git a/www-client/mozilla-firefox/old-patches/nsAppRunner.patch b/www-client/mozilla_firefox/old-patches/nsAppRunner.patch similarity index 100% rename from www-client/mozilla-firefox/old-patches/nsAppRunner.patch rename to www-client/mozilla_firefox/old-patches/nsAppRunner.patch diff --git a/www-client/mozilla-firefox/old-patches/prpolevt-fix.patch b/www-client/mozilla_firefox/old-patches/prpolevt-fix.patch similarity index 100% rename from www-client/mozilla-firefox/old-patches/prpolevt-fix.patch rename to www-client/mozilla_firefox/old-patches/prpolevt-fix.patch diff --git a/www-client/mozilla-firefox/old-patches/sunbird-makefile-apprunner-rsrc.zip b/www-client/mozilla_firefox/old-patches/sunbird-makefile-apprunner-rsrc.zip similarity index 100% rename from www-client/mozilla-firefox/old-patches/sunbird-makefile-apprunner-rsrc.zip rename to www-client/mozilla_firefox/old-patches/sunbird-makefile-apprunner-rsrc.zip diff --git a/www-client/mozilla-firefox/patches/2009-09-27/bezilla.step-by-step.txt b/www-client/mozilla_firefox/patches/2009-09-27/bezilla.step-by-step.txt similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/bezilla.step-by-step.txt rename to www-client/mozilla_firefox/patches/2009-09-27/bezilla.step-by-step.txt diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r01-config-star.patch b/www-client/mozilla_firefox/patches/2009-09-27/r01-config-star.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r01-config-star.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r01-config-star.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r02-configure-in-withGCC4andCrossCompile.patch b/www-client/mozilla_firefox/patches/2009-09-27/r02-configure-in-withGCC4andCrossCompile.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r02-configure-in-withGCC4andCrossCompile.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r02-configure-in-withGCC4andCrossCompile.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r03a-makefile-in.patch b/www-client/mozilla_firefox/patches/2009-09-27/r03a-makefile-in.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r03a-makefile-in.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r03a-makefile-in.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r03b-starmk.patch b/www-client/mozilla_firefox/patches/2009-09-27/r03b-starmk.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r03b-starmk.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r03b-starmk.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r04a-rdef-support-in-Makefile.patch b/www-client/mozilla_firefox/patches/2009-09-27/r04a-rdef-support-in-Makefile.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r04a-rdef-support-in-Makefile.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r04a-rdef-support-in-Makefile.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r04b-just-rdefs-no-Makefile.patch b/www-client/mozilla_firefox/patches/2009-09-27/r04b-just-rdefs-no-Makefile.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r04b-just-rdefs-no-Makefile.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r04b-just-rdefs-no-Makefile.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r05-fix-shlibsign.README b/www-client/mozilla_firefox/patches/2009-09-27/r05-fix-shlibsign.README similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r05-fix-shlibsign.README rename to www-client/mozilla_firefox/patches/2009-09-27/r05-fix-shlibsign.README diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r05-fix-shlibsign.patch b/www-client/mozilla_firefox/patches/2009-09-27/r05-fix-shlibsign.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r05-fix-shlibsign.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r05-fix-shlibsign.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r06-nss-gcc4.patch b/www-client/mozilla_firefox/patches/2009-09-27/r06-nss-gcc4.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r06-nss-gcc4.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r06-nss-gcc4.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r07-working-nspr-from-haikuports.patch b/www-client/mozilla_firefox/patches/2009-09-27/r07-working-nspr-from-haikuports.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r07-working-nspr-from-haikuports.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r07-working-nspr-from-haikuports.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r08-misc.patch b/www-client/mozilla_firefox/patches/2009-09-27/r08-misc.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r08-misc.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r08-misc.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r09-sunbird-options-fix.patch b/www-client/mozilla_firefox/patches/2009-09-27/r09-sunbird-options-fix.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r09-sunbird-options-fix.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r09-sunbird-options-fix.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r10-grey-menu-color.patch b/www-client/mozilla_firefox/patches/2009-09-27/r10-grey-menu-color.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r10-grey-menu-color.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r10-grey-menu-color.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r11-bookmarks-v2.patch b/www-client/mozilla_firefox/patches/2009-09-27/r11-bookmarks-v2.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r11-bookmarks-v2.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r11-bookmarks-v2.patch diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r12-releasenotes.patch b/www-client/mozilla_firefox/patches/2009-09-27/r12-releasenotes.patch similarity index 100% rename from www-client/mozilla-firefox/patches/2009-09-27/r12-releasenotes.patch rename to www-client/mozilla_firefox/patches/2009-09-27/r12-releasenotes.patch diff --git a/www-client/mozilla-firefox/persdict.dat b/www-client/mozilla_firefox/persdict.dat similarity index 100% rename from www-client/mozilla-firefox/persdict.dat rename to www-client/mozilla_firefox/persdict.dat diff --git a/www-client/mozilla-firefox/select-a-mozconfig/browser-debug.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/browser-debug.mozconfig similarity index 100% rename from www-client/mozilla-firefox/select-a-mozconfig/browser-debug.mozconfig rename to www-client/mozilla_firefox/select-a-mozconfig/browser-debug.mozconfig diff --git a/www-client/mozilla-firefox/select-a-mozconfig/browser.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/browser.mozconfig similarity index 100% rename from www-client/mozilla-firefox/select-a-mozconfig/browser.mozconfig rename to www-client/mozilla_firefox/select-a-mozconfig/browser.mozconfig diff --git a/www-client/mozilla-firefox/select-a-mozconfig/calendar.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/calendar.mozconfig similarity index 100% rename from www-client/mozilla-firefox/select-a-mozconfig/calendar.mozconfig rename to www-client/mozilla_firefox/select-a-mozconfig/calendar.mozconfig diff --git a/www-client/mozilla-firefox/select-a-mozconfig/mailnews.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/mailnews.mozconfig similarity index 100% rename from www-client/mozilla-firefox/select-a-mozconfig/mailnews.mozconfig rename to www-client/mozilla_firefox/select-a-mozconfig/mailnews.mozconfig diff --git a/www-client/mozilla-firefox/select-a-mozconfig/suite-debug.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/suite-debug.mozconfig similarity index 100% rename from www-client/mozilla-firefox/select-a-mozconfig/suite-debug.mozconfig rename to www-client/mozilla_firefox/select-a-mozconfig/suite-debug.mozconfig diff --git a/www-client/mozilla-firefox/select-a-mozconfig/suite-just-browser.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/suite-just-browser.mozconfig similarity index 100% rename from www-client/mozilla-firefox/select-a-mozconfig/suite-just-browser.mozconfig rename to www-client/mozilla_firefox/select-a-mozconfig/suite-just-browser.mozconfig diff --git a/www-client/mozilla-firefox/select-a-mozconfig/suite.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/suite.mozconfig similarity index 100% rename from www-client/mozilla-firefox/select-a-mozconfig/suite.mozconfig rename to www-client/mozilla_firefox/select-a-mozconfig/suite.mozconfig diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.0.recipe b/x11-misc/shared_mime_info/shared-mime-info-1.0.recipe similarity index 100% rename from x11-misc/shared-mime-info/shared-mime-info-1.0.recipe rename to x11-misc/shared_mime_info/shared-mime-info-1.0.recipe 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 similarity index 100% rename from x11-misc/util-macros/util-macros-1.17.0-git.recipe rename to x11-misc/util_macros/util-macros-1.17.0-git.recipe diff --git a/x11-misc/util-macros/util-macros-1.7.0.recipe b/x11-misc/util_macros/util-macros-1.7.0.recipe similarity index 100% rename from x11-misc/util-macros/util-macros-1.7.0.recipe rename to x11-misc/util_macros/util-macros-1.7.0.recipe diff --git a/x11-proto/xcb-proto/xcb-proto-1.6.recipe b/x11-proto/xcb_proto/xcb-proto-1.6.recipe similarity index 100% rename from x11-proto/xcb-proto/xcb-proto-1.6.recipe rename to x11-proto/xcb_proto/xcb-proto-1.6.recipe From 4a90d4f15dc656d7a3bf3bfce9d6f727eb80918a Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 21 Apr 2013 19:55:45 +0200 Subject: [PATCH 095/587] Deactivate autoconf-2.68 and automake-1.11.1 for now. * we need to make room for new versions (as support for multiple versions of a single port hasn't been implemented in haikuporter yet) --- sys-devel/autoconf/autoconf-2.68.recipe | 4 ++-- sys-devel/automake/automake-1.11.1.recipe | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index 94892a1aa..29e89a89e 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -8,8 +8,8 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/autoconf/" SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2" CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07" -REVISION="4" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="5" +ARCHITECTURES="?x86_gcc2 ?x86" LICENSE=" GNU GPL v2 GNU GPL v3" diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe index 77bbbef50..36fb1aed4 100644 --- a/sys-devel/automake/automake-1.11.1.recipe +++ b/sys-devel/automake/automake-1.11.1.recipe @@ -6,10 +6,12 @@ DESCRIPTION=" '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" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz" CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74" -REVISION="4" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="5" +ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES=" automake = $portVersion compat >= 1.11 @@ -24,7 +26,7 @@ REQUIRES=" coreutils diffutils cmd:m4 >= 1.4 - cmd:perl >= 5 + cmd:perl >= 5.8 cmd:sh " BUILD_REQUIRES=" @@ -54,6 +56,3 @@ TEST() { make check } - -LICENSE="GNU GPL v2" -COPYRIGHT="2009 Free Software Foundation, Inc." From 1f16fbf4687f9f273ac7211cd4883d0b99cb76cd Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 21 Apr 2013 19:57:15 +0200 Subject: [PATCH 096/587] Finish and activate autoconf-2.69 and automake-1.13.1 --- sys-devel/autoconf/autoconf-2.69.recipe | 43 +++++++++++++-------- sys-devel/automake/automake-1.13.1.recipe | 46 ++++++++++++++--------- 2 files changed, 57 insertions(+), 32 deletions(-) diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index b418af8bd..17d071f0f 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -1,31 +1,47 @@ -SUMMARY="A GNU tool for automatically configuring source code" -DESCRIPTION="GNU Autoconf is a tool for configuring source code and makefiles. Using +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." + configuration options. + " HOMEPAGE="http://www.gnu.org/software/autoconf/" +COPYRIGHT="1992-2012 Free Software Foundation, Inc." +LICENSE=" + GNU GPL v2 + GNU GPL v3 + " SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz" CHECKSUM_MD5="50f97f4159805e374639a73e2636f22e" -REVISION="2" -ARCHITECTURES="?x86_gcc2 ?x86" +REVISION="3" +ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="autoconf = $portVersion compat >= 2.60 +PROVIDES=" + autoconf = $portVersion compat >= 2.60 cmd:autoconf = $portVersion compat >= 2.60 cmd:autoheader = $portVersion compat >= 2.60 cmd:autom4te = $portVersion compat >= 2.60 cmd:autoreconf = $portVersion compat >= 2.60 cmd:autoscan = $portVersion compat >= 2.60 cmd:autoupdate = $portVersion compat >= 2.60 - cmd:ifnames = $portVersion compat >= 2.60" -REQUIRES="haiku >= $haikuVersion + cmd:ifnames = $portVersion compat >= 2.60 + " +REQUIRES=" + haiku >= $haikuVersion cmd:awk coreutils diffutils cmd:m4 >= 1.4 cmd:perl >= 5 - cmd:sh" -BUILD_REQUIRES="cmd:automake >= 1.13.1" -BUILD_PREREQUIRES="haiku_devel >= $haikuVersion + cmd:sh + " +BUILD_REQUIRES=" + cmd:automake >= 1.13.1 + cmd:makeinfo + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:autoreconf >= 2.60 cmd:make" @@ -43,13 +59,10 @@ BUILD() INSTALL() { make install + make install-html } TEST() { make check } - -LICENSE="GNU GPL v2 - GNU GPL v3" -COPYRIGHT="1992-2012 Free Software Foundation, Inc." diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index eb4ff4580..f1172793e 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -1,31 +1,44 @@ SUMMARY="A tool for generating 'Makefile.in' from 'Makefile.am'" -DESCRIPTION="Automake is a tool for automatically generating 'Makefile.in' files +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." + '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" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz" CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847" -REVISION="2" -ARCHITECTURES="?x86_gcc2 ?x86" +REVISION="3" +ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="automake = $portVersion compat >= 1.11 - cmd:automake = $portVersion compat >= 1.11 - cmd:automake_1.11 = $portVersion compat >= 1.11 - cmd:aclocal = $portVersion compat >= 1.11 - cmd:aclocal_1.11 = $portVersion compat >= 1.11" -REQUIRES="haiku >= $haikuVersion +PROVIDES=" + automake = $portVersion compat >= 1.13 + cmd:automake = $portVersion compat >= 1.13 + cmd:automake_1.13 = $portVersion compat >= 1.13 + cmd:aclocal = $portVersion compat >= 1.13 + cmd:aclocal_1.13 = $portVersion compat >= 1.13 + " +REQUIRES=" + haiku >= $haikuVersion cmd:awk coreutils diffutils cmd:m4 >= 1.4 - cmd:perl >= 5 - cmd:sh" -BUILD_REQUIRES="cmd:sed" -BUILD_PREREQUIRES="haiku_devel >= $haikuVersion + cmd:perl >= 5.8 + cmd:sh + " +BUILD_REQUIRES=" + cmd:perl >= 5.8 + cmd:makeinfo + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:autoconf >= 2.60 cmd:make - cmd:perl >= 5.8" + " SOURCE_DIR="$portVersionedName" @@ -38,6 +51,7 @@ BUILD() INSTALL() { make install + make install-html } TEST() @@ -45,5 +59,3 @@ TEST() make check } -LICENSE="GNU GPL v2" -COPYRIGHT="2013 Free Software Foundation, Inc." From 43d36deaeddb962f986c119f50dac4b82cac1ef8 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 21 Apr 2013 19:58:10 +0200 Subject: [PATCH 097/587] Adjust make-3.82 as an example for a source package --- sys-devel/make/make-3.82.recipe | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index 723658692..d7519d831 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -10,6 +10,8 @@ DESCRIPTION=" program. " HOMEPAGE="http://www.gnu.org/software/make/" +LICENSE="GNU GPL v3" +COPYRIGHT="1988-2010 Free Software Foundation, Inc." SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2" CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f" REVISION="4" @@ -47,5 +49,6 @@ INSTALL() ./make install } -LICENSE="GNU GPL v3" -COPYRIGHT="1988-2010 Free Software Foundation, Inc." +# ----- source package ------------------------------------------------------- + +PROVIDES_source="make_source = $portVersion" From 06e4e0810387ea9c5c2df0d9107e6a5a63386fc2 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 22 Apr 2013 00:18:31 +0200 Subject: [PATCH 098/587] Finish work on haiku/master versions of prequired packages --- .../binutils/binutils-2.17_130421.recipe | 169 ++++++++++++++++++ sys-devel/bison/bison-2.4.3.recipe | 46 +++-- sys-devel/gcc/gcc-2.95.3_130421.recipe | 149 +++++++++++++++ 3 files changed, 347 insertions(+), 17 deletions(-) create mode 100644 sys-devel/binutils/binutils-2.17_130421.recipe create mode 100644 sys-devel/gcc/gcc-2.95.3_130421.recipe diff --git a/sys-devel/binutils/binutils-2.17_130421.recipe b/sys-devel/binutils/binutils-2.17_130421.recipe new file mode 100644 index 000000000..d02db30e1 --- /dev/null +++ b/sys-devel/binutils/binutils-2.17_130421.recipe @@ -0,0 +1,169 @@ +SUMMARY="The GNU assembler, linker and binary utilities" +HOMEPAGE="http://www.gnu.org/software/binutils" +SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2006 Free Software Foundation, Inc." + + +PROVIDES=" + binutils = $portVersion compat >= 2.17 + cmd:addr2line = $portVersion compat >= 2.17 + cmd:ar = $portVersion compat >= 2.17 + cmd:as = $portVersion compat >= 2.17 + cmd:c++filt = $portVersion compat >= 2.17 + cmd:gprof = $portVersion compat >= 2.17 + cmd:ld = $portVersion compat >= 2.17 + cmd:nm = $portVersion compat >= 2.17 + cmd:objcopy = $portVersion compat >= 2.17 + cmd:objdump = $portVersion compat >= 2.17 + cmd:ranlib = $portVersion compat >= 2.17 + cmd:readelf = $portVersion compat >= 2.17 + cmd:size = $portVersion compat >= 2.17 + cmd:strings = $portVersion compat >= 2.17 + cmd:strip = $portVersion compat >= 2.17 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoconf + binutils + gcc + cmd:flex + cmd:make + cmd:sed + cmd:tar + texinfo + " + +SOURCE_DIR="$portVersionedName" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +binutilsDir=$(pwd)/legacy/binutils +relativeArchInstallDir="develop/tools/${portVersionedName}" +archInstallDir="$prefix/$relativeArchInstallDir" +objectsDir=$(pwd)/../${portVersionedName}-obj +binutilsObjectsDir=$objectsDir/binutils + +BUILD() +{ + rm -rf $objectsDir + + # Touch all *.info files, as newer texinfos don't like their format + (cd $binutilsDir; find . -name \*.info | xargs touch) + + # build binutils + mkdir -p $binutilsObjectsDir + cd $binutilsObjectsDir + CFLAGS="-O2" CXXFLAGS="-O2" "$binutilsDir/configure" \ + --prefix=$prefix --exec-prefix=$archInstallDir \ + --bindir=$prefix/bin --libdir=$prefix/lib \ + --includedir=$prefix/develop/headers/binutils \ + --mandir=$prefix/documentation/man \ + --with-htmldir=documentation/html/binutils \ + --disable-nls --enable-shared=yes + make +} + +INSTALL() +{ + cd $binutilsObjectsDir + archName=$(grep '^target_alias' Makefile | cut -d= -f2) + + make install + make install-html + + ### HTML documentation #################################### + + echo "Organizing HTML documentation..." + html_base=$prefix/documentation/html/binutils + cd $html_base + + mv as.html as + ln -sf as/index.html as.html + mv bfd.html bfd + ln -sf bfd/index.html bfd.html + mv binutils.html binutils + ln -sf binutils/index.html binutils.html + mv gprof.html gprof + ln -sf gprof/index.html gprof.html + mv ld.html ld + ln -sf ld/index.html ld.html + rm standards.html + + ### Strip ################################################# + + echo "Strip debug info" + + cd $prefix + find bin -type f | xargs -r strip --strip-debug + strip --strip-debug lib/*.a + strip --strip-debug $archInstallDir/$archName/bin/* + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # remove duplicate architecture-dependent binaries from $prefix/bin + cd $prefix/bin + rm ar as ld nm objdump ranlib strip + + # make all tools available via default paths if these are + # the system binutils + if [ $architecture = 'x86_gcc2' ]; then + echo "Symlinking binaries into default path" + mkdir -p $prefix/bin + ln -sfn ../$relativeArchInstallDir/$archName/bin/* . + fi + + ### Cleanup ################################################# + + echo "Cleanup" + + cd $prefix + rm -rf info +} + +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. + " diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe index f3e420f0a..8a98b4c02 100644 --- a/sys-devel/bison/bison-2.4.3.recipe +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -1,29 +1,43 @@ 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. +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 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" SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz" CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="bison = $portVersion compat >= 2.4 +PROVIDES=" + bison = $portVersion compat >= 2.4 cmd:bison = $portVersion compat >= 2.4 cmd:yacc - lib:liby.a = $portVersion compat >= 2.4" -REQUIRES="haiku >= $haikuVersion" -BUILD_PREREQUIRES="haiku_devel >= $haikuVersion + lib:liby.a = $portVersion compat >= 2.4 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" cmd:gcc cmd:ld - cmd:make" + cmd:m4 + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " SOURCE_DIR="$portVersionedName" @@ -46,5 +60,3 @@ TEST() make check } -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-devel/gcc/gcc-2.95.3_130421.recipe b/sys-devel/gcc/gcc-2.95.3_130421.recipe new file mode 100644 index 000000000..21a0fbfd1 --- /dev/null +++ b/sys-devel/gcc/gcc-2.95.3_130421.recipe @@ -0,0 +1,149 @@ +SUMMARY="C/C++ compiler" +DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5." +HOMEPAGE="http://gcc.gnu.org" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2000 Free Software Foundation, Inc." +SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + gcc = $portVersion compat >= 2.95.3 + cmd:c++ = $portVersion compat >= 2.95.3 + cmd:cpp = $portVersion compat >= 2.95.3 + cmd:g++ = $portVersion compat >= 2.95.3 + cmd:gcc = $portVersion compat >= 2.95.3 + cmd:gcov = 1.5 compat >= 1.5 + cmd:protoize = $portVersion compat >= 2.95.3 + cmd:unprotoize = $portVersion compat >= 2.95.3 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + binutils + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoconf + gcc + cmd:flex + cmd:make + cmd:sed + cmd:tar + cmd:makeinfo + " + +SOURCE_DIR="$portVersionedName" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +gccDir=$(pwd)/legacy/gcc +gccDate=110711 +relativeGccInstallDir="develop/tools/gcc-2.95.3-${gccDate}" +gccInstallDir="$prefix/$relativeGccInstallDir" +objectsDir=$(pwd)/../${portVersionedName}-obj +gccObjectsDir=$objectsDir/gcc + +BUILD() +{ + rm -rf $objectsDir + + # Touch some files generated by bison, so that bison won't run to update + # them. Fixes issues with newer bison versions. + # And while at it, touch gperf target, too (as gperf may not be installed). + (cd $gccDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + cp/parse.h c-gperf.h) + + # build gcc + mkdir -p $gccObjectsDir + cd $gccObjectsDir + CFLAGS="-O2" CXXFLAGS="-O2" "$gccDir/configure" \ + --prefix=$gccInstallDir \ + --disable-nls --enable-shared=yes --enable-languages=c,c++ + make bootstrap || true + # The above will fail when compiling builtinbuf.cc, but we can ignore + # that since it's trying to build libstdc++.so, which haiku provides + # anyway. +} + +INSTALL() +{ + cd $gccObjectsDir + make install + + base=$gccInstallDir + + ### HTML documentation #################################### + + html_base=$prefix/documentation/packages/$portVersionedName + if [ ! -d "$html_base" ]; then + echo "Building HTML documentation..." + mkdir -p $html_base + cd $html_base + + makeinfo --html "$gccDir/gcc/cpp.texi" + makeinfo --html "$gccDir/gcc/gcc.texi" + makeinfo --force --html "$gccDir/libio/iostream.texi" \ + && true + # some errors + + ln -sf cpp/index.html $html_base/cpp.html + ln -sf gcc/index.html $html_base/gcc.html + ln -sf iostream/index.html $html_base/iostream.html + fi + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # convert to absolute links to relative ones + cd $base/bin + ln -sfn g++ c++ + ln -sfn gcc cc + ln -sfn gcc i586-pc-haiku-gcc + + # make all tools available via default paths if this is the system + # compiler + if [ $architecture = 'x86_gcc2' ]; then + echo "Symlinking binaries into default path" + mkdir -p $prefix/bin + cd $prefix/bin + ln -sfn ../$relativeGccInstallDir/bin/* . + fi + + ### Strip ################################################# + + echo "Strip debug info" + + cd $base + strip --strip-debug bin/* + strip --strip-debug i586-pc-haiku/bin/* + strip --strip-debug lib/gcc-lib/i586-pc-haiku/2.95.3-${gccDate}/* \ + &>/dev/null || true + + ### Cleanup ############################################### + + echo "Cleanup" + + if [ -d $base/man -o -d $base/info -o -d $base/share ]; then + rm -rf $base/man + rm -rf $base/info + rm -rf $base/share + fi + + rm -f $base/lib/gcc-lib/i586-pc-haiku/2.95.3-haiku-$gccDate/include/math.h + + ### C++ includes ########################################## + + echo "Install C++ includes & library" + + rm -rf $base/include/g++ + ln -snf /boot/system/develop/headers/c++/2.95.3 $base/include/g++ + + ln -snf /boot/system/lib/libstdc++.r4.so $base/lib/ + ln -snf /boot/system/lib/libstdc++.so $base/lib/ +} From 404e2f047d3abb4a70252e56a8a2d2d3ceaaa4de Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 22 Apr 2013 11:57:20 +0200 Subject: [PATCH 099/587] xz_utils-5.0.1.recipe: Turn into an actual recipe I tried a bit, but there's no easy way of building with gcc 2, as the code makes heavy use of C99 features. Should we really need to build it with gcc 2, we should at least deal with the local variable declarations not at the beginning of a block in an automated fashion. --- app-arch/xz_utils/xz_utils-5.0.1.recipe | 84 ++++++++++++++++++++----- 1 file changed, 67 insertions(+), 17 deletions(-) diff --git a/app-arch/xz_utils/xz_utils-5.0.1.recipe b/app-arch/xz_utils/xz_utils-5.0.1.recipe index 537853ebf..c55bf9fcf 100644 --- a/app-arch/xz_utils/xz_utils-5.0.1.recipe +++ b/app-arch/xz_utils/xz_utils-5.0.1.recipe @@ -1,37 +1,87 @@ -DESCRIPTION="XZ Utils is data compression software for working with LZMA compressed files." +SUMMARY="Free general-purpose data compression software" HOMEPAGE="http://tukaani.org/xz/" SRC_URI="http://tukaani.org/xz/xz-5.0.1.tar.bz2" CHECKSUM_MD5="cb6c7a58cec4d663a395c54d186ca0c6" -REVISION="1" -STATUS_HAIKU="stable" -MESSAGE="This port only builds with gcc4." -DEPEND="" +LICENSE=" + GNU LGPL v2.1 + GNU GPL v2 + GNU GPL v3 + " +COPYRIGHT="2005-2011 Lasse Collin" +REVISION="2" +ARCHITECTURES="!x86_gcc2 ?x86" + +PROVIDES=" + xz_utils = $portVersion compat >= 5 + cmd:lzcat = 5.0.1 compat >= 5 + cmd:lzcmp = 5.0.1 compat >= 5 + cmd:lzdiff = 5.0.1 compat >= 5 + cmd:lzegrep = 5.0.1 compat >= 5 + cmd:lzfgrep = 5.0.1 compat >= 5 + cmd:lzgrep = 5.0.1 compat >= 5 + cmd:lzless = 5.0.1 compat >= 5 + cmd:lzma = 5.0.1 compat >= 5 + cmd:lzmadec = 5.0.1 compat >= 5 + cmd:lzmainfo = 5.0.1 compat >= 5 + cmd:lzmore = 5.0.1 compat >= 5 + cmd:unlzma = 5.0.1 compat >= 5 + cmd:unxz = 5.0.1 compat >= 5 + cmd:xz = 5.0.1 compat >= 5 + cmd:xzcat = 5.0.1 compat >= 5 + cmd:xzcmp = 5.0.1 compat >= 5 + cmd:xzdec = 5.0.1 compat >= 5 + cmd:xzdiff = 5.0.1 compat >= 5 + cmd:xzegrep = 5.0.1 compat >= 5 + cmd:xzfgrep = 5.0.1 compat >= 5 + cmd:xzgrep = 5.0.1 compat >= 5 + cmd:xzless = 5.0.1 compat >= 5 + cmd:xzmore = 5.0.1 compat >= 5 + lib:liblzma = 5.0.1 compat >= 5 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="xz-5.0.1" + BUILD() { - cd xz-5.0.1 touch po/t-cs.gmo libtoolize --force --copy --install - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --docdir=$COMMON_DOCS/doc/xz \ - --mandir=$COMMON_DOCS/man \ - --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale + ./configure $configureDirArgs +# --localedir=$dataRootDir/locale make } INSTALL() { - cd xz-5.0.1 make install } TEST() { - cd xz-5.0.1 make check } -LICENSE="GNU LGPL v2.1 - GNU GPL v2 - GNU GPL v3" -COPYRIGHT="2005-2011 Lasse Collin" +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." From e8cc57a00cadd7de9decb481015dba77a93d1512 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 22 Apr 2013 13:47:28 +0200 Subject: [PATCH 100/587] Convert yasm recipes to actual recipes --- dev-lang/yasm/yasm-1.1.0.recipe | 54 ++++++++++++++++++++++++--------- dev-lang/yasm/yasm-1.2.0.recipe | 54 ++++++++++++++++++++++++--------- 2 files changed, 78 insertions(+), 30 deletions(-) diff --git a/dev-lang/yasm/yasm-1.1.0.recipe b/dev-lang/yasm/yasm-1.1.0.recipe index 08112aced..6be4ce273 100644 --- a/dev-lang/yasm/yasm-1.1.0.recipe +++ b/dev-lang/yasm/yasm-1.1.0.recipe @@ -1,30 +1,54 @@ -DESCRIPTION="Yasm assembler" +SUMMARY="The Yasm modular assembler" HOMEPAGE="http://www.tortall.net/projects/yasm/" SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz" CHECKSUM_MD5="8392e5f2235c2c2a981e1a633f2698cb" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +LICENSE=" + Artistic + BSD (2-clause) + BSD (3-clause) + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="2001-2010 Peter Johnson and other Yasm developers." +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + yasm = $portVersion compat >= 1 + cmd:yasm = 1.1.0 compat >= 1 + lib:libyasm = 1.1.0 compat >= 1.1 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd yasm-1.1.0 libtoolize --force --copy --install - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man \ + ./configure $configureDirArgs \ --disable-nls make } INSTALL() { - cd yasm-1.1.0 make install } -LICENSE="Artistic - BSD (2-clause) - BSD (3-clause) - GNU GPL v2 - GNU LGPL v2" -COPYRIGHT="2001-2010 Peter Johnson and other Yasm developers." + +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 cf851af25..4d5eb44ff 100644 --- a/dev-lang/yasm/yasm-1.2.0.recipe +++ b/dev-lang/yasm/yasm-1.2.0.recipe @@ -1,30 +1,54 @@ -DESCRIPTION="Yasm assembler" +SUMMARY="The Yasm modular assembler" HOMEPAGE="http://www.tortall.net/projects/yasm/" SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz" CHECKSUM_MD5="4cfc0686cf5350dd1305c4d905eb55a6" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +LICENSE=" + Artistic + BSD (2-clause) + BSD (3-clause) + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="2001-2011 Peter Johnson and other Yasm developers." +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + yasm = $portVersion compat >= 1 + cmd:yasm = 1.2.0 compat >= 1 + lib:libyasm = 1.2.0 compat >= 1.2 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd yasm-1.2.0 libtoolize --force --copy --install - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man \ + ./configure $configureDirArgs \ --disable-nls make } INSTALL() { - cd yasm-1.2.0 make install } -LICENSE="Artistic - BSD (2-clause) - BSD (3-clause) - GNU GPL v2 - GNU LGPL v2" -COPYRIGHT="2001-2011 Peter Johnson and other Yasm developers." + +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 95434f0173891f267fa2e170b315321bcf02cfa9 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 22 Apr 2013 19:11:31 +0200 Subject: [PATCH 101/587] Convert Vision recipe to an actual recipe --- haiku-apps/vision/vision-908.recipe | 60 +++++++++++++++++++---------- 1 file changed, 39 insertions(+), 21 deletions(-) diff --git a/haiku-apps/vision/vision-908.recipe b/haiku-apps/vision/vision-908.recipe index 63a723983..3c33e5442 100644 --- a/haiku-apps/vision/vision-908.recipe +++ b/haiku-apps/vision/vision-908.recipe @@ -1,32 +1,50 @@ -DESCRIPTION="Vision is an irc client for Haiku" +SUMMARY="IRC client for Haiku" +DESCRIPTION="Vision is an IRC client for Haiku." HOMEPAGE="http://vision.sourceforge.net/" SRC_URI="svn+http://vision.svn.sourceforge.net/svnroot/vision/trunk#908" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" - +LICENSE="MPL v1.1" +COPYRIGHT="1999-2010 The Vision Team" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +if [ $architecture != x86_gcc2 ]; then + PATCHES="vision-908-gcc4.patch" +fi + +PROVIDES=" + vision = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:ld + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd vision-908 - if [ -n "$(setgcc | grep '4')" ]; then - patch -p0 -ui ../../patches/vision-908-gcc4.patch - fi cd Vision make } INSTALL() { - VISIONSETTINGSDIR=${DESTDIR}/`finddir B_USER_SETTINGS_DIRECTORY`/Vision - mkdir -p ${VISIONSETTINGSDIR} - cd vision-908 - cd Vision - mkdir -p ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision - cp Vision ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision - cd data - cp -a * ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision - cp -a `haikuporter -t`/haiku-apps/vision/VisionSettings ${VISIONSETTINGSDIR}/ -} + visionDir=$appsDir/Vision + visionSettingsDir=$settingsDir/Vision + mkdir -p $visionDir + mkdir -p $visionSettingsDir -COPYRIGHT="1999-2010 The Vision Team" -LICENSE="MPL v1.1" + cp -a $portDir/VisionSettings $visionSettingsDir + + cd Vision + cp Vision $visionDir + cd data + copyattr -d -r -x .svn * $visionDir +} From 22d146555601965a7d618bf2469ea7e2d7b43098 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 22 Apr 2013 20:01:16 +0200 Subject: [PATCH 102/587] Convert wqy_zenhei recipe to an actual recipe --- ...0.9.45.recipe => wqy_zenhei-0.9.45.recipe} | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) rename media-fonts/wqy_zenhei/{wqy-zenhei-0.9.45.recipe => wqy_zenhei-0.9.45.recipe} (51%) diff --git a/media-fonts/wqy_zenhei/wqy-zenhei-0.9.45.recipe b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe similarity index 51% rename from media-fonts/wqy_zenhei/wqy-zenhei-0.9.45.recipe rename to media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe index c95a82a32..36bcedfe6 100644 --- a/media-fonts/wqy_zenhei/wqy-zenhei-0.9.45.recipe +++ b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe @@ -1,23 +1,35 @@ -DESCRIPTION="WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font" -HOMEPAGE="http://wqy.sourceforge.net/en" +SUMMARY="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" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="4c6c3f4e902dd5ee0a121e8c41d040bd" +LICENSE=" + GNU GPL v2 + GNU GPL v2 with font embedding exception + " +COPYRIGHT="2005-2010 Qianqian Fang and The WenQuanYi Project Board of Trustees" +REVISION="2" +ARCHITECTURES="any" + +PROVIDES=" + wqy_zenhei = $portVersion + " +REQUIRES="" +BUILD_REQUIRES=" + coreutils" +BUILD_PREREQUIRES="" + +SOURCE_DIR="wqy-zenhei" + BUILD() { - cd wqy-zenhei + true } INSTALL() { - cd wqy-zenhei - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/wenquanyi + FONTDIR=$fontsDir/wenquanyi mkdir -p ${FONTDIR} cp wqy-zenhei.ttc ${FONTDIR}/wqy-zenhei.ttf } -LICENSE="GNU GPL v2 - GNU GPL v2 with font embedding exception" -COPYRIGHT="2005-2010 Qianqian Fang and The WenQuanYi Project Board of Trustees" From 7c245319d0b05c9f7e3dbb902bfd0365ac863b85 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 22 Apr 2013 20:34:25 +0200 Subject: [PATCH 103/587] Convert wqy_microhei recipe to an actual recipe --- .../wqy-microhei-0.2.0-beta.recipe | 25 ------------ .../wqy_microhei-0.2.0~beta.recipe | 39 +++++++++++++++++++ 2 files changed, 39 insertions(+), 25 deletions(-) delete mode 100644 media-fonts/wqy_microhei/wqy-microhei-0.2.0-beta.recipe create mode 100644 media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe 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 deleted file mode 100644 index 06a576b38..000000000 --- a/media-fonts/wqy_microhei/wqy-microhei-0.2.0-beta.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="A droid derived Sans-Serif style CJK font" -HOMEPAGE="http://wqy.sourceforge.net/en" -SRC_URI="http://sourceforge.net/projects/wqy/files/wqy-microhei/0.2.0-beta/wqy-microhei-0.2.0-beta.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="a124c5c6606f4f3b733d3477380e9d2f" -BUILD() -{ - cd wqy-microhei -} - -INSTALL() -{ - cd wqy-microhei - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/wenquanyi - mkdir -p ${FONTDIR} - cp wqy-microhei.ttc ${FONTDIR}/wqy-microhei.ttf -} - -LICENSE="Apache v2 - GNU GPL v3 - GNU GPL font exception" -COPYRIGHT="2007 Google Corp. - 2008-2010 WenQuanYi Board of Trustees and Qianqian Fang" 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 new file mode 100644 index 000000000..8e5c39975 --- /dev/null +++ b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe @@ -0,0 +1,39 @@ +SUMMARY="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" +LICENSE=" + Apache v2 + GNU GPL v3 + GNU GPL font exception + " +COPYRIGHT=" + 2007 Google Corp. + 2008-2010 WenQuanYi Board of Trustees and Qianqian Fang + " +REVISION="2" +ARCHITECTURES="any" + +PROVIDES=" + wqy_microhei = $portVersion + " +REQUIRES="" +BUILD_REQUIRES=" + coreutils" +BUILD_PREREQUIRES="" + +SOURCE_DIR="wqy-microhei" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/wenquanyi + mkdir -p ${FONTDIR} + cp wqy-microhei.ttc ${FONTDIR}/wqy-microhei.ttf +} + From fd7e08593c1470f7e060c4fe70187e63b69aee58 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 22 Apr 2013 22:24:36 +0200 Subject: [PATCH 104/587] Convert wpa_supplicant recipe to an actual recipe Also adjust the patch to use the correct private Haiku headers. --- .../patches/wpa_supplicant-0.7.3.patch | 6 +-- .../wpa_supplicant-0.7.3.recipe | 45 ++++++++++++++----- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/net-wireless/wpa_supplicant/patches/wpa_supplicant-0.7.3.patch b/net-wireless/wpa_supplicant/patches/wpa_supplicant-0.7.3.patch index 3e318adb4..8ff5d9c4d 100644 --- a/net-wireless/wpa_supplicant/patches/wpa_supplicant-0.7.3.patch +++ b/net-wireless/wpa_supplicant/patches/wpa_supplicant-0.7.3.patch @@ -777,9 +777,9 @@ diff -urN wpa_supplicant-0.7.3/wpa_supplicant/.config wpa_supplicant-0.7.3-haiku +LIBS += -L/boot/common/lib + +# for private Haiku headers -+CFLAGS += -I/Source/Haiku/trunk/src/libs/compat/freebsd_network/compat -+CFLAGS += -I/Source/Haiku/trunk/src/libs/compat/freebsd_wlan -+CFLAGS += -I/Source/Haiku/trunk/headers/private/net ++CFLAGS += -I/system/develop/headers/private/libs/compat/freebsd_network/compat ++CFLAGS += -I/system/develop/headers/private/libs/compat/freebsd_wlan ++CFLAGS += -I/system/develop/headers/private/net +CFLAGS += -Wno-multichar + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) 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 6374d8267..f783ff9b3 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe @@ -1,21 +1,44 @@ -DESCRIPTION="A WPA Supplicant with support for WPA and WPA2." +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" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +LICENSE=" + BSD (2-clause) + GNU GPL v2 + " +COPYRIGHT="2003-2010 Jouni Malinen" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="wpa_supplicant-0.7.3.patch" + +PROVIDES=" + wpa_supplicant = $portVersion compat >= 0.7 + " +REQUIRES=" + haiku >= $haikuVersion + openssl >= 1.0.0 + " +BUILD_REQUIRES=" + cmd:gcc + cmd:ld + cmd:make + openssl >= 1.0.0 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName/wpa_supplicant" + BUILD() { - cd wpa_supplicant-0.7.3/wpa_supplicant CFLAGS="-MMD -O2 -Wall" make wpa_supplicant } + INSTALL() { - cd wpa_supplicant-0.7.3/wpa_supplicant - mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` - cp -v wpa_supplicant ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/ + mkdir -p $binDir + cp -v wpa_supplicant $binDir } -LICENSE="BSD (2-clause) - GNU GPL v2" -COPYRIGHT="2003-2010 Jouni Malinen" From e247faabc4a90d751fe48dbc8265c45ef01e9fd3 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sun, 31 Mar 2013 00:51:41 +0000 Subject: [PATCH 105/587] Update wpa_supplicant to version 2.0 and bring in improvements. * Updated to version 2.0 of vendor code. * Reliability improvements in controlling the underlying devices. * Implement leaving networks. * Better timeout handling. * Usability enhancements like cancel on escape, ok button being the default and the password field having focus on start. * Storing of the password using BKeyStore. --- .../patches/wpa_supplicant-2.0.patch | 2639 +++++++++++++++++ .../wpa_supplicant/wpa_supplicant-2.0.bep | 19 + 2 files changed, 2658 insertions(+) create mode 100644 net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch create mode 100644 net-wireless/wpa_supplicant/wpa_supplicant-2.0.bep diff --git a/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch b/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch new file mode 100644 index 000000000..d2fa387d9 --- /dev/null +++ b/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch @@ -0,0 +1,2639 @@ +diff --git a/.gitignore wpa_supplicant-2.0/.gitignore +new file mode 100644 +index 0000000..02ecd61 +--- /dev/null ++++ wpa_supplicant-2.0/.gitignore +@@ -0,0 +1,6 @@ ++*.d ++*.o ++*.rsrc ++/wpa_supplicant/wpa_cli ++/wpa_supplicant/wpa_passphrase ++/wpa_supplicant/wpa_supplicant +diff --git a/src/drivers/driver_bsd.c wpa_supplicant-2.0/src/drivers/driver_bsd.c +index 9d869b1..2b6f83a 100644 +--- a/src/drivers/driver_bsd.c ++++ wpa_supplicant-2.0/src/drivers/driver_bsd.c +@@ -44,15 +44,36 @@ + #if __NetBSD__ + #include + #endif ++#ifdef __HAIKU__ ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include "net80211/ieee80211.h" ++#include "net80211/ieee80211_ioctl.h" ++#include "net80211/ieee80211_crypto.h" ++#endif /* __HAIKU__ */ + + #include "l2_packet/l2_packet.h" + ++ ++#ifdef __HAIKU__ ++void haiku_unregister_events(void *drv); ++int haiku_register_events(void *ctx, void *drv, const char *ifname, ++ void **events, void (*callback)(void *ctx, void *drv, int opcode)); ++#endif ++ + struct bsd_driver_data { + struct hostapd_data *hapd; /* back pointer */ + + int sock; /* open socket for 802.11 ioctls */ + struct l2_packet_data *sock_xmit;/* raw packet xmit socket */ ++#ifndef __HAIKU__ + int route; /* routing socket for events */ ++#endif + char ifname[IFNAMSIZ+1]; /* interface name */ + unsigned int ifindex; /* interface index */ + void *ctx; +@@ -61,6 +82,9 @@ struct bsd_driver_data { + int prev_roaming; /* roaming state to restore on deinit */ + int prev_privacy; /* privacy state to restore on deinit */ + int prev_wpa; /* wpa state to restore on deinit */ ++#ifdef __HAIKU__ ++ void *events; ++#endif + }; + + /* Generic functions for hostapd and wpa_supplicant */ +@@ -78,7 +102,7 @@ bsd_set80211(void *priv, int op, int val, const void *arg, int arg_len) + ireq.i_data = (void *) arg; + ireq.i_len = arg_len; + +- if (ioctl(drv->sock, SIOCS80211, &ireq) < 0) { ++ if (ioctl(drv->sock, SIOCS80211, &ireq, sizeof(ireq)) < 0) { + wpa_printf(MSG_ERROR, "ioctl[SIOCS80211, op=%u, val=%u, " + "arg_len=%u]: %s", op, val, arg_len, + strerror(errno)); +@@ -99,8 +123,8 @@ bsd_get80211(void *priv, struct ieee80211req *ireq, int op, void *arg, + ireq->i_len = arg_len; + ireq->i_data = arg; + +- if (ioctl(drv->sock, SIOCG80211, ireq) < 0) { +- wpa_printf(MSG_ERROR, "ioctl[SIOCS80211, op=%u, " ++ if (ioctl(drv->sock, SIOCG80211, ireq, sizeof(*ireq)) < 0) { ++ wpa_printf(MSG_ERROR, "ioctl[SIOCG80211, op=%u, " + "arg_len=%u]: %s", op, arg_len, strerror(errno)); + return -1; + } +@@ -140,7 +164,7 @@ bsd_get_ssid(void *priv, u8 *ssid, int len) + os_memset(&ifr, 0, sizeof(ifr)); + os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name)); + ifr.ifr_data = (void *)&nwid; +- if (ioctl(drv->sock, SIOCG80211NWID, &ifr) < 0 || ++ if (ioctl(drv->sock, SIOCG80211NWID, &ifr, sizeof(ifr)) < 0 || + nwid.i_len > IEEE80211_NWID_LEN) + return -1; + os_memcpy(ssid, nwid.i_nwid, nwid.i_len); +@@ -163,7 +187,7 @@ bsd_set_ssid(void *priv, const u8 *ssid, int ssid_len) + os_memset(&ifr, 0, sizeof(ifr)); + os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name)); + ifr.ifr_data = (void *)&nwid; +- return ioctl(drv->sock, SIOCS80211NWID, &ifr); ++ return ioctl(drv->sock, SIOCS80211NWID, &ifr, sizeof(ifr)); + #else + return set80211var(drv, IEEE80211_IOC_SSID, ssid, ssid_len); + #endif +@@ -178,7 +202,7 @@ bsd_get_if_media(void *priv) + os_memset(&ifmr, 0, sizeof(ifmr)); + os_strlcpy(ifmr.ifm_name, drv->ifname, sizeof(ifmr.ifm_name)); + +- if (ioctl(drv->sock, SIOCGIFMEDIA, &ifmr) < 0) { ++ if (ioctl(drv->sock, SIOCGIFMEDIA, &ifmr, sizeof(ifmr)) < 0) { + wpa_printf(MSG_ERROR, "%s: SIOCGIFMEDIA %s", __func__, + strerror(errno)); + return -1; +@@ -197,7 +221,7 @@ bsd_set_if_media(void *priv, int media) + os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name)); + ifr.ifr_media = media; + +- if (ioctl(drv->sock, SIOCSIFMEDIA, &ifr) < 0) { ++ if (ioctl(drv->sock, SIOCSIFMEDIA, &ifr, sizeof(ifr)) < 0) { + wpa_printf(MSG_ERROR, "%s: SIOCSIFMEDIA %s", __func__, + strerror(errno)); + return -1; +@@ -254,13 +278,14 @@ bsd_send_mlme_param(void *priv, const u8 op, const u16 reason, const u8 *addr) + static int + bsd_ctrl_iface(void *priv, int enable) + { ++#ifndef __HAIKU__ + struct bsd_driver_data *drv = priv; + struct ifreq ifr; + + os_memset(&ifr, 0, sizeof(ifr)); + os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name)); + +- if (ioctl(drv->sock, SIOCGIFFLAGS, &ifr) < 0) { ++ if (ioctl(drv->sock, SIOCGIFFLAGS, &ifr, sizeof(ifr)) < 0) { + perror("ioctl[SIOCGIFFLAGS]"); + return -1; + } +@@ -270,12 +295,16 @@ bsd_ctrl_iface(void *priv, int enable) + else + ifr.ifr_flags &= ~IFF_UP; + +- if (ioctl(drv->sock, SIOCSIFFLAGS, &ifr) < 0) { ++ if (ioctl(drv->sock, SIOCSIFFLAGS, &ifr, sizeof(ifr)) < 0) { + perror("ioctl[SIOCSIFFLAGS]"); + return -1; + } + + return 0; ++#else /* !__HAIKU__ */ ++ return set80211var(priv, enable ? IEEE80211_IOC_HAIKU_COMPAT_WLAN_UP ++ : IEEE80211_IOC_HAIKU_COMPAT_WLAN_DOWN, NULL, 0); ++#endif /* __HAIKU__ */ + } + + static int +@@ -493,6 +522,7 @@ bsd_set_sta_authorized(void *priv, const u8 *addr, + IEEE80211_MLME_UNAUTHORIZE, 0, addr); + } + ++#ifndef __HAIKU__ + static void + bsd_new_sta(void *priv, void *ctx, u8 addr[IEEE80211_ADDR_LEN]) + { +@@ -519,6 +549,7 @@ bsd_new_sta(void *priv, void *ctx, u8 addr[IEEE80211_ADDR_LEN]) + no_ie: + drv_event_assoc(ctx, addr, iebuf, ielen, 0); + } ++#endif // !__HAIKU__ + + static int + bsd_send_eapol(void *priv, const u8 *addr, const u8 *data, size_t data_len, +@@ -567,7 +598,7 @@ bsd_set_freq(void *priv, struct hostapd_freq_params *freq) + os_memset(&creq, 0, sizeof(creq)); + os_strlcpy(creq.i_name, drv->ifname, sizeof(creq.i_name)); + creq.i_channel = (u_int16_t)channel; +- return ioctl(drv->sock, SIOCS80211CHANNEL, &creq); ++ return ioctl(drv->sock, SIOCS80211CHANNEL, &creq, sizeof(creq)); + #else /* SIOCS80211CHANNEL */ + return set80211param(priv, IEEE80211_IOC_CHANNEL, channel); + #endif /* SIOCS80211CHANNEL */ +@@ -585,6 +616,7 @@ bsd_set_opt_ie(void *priv, const u8 *ie, size_t ie_len) + return 0; + } + ++#ifndef __HAIKU__ + static int + rtbuf_len(void) + { +@@ -600,6 +632,7 @@ rtbuf_len(void) + + return len; + } ++#endif // !__HAIKU__ + + #ifdef HOSTAPD + +@@ -675,7 +708,7 @@ bsd_get_seqnum(const char *ifname, void *priv, const u8 *addr, int idx, + } + + +-static int ++static int + bsd_flush(void *priv) + { + u8 allsta[IEEE80211_ADDR_LEN]; +@@ -896,7 +929,7 @@ wpa_driver_bsd_get_bssid(void *priv, u8 *bssid) + struct ieee80211_bssid bs; + + os_strlcpy(bs.i_name, drv->ifname, sizeof(bs.i_name)); +- if (ioctl(drv->sock, SIOCG80211BSSID, &bs) < 0) ++ if (ioctl(drv->sock, SIOCG80211BSSID, &bs, sizeof(bs)) < 0) + return -1; + os_memcpy(bssid, bs.i_bssid, sizeof(bs.i_bssid)); + return 0; +@@ -1008,7 +1041,7 @@ wpa_driver_bsd_associate(void *priv, struct wpa_driver_associate_params *params) + wpa_printf(MSG_DEBUG, + "%s: ssid '%.*s' wpa ie len %u pairwise %u group %u key mgmt %u" + , __func__ +- , (unsigned int) params->ssid_len, params->ssid ++ , (int) params->ssid_len, params->ssid + , (unsigned int) params->wpa_ie_len + , params->pairwise_suite + , params->group_suite +@@ -1147,6 +1180,23 @@ wpa_driver_bsd_scan(void *priv, struct wpa_driver_scan_params *params) + #endif /* IEEE80211_IOC_SCAN_MAX_SSID */ + } + ++#ifdef __HAIKU__ ++static void ++wpa_driver_haiku_event(void *ctx, void *drv, int opcode) ++{ ++ switch (opcode) { ++ case B_NETWORK_WLAN_JOINED: ++ wpa_supplicant_event(ctx, EVENT_ASSOC, NULL); ++ break; ++ case B_NETWORK_WLAN_LEFT: ++ wpa_supplicant_event(ctx, EVENT_DISASSOC, NULL); ++ break; ++ case B_NETWORK_WLAN_SCANNED: ++ wpa_supplicant_event(ctx, EVENT_SCAN_RESULTS, NULL); ++ break; ++ } ++} ++#else // !__HAIKU__ + static void + wpa_driver_bsd_event_receive(int sock, void *ctx, void *sock_ctx) + { +@@ -1272,6 +1322,7 @@ wpa_driver_bsd_event_receive(int sock, void *ctx, void *sock_ctx) + } + os_free(buf); + } ++#endif // !__HAIKU__ + + static void + wpa_driver_bsd_add_scan_entry(struct wpa_scan_results *res, +@@ -1290,7 +1341,11 @@ wpa_driver_bsd_add_scan_entry(struct wpa_scan_results *res, + if (result == NULL) + return; + os_memcpy(result->bssid, sr->isr_bssid, ETH_ALEN); ++#ifdef __HAIKU__ ++ result->freq = sr->isr_chan.ic_freq; ++#else + result->freq = sr->isr_freq; ++#endif + result->beacon_int = sr->isr_intval; + result->caps = sr->isr_capinfo; + result->qual = sr->isr_rssi; +@@ -1349,7 +1404,7 @@ wpa_driver_bsd_get_scan_results2(void *priv) + + pos = buf; + rest = len; +- while (rest >= sizeof(struct ieee80211req_scan_result)) { ++ while (rest >= (int) sizeof(struct ieee80211req_scan_result)) { + sr = (struct ieee80211req_scan_result *)pos; + wpa_driver_bsd_add_scan_entry(res, sr); + pos += sr->isr_len; +@@ -1461,11 +1516,18 @@ wpa_driver_bsd_init(void *ctx, const char *ifname) + drv->sock = socket(PF_INET, SOCK_DGRAM, 0); + if (drv->sock < 0) + goto fail1; ++#ifndef __HAIKU__ + drv->route = socket(PF_ROUTE, SOCK_RAW, 0); + if (drv->route < 0) + goto fail; + eloop_register_read_sock(drv->route, + wpa_driver_bsd_event_receive, ctx, drv); ++#else ++ if (haiku_register_events(ctx, drv, ifname, &drv->events, ++ wpa_driver_haiku_event) != 0) { ++ goto fail; ++ } ++#endif + + drv->ctx = ctx; + os_strlcpy(drv->ifname, ifname, sizeof(drv->ifname)); +@@ -1508,7 +1570,11 @@ wpa_driver_bsd_deinit(void *priv) + struct bsd_driver_data *drv = priv; + + wpa_driver_bsd_set_wpa(drv, 0); ++#ifndef __HAIKU__ + eloop_unregister_read_sock(drv->route); ++#else ++ haiku_unregister_events(drv->events); ++#endif + + /* NB: mark interface down */ + bsd_ctrl_iface(drv, 0); +@@ -1520,7 +1586,9 @@ wpa_driver_bsd_deinit(void *priv) + + if (drv->sock_xmit != NULL) + l2_packet_deinit(drv->sock_xmit); ++#ifndef __HAIKU__ + (void) close(drv->route); /* ioctl socket */ ++#endif + (void) close(drv->sock); /* event socket */ + os_free(drv); + } +diff --git a/src/drivers/driver_haiku_events.cpp wpa_supplicant-2.0/src/drivers/driver_haiku_events.cpp +new file mode 100644 +index 0000000..27af03c +--- /dev/null ++++ wpa_supplicant-2.0/src/drivers/driver_haiku_events.cpp +@@ -0,0 +1,103 @@ ++/* ++ * WPA Supplicant - Haiku event handling routines ++ * Copyright (c) 2010, Axel Dörfler, axeld@pinc-software.de. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Alternatively, this software may be distributed under the terms of BSD ++ * license. ++ * ++ * See README and COPYING for more details. ++ * ++ * This file can be used as a starting point for layer2 packet implementation. ++ */ ++ ++#include ++#include ++#include ++ ++#include ++ ++#include ++ ++ ++class EventLooper : public BLooper { ++public: ++ EventLooper(void *context, void *driverData, const char *interfaceName, ++ void (*callback)(void *, void *, int)) ++ : ++ fContext(context), ++ fDriverData(driverData), ++ fInterfaceName(interfaceName), ++ fCallback(callback), ++ fQuitting(false) ++ { ++ start_watching_network(B_WATCH_NETWORK_WLAN_CHANGES, this); ++ } ++ ++ virtual ~EventLooper() ++ { ++ fQuitting = true; ++ stop_watching_network(this); ++ } ++ ++protected: ++ virtual void MessageReceived(BMessage *message) ++ { ++ if (message->what != B_NETWORK_MONITOR) { ++ BLooper::MessageReceived(message); ++ return; ++ } ++ ++ if (fQuitting) ++ return; ++ ++ BString interfaceName; ++ if (message->FindString("interface", &interfaceName) != B_OK) ++ return; ++ ++ if (fInterfaceName.FindFirst(interfaceName) < 0) { ++ // The notification is for some other interface ++ return; ++ } ++ ++ message->AddPointer("callback", (void *)fCallback); ++ message->AddPointer("context", fContext); ++ message->AddPointer("data", fDriverData); ++ be_app->PostMessage(message); ++ } ++ ++private: ++ void *fContext; ++ void *fDriverData; ++ BString fInterfaceName; ++ void (*fCallback)(void *, void *, int); ++ bool fQuitting; ++}; ++ ++ ++extern "C" void ++haiku_unregister_events(void *events) ++{ ++ EventLooper *eventLooper = (EventLooper *)events; ++ if (eventLooper->Lock()) ++ eventLooper->Quit(); ++} ++ ++ ++extern "C" int ++haiku_register_events(void *ctx, void *drv, const char *ifname, void **events, ++ void (*callback)(void *ctx, void *drv, int opcode)) ++{ ++ EventLooper *eventLooper = new(std::nothrow) EventLooper(ctx, drv, ifname, ++ callback); ++ if (eventLooper == NULL) ++ return B_NO_MEMORY; ++ ++ eventLooper->Run(); ++ ++ *events = eventLooper; ++ return 0; ++} +diff --git a/src/drivers/drivers.mak wpa_supplicant-2.0/src/drivers/drivers.mak +index c7a98d3..a1d4b84 100644 +--- a/src/drivers/drivers.mak ++++ wpa_supplicant-2.0/src/drivers/drivers.mak +@@ -51,9 +51,15 @@ CONFIG_L2_PACKET=freebsd + endif + DRV_CFLAGS += -DCONFIG_DRIVER_BSD + DRV_OBJS += ../src/drivers/driver_bsd.o ++ifneq ($(CONFIG_L2_PACKET), haiku) + CONFIG_L2_FREEBSD=y + CONFIG_DNET_PCAP=y + endif ++endif ++ ++ifeq ($(CONFIG_L2_PACKET), haiku) ++DRV_OBJS += ../src/drivers/driver_haiku_events.o ++endif + + ifdef CONFIG_DRIVER_TEST + DRV_CFLAGS += -DCONFIG_DRIVER_TEST +diff --git a/src/l2_packet/l2_packet_haiku.c wpa_supplicant-2.0/src/l2_packet/l2_packet_haiku.c +new file mode 100644 +index 0000000..9410d43 +--- /dev/null ++++ wpa_supplicant-2.0/src/l2_packet/l2_packet_haiku.c +@@ -0,0 +1,241 @@ ++/* ++ * WPA Supplicant - Layer2 packet handling for Haiku ++ * Copyright (c) 2010, Axel Dörfler, axeld@pinc-software.de. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Alternatively, this software may be distributed under the terms of BSD ++ * license. ++ * ++ * See README and COPYING for more details. ++ * ++ * This file can be used as a starting point for layer2 packet implementation. ++ */ ++ ++#include "includes.h" ++ ++#include "common.h" ++#include "eloop.h" ++#include "l2_packet.h" ++ ++#include ++#include ++#include ++ ++ ++struct l2_packet_data { ++ char ifname[IF_NAMESIZE]; ++ union { ++ struct sockaddr_dl link_address; ++ struct sockaddr_storage link_storage; ++ }; ++ void (*rx_callback)(void *ctx, const u8 *src_addr, ++ const u8 *buf, size_t len); ++ void *rx_callback_ctx; ++ int l2_hdr; /* whether to include layer 2 (Ethernet) header data ++ * buffers */ ++ int rx_fd; ++ int tx_fd; ++}; ++ ++ ++int l2_packet_get_own_addr(struct l2_packet_data *l2, u8 *addr) ++{ ++ os_memcpy(addr, LLADDR(&l2->link_address), ETH_ALEN); ++ return 0; ++} ++ ++ ++#if 0 ++static void ++dump_block(const u8* buffer, int size, const char* prefix) ++{ ++ const int DUMPED_BLOCK_SIZE = 16; ++ int i; ++ ++ for (i = 0; i < size;) { ++ int start = i; ++ ++ printf("%s%04x ", prefix, i); ++ for (; i < start + DUMPED_BLOCK_SIZE; i++) { ++ if (!(i % 4)) ++ printf(" "); ++ ++ if (i >= size) ++ printf(" "); ++ else ++ printf("%02x", *(unsigned char*)(buffer + i)); ++ } ++ printf(" "); ++ ++ for (i = start; i < start + DUMPED_BLOCK_SIZE; i++) { ++ if (i < size) { ++ char c = buffer[i]; ++ ++ if (c < 30) ++ printf("."); ++ else ++ printf("%c", c); ++ } else ++ break; ++ } ++ printf("\n"); ++ } ++} ++#endif ++ ++ ++int l2_packet_send(struct l2_packet_data *l2, const u8 *dst_addr, u16 proto, ++ const u8 *buf, size_t len) ++{ ++ int result = -1; ++ struct sockaddr_dl to; ++ ++ if (l2 == NULL) ++ return -1; ++ ++ if (l2->l2_hdr) { ++ int result = send(l2->tx_fd, buf, len, 0); ++ if (result < 0) ++ printf("l2_packet_send failed to send: %s", strerror(errno)); ++ return result; ++ } ++ ++ memset(&to, 0, sizeof(struct sockaddr_dl)); ++ to.sdl_len = sizeof(struct sockaddr_dl); ++ to.sdl_family = AF_LINK; ++ to.sdl_e_type = htons(proto); ++ to.sdl_alen = ETHER_ADDR_LEN; ++ memcpy(LLADDR(&to), dst_addr, ETHER_ADDR_LEN); ++ ++ result = sendto(l2->tx_fd, buf, len, 0, (struct sockaddr*)&to, ++ sizeof(struct sockaddr_dl)); ++ if (result < 0) ++ printf("l2_packet_send failed to send: %s", strerror(errno)); ++ ++ return result; ++} ++ ++ ++static void l2_packet_receive(int sock, void *eloop_ctx, void *sock_ctx) ++{ ++ struct l2_packet_data *l2 = eloop_ctx; ++ struct sockaddr_dl from; ++ socklen_t fromLength = sizeof(struct sockaddr_dl); ++ ssize_t bytesReceived; ++ u8 buffer[2300]; ++ ++ bytesReceived = recvfrom(l2->rx_fd, buffer, sizeof(buffer), MSG_TRUNC, ++ (struct sockaddr*)&from, &fromLength); ++ ++ if (bytesReceived <= 0) ++ return; ++ ++ l2->rx_callback(l2->rx_callback_ctx, LLADDR(&from), buffer, bytesReceived); ++} ++ ++ ++struct l2_packet_data * l2_packet_init( ++ const char *ifname, const u8 *own_addr, unsigned short protocol, ++ void (*rx_callback)(void *ctx, const u8 *src_addr, ++ const u8 *buf, size_t len), ++ void *rx_callback_ctx, int l2_hdr) ++{ ++ struct l2_packet_data *l2; ++ struct ifreq request; ++ ++ /* check if the interface exists */ ++ if (if_nametoindex(ifname) == 0) ++ return NULL; ++ ++ l2 = os_zalloc(sizeof(struct l2_packet_data)); ++ if (l2 == NULL) ++ return NULL; ++ os_strlcpy(l2->ifname, ifname, sizeof(l2->ifname)); ++ l2->rx_callback = rx_callback; ++ l2->rx_callback_ctx = rx_callback_ctx; ++ l2->l2_hdr = l2_hdr; ++ ++ /* open connection for sending and receiving frames */ ++ l2->tx_fd = socket(AF_LINK, SOCK_DGRAM, 0); ++ if (l2->tx_fd < 0) ++ goto err1; ++ ++ /* retrieve link address */ ++ strlcpy(request.ifr_name, ifname, IF_NAMESIZE); ++ if (ioctl(l2->tx_fd, SIOCGIFADDR, &request, sizeof(struct ifreq)) < 0) ++ goto err2; ++ ++ memcpy(&l2->link_address, &request.ifr_addr, request.ifr_addr.sa_len); ++ ++ if (l2_hdr) { ++ /* we need to preserve the L2 header - this is only ++ possible by using a dedicated socket. ++ */ ++ ++ /* open connection for monitoring frames */ ++ l2->rx_fd = socket(AF_LINK, SOCK_DGRAM, 0); ++ if (l2->rx_fd < 0) ++ goto err2; ++ ++ /* start monitoring */ ++ if (ioctl(l2->rx_fd, SIOCSPACKETCAP, &request, ++ sizeof(struct ifreq)) < 0) ++ goto err2; ++ } else { ++ /* bind to protocol */ ++ l2->link_address.sdl_e_type = htons(protocol); ++ ++ if (bind(l2->tx_fd, (struct sockaddr *)&l2->link_address, ++ ((struct sockaddr *)&l2->link_address)->sa_len) < 0) ++ goto err2; ++ ++ /* we can use the same socket to receive our packets */ ++ l2->rx_fd = l2->tx_fd; ++ } ++ ++ eloop_register_read_sock(l2->rx_fd, l2_packet_receive, l2, NULL); ++ ++ return l2; ++ ++err2: ++ close(l2->tx_fd); ++err1: ++ os_free(l2); ++ return NULL; ++} ++ ++ ++void l2_packet_deinit(struct l2_packet_data *l2) ++{ ++ if (l2 == NULL) ++ return; ++ ++ if (l2->rx_fd >= 0) { ++ eloop_unregister_read_sock(l2->rx_fd); ++ ++ close(l2->rx_fd); ++ if (l2->rx_fd != l2->tx_fd) { ++ /* we aren't bound to the protocol and use two different sockets ++ for sending and receiving */ ++ close(l2->rx_fd); ++ } ++ } ++ ++ os_free(l2); ++} ++ ++ ++int l2_packet_get_ip_addr(struct l2_packet_data *l2, char *buf, size_t len) ++{ ++ /* TODO: get interface IP address */ ++ return -1; ++} ++ ++ ++void l2_packet_notify_auth_start(struct l2_packet_data *l2) ++{ ++ /* This function can be left empty */ ++} +diff --git a/src/utils/common.h wpa_supplicant-2.0/src/utils/common.h +index 5fc916c..aed17c3 100644 +--- a/src/utils/common.h ++++ wpa_supplicant-2.0/src/utils/common.h +@@ -53,6 +53,14 @@ static inline unsigned int bswap_32(unsigned int v) + } + #endif /* __APPLE__ */ + ++#if defined(__HAIKU__) ++#include ++#include ++#define bswap_16 __swap_int16 ++#define bswap_32 __swap_int32 ++#define bswap_64 __swap_int64 ++#endif /* __HAIKU__ */ ++ + #ifdef CONFIG_TI_COMPILER + #define __BIG_ENDIAN 4321 + #define __LITTLE_ENDIAN 1234 +diff --git a/src/utils/os_unix.c wpa_supplicant-2.0/src/utils/os_unix.c +index 23a93be..5e164d6 100644 +--- a/src/utils/os_unix.c ++++ wpa_supplicant-2.0/src/utils/os_unix.c +@@ -155,9 +155,9 @@ static int os_daemon(int nochdir, int noclose) + + int os_daemonize(const char *pid_file) + { +-#if defined(__uClinux__) || defined(__sun__) ++#if defined(__uClinux__) || defined(__sun__) || defined(__HAIKU__) + return -1; +-#else /* defined(__uClinux__) || defined(__sun__) */ ++#else /* defined(__uClinux__) || defined(__sun__) || defined(__HAIKU__) */ + if (os_daemon(0, 0)) { + perror("daemon"); + return -1; +@@ -172,7 +172,7 @@ int os_daemonize(const char *pid_file) + } + + return -0; +-#endif /* defined(__uClinux__) || defined(__sun__) */ ++#endif /* defined(__uClinux__) || defined(__sun__) || defined(__HAIKU__) */ + } + + +diff --git a/src/utils/wpa_debug.h wpa_supplicant-2.0/src/utils/wpa_debug.h +index 339c749..78509b6 100644 +--- a/src/utils/wpa_debug.h ++++ wpa_supplicant-2.0/src/utils/wpa_debug.h +@@ -82,7 +82,7 @@ void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len); + static inline void wpa_hexdump_buf(int level, const char *title, + const struct wpabuf *buf) + { +- wpa_hexdump(level, title, buf ? wpabuf_head(buf) : NULL, ++ wpa_hexdump(level, title, buf ? (const u8 *)wpabuf_head(buf) : NULL, + buf ? wpabuf_len(buf) : 0); + } + +@@ -104,7 +104,7 @@ void wpa_hexdump_key(int level, const char *title, const u8 *buf, size_t len); + static inline void wpa_hexdump_buf_key(int level, const char *title, + const struct wpabuf *buf) + { +- wpa_hexdump_key(level, title, buf ? wpabuf_head(buf) : NULL, ++ wpa_hexdump_key(level, title, buf ? (const u8 *)wpabuf_head(buf) : NULL, + buf ? wpabuf_len(buf) : 0); + } + +diff --git a/src/utils/wpabuf.h wpa_supplicant-2.0/src/utils/wpabuf.h +index dbce925..5f7a73e 100644 +--- a/src/utils/wpabuf.h ++++ wpa_supplicant-2.0/src/utils/wpabuf.h +@@ -80,7 +80,7 @@ static inline const void * wpabuf_head(const struct wpabuf *buf) + + static inline const u8 * wpabuf_head_u8(const struct wpabuf *buf) + { +- return wpabuf_head(buf); ++ return (u8 *)wpabuf_head(buf); + } + + /** +@@ -95,42 +95,42 @@ static inline void * wpabuf_mhead(struct wpabuf *buf) + + static inline u8 * wpabuf_mhead_u8(struct wpabuf *buf) + { +- return wpabuf_mhead(buf); ++ return (u8 *)wpabuf_mhead(buf); + } + + static inline void wpabuf_put_u8(struct wpabuf *buf, u8 data) + { +- u8 *pos = wpabuf_put(buf, 1); ++ u8 *pos = (u8 *)wpabuf_put(buf, 1); + *pos = data; + } + + static inline void wpabuf_put_le16(struct wpabuf *buf, u16 data) + { +- u8 *pos = wpabuf_put(buf, 2); ++ u8 *pos = (u8 *)wpabuf_put(buf, 2); + WPA_PUT_LE16(pos, data); + } + + static inline void wpabuf_put_le32(struct wpabuf *buf, u32 data) + { +- u8 *pos = wpabuf_put(buf, 4); ++ u8 *pos = (u8 *)wpabuf_put(buf, 4); + WPA_PUT_LE32(pos, data); + } + + static inline void wpabuf_put_be16(struct wpabuf *buf, u16 data) + { +- u8 *pos = wpabuf_put(buf, 2); ++ u8 *pos = (u8 *)wpabuf_put(buf, 2); + WPA_PUT_BE16(pos, data); + } + + static inline void wpabuf_put_be24(struct wpabuf *buf, u32 data) + { +- u8 *pos = wpabuf_put(buf, 3); ++ u8 *pos = (u8 *)wpabuf_put(buf, 3); + WPA_PUT_BE24(pos, data); + } + + static inline void wpabuf_put_be32(struct wpabuf *buf, u32 data) + { +- u8 *pos = wpabuf_put(buf, 4); ++ u8 *pos = (u8 *)wpabuf_put(buf, 4); + WPA_PUT_BE32(pos, data); + } + +diff --git a/wpa_supplicant/.config wpa_supplicant-2.0/wpa_supplicant/.config +new file mode 100644 +index 0000000..7d73f13 +--- /dev/null ++++ wpa_supplicant-2.0/wpa_supplicant/.config +@@ -0,0 +1,374 @@ ++# for OpenSSL ++CFLAGS += -I/boot/common/include ++LIBS += -L/boot/common/lib ++ ++# for private Haiku headers ++CFLAGS += -I/Source/haiku/git/haiku/src/libs/compat/freebsd_network/compat ++CFLAGS += -I/Source/haiku/git/haiku/src/libs/compat/freebsd_wlan ++CFLAGS += -I/Source/haiku/git/haiku/headers/private/net ++CFLAGS += -Wno-multichar ++ ++# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) ++CONFIG_DRIVER_BSD=y ++ ++# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is ++# included) ++#CONFIG_IEEE8021X_EAPOL=y ++ ++# EAP-MD5 ++#CONFIG_EAP_MD5=y ++ ++# EAP-MSCHAPv2 ++#CONFIG_EAP_MSCHAPV2=y ++ ++# EAP-TLS ++#CONFIG_EAP_TLS=y ++ ++# EAL-PEAP ++#CONFIG_EAP_PEAP=y ++ ++# EAP-TTLS ++#CONFIG_EAP_TTLS=y ++ ++# EAP-FAST ++# Note: Default OpenSSL package does not include support for all the ++# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, ++# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch) ++# to add the needed functions. ++#CONFIG_EAP_FAST=y ++ ++# EAP-GTC ++#CONFIG_EAP_GTC=y ++ ++# EAP-OTP ++#CONFIG_EAP_OTP=y ++ ++# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) ++#CONFIG_EAP_SIM=y ++ ++# EAP-PSK (experimental; this is _not_ needed for WPA-PSK) ++#CONFIG_EAP_PSK=y ++ ++# EAP-pwd (secure authentication using only a password) ++#CONFIG_EAP_PWD=y ++ ++# EAP-PAX ++#CONFIG_EAP_PAX=y ++ ++# LEAP ++#CONFIG_EAP_LEAP=y ++ ++# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used) ++#CONFIG_EAP_AKA=y ++ ++# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). ++# This requires CONFIG_EAP_AKA to be enabled, too. ++#CONFIG_EAP_AKA_PRIME=y ++ ++# EAP-SAKE ++#CONFIG_EAP_SAKE=y ++ ++# EAP-GPSK ++#CONFIG_EAP_GPSK=y ++# Include support for optional SHA256 cipher suite in EAP-GPSK ++#CONFIG_EAP_GPSK_SHA256=y ++ ++# EAP-TNC and related Trusted Network Connect support (experimental) ++#CONFIG_EAP_TNC=y ++ ++# Wi-Fi Protected Setup (WPS) ++#CONFIG_WPS=y ++# Enable WSC 2.0 support ++#CONFIG_WPS2=y ++# Enable WPS external registrar functionality ++#CONFIG_WPS_ER=y ++# Disable credentials for an open network by default when acting as a WPS ++# registrar. ++#CONFIG_WPS_REG_DISABLE_OPEN=y ++# Enable WPS support with NFC config method ++#CONFIG_WPS_NFC=y ++ ++# EAP-IKEv2 ++#CONFIG_EAP_IKEV2=y ++ ++# PKCS#12 (PFX) support (used to read private key and certificate file from ++# a file that usually has extension .p12 or .pfx) ++#CONFIG_PKCS12=y ++ ++# Smartcard support (i.e., private key on a smartcard), e.g., with openssl ++# engine. ++#CONFIG_SMARTCARD=y ++ ++# PC/SC interface for smartcards (USIM, GSM SIM) ++# Enable this if EAP-SIM or EAP-AKA is included ++#CONFIG_PCSC=y ++ ++# Support HT overrides (disable HT/HT40, mask MCS rates, etc.) ++#CONFIG_HT_OVERRIDES=y ++ ++# Development testing ++#CONFIG_EAPOL_TEST=y ++ ++# Select control interface backend for external programs, e.g, wpa_cli: ++# unix = UNIX domain sockets (default for Linux/*BSD) ++# udp = UDP sockets using localhost (127.0.0.1) ++# named_pipe = Windows Named Pipe (default for Windows) ++# udp-remote = UDP sockets with remote access (only for tests systems/purpose) ++# y = use default (backwards compatibility) ++# If this option is commented out, control interface is not included in the ++# build. ++#CONFIG_CTRL_IFACE=y ++ ++# Remove debugging code that is printing out debug message to stdout. ++# This can be used to reduce the size of the wpa_supplicant considerably ++# if debugging code is not needed. The size reduction can be around 35% ++# (e.g., 90 kB). ++#CONFIG_NO_STDOUT_DEBUG=y ++ ++# Select configuration backend: ++# file = text file (e.g., wpa_supplicant.conf; note: the configuration file ++# path is given on command line, not here; this option is just used to ++# select the backend that allows configuration files to be used) ++# winreg = Windows registry (see win_example.reg for an example) ++CONFIG_BACKEND=none ++ ++# Remove configuration write functionality (i.e., to allow the configuration ++# file to be updated based on runtime configuration changes). The runtime ++# configuration can still be changed, the changes are just not going to be ++# persistent over restarts. This option can be used to reduce code size by ++# about 3.5 kB. ++CONFIG_NO_CONFIG_WRITE=y ++ ++# Remove support for configuration blobs to reduce code size by about 1.5 kB. ++CONFIG_NO_CONFIG_BLOBS=y ++ ++# Select program entry point implementation: ++# main = UNIX/POSIX like main() function (default) ++# main_winsvc = Windows service (read parameters from registry) ++# main_none = Very basic example (development use only) ++CONFIG_MAIN=main_haiku ++ ++# Select wrapper for operatins system and C library specific functions ++# unix = UNIX/POSIX like systems (default) ++# win32 = Windows systems ++# none = Empty template ++#CONFIG_OS=haiku ++ ++# Select event loop implementation ++# eloop = select() loop (default) ++# eloop_win = Windows events and WaitForMultipleObject() loop ++# eloop_none = Empty template ++#CONFIG_ELOOP=eloop ++ ++# Should we use poll instead of select? Select is used by default. ++#CONFIG_ELOOP_POLL=y ++ ++# Select layer 2 packet implementation ++# linux = Linux packet socket (default) ++# pcap = libpcap/libdnet/WinPcap ++# freebsd = FreeBSD libpcap ++# winpcap = WinPcap with receive thread ++# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) ++# none = Empty template ++CONFIG_L2_PACKET=haiku ++ ++# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) ++CONFIG_PEERKEY=y ++ ++# IEEE 802.11w (management frame protection), also known as PMF ++# Driver support is also needed for IEEE 802.11w. ++#CONFIG_IEEE80211W=y ++ ++# Select TLS implementation ++# openssl = OpenSSL (default) ++# gnutls = GnuTLS ++# internal = Internal TLSv1 implementation (experimental) ++# none = Empty template ++#CONFIG_TLS=openssl ++ ++# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) ++# can be enabled to get a stronger construction of messages when block ciphers ++# are used. It should be noted that some existing TLS v1.0 -based ++# implementation may not be compatible with TLS v1.1 message (ClientHello is ++# sent prior to negotiating which version will be used) ++#CONFIG_TLSV11=y ++ ++# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2) ++# can be enabled to enable use of stronger crypto algorithms. It should be ++# noted that some existing TLS v1.0 -based implementation may not be compatible ++# with TLS v1.2 message (ClientHello is sent prior to negotiating which version ++# will be used) ++#CONFIG_TLSV12=y ++ ++# If CONFIG_TLS=internal is used, additional library and include paths are ++# needed for LibTomMath. Alternatively, an integrated, minimal version of ++# LibTomMath can be used. See beginning of libtommath.c for details on benefits ++# and drawbacks of this option. ++#CONFIG_INTERNAL_LIBTOMMATH=y ++#ifndef CONFIG_INTERNAL_LIBTOMMATH ++#LTM_PATH=/usr/src/libtommath-0.39 ++#CFLAGS += -I$(LTM_PATH) ++#LIBS += -L$(LTM_PATH) ++#LIBS_p += -L$(LTM_PATH) ++#endif ++# At the cost of about 4 kB of additional binary size, the internal LibTomMath ++# can be configured to include faster routines for exptmod, sqr, and div to ++# speed up DH and RSA calculation considerably ++#CONFIG_INTERNAL_LIBTOMMATH_FAST=y ++ ++# Include NDIS event processing through WMI into wpa_supplicant/wpasvc. ++# This is only for Windows builds and requires WMI-related header files and ++# WbemUuid.Lib from Platform SDK even when building with MinGW. ++#CONFIG_NDIS_EVENTS_INTEGRATED=y ++#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib" ++ ++# Add support for old DBus control interface ++# (fi.epitest.hostap.WPASupplicant) ++#CONFIG_CTRL_IFACE_DBUS=y ++ ++# Add support for new DBus control interface ++# (fi.w1.hostap.wpa_supplicant1) ++#CONFIG_CTRL_IFACE_DBUS_NEW=y ++ ++# Add introspection support for new DBus control interface ++#CONFIG_CTRL_IFACE_DBUS_INTRO=y ++ ++# Add support for loading EAP methods dynamically as shared libraries. ++# When this option is enabled, each EAP method can be either included ++# statically (CONFIG_EAP_=y) or dynamically (CONFIG_EAP_=dyn). ++# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to ++# be loaded in the beginning of the wpa_supplicant configuration file ++# (see load_dynamic_eap parameter in the example file) before being used in ++# the network blocks. ++# ++# Note that some shared parts of EAP methods are included in the main program ++# and in order to be able to use dynamic EAP methods using these parts, the ++# main program must have been build with the EAP method enabled (=y or =dyn). ++# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries ++# unless at least one of them was included in the main build to force inclusion ++# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included ++# in the main build to be able to load these methods dynamically. ++# ++# Please also note that using dynamic libraries will increase the total binary ++# size. Thus, it may not be the best option for targets that have limited ++# amount of memory/flash. ++#CONFIG_DYNAMIC_EAP_METHODS=y ++ ++# IEEE Std 802.11r-2008 (Fast BSS Transition) ++#CONFIG_IEEE80211R=y ++ ++# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) ++#CONFIG_DEBUG_FILE=y ++ ++# Send debug messages to syslog instead of stdout ++#CONFIG_DEBUG_SYSLOG=y ++# Set syslog facility for debug messages ++#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON ++ ++# Add support for sending all debug messages (regardless of debug verbosity) ++# to the Linux kernel tracing facility. This helps debug the entire stack by ++# making it easy to record everything happening from the driver up into the ++# same file, e.g., using trace-cmd. ++#CONFIG_DEBUG_LINUX_TRACING=y ++ ++# Enable privilege separation (see README 'Privilege separation' for details) ++#CONFIG_PRIVSEP=y ++ ++# Enable mitigation against certain attacks against TKIP by delaying Michael ++# MIC error reports by a random amount of time between 0 and 60 seconds ++#CONFIG_DELAYED_MIC_ERROR_REPORT=y ++ ++# Enable tracing code for developer debugging ++# This tracks use of memory allocations and other registrations and reports ++# incorrect use with a backtrace of call (or allocation) location. ++#CONFIG_WPA_TRACE=y ++# For BSD, uncomment these. ++#LIBS += -lexecinfo ++#LIBS_p += -lexecinfo ++#LIBS_c += -lexecinfo ++ ++# Use libbfd to get more details for developer debugging ++# This enables use of libbfd to get more detailed symbols for the backtraces ++# generated by CONFIG_WPA_TRACE=y. ++#CONFIG_WPA_TRACE_BFD=y ++# For BSD, uncomment these. ++#LIBS += -lbfd -liberty -lz ++#LIBS_p += -lbfd -liberty -lz ++#LIBS_c += -lbfd -liberty -lz ++ ++# wpa_supplicant depends on strong random number generation being available ++# from the operating system. os_get_random() function is used to fetch random ++# data when needed, e.g., for key generation. On Linux and BSD systems, this ++# works by reading /dev/urandom. It should be noted that the OS entropy pool ++# needs to be properly initialized before wpa_supplicant is started. This is ++# important especially on embedded devices that do not have a hardware random ++# number generator and may by default start up with minimal entropy available ++# for random number generation. ++# ++# As a safety net, wpa_supplicant is by default trying to internally collect ++# additional entropy for generating random data to mix in with the data fetched ++# from the OS. This by itself is not considered to be very strong, but it may ++# help in cases where the system pool is not initialized properly. However, it ++# is very strongly recommended that the system pool is initialized with enough ++# entropy either by using hardware assisted random number generator or by ++# storing state over device reboots. ++# ++# wpa_supplicant can be configured to maintain its own entropy store over ++# restarts to enhance random number generation. This is not perfect, but it is ++# much more secure than using the same sequence of random numbers after every ++# reboot. This can be enabled with -e command line option. The ++# specified file needs to be readable and writable by wpa_supplicant. ++# ++# If the os_get_random() is known to provide strong random data (e.g., on ++# Linux/BSD, the board in question is known to have reliable source of random ++# data from /dev/urandom), the internal wpa_supplicant random pool can be ++# disabled. This will save some in binary size and CPU use. However, this ++# should only be considered for builds that are known to be used on devices ++# that meet the requirements described above. ++#CONFIG_NO_RANDOM_POOL=y ++ ++# IEEE 802.11n (High Throughput) support (mainly for AP mode) ++#CONFIG_IEEE80211N=y ++ ++# Wireless Network Management (IEEE Std 802.11v-2011) ++# Note: This is experimental and not complete implementation. ++#CONFIG_WNM=y ++ ++# Interworking (IEEE 802.11u) ++# This can be used to enable functionality to improve interworking with ++# external networks (GAS/ANQP to learn more about the networks and network ++# selection based on available credentials). ++#CONFIG_INTERWORKING=y ++ ++# Hotspot 2.0 ++#CONFIG_HS20=y ++ ++# AP mode operations with wpa_supplicant ++# This can be used for controlling AP mode operations with wpa_supplicant. It ++# should be noted that this is mainly aimed at simple cases like ++# WPA2-Personal while more complex configurations like WPA2-Enterprise with an ++# external RADIUS server can be supported with hostapd. ++#CONFIG_AP=y ++ ++# P2P (Wi-Fi Direct) ++# This can be used to enable P2P support in wpa_supplicant. See README-P2P for ++# more information on P2P operations. ++#CONFIG_P2P=y ++ ++# Autoscan ++# This can be used to enable automatic scan support in wpa_supplicant. ++# See wpa_supplicant.conf for more information on autoscan usage. ++# ++# Enabling directly a module will enable autoscan support. ++# For exponential module: ++#CONFIG_AUTOSCAN_EXPONENTIAL=y ++# For periodic module: ++#CONFIG_AUTOSCAN_PERIODIC=y ++ ++# Password (and passphrase, etc.) backend for external storage ++# These optional mechanisms can be used to add support for storing passwords ++# and other secrets in external (to wpa_supplicant) location. This allows, for ++# example, operating system specific key storage to be used ++# ++# External password backend for testing purposes (developer use) ++#CONFIG_EXT_PASSWORD_TEST=y +diff --git a/wpa_supplicant/Makefile wpa_supplicant-2.0/wpa_supplicant/Makefile +index 65fef41..d9e2cff 100644 +--- a/wpa_supplicant/Makefile ++++ wpa_supplicant-2.0/wpa_supplicant/Makefile +@@ -692,9 +692,11 @@ OBJS += ../src/eap_peer/eap.o ../src/eap_peer/eap_methods.o + NEED_EAP_COMMON=y + ifdef CONFIG_DYNAMIC_EAP_METHODS + CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS ++ifneq ($(CONFIG_L2_PACKET), haiku) + LIBS += -ldl -rdynamic + endif + endif ++endif + + ifdef CONFIG_AP + NEED_80211_COMMON=y +@@ -1039,11 +1041,23 @@ ifdef TLS_FUNCS + ifdef CONFIG_SMARTCARD + ifndef CONFIG_NATIVE_WINDOWS + ifneq ($(CONFIG_L2_PACKET), freebsd) ++ifneq ($(CONFIG_L2_PACKET), haiku) + LIBS += -ldl + endif + endif + endif + endif ++endif ++ ++ifeq ($(CONFIG_L2_PACKET), haiku) ++OBJS += WirelessConfigDialog.o ++OBJS += notify_haiku.o ++LIBS += -lnetwork -lbe -lbnetapi ++LIBS_c += -lnetwork ++ifeq ($(shell $(CC) -dumpversion | cut -d. -f1), 4) ++LIBS += -lstdc++ ++endif ++endif + + ifndef TLS_FUNCS + OBJS += ../src/crypto/tls_none.o +@@ -1506,9 +1520,18 @@ wpa_priv: $(BCHECK) $(OBJS_priv) + + $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config + ++ifneq ($(CONFIG_L2_PACKET), haiku) ++wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs) ++ $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS) ++ @$(E) " LD " $@ ++else + wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs) + $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS) + @$(E) " LD " $@ ++ rc -o wpa_supplicant.rsrc wpa_supplicant.rdef ++ xres -o wpa_supplicant wpa_supplicant.rsrc ++ mimeset -F wpa_supplicant ++endif + + eapol_test: $(OBJS_t) + $(Q)$(LDO) $(LDFLAGS) -o eapol_test $(OBJS_t) $(LIBS) +@@ -1570,6 +1593,10 @@ eap_ikev2.so: ../src/eap_peer/eap_ikev2.c ../src/eap_peer/ikev2.c ../src/eap_com + $(Q)$(CC) -c -o $@ $(CFLAGS) $< + @$(E) " CC " $< + ++%.o: %.cpp ++ $(Q)$(CC) -c -o $@ $(CFLAGS) $< ++ @$(E) " CPP " $< ++ + %.service: %.service.in + sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@ + +@@ -1596,7 +1623,7 @@ wpa_gui: + @echo "wpa_gui has been removed - see wpa_gui-qt4 for replacement" + + wpa_gui-qt4/Makefile: +- qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro ++ qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro + + wpa_gui-qt4/lang/wpa_gui_de.qm: wpa_gui-qt4/lang/wpa_gui_de.ts + lrelease wpa_gui-qt4/wpa_gui.pro +@@ -1626,5 +1653,6 @@ clean: + rm -f core *~ *.o *.d eap_*.so $(ALL) $(WINALL) eapol_test preauth_test + rm -f wpa_priv + rm -f nfc_pw_token ++ rm -f *.rsrc + + -include $(OBJS:%.o=%.d) +diff --git a/wpa_supplicant/WirelessConfigDialog.cpp wpa_supplicant-2.0/wpa_supplicant/WirelessConfigDialog.cpp +new file mode 100644 +index 0000000..6fdad6a +--- /dev/null ++++ wpa_supplicant-2.0/wpa_supplicant/WirelessConfigDialog.cpp +@@ -0,0 +1,293 @@ ++/* ++ * WPA Supplicant - Wireless Config Dialog ++ * Copyright (c) 2011, Michael Lotz ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Alternatively, this software may be distributed under the terms of BSD ++ * license. ++ * ++ * See README and COPYING for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++static const uint32 kMessageCancel = 'btcl'; ++static const uint32 kMessageOk = 'btok'; ++ ++ ++class WirelessConfigView : public BView { ++public: ++ WirelessConfigView() ++ : ++ BView("WirelessConfigView", B_WILL_DRAW), ++ fPassword(NULL) ++ { ++ SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); ++ ++ BGroupLayout* rootLayout = new(std::nothrow) BGroupLayout(B_VERTICAL); ++ if (rootLayout == NULL) ++ return; ++ ++ SetLayout(rootLayout); ++ ++ BGridView* controls = new(std::nothrow) BGridView(); ++ if (controls == NULL) ++ return; ++ ++ BGridLayout* layout = controls->GridLayout(); ++ ++ float inset = ceilf(be_plain_font->Size() * 0.7); ++ rootLayout->SetInsets(inset, inset, inset, inset); ++ rootLayout->SetSpacing(inset); ++ layout->SetSpacing(inset, inset); ++ ++ fNetworkName = new(std::nothrow) BTextControl("Network Name:", "", ++ NULL); ++ if (fNetworkName == NULL) ++ return; ++ ++ int32 row = 0; ++ layout->AddItem(fNetworkName->CreateLabelLayoutItem(), 0, row); ++ layout->AddItem(fNetworkName->CreateTextViewLayoutItem(), 1, row++); ++ ++ BPopUpMenu* authMenu = new(std::nothrow) BPopUpMenu("authMode"); ++ if (authMenu == NULL) ++ return; ++ ++ fAuthOpen = new(std::nothrow) BMenuItem("Open", NULL); ++ authMenu->AddItem(fAuthOpen); ++ fAuthWEP = new(std::nothrow) BMenuItem("WEP", NULL); ++ authMenu->AddItem(fAuthWEP); ++ fAuthWPA = new(std::nothrow) BMenuItem("WPA/WPA2", NULL); ++ authMenu->AddItem(fAuthWPA); ++ ++ BMenuField* authMenuField = new(std::nothrow) BMenuField( ++ "Authentication:", authMenu); ++ if (authMenuField == NULL) ++ return; ++ ++ layout->AddItem(authMenuField->CreateLabelLayoutItem(), 0, row); ++ layout->AddItem(authMenuField->CreateMenuBarLayoutItem(), 1, row++); ++ ++ fPassword = new(std::nothrow) BTextControl("Password:", "", NULL); ++ if (fPassword == NULL) ++ return; ++ ++ BLayoutItem* layoutItem = fPassword->CreateTextViewLayoutItem(); ++ layoutItem->SetExplicitMinSize(BSize(fPassword->StringWidth( ++ "0123456789012345678901234567890123456789") + inset, ++ B_SIZE_UNSET)); ++ ++ layout->AddItem(fPassword->CreateLabelLayoutItem(), 0, row); ++ layout->AddItem(layoutItem, 1, row++); ++ ++ fPersist = new(std::nothrow) BCheckBox("Store this configuration"); ++ layout->AddItem(BSpaceLayoutItem::CreateGlue(), 0, row); ++ layout->AddView(fPersist, 1, row++); ++ ++ BGroupView* buttons = new(std::nothrow) BGroupView(B_HORIZONTAL); ++ if (buttons == NULL) ++ return; ++ ++ fCancelButton = new(std::nothrow) BButton("Cancel", ++ new BMessage(kMessageCancel)); ++ buttons->GroupLayout()->AddView(fCancelButton); ++ ++ buttons->GroupLayout()->AddItem(BSpaceLayoutItem::CreateGlue()); ++ ++ fOkButton = new(std::nothrow) BButton("OK", new BMessage(kMessageOk)); ++ buttons->GroupLayout()->AddView(fOkButton); ++ ++ rootLayout->AddView(controls); ++ rootLayout->AddView(buttons); ++ } ++ ++ virtual void ++ AttachedToWindow() ++ { ++ fCancelButton->SetTarget(Window()); ++ fOkButton->SetTarget(Window()); ++ fOkButton->MakeDefault(true); ++ fPassword->MakeFocus(true); ++ } ++ ++ void ++ SetUp(const BMessage& message) ++ { ++ BString networkName; ++ if (message.FindString("name", &networkName) == B_OK) ++ fNetworkName->SetText(networkName); ++ ++ uint32 authMode; ++ if (message.FindUInt32("authentication", &authMode) != B_OK) ++ authMode = B_NETWORK_AUTHENTICATION_NONE; ++ ++ switch (authMode) { ++ default: ++ case B_NETWORK_AUTHENTICATION_NONE: ++ fAuthOpen->SetMarked(true); ++ break; ++ case B_NETWORK_AUTHENTICATION_WEP: ++ fAuthWEP->SetMarked(true); ++ break; ++ case B_NETWORK_AUTHENTICATION_WPA: ++ case B_NETWORK_AUTHENTICATION_WPA2: ++ fAuthWPA->SetMarked(true); ++ break; ++ } ++ ++ BString password; ++ if (message.FindString("password", &password) == B_OK) ++ fPassword->SetText(password); ++ } ++ ++ void ++ Complete(BMessage& message) ++ { ++ message.RemoveName("name"); ++ message.AddString("name", fNetworkName->Text()); ++ ++ uint32 authMode = B_NETWORK_AUTHENTICATION_NONE; ++ if (fAuthWEP->IsMarked()) ++ authMode = B_NETWORK_AUTHENTICATION_WEP; ++ else if (fAuthWPA->IsMarked()) ++ authMode = B_NETWORK_AUTHENTICATION_WPA; ++ ++ message.RemoveName("authentication"); ++ message.AddUInt32("authentication", authMode); ++ ++ message.RemoveName("password"); ++ message.AddString("password", fPassword->Text()); ++ ++ message.RemoveName("persistent"); ++ message.AddBool("persistent", fPersist->Value() != 0); ++ } ++ ++private: ++ BTextControl* fNetworkName; ++ BMenuItem* fAuthOpen; ++ BMenuItem* fAuthWEP; ++ BMenuItem* fAuthWPA; ++ BTextControl* fPassword; ++ BCheckBox* fPersist; ++ BButton* fCancelButton; ++ BButton* fOkButton; ++}; ++ ++ ++class WirelessConfigWindow : public BWindow { ++public: ++ WirelessConfigWindow(BRect frame) ++ : ++ BWindow(BRect(50, 50, 269, 302), "Connect Wireless Network", ++ B_TITLED_WINDOW, B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS ++ | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS), ++ fConfigView(NULL), ++ fDoneSem(-1), ++ fResult(B_ERROR) ++ { ++ fDoneSem = create_sem(0, "wireless config done"); ++ if (fDoneSem < 0) ++ return; ++ ++ BLayout* layout = new(std::nothrow) BGroupLayout(B_HORIZONTAL); ++ if (layout == NULL) ++ return; ++ ++ SetLayout(layout); ++ ++ fConfigView = new(std::nothrow) WirelessConfigView(); ++ if (fConfigView == NULL) ++ return; ++ ++ layout->AddView(fConfigView); ++ } ++ ++ virtual ++ ~WirelessConfigWindow() ++ { ++ if (fDoneSem >= 0) ++ delete_sem(fDoneSem); ++ } ++ ++ virtual void ++ DispatchMessage(BMessage* message, BHandler* handler) ++ { ++ int8 key; ++ if (message->what == B_KEY_DOWN ++ && message->FindInt8("byte", 0, &key) == B_OK ++ && key == B_ESCAPE) { ++ PostMessage(kMessageCancel); ++ } ++ ++ BWindow::DispatchMessage(message, handler); ++ } ++ ++ virtual void ++ MessageReceived(BMessage* message) ++ { ++ switch (message->what) { ++ case kMessageCancel: ++ case kMessageOk: ++ fResult = message->what == kMessageCancel ? B_CANCELED : B_OK; ++ release_sem(fDoneSem); ++ return; ++ } ++ ++ BWindow::MessageReceived(message); ++ } ++ ++ status_t ++ WaitForDialog(BMessage& message) ++ { ++ ++ fConfigView->SetUp(message); ++ ++ CenterOnScreen(); ++ Show(); ++ ++ while (acquire_sem(fDoneSem) == B_INTERRUPTED); ++ ++ status_t result = fResult; ++ fConfigView->Complete(message); ++ ++ LockLooper(); ++ Quit(); ++ return result; ++ } ++ ++private: ++ WirelessConfigView* fConfigView; ++ sem_id fDoneSem; ++ status_t fResult; ++}; ++ ++ ++status_t ++wireless_config_dialog(BMessage& message) ++{ ++ WirelessConfigWindow* configWindow ++ = new(std::nothrow) WirelessConfigWindow(BRect(100, 100, 200, 200)); ++ if (configWindow == NULL) ++ return B_NO_MEMORY; ++ ++ return configWindow->WaitForDialog(message); ++} +diff --git a/wpa_supplicant/WirelessConfigDialog.h wpa_supplicant-2.0/wpa_supplicant/WirelessConfigDialog.h +new file mode 100644 +index 0000000..38e898b +--- /dev/null ++++ wpa_supplicant-2.0/wpa_supplicant/WirelessConfigDialog.h +@@ -0,0 +1 @@ ++status_t wireless_config_dialog(BMessage& message); +diff --git a/wpa_supplicant/bss.c wpa_supplicant-2.0/wpa_supplicant/bss.c +index 87b7db8..e6da734 100644 +--- a/wpa_supplicant/bss.c ++++ wpa_supplicant-2.0/wpa_supplicant/bss.c +@@ -353,7 +353,7 @@ static struct wpa_bss * wpa_bss_add(struct wpa_supplicant *wpa_s, + static int are_ies_equal(const struct wpa_bss *old, + const struct wpa_scan_res *new, u32 ie) + { +- const u8 *old_ie, *new_ie; ++ const u8 *old_ie = NULL, *new_ie = NULL; + struct wpabuf *old_ie_buff = NULL; + struct wpabuf *new_ie_buff = NULL; + int new_ie_len, old_ie_len, ret, is_multi; +diff --git a/wpa_supplicant/config.c wpa_supplicant-2.0/wpa_supplicant/config.c +index 0fab07a..54b3683 100644 +--- a/wpa_supplicant/config.c ++++ wpa_supplicant-2.0/wpa_supplicant/config.c +@@ -2120,6 +2120,7 @@ int wpa_config_set_quoted(struct wpa_ssid *ssid, const char *var, + } + + ++#ifndef NO_CONFIG_WRITE + /** + * wpa_config_get_all - Get all options from network configuration + * @ssid: Pointer to network configuration data +@@ -2182,7 +2183,6 @@ err: + } + + +-#ifndef NO_CONFIG_WRITE + /** + * wpa_config_get - Get a variable in network configuration + * @ssid: Pointer to network configuration data +@@ -2257,7 +2257,7 @@ char * wpa_config_get_no_key(struct wpa_ssid *ssid, const char *var) + + return NULL; + } +-#endif /* NO_CONFIG_WRITE */ ++#endif // !NO_CONFIG_WRITE + + + /** +diff --git a/wpa_supplicant/main_haiku.cpp wpa_supplicant-2.0/wpa_supplicant/main_haiku.cpp +new file mode 100644 +index 0000000..e9b0c8a +--- /dev/null ++++ wpa_supplicant-2.0/wpa_supplicant/main_haiku.cpp +@@ -0,0 +1,863 @@ ++/* ++ * WPA Supplicant / Haiku entrypoint ++ * Copyright (c) 2011, Michael Lotz ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Alternatively, this software may be distributed under the terms of BSD ++ * license. ++ * ++ * See README and COPYING for more details. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include "WirelessConfigDialog.h" ++#include "WPASupplicant.h" // private header currently inside Haiku ++ ++#include ++ ++extern "C" { ++#include "utils/includes.h" ++#include "utils/common.h" ++#include "utils/eloop.h" ++#include "common/defs.h" ++ ++#include "config.h" ++#include "notify.h" ++#include "notify_haiku.h" ++#include "wpa_supplicant_i.h" ++} ++ ++extern "C" { ++#include ++#include ++#include ++} ++ ++ ++static const uint32 kMsgJoinTimeout = 'jnto'; ++static const char *kWPASupplicantKeyring = "wpa_supplicant"; ++ ++ ++typedef bool (*StateChangeCallback)(const wpa_supplicant *interface, ++ BMessage *message, void *data); ++ ++ ++class StateChangeWatchingEntry { ++public: ++ StateChangeWatchingEntry( ++ const wpa_supplicant *interface, ++ StateChangeCallback callback, ++ void *data); ++ ++ ++ bool MessageReceived( ++ const wpa_supplicant *interface, ++ BMessage *message); ++ ++private: ++ const wpa_supplicant * fInterface; ++ StateChangeCallback fCallback; ++ void * fData; ++}; ++ ++ ++StateChangeWatchingEntry::StateChangeWatchingEntry( ++ const wpa_supplicant *interface, StateChangeCallback callback, void *data) ++ : ++ fInterface(interface), ++ fCallback(callback), ++ fData(data) ++{ ++} ++ ++ ++bool ++StateChangeWatchingEntry::MessageReceived(const wpa_supplicant *interface, ++ BMessage *message) ++{ ++ if (interface != fInterface) ++ return false; ++ ++ return fCallback(interface, message, fData); ++} ++ ++ ++class WPASupplicantApp : public BApplication { ++public: ++ WPASupplicantApp(); ++virtual ~WPASupplicantApp(); ++ ++ status_t InitCheck(); ++ ++virtual void ReadyToRun(); ++virtual void MessageReceived(BMessage *message); ++ ++ status_t RunSupplicantInMainThread(); ++ ++private: ++static int32 _SupplicantThread(void *data); ++static void _EventLoopProcessEvents(int sock, ++ void *eventLoopContext, void *data); ++ ++ status_t _EnqueueAndNotify(BMessage *message); ++ status_t _NotifyEventLoop(); ++ ++ bool _CheckAskForConfig(BMessage *message); ++ ++ status_t _JoinNetwork(BMessage *message); ++ status_t _LeaveNetwork(BMessage *message); ++ ++ status_t _NotifyNetworkEvent(BMessage *message); ++ ++static void _SuccessfullyJoined( ++ const wpa_supplicant *interface, ++ const BMessage &joinRequest); ++static void _FailedToJoin(const wpa_supplicant *interface, ++ const BMessage &joinRequest); ++ ++static bool _InterfaceStateChangeCallback( ++ const wpa_supplicant *interface, ++ BMessage *message, void *data); ++ ++ status_t _StartWatchingInterfaceChanges( ++ const wpa_supplicant *interface, ++ StateChangeCallback callback, void *data); ++ void _NotifyInterfaceStateChanged(BMessage *message); ++ ++static void _SendReplyIfNeeded(BMessage &message, ++ status_t status); ++ ++ status_t fInitStatus; ++ thread_id fSupplicantThread; ++ BMessageQueue fEventQueue; ++ ++ int fNotifySockets[2]; ++ ++ BObjectList ++ fWatchingEntryList; ++ BLocker fWatchingEntryListLocker; ++ ++ wpa_global * fWPAGlobal; ++ wpa_params fWPAParameters; ++}; ++ ++ ++WPASupplicantApp::WPASupplicantApp() ++ : ++ BApplication(kWPASupplicantSignature), ++ fInitStatus(B_NO_INIT), ++ fSupplicantThread(-1), ++ fWPAGlobal(NULL) ++{ ++ fNotifySockets[0] = fNotifySockets[1] = -1; ++ ++ fInitStatus = BApplication::InitCheck(); ++ if (fInitStatus != B_OK) ++ return; ++ ++ memset(&fWPAParameters, 0, sizeof(fWPAParameters)); ++ //fWPAParameters.wpa_debug_level = MSG_DEBUG; ++ ++ fWPAGlobal = wpa_supplicant_init(&fWPAParameters); ++ if (fWPAGlobal == NULL) { ++ fInitStatus = B_ERROR; ++ return; ++ } ++ ++ if (socketpair(AF_LOCAL, SOCK_STREAM, 0, fNotifySockets) != 0) { ++ fInitStatus = errno; ++ return; ++ } ++} ++ ++ ++WPASupplicantApp::~WPASupplicantApp() ++{ ++ if (fWPAGlobal == NULL) ++ return; ++ ++ wpa_supplicant_terminate_proc(fWPAGlobal); ++ ++ // Wake the event loop up so it'll process the quit request and exit. ++ _NotifyEventLoop(); ++ ++ int32 result; ++ wait_for_thread(fSupplicantThread, &result); ++ ++ wpa_supplicant_deinit(fWPAGlobal); ++ ++ close(fNotifySockets[0]); ++ close(fNotifySockets[1]); ++} ++ ++ ++status_t ++WPASupplicantApp::InitCheck() ++{ ++ return fInitStatus; ++} ++ ++ ++void ++WPASupplicantApp::ReadyToRun() ++{ ++ fSupplicantThread = spawn_thread(_SupplicantThread, ++ "wpa_supplicant thread", B_NORMAL_PRIORITY, this); ++ if (fSupplicantThread < 0 || resume_thread(fSupplicantThread)) ++ PostMessage(B_QUIT_REQUESTED); ++} ++ ++ ++void ++WPASupplicantApp::MessageReceived(BMessage *message) ++{ ++ switch (message->what) { ++ case kMsgWPAJoinNetwork: ++ { ++ if (_CheckAskForConfig(message)) { ++ status_t status = wireless_config_dialog(*message); ++ if (status != B_OK) { ++ _SendReplyIfNeeded(*message, status); ++ return; ++ } ++ } ++ ++ _EnqueueAndNotify(DetachCurrentMessage()); ++ // The event processing code will send the reply. ++ return; ++ } ++ ++ case kMsgWPALeaveNetwork: ++ { ++ _EnqueueAndNotify(DetachCurrentMessage()); ++ // The event processing code will send the reply. ++ return; ++ } ++ ++ case B_NETWORK_MONITOR: ++ { ++ BMessage *copy = new BMessage(); ++ *copy = *message; ++ _EnqueueAndNotify(copy); ++ return; ++ } ++ ++ case kMsgSupplicantStateChanged: ++ case kMsgJoinTimeout: ++ { ++ _NotifyInterfaceStateChanged(message); ++ return; ++ } ++ } ++ ++ BApplication::MessageReceived(message); ++} ++ ++ ++int32 ++WPASupplicantApp::_SupplicantThread(void *data) ++{ ++ WPASupplicantApp *app = (WPASupplicantApp *)data; ++ ++ // Register our notify socket with the polling event loop. ++ if (eloop_register_read_sock(app->fNotifySockets[0], ++ _EventLoopProcessEvents, app->fWPAGlobal, app) != 0) { ++ return B_ERROR; ++ } ++ ++ wpa_supplicant_run(app->fWPAGlobal); ++ ++ eloop_unregister_read_sock(app->fNotifySockets[0]); ++ ++ // There are two reasons why the supplicant thread quit: ++ // 1. The event loop was terminated because of a signal or error and the ++ // application is still there and running. ++ // 2. The app has quit and stopped the event loop. ++ // ++ // In case of 2. we're done, but in case of 1. we need to quit the still ++ // running application. We use the app messenger to reach the app if it is ++ // still running. If it already quit the SendMessage() will simply fail. ++ ++ be_app_messenger.SendMessage(B_QUIT_REQUESTED); ++ return B_OK; ++} ++ ++ ++status_t ++WPASupplicantApp::_EnqueueAndNotify(BMessage *message) ++{ ++ if (!fEventQueue.Lock()) ++ return B_ERROR; ++ ++ fEventQueue.AddMessage(message); ++ fEventQueue.Unlock(); ++ ++ return _NotifyEventLoop(); ++} ++ ++ ++status_t ++WPASupplicantApp::_NotifyEventLoop() ++{ ++ // This will interrupt the event loop and cause the message queue to be ++ // processed through the installed handler. ++ uint8 byte = 0; ++ ssize_t written = write(fNotifySockets[1], &byte, sizeof(byte)); ++ if (written < 0) ++ return written; ++ ++ return written == sizeof(byte) ? B_OK : B_ERROR; ++} ++ ++ ++void ++WPASupplicantApp::_EventLoopProcessEvents(int sock, void *eventLoopContext, ++ void *data) ++{ ++ // This function is called from the event loop only. ++ ++ WPASupplicantApp *app = (WPASupplicantApp *)data; ++ ++ uint8 bytes[25]; ++ read(app->fNotifySockets[0], bytes, sizeof(bytes)); ++ // discard them, they are just here to wake the event loop ++ ++ BMessageQueue &queue = app->fEventQueue; ++ if (!queue.Lock()) ++ return; ++ ++ while (true) { ++ BMessage *message = queue.FindMessage((int32)0); ++ if (message == NULL) ++ break; ++ ++ queue.RemoveMessage(message); ++ ++ bool needsReply = false; ++ bool deleteMessage = true; ++ status_t status = B_MESSAGE_NOT_UNDERSTOOD; ++ switch (message->what) { ++ case kMsgWPAJoinNetwork: ++ status = app->_JoinNetwork(message); ++ needsReply = status != B_OK; ++ deleteMessage = needsReply; ++ break; ++ ++ case kMsgWPALeaveNetwork: ++ status = app->_LeaveNetwork(message); ++ needsReply = status != B_OK; ++ deleteMessage = needsReply; ++ break; ++ ++ case B_NETWORK_MONITOR: ++ app->_NotifyNetworkEvent(message); ++ break; ++ } ++ ++ if (needsReply) ++ _SendReplyIfNeeded(*message, status); ++ if (deleteMessage) ++ delete message; ++ } ++ ++ queue.Unlock(); ++} ++ ++ ++bool ++WPASupplicantApp::_CheckAskForConfig(BMessage *message) ++{ ++ bool force = false; ++ if (message->FindBool("forceDialog", &force) == B_OK && force) ++ return true; ++ ++ if (!message->HasString("name")) ++ return true; ++ ++ uint32 authMode = B_NETWORK_AUTHENTICATION_NONE; ++ if (message->FindUInt32("authentication", &authMode) != B_OK) ++ return true; ++ ++ if (authMode <= B_NETWORK_AUTHENTICATION_NONE ++ || message->HasString("password")) { ++ return false; ++ } ++ ++ // Try looking up the password in the keystore. ++ const char *name = message->FindString("name"); ++ ++ // TODO: Use the bssid as an optional secondary identifier to allow for ++ // overlapping network names. ++ BPasswordKey key; ++ BKeyStore keyStore; ++ if (keyStore.GetKey(kWPASupplicantKeyring, B_KEY_TYPE_PASSWORD, ++ name, key) != B_OK) { ++ return true; ++ } ++ ++ message->AddString("password", key.Password()); ++ return false; ++} ++ ++ ++status_t ++WPASupplicantApp::_JoinNetwork(BMessage *message) ++{ ++ const char *interfaceName = NULL; ++ status_t status = message->FindString("device", &interfaceName); ++ if (status != B_OK) ++ return status; ++ ++ // Check if we already registered this interface. ++ wpa_supplicant *interface = wpa_supplicant_get_iface(fWPAGlobal, ++ interfaceName); ++ if (interface == NULL) { ++ wpa_interface interfaceOptions; ++ memset(&interfaceOptions, 0, sizeof(wpa_interface)); ++ ++ interfaceOptions.ifname = interfaceName; ++ ++ interface = wpa_supplicant_add_iface(fWPAGlobal, &interfaceOptions); ++ if (interface == NULL) ++ return B_NO_MEMORY; ++ } else { ++ // Disable everything ++ wpa_supplicant_disable_network(interface, NULL); ++ ++ // Try to remove any existing network ++ while (true) { ++ wpa_ssid *network = wpa_config_get_network(interface->conf, 0); ++ if (network == NULL) ++ break; ++ ++ wpas_notify_network_removed(interface, network); ++ wpa_config_remove_network(interface->conf, network->id); ++ } ++ } ++ ++ const char *networkName = NULL; ++ status = message->FindString("name", &networkName); ++ if (status != B_OK) ++ return status; ++ ++ uint32 authMode = B_NETWORK_AUTHENTICATION_NONE; ++ status = message->FindUInt32("authentication", &authMode); ++ if (status != B_OK) ++ return status; ++ ++ const char *password = NULL; ++ if (authMode > B_NETWORK_AUTHENTICATION_NONE) { ++ status = message->FindString("password", &password); ++ if (status != B_OK) ++ return status; ++ } ++ ++ wpa_ssid *network = wpa_config_add_network(interface->conf); ++ if (network == NULL) ++ return B_NO_MEMORY; ++ ++ wpas_notify_network_added(interface, network); ++ ++ network->disabled = 1; ++ wpa_config_set_network_defaults(network); ++ ++ // Fill in the info from the join request ++ ++ // The format includes the quotes ++ BString value; ++ value = "\""; ++ value += networkName; ++ value += "\""; ++ int result = wpa_config_set(network, "ssid", value.String(), 0); ++ ++ if (result == 0) ++ result = wpa_config_set(network, "scan_ssid", "1", 1); ++ ++ if (authMode >= B_NETWORK_AUTHENTICATION_WPA) { ++ if (result == 0) ++ result = wpa_config_set(network, "proto", "WPA RSN", 2); ++ if (result == 0) ++ result = wpa_config_set(network, "key_mgmt", "WPA-PSK", 3); ++ if (result == 0) ++ result = wpa_config_set(network, "pairwise", "CCMP TKIP NONE", 4); ++ if (result == 0) { ++ result = wpa_config_set(network, "group", ++ "CCMP TKIP WEP104 WEP40", 5); ++ } ++ } else { ++ // Open or WEP. ++ if (result == 0) ++ result = wpa_config_set(network, "key_mgmt", "NONE", 6); ++ } ++ ++ if (result == 0) { ++ if (authMode == B_NETWORK_AUTHENTICATION_WEP) { ++ if (strncmp("0x", password, 2) == 0) { ++ // interpret as hex key ++ // TODO: make this non-ambiguous ++ result = wpa_config_set(network, "wep_key0", password + 2, 7); ++ } else { ++ value = "\""; ++ value += password; ++ value += "\""; ++ result = wpa_config_set(network, "wep_key0", value.String(), 8); ++ } ++ ++ if (result == 0) ++ result = wpa_config_set(network, "wep_tx_keyidx", "0", 9); ++ } else if (authMode >= B_NETWORK_AUTHENTICATION_WPA) { ++ // WPA/WPA2 ++ value = "\""; ++ value += password; ++ value += "\""; ++ result = wpa_config_set(network, "psk", value.String(), 10); ++ ++ if (result == 0) { ++ // We need to actually "apply" the PSK ++ wpa_config_update_psk(network); ++ } ++ } ++ ++ if (result != 0) { ++ // The key format is invalid, we need to ask for another password. ++ BMessage newJoinRequest = *message; ++ newJoinRequest.RemoveName("password"); ++ newJoinRequest.AddString("error", "Password format invalid"); ++ newJoinRequest.AddBool("forceDialog", true); ++ PostMessage(&newJoinRequest); ++ } ++ } ++ ++ if (result != 0) { ++ wpas_notify_network_removed(interface, network); ++ wpa_config_remove_network(interface->conf, network->id); ++ return B_ERROR; ++ } ++ ++ // Set up watching for the completion event ++ _StartWatchingInterfaceChanges(interface, _InterfaceStateChangeCallback, ++ message); ++ ++ // Now attempt to connect ++ wpa_supplicant_select_network(interface, network); ++ ++ // Use a message runner to return a timeout and stop watching after a while ++ BMessage timeout(kMsgJoinTimeout); ++ timeout.AddPointer("interface", interface); ++ ++ BMessageRunner::StartSending(be_app_messenger, &timeout, ++ 15 * 1000 * 1000, 1); ++ // Note that we don't need to cancel this. If joining works before the ++ // timeout happens, it will take the StateChangeWatchingEntry with it ++ // and the timeout message won't match anything and be discarded. ++ ++ return B_OK; ++} ++ ++ ++status_t ++WPASupplicantApp::_LeaveNetwork(BMessage *message) ++{ ++ const char *interfaceName = NULL; ++ status_t status = message->FindString("device", &interfaceName); ++ if (status != B_OK) ++ return status; ++ ++ wpa_supplicant *interface = wpa_supplicant_get_iface(fWPAGlobal, ++ interfaceName); ++ if (interface == NULL) ++ return B_ENTRY_NOT_FOUND; ++ ++ if (wpa_supplicant_remove_iface(fWPAGlobal, interface, 0) != 0) ++ return B_ERROR; ++ ++ return B_OK; ++} ++ ++ ++status_t ++WPASupplicantApp::_NotifyNetworkEvent(BMessage *message) ++{ ++ // Verify that the interface is still there. ++ BString interfaceName; ++ if (message->FindString("interface", &interfaceName) != B_OK) ++ return B_ERROR; ++ ++ interfaceName.Prepend("/dev/"); ++ wpa_supplicant *interface = wpa_supplicant_get_iface(fWPAGlobal, ++ interfaceName.String()); ++ if (interface == NULL) ++ return B_ENTRY_NOT_FOUND; ++ ++ void (*callback)(void *context, void *data, int opcode) = NULL; ++ status_t result = message->FindPointer("callback", (void **)&callback); ++ if (result != B_OK) ++ return result; ++ ++ void *context = NULL; ++ result = message->FindPointer("context", &context); ++ if (result != B_OK) ++ return result; ++ ++ void *data = NULL; ++ message->FindPointer("data", &data); ++ ++ callback(context, data, message->FindInt32("opcode")); ++ return B_OK; ++} ++ ++ ++void ++WPASupplicantApp::_SuccessfullyJoined(const wpa_supplicant *interface, ++ const BMessage &joinRequest) ++{ ++ // We successfully connected with this configuration, store the config, ++ // if requested, by adding a persistent network on the network device. ++ if (!joinRequest.FindBool("persistent")) ++ return; ++ ++ wpa_ssid *networkConfig = interface->current_ssid; ++ if (networkConfig == NULL) ++ return; ++ ++ wireless_network network; ++ memset(network.name, 0, sizeof(network.name)); ++ memcpy(network.name, networkConfig->ssid, ++ min_c(sizeof(network.name), networkConfig->ssid_len)); ++ ++ //network.address.SetToLinkLevel((uint8 *)interface->bssid, ETH_ALEN); ++ // TODO: Decide if we want to do this, it limits the network to ++ // a specific base station instead of a "service set" that might ++ // consist of more than one base station. On the other hand it makes ++ // the network unique so the right one is connected in case of name ++ // conflicts. It should probably be used as a hint, as in "preferred" ++ // base station. ++ ++ if (joinRequest.FindUInt32("authentication", ++ &network.authentication_mode) != B_OK) { ++ return; ++ } ++ ++ if (network.authentication_mode > B_NETWORK_AUTHENTICATION_NONE) { ++ const char *password = NULL; ++ if (joinRequest.FindString("password", &password) != B_OK) ++ return; ++ ++ BString networkName(network.name, sizeof(network.name)); ++ BPasswordKey key(password, B_KEY_PURPOSE_NETWORK, networkName); ++ ++ BKeyStore keyStore; ++ keyStore.AddKeyring(kWPASupplicantKeyring); ++ keyStore.AddKey(kWPASupplicantKeyring, key); ++ } ++ ++ switch (interface->pairwise_cipher) { ++ case WPA_CIPHER_NONE: ++ network.cipher = B_NETWORK_CIPHER_NONE; ++ break; ++ case WPA_CIPHER_TKIP: ++ network.cipher = B_NETWORK_CIPHER_TKIP; ++ break; ++ case WPA_CIPHER_CCMP: ++ network.cipher = B_NETWORK_CIPHER_CCMP; ++ break; ++ } ++ ++ switch (interface->group_cipher) { ++ case WPA_CIPHER_NONE: ++ network.group_cipher = B_NETWORK_CIPHER_NONE; ++ break; ++ case WPA_CIPHER_WEP40: ++ network.group_cipher = B_NETWORK_CIPHER_WEP_40; ++ break; ++ case WPA_CIPHER_WEP104: ++ network.group_cipher = B_NETWORK_CIPHER_WEP_104; ++ break; ++ case WPA_CIPHER_TKIP: ++ network.group_cipher = B_NETWORK_CIPHER_TKIP; ++ break; ++ case WPA_CIPHER_CCMP: ++ network.group_cipher = B_NETWORK_CIPHER_CCMP; ++ break; ++ } ++ ++ switch (interface->key_mgmt) { ++ case WPA_KEY_MGMT_IEEE8021X: ++ network.key_mode = B_KEY_MODE_IEEE802_1X; ++ break; ++ case WPA_KEY_MGMT_PSK: ++ network.key_mode = B_KEY_MODE_PSK; ++ break; ++ case WPA_KEY_MGMT_NONE: ++ network.key_mode = B_KEY_MODE_NONE; ++ break; ++ case WPA_KEY_MGMT_FT_IEEE8021X: ++ network.key_mode = B_KEY_MODE_FT_IEEE802_1X; ++ break; ++ case WPA_KEY_MGMT_FT_PSK: ++ network.key_mode = B_KEY_MODE_FT_PSK; ++ break; ++ case WPA_KEY_MGMT_IEEE8021X_SHA256: ++ network.key_mode = B_KEY_MODE_IEEE802_1X_SHA256; ++ break; ++ case WPA_KEY_MGMT_PSK_SHA256: ++ network.key_mode = B_KEY_MODE_PSK_SHA256; ++ break; ++ } ++ ++ BNetworkRoster::Default().AddPersistentNetwork(network); ++} ++ ++ ++void ++WPASupplicantApp::_FailedToJoin(const wpa_supplicant *interface, ++ const BMessage &joinRequest) ++{ ++ BMessage leaveRequest = joinRequest; ++ leaveRequest.what = kMsgWPALeaveNetwork; ++ be_app->PostMessage(&leaveRequest); ++ ++ BMessage newJoinRequest = joinRequest; ++ newJoinRequest.AddString("error", "Failed to join network"); ++ newJoinRequest.AddBool("forceDialog", true); ++ be_app->PostMessage(&newJoinRequest); ++} ++ ++ ++bool ++WPASupplicantApp::_InterfaceStateChangeCallback(const wpa_supplicant *interface, ++ BMessage *message, void *data) ++{ ++ // We wait for the completion state notification ++ // TODO: We should also use the disconnect as an error case when joining, ++ // but due to the event queue being serialized any disconnect happening ++ // due to a new connect attempt would trigger that state. Either we need ++ // to have the disconnect happen synchronously before joining again or ++ // we need a way to discern one disconnect from the other, for example if ++ // there was a way to tell from which network we disconnected. ++ ++ BMessage *originalMessage = (BMessage *)data; ++ ++ int32 newState; ++ status_t result = B_ERROR; ++ if (message->what == kMsgJoinTimeout) { ++ _FailedToJoin(interface, *originalMessage); ++ result = B_TIMED_OUT; ++ } else if (message->FindInt32("newState", &newState) == B_OK) { ++ switch (newState) { ++ case WPA_COMPLETED: ++ { ++ if (originalMessage->what != kMsgWPAJoinNetwork) ++ return false; ++ ++ _SuccessfullyJoined(interface, *originalMessage); ++ result = B_OK; ++ break; ++ } ++ ++ case WPA_DISCONNECTED: ++ { ++ if (originalMessage->what != kMsgWPALeaveNetwork) ++ return false; ++ ++ result = B_OK; ++ break; ++ } ++ ++ default: ++ return false; ++ } ++ } ++ ++ _SendReplyIfNeeded(*originalMessage, result); ++ delete originalMessage; ++ return true; ++} ++ ++ ++status_t ++WPASupplicantApp::_StartWatchingInterfaceChanges( ++ const wpa_supplicant *interface, StateChangeCallback callback, void *data) ++{ ++ StateChangeWatchingEntry *entry ++ = new(std::nothrow) StateChangeWatchingEntry(interface, callback, data); ++ if (entry == NULL) ++ return B_NO_MEMORY; ++ ++ if (!fWatchingEntryListLocker.Lock()) { ++ delete entry; ++ return B_ERROR; ++ } ++ ++ status_t result = B_OK; ++ if (!fWatchingEntryList.AddItem(entry)) { ++ result = B_ERROR; ++ delete entry; ++ } ++ ++ fWatchingEntryListLocker.Unlock(); ++ return result; ++} ++ ++ ++void ++WPASupplicantApp::_NotifyInterfaceStateChanged(BMessage *message) ++{ ++ const wpa_supplicant *interface; ++ if (message->FindPointer("interface", (void **)&interface) != B_OK) ++ return; ++ ++ if (!fWatchingEntryListLocker.Lock()) ++ return; ++ ++ for (int32 i = 0; i < fWatchingEntryList.CountItems(); i++) { ++ StateChangeWatchingEntry *entry = fWatchingEntryList.ItemAt(i); ++ if (entry->MessageReceived(interface, message)) { ++ delete fWatchingEntryList.RemoveItemAt(i); ++ i--; ++ } ++ } ++ ++ fWatchingEntryListLocker.Unlock(); ++} ++ ++ ++void ++WPASupplicantApp::_SendReplyIfNeeded(BMessage &message, status_t status) ++{ ++ if (!message.IsSourceWaiting()) ++ return; ++ ++ BMessage reply; ++ reply.AddInt32("status", status); ++ message.SendReply(&reply); ++} ++ ++ ++int ++main(int argc, char *argv[]) ++{ ++ WPASupplicantApp *app = new(std::nothrow) WPASupplicantApp(); ++ if (app == NULL) ++ return B_NO_MEMORY; ++ if (app->InitCheck() != B_OK) ++ return app->InitCheck(); ++ ++ app->Run(); ++ delete app; ++ return 0; ++} +diff --git a/wpa_supplicant/notify.c wpa_supplicant-2.0/wpa_supplicant/notify.c +index 9251f62..43a4263 100644 +--- a/wpa_supplicant/notify.c ++++ wpa_supplicant-2.0/wpa_supplicant/notify.c +@@ -23,6 +23,10 @@ + #include "sme.h" + #include "notify.h" + ++#ifdef __HAIKU__ ++#include "notify_haiku.h" ++#endif ++ + int wpas_notify_supplicant_initialized(struct wpa_global *global) + { + #ifdef CONFIG_DBUS +@@ -79,6 +83,10 @@ void wpas_notify_state_changed(struct wpa_supplicant *wpa_s, + /* notify the new DBus API */ + wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_STATE); + ++#ifdef __HAIKU__ ++ wpa_supplicant_haiku_notify_state_change(wpa_s, new_state, old_state); ++#endif ++ + #ifdef CONFIG_P2P + if (new_state == WPA_COMPLETED) + wpas_p2p_notif_connected(wpa_s); +diff --git a/wpa_supplicant/notify_haiku.cpp wpa_supplicant-2.0/wpa_supplicant/notify_haiku.cpp +new file mode 100644 +index 0000000..abc63e0 +--- /dev/null ++++ wpa_supplicant-2.0/wpa_supplicant/notify_haiku.cpp +@@ -0,0 +1,37 @@ ++/* ++ * WPA Supplicant / Haiku notification functions ++ * Copyright (c) 2011, Michael Lotz ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Alternatively, this software may be distributed under the terms of BSD ++ * license. ++ * ++ * See README and COPYING for more details. ++ */ ++ ++extern "C" { ++#include "utils/includes.h" ++#include "utils/common.h" ++#include "common/defs.h" ++#include "config.h" ++ ++#include "notify_haiku.h" ++} ++ ++#include ++#include ++ ++ ++void ++wpa_supplicant_haiku_notify_state_change(struct wpa_supplicant *wpa_s, ++ enum wpa_states new_state, enum wpa_states old_state) ++{ ++ BMessage message(kMsgSupplicantStateChanged); ++ message.AddPointer("interface", wpa_s); ++ message.AddInt32("oldState", old_state); ++ message.AddInt32("newState", new_state); ++ be_app->PostMessage(&message); ++} +diff --git a/wpa_supplicant/notify_haiku.h wpa_supplicant-2.0/wpa_supplicant/notify_haiku.h +new file mode 100644 +index 0000000..db1a61c +--- /dev/null ++++ wpa_supplicant-2.0/wpa_supplicant/notify_haiku.h +@@ -0,0 +1,26 @@ ++/* ++ * WPA Supplicant / Haiku notification functions ++ * Copyright (c) 2011, Michael Lotz ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Alternatively, this software may be distributed under the terms of BSD ++ * license. ++ * ++ * See README and COPYING for more details. ++ */ ++ ++#ifndef NOTIFY_HAIKU_H ++#define NOTIFY_HAIKU_H ++ ++static const uint32_t kMsgSupplicantStateChanged = 'stch'; ++ ++struct wpa_supplicant; ++enum wpa_states; ++ ++void wpa_supplicant_haiku_notify_state_change(struct wpa_supplicant *wpa_s, ++ enum wpa_states new_state, enum wpa_states old_state); ++ ++#endif +diff --git a/wpa_supplicant/wpa_supplicant.c wpa_supplicant-2.0/wpa_supplicant/wpa_supplicant.c +index 0fb4d0f..61c0811 100644 +--- a/wpa_supplicant/wpa_supplicant.c ++++ wpa_supplicant-2.0/wpa_supplicant/wpa_supplicant.c +@@ -655,8 +655,8 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s, + wpa_supplicant_notify_scanning(wpa_s, 0); + + if (state == WPA_COMPLETED && wpa_s->new_connection) { +-#if defined(CONFIG_CTRL_IFACE) || !defined(CONFIG_NO_STDOUT_DEBUG) + struct wpa_ssid *ssid = wpa_s->current_ssid; ++#if defined(CONFIG_CTRL_IFACE) || !defined(CONFIG_NO_STDOUT_DEBUG) + wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_CONNECTED "- Connection to " + MACSTR " completed [id=%d id_str=%s]", + MAC2STR(wpa_s->bssid), +diff --git a/wpa_supplicant/wpa_supplicant.rdef wpa_supplicant-2.0/wpa_supplicant/wpa_supplicant.rdef +new file mode 100644 +index 0000000..0766b97 +--- /dev/null ++++ wpa_supplicant-2.0/wpa_supplicant/wpa_supplicant.rdef +@@ -0,0 +1,15 @@ ++resource app_signature "application/x-vnd.malinen-wpa_supplicant"; ++ ++resource app_flags B_EXCLUSIVE_LAUNCH | B_BACKGROUND_APP; ++ ++resource app_version { ++ major = 2, ++ middle = 0, ++ minor = 0, ++ ++ variety = B_APPV_DEVELOPMENT, ++ internal = 0, ++ ++ short_info = "wpa_supplicant", ++ long_info = "wpa_supplicant © 2003-2012, Jouni Malinen " ++}; diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.bep b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.bep new file mode 100644 index 000000000..e99053fc4 --- /dev/null +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.bep @@ -0,0 +1,19 @@ +DESCRIPTION="A WPA Supplicant with support for WPA and WPA2." +HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" +SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-2.0.tar.gz" +CHECKSUM_MD5="3be2ebfdcced52e00eda0afe2889839d" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd wpa_supplicant-2.0/wpa_supplicant + CFLAGS="-MMD -O2 -Wall" make wpa_supplicant +} +INSTALL { + cd wpa_supplicant-2.0/wpa_supplicant + mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` + cp -v wpa_supplicant ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/ +} +LICENSE="BSD (2-clause) + GNU GPL v2" +COPYRIGHT="2003-2012 Jouni Malinen" From f271a239d3f654566e600a4656e38a6688cd2cef Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 22 Apr 2013 22:41:29 +0200 Subject: [PATCH 106/587] Rename wpa_supplicant-2.0.bep to *.recipe --- .../{wpa_supplicant-2.0.bep => wpa_supplicant-2.0.recipe} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename net-wireless/wpa_supplicant/{wpa_supplicant-2.0.bep => wpa_supplicant-2.0.recipe} (100%) diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.bep b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe similarity index 100% rename from net-wireless/wpa_supplicant/wpa_supplicant-2.0.bep rename to net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe From 68ea76c1c765bccb3f0431c67cef57ca3bec4aec Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 22 Apr 2013 22:49:39 +0200 Subject: [PATCH 107/587] Convert wpa_suplicant-2.0 recipe to an actual recipe Also adjust the patch to use the correct private Haiku header directories. Doesn't build yet, since it requires newer Haiku API. --- .../patches/wpa_supplicant-2.0.patch | 6 +-- .../wpa_supplicant/wpa_supplicant-2.0.recipe | 51 ++++++++++++++----- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch b/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch index d2fa387d9..e6d7dea3b 100644 --- a/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch +++ b/net-wireless/wpa_supplicant/patches/wpa_supplicant-2.0.patch @@ -829,9 +829,9 @@ index 0000000..7d73f13 +LIBS += -L/boot/common/lib + +# for private Haiku headers -+CFLAGS += -I/Source/haiku/git/haiku/src/libs/compat/freebsd_network/compat -+CFLAGS += -I/Source/haiku/git/haiku/src/libs/compat/freebsd_wlan -+CFLAGS += -I/Source/haiku/git/haiku/headers/private/net ++CFLAGS += -I/system/develop/headers/private/libs/compat/freebsd_network/compat ++CFLAGS += -I/system/develop/headers/private/libs/compat/freebsd_wlan ++CFLAGS += -I/system/develop/headers/private/net +CFLAGS += -Wno-multichar + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe index e99053fc4..e5f6fe587 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe @@ -1,19 +1,44 @@ -DESCRIPTION="A WPA Supplicant with support for WPA and WPA2." +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-2.0.tar.gz" CHECKSUM_MD5="3be2ebfdcced52e00eda0afe2889839d" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd wpa_supplicant-2.0/wpa_supplicant +LICENSE=" + BSD (2-clause) + GNU GPL v2 + " +COPYRIGHT="2003-2012 Jouni Malinen" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="wpa_supplicant-2.0.patch" + +PROVIDES=" + wpa_supplicant = $portVersion compat >= 2 + " +REQUIRES=" + haiku >= $haikuVersion + openssl >= 1.0.0 + " +BUILD_REQUIRES=" + cmd:gcc + cmd:ld + cmd:make + openssl >= 1.0.0 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName/wpa_supplicant" + +BUILD() +{ CFLAGS="-MMD -O2 -Wall" make wpa_supplicant } -INSTALL { - cd wpa_supplicant-2.0/wpa_supplicant - mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` - cp -v wpa_supplicant ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/ + +INSTALL() +{ + mkdir -p $binDir + cp -v wpa_supplicant $binDir } -LICENSE="BSD (2-clause) - GNU GPL v2" -COPYRIGHT="2003-2012 Jouni Malinen" From e8f0489003a9ffaf7180e6721bc39ace37fa38ec Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 23 Apr 2013 14:11:39 +0200 Subject: [PATCH 108/587] Adjust libtool requirements to make it usable again * with the current set of packages, libtool could no longer be used for building, as its requirement on automake-1.11 could not be provided. --- sys-devel/libtool/libtool-2.4.recipe | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index b5306ea85..2ddf69215 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -6,7 +6,7 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/libtool" SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz" CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -18,15 +18,15 @@ PROVIDES=" " REQUIRES=" haiku >= $haikuVersion - cmd:aclocal >= 1.11 - cmd:automake >= 1.11 + cmd:aclocal + cmd:automake cmd:sed cmd:tar " BUILD_REQUIRES=" - cmd:autoconf >= 2.60 - cmd:aclocal >= 1.11 - cmd:autoheader >= 2.60 + cmd:autoconf >= 2.62 + cmd:aclocal >= 1.13 + cmd:autoheader >= 2.62 cmd:sed " BUILD_PREREQUIRES=" From 5c158f51939869bf83c9d6423218885bad8170b5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 23 Apr 2013 20:52:36 +0200 Subject: [PATCH 109/587] Make p7zip 9.13 an 9.20.1 recipes actual recipes Remove 9.04 recipe and patch. --- app-arch/p7zip/p7zip-9.04.recipe | 25 ----- app-arch/p7zip/p7zip-9.13.recipe | 41 ++++--- app-arch/p7zip/p7zip-9.20.1.recipe | 41 ++++--- app-arch/p7zip/patches/p7zip-9.04.patch | 137 ------------------------ 4 files changed, 58 insertions(+), 186 deletions(-) delete mode 100644 app-arch/p7zip/p7zip-9.04.recipe delete mode 100644 app-arch/p7zip/patches/p7zip-9.04.patch diff --git a/app-arch/p7zip/p7zip-9.04.recipe b/app-arch/p7zip/p7zip-9.04.recipe deleted file mode 100644 index f679f10b0..000000000 --- a/app-arch/p7zip/p7zip-9.04.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="p7zip" -HOMEPAGE="http://p7zip.sourceforge.net" -SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.04/p7zip_9.04_src_all.tar.bz2?use_mirror=cdnetworks-us-2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="9194ebf9a2b3735d236aed001de5f6f8" -BUILD() -{ - cd p7zip_9.04 - cp makefile.beos makefile.machine - make -} - -INSTALL() -{ - cd p7zip_9.04 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - make install DEST_DIR=${DESTDIR} \ - DEST_HOME=`finddir B_COMMON_DIRECTORY` \ - DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \ - DEST_MAN=$COMMON_DOCS/man -} -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1999-2009 7-Zip Igor Pavlov." diff --git a/app-arch/p7zip/p7zip-9.13.recipe b/app-arch/p7zip/p7zip-9.13.recipe index 7fc9cdc99..89d854d39 100644 --- a/app-arch/p7zip/p7zip-9.13.recipe +++ b/app-arch/p7zip/p7zip-9.13.recipe @@ -1,24 +1,41 @@ -DESCRIPTION="p7zip" +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." HOMEPAGE="http://p7zip.sourceforge.net" SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.13/p7zip_9.13_src_all.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="8ddb5053db3b1f2696407d01be145779" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1999-2010 7-Zip Igor Pavlov." +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="p7zip-9.13.patch" + +PROVIDES=" + p7zip = $portVersion + cmd:7za = $portVersion compat >= 9 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:ld + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="p7zip_9.13" + BUILD() { - cd p7zip_9.13 cp makefile.haiku makefile.machine make } INSTALL() { - cd p7zip_9.13 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \ - DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \ - DEST_MAN=$COMMON_DOCS/man + make install DEST_DIR=$prefix DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \ + DEST_MAN=$manDir } -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1999-2010 7-Zip Igor Pavlov." diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe index 2c45ea1fb..eff191d12 100644 --- a/app-arch/p7zip/p7zip-9.20.1.recipe +++ b/app-arch/p7zip/p7zip-9.20.1.recipe @@ -1,24 +1,41 @@ -DESCRIPTION="p7zip" +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." 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" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1999-2011 7-Zip Igor Pavlov." +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="p7zip-9.20.1.patch" + +PROVIDES=" + p7zip = $portVersion + cmd:7za = $portVersion compat >= 9 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:ld + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="p7zip_9.20.1" + BUILD() { - cd p7zip_9.20.1 cp makefile.haiku makefile.machine make } INSTALL() { - cd p7zip_9.20.1 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \ - DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \ - DEST_MAN=$COMMON_DOCS/man + make install DEST_DIR=$prefix DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \ + DEST_MAN=$manDir } -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1999-2011 7-Zip Igor Pavlov." diff --git a/app-arch/p7zip/patches/p7zip-9.04.patch b/app-arch/p7zip/patches/p7zip-9.04.patch deleted file mode 100644 index 7fb6cac22..000000000 --- a/app-arch/p7zip/patches/p7zip-9.04.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -up p7zip_9.04/install.sh.orig p7zip_9.04/install.sh ---- p7zip_9.04/install.sh.orig 2010-04-23 23:59:47.153092096 -0600 -+++ p7zip_9.04/install.sh 2010-04-24 00:00:57.560201728 -0600 -@@ -56,10 +56,10 @@ then - cp bin/7za "${DEST_DIR}${DEST_SHARE}/7za" - chmod 777 "${DEST_DIR}${DEST_SHARE}/7za" - strip "${DEST_DIR}${DEST_SHARE}/7za" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7za" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7za" - echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7za" - echo "\"${DEST_SHARE}/7za\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7za" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7za" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7za" - fi - - if [ -x bin/7zr ] -@@ -68,10 +68,10 @@ then - cp bin/7zr "${DEST_DIR}${DEST_SHARE}/7zr" - chmod 777 "${DEST_DIR}${DEST_SHARE}/7zr" - strip "${DEST_DIR}${DEST_SHARE}/7zr" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7zr" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7zr" - echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7zr" - echo "\"${DEST_SHARE}/7zr\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7zr" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7zr" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7zr" - fi - - if [ -x bin/7zCon.sfx ] -@@ -80,7 +80,7 @@ then - cp bin/7zCon.sfx "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" - chmod 777 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" - strip "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" - fi - - if [ -x bin/7z ] -@@ -89,14 +89,14 @@ then - cp bin/7z "${DEST_DIR}${DEST_SHARE}/7z" - chmod 777 "${DEST_DIR}${DEST_SHARE}/7z" - strip "${DEST_DIR}${DEST_SHARE}/7z" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7z" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7z" - cp -r bin/Codecs "${DEST_DIR}${DEST_SHARE}/" -- chmod 555 "${DEST_DIR}${DEST_SHARE}"/*/* -+ chmod 755 "${DEST_DIR}${DEST_SHARE}"/*/* - cp bin/7z.so "${DEST_DIR}${DEST_SHARE}/7z.so" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7z.so" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7z.so" - echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7z" - echo "\"${DEST_SHARE}/7z\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7z" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7z" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7z" - fi - - else -@@ -105,7 +105,7 @@ else - echo "- installing ${DEST_DIR}${DEST_BIN}/7za" - mkdir -p "${DEST_DIR}${DEST_BIN}" - cp bin/7za "${DEST_DIR}${DEST_BIN}/7za" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7za" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7za" - fi - - if [ -x bin/7zr ] -@@ -113,7 +113,7 @@ else - echo "- installing ${DEST_DIR}${DEST_BIN}/7zr" - mkdir -p "${DEST_DIR}${DEST_BIN}" - cp bin/7zr "${DEST_DIR}${DEST_BIN}/7zr" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7zr" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7zr" - fi - fi - -@@ -122,27 +122,27 @@ if [ -d DOCS ] - then - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" - sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1" - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1" - sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1" - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1" - sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" - else - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" - grep -v "{DEST_SHARE_DOC}" man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1" - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1" - grep -v "{DEST_SHARE_DOC}" man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1" - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1" - grep -v "{DEST_SHARE_DOC}" man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" - fi - - if [ -f README ] -@@ -150,7 +150,7 @@ then - echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/README" - mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" - cp README "${DEST_DIR}${DEST_SHARE_DOC}/README" -- chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/README" -+ chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/README" - fi - - if [ -f ChangeLog ] -@@ -158,7 +158,7 @@ then - echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" - mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" - cp ChangeLog "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" -- chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" -+ chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" - fi - - if [ -d DOCS ] -@@ -166,7 +166,7 @@ then - echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS" - mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" - cp -r DOCS "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -- find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 555 {} \; -- find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 444 {} \; -+ find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 755 {} \; -+ find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 644 {} \; - fi - From 428759c8317214bfa4b4ee15635ed5a34ce8bdba Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 23 Apr 2013 23:04:59 +0200 Subject: [PATCH 110/587] Convert groff recipe to actual recipe --- sys-apps/groff/groff-1.20.1.recipe | 87 ++++++++++++++++++++++++------ 1 file changed, 72 insertions(+), 15 deletions(-) diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe index 5fe7f0c9c..345512d71 100644 --- a/sys-apps/groff/groff-1.20.1.recipe +++ b/sys-apps/groff/groff-1.20.1.recipe @@ -1,36 +1,93 @@ -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/" +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." +HOMEPAGE="http://www.gnu.org/software/groff/" SRC_URI="http://ftp.gnu.org/gnu/groff/groff-1.20.1.tar.gz" CHECKSUM_MD5="48fa768dd6fdeb7968041dd5ae8e2b02" +LICENSE="GNU GPL v3" +COPYRIGHT="2003-2009 Free Software Foundation, Inc." REVISION="1" -STATUS_HAIKU="stable" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + groff = $portVersion compat >= 1.20 + cmd:addftinfo = $portVersion compat >= 1.20 + cmd:afmtodit = $portVersion compat >= 1.20 + cmd:chem = $portVersion compat >= 1.20 + cmd:eqn = $portVersion compat >= 1.20 + cmd:eqn2graph = $portVersion compat >= 1.20 + cmd:gdiffmk = $portVersion compat >= 1.20 + cmd:grap2graph = $portVersion compat >= 1.20 + cmd:grn = $portVersion compat >= 1.20 + cmd:grodvi = $portVersion compat >= 1.20 + cmd:groff = $portVersion compat >= 1.20 + cmd:groffer = $portVersion compat >= 1.20 + cmd:grog = $portVersion compat >= 1.20 + cmd:grolbp = $portVersion compat >= 1.20 + cmd:grolj4 = $portVersion compat >= 1.20 + cmd:grops = $portVersion compat >= 1.20 + cmd:grotty = $portVersion compat >= 1.20 + cmd:hpftodit = $portVersion compat >= 1.20 + cmd:indxbib = $portVersion compat >= 1.20 + cmd:lkbib = $portVersion compat >= 1.20 + cmd:lookbib = $portVersion compat >= 1.20 + cmd:mmroff = $portVersion compat >= 1.20 + cmd:neqn = $portVersion compat >= 1.20 + cmd:nroff = $portVersion compat >= 1.20 + cmd:pdfroff = $portVersion compat >= 1.20 + cmd:pfbtops = $portVersion compat >= 1.20 + cmd:pic = $portVersion compat >= 1.20 + cmd:pic2graph = $portVersion compat >= 1.20 + cmd:post_grohtml = $portVersion compat >= 1.20 + cmd:pre_grohtml = $portVersion compat >= 1.20 + cmd:preconv = $portVersion compat >= 1.20 + cmd:refer = $portVersion compat >= 1.20 + cmd:roff2dvi = $portVersion compat >= 1.20 + cmd:roff2html = $portVersion compat >= 1.20 + cmd:roff2pdf = $portVersion compat >= 1.20 + cmd:roff2ps = $portVersion compat >= 1.20 + cmd:roff2text = $portVersion compat >= 1.20 + cmd:roff2x = $portVersion compat >= 1.20 + cmd:soelim = $portVersion compat >= 1.20 + cmd:tbl = $portVersion compat >= 1.20 + cmd:tfmtodit = $portVersion compat >= 1.20 + cmd:troff = $portVersion compat >= 1.20 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + DEPEND="" BUILD() { - cd groff-1.20.1 libtoolize --force --copy --install aclocal -I m4 autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - sed -i 's/docdir=$(datadir)\/doc\/groff\//docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/doc\/groff/g' Ma* - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=$COMMON_DOCS/info \ - --mandir=$COMMON_DOCS/man + sed -i s@docdir='$(datadir)/doc/groff/'@docdir=$docDir/@g Ma* + ./configure $configureDirArgs make } INSTALL() { - cd groff-1.20.1 make install + rm $prefix/lib/charset.alias } TEST() { - cd groff-1.20.1 make check } - -LICENSE="GNU GPL v3" -COPYRIGHT="2003-2009 Free Software Foundation, Inc." From c849f5886d72320021434fd31688441b4b1a0513 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 24 Apr 2013 00:20:27 +0200 Subject: [PATCH 111/587] Update libtool-2.4 recipe to work with autoconf-1.13 * liberate requirement on automake from 1.11 to generic, as there's hope that any automake equal or newer than 1.11 will do * add patch for removing dependency to help2man which is being invoked to regenerate the manpages, which won't work and has become an error with automake-1.13 * move patches for 2.4 into a corresponding subfolder * explictly list patches --- sys-devel/libtool/libtool-2.4.recipe | 7 +++++- .../adjust_config_for_packaging.patch} | 2 ++ .../2.4/remove_help2man_dependency.patch | 24 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) rename sys-devel/libtool/patches/{libtool-2.4.patch => 2.4/adjust_config_for_packaging.patch} (93%) create mode 100644 sys-devel/libtool/patches/2.4/remove_help2man_dependency.patch diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index 2ddf69215..3cd499b72 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -9,6 +9,11 @@ CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" +PATCHES=" + 2.4/adjust_config_for_packaging.patch + 2.4/remove_help2man_dependency.patch + " + PROVIDES=" libtool = $portVersion compat >= 2.4 cmd:libtool = $portVersion compat >= 2.4 @@ -25,7 +30,7 @@ REQUIRES=" " BUILD_REQUIRES=" cmd:autoconf >= 2.62 - cmd:aclocal >= 1.13 + cmd:aclocal cmd:autoheader >= 2.62 cmd:sed " diff --git a/sys-devel/libtool/patches/libtool-2.4.patch b/sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch similarity index 93% rename from sys-devel/libtool/patches/libtool-2.4.patch rename to sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch index c0a99595a..e8a419a7f 100644 --- a/sys-devel/libtool/patches/libtool-2.4.patch +++ b/sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch @@ -1,3 +1,5 @@ +Adjust haiku configuration of upstream libtool for packaging. + diff -ur libtool-2.4/libltdl/m4/libtool.m4 libtool-2.4/libltdl/m4/libtool.m4 --- libtool-2.4/libltdl/m4/libtool.m4 2010-09-22 08:41:19.064749568 +0000 +++ libtool-2.4/libltdl/m4/libtool.m4 2011-07-24 16:58:02.885260288 +0000 diff --git a/sys-devel/libtool/patches/2.4/remove_help2man_dependency.patch b/sys-devel/libtool/patches/2.4/remove_help2man_dependency.patch new file mode 100644 index 000000000..de7615273 --- /dev/null +++ b/sys-devel/libtool/patches/2.4/remove_help2man_dependency.patch @@ -0,0 +1,24 @@ +Remove dependency to help2man, which tries to regenerate the manpages. +As the failure to use help2man has become an error with automake-1.13, +we just use the manpages that come with the source. + +diff -ruwN libtool-2.4/Makefile.am libtool-2.4_haiku/Makefile.am +--- libtool-2.4/Makefile.am 2010-09-21 09:07:22.038535168 +0200 ++++ libtool-2.4_haiku/Makefile.am 2013-04-23 23:41:18.886833152 +0200 +@@ -322,16 +322,6 @@ + $(MAKEINFO) --no-headers $(MAKEINFOFLAGS) -o notes.txt notes.texi + + dist_man1_MANS = $(srcdir)/doc/libtool.1 $(srcdir)/doc/libtoolize.1 +-MAINTAINERCLEANFILES += $(dist_man1_MANS) +-update_mans = \ +- PATH=.$(PATH_SEPARATOR)$$PATH; export PATH; \ +- $(HELP2MAN) --output=$@ +-$(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh +- $(update_mans) --help-option=--help-all libtool +-$(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in +- $(update_mans) libtoolize +- +- + ## ------------- ## + ## Installation. ## + ## ------------- ## From 27fd02eaf487dab1d70183902c893cb946da7612 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 24 Apr 2013 15:47:39 +0200 Subject: [PATCH 112/587] Update man 1.6g patch Mostly fixes for using the correct paths for package management, like not using absolute paths for the tools that man invokes, and using the correct man search paths. Displayed man pages contain uninterpreted escape sequences. It works correctly when adding the '-r' option to DEFAULTLESSOPT (or piping to "less -irs"), but the comment for this variable explicitly notes that having to do that hints toward a broken setup. So I didn't do that and we'll see later whether the current Haiku does better. --- sys-apps/man/patches/man-1.6g.patch | 125 ++++++++++++++++++---------- 1 file changed, 83 insertions(+), 42 deletions(-) diff --git a/sys-apps/man/patches/man-1.6g.patch b/sys-apps/man/patches/man-1.6g.patch index e3171b3ca..e80018211 100644 --- a/sys-apps/man/patches/man-1.6g.patch +++ b/sys-apps/man/patches/man-1.6g.patch @@ -1,35 +1,81 @@ -diff -up man-1.6g/configure.orig man-1.6g/configure ---- man-1.6g/configure.orig 2010-12-31 13:28:46.006291456 -0700 -+++ man-1.6g/configure 2012-05-02 21:57:49.683147264 -0600 -@@ -287,6 +287,12 @@ if test -f /xenix; then - esac - fi - -+echo checking for Haiku -+if test `uname` = "Haiku"; then -+ LIBS="$LIBS -L/boot/system/lib -llocale" -+ mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man -+fi -+ - echo checking how to get alloca - echo ' - #ifdef __GNUC__ -diff -up man-1.6g/man2html/Makefile.in.orig man-1.6g/man2html/Makefile.in ---- man-1.6g/man2html/Makefile.in.orig 2010-12-31 13:28:46.010747904 -0700 -+++ man-1.6g/man2html/Makefile.in 2012-05-02 21:58:50.621805568 -0600 -@@ -2,7 +2,7 @@ CC = @CC@ +diff -ur man-1.6g.orig/configure man-1.6g/configure +--- man-1.6g.orig/configure 2010-12-31 21:28:46.004194304 +0100 ++++ man-1.6g/configure 2013-04-24 15:24:06.851968000 +0200 +@@ -411,7 +411,7 @@ + do + if test -f $j/$i + then +- eval F$i=$j/$i ++ eval F$i=$i + break + fi + done +@@ -455,7 +455,7 @@ + do + if test -f $j/$i + then +- eval F$i=$j/$i ++ eval F$i=$i + break + fi + done +@@ -468,7 +468,7 @@ + do + if test -f $j/$i + then +- eval Fg$i=$j/$i ++ eval Fg$i=$i + break + fi + done +@@ -1026,7 +1026,7 @@ + do + if test -f $j/$i + then +- eval F$i=$j/$i ++ eval F$i=$i + if [ x$compress = x ]; then compress=$j/$i; fi + break + fi +@@ -1124,7 +1124,7 @@ + do + if test -f $j/$i + then +- eval F$i=$j/$i ++ eval F$i=$i + break + fi + done +@@ -1368,6 +1368,11 @@ + s,@man_config_file@,$man_config_file, + s,@manpathoption@,$manpathoption, + s/@sections@/$sections/ ++s,@haikuSystemManDir@,`finddir B_SYSTEM_DOCUMENTATION_DIRECTORY`/man, ++s,@haikuCommonManDir@,`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man, ++s,@haikuCommonNonPackagedManDir@,`finddir B_COMMON_NONPACKAGED_DOCUMENTATION_DIRECTORY`/man, ++s,@haikuUserManDir@,`finddir B_USER_DOCUMENTATION_DIRECTORY`/man, ++s,@haikuUserNonPackagedManDir@,`finddir B_USER_NONPACKAGED_DOCUMENTATION_DIRECTORY`/man, + ' $infile.in >> $infile + done + EOS +diff -ur man-1.6g.orig/man2html/Makefile.in man-1.6g/man2html/Makefile.in +--- man-1.6g.orig/man2html/Makefile.in 2010-12-31 21:28:46.008912896 +0100 ++++ man-1.6g/man2html/Makefile.in 2013-04-24 15:25:28.619970560 +0200 +@@ -2,8 +2,8 @@ CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o EXEEXT = @EXEEXT@ -bindir = $(DESTDIR)$(PREFIX)/usr/bin -+bindir = $(DESTDIR)$(PREFIX)/bin - mandir = $(DESTDIR)$(PREFIX)@mandir@ +-mandir = $(DESTDIR)$(PREFIX)@mandir@ ++bindir = $(DESTDIR)@bindir@ ++mandir = $(DESTDIR)@mandir@ vardir = $(DESTDIR)$(PREFIX)/var httpdir = $(DESTDIR)$(PREFIX)/home/httpd -diff -up man-1.6g/src/Makefile.in.orig man-1.6g/src/Makefile.in ---- man-1.6g/src/Makefile.in.orig 2010-12-31 13:28:46.006815744 -0700 -+++ man-1.6g/src/Makefile.in 2012-05-02 21:59:22.845938688 -0600 -@@ -30,6 +30,8 @@ LDFLAGS ?= -s + cgiowner = nobody +diff -ur man-1.6g.orig/src/Makefile.in man-1.6g/src/Makefile.in +--- man-1.6g.orig/src/Makefile.in 2010-12-31 21:28:46.004718592 +0100 ++++ man-1.6g/src/Makefile.in 2013-04-24 13:18:00.114032640 +0200 +@@ -30,6 +30,8 @@ LIBOBJS = @LIBOBJS@ @@ -38,10 +84,10 @@ diff -up man-1.6g/src/Makefile.in.orig man-1.6g/src/Makefile.in all: man$(EXEEXT) man.conf apropos whatis makewhatis MANOBJS = man.o manfile.o manpath.o man-config.o man-getopt.o \ -diff -up man-1.6g/src/man.conf.in.orig man-1.6g/src/man.conf.in ---- man-1.6g/src/man.conf.in.orig 2010-10-25 18:22:24.008388608 -0600 -+++ man-1.6g/src/man.conf.in 2012-05-02 21:57:49.699400192 -0600 -@@ -36,11 +36,14 @@ +diff -ur man-1.6g.orig/src/man.conf.in man-1.6g/src/man.conf.in +--- man-1.6g.orig/src/man.conf.in 2010-10-26 02:22:24.006553600 +0200 ++++ man-1.6g/src/man.conf.in 2013-04-24 14:34:03.149946368 +0200 +@@ -36,11 +36,11 @@ # # Every automatically generated MANPATH includes these fields # @@ -50,18 +96,15 @@ diff -up man-1.6g/src/man.conf.in.orig man-1.6g/src/man.conf.in -MANPATH /usr/local/man -MANPATH /usr/local/share/man -MANPATH /usr/X11R6/man -+MANPATH /boot/common/man -+MANPATH /boot/common/share/man -+MANPATH /boot/home/config/man -+MANPATH /boot/home/config/share/man -+MANPATH /boot/common/*/man -+MANPATH /boot/common/*/share/man -+MANPATH /boot/home/config/*/man -+MANPATH /boot/home/config/*/share/man ++MANPATH @haikuUserNonPackagedManDir@ ++MANPATH @haikuUserManDir@ ++MANPATH @haikuCommonNonPackagedManDir@ ++MANPATH @haikuCommonManDir@ ++MANPATH @haikuSystemManDir@ # # Uncomment if you want to include one of these by default # -@@ -58,15 +61,9 @@ MANPATH /usr/X11R6/man +@@ -58,15 +58,7 @@ # in the mandatory manpath already, but will keep man from statting # lots of other nearby files and directories. # @@ -74,9 +117,7 @@ diff -up man-1.6g/src/man.conf.in.orig man-1.6g/src/man.conf.in -MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man -MANPATH_MAP /usr/bin/X11 /usr/X11R6/man -MANPATH_MAP /usr/bin/mh /usr/share/man -+MANPATH_MAP /bin /boot/common/share/man -+MANPATH_MAP /boot/common/bin /boot/common/share/man -+MANPATH_MAP /boot/home/config/bin /boot/home/config/share/man ++MANPATH_MAP /bin @haikuSystemManDir@ # # NOAUTOPATH keeps man from automatically adding directories that look like # manual page directories to the path. From 98e24ea06555600d4d76c94f01cda598d6bffa0e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 24 Apr 2013 15:58:41 +0200 Subject: [PATCH 113/587] Convert man 1.6g recipe to an actual recipe Due to man needing a config file and our package manager/daemon not supporting any settings file handling one has to manually copy the man.conf from the package to the respective settings directory to make things work. --- sys-apps/man/man-1.6g.recipe | 51 +++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe index 812c21cd4..96f589644 100644 --- a/sys-apps/man/man-1.6g.recipe +++ b/sys-apps/man/man-1.6g.recipe @@ -1,23 +1,54 @@ -DESCRIPTION="Standard commands to read man pages." +SUMMARY="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" +LICENSE="GNU GPL v2" +COPYRIGHT="1989-2012 Free Software Foundation, Inc." REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-apps/groff >= 1.20.1" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="man-1.6g.patch" + +PROVIDES=" + man = $portVersion compat >= 1.6 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:groff + cmd:gunzip + cmd:bzip2 + cmd:zcat + " +BUILD_REQUIRES=" + cmd:groff + cmd:gunzip + cmd:bzip2 + cmd:zcat + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd man-1.6g - ./configure -prefix=`finddir B_COMMON_DIRECTORY` \ - -sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - -confdir=`finddir B_COMMON_SETTINGS_DIRECTORY` + LIBS="-L/boot/system/lib -llocale" \ + groff=/packages/$portVersionedName/cmd:groff/bin/groff \ + ./configure -prefix=$prefix \ + -bindir=$binDir \ + -sbindir=$sbinDir \ + -confdir=$sysconfDir \ + -mandir=$manDir make } INSTALL() { - cd man-1.6g make install } -LICENSE="GNU GPL v2" -COPYRIGHT="1989-2012 Free Software Foundation, Inc." From de97fbcc151388a929b2d12dc9d0c96f99855a25 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 24 Apr 2013 16:01:19 +0200 Subject: [PATCH 114/587] Remove man 1.6f patch and recipe --- sys-apps/man/man-1.6f.recipe | 21 -------- sys-apps/man/patches/man-1.6f.patch | 82 ----------------------------- 2 files changed, 103 deletions(-) delete mode 100644 sys-apps/man/man-1.6f.recipe delete mode 100644 sys-apps/man/patches/man-1.6f.patch diff --git a/sys-apps/man/man-1.6f.recipe b/sys-apps/man/man-1.6f.recipe deleted file mode 100644 index c4797f0fd..000000000 --- a/sys-apps/man/man-1.6f.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Standard commands to read man pages." -HOMEPAGE="http://primates.ximian.com/~flucifredi/man/" -SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6f.tar.gz" -CHECKSUM_MD5="67aaaa6df35215e812fd7d89472c44b6" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-apps/groff >= 1.20.1" -BUILD() -{ - cd man-1.6f - ./configure -prefix=`finddir B_COMMON_DIRECTORY` -sbindir=`finddir B_COMMON_BIN_DIRECTORY` -confdir=`finddir B_COMMON_SETTINGS_DIRECTORY` - make -} - -INSTALL() -{ - cd man-1.6f - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1989-2009 Free Software Foundation, Inc." diff --git a/sys-apps/man/patches/man-1.6f.patch b/sys-apps/man/patches/man-1.6f.patch deleted file mode 100644 index 83bd61983..000000000 --- a/sys-apps/man/patches/man-1.6f.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -up man-1.6f/configure.orig man-1.6f/configure ---- man-1.6f/configure.orig 2007-08-20 22:15:21.024379392 -0600 -+++ man-1.6f/configure 2010-08-30 21:38:47.617349120 -0600 -@@ -283,6 +283,12 @@ if test -f /xenix; then - esac - fi - -+echo checking for Haiku -+if test `uname` = "Haiku"; then -+ LIBS="$LIBS -llocale" -+ mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man -+fi -+ - echo checking how to get alloca - echo ' - #ifdef __GNUC__ -diff -up man-1.6f/man2html/Makefile.in.orig man-1.6f/man2html/Makefile.in ---- man-1.6f/man2html/Makefile.in.orig 2006-04-25 00:44:15.028835840 -0600 -+++ man-1.6f/man2html/Makefile.in 2010-08-30 21:35:20.566493184 -0600 -@@ -1,7 +1,7 @@ - CC = @CC@ - CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes - OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o --bindir = $(DESTDIR)$(PREFIX)/usr/bin -+bindir = $(DESTDIR)$(PREFIX)/bin - mandir = $(DESTDIR)$(PREFIX)@mandir@ - vardir = $(DESTDIR)$(PREFIX)/var - httpdir = $(DESTDIR)$(PREFIX)/home/httpd -diff -up man-1.6f/src/Makefile.in.orig man-1.6f/src/Makefile.in ---- man-1.6f/src/Makefile.in.orig 2010-08-30 21:36:40.814219264 -0600 -+++ man-1.6f/src/Makefile.in 2010-08-30 21:36:58.706740224 -0600 -@@ -29,6 +29,8 @@ LDFLAGS ?= -s - - LIBOBJS = @LIBOBJS@ - -+LIBS = @LIBS@ -+ - all: man man.conf apropos whatis makewhatis - - MANOBJS = man.o manfile.o manpath.o man-config.o man-getopt.o \ -diff -up man-1.6f/src/man.conf.in.orig man-1.6f/src/man.conf.in ---- man-1.6f/src/man.conf.in.orig 2007-08-20 22:15:21.026476544 -0600 -+++ man-1.6f/src/man.conf.in 2010-08-30 21:35:20.568328192 -0600 -@@ -36,11 +36,14 @@ - # - # Every automatically generated MANPATH includes these fields - # --MANPATH /usr/man --MANPATH /usr/share/man --MANPATH /usr/local/man --MANPATH /usr/local/share/man --MANPATH /usr/X11R6/man -+MANPATH /boot/common/man -+MANPATH /boot/common/share/man -+MANPATH /boot/home/config/man -+MANPATH /boot/home/config/share/man -+MANPATH /boot/common/*/man -+MANPATH /boot/common/*/share/man -+MANPATH /boot/home/config/*/man -+MANPATH /boot/home/config/*/share/man - # - # Uncomment if you want to include one of these by default - # -@@ -58,15 +61,9 @@ MANPATH /usr/X11R6/man - # in the mandatory manpath already, but will keep man from statting - # lots of other nearby files and directories. - # --MANPATH_MAP /bin /usr/share/man --MANPATH_MAP /sbin /usr/share/man --MANPATH_MAP /usr/bin /usr/share/man --MANPATH_MAP /usr/sbin /usr/share/man --MANPATH_MAP /usr/local/bin /usr/local/share/man --MANPATH_MAP /usr/local/sbin /usr/local/share/man --MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man --MANPATH_MAP /usr/bin/X11 /usr/X11R6/man --MANPATH_MAP /usr/bin/mh /usr/share/man -+MANPATH_MAP /bin /boot/common/share/man -+MANPATH_MAP /boot/common/bin /boot/common/share/man -+MANPATH_MAP /boot/home/config/bin /boot/home/config/share/man - # - # NOAUTOPATH keeps man from automatically adding directories that look like - # manual page directories to the path. From 14c8bc34fced905db27aa1195b1e3dc7d70f5b03 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 25 Apr 2013 03:33:08 +0200 Subject: [PATCH 115/587] Convert ncurses 5.9 recipe to an actual recipe --- sys-libs/ncurses/ncurses-5.9.recipe | 64 +++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index d4f2696ad..fa7e6d448 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -1,16 +1,50 @@ -DESCRIPTION="ncurses" +SUMMARY="New curses library" HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz" CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" +LICENSE="MIT" +COPYRIGHT="1998-2011 Free Software Foundation, Inc." +REVISION="3" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + ncurses = $portVersion compat >= 5 + cmd:captoinfo = $portVersion compat >= 5 + cmd:clear = $portVersion compat >= 5 + cmd:infocmp = $portVersion compat >= 5 + cmd:infotocap = $portVersion compat >= 5 + cmd:ncurses5_config = $portVersion compat >= 5 + cmd:reset = $portVersion compat >= 5 + cmd:tabs = $portVersion compat >= 5 + cmd:tic = $portVersion compat >= 5 + cmd:toe = $portVersion compat >= 5 + cmd:tput = $portVersion compat >= 5 + cmd:tset = $portVersion compat >= 5 + lib:libform = $portVersion compat >= 5 + lib:libmenu = $portVersion compat >= 5 + lib:libncurses++ = $portVersion compat >= 5 + lib:libncurses = $portVersion compat >= 5 + lib:libpanel = $portVersion compat >= 5 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:grep + cmd:ld + cmd:libtool + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " +SOURCE_DIR="$portVersionedName" + BUILD() { - cd ncurses-5.9 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + runConfigure --omit-dirs "dataRootDir docDir" ./configure \ --with-libtool \ --enable-termcap make @@ -18,9 +52,15 @@ BUILD() INSTALL() { - cd ncurses-5.9 - ./misc/shlib make install DESTDIR="${DESTDIR}" + ./misc/shlib make install + + # prepare develop/lib + prepareInstalledDevelLibs libform libmenu libncurses libncurses++ libpanel } -LICENSE="MIT" -COPYRIGHT="1998-2011 Free Software Foundation, Inc." + +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." From 49f612fe186933476ee60c9e6abc6a206e08cab7 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 25 Apr 2013 03:33:55 +0200 Subject: [PATCH 116/587] Removing old ncurses (non-)recipes and patches --- sys-libs/ncurses/ncurses-5.6.recipe | 21 -------- sys-libs/ncurses/ncurses-5.7.recipe | 21 -------- sys-libs/ncurses/ncurses-5.8.recipe | 25 --------- .../ncurses/patches/ncurses-5.6-haiku.diff | 54 ------------------- 4 files changed, 121 deletions(-) delete mode 100644 sys-libs/ncurses/ncurses-5.6.recipe delete mode 100644 sys-libs/ncurses/ncurses-5.7.recipe delete mode 100644 sys-libs/ncurses/ncurses-5.8.recipe delete mode 100644 sys-libs/ncurses/patches/ncurses-5.6-haiku.diff diff --git a/sys-libs/ncurses/ncurses-5.6.recipe b/sys-libs/ncurses/ncurses-5.6.recipe deleted file mode 100644 index f04e2b6b5..000000000 --- a/sys-libs/ncurses/ncurses-5.6.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="ncurses" -HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" -SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.6.tar.gz" -CHECKSUM_MD5="b6593abe1089d6aab1551c105c9300e3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd ncurses-5.6 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd ncurses-5.6 - make install -} -LICENSE="MIT" -COPYRIGHT="1998-2008 Free Software Foundation, Inc." diff --git a/sys-libs/ncurses/ncurses-5.7.recipe b/sys-libs/ncurses/ncurses-5.7.recipe deleted file mode 100644 index 704df8033..000000000 --- a/sys-libs/ncurses/ncurses-5.7.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="ncurses" -HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" -SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.7.tar.gz" -CHECKSUM_MD5="cce05daf61a64501ef6cd8da1f727ec6" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd ncurses-5.7 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-libtool - make -} - -INSTALL() -{ - cd ncurses-5.7 - ./misc/shlib make install DESTDIR="${DESTDIR}" -} -LICENSE="MIT" -COPYRIGHT="1998-2008 Free Software Foundation, Inc." diff --git a/sys-libs/ncurses/ncurses-5.8.recipe b/sys-libs/ncurses/ncurses-5.8.recipe deleted file mode 100644 index 1511c5ce7..000000000 --- a/sys-libs/ncurses/ncurses-5.8.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="ncurses" -HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" -SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.8.tar.gz" -CHECKSUM_MD5="20ed3fa7599937f0ca268d9088837a64" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd ncurses-5.8 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY`/ \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-libtool - make -} - -INSTALL() -{ - cd ncurses-5.8 - ./misc/shlib make install DESTDIR="${DESTDIR}" -} - -LICENSE="MIT" -COPYRIGHT="1998-2011 Free Software Foundation, Inc." diff --git a/sys-libs/ncurses/patches/ncurses-5.6-haiku.diff b/sys-libs/ncurses/patches/ncurses-5.6-haiku.diff deleted file mode 100644 index e9e9b3d8c..000000000 --- a/sys-libs/ncurses/patches/ncurses-5.6-haiku.diff +++ /dev/null @@ -1,54 +0,0 @@ -diff -ur ncurses-5.6/include/curses.h ncurses-5.6-haiku/include/curses.h ---- ncurses-5.6/include/curses.h 2008-06-04 05:57:46.000000000 -0700 -+++ ncurses-5.6-haiku/include/curses.h 2008-06-14 18:12:44.000000000 -0700 -@@ -450,7 +450,7 @@ - */ - #if 1 - #ifdef NCURSES_WGETCH_EVENTS --#if !defined(__BEOS__) /* Fix _nc_timed_wait() on BEOS... */ -+#if !defined(__BEOS__) || defined(__HAIKU__) /* Fix _nc_timed_wait() on BEOS... */ - # define NCURSES_EVENT_VERSION 1 - #endif /* !defined(__BEOS__) */ - -diff -ur ncurses-5.6/ncurses/tty/lib_twait.c ncurses-5.6-haiku/ncurses/tty/lib_twait.c ---- ncurses-5.6/ncurses/tty/lib_twait.c 2006-05-27 14:57:43.000000000 -0700 -+++ ncurses-5.6-haiku/ncurses/tty/lib_twait.c 2008-06-14 18:26:31.000000000 -0700 -@@ -42,6 +42,10 @@ - - #include - -+#if defined __HAIKU__ && defined __BEOS__ -+#undef __BEOS__ -+#endif -+ - #ifdef __BEOS__ - #undef false - #undef true -diff -ur ncurses-5.6/ncurses/tty/tty_update.c ncurses-5.6-haiku/ncurses/tty/tty_update.c ---- ncurses-5.6/ncurses/tty/tty_update.c 2006-11-25 14:33:21.000000000 -0800 -+++ ncurses-5.6-haiku/ncurses/tty/tty_update.c 2008-06-14 18:27:03.000000000 -0700 -@@ -44,6 +44,10 @@ - - #include - -+#if defined __HAIKU__ && defined __BEOS__ -+#undef __BEOS__ -+#endif -+ - #ifdef __BEOS__ - #undef false - #undef true -diff -ur ncurses-5.6/tack/sysdep.c ncurses-5.6-haiku/tack/sysdep.c ---- ncurses-5.6/tack/sysdep.c 2005-09-17 12:49:16.000000000 -0700 -+++ ncurses-5.6-haiku/tack/sysdep.c 2008-06-14 18:26:03.000000000 -0700 -@@ -34,6 +34,10 @@ - #include - #include - -+#if defined __HAIKU__ && defined __BEOS__ -+#undef __BEOS__ -+#endif -+ - #if defined(__BEOS__) - #undef false - #undef true From 1a509f80d198bce2d7dd94a2e7d68d3215b1fb80 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 25 Apr 2013 17:55:32 +0200 Subject: [PATCH 117/587] Update gcc 2 recipe Some missing include and all library search paths are now built in. --- sys-devel/gcc/gcc-2.95.3_130425.recipe | 149 +++++++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 sys-devel/gcc/gcc-2.95.3_130425.recipe diff --git a/sys-devel/gcc/gcc-2.95.3_130425.recipe b/sys-devel/gcc/gcc-2.95.3_130425.recipe new file mode 100644 index 000000000..78d7fdb42 --- /dev/null +++ b/sys-devel/gcc/gcc-2.95.3_130425.recipe @@ -0,0 +1,149 @@ +SUMMARY="C/C++ compiler" +DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5." +HOMEPAGE="http://gcc.gnu.org" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2000 Free Software Foundation, Inc." +SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + gcc = $portVersion compat >= 2.95.3 + cmd:c++ = $portVersion compat >= 2.95.3 + cmd:cpp = $portVersion compat >= 2.95.3 + cmd:g++ = $portVersion compat >= 2.95.3 + cmd:gcc = $portVersion compat >= 2.95.3 + cmd:gcov = 1.5 compat >= 1.5 + cmd:protoize = $portVersion compat >= 2.95.3 + cmd:unprotoize = $portVersion compat >= 2.95.3 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + binutils + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoconf + gcc + cmd:flex + cmd:make + cmd:sed + cmd:tar + cmd:makeinfo + " + +SOURCE_DIR="$portVersionedName" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +gccDir=$(pwd)/legacy/gcc +gccDate=110711 +relativeGccInstallDir="develop/tools/gcc-2.95.3-${gccDate}" +gccInstallDir="$prefix/$relativeGccInstallDir" +objectsDir=$(pwd)/../${portVersionedName}-obj +gccObjectsDir=$objectsDir/gcc + +BUILD() +{ + rm -rf $objectsDir + + # Touch some files generated by bison, so that bison won't run to update + # them. Fixes issues with newer bison versions. + # And while at it, touch gperf target, too (as gperf may not be installed). + (cd $gccDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + cp/parse.h c-gperf.h) + + # build gcc + mkdir -p $gccObjectsDir + cd $gccObjectsDir + CFLAGS="-O2" CXXFLAGS="-O2" "$gccDir/configure" \ + --prefix=$gccInstallDir \ + --disable-nls --enable-shared=yes --enable-languages=c,c++ + make bootstrap || true + # The above will fail when compiling builtinbuf.cc, but we can ignore + # that since it's trying to build libstdc++.so, which haiku provides + # anyway. +} + +INSTALL() +{ + cd $gccObjectsDir + make install + + base=$gccInstallDir + + ### HTML documentation #################################### + + html_base=$prefix/documentation/packages/$portVersionedName + if [ ! -d "$html_base" ]; then + echo "Building HTML documentation..." + mkdir -p $html_base + cd $html_base + + makeinfo --html "$gccDir/gcc/cpp.texi" + makeinfo --html "$gccDir/gcc/gcc.texi" + makeinfo --force --html "$gccDir/libio/iostream.texi" \ + && true + # some errors + + ln -sf cpp/index.html $html_base/cpp.html + ln -sf gcc/index.html $html_base/gcc.html + ln -sf iostream/index.html $html_base/iostream.html + fi + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # convert to absolute links to relative ones + cd $base/bin + ln -sfn g++ c++ + ln -sfn gcc cc + ln -sfn gcc i586-pc-haiku-gcc + + # make all tools available via default paths if this is the system + # compiler + if [ $architecture = 'x86_gcc2' ]; then + echo "Symlinking binaries into default path" + mkdir -p $prefix/bin + cd $prefix/bin + ln -sfn ../$relativeGccInstallDir/bin/* . + fi + + ### Strip ################################################# + + echo "Strip debug info" + + cd $base + strip --strip-debug bin/* + strip --strip-debug i586-pc-haiku/bin/* + strip --strip-debug lib/gcc-lib/i586-pc-haiku/2.95.3-${gccDate}/* \ + &>/dev/null || true + + ### Cleanup ############################################### + + echo "Cleanup" + + if [ -d $base/man -o -d $base/info -o -d $base/share ]; then + rm -rf $base/man + rm -rf $base/info + rm -rf $base/share + fi + + rm -f $base/lib/gcc-lib/i586-pc-haiku/2.95.3-haiku-$gccDate/include/math.h + + ### C++ includes ########################################## + + echo "Install C++ includes & library" + + rm -rf $base/include/g++ + ln -snf /boot/system/develop/headers/c++/2.95.3 $base/include/g++ + + ln -snf /boot/system/lib/libstdc++.r4.so $base/lib/ + ln -snf /boot/system/lib/libstdc++.so $base/lib/ +} From d9d5efcb728b8fb541cd6be188e45940a3c2db91 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 25 Apr 2013 17:56:52 +0200 Subject: [PATCH 118/587] Small correction in yasm 1.2.0 recipe Use the portVersion veriable instead of hard-coding the version. --- dev-lang/yasm/yasm-1.2.0.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe index 4d5eb44ff..45b9e7371 100644 --- a/dev-lang/yasm/yasm-1.2.0.recipe +++ b/dev-lang/yasm/yasm-1.2.0.recipe @@ -15,8 +15,8 @@ ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" yasm = $portVersion compat >= 1 - cmd:yasm = 1.2.0 compat >= 1 - lib:libyasm = 1.2.0 compat >= 1.2 + cmd:yasm = $portVersion compat >= 1 + lib:libyasm = $portVersion compat >= 1.2 " REQUIRES=" haiku >= $haikuVersion From c67ae398243e252262e77e5a6762ca9cf77a58f9 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 25 Apr 2013 17:57:37 +0200 Subject: [PATCH 119/587] ncurses: Build libraries with wchar support --- sys-libs/ncurses/ncurses-5.9.recipe | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index fa7e6d448..bfd6e4c84 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -4,7 +4,7 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz" CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1" LICENSE="MIT" COPYRIGHT="1998-2011 Free Software Foundation, Inc." -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -13,18 +13,18 @@ PROVIDES=" cmd:clear = $portVersion compat >= 5 cmd:infocmp = $portVersion compat >= 5 cmd:infotocap = $portVersion compat >= 5 - cmd:ncurses5_config = $portVersion compat >= 5 + cmd:ncursesw5_config = $portVersion compat >= 5 cmd:reset = $portVersion compat >= 5 cmd:tabs = $portVersion compat >= 5 cmd:tic = $portVersion compat >= 5 cmd:toe = $portVersion compat >= 5 cmd:tput = $portVersion compat >= 5 cmd:tset = $portVersion compat >= 5 - lib:libform = $portVersion compat >= 5 - lib:libmenu = $portVersion compat >= 5 - lib:libncurses++ = $portVersion compat >= 5 - lib:libncurses = $portVersion compat >= 5 - lib:libpanel = $portVersion compat >= 5 + lib:libformw = $portVersion compat >= 5 + lib:libmenuw = $portVersion compat >= 5 + lib:libncurses++w = $portVersion compat >= 5 + lib:libncursesw = $portVersion compat >= 5 + lib:libpanelw = $portVersion compat >= 5 " REQUIRES=" haiku >= $haikuVersion @@ -46,7 +46,8 @@ BUILD() { runConfigure --omit-dirs "dataRootDir docDir" ./configure \ --with-libtool \ - --enable-termcap + --enable-termcap \ + --enable-widec make } @@ -55,7 +56,8 @@ INSTALL() ./misc/shlib make install # prepare develop/lib - prepareInstalledDevelLibs libform libmenu libncurses libncurses++ libpanel + prepareInstalledDevelLibs libformw libmenuw libncursesw libncurses++w \ + libpanelw } From 79948b074c1af81e9b91b990ff6b1455030f2d33 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 25 Apr 2013 17:58:16 +0200 Subject: [PATCH 120/587] Convert nano 2.2.6 recipe to an actual recipe --- app-editors/nano/nano-2.2.6.recipe | 46 +++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe index 9abbc2515..74951a39e 100644 --- a/app-editors/nano/nano-2.2.6.recipe +++ b/app-editors/nano/nano-2.2.6.recipe @@ -1,27 +1,45 @@ -DESCRIPTION="GNU GPL'd Pico clone with more functionality" +SUMMARY="GNU GPL'd Pico clone with more functionality" +DESCRIPTION="GNU GPL'd Pico clone with more functionality." HOMEPAGE="http://www.nano-editor.org/" SRC_URI="http://www.nano-editor.org/dist/v2.2/nano-2.2.6.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/ncurses >= 5.6 - sys-apps/groff >= 1.20.1" CHECKSUM_MD5="03233ae480689a008eb98feb1b599807" +LICENSE="GNU GPL v3" +COPYRIGHT="1999-2010 Free Software Foundation, Inc. " +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + nano = $portVersion compat >= 2 + cmd:nano = $portVersion compat >= 2 + cmd:rnano = $portVersion compat >= 2 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:groff + lib:libncurses + " +BUILD_REQUIRES=" + cmd:gcc + cmd:groff + cmd:ld + cmd:libtoolize + cmd:make + ncurses + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd nano-2.2.6 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=$COMMON_DOCS/info \ - --mandir=$COMMON_DOCS/man + runConfigure ./configure make } INSTALL() { - cd nano-2.2.6 make install } -LICENSE="GNU GPL v3" -COPYRIGHT="1999-2010 Free Software Foundation, Inc. " From 7ea2ed82fe5e7a9e6b2e9418fcf4a3c9c614fb5e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 25 Apr 2013 23:44:03 +0200 Subject: [PATCH 121/587] Update sqlite 3.7.5 recipe * Correct version of provided lib:libsqlite3 -- it has it's own versioning. * Drop provided lib:libsqlite. * Move the development library stuff to develop/lib. --- dev-db/sqlite/sqlite-3.7.5.recipe | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-db/sqlite/sqlite-3.7.5.recipe b/dev-db/sqlite/sqlite-3.7.5.recipe index cfc47cb59..ef624510e 100644 --- a/dev-db/sqlite/sqlite-3.7.5.recipe +++ b/dev-db/sqlite/sqlite-3.7.5.recipe @@ -9,14 +9,15 @@ DESCRIPTION=" HOMEPAGE="http://www.sqlite.org/" SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz" CHECKSUM_MD5="a9604a82613ade2e7f4c303f233e477f" -REVISION="5" +LICENSE="SQLite" +COPYRIGHT="Public Domain" +REVISION="6" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" sqlite = $portVersion compat >= 3 cmd:sqlite3 = $portVersion compat >= 3 - lib:libsqlite = $portVersion compat >= 3 - lib:libsqlite3 = $portVersion compat >= 3 + lib:libsqlite3 = 0.8.6 compat >= 0 " REQUIRES=" haiku >= $haikuVersion @@ -49,7 +50,8 @@ BUILD() INSTALL() { make install -} -LICENSE="SQLite" -COPYRIGHT="Public Domain" + # prepare develop/lib + prepareInstalledDevelLibs libsqlite3 + mv $libDir/pkgconfig $developLibDir/ +} From ae5789b5abdbfcd5a97806553fa8e65aaaaf9cb3 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 25 Apr 2013 23:56:52 +0200 Subject: [PATCH 122/587] Convert sqlite 3.7.13 recipe to actual recipe --- dev-db/sqlite/sqlite-3.7.13.recipe | 55 +++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/dev-db/sqlite/sqlite-3.7.13.recipe b/dev-db/sqlite/sqlite-3.7.13.recipe index 8ce7af2d0..f894f54f6 100644 --- a/dev-db/sqlite/sqlite-3.7.13.recipe +++ b/dev-db/sqlite/sqlite-3.7.13.recipe @@ -1,28 +1,59 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." +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. + " HOMEPAGE="http://www.sqlite.org/" SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="c97df403e8a3d5b67bb408fcd6aabd8e" +LICENSE="SQLite" +COPYRIGHT="Public Domain" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="sqlite-3.7.13.patch" + +PROVIDES=" + sqlite = $portVersion compat >= 3 + cmd:sqlite3 = $portVersion compat >= 3 + lib:libsqlite3 = 0.8.6 compat >= 0 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="sqlite-autoconf-3071300" + BUILD() { - cd sqlite-autoconf-3071300 libtoolize --force --copy --install aclocal autoconf automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man + ./configure $configureDirArgs make } INSTALL() { - cd sqlite-autoconf-3071300 make install -} -LICENSE="SQLite" -COPYRIGHT="Public Domain" + # prepare develop/lib + prepareInstalledDevelLibs libsqlite3 + mv $libDir/pkgconfig $developLibDir/ +} From 6b4cc9b2acd758ed0e9ae42fd8c3d301a9df90f4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 26 Apr 2013 00:01:24 +0200 Subject: [PATCH 123/587] Remove older and intermediate sqlite non-recipes --- dev-db/sqlite/sqlite-3.6.22.recipe | 25 ------------------------- dev-db/sqlite/sqlite-3.6.23.recipe | 25 ------------------------- dev-db/sqlite/sqlite-3.7.2.recipe | 25 ------------------------- dev-db/sqlite/sqlite-3.7.3.recipe | 25 ------------------------- dev-db/sqlite/sqlite-3.7.4.recipe | 25 ------------------------- dev-db/sqlite/sqlite-3.7.6.2.recipe | 28 ---------------------------- dev-db/sqlite/sqlite-3.7.7.1.recipe | 28 ---------------------------- 7 files changed, 181 deletions(-) delete mode 100644 dev-db/sqlite/sqlite-3.6.22.recipe delete mode 100644 dev-db/sqlite/sqlite-3.6.23.recipe delete mode 100644 dev-db/sqlite/sqlite-3.7.2.recipe delete mode 100644 dev-db/sqlite/sqlite-3.7.3.recipe delete mode 100644 dev-db/sqlite/sqlite-3.7.4.recipe delete mode 100644 dev-db/sqlite/sqlite-3.7.6.2.recipe delete mode 100644 dev-db/sqlite/sqlite-3.7.7.1.recipe diff --git a/dev-db/sqlite/sqlite-3.6.22.recipe b/dev-db/sqlite/sqlite-3.6.22.recipe deleted file mode 100644 index 5d8723bac..000000000 --- a/dev-db/sqlite/sqlite-3.6.22.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-amalgamation-3.6.22.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="b683b3903e79ab8a6d928dc9d4a56937" -BUILD() -{ - cd sqlite-3.6.22 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd sqlite-3.6.22 - make install -} -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.6.23.recipe b/dev-db/sqlite/sqlite-3.6.23.recipe deleted file mode 100644 index ba681fb39..000000000 --- a/dev-db/sqlite/sqlite-3.6.23.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-amalgamation-3.6.23.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="8f1e86b3909a27f8122b0981afd16fcd" -BUILD() -{ - cd sqlite-3.6.23 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd sqlite-3.6.23 - make install -} -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.2.recipe b/dev-db/sqlite/sqlite-3.7.2.recipe deleted file mode 100644 index 482c5f9bb..000000000 --- a/dev-db/sqlite/sqlite-3.7.2.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-amalgamation-3.7.2.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="bd9586208f48ba840467bcfd066a6fa9" -BUILD() -{ - cd sqlite-3.7.2 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd sqlite-3.7.2 - make install -} -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.3.recipe b/dev-db/sqlite/sqlite-3.7.3.recipe deleted file mode 100644 index 6e459ad97..000000000 --- a/dev-db/sqlite/sqlite-3.7.3.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-amalgamation-3.7.3.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="74fe78b264f1c434c4b159d45b78e9b7" -BUILD() -{ - cd sqlite-3.7.3 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd sqlite-3.7.3 - make install -} -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.4.recipe b/dev-db/sqlite/sqlite-3.7.4.recipe deleted file mode 100644 index 490127749..000000000 --- a/dev-db/sqlite/sqlite-3.7.4.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070400.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="8f0c690bfb33c3cbbc2471c3d9ba0158" -BUILD() -{ - cd sqlite-autoconf-3070400 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd sqlite-autoconf-3070400 - make install -} -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.6.2.recipe b/dev-db/sqlite/sqlite-3.7.6.2.recipe deleted file mode 100644 index 24337da57..000000000 --- a/dev-db/sqlite/sqlite-3.7.6.2.recipe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070602.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="f16c08617968b4087b3d591fd575f59f" -BUILD() -{ - cd sqlite-autoconf-3070602 - libtoolize --force --copy --install - aclocal - autoconf - automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL() -{ - cd sqlite-autoconf-3070602 - make install -} - -LICENSE="SQLite" -COPYRIGHT="Public Domain" diff --git a/dev-db/sqlite/sqlite-3.7.7.1.recipe b/dev-db/sqlite/sqlite-3.7.7.1.recipe deleted file mode 100644 index a5cfdc082..000000000 --- a/dev-db/sqlite/sqlite-3.7.7.1.recipe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine." -HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="554026fe7fac47b1cf61c18d5fe43419" -BUILD() -{ - cd sqlite-autoconf-3070701 - libtoolize --force --copy --install - aclocal - autoconf - automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL() -{ - cd sqlite-autoconf-3070701 - make install -} - -LICENSE="SQLite" -COPYRIGHT="Public Domain" From 502c0dd5227d14bca93d8695219da5cf1bcf7d60 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 26 Apr 2013 01:21:20 +0200 Subject: [PATCH 124/587] Update openssl 1.0.0d recipe * Fix compat versions in provides. * Move include/ directory to develop/headers/. * Move development libaries to develop/lib/. * Fix pkgconfig. --- dev-libs/openssl/openssl-1.0.0d.recipe | 27 ++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe index 8822d6de8..3c131f28e 100644 --- a/dev-libs/openssl/openssl-1.0.0d.recipe +++ b/dev-libs/openssl/openssl-1.0.0d.recipe @@ -17,15 +17,22 @@ DESCRIPTION=" HOMEPAGE="http://www.openssl.org/" SRC_URI="http://www.openssl.org/source/openssl-1.0.0d.tar.gz" CHECKSUM_MD5="40b6ea380cc8a5bf9734c2f8bf7e701e" -REVISION="4" +LICENSE="OpenSSL" +COPYRIGHT=" + 1995-1998 Eric Young + 1998-2011 The OpenSSL Project. + " +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" +PATCHES="openssl-1.0.0d.patch" + PROVIDES=" - openssl = $portVersion compat >= 1 + openssl = $portVersion compat >= 1.0.0 cmd:c_rehash = $portVersion compat >= 1 cmd:openssl = $portVersion compat >= 1 - lib:libcrypto = $portVersion compat >= 1 - lib:libssl = $portVersion compat >= 1 + lib:libcrypto = $portVersion compat >= 1.0.0 + lib:libssl = $portVersion compat >= 1.0.0 " REQUIRES=" haiku >= $haikuVersion @@ -57,13 +64,17 @@ BUILD() INSTALL() { make install + + # move include dir to correct location + mkdir -p $(dirname $includeDir) + mv $prefix/include $includeDir + + # prepare develop/lib + prepareInstalledDevelLibs libcrypto libssl + fixPkgconfig } TEST() { make test } - -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2011 The OpenSSL Project." From 68971701aa054f4779473f36c83903c1150d6858 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 26 Apr 2013 01:30:42 +0200 Subject: [PATCH 125/587] Convert openssl 1.0.0j recipe to actual recipe --- dev-libs/openssl/openssl-1.0.0j.recipe | 77 +++++++++++++++++++++----- 1 file changed, 64 insertions(+), 13 deletions(-) diff --git a/dev-libs/openssl/openssl-1.0.0j.recipe b/dev-libs/openssl/openssl-1.0.0j.recipe index 8a5a30f01..05fba8124 100644 --- a/dev-libs/openssl/openssl-1.0.0j.recipe +++ b/dev-libs/openssl/openssl-1.0.0j.recipe @@ -1,23 +1,78 @@ -DESCRIPTION="openssl" +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. + " HOMEPAGE="http://www.openssl.org/" SRC_URI="http://www.openssl.org/source/openssl-1.0.0j.tar.gz" CHECKSUM_MD5="cbe4ac0d8f598680f68a951e04b0996b" +LICENSE="OpenSSL" +COPYRIGHT=" + 1995-1998 Eric Young + 1998-2012 The OpenSSL Project. + " REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="openssl-1.0.0j.patch" + +PROVIDES=" + openssl = $portVersion compat >= 1.0.0 + cmd:c_rehash = $portVersion compat >= 1 + cmd:openssl = $portVersion compat >= 1 + lib:libcrypto = $portVersion compat >= 1.0.0 + lib:libssl = $portVersion compat >= 1.0.0 + " +REQUIRES=" + haiku >= $haikuVersion + zlib >= 1.2.3 + " +BUILD_REQUIRES=" + $REQUIRES + cmd:gcc + cmd:ld + cmd:make + cmd:perl >= 5 + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + + BUILD() { - cd openssl-1.0.0j - sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make* - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \ - --openssldir=`finddir B_COMMON_DATA_DIRECTORY`/ssl + # Fix hardcoded directory for manpages + sed -i "s@MANDIR=.*\$@MANDIR=$manDir@g" Make* + + ./config --prefix=$prefix zlib shared --openssldir=$dataRootDir/ssl make } INSTALL() { - cd openssl-1.0.0j - make install INSTALL_PREFIX="${DESTDIR}" + make install + + # move include dir to correct location + mkdir -p $(dirname $includeDir) + mv $prefix/include $includeDir + + # prepare develop/lib + prepareInstalledDevelLibs libcrypto libssl + fixPkgconfig } TEST() @@ -25,7 +80,3 @@ TEST() cd openssl-1.0.0j make test } - -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2012 The OpenSSL Project." From 8677d466b90558edee38f5849507b102c39ca8b6 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 26 Apr 2013 01:34:29 +0200 Subject: [PATCH 126/587] Remove old/intermediate openssl non-recipes --- dev-libs/openssl/openssl-0.9.8l.recipe | 22 -------- dev-libs/openssl/openssl-0.9.8m.recipe | 22 -------- dev-libs/openssl/openssl-1.0.0.recipe | 22 -------- dev-libs/openssl/openssl-1.0.0a.recipe | 22 -------- dev-libs/openssl/openssl-1.0.0c.hpb | 26 --------- dev-libs/openssl/openssl-1.0.0c.recipe | 29 ---------- dev-libs/openssl/openssl-1.0.0e.recipe | 31 ----------- dev-libs/openssl/openssl-1.0.0g.recipe | 31 ----------- dev-libs/openssl/patches/openssl-0.9.8l.patch | 54 ------------------- dev-libs/openssl/patches/openssl-0.9.8m.patch | 54 ------------------- dev-libs/openssl/patches/openssl-1.0.0.patch | 54 ------------------- dev-libs/openssl/patches/openssl-1.0.0a.patch | 54 ------------------- dev-libs/openssl/patches/openssl-1.0.0c.patch | 54 ------------------- dev-libs/openssl/patches/openssl-1.0.0e.patch | 54 ------------------- dev-libs/openssl/patches/openssl-1.0.0g.patch | 54 ------------------- 15 files changed, 583 deletions(-) delete mode 100644 dev-libs/openssl/openssl-0.9.8l.recipe delete mode 100644 dev-libs/openssl/openssl-0.9.8m.recipe delete mode 100644 dev-libs/openssl/openssl-1.0.0.recipe delete mode 100644 dev-libs/openssl/openssl-1.0.0a.recipe delete mode 100644 dev-libs/openssl/openssl-1.0.0c.hpb delete mode 100644 dev-libs/openssl/openssl-1.0.0c.recipe delete mode 100644 dev-libs/openssl/openssl-1.0.0e.recipe delete mode 100644 dev-libs/openssl/openssl-1.0.0g.recipe delete mode 100644 dev-libs/openssl/patches/openssl-0.9.8l.patch delete mode 100644 dev-libs/openssl/patches/openssl-0.9.8m.patch delete mode 100644 dev-libs/openssl/patches/openssl-1.0.0.patch delete mode 100644 dev-libs/openssl/patches/openssl-1.0.0a.patch delete mode 100644 dev-libs/openssl/patches/openssl-1.0.0c.patch delete mode 100644 dev-libs/openssl/patches/openssl-1.0.0e.patch delete mode 100644 dev-libs/openssl/patches/openssl-1.0.0g.patch diff --git a/dev-libs/openssl/openssl-0.9.8l.recipe b/dev-libs/openssl/openssl-0.9.8l.recipe deleted file mode 100644 index 3980d41e4..000000000 --- a/dev-libs/openssl/openssl-0.9.8l.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-0.9.8l.tar.gz" -CHECKSUM_MD5="05a0ece1372392a2cf310ebb96333025" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd openssl-0.9.8l - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared - make -} - -INSTALL() -{ - cd openssl-0.9.8l - make install -} -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2010 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-0.9.8m.recipe b/dev-libs/openssl/openssl-0.9.8m.recipe deleted file mode 100644 index 9b800b609..000000000 --- a/dev-libs/openssl/openssl-0.9.8m.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-0.9.8m.tar.gz" -CHECKSUM_MD5="898bf125370926d5f692a2201124f8ec" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD() -{ - cd openssl-0.9.8m - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared - make -} - -INSTALL() -{ - cd openssl-0.9.8m - make install -} -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2010 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0.recipe b/dev-libs/openssl/openssl-1.0.0.recipe deleted file mode 100644 index b9bcf4c58..000000000 --- a/dev-libs/openssl/openssl-1.0.0.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0.tar.gz" -CHECKSUM_MD5="89eaa86e25b2845f920ec00ae4c864ed" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD() -{ - cd openssl-1.0.0 - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared - make -} - -INSTALL() -{ - cd openssl-1.0.0 - make install INSTALL_PREFIX="${DESTDIR}" -} -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2010 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0a.recipe b/dev-libs/openssl/openssl-1.0.0a.recipe deleted file mode 100644 index eaea93655..000000000 --- a/dev-libs/openssl/openssl-1.0.0a.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0a.tar.gz" -CHECKSUM_MD5="e3873edfffc783624cfbdb65e2249cbd" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD() -{ - cd openssl-1.0.0a - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared - make -} - -INSTALL() -{ - cd openssl-1.0.0a - make install INSTALL_PREFIX="${DESTDIR}" -} -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2010 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0c.hpb b/dev-libs/openssl/openssl-1.0.0c.hpb deleted file mode 100644 index 62f55d87c..000000000 --- a/dev-libs/openssl/openssl-1.0.0c.hpb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0c.tar.gz" -CHECKSUM_MD5="ff8fb85610aef328315a9decbb2712e4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD { - cd openssl-1.0.0c - config --prefix=/boot/common zlib shared - make -} - -INSTALL { - cd openssl-1.0.0c - make install INSTALL_PREFIX="${DESTDIR}" -} - -TEST { - cd openssl-1.0.0c - make test -} - -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2010 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0c.recipe b/dev-libs/openssl/openssl-1.0.0c.recipe deleted file mode 100644 index 7ddfa6214..000000000 --- a/dev-libs/openssl/openssl-1.0.0c.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0c.tar.gz" -CHECKSUM_MD5="ff8fb85610aef328315a9decbb2712e4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD() -{ - cd openssl-1.0.0c - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared - make -} - -INSTALL() -{ - cd openssl-1.0.0c - make install INSTALL_PREFIX="${DESTDIR}" -} - -TEST() -{ - cd openssl-1.0.0c - make test -} - -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2010 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0e.recipe b/dev-libs/openssl/openssl-1.0.0e.recipe deleted file mode 100644 index 713f871ab..000000000 --- a/dev-libs/openssl/openssl-1.0.0e.recipe +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0e.tar.gz" -CHECKSUM_MD5="7040b89c4c58c7a1016c0dfa6e821c86" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD() -{ - cd openssl-1.0.0e - sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make* - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \ - --openssldir=`finddir B_COMMON_DATA_DIRECTORY`/ssl - make -} - -INSTALL() -{ - cd openssl-1.0.0e - make install INSTALL_PREFIX="${DESTDIR}" -} - -TEST() -{ - cd openssl-1.0.0e - make test -} - -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2011 The OpenSSL Project." diff --git a/dev-libs/openssl/openssl-1.0.0g.recipe b/dev-libs/openssl/openssl-1.0.0g.recipe deleted file mode 100644 index 98e450b49..000000000 --- a/dev-libs/openssl/openssl-1.0.0g.recipe +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="openssl" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="http://www.openssl.org/source/openssl-1.0.0g.tar.gz" -CHECKSUM_MD5="07ecbe4324f140d157478637d6beccf1" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/zlib >= 1.2.3" -BUILD() -{ - cd openssl-1.0.0g - sed -i 's/MANDIR=$(OPENSSLDIR)\/man/MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`\/man/g' Make* - config --prefix=`finddir B_COMMON_DIRECTORY` zlib shared \ - --openssldir=`finddir B_COMMON_DATA_DIRECTORY`/ssl - make -} - -INSTALL() -{ - cd openssl-1.0.0g - make install INSTALL_PREFIX="${DESTDIR}" -} - -TEST() -{ - cd openssl-1.0.0g - make test -} - -LICENSE="OpenSSL" -COPYRIGHT="1995-1998 Eric Young - 1998-2012 The OpenSSL Project." diff --git a/dev-libs/openssl/patches/openssl-0.9.8l.patch b/dev-libs/openssl/patches/openssl-0.9.8l.patch deleted file mode 100644 index 338226ec8..000000000 --- a/dev-libs/openssl/patches/openssl-0.9.8l.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN openssl-0.9.8l/Configure openssl-0.9.8l-haiku/Configure ---- openssl-0.9.8l/Configure 2009-11-05 12:07:06.000000000 +0000 -+++ openssl-0.9.8l-haiku/Configure 2009-11-07 16:59:19.000000000 +0000 -@@ -545,6 +545,9 @@ - ##### Compaq Non-Stop Kernel (Tandem) - "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::", - -+##### Haiku -+"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff -urN openssl-0.9.8l/Makefile.shared openssl-0.9.8l-haiku/Makefile.shared ---- openssl-0.9.8l/Makefile.shared 2008-09-17 15:56:40.000000000 +0000 -+++ openssl-0.9.8l-haiku/Makefile.shared 2009-11-07 16:59:19.000000000 +0000 -@@ -552,10 +552,10 @@ - symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath: - - # Compatibility targets --link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu --link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu --link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu --symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu -+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu -+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu -+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu -+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu - link_o.bsd-shared: link_o.bsd - link_a.bsd-shared: link_a.bsd - link_app.bsd-shared: link_app.bsd -diff -urN openssl-0.9.8l/config openssl-0.9.8l-haiku/config ---- openssl-0.9.8l/config 2009-02-16 08:43:41.000000000 +0000 -+++ openssl-0.9.8l-haiku/config 2009-11-07 16:59:19.000000000 +0000 -@@ -126,6 +126,10 @@ - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -761,6 +765,8 @@ - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; diff --git a/dev-libs/openssl/patches/openssl-0.9.8m.patch b/dev-libs/openssl/patches/openssl-0.9.8m.patch deleted file mode 100644 index 7b74cc2fe..000000000 --- a/dev-libs/openssl/patches/openssl-0.9.8m.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN openssl-0.9.8m/Configure openssl-0.9.8m-haiku/Configure ---- openssl-0.9.8m/Configure 2009-11-05 12:07:06.000000000 +0000 -+++ openssl-0.9.8m-haiku/Configure 2009-11-07 16:59:19.000000000 +0000 -@@ -545,6 +545,9 @@ - ##### Compaq Non-Stop Kernel (Tandem) - "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::", - -+##### Haiku -+"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff -urN openssl-0.9.8m/Makefile.shared openssl-0.9.8m-haiku/Makefile.shared ---- openssl-0.9.8m/Makefile.shared 2008-09-17 15:56:40.000000000 +0000 -+++ openssl-0.9.8m-haiku/Makefile.shared 2009-11-07 16:59:19.000000000 +0000 -@@ -552,10 +552,10 @@ - symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath: - - # Compatibility targets --link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu --link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu --link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu --symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu -+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu -+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu -+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu -+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu - link_o.bsd-shared: link_o.bsd - link_a.bsd-shared: link_a.bsd - link_app.bsd-shared: link_app.bsd -diff -urN openssl-0.9.8m/config openssl-0.9.8m-haiku/config ---- openssl-0.9.8m/config 2009-02-16 08:43:41.000000000 +0000 -+++ openssl-0.9.8m-haiku/config 2009-11-07 16:59:19.000000000 +0000 -@@ -126,6 +126,10 @@ - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -761,6 +765,8 @@ - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; diff --git a/dev-libs/openssl/patches/openssl-1.0.0.patch b/dev-libs/openssl/patches/openssl-1.0.0.patch deleted file mode 100644 index 00ec33277..000000000 --- a/dev-libs/openssl/patches/openssl-1.0.0.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN openssl-1.0.0/Configure openssl-1.0.0-haiku/Configure ---- openssl-1.0.0/Configure 2009-11-05 12:07:06.000000000 +0000 -+++ openssl-1.0.0-haiku/Configure 2009-11-07 16:59:19.000000000 +0000 -@@ -545,6 +545,9 @@ - ##### Compaq Non-Stop Kernel (Tandem) - "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::", - -+##### Haiku -+"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff -urN openssl-1.0.0/Makefile.shared openssl-1.0.0-haiku/Makefile.shared ---- openssl-1.0.0/Makefile.shared 2008-09-17 15:56:40.000000000 +0000 -+++ openssl-1.0.0-haiku/Makefile.shared 2009-11-07 16:59:19.000000000 +0000 -@@ -552,10 +552,10 @@ - symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath: - - # Compatibility targets --link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu --link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu --link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu --symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu -+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu -+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu -+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu -+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu - link_o.bsd-shared: link_o.bsd - link_a.bsd-shared: link_a.bsd - link_app.bsd-shared: link_app.bsd -diff -urN openssl-1.0.0/config openssl-1.0.0-haiku/config ---- openssl-1.0.0/config 2009-02-16 08:43:41.000000000 +0000 -+++ openssl-1.0.0-haiku/config 2009-11-07 16:59:19.000000000 +0000 -@@ -126,6 +126,10 @@ - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -761,6 +765,8 @@ - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; diff --git a/dev-libs/openssl/patches/openssl-1.0.0a.patch b/dev-libs/openssl/patches/openssl-1.0.0a.patch deleted file mode 100644 index 92f1dbddb..000000000 --- a/dev-libs/openssl/patches/openssl-1.0.0a.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN openssl-1.0.0a/Configure openssl-1.0.0a-haiku/Configure ---- openssl-1.0.0a/Configure 2009-11-05 12:07:06.000000000 +0000 -+++ openssl-1.0.0a-haiku/Configure 2009-11-07 16:59:19.000000000 +0000 -@@ -545,6 +545,9 @@ - ##### Compaq Non-Stop Kernel (Tandem) - "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::", - -+##### Haiku -+"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff -urN openssl-1.0.0a/Makefile.shared openssl-1.0.0a-haiku/Makefile.shared ---- openssl-1.0.0a/Makefile.shared 2008-09-17 15:56:40.000000000 +0000 -+++ openssl-1.0.0a-haiku/Makefile.shared 2009-11-07 16:59:19.000000000 +0000 -@@ -552,10 +552,10 @@ - symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath: - - # Compatibility targets --link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu --link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu --link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu --symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu -+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu -+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu -+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu -+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu - link_o.bsd-shared: link_o.bsd - link_a.bsd-shared: link_a.bsd - link_app.bsd-shared: link_app.bsd -diff -urN openssl-1.0.0a/config openssl-1.0.0a-haiku/config ---- openssl-1.0.0a/config 2009-02-16 08:43:41.000000000 +0000 -+++ openssl-1.0.0a-haiku/config 2009-11-07 16:59:19.000000000 +0000 -@@ -126,6 +126,10 @@ - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -761,6 +765,8 @@ - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; diff --git a/dev-libs/openssl/patches/openssl-1.0.0c.patch b/dev-libs/openssl/patches/openssl-1.0.0c.patch deleted file mode 100644 index a7bd91cba..000000000 --- a/dev-libs/openssl/patches/openssl-1.0.0c.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN openssl-1.0.0c/Configure openssl-1.0.0c-haiku/Configure ---- openssl-1.0.0c/Configure 2010-11-30 22:19:26.013631488 +0000 -+++ openssl-1.0.0c-haiku/Configure 2010-12-10 09:33:29.000000000 +0000 -@@ -582,6 +582,9 @@ - "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", - "uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", - -+##### Haiku -+"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff -urN openssl-1.0.0c/Makefile.shared openssl-1.0.0c-haiku/Makefile.shared ---- openssl-1.0.0c/Makefile.shared 2010-08-21 11:36:49.004456448 +0000 -+++ openssl-1.0.0c-haiku/Makefile.shared 2010-12-10 09:33:29.000000000 +0000 -@@ -594,10 +594,10 @@ - symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos: - - # Compatibility targets --link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu --link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu --link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu --symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu -+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu -+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu -+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu -+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu - link_o.bsd-shared: link_o.bsd - link_a.bsd-shared: link_a.bsd - link_app.bsd-shared: link_app.bsd -diff -urN openssl-1.0.0c/config openssl-1.0.0c-haiku/config ---- openssl-1.0.0c/config 2010-03-09 17:08:39.013369344 +0000 -+++ openssl-1.0.0c-haiku/config 2010-12-10 09:33:29.000000000 +0000 -@@ -134,6 +134,10 @@ - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -799,6 +803,8 @@ - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; diff --git a/dev-libs/openssl/patches/openssl-1.0.0e.patch b/dev-libs/openssl/patches/openssl-1.0.0e.patch deleted file mode 100644 index 92bb62dc2..000000000 --- a/dev-libs/openssl/patches/openssl-1.0.0e.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN openssl-1.0.0e/Configure openssl-1.0.0e-haiku/Configure ---- openssl-1.0.0e/Configure 2010-11-30 22:19:26.013631488 +0000 -+++ openssl-1.0.0e-haiku/Configure 2010-12-10 09:33:29.000000000 +0000 -@@ -582,6 +582,9 @@ - "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", - "uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", - -+##### Haiku -+"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff -urN openssl-1.0.0e/Makefile.shared openssl-1.0.0e-haiku/Makefile.shared ---- openssl-1.0.0e/Makefile.shared 2010-08-21 11:36:49.004456448 +0000 -+++ openssl-1.0.0e-haiku/Makefile.shared 2010-12-10 09:33:29.000000000 +0000 -@@ -594,10 +594,10 @@ - symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos: - - # Compatibility targets --link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu --link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu --link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu --symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu -+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu -+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu -+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu -+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu - link_o.bsd-shared: link_o.bsd - link_a.bsd-shared: link_a.bsd - link_app.bsd-shared: link_app.bsd -diff -urN openssl-1.0.0e/config openssl-1.0.0e-haiku/config ---- openssl-1.0.0e/config 2010-03-09 17:08:39.013369344 +0000 -+++ openssl-1.0.0e-haiku/config 2010-12-10 09:33:29.000000000 +0000 -@@ -134,6 +134,10 @@ - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -799,6 +803,8 @@ - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; diff --git a/dev-libs/openssl/patches/openssl-1.0.0g.patch b/dev-libs/openssl/patches/openssl-1.0.0g.patch deleted file mode 100644 index a66237b5c..000000000 --- a/dev-libs/openssl/patches/openssl-1.0.0g.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN openssl-1.0.0g/Configure openssl-1.0.0g-haiku/Configure ---- openssl-1.0.0g/Configure 2010-11-30 22:19:26.013631488 +0000 -+++ openssl-1.0.0g-haiku/Configure 2010-12-10 09:33:29.000000000 +0000 -@@ -582,6 +582,9 @@ - "uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", - "uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::", - -+##### Haiku -+"haiku-x86", "gcc:-DL_ENDIAN -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnetwork:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:haiku-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+ - ); - - my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A -diff -urN openssl-1.0.0g/Makefile.shared openssl-1.0.0g-haiku/Makefile.shared ---- openssl-1.0.0g/Makefile.shared 2010-08-21 11:36:49.004456448 +0000 -+++ openssl-1.0.0g-haiku/Makefile.shared 2010-12-10 09:33:29.000000000 +0000 -@@ -594,10 +594,10 @@ - symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos: - - # Compatibility targets --link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu --link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu --link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu --symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu -+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared link_o.haiku-shared: link_o.gnu -+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared link_a.haiku-shared: link_a.gnu -+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared link_app.haiku-shared: link_app.gnu -+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared symlink.haiku-shared: symlink.gnu - link_o.bsd-shared: link_o.bsd - link_a.bsd-shared: link_a.bsd - link_app.bsd-shared: link_app.bsd -diff -urN openssl-1.0.0g/config openssl-1.0.0g-haiku/config ---- openssl-1.0.0g/config 2010-03-09 17:08:39.013369344 +0000 -+++ openssl-1.0.0g-haiku/config 2010-12-10 09:33:29.000000000 +0000 -@@ -134,6 +134,10 @@ - echo "${MACHINE}-dg-dgux"; exit 0 - ;; - -+ Haiku:*:BePC) -+ echo "i586-pc-haiku"; exit 0 -+ ;; -+ - HI-UX:*) - echo "${MACHINE}-hi-hiux"; exit 0 - ;; -@@ -799,6 +803,8 @@ - options="$options no-asm" - fi - ;; -+ i586-*-haiku) OUT="haiku-x86" ;; -+ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; From 7565ab68d8b12442ff76c3ae51d70a94e36262d5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 26 Apr 2013 01:38:30 +0200 Subject: [PATCH 127/587] Update sqlite recipes to use fixPkgconfig --- dev-db/sqlite/sqlite-3.7.13.recipe | 4 ++-- dev-db/sqlite/sqlite-3.7.5.recipe | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-db/sqlite/sqlite-3.7.13.recipe b/dev-db/sqlite/sqlite-3.7.13.recipe index f894f54f6..2ff9b79dc 100644 --- a/dev-db/sqlite/sqlite-3.7.13.recipe +++ b/dev-db/sqlite/sqlite-3.7.13.recipe @@ -11,7 +11,7 @@ SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz" CHECKSUM_MD5="c97df403e8a3d5b67bb408fcd6aabd8e" LICENSE="SQLite" COPYRIGHT="Public Domain" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="sqlite-3.7.13.patch" @@ -55,5 +55,5 @@ INSTALL() # prepare develop/lib prepareInstalledDevelLibs libsqlite3 - mv $libDir/pkgconfig $developLibDir/ + fixPkgconfig } diff --git a/dev-db/sqlite/sqlite-3.7.5.recipe b/dev-db/sqlite/sqlite-3.7.5.recipe index ef624510e..c92372e50 100644 --- a/dev-db/sqlite/sqlite-3.7.5.recipe +++ b/dev-db/sqlite/sqlite-3.7.5.recipe @@ -11,7 +11,7 @@ SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz" CHECKSUM_MD5="a9604a82613ade2e7f4c303f233e477f" LICENSE="SQLite" COPYRIGHT="Public Domain" -REVISION="6" +REVISION="7" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -53,5 +53,5 @@ INSTALL() # prepare develop/lib prepareInstalledDevelLibs libsqlite3 - mv $libDir/pkgconfig $developLibDir/ + fixPkgconfig } From 1111e4a96bcb0c57e46403f10340b21887483284 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 26 Apr 2013 16:31:02 +0200 Subject: [PATCH 128/587] Convert libxml2 2.8.0 recipe to an actual recipe --- dev-libs/libxml2/libxml2-2.8.0.recipe | 120 ++++++++++++++++--- dev-libs/libxml2/patches/libxml2-2.8.0.patch | 26 ++++ 2 files changed, 130 insertions(+), 16 deletions(-) create mode 100644 dev-libs/libxml2/patches/libxml2-2.8.0.patch diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe index f4a143cd6..8acd7b29c 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.recipe +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -1,38 +1,126 @@ -DESCRIPTION="libxml2 - Version 2 of the library to manipulate XML files" +SUMMARY="The XML C parser and toolkit of Gnome" HOMEPAGE="http://www.xmlsoft.org/" +LICENSE="MIT" +COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz" CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="libxml2-2.8.0.patch" + +PROVIDES=" + libxml2 = $portVersion compat >= 2 + cmd:xml2_config = $portVersion compat >= 2 + cmd:xmlcatalog = $portVersion compat >= 2 + cmd:xmllint = $portVersion compat >= 2 + lib:libxml2 = $portVersion compat >= 2 + " +REQUIRES=" + haiku >= $haikuVersion + zlib + " +BUILD_REQUIRES=" + $REQUIRES + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + # replace hard-coded references to the development documentation dir + sed -i "s,^DEVHELP_DIR=\(.*\),DEVHELP_DIR=${developDocDir}," \ + doc/devhelp/Makefile.am + sed -i "s,%{_datadir}/gtk-doc/html/libxml2,${developDocDir},g" \ + libxml.spec.in +} + BUILD() { - cd libxml2-2.8.0 libtoolize --force --copy --install aclocal autoconf - sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS \ - --docdir=$COMMON_DOCS/doc \ - --mandir=$COMMON_DOCS/man - LDFLAGS="-lnetwork" - make + runConfigure ./configure LDFLAGS="-lnetwork" \ + --with-html-dir=$docDir/html \ + --with-html-subdir="" } INSTALL() { - cd libxml2-2.8.0 make install + + # prepare develop/lib + prepareInstalledDevelLibs libxml2 + fixPkgconfig + mv $libDir/xml2Conf.sh $developLibDir/ } TEST() { - cd libxml2-2.8.0 make tests } -LICENSE="MIT" -COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." +DESCRIPTION=" + Libxml2 is the XML C parser and toolkit developed for the Gnome project + (but usable outside of the Gnome platform), it is free software available + under the MIT License. XML itself is a metalanguage to design markup + languages, i.e. text language where semantic and structure are added to + the content using extra "markup" information enclosed between angle + brackets. HTML is the most well-known markup language. Though the library + is written in C a variety of language bindings make it available in other + environments. + + Libxml2 implements a number of existing standards related to markup + languages: + + - the XML standard: http://www.w3.org/TR/REC-xml + - Namespaces in XML: http://www.w3.org/TR/REC-xml-names/ + - XML Base: http://www.w3.org/TR/xmlbase/ + - RFC 2396 : Uniform Resource Identifiers + - XML Path Language (XPath) 1.0: http://www.w3.org/TR/xpath + - HTML4 parser: http://www.w3.org/TR/html401/ + - XML Pointer Language (XPointer) Version 1.0: http://www.w3.org/TR/xptr + - XML Inclusions (XInclude) Version 1.0: http://www.w3.org/TR/xinclude/ + - ISO-8859-x encodings, as well as rfc2044 [UTF-8] and rfc2781 [UTF-16] + Unicode encodings, and more if using iconv support part of SGML Open + Technical Resolution TR9401:1997 + - XML Catalogs Working Draft 06 August 2001: + http://www.oasis-open.org/committees/entity/spec-2001-08-06.html + - Canonical XML Version 1.0: + http://www.w3.org/TR/xml-c14n and the Exclusive XML Canonicalization + CR draft http://www.w3.org/TR/xml-exc-c14n + - Relax NG, ISO/IEC 19757-2:2003, + http://www.oasis-open.org/committees/relax-ng/spec-20011203.html + - W3C XML Schemas Part 2: Datatypes REC 02 May 2001 + - W3C xml:id Working Draft 7 April 2004 + + In most cases libxml2 tries to implement the specifications in a + relatively strictly compliant way. As of release 2.4.16, libxml2 passed + all 1800+ tests from the OASIS XML Tests Suite. + + To some extent libxml2 provides support for the following additional + specifications but doesn't claim to implement them completely: + + - Document Object Model (DOM) http://www.w3.org/TR/DOM-Level-2-Core/ + the document model, but it doesn't implement the API itself, gdome2 + does this on top of libxml2 + - RFC 959 : libxml2 implements a basic FTP client code + - RFC 1945 : HTTP/1.0, again a basic HTTP client code + - SAX: a SAX2 like interface and a minimal SAX1 implementation compatible + with early expat versions + + A partial implementation of XML Schemas Part 1: Structure is being worked + on but it would be far too early to make any conformance statement about + it at the moment. + " diff --git a/dev-libs/libxml2/patches/libxml2-2.8.0.patch b/dev-libs/libxml2/patches/libxml2-2.8.0.patch new file mode 100644 index 000000000..6973091ea --- /dev/null +++ b/dev-libs/libxml2/patches/libxml2-2.8.0.patch @@ -0,0 +1,26 @@ +diff -ur libxml2-2.8.0.orig/configure.in libxml2-2.8.0/configure.in +--- libxml2-2.8.0.orig/configure.in 2012-05-23 10:33:55.027787264 +0200 ++++ libxml2-2.8.0/configure.in 2013-04-26 13:50:43.429391872 +0200 +@@ -1,7 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + AC_PREREQ(2.59) + AC_INIT(entities.c) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_HOST + +diff -ur libxml2-2.8.0.orig/Makefile.am libxml2-2.8.0/Makefile.am +--- libxml2-2.8.0.orig/Makefile.am 2012-05-23 10:56:18.030932992 +0200 ++++ libxml2-2.8.0/Makefile.am 2013-04-26 13:50:43.432537600 +0200 +@@ -1208,8 +1208,8 @@ + # + # Install the tests program sources as examples + # +-BASE_DIR=$(datadir)/doc +-DOC_MODULE=libxml2-$(VERSION) ++BASE_DIR=$(docdir) ++DOC_MODULE= + EXAMPLES_DIR=$(BASE_DIR)/$(DOC_MODULE)/examples + + install-data-local: From e991c42864f8c1affe764c5275ef945f79341f04 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 26 Apr 2013 23:08:41 +0200 Subject: [PATCH 129/587] libxml2 2.8.0 recipe: Re-add missing "make in BUILD() --- dev-libs/libxml2/libxml2-2.8.0.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe index 8acd7b29c..ea7897ead 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.recipe +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -54,6 +54,7 @@ BUILD() runConfigure ./configure LDFLAGS="-lnetwork" \ --with-html-dir=$docDir/html \ --with-html-subdir="" + make } INSTALL() From b22b245c774a056a4de0714960dcbe54b9c24261 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 26 Apr 2013 23:10:47 +0200 Subject: [PATCH 130/587] libxml2: Remove old non-recipes/patches Also move trunk patch to patches/. --- dev-libs/libxml2/libxml2-2.7.0-haiku.diff | 13 --- dev-libs/libxml2/libxml2-2.7.2-haiku.diff | 12 -- dev-libs/libxml2/libxml2-2.7.3.recipe | 25 ----- dev-libs/libxml2/libxml2-2.7.6.recipe | 25 ----- dev-libs/libxml2/libxml2-2.7.7.recipe | 32 ------ dev-libs/libxml2/libxml2-2.7.8.recipe | 106 ------------------ dev-libs/libxml2/patches/libxml2-2.7.3.patch | 21 ---- .../libxml2/{ => patches}/libxml2-trunk.diff | 0 8 files changed, 234 deletions(-) delete mode 100644 dev-libs/libxml2/libxml2-2.7.0-haiku.diff delete mode 100644 dev-libs/libxml2/libxml2-2.7.2-haiku.diff delete mode 100644 dev-libs/libxml2/libxml2-2.7.3.recipe delete mode 100644 dev-libs/libxml2/libxml2-2.7.6.recipe delete mode 100644 dev-libs/libxml2/libxml2-2.7.7.recipe delete mode 100644 dev-libs/libxml2/libxml2-2.7.8.recipe delete mode 100644 dev-libs/libxml2/patches/libxml2-2.7.3.patch rename dev-libs/libxml2/{ => patches}/libxml2-trunk.diff (100%) diff --git a/dev-libs/libxml2/libxml2-2.7.0-haiku.diff b/dev-libs/libxml2/libxml2-2.7.0-haiku.diff deleted file mode 100644 index 6bbb44a31..000000000 --- a/dev-libs/libxml2/libxml2-2.7.0-haiku.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN libxml2-2.7.0/configure.in libxml2-2.7.0-haiku/configure.in ---- libxml2-2.7.0/configure.in 2008-08-30 07:38:39.000000000 -0700 -+++ libxml2-2.7.0-haiku/configure.in 2008-08-30 14:20:06.000000000 -0700 -@@ -1255,6 +1255,9 @@ - ;; - *beos*) M_LIBS="" - ;; -+ *haiku*) M_LIBS="" -+ ;; -+ - *) M_LIBS="-lm" - ;; - esac diff --git a/dev-libs/libxml2/libxml2-2.7.2-haiku.diff b/dev-libs/libxml2/libxml2-2.7.2-haiku.diff deleted file mode 100644 index ec5425521..000000000 --- a/dev-libs/libxml2/libxml2-2.7.2-haiku.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libxml2-2.7.2/configure.in libxml2-2.7.2-haiku/configure.in ---- libxml2-2.7.2/configure.in 2008-10-03 07:09:55.000000000 +0000 -+++ libxml2-2.7.2-haiku/configure.in 2008-10-22 19:07:34.000000000 +0000 -@@ -1257,6 +1257,8 @@ - ;; - *beos*) M_LIBS="" - ;; -+ *haiku*) M_LIBS="" -+ ;; - *) M_LIBS="-lm" - ;; - esac diff --git a/dev-libs/libxml2/libxml2-2.7.3.recipe b/dev-libs/libxml2/libxml2-2.7.3.recipe deleted file mode 100644 index 19024e0a9..000000000 --- a/dev-libs/libxml2/libxml2-2.7.3.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libxml2 - Version 2 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.3.tar.gz" -CHECKSUM_MD5="8f4fda3969237c2a33bdb1583b5d06b2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libxml2-2.7.3 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-ipv6=no LDFLAGS=-lnetwork - make -} - -INSTALL() -{ - cd libxml2-2.7.3 - make install -} -LICENSE="MIT" -COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." diff --git a/dev-libs/libxml2/libxml2-2.7.6.recipe b/dev-libs/libxml2/libxml2-2.7.6.recipe deleted file mode 100644 index f12282c3f..000000000 --- a/dev-libs/libxml2/libxml2-2.7.6.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libxml2 - Version 2 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.6.tar.gz" -CHECKSUM_MD5="7740a8ec23878a2f50120e1faa2730f2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libxml2-2.7.6 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-ipv6=no LDFLAGS="-lnetwork -L/boot/common/lib" - make -} - -INSTALL() -{ - cd libxml2-2.7.6 - make install -} -LICENSE="MIT" -COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." diff --git a/dev-libs/libxml2/libxml2-2.7.7.recipe b/dev-libs/libxml2/libxml2-2.7.7.recipe deleted file mode 100644 index f30d0bad0..000000000 --- a/dev-libs/libxml2/libxml2-2.7.7.recipe +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="libxml2 - Version 2 of the library to manipulate XML files" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.7.tar.gz" -CHECKSUM_MD5="9abc9959823ca9ff904f1fbcf21df066" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libxml2-2.7.7 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-ipv6=no LDFLAGS="-lnetwork -L/boot/common/lib" - make -} - -INSTALL() -{ - cd libxml2-2.7.7 - make install -} - -TEST() -{ - cd libxml2-2.7.7 - make tests -} - -LICENSE="MIT" -COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." diff --git a/dev-libs/libxml2/libxml2-2.7.8.recipe b/dev-libs/libxml2/libxml2-2.7.8.recipe deleted file mode 100644 index 4c33f4674..000000000 --- a/dev-libs/libxml2/libxml2-2.7.8.recipe +++ /dev/null @@ -1,106 +0,0 @@ -SUMMARY="The XML C parser and toolkit of Gnome" -HOMEPAGE="http://www.xmlsoft.org/" -LICENSE="MIT" -COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." -SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz" -CHECKSUM_MD5="8127a65e8c3b08856093099b52599c86" -REVISION="4" -ARCHITECTURES="x86_gcc2 ?x86" - -PROVIDES=" - libxml2 = $portVersion compat >= 2.7 - lib:libxml2 = $portVersion compat >= 2.7 - " -REQUIRES=" - haiku >= $haikuVersion - zlib - " -BUILD_REQUIRES=" - $REQUIRES - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " - -SOURCE_DIR="$portVersionedName" - -BUILD() -{ - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure $configureDirArgs --enable-ipv6=no LDFLAGS="-lnetwork" - make -} - -INSTALL() -{ - make install -} - -TEST() -{ - make tests -} - -DESCRIPTION=" - Libxml2 is the XML C parser and toolkit developed for the Gnome project - (but usable outside of the Gnome platform), it is free software available - under the MIT License. XML itself is a metalanguage to design markup - languages, i.e. text language where semantic and structure are added to - the content using extra "markup" information enclosed between angle - brackets. HTML is the most well-known markup language. Though the library - is written in C a variety of language bindings make it available in other - environments. - - Libxml2 implements a number of existing standards related to markup - languages: - - - the XML standard: http://www.w3.org/TR/REC-xml - - Namespaces in XML: http://www.w3.org/TR/REC-xml-names/ - - XML Base: http://www.w3.org/TR/xmlbase/ - - RFC 2396 : Uniform Resource Identifiers - - XML Path Language (XPath) 1.0: http://www.w3.org/TR/xpath - - HTML4 parser: http://www.w3.org/TR/html401/ - - XML Pointer Language (XPointer) Version 1.0: http://www.w3.org/TR/xptr - - XML Inclusions (XInclude) Version 1.0: http://www.w3.org/TR/xinclude/ - - ISO-8859-x encodings, as well as rfc2044 [UTF-8] and rfc2781 [UTF-16] - Unicode encodings, and more if using iconv support part of SGML Open - Technical Resolution TR9401:1997 - - XML Catalogs Working Draft 06 August 2001: - http://www.oasis-open.org/committees/entity/spec-2001-08-06.html - - Canonical XML Version 1.0: - http://www.w3.org/TR/xml-c14n and the Exclusive XML Canonicalization - CR draft http://www.w3.org/TR/xml-exc-c14n - - Relax NG, ISO/IEC 19757-2:2003, - http://www.oasis-open.org/committees/relax-ng/spec-20011203.html - - W3C XML Schemas Part 2: Datatypes REC 02 May 2001 - - W3C xml:id Working Draft 7 April 2004 - - In most cases libxml2 tries to implement the specifications in a - relatively strictly compliant way. As of release 2.4.16, libxml2 passed - all 1800+ tests from the OASIS XML Tests Suite. - - To some extent libxml2 provides support for the following additional - specifications but doesn't claim to implement them completely: - - - Document Object Model (DOM) http://www.w3.org/TR/DOM-Level-2-Core/ - the document model, but it doesn't implement the API itself, gdome2 - does this on top of libxml2 - - RFC 959 : libxml2 implements a basic FTP client code - - RFC 1945 : HTTP/1.0, again a basic HTTP client code - - SAX: a SAX2 like interface and a minimal SAX1 implementation compatible - with early expat versions - - A partial implementation of XML Schemas Part 1: Structure is being worked - on but it would be far too early to make any conformance statement about - it at the moment. - " diff --git a/dev-libs/libxml2/patches/libxml2-2.7.3.patch b/dev-libs/libxml2/patches/libxml2-2.7.3.patch deleted file mode 100644 index e8f931a1c..000000000 --- a/dev-libs/libxml2/patches/libxml2-2.7.3.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN libxml2-2.7.3/configure.in libxml2-2.7.3-haiku/configure.in ---- libxml2-2.7.3/configure.in 2009-01-19 06:27:55.000000000 +0000 -+++ libxml2-2.7.3-haiku/configure.in 2009-01-19 06:24:30.000000000 +0000 -@@ -473,7 +473,7 @@ - - dnl Checks for inet libraries: - AC_SEARCH_LIBS(gethostent, [nsl]) --AC_SEARCH_LIBS(setsockopt, [socket net]) -+AC_SEARCH_LIBS(setsockopt, [socket net network]) - AC_SEARCH_LIBS(connect, [inet]) - - dnl Determine what socket length (socklen_t) data type is -@@ -1259,7 +1259,7 @@ - case "$host" in - *mingw*) M_LIBS="" - ;; -- *beos*) M_LIBS="" -+ *beos*|*haiku*) M_LIBS="" - ;; - *) M_LIBS="-lm" - ;; diff --git a/dev-libs/libxml2/libxml2-trunk.diff b/dev-libs/libxml2/patches/libxml2-trunk.diff similarity index 100% rename from dev-libs/libxml2/libxml2-trunk.diff rename to dev-libs/libxml2/patches/libxml2-trunk.diff From 5a72314502a6732f59da2b6c0d3d47f492798f16 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 27 Apr 2013 00:18:23 +0200 Subject: [PATCH 131/587] Convert mkdepend recipe to an actual recipe --- haiku-apps/mkdepend/mkdepend-1.7.recipe | 40 ++++++++++++++++++------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe index c1c6269a8..ed098dbf2 100644 --- a/haiku-apps/mkdepend/mkdepend-1.7.recipe +++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe @@ -1,13 +1,34 @@ -DESCRIPTION="mkdepend" +SUMMARY="MkDepend for BeOS" +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" -SRC_URI="http://ports.haiku-files.org/export/1051/haikuports/trunk/haiku-apps/mkdepend/source/mkdepend-1.7.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +LICENSE="MIT" +COPYRIGHT="1995-2001 Lars Düning. All Rights Reserved" +#SRC_URI="http://ports.haiku-files.org/export/1051/haikuports/trunk/haiku-apps/mkdepend/source/mkdepend-1.7.zip" +SRC_URI="source/mkdepend-1.7.zip" CHECKSUM_MD5="d4ec4fea9dd9b7292b52d780c8ee3387" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + mkdepend = $portVersion + cmd:mkdepend = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + $REQUIRES + cmd:gcc + cmd:ld + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd mkdepend-1.7 rc mkdepend.rdef xres mkdepend.rsrc gcc args.c getargs.c main.c nodes.c reader.c util.c -o mkdepend @@ -15,9 +36,6 @@ BUILD() INSTALL() { - cd mkdepend-1.7 - mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` - cp -a mkdepend ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` + mkdir -p $binDir + cp -a mkdepend $binDir } -LICENSE="MIT" -COPYRIGHT="1995-2001 Lars Düning. All Rights Reserved" From efec81e03688f909424f59c79b0630c538989e9a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 27 Apr 2013 02:55:44 +0200 Subject: [PATCH 132/587] ncurses: Build both wchar and non-wchar libraries --- sys-libs/ncurses/ncurses-5.9.recipe | 53 +++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 11 deletions(-) diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index bfd6e4c84..cefa69f34 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -4,7 +4,7 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz" CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1" LICENSE="MIT" COPYRIGHT="1998-2011 Free Software Foundation, Inc." -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -13,6 +13,7 @@ PROVIDES=" cmd:clear = $portVersion compat >= 5 cmd:infocmp = $portVersion compat >= 5 cmd:infotocap = $portVersion compat >= 5 + cmd:ncurses5_config = $portVersion compat >= 5 cmd:ncursesw5_config = $portVersion compat >= 5 cmd:reset = $portVersion compat >= 5 cmd:tabs = $portVersion compat >= 5 @@ -20,10 +21,15 @@ PROVIDES=" cmd:toe = $portVersion compat >= 5 cmd:tput = $portVersion compat >= 5 cmd:tset = $portVersion compat >= 5 + lib:libform = $portVersion compat >= 5 lib:libformw = $portVersion compat >= 5 + lib:libmenu = $portVersion compat >= 5 lib:libmenuw = $portVersion compat >= 5 - lib:libncurses++w = $portVersion compat >= 5 + lib:libncurses = $portVersion compat >= 5 lib:libncursesw = $portVersion compat >= 5 + lib:libncurses++ = $portVersion compat >= 5 + lib:libncurses++w = $portVersion compat >= 5 + lib:libpanel = $portVersion compat >= 5 lib:libpanelw = $portVersion compat >= 5 " REQUIRES=" @@ -40,27 +46,52 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion " + SOURCE_DIR="$portVersionedName" +doBuild() +{ + if [ $# -lt 1 ]; then + echo >&2 "Usage: doBuild [ ... ]" + exit 1 + fi + + targetDir=$(pwd)/$1 + shift 1 + + rm -rf $targetDir + mkdir $targetDir + + runConfigure \ + --omit-dirs "dataRootDir docDir" ./configure \ + --with-libtool \ + --enable-termcap \ + --enable-hard-tabs \ + $@ + make + make install DESTDIR=$targetDir +} + BUILD() { - runConfigure --omit-dirs "dataRootDir docDir" ./configure \ - --with-libtool \ - --enable-termcap \ - --enable-widec - make + # Unfortunately building only works in the source directory. So we build + # two times, installing in temporary directories from which we copy to the + # actual installation directory in INSTALL(). + doBuild build-nowidec + doBuild build-widec --enable-widec --without-progs } INSTALL() { - ./misc/shlib make install + cp -ra build-nowidec/$prefix/. $prefix + cp -ra build-widec/$prefix/. $prefix # prepare develop/lib - prepareInstalledDevelLibs libformw libmenuw libncursesw libncurses++w \ - libpanelw + prepareInstalledDevelLibs \ + libform libmenu libncurses libncurses++ libpanel \ + libformw libmenuw libncursesw libncurses++w libpanelw } - 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! From 919bfb859dd7a80a6d498c4eb99ab68873f9d2ff Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 27 Apr 2013 03:07:18 +0200 Subject: [PATCH 133/587] Convert libedit recipe to an actual recipe --- dev-libs/libedit/libedit-20120601-3.0.recipe | 24 --------- dev-libs/libedit/libedit-20120601_3.0.recipe | 49 +++++++++++++++++++ ...1-3.0.patch => libedit-20120601_3.0.patch} | 13 ----- 3 files changed, 49 insertions(+), 37 deletions(-) delete mode 100644 dev-libs/libedit/libedit-20120601-3.0.recipe create mode 100644 dev-libs/libedit/libedit-20120601_3.0.recipe rename dev-libs/libedit/patches/{libedit-20120601-3.0.patch => libedit-20120601_3.0.patch} (84%) diff --git a/dev-libs/libedit/libedit-20120601-3.0.recipe b/dev-libs/libedit/libedit-20120601-3.0.recipe deleted file mode 100644 index e2482729a..000000000 --- a/dev-libs/libedit/libedit-20120601-3.0.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="A BSD licensed replacement for the GNU readline library." -HOMEPAGE="http://www.thrysoee.dk/editline/" -SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz" -CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -LICENSE="BSD (3-clause)" -COPYRIGHT="1992-2012 The NetBSD Foundation, Inc." -BUILD() -{ - cd libedit-20120601-3.0 - autoreconf --force --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --disable-shared \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd libedit-20120601-3.0 - make install -} diff --git a/dev-libs/libedit/libedit-20120601_3.0.recipe b/dev-libs/libedit/libedit-20120601_3.0.recipe new file mode 100644 index 000000000..3afddae89 --- /dev/null +++ b/dev-libs/libedit/libedit-20120601_3.0.recipe @@ -0,0 +1,49 @@ +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." +LICENSE="BSD (3-clause)" +COPYRIGHT="1992-2012 The NetBSD Foundation, Inc." +HOMEPAGE="http://www.thrysoee.dk/editline/" +SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz" +CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="libedit-20120601_3.0.patch" + +PROVIDES=" + libedit = $portVersion + lib:libedit = 0.0.41 compat >= 0 + " +REQUIRES=" + haiku >= $haikuVersion + ncurses + " +BUILD_REQUIRES=" + $REQUIRES + cmd:aclocal + cmd:autoreconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="libedit-20120601-3.0" + +BUILD() +{ + autoreconf --force --install + runConfigure ./configure + make +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs libedit + fixPkgconfig +} diff --git a/dev-libs/libedit/patches/libedit-20120601-3.0.patch b/dev-libs/libedit/patches/libedit-20120601_3.0.patch similarity index 84% rename from dev-libs/libedit/patches/libedit-20120601-3.0.patch rename to dev-libs/libedit/patches/libedit-20120601_3.0.patch index 6c2bae550..ffecf61f4 100644 --- a/dev-libs/libedit/patches/libedit-20120601-3.0.patch +++ b/dev-libs/libedit/patches/libedit-20120601_3.0.patch @@ -37,19 +37,6 @@ diff -urN libedit-20120601-3.0/src/editline/readline.h libedit-20120601-3.0-haik #include #endif #ifndef CTRL -diff -urN libedit-20120601-3.0/src/el.c libedit-20120601-3.0-haiku/src/el.c ---- libedit-20120601-3.0/src/el.c 2012-03-11 15:00:23.000000000 -0700 -+++ libedit-20120601-3.0-haiku/src/el.c 2012-06-16 15:01:11.013893632 -0700 -@@ -55,7 +55,9 @@ - #include - #include - #include -+#ifdef HAVE_LANGINFO_H - #include -+#endif - #include "el.h" - - /* el_init(): diff -urN libedit-20120601-3.0/src/vis.c libedit-20120601-3.0-haiku/src/vis.c --- libedit-20120601-3.0/src/vis.c 2011-07-08 23:39:42.000000000 -0700 +++ libedit-20120601-3.0-haiku/src/vis.c 2012-06-16 15:01:11.063176704 -0700 From 05d1087a19172003cf848ebee9f553b1fd5499fa Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 27 Apr 2013 03:09:16 +0200 Subject: [PATCH 134/587] Remove old libedit non-recipes/patches --- dev-libs/libedit/libedit-20090923.recipe | 21 ------ dev-libs/libedit/libedit-20100424.recipe | 24 ------- dev-libs/libedit/libedit-20110802-3.0.recipe | 24 ------- .../libedit/patches/libedit-20090923.patch | 66 ------------------- .../libedit/patches/libedit-20100424.patch | 66 ------------------- .../patches/libedit-20110802-3.0.patch | 66 ------------------- 6 files changed, 267 deletions(-) delete mode 100644 dev-libs/libedit/libedit-20090923.recipe delete mode 100644 dev-libs/libedit/libedit-20100424.recipe delete mode 100644 dev-libs/libedit/libedit-20110802-3.0.recipe delete mode 100644 dev-libs/libedit/patches/libedit-20090923.patch delete mode 100644 dev-libs/libedit/patches/libedit-20100424.patch delete mode 100644 dev-libs/libedit/patches/libedit-20110802-3.0.patch diff --git a/dev-libs/libedit/libedit-20090923.recipe b/dev-libs/libedit/libedit-20090923.recipe deleted file mode 100644 index bb2f281aa..000000000 --- a/dev-libs/libedit/libedit-20090923.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="libedit - A BSD licensed replacement for the GNU readline library." -HOMEPAGE="http://www.thrysoee.dk/editline/" -SRC_URI="http://www.thrysoee.dk/editline/libedit-20090923-3.0.tar.gz" -CHECKSUM_MD5="1e6dad38e8499d71b9c78045e5536734" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libedit-20090923-3.0 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libedit-20090923-3.0 - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="1992-2010 The NetBSD Foundation, Inc." diff --git a/dev-libs/libedit/libedit-20100424.recipe b/dev-libs/libedit/libedit-20100424.recipe deleted file mode 100644 index 9618ab12f..000000000 --- a/dev-libs/libedit/libedit-20100424.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="A BSD licensed replacement for the GNU readline library." -HOMEPAGE="http://www.thrysoee.dk/editline/" -SRC_URI="http://ports-space.haiku-files.org/dev-libs/source/libedit-20100424-3.0.tar.gz" -CHECKSUM_MD5="eb4482139525beff12c8ef59f1a84aae" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -LICENSE="BSD (3-clause)" -COPYRIGHT="1992-2010 The NetBSD Foundation, Inc." -BUILD() -{ - cd libedit-20100424-3.0 - autoreconf --force --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --disable-shared \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd libedit-20100424-3.0 - make install -} diff --git a/dev-libs/libedit/libedit-20110802-3.0.recipe b/dev-libs/libedit/libedit-20110802-3.0.recipe deleted file mode 100644 index 36fda7353..000000000 --- a/dev-libs/libedit/libedit-20110802-3.0.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="A BSD licensed replacement for the GNU readline library." -HOMEPAGE="http://www.thrysoee.dk/editline/" -SRC_URI="http://www.thrysoee.dk/editline/libedit-20110802-3.0.tar.gz" -CHECKSUM_MD5="0ea42e2c794da8ed32f6307b427f6590" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -LICENSE="BSD (3-clause)" -COPYRIGHT="1992-2011 The NetBSD Foundation, Inc." -BUILD() -{ - cd libedit-20110802-3.0 - autoreconf --force --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --disable-shared \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd libedit-20110802-3.0 - make install -} diff --git a/dev-libs/libedit/patches/libedit-20090923.patch b/dev-libs/libedit/patches/libedit-20090923.patch deleted file mode 100644 index c706156d4..000000000 --- a/dev-libs/libedit/patches/libedit-20090923.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ur libedit-20090923-3.0/examples/fileman.c libedit-20090923-3.0-haiku/examples/fileman.c ---- libedit-20090923-3.0/examples/fileman.c 2008-07-12 02:41:43.000000000 -0600 -+++ libedit-20090923-3.0-haiku/examples/fileman.c 2009-10-29 15:35:57.000000000 -0600 -@@ -11,7 +11,11 @@ - #include - #include - #include -+#if defined(__HAIKU__) -+#include -+#else - #include -+#endif - #include - #include - #include -diff -ur libedit-20090923-3.0/src/editline/readline.h libedit-20090923-3.0-haiku/src/editline/readline.h ---- libedit-20090923-3.0/src/editline/readline.h 2009-09-23 15:04:26.000000000 -0600 -+++ libedit-20090923-3.0-haiku/src/editline/readline.h 2009-10-29 15:35:17.000000000 -0600 -@@ -75,7 +75,7 @@ - - #ifndef CTRL - #include --#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) -+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__) - #include - #endif - #ifndef CTRL -diff -ur libedit-20090923-3.0/src/el.c libedit-20090923-3.0-haiku/src/el.c ---- libedit-20090923-3.0/src/el.c 2009-09-23 15:04:26.000000000 -0600 -+++ libedit-20090923-3.0-haiku/src/el.c 2009-10-29 15:30:46.000000000 -0600 -@@ -41,10 +41,6 @@ - #endif - #endif /* not lint && not SCCSID */ - --#ifndef MAXPATHLEN --#define MAXPATHLEN 4096 --#endif -- - /* - * el.c: EditLine interface functions - */ -@@ -56,6 +52,10 @@ - #include - #include "el.h" - -+#ifndef MAXPATHLEN -+#define MAXPATHLEN 4096 -+#endif -+ - /* el_init(): - * Initialize editline and set default parameters. - */ -diff -ur libedit-20090923-3.0/src/vis.c libedit-20090923-3.0-haiku/src/vis.c ---- libedit-20090923-3.0/src/vis.c 2009-09-23 15:04:26.000000000 -0600 -+++ libedit-20090923-3.0-haiku/src/vis.c 2009-10-29 15:34:45.000000000 -0600 -@@ -65,6 +65,10 @@ - #include - #include - -+#if defined(__HAIKU__) -+#include -+#endif -+ - #ifdef __weak_alias - __weak_alias(strsvis,_strsvis) - __weak_alias(strsvisx,_strsvisx) diff --git a/dev-libs/libedit/patches/libedit-20100424.patch b/dev-libs/libedit/patches/libedit-20100424.patch deleted file mode 100644 index 9ed2ec6b6..000000000 --- a/dev-libs/libedit/patches/libedit-20100424.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -up libedit-20100424-3.0/configure.ac.orig libedit-20100424-3.0/configure.ac ---- libedit-20100424-3.0/configure.ac.orig 2010-04-29 17:13:51.201588736 -0600 -+++ libedit-20100424-3.0/configure.ac 2010-04-29 17:13:56.768344064 -0600 -@@ -46,7 +46,7 @@ AC_FUNC_ALLOCA - AC_HEADER_DIRENT - AC_HEADER_STDC - AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h]) -+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdint.h stdlib.h string.h sys/errno.h errno.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h langinfo.h]) - - AC_CHECK_HEADER([termios.h], [], [AC_MSG_ERROR([termios.h is required!])],[]) - -diff -up libedit-20100424-3.0/examples/fileman.c.orig libedit-20100424-3.0/examples/fileman.c ---- libedit-20100424-3.0/examples/fileman.c.orig 2010-04-29 17:11:46.768868352 -0600 -+++ libedit-20100424-3.0/examples/fileman.c 2010-04-29 17:11:53.987496448 -0600 -@@ -11,7 +11,11 @@ - #include - #include - #include -+#ifdef HAVE_SYS_ERRNO_H - #include -+#elif HAVE_ERRNO_H -+#include -+#endif - #include - #include - #include -diff -up libedit-20100424-3.0/src/el.c.orig libedit-20100424-3.0/src/el.c ---- libedit-20100424-3.0/src/el.c.orig 2010-04-29 17:13:07.215482368 -0600 -+++ libedit-20100424-3.0/src/el.c 2010-04-29 17:13:27.866385920 -0600 -@@ -55,7 +55,9 @@ __RCSID("$NetBSD: el.c,v 1.59 2010/04/15 - #include - #include - #include -+#ifdef HAVE_LANGINFO_H - #include -+#endif - #include "el.h" - - /* el_init(): -diff -up libedit-20100424-3.0/src/vis.c.orig libedit-20100424-3.0/src/vis.c ---- libedit-20100424-3.0/src/vis.c.orig 2010-04-29 17:12:31.912261120 -0600 -+++ libedit-20100424-3.0/src/vis.c 2010-04-29 17:12:56.681574400 -0600 -@@ -67,6 +67,10 @@ __RCSID("$NetBSD: vis.c,v 1.41 2009/11/2 - #include - #include - -+#ifdef HAVE_STDINT_H -+#include -+#endif -+ - #ifdef __weak_alias - __weak_alias(strsvis,_strsvis) - __weak_alias(strsvisx,_strsvisx) -diff -up libedit-20100424-3.0/src/editline/readline.h.orig libedit-20100424-3.0/src/editline/readline.h ---- libedit-20100424-3.0/src/editline/readline.h.orig 2010-04-29 17:12:05.235143168 -0600 -+++ libedit-20100424-3.0/src/editline/readline.h 2010-04-29 17:12:16.735313920 -0600 -@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap; - - #ifndef CTRL - #include --#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) -+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__) - #include - #endif - #ifndef CTRL diff --git a/dev-libs/libedit/patches/libedit-20110802-3.0.patch b/dev-libs/libedit/patches/libedit-20110802-3.0.patch deleted file mode 100644 index 9fb782c91..000000000 --- a/dev-libs/libedit/patches/libedit-20110802-3.0.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -urN libedit-20110802-3.0/configure.ac libedit-20110802-3.0-haiku/configure.ac ---- libedit-20110802-3.0/configure.ac 2011-08-02 01:09:05.036962304 -0700 -+++ libedit-20110802-3.0-haiku/configure.ac 2012-06-16 10:41:31.579338240 -0700 -@@ -64,7 +64,7 @@ - AC_HEADER_DIRENT - AC_HEADER_STDC - AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h termcap.h]) -+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdint.h stdlib.h string.h sys/errno.h errno.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h langinfo.h]) - - AC_CHECK_HEADER([termios.h], [], [AC_MSG_ERROR([termios.h is required!])],[]) - -diff -urN libedit-20110802-3.0/examples/fileman.c libedit-20110802-3.0-haiku/examples/fileman.c ---- libedit-20110802-3.0/examples/fileman.c 2010-04-22 12:13:17.046137344 -0700 -+++ libedit-20110802-3.0-haiku/examples/fileman.c 2012-06-16 10:41:31.721944576 -0700 -@@ -11,7 +11,11 @@ - #include - #include - #include -+#ifdef HAVE_SYS_ERRNO_H - #include -+#elif HAVE_ERRNO_H -+#include -+#endif - #include - #include - #include -diff -urN libedit-20110802-3.0/src/editline/readline.h libedit-20110802-3.0-haiku/src/editline/readline.h ---- libedit-20110802-3.0/src/editline/readline.h 2011-02-26 14:42:59.045088768 -0800 -+++ libedit-20110802-3.0-haiku/src/editline/readline.h 2012-06-16 10:41:32.068943872 -0700 -@@ -75,7 +75,7 @@ - - #ifndef CTRL - #include --#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) -+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__) - #include - #endif - #ifndef CTRL -diff -urN libedit-20110802-3.0/src/el.c libedit-20110802-3.0-haiku/src/el.c ---- libedit-20110802-3.0/src/el.c 2011-08-02 00:02:46.039583744 -0700 -+++ libedit-20110802-3.0-haiku/src/el.c 2012-06-16 10:41:31.823394304 -0700 -@@ -55,7 +55,9 @@ - #include - #include - #include -+#ifdef HAVE_LANGINFO_H - #include -+#endif - #include "el.h" - - /* el_init(): -diff -urN libedit-20110802-3.0/src/vis.c libedit-20110802-3.0-haiku/src/vis.c ---- libedit-20110802-3.0/src/vis.c 2011-07-08 23:39:42.044564480 -0700 -+++ libedit-20110802-3.0-haiku/src/vis.c 2012-06-16 10:41:31.985137152 -0700 -@@ -68,6 +68,10 @@ - #include - #include - -+#ifdef HAVE_STDINT_H -+#include -+#endif -+ - #ifdef __weak_alias - __weak_alias(strvisx,_strvisx) - #endif From 8167741595a518a2aa916de430da8a56e7be3481 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 27 Apr 2013 21:32:59 +0200 Subject: [PATCH 135/587] Adjust libtool a bit more to our needs. * add /boot/common/develop/lib to link-time library search path * configure libtool to not hardcode run-time paths into libraries --- sys-devel/libtool/libtool-2.4.recipe | 2 +- .../2.4/adjust_config_for_packaging.patch | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index 3cd499b72..19406dfdf 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -6,7 +6,7 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/libtool" SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz" CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 ?x86" PATCHES=" diff --git a/sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch b/sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch index e8a419a7f..53cdd3033 100644 --- a/sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch +++ b/sys-devel/libtool/patches/2.4/adjust_config_for_packaging.patch @@ -1,18 +1,17 @@ Adjust haiku configuration of upstream libtool for packaging. -diff -ur libtool-2.4/libltdl/m4/libtool.m4 libtool-2.4/libltdl/m4/libtool.m4 ---- libtool-2.4/libltdl/m4/libtool.m4 2010-09-22 08:41:19.064749568 +0000 -+++ libtool-2.4/libltdl/m4/libtool.m4 2011-07-24 16:58:02.885260288 +0000 -@@ -2472,8 +2472,10 @@ - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +diff -ruwN libtool-2.4/libltdl/m4/libtool.m4 libtool-2.4_haiku/libltdl/m4/libtool.m4 +--- libtool-2.4/libltdl/m4/libtool.m4 2010-09-22 10:41:19.021233664 +0200 ++++ libtool-2.4_haiku/libltdl/m4/libtool.m4 2013-04-27 21:00:11.784859136 +0200 +@@ -2473,8 +2473,9 @@ soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH -- shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' -+ shlibpath_overrides_runpath=no -+ # TODO: The /boot/common search path should also develop/lib! -+ sys_lib_search_path_spec='/boot/common/non-packaged/lib /boot/common/lib /boot/system/develop/lib' +- hardcode_into_libs=yes ++ sys_lib_search_path_spec='/boot/common/non-packaged/lib /boot/common/develop/lib /boot/common/lib /boot/system/develop/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/common/non-packaged/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes ++ hardcode_into_libs=no ;; + hpux9* | hpux10* | hpux11*) From 6c1601cf8f7597188f79e644c09427c9e34123ca Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 27 Apr 2013 21:46:04 +0200 Subject: [PATCH 136/587] turn apr-1.4.6.recipe into an actual recipe --- dev-libs/apr/apr-1.4.6.recipe | 89 +++++++++++++++++++++++++++-------- 1 file changed, 69 insertions(+), 20 deletions(-) diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe index 0d6e54591..971229796 100644 --- a/dev-libs/apr/apr-1.4.6.recipe +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -1,42 +1,91 @@ -DESCRIPTION="apr - Apache Portable Runtime Library" +SUMMARY="Apache Portable Runtime Library" HOMEPAGE="http://apr.apache.org/" SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz" +COPYRIGHT="2012 The Apache Software Foundation." +LICENSE="Apache v2" CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb" -REVISION="4" -STATUS_HAIKU="stable" -DEPEND="" +REVISION="5" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + apr = $portVersion compat >= 1 + lib:libapr = $portVersion compat >= 1 + lib:libapr_1 = $portVersion compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd apr-1.4.6 libtoolize -fci touch libtool.m4 aclocal -I build autoconf - ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + runConfigure ./configure \ + --with-installbuilddir=$prefix/data/apr + + # TODO: fix this hack (by finding out why top_builddir seems to be unset)! + ln -sfn $sourceDir/libtool /libtool + make } INSTALL() { - cd apr-1.4.6 make install + + # prepare develop/lib + prepareInstalledDevelLibs libapr-1 + fixPkgconfig } TEST() { - cd apr-1.4.6 make test } -LICENSE="Apache v2" -COPYRIGHT="2012 The Apache Software Foundation." +# ----- source package ------------------------------------------------------- + +PROVIDES_source="apr_source = $portVersion compat = $portVersion" + +# ----- 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) + " From 10f83b5733e2a84356d86375d09d299c0123655a Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 27 Apr 2013 21:47:50 +0200 Subject: [PATCH 137/587] Drop obsolete unconverted recipe files --- dev-libs/apr/apr-1.3.8.recipe | 22 ------------------ dev-libs/apr/apr-1.3.9.recipe | 23 ------------------- dev-libs/apr/apr-1.4.4.recipe | 42 ----------------------------------- dev-libs/apr/apr-1.4.5.recipe | 42 ----------------------------------- 4 files changed, 129 deletions(-) delete mode 100644 dev-libs/apr/apr-1.3.8.recipe delete mode 100644 dev-libs/apr/apr-1.3.9.recipe delete mode 100644 dev-libs/apr/apr-1.4.4.recipe delete mode 100644 dev-libs/apr/apr-1.4.5.recipe diff --git a/dev-libs/apr/apr-1.3.8.recipe b/dev-libs/apr/apr-1.3.8.recipe deleted file mode 100644 index be0c3c309..000000000 --- a/dev-libs/apr/apr-1.3.8.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="apr - Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://www.apache.org/dist/apr/apr-1.3.8.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd apr-1.3.8 - libtoolize --force --copy --install - buildconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd apr-1.3.8 - make install -} -LICENSE="Apache v2" -COPYRIGHT="2010 The Apache Software Foundation." diff --git a/dev-libs/apr/apr-1.3.9.recipe b/dev-libs/apr/apr-1.3.9.recipe deleted file mode 100644 index 8a9b44563..000000000 --- a/dev-libs/apr/apr-1.3.9.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="apr - Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://www.apache.org/dist/apr/apr-1.3.9.tar.gz" -CHECKSUM_MD5="85bcd8005153b8fa63b1e3f95ea31f07" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd apr-1.3.9 - libtoolize --force --copy --install - buildconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd apr-1.3.9 - make install -} -LICENSE="Apache v2" -COPYRIGHT="2010 The Apache Software Foundation." diff --git a/dev-libs/apr/apr-1.4.4.recipe b/dev-libs/apr/apr-1.4.4.recipe deleted file mode 100644 index 0d3ffc1fa..000000000 --- a/dev-libs/apr/apr-1.4.4.recipe +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION="apr - Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://www.apache.org/dist/apr/apr-1.4.4.tar.gz" -CHECKSUM_MD5="9d70b96d4d7f7449f9c3cc81a691c5bf" -REVISION="3" -STATUS_HAIKU="broken" -DEPEND="" -BUILD() -{ - cd apr-1.4.4 - libtoolize -fci - touch libtool.m4 - aclocal -I build - autoconf - ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd apr-1.4.4 - make install -} - -TEST() -{ - cd apr-1.4.4 - make test -} - -LICENSE="Apache v2" -COPYRIGHT="2010 The Apache Software Foundation." diff --git a/dev-libs/apr/apr-1.4.5.recipe b/dev-libs/apr/apr-1.4.5.recipe deleted file mode 100644 index 750e66449..000000000 --- a/dev-libs/apr/apr-1.4.5.recipe +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION="apr - Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://www.apache.org/dist/apr/apr-1.4.5.tar.gz" -CHECKSUM_MD5="97262fe54dddaf583eaaee3497a426e1" -REVISION="4" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd apr-1.4.5 - libtoolize -fci - touch libtool.m4 - aclocal -I build - autoconf - ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool /libtool - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd apr-1.4.5 - make install -} - -TEST() -{ - cd apr-1.4.5 - make test -} - -LICENSE="Apache v2" -COPYRIGHT="2011 The Apache Software Foundation." From 5ea51163d35110e8abbe583f5ef7bc0dfec216da Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 27 Apr 2013 21:49:38 +0200 Subject: [PATCH 138/587] Rename apr-util-1.4.6.recipe and convert it to an actual recipe --- dev-libs/apr_util/apr-util-1.3.11.recipe | 51 ------------ dev-libs/apr_util/apr-util-1.3.12.recipe | 51 ------------ dev-libs/apr_util/apr-util-1.3.9.recipe | 49 ----------- dev-libs/apr_util/apr-util-1.4.1.recipe | 51 ------------ dev-libs/apr_util/apr_util-1.4.1.recipe | 100 +++++++++++++++++++++++ 5 files changed, 100 insertions(+), 202 deletions(-) delete mode 100644 dev-libs/apr_util/apr-util-1.3.11.recipe delete mode 100644 dev-libs/apr_util/apr-util-1.3.12.recipe delete mode 100644 dev-libs/apr_util/apr-util-1.3.9.recipe delete mode 100644 dev-libs/apr_util/apr-util-1.4.1.recipe create mode 100644 dev-libs/apr_util/apr_util-1.4.1.recipe diff --git a/dev-libs/apr_util/apr-util-1.3.11.recipe b/dev-libs/apr_util/apr-util-1.3.11.recipe deleted file mode 100644 index 8427643e5..000000000 --- a/dev-libs/apr_util/apr-util-1.3.11.recipe +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION="apr-util - Apache Portable Runtime Utility Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.11.tar.gz" -CHECKSUM_MD5="bfc16065a784785dd356dc4067fe2504" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.3.9" -BUILD() -{ - cd apr-util-1.3.11 - rm -rf aclocal.m4 - mkdir -p m4 - haikuporter -b apr-1.4.2 - libtoolize -fci - aclocal --install -I m4 - autoconf -f - cd xml/expat - mkdir -p m4 - echo `AM_INIT_AUTOMAKE` >> configure.in - libtoolize -fci - aclocal --install -I m4 - autoconf --force - autoheader - touch libtool.m4 - cd ../.. - sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.2/build/gen-build.py - buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.2 \ - --prefix=`finddir B_COMMON_DIRECTORY` - ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config - make -} - -INSTALL() -{ - cd apr-util-1.3.11 - make install -} - -LICENSE="Apache v2" -COPYRIGHT="2010 The Apache Software Foundation." diff --git a/dev-libs/apr_util/apr-util-1.3.12.recipe b/dev-libs/apr_util/apr-util-1.3.12.recipe deleted file mode 100644 index 215237a3c..000000000 --- a/dev-libs/apr_util/apr-util-1.3.12.recipe +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION="apr-util - Apache Portable Runtime Utility Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.3.12.tar.gz" -CHECKSUM_MD5="d1977289889592ef998e3f777f68efe4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.3.9" -BUILD() -{ - cd apr-util-1.3.12 - rm -rf aclocal.m4 - mkdir -p m4 - haikuporter -b apr-1.4.5 - libtoolize -fci - aclocal --install -I m4 - autoconf -f - cd xml/expat - mkdir -p m4 - echo `AM_INIT_AUTOMAKE` >> configure.in - libtoolize -fci - aclocal --install -I m4 - autoconf --force - autoheader - touch libtool.m4 - cd ../.. - sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.5/build/gen-build.py - buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.5 \ - --prefix=`finddir B_COMMON_DIRECTORY` - ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config - make -} - -INSTALL() -{ - cd apr-util-1.3.12 - make install -} - -LICENSE="Apache v2" -COPYRIGHT="2011 The Apache Software Foundation." diff --git a/dev-libs/apr_util/apr-util-1.3.9.recipe b/dev-libs/apr_util/apr-util-1.3.9.recipe deleted file mode 100644 index 896323400..000000000 --- a/dev-libs/apr_util/apr-util-1.3.9.recipe +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION="apr-util - Apache Portable Runtime Utility Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://apache.multihomed.net/apr/apr-util-1.3.9.tar.gz" -CHECKSUM_MD5="cc2ec0ba4f01d88375f1170f762518fa" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.3.9" -BUILD() -{ - cd apr-util-1.3.9 - rm -rf aclocal.m4 - mkdir -p m4 - haikuporter -b apr-1.4.2 - echo `AC_CONFIG_MACRO_DIR([m4])` >> configure.in - echo `AM_INIT_AUTOMAKE` >> configure.in - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 - libtoolize --force --copy --install - aclocal -I m4 - autoconf --force - APRDIR=`haikuporter -t` - buildconf --with-apr=${APRDIR}/dev-libs/apr/work/apr-1.4.2 - cd xml/expat - mkdir -p m4 - echo `AM_INIT_AUTOMAKE` >> configure.in - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 - libtoolize --force --copy --install - aclocal -I m4 - autoconf --force - autoheader - cd ../.. - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config - make -} - -INSTALL() -{ - cd apr-util-1.3.9 - make install -} -LICENSE="Apache v2" -COPYRIGHT="2009 The Apache Software Foundation." diff --git a/dev-libs/apr_util/apr-util-1.4.1.recipe b/dev-libs/apr_util/apr-util-1.4.1.recipe deleted file mode 100644 index c5878e7ef..000000000 --- a/dev-libs/apr_util/apr-util-1.4.1.recipe +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION="apr-util - Apache Portable Runtime Utility Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz" -CHECKSUM_MD5="666a5d56098a9debf998510e304c8095" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr == 1.4.6" -BUILD() -{ - cd apr-util-1.4.1 - rm -rf aclocal.m4 - mkdir -p m4 - haikuporter -b apr-1.4.6 - libtoolize -fci - aclocal --install -I m4 - autoconf -f - cd xml/expat - mkdir -p m4 - echo `AM_INIT_AUTOMAKE` >> configure.in - libtoolize -fci - aclocal --install -I m4 - autoconf --force - autoheader - touch libtool.m4 - cd ../.. - sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.6/build/gen-build.py - buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.6 \ - --prefix=`finddir B_COMMON_DIRECTORY` - ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config - make -} - -INSTALL() -{ - cd apr-util-1.4.1 - make install -} - -LICENSE="Apache v2" -COPYRIGHT="2011 The Apache Software Foundation." diff --git a/dev-libs/apr_util/apr_util-1.4.1.recipe b/dev-libs/apr_util/apr_util-1.4.1.recipe new file mode 100644 index 000000000..bb4b7243e --- /dev/null +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -0,0 +1,100 @@ +SUMMARY="Apache Portable Runtime Utility Library" +HOMEPAGE="http://apr.apache.org/" +SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz" +LICENSE="Apache v2" +COPYRIGHT="2011 The Apache Software Foundation." +CHECKSUM_MD5="666a5d56098a9debf998510e304c8095" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + apr_util = $portVersion compat >= 1 + lib:libaprutil = $portVersion compat >= 1 + lib:libaprutil_1 = $portVersion compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + apr >= 1.4.6 + expat >= 2.0 + " +BUILD_REQUIRES=" + $REQUIRES + cmd:aclocal + cmd:autoconf + cmd:autoheader + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName + aprInstallDir=$aprUtilPackageLinksDir/apr + expatInstallDir=$aprUtilPackageLinksDir/expat + + rm -rf aclocal.m4 + mkdir -p m4 + libtoolize -fci + aclocal --install -I m4 + autoconf -f + cd xml/expat + mkdir -p m4 + echo 'AM_INIT_AUTOMAKE' >> configure.in + libtoolize -fci + aclocal --install -I m4 + autoconf --force + autoheader + touch libtool.m4 + cd ../.. + + # TODO: fix this hack! + cp /boot/common/bin/libtool . + ln -sfn $sourceDir/libtool /libtool + + ./configure $configureDirArgs \ + --with-apr=$aprInstallDir \ + --with-expat=$expatInstallDir + make +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs libaprutil-1 + fixPkgconfig +} + +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) + " From 979e9ff5a0549431500aa3e31432420738c134ef Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 27 Apr 2013 21:56:23 +0200 Subject: [PATCH 139/587] Reinstate correct architecture definition for autoconf-2.68 --- sys-devel/autoconf/autoconf-2.68.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index 29e89a89e..11cbe49f1 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnu.org/software/autoconf/" SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.68.tar.bz2" CHECKSUM_MD5="864d785215aa60d627c91fcb21b05b07" REVISION="5" -ARCHITECTURES="?x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 ?x86" LICENSE=" GNU GPL v2 GNU GPL v3" From 4a44285fa71e17696b183eef8af5a856fc2c3ec8 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 27 Apr 2013 21:57:42 +0200 Subject: [PATCH 140/587] Reinstate correct architectures definition for automake-1.11.1 --- sys-devel/automake/automake-1.11.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe index 36fb1aed4..d9c1e9f9e 100644 --- a/sys-devel/automake/automake-1.11.1.recipe +++ b/sys-devel/automake/automake-1.11.1.recipe @@ -11,7 +11,7 @@ LICENSE="GNU GPL v2" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.gz" CHECKSUM_MD5="4ee7f0ff5f0e467d58b6bd5da96b1c74" REVISION="5" -ARCHITECTURES="?x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" automake = $portVersion compat >= 1.11 From 63e08235422a4afa92bea1ffab8f145f3e7ee933 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 27 Apr 2013 23:17:51 +0200 Subject: [PATCH 141/587] Convert curl-7.26.0.recipe to an actual recipe --- net-misc/curl/curl-7.26.0.recipe | 67 ++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 12 deletions(-) diff --git a/net-misc/curl/curl-7.26.0.recipe b/net-misc/curl/curl-7.26.0.recipe index 1e3eac980..f55ce9f7c 100644 --- a/net-misc/curl/curl-7.26.0.recipe +++ b/net-misc/curl/curl-7.26.0.recipe @@ -1,33 +1,76 @@ -DESCRIPTION="curl and libcurl" +SUMMARY="A commandline-tool and library for downloading data from URLs" HOMEPAGE="http://curl.haxx.se" +COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." +LICENSE="Curl" SRC_URI="http://curl.haxx.se/download/curl-7.26.0.tar.bz2" CHECKSUM_MD5="bfa80f01b3d300359cfb4d409b6136a3" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="x86_gcc2 ?x86" + +# libcurl's SONAME is bumped whenever backward compat is broken, v7.16 +# introduced SO-version 4, which is still current +PROVIDES=" + curl = $portVersion + cmd:curl = $portVersion compat >= 7.16 + lib:libcurl = $portVersion compat >= 7.16 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libssl + " +BUILD_REQUIRES=" + lib:libssl + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd curl-7.26.0 libtoolize --force --copy --install autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem + ./configure $configureDirArgs \ + --enable-ipv6 make } INSTALL() { - cd curl-7.26.0 make install + + # prepare develop/lib + prepareInstalledDevelLibs libcurl + fixPkgconfig + + # install html documentation for curl + mkdir -p "$docDir" + install -c -m 644 "docs/curl.html" "$docDir" + + # install html development documentation for libcurl + mkdir -p "$developDocDir" + for h in docs/libcurl/*.html; do + install -c -m 644 "$h" "$developDocDir" + done } TEST() { - cd curl-7.26.0 make check } -LICENSE="Curl" -COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." +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. + " From 5f0a3cf2f73e497854ed6a08e2b322bb4eab7bb6 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 27 Apr 2013 23:20:12 +0200 Subject: [PATCH 142/587] Remove obsolete unconverted recipes for curl. --- net-misc/curl/curl-7.18.2.recipe | 25 ------------------------ net-misc/curl/curl-7.19.1.recipe | 25 ------------------------ net-misc/curl/curl-7.19.2.recipe | 25 ------------------------ net-misc/curl/curl-7.19.5.recipe | 25 ------------------------ net-misc/curl/curl-7.19.7.recipe | 21 -------------------- net-misc/curl/curl-7.20.0.recipe | 23 ---------------------- net-misc/curl/curl-7.20.1.recipe | 23 ---------------------- net-misc/curl/curl-7.21.1.recipe | 23 ---------------------- net-misc/curl/curl-7.21.2.recipe | 23 ---------------------- net-misc/curl/curl-7.21.3.recipe | 30 ----------------------------- net-misc/curl/curl-7.21.4.recipe | 32 ------------------------------- net-misc/curl/curl-7.21.6.recipe | 32 ------------------------------- net-misc/curl/curl-7.21.7.recipe | 33 -------------------------------- net-misc/curl/curl-7.24.0.recipe | 33 -------------------------------- net-misc/curl/curl-7.25.0.recipe | 33 -------------------------------- 15 files changed, 406 deletions(-) delete mode 100644 net-misc/curl/curl-7.18.2.recipe delete mode 100644 net-misc/curl/curl-7.19.1.recipe delete mode 100644 net-misc/curl/curl-7.19.2.recipe delete mode 100644 net-misc/curl/curl-7.19.5.recipe delete mode 100644 net-misc/curl/curl-7.19.7.recipe delete mode 100644 net-misc/curl/curl-7.20.0.recipe delete mode 100644 net-misc/curl/curl-7.20.1.recipe delete mode 100644 net-misc/curl/curl-7.21.1.recipe delete mode 100644 net-misc/curl/curl-7.21.2.recipe delete mode 100644 net-misc/curl/curl-7.21.3.recipe delete mode 100644 net-misc/curl/curl-7.21.4.recipe delete mode 100644 net-misc/curl/curl-7.21.6.recipe delete mode 100644 net-misc/curl/curl-7.21.7.recipe delete mode 100644 net-misc/curl/curl-7.24.0.recipe delete mode 100644 net-misc/curl/curl-7.25.0.recipe diff --git a/net-misc/curl/curl-7.18.2.recipe b/net-misc/curl/curl-7.18.2.recipe deleted file mode 100644 index 5c903e97f..000000000 --- a/net-misc/curl/curl-7.18.2.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/ curl-7.18.2.tar.bz2" -CHECKSUM_MD5="c389be5b0525276e58865956b7465562" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.18.2 - libtoolize --force --copy - aclocal - automake - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd curl-7.18.2 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.19.1.recipe b/net-misc/curl/curl-7.19.1.recipe deleted file mode 100644 index 5210c9985..000000000 --- a/net-misc/curl/curl-7.19.1.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/ curl-7.19.1.tar.bz2" -CHECKSUM_MD5="6c4921e55ad276154065052c9e34e1cb" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.19.1 - libtoolize --force --copy - aclocal - automake - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd curl-7.19.1 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.19.2.recipe b/net-misc/curl/curl-7.19.2.recipe deleted file mode 100644 index 806c637a5..000000000 --- a/net-misc/curl/curl-7.19.2.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/ curl-7.19.2.tar.bz2" -CHECKSUM_MD5="3a461b145a4a31fe7d5a44684e7fbdbc" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.19.2 - libtoolize --force --copy - aclocal - automake - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd curl-7.19.2 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.19.5.recipe b/net-misc/curl/curl-7.19.5.recipe deleted file mode 100644 index 8cda1fcf2..000000000 --- a/net-misc/curl/curl-7.19.5.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/ curl-7.19.5.tar.bz2" -CHECKSUM_MD5="426d161661dce70c8ea9ad8f553363a3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.19.5 - libtoolize --force --copy - aclocal - automake - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd curl-7.19.5 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.19.7.recipe b/net-misc/curl/curl-7.19.7.recipe deleted file mode 100644 index 5ef534c41..000000000 --- a/net-misc/curl/curl-7.19.7.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.19.7.tar.gz" -CHECKSUM_MD5="ecb2e37e45c9933e2a963cabe03670ab" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.19.7 - cmake -DCMAKE_INSTALL_PREFIX=`finddir B_COMMON_DIRECTORY` -DCURL_DISABLE_LDAP=ON . - make -} - -INSTALL() -{ - cd curl-7.19.7 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.20.0.recipe b/net-misc/curl/curl-7.20.0.recipe deleted file mode 100644 index d65fac283..000000000 --- a/net-misc/curl/curl-7.20.0.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.20.0.tar.bz2" -CHECKSUM_MD5="3dda78c4a808d9a779dc3a2ae81b47d8" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.20.0 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd curl-7.20.0 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.20.1.recipe b/net-misc/curl/curl-7.20.1.recipe deleted file mode 100644 index 3042ce4a0..000000000 --- a/net-misc/curl/curl-7.20.1.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.20.1.tar.bz2" -CHECKSUM_MD5="244b16b2a38c70e47130c8494b7371b9" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.20.1 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd curl-7.20.1 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.21.1.recipe b/net-misc/curl/curl-7.21.1.recipe deleted file mode 100644 index 18ef3caf8..000000000 --- a/net-misc/curl/curl-7.21.1.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.21.1.tar.bz2" -CHECKSUM_MD5="eafde5b933bce1c1dca82d1054c8d967" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.21.1 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd curl-7.21.1 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.21.2.recipe b/net-misc/curl/curl-7.21.2.recipe deleted file mode 100644 index 2afa1f2cc..000000000 --- a/net-misc/curl/curl-7.21.2.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.21.2.tar.bz2" -CHECKSUM_MD5="ca96df88e044c7c25d19692ec8b250b2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.21.2 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd curl-7.21.2 - make install -} -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.21.3.recipe b/net-misc/curl/curl-7.21.3.recipe deleted file mode 100644 index 59cc61d4d..000000000 --- a/net-misc/curl/curl-7.21.3.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.21.3.tar.bz2" -CHECKSUM_MD5="5b57fee22090b5c43a6886fdd35af2ce" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.21.3 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd curl-7.21.3 - make install -} - -TEST() -{ - cd curl-7.21.3 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2010, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.21.4.recipe b/net-misc/curl/curl-7.21.4.recipe deleted file mode 100644 index ea31867da..000000000 --- a/net-misc/curl/curl-7.21.4.recipe +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.21.4.tar.bz2" -CHECKSUM_MD5="e2dd20c88a7d01c745af9d788545ab2a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.21.4 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd curl-7.21.4 - make install -} - -TEST() -{ - cd curl-7.21.4 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2011, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.21.6.recipe b/net-misc/curl/curl-7.21.6.recipe deleted file mode 100644 index 85ee980e4..000000000 --- a/net-misc/curl/curl-7.21.6.recipe +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.21.6.tar.bz2" -CHECKSUM_MD5="6611989a81ebd7b03a35adc3001ddee0" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.21.6 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd curl-7.21.6 - make install -} - -TEST() -{ - cd curl-7.21.6 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2011, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.21.7.recipe b/net-misc/curl/curl-7.21.7.recipe deleted file mode 100644 index c3b091d38..000000000 --- a/net-misc/curl/curl-7.21.7.recipe +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.21.7.tar.bz2" -CHECKSUM_MD5="5f6d50c4d4ee38c57fe37e3cff75adbd" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.21.7 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem - make -} - -INSTALL() -{ - cd curl-7.21.7 - make install -} - -TEST() -{ - cd curl-7.21.7 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2011, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.24.0.recipe b/net-misc/curl/curl-7.24.0.recipe deleted file mode 100644 index 2c8816086..000000000 --- a/net-misc/curl/curl-7.24.0.recipe +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.24.0.tar.bz2" -CHECKSUM_MD5="f912221d75eb8d8fe08900eaf011b023" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.24.0 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem - make -} - -INSTALL() -{ - cd curl-7.24.0 - make install -} - -TEST() -{ - cd curl-7.24.0 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." diff --git a/net-misc/curl/curl-7.25.0.recipe b/net-misc/curl/curl-7.25.0.recipe deleted file mode 100644 index f613065c8..000000000 --- a/net-misc/curl/curl-7.25.0.recipe +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="curl and libcurl" -HOMEPAGE="http://curl.haxx.se" -SRC_URI="http://curl.haxx.se/download/curl-7.25.0.tar.bz2" -CHECKSUM_MD5="f0303d47d9d3e6e4f08c2863c6504823" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd curl-7.25.0 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-ipv6 \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-ca-bundle=`finddir B_COMMON_DATA_DIRECTORY`/ssl/cert.pem - make -} - -INSTALL() -{ - cd curl-7.25.0 - make install -} - -TEST() -{ - cd curl-7.25.0 - make check -} - -LICENSE="Curl" -COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." From 3a96983a63f1ab5d4bcf3766f11fc5ce263bfbe1 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 27 Apr 2013 23:35:45 +0200 Subject: [PATCH 143/587] Convert libpcre-8.21.recipe to an actual recipe --- dev-libs/libpcre/libpcre-8.21.recipe | 64 ++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 17 deletions(-) diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe index f1f33acba..73800f980 100644 --- a/dev-libs/libpcre/libpcre-8.21.recipe +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -1,33 +1,67 @@ -DESCRIPTION="libpcre - Perl Compatible Regular Expressions" +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. + " HOMEPAGE="http://www.pcre.org/" +LICENSE="PCRE" +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" CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + libpcre = $portVersion + lib:libpcre = $portVersion compat >= 8 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:make + cmd:ld + cmd:libtoolize + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="pcre-$portVersion" + BUILD() { - cd pcre-8.21 - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + automake --add-missing libtoolize --force --copy --install aclocal autoconf automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + ./configure $configureDirArgs \ --enable-utf8 \ --enable-unicode-properties \ - --with-pic \ - --libdir=${LIBDIR} \ - --mandir=$COMMON_DOCS/man \ - --docdir=$COMMON_DOCS/doc/pcre + --with-pic make } INSTALL() { - cd pcre-8.21 make install + + # prepare develop/lib + prepareInstalledDevelLibs libpcre libpcrecpp libpcreposix + fixPkgconfig } TEST() @@ -35,7 +69,3 @@ TEST() cd pcre-8.21 make check } - -LICENSE="PCRE" -COPYRIGHT="1997-2011 University of Cambridge - 2007-2011, Google Inc. All rights reserved." From 6638964926c3aad510aeff2f47a0f0eed4ee941b Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 27 Apr 2013 23:36:20 +0200 Subject: [PATCH 144/587] Remove obsolete unconverted recipes for libpcre --- dev-libs/libpcre/libpcre-8.00.recipe | 27 ------------------ dev-libs/libpcre/libpcre-8.02.recipe | 28 ------------------- dev-libs/libpcre/libpcre-8.12.recipe | 41 ---------------------------- 3 files changed, 96 deletions(-) delete mode 100644 dev-libs/libpcre/libpcre-8.00.recipe delete mode 100644 dev-libs/libpcre/libpcre-8.02.recipe delete mode 100644 dev-libs/libpcre/libpcre-8.12.recipe diff --git a/dev-libs/libpcre/libpcre-8.00.recipe b/dev-libs/libpcre/libpcre-8.00.recipe deleted file mode 100644 index 04040b1d7..000000000 --- a/dev-libs/libpcre/libpcre-8.00.recipe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="libpcre - Perl Compatible Regular Expressions" -HOMEPAGE="http://www.xpcre.org/" -SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.00.tar.gz" -CHECKSUM_MD5="c95500eeda12c8c7edc6b0926d60952c" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd pcre-8.00 - libtoolize --force --copy - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-utf8 --enable-unicode-properties --with-pic - make - make check -} - -INSTALL() -{ - cd pcre-8.00 - make install -} -LICENSE="PCRE" -COPYRIGHT="1997-2010 University of Cambridge - 2007-2010, Google Inc. All rights reserved." diff --git a/dev-libs/libpcre/libpcre-8.02.recipe b/dev-libs/libpcre/libpcre-8.02.recipe deleted file mode 100644 index c4d7c571d..000000000 --- a/dev-libs/libpcre/libpcre-8.02.recipe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="libpcre - Perl Compatible Regular Expressions" -HOMEPAGE="http://www.xpcre.org/" -SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.02.tar.bz2" -CHECKSUM_MD5="27948c1b5f5c1eabc23cba1ebe4c316f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd pcre-8.02 - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - libtoolize --force --copy - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-utf8 --enable-unicode-properties --with-pic --libdir=${LIBDIR} - make - make check -} - -INSTALL() -{ - cd pcre-8.02 - make install -} -LICENSE="PCRE" -COPYRIGHT="1997-2010 University of Cambridge - 2007-2010, Google Inc. All rights reserved." diff --git a/dev-libs/libpcre/libpcre-8.12.recipe b/dev-libs/libpcre/libpcre-8.12.recipe deleted file mode 100644 index 3a1db3765..000000000 --- a/dev-libs/libpcre/libpcre-8.12.recipe +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION="libpcre - Perl Compatible Regular Expressions" -HOMEPAGE="http://www.xpcre.org/" -SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.12.tar.bz2" -CHECKSUM_MD5="f14a9fef3c92f3fc6c5ac92d7a2c7eb3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd pcre-8.12 - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - libtoolize --force --copy - aclocal - autoconf - automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-utf8 \ - --enable-unicode-properties \ - --with-pic \ - --libdir=${LIBDIR} \ - --mandir=$COMMON_DOCS/man \ - --docdir=$COMMON_DOCS/doc/pcre - make -} - -INSTALL() -{ - cd pcre-8.12 - make install -} - -TEST() -{ - cd pcre-8.12 - make check -} - -LICENSE="PCRE" -COPYRIGHT="1997-2010 University of Cambridge - 2007-2010, Google Inc. All rights reserved." From 8950faa2f6a5752930eea7b0bb08f1785c217339 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 28 Apr 2013 00:41:56 +0200 Subject: [PATCH 145/587] Update sed recipe to newer autotools * Basically we just don't run autoreconf anymore. * Also remove lib/charset.alias from the package. --- sys-apps/sed/sed-4.2.1.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe index 40de789b0..f3e4cface 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -12,7 +12,7 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/sed" SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz" CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -26,9 +26,8 @@ BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:gcc cmd:ld - cmd:aclocal >= 1.11 - cmd:autoreconf >= 2.68 cmd:make + cmd:perl cmd:sed " @@ -36,7 +35,6 @@ SOURCE_DIR="$portVersionedName" BUILD() { - autoreconf ./configure $configureDirArgs \ --enable-regex-tests --without-included-regex \ --disable-rpath --with-gnu-ld @@ -46,6 +44,8 @@ BUILD() INSTALL() { make install + rm $libDir/charset.alias + rmdir $libDir } LICENSE="GNU GPL v3" From b6dbabb155ef179bf704a6dd1a8d30dcc77dfaa6 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 00:50:22 +0200 Subject: [PATCH 146/587] Convert jam-2.5.recipe to an actual recipe. --- sys-devel/jam/jam-2.5.recipe | 58 +++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/sys-devel/jam/jam-2.5.recipe b/sys-devel/jam/jam-2.5.recipe index 4d4295ee5..c7bffda9c 100644 --- a/sys-devel/jam/jam-2.5.recipe +++ b/sys-devel/jam/jam-2.5.recipe @@ -1,21 +1,59 @@ -DESCRIPTION="jam" +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. + " HOMEPAGE="http://www.perforce.com/jam/jam.html" +LICENSE="Jam" +COPYRIGHT="1993-2003 Christopher Seiwald" SRC_URI="git://git.haiku-os.org/buildtools" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -#CHECKSUM_MD5="" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + jam = $portVersion + cmd:jam = $portVersion compat >= 2.5 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:make + cmd:ld + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName/jam" + BUILD() { - cd jam-2.5/jam make } INSTALL() { - cd jam-2.5/jam - mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` - cp -a bin.haikux86/jam ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/jam + mkdir -p "$binDir" + cp bin.haikux86/jam "$binDir" + + mkdir -p "$docDir" + cp Jam.html README* "$docDir" + + mkdir -p "$developDocDir" + cp Jambase.html Jamfile.html "$developDocDir" } -LICENSE="Jam" -COPYRIGHT="1993-2003 Christopher Seiwald" From 4ea9663aa12937cdb961bc0c1f1fa9734df76119 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 01:00:42 +0200 Subject: [PATCH 147/587] Separate link-time and runtime libs in older apr & apr_util recipes --- dev-libs/apr/apr-1.4.2.recipe | 4 ++++ dev-libs/apr_util/apr_util-1.3.10.recipe | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dev-libs/apr/apr-1.4.2.recipe b/dev-libs/apr/apr-1.4.2.recipe index 7a6c33b5f..b381a1385 100644 --- a/dev-libs/apr/apr-1.4.2.recipe +++ b/dev-libs/apr/apr-1.4.2.recipe @@ -46,6 +46,10 @@ BUILD() INSTALL() { make install + + # prepare develop/lib + prepareInstalledDevelLibs libapr-1 + fixPkgconfig } TEST() 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 9a0e4cbd4..94928fb6b 100644 --- a/dev-libs/apr_util/apr_util-1.3.10.recipe +++ b/dev-libs/apr_util/apr_util-1.3.10.recipe @@ -67,6 +67,10 @@ BUILD() INSTALL() { make install + + # prepare develop/lib + prepareInstalledDevelLibs libaprutil-1 + fixPkgconfig } DESCRIPTION=" From 10cc8a9e76dfa22bccb79b9d11aa6c6e87a4ff7e Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 01:05:56 +0200 Subject: [PATCH 148/587] Add missing provides to libpcre-8.21 --- dev-libs/libpcre/libpcre-8.21.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe index 73800f980..768c3bb42 100644 --- a/dev-libs/libpcre/libpcre-8.21.recipe +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -15,12 +15,14 @@ COPYRIGHT=" " SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2" CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" libpcre = $portVersion lib:libpcre = $portVersion compat >= 8 + lib:libpcrecpp = $portVersion compat >= 8 + lib:libpcreposix = $portVersion compat >= 8 " REQUIRES=" From fbc56b6b3ac12f27132722c350b5b7030300a5da Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 01:35:36 +0200 Subject: [PATCH 149/587] Untested conversion of pe-2.4.3_hg602 to recipe --- ...-2.4.3_hg.recipe => pe-2.4.3_hg602.recipe} | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) rename haiku-apps/pe/{pe-2.4.3_hg.recipe => pe-2.4.3_hg602.recipe} (61%) diff --git a/haiku-apps/pe/pe-2.4.3_hg.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe similarity index 61% rename from haiku-apps/pe/pe-2.4.3_hg.recipe rename to haiku-apps/pe/pe-2.4.3_hg602.recipe index e2d3f9352..54e556372 100644 --- a/haiku-apps/pe/pe-2.4.3_hg.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe @@ -9,11 +9,10 @@ COPYRIGHT=" 1996-2002 Maarteen Hekkelman 2003-2012 Team Pe " -SRC_URI="hg+http://hg.berlios.de/repos/pe-editor" +SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#602" REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" -DEPEND="dev-libs/libpcre >= 8.00" PROVIDES=" pe = $portVersion cmd:Pe = $portVersion compat >= 2 @@ -26,6 +25,9 @@ REQUIRES=" lib:libpcreposix >= 8 " BUILD_REQUIRES=" + $REQUIRES + cmd:bison + cmd:flex cmd:gcc cmd:jam cmd:ld @@ -38,16 +40,13 @@ SOURCE_DIR="$portVersionedName" BUILD() { - jam + jam -q -j$jobs } INSTALL() { - mkdir -p ${DESTDIR}/boot/apps - cp -a generated/distro ${DESTDIR}/boot/apps/Pe - cp -a doc ${DESTDIR}/boot/apps/Pe/Documentation - rm -f ${DESTDIR}/boot/apps/Pe/.OptionalPackageDescription - if [ -z "${DESTDIR}" ];then - find /boot/apps/Pe -type d -name ".svn" | xargs rm -rf - fi + mkdir -p $prefix/boot/apps + cp -a generated/distro $prefix/boot/apps/Pe + cp -a doc prefix/boot/apps/Pe/Documentation + rm -f $prefix/boot/apps/Pe/.OptionalPackageDescription } From 1f17202603e4fabc067570619f6c8699a9393ac4 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 01:36:26 +0200 Subject: [PATCH 150/587] Add patch for pe-2.4.3_hg602 --- haiku-apps/pe/patches/pe-2.4.3_hg602.patch | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 haiku-apps/pe/patches/pe-2.4.3_hg602.patch diff --git a/haiku-apps/pe/patches/pe-2.4.3_hg602.patch b/haiku-apps/pe/patches/pe-2.4.3_hg602.patch new file mode 100644 index 000000000..eb2e98304 --- /dev/null +++ b/haiku-apps/pe/patches/pe-2.4.3_hg602.patch @@ -0,0 +1,24 @@ +diff -r 4bb6aa3dee15 Jamrules +--- pe-2.4.3_hg602/Jamrules Wed Dec 26 21:33:51 2012 +0100 ++++ pe-2.4.3_hg602/Jamrules Sun Apr 28 01:12:55 2013 +0200 +@@ -11,7 +11,7 @@ + # /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus + # gcc 2 platform. This is not entirely correct, but should be good enough + # for the time being. +- local hasLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ; ++ local hasLibStdC++.R4 = [ Glob /boot/system/lib : libstdc++.r4.so ] ; + if ! $(hasLibStdC++.R4) { + IS_GCC_4_PLATFORM = 1 ; + } +diff -r 4bb6aa3dee15 build/BuildSettings +--- pe-2.4.3_hg602/build/BuildSettings Wed Dec 26 21:33:51 2012 +0100 ++++ pe-2.4.3_hg602/build/BuildSettings Sun Apr 28 01:12:55 2013 +0200 +@@ -48,7 +48,7 @@ + CCFLAGS += -isystem /boot/develop/headers/pcre ; + C++FLAGS += -isystem /boot/develop/headers/pcre ; + } else { +- haveHeadersPcre = [ GLOB /boot/common/include : pcre.h ] ; ++ haveHeadersPcre = [ GLOB /boot/common/develop/headers : pcre.h ] ; + if ! $(haveHeadersPcre) { + haveHeadersPcre = [ GLOB /boot/home/config/include : pcre.h ] ; + if ! $(haveHeadersPcre) { From 191f87a041def106042f01994a5e034566fe82ca Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 01:44:58 +0200 Subject: [PATCH 151/587] Flex requires cmd:m4 at runtime. --- sys-devel/flex/flex-2.5.35.recipe | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index 86cc33e7a..22038aa0d 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -6,7 +6,7 @@ DESCRIPTION=" HOMEPAGE="http://flex.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download" CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -17,12 +17,13 @@ PROVIDES=" " REQUIRES=" haiku >= $haikuVersion + cmd:m4 " BUILD_REQUIRES=" - cmd:aclocal >= 1.11 - cmd:autoconf >= 2.60 - cmd:automake >= 1.11 - cmd:libtoolize >= 2.4 + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:libtoolize cmd:make " BUILD_PREREQUIRES=" From c906836369713fe08fbe9902840de9de4e6494d8 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 01:57:09 +0200 Subject: [PATCH 152/587] Finish work on pe-2.4.3_hg602 --- haiku-apps/pe/pe-2.4.3_hg602.recipe | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe index 54e556372..df1369701 100644 --- a/haiku-apps/pe/pe-2.4.3_hg602.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe @@ -45,8 +45,14 @@ BUILD() INSTALL() { - mkdir -p $prefix/boot/apps - cp -a generated/distro $prefix/boot/apps/Pe - cp -a doc prefix/boot/apps/Pe/Documentation - rm -f $prefix/boot/apps/Pe/.OptionalPackageDescription + apps=$prefix/apps + mkdir -p $apps + + peBase=$apps/Pe + cp -a generated/distro $peBase + cp -a doc $peBase/Documentation + + mkdir $prefix/bin + cd $prefix/bin + ln -sfn ../apps/lpe . } From aaf965fbd1db17f335eac1e4419bbd4e6bc23c3b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 28 Apr 2013 00:45:12 +0200 Subject: [PATCH 153/587] tar: Move automake and autoreconf to build_prerequires Since tar itself is a requires for the autotools we need to break the dependency cycle at some point. --- app-arch/tar/tar-1.26.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index c9d58597d..d60cd4f5c 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -14,7 +14,7 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/tar/" SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2" CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -25,12 +25,12 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:automake >= 1.11 - cmd:autoreconf >= 2.68 cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:automake + cmd:autoreconf cmd:gcc cmd:ld cmd:make From dc059313ce07107c8bf3d179a3dfbfb33c7024ca Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 28 Apr 2013 00:48:39 +0200 Subject: [PATCH 154/587] automake: Move makeinfo to the build_prerequires ... to break another dependency cycle. --- sys-devel/automake/automake-1.13.1.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index f1172793e..2f6186f0f 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -31,13 +31,13 @@ REQUIRES=" " BUILD_REQUIRES=" cmd:perl >= 5.8 - cmd:makeinfo cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion - cmd:autoconf >= 2.60 - cmd:make + cmd:autoconf >= 2.60 + cmd:make + cmd:makeinfo " SOURCE_DIR="$portVersionedName" From 80e2775585bd89b861d97dd28f4f63dae0943768 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 28 Apr 2013 00:50:19 +0200 Subject: [PATCH 155/587] texinfo requires ncurses The haiku system package did provide ncurses implicitly before, so that was never noticed. --- sys-apps/texinfo/texinfo-4.13a.recipe | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe index f080a7726..65ec119f6 100644 --- a/sys-apps/texinfo/texinfo-4.13a.recipe +++ b/sys-apps/texinfo/texinfo-4.13a.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Texinfo is the official documentation format of the GNU project." HOMEPAGE="http://www.gnu.org/software/texinfo/" SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz" CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="texinfo = $portVersion compat >= 4.13 @@ -15,8 +15,12 @@ PROVIDES="texinfo = $portVersion compat >= 4.13 cmd:texindex = $portVersion compat >= 4.13 cmd:infokey = $portVersion compat >= 4.13 cmd:pdftexi2dvi = $portVersion compat >= 4.13" -REQUIRES="" -BUILD_REQUIRES="" +REQUIRES=" + ncurses + " +BUILD_REQUIRES=" + $REQUIRES + " BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:gcc cmd:ld From 990cd0dedff42b2114fc5fa4447ac42e60b7d4d1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 28 Apr 2013 01:27:54 +0200 Subject: [PATCH 156/587] make: Move libtoolize to build_prerequires ... to break dependency cycle. --- sys-devel/make/make-3.82.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index d7519d831..f185c9434 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -25,13 +25,13 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:libtoolize cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:gcc cmd:ld + cmd:libtoolize " SOURCE_DIR="$portVersionedName" From d74b126d3fb7c25fa98d3fd821eaebadd040fb77 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 28 Apr 2013 01:51:23 +0200 Subject: [PATCH 157/587] libtool: Move autoconf to build_prerequires ... to break dependency cycle. --- sys-devel/libtool/libtool-2.4.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index 19406dfdf..a36ec5e1e 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -29,13 +29,13 @@ REQUIRES=" cmd:tar " BUILD_REQUIRES=" - cmd:autoconf >= 2.62 cmd:aclocal - cmd:autoheader >= 2.62 cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:autoconf >= 2.62 + cmd:autoheader >= 2.62 cmd:gcc cmd:ld cmd:make From 98020cfd105fbc20af8b87b4de96e2a9008f55f4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 28 Apr 2013 02:05:20 +0200 Subject: [PATCH 158/587] libtool: Move development libs to respective dir --- sys-devel/libtool/libtool-2.4.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index a36ec5e1e..348ccdeec 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -6,7 +6,7 @@ DESCRIPTION=" HOMEPAGE="http://www.gnu.org/software/libtool" SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz" CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" -REVISION="6" +REVISION="7" ARCHITECTURES="x86_gcc2 ?x86" PATCHES=" @@ -67,6 +67,7 @@ BUILD() INSTALL() { make install + prepareInstalledDevelLibs libltdl } TEST() From 2ce975c53644eb66180018bd596e679316dce124 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 02:06:20 +0200 Subject: [PATCH 159/587] Bump revision of jam-2.5 --- sys-devel/jam/jam-2.5.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/jam/jam-2.5.recipe b/sys-devel/jam/jam-2.5.recipe index c7bffda9c..3d8195ac2 100644 --- a/sys-devel/jam/jam-2.5.recipe +++ b/sys-devel/jam/jam-2.5.recipe @@ -19,7 +19,7 @@ HOMEPAGE="http://www.perforce.com/jam/jam.html" LICENSE="Jam" COPYRIGHT="1993-2003 Christopher Seiwald" SRC_URI="git://git.haiku-os.org/buildtools" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" From 1b42a406e3f61c5301b7c2abcc1ba4defc71b3ae Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 02:10:47 +0200 Subject: [PATCH 160/587] Rename jam-2.5 according to date given in git log info --- sys-devel/jam/{jam-2.5.recipe => jam-2.5_121012.recipe} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sys-devel/jam/{jam-2.5.recipe => jam-2.5_121012.recipe} (100%) diff --git a/sys-devel/jam/jam-2.5.recipe b/sys-devel/jam/jam-2.5_121012.recipe similarity index 100% rename from sys-devel/jam/jam-2.5.recipe rename to sys-devel/jam/jam-2.5_121012.recipe From 28f92d76d9a10952129ed154a806710f7a0f23cf Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 28 Apr 2013 02:21:06 +0200 Subject: [PATCH 161/587] texinfo: Remove lib/charset.alias --- sys-apps/texinfo/texinfo-4.13a.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe index 65ec119f6..1602b8428 100644 --- a/sys-apps/texinfo/texinfo-4.13a.recipe +++ b/sys-apps/texinfo/texinfo-4.13a.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Texinfo is the official documentation format of the GNU project." HOMEPAGE="http://www.gnu.org/software/texinfo/" SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz" CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="texinfo = $portVersion compat >= 4.13 @@ -40,6 +40,8 @@ BUILD() INSTALL() { make install + rm $libDir/charset.alias + rmdir $libDir } LICENSE="GNU GPL v3" From 588f7769ed3a817dcb4de1b88a80de4fa3ab265f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 28 Apr 2013 19:12:03 +0200 Subject: [PATCH 162/587] Convert cmake 2.8.5 recipe to an actual recipe Also adjust the patch according to the new directory layout for development files and simplify in a few places. --- dev-util/cmake/cmake-2.8.5.recipe | 55 +++-- dev-util/cmake/patches/cmake-2.8.5.patch | 266 ++++++++++++++--------- 2 files changed, 203 insertions(+), 118 deletions(-) diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe index dde87fa24..cd8943eec 100644 --- a/dev-util/cmake/cmake-2.8.5.recipe +++ b/dev-util/cmake/cmake-2.8.5.recipe @@ -1,30 +1,49 @@ -DESCRIPTION="cmake - Cross platform Make" +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." HOMEPAGE="http://www.cmake.org" +LICENSE="CMake" +COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz" CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +REVISION="3" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="cmake-2.8.5.patch" + +PROVIDES=" + cmake = $portVersion compat >= 2.8 + cmd:cmake = $portVersion compat >= 2.8 + cmd:cpack = $portVersion compat >= 2.8 + cmd:ctest = $portVersion compat >= 2.8 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:grep + cmd:ld + cmd:libtool + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd cmake-2.8.5 - # cmake appends the prefix to mandir and datadir - # so using ../../ to back that part out but for some reason - # the doc was also picking up /boot, so had to back it out 3 times - # this seems to work but might still need some further adjusting -# sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=/data/cmake \ - --docdir=/documentation/doc/CMake \ - --mandir=/documentation/man - make + ./configure --prefix=$prefix \ + --datadir=/$relativeDataDir/cmake \ + --docdir=/$relativeDocDir \ + --mandir=/$relativeManDir + make $jobArgs } INSTALL() { - cd cmake-2.8.5 make install } -LICENSE="CMake" -COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/patches/cmake-2.8.5.patch b/dev-util/cmake/patches/cmake-2.8.5.patch index 9cd379392..b1b016368 100644 --- a/dev-util/cmake/patches/cmake-2.8.5.patch +++ b/dev-util/cmake/patches/cmake-2.8.5.patch @@ -1,6 +1,6 @@ -diff -ur cmake-2.8.5_orig/bootstrap cmake-2.8.5/bootstrap ---- cmake-2.8.5_orig/bootstrap 2011-07-08 12:21:43.031981568 +0000 -+++ cmake-2.8.5/bootstrap 2011-07-09 17:59:50.059768832 +0000 +diff -ur orig/cmake-2.8.5/bootstrap cmake-2.8.5/bootstrap +--- orig/cmake-2.8.5/bootstrap 2011-07-08 14:21:43.006815744 +0200 ++++ cmake-2.8.5/bootstrap 2013-04-28 15:17:09.327680000 +0200 @@ -142,7 +142,9 @@ cmake_default_prefix="c:/Program Files/CMake" fi @@ -8,13 +8,13 @@ diff -ur cmake-2.8.5_orig/bootstrap cmake-2.8.5/bootstrap - cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` + cmake_default_prefix=`finddir B_COMMON_DIRECTORY` + cmake_man_dir="/documentation/man" -+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" ++ cmake_doc_dir="/documentation/packages/cmake-${cmake_version}" else cmake_default_prefix="/usr/local" fi -diff -ur cmake-2.8.5_orig/Modules/CheckForPthreads.c cmake-2.8.5/Modules/CheckForPthreads.c ---- cmake-2.8.5_orig/Modules/CheckForPthreads.c 2011-07-08 12:21:44.040632320 +0000 -+++ cmake-2.8.5/Modules/CheckForPthreads.c 2011-07-09 17:59:50.060817408 +0000 +diff -ur orig/cmake-2.8.5/Modules/CheckForPthreads.c cmake-2.8.5/Modules/CheckForPthreads.c +--- orig/cmake-2.8.5/Modules/CheckForPthreads.c 2011-07-08 14:21:44.015204352 +0200 ++++ cmake-2.8.5/Modules/CheckForPthreads.c 2013-04-28 15:17:09.328204288 +0200 @@ -16,7 +16,7 @@ pthread_create(&tid[0], 0, runner, (void*)1); pthread_create(&tid[1], 0, runner, (void*)2); @@ -24,9 +24,9 @@ diff -ur cmake-2.8.5_orig/Modules/CheckForPthreads.c cmake-2.8.5/Modules/CheckFo usleep(1); // for strange behavior on single-processor sun #endif -diff -ur cmake-2.8.5_orig/Modules/CMakeFortranCompilerId.F.in cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in ---- cmake-2.8.5_orig/Modules/CMakeFortranCompilerId.F.in 2011-07-08 12:21:44.047448064 +0000 -+++ cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in 2011-07-09 17:59:50.062128128 +0000 +diff -ur orig/cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in +--- orig/cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in 2011-07-08 14:21:44.022282240 +0200 ++++ cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in 2013-04-28 15:17:09.328990720 +0200 @@ -74,12 +74,8 @@ PRINT *, 'INFO:platform[IRIX]' #elif defined(__hpux) || defined(__hpux__) @@ -41,9 +41,9 @@ diff -ur cmake-2.8.5_orig/Modules/CMakeFortranCompilerId.F.in cmake-2.8.5/Module #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) PRINT *, 'INFO:platform[BeOS]' #elif defined(__QNX__) || defined(__QNXNTO__) -diff -ur cmake-2.8.5_orig/Modules/CMakePlatformId.h.in cmake-2.8.5/Modules/CMakePlatformId.h.in ---- cmake-2.8.5_orig/Modules/CMakePlatformId.h.in 2011-07-08 12:21:44.048758784 +0000 -+++ cmake-2.8.5/Modules/CMakePlatformId.h.in 2011-07-09 17:59:50.063176704 +0000 +diff -ur orig/cmake-2.8.5/Modules/CMakePlatformId.h.in cmake-2.8.5/Modules/CMakePlatformId.h.in +--- orig/cmake-2.8.5/Modules/CMakePlatformId.h.in 2011-07-08 14:21:44.023330816 +0200 ++++ cmake-2.8.5/Modules/CMakePlatformId.h.in 2013-04-28 15:17:09.329777152 +0200 @@ -35,11 +35,8 @@ #elif defined(__hpux) || defined(__hpux__) # define PLATFORM_ID "HP-UX" @@ -57,19 +57,18 @@ diff -ur cmake-2.8.5_orig/Modules/CMakePlatformId.h.in cmake-2.8.5/Modules/CMake #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) # define PLATFORM_ID "BeOS" -diff -ur cmake-2.8.5_orig/Modules/FindGLUT.cmake cmake-2.8.5/Modules/FindGLUT.cmake ---- cmake-2.8.5_orig/Modules/FindGLUT.cmake 2011-07-08 12:21:44.063438848 +0000 -+++ cmake-2.8.5/Modules/FindGLUT.cmake 2011-07-09 18:02:18.662437888 +0000 +diff -ur orig/cmake-2.8.5/Modules/FindGLUT.cmake cmake-2.8.5/Modules/FindGLUT.cmake +--- orig/cmake-2.8.5/Modules/FindGLUT.cmake 2011-07-08 14:21:44.038273024 +0200 ++++ cmake-2.8.5/Modules/FindGLUT.cmake 2013-04-28 15:17:09.330301440 +0200 @@ -46,20 +46,22 @@ /usr/openwin/include /opt/graphics/OpenGL/include /opt/graphics/OpenGL/contrib/libglut -+ /boot/develop/headers/os/opengl ++ /boot/system/develop/headers/os/opengl ) FIND_LIBRARY( GLUT_glut_LIBRARY glut /usr/openwin/lib -+ /boot/develop/lib/x86/ ) - - FIND_LIBRARY( GLUT_Xi_LIBRARY Xi @@ -80,6 +79,7 @@ diff -ur cmake-2.8.5_orig/Modules/FindGLUT.cmake cmake-2.8.5/Modules/FindGLUT.cm - /usr/openwin/lib - ) - ++ + IF(NOT BEOS AND NOT HAIKU) + FIND_LIBRARY( GLUT_Xi_LIBRARY Xi + /usr/openwin/lib @@ -140,9 +140,9 @@ diff -ur cmake-2.8.5_orig/Modules/FindGLUT.cmake cmake-2.8.5/Modules/FindGLUT.cm + GLUT_Xi_LIBRARY + ) +ENDIF(BEOS OR HAIKU) -diff -ur cmake-2.8.5_orig/Modules/FindLua51.cmake cmake-2.8.5/Modules/FindLua51.cmake ---- cmake-2.8.5_orig/Modules/FindLua51.cmake 2011-07-08 12:21:44.066060288 +0000 -+++ cmake-2.8.5/Modules/FindLua51.cmake 2011-07-09 17:59:50.090439680 +0000 +diff -ur orig/cmake-2.8.5/Modules/FindLua51.cmake cmake-2.8.5/Modules/FindLua51.cmake +--- orig/cmake-2.8.5/Modules/FindLua51.cmake 2011-07-08 14:21:44.040632320 +0200 ++++ cmake-2.8.5/Modules/FindLua51.cmake 2013-04-28 15:17:09.330825728 +0200 @@ -57,13 +57,13 @@ IF(LUA_LIBRARY) @@ -159,29 +159,21 @@ diff -ur cmake-2.8.5_orig/Modules/FindLua51.cmake cmake-2.8.5/Modules/FindLua51. ENDIF(LUA_LIBRARY) INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -diff -ur cmake-2.8.5_orig/Modules/FindOpenGL.cmake cmake-2.8.5/Modules/FindOpenGL.cmake ---- cmake-2.8.5_orig/Modules/FindOpenGL.cmake 2011-07-08 12:21:44.066846720 +0000 -+++ cmake-2.8.5/Modules/FindOpenGL.cmake 2011-07-09 17:59:50.091488256 +0000 +diff -ur orig/cmake-2.8.5/Modules/FindOpenGL.cmake cmake-2.8.5/Modules/FindOpenGL.cmake +--- orig/cmake-2.8.5/Modules/FindOpenGL.cmake 2011-07-08 14:21:44.041418752 +0200 ++++ cmake-2.8.5/Modules/FindOpenGL.cmake 2013-04-28 15:17:09.331612160 +0200 @@ -80,6 +80,7 @@ /usr/share/doc/NVIDIA_GLX-1.0/include /usr/openwin/share/include /opt/graphics/OpenGL/include /usr/X11R6/include -+ /boot/develop/headers/os/opengl ++ /boot/system/develop/headers/os/opengl ) FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h -@@ -94,6 +95,7 @@ - /usr/openwin/lib - /usr/shlib /usr/X11R6/lib - ${HPUX_IA_OPENGL_LIB_PATH} -+ /boot/develop/lib/x86/ - ) - - # On Unix OpenGL most certainly always requires X11. -diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platform/Haiku.cmake ---- cmake-2.8.5_orig/Modules/Platform/Haiku.cmake 2011-07-08 12:21:44.016777216 +0000 -+++ cmake-2.8.5/Modules/Platform/Haiku.cmake 2011-07-09 17:59:50.092798976 +0000 -@@ -1,20 +1,27 @@ +diff -ur orig/cmake-2.8.5/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platform/Haiku.cmake +--- orig/cmake-2.8.5/Modules/Platform/Haiku.cmake 2011-07-08 14:21:44.058458112 +0200 ++++ cmake-2.8.5/Modules/Platform/Haiku.cmake 2013-04-28 15:57:05.984875008 +0200 +@@ -1,20 +1,82 @@ -SET(BEOS 1) +SET(HAIKU 1) +SET(UNIX 1) @@ -210,31 +202,93 @@ diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf + /boot/common + /boot/system + ) -+LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -+ /boot/common/non-packaged/lib -+ /boot/common/lib -+ /boot/system/develop/lib/x86 ++ ++LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES ++ /boot/common/non-packaged/develop/headers ++ /boot/common/non-packaged/include ++ # TODO: To be removed ++ /boot/common/develop/headers ++ /boot/common/include ++ # TODO: To be removed ++ /boot/common/develop/headers ++ ) ++ ++LIST(APPEND CMAKE_HAIKU_C_INCLUDE_DIRECTORIES ++ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES} ++ /boot/system/develop/headers/3rdparty ++ /boot/system/develop/headers/bsd ++ /boot/system/develop/headers/glibc ++ /boot/system/develop/headers/gnu ++ /boot/system/develop/headers/posix ++ /boot/system/develop/headers ++ ) ++ ++LIST(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES ++ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES} ++ /boot/system/develop/headers/os ++ /boot/system/develop/headers/os/app ++ /boot/system/develop/headers/os/device ++ /boot/system/develop/headers/os/drivers ++ /boot/system/develop/headers/os/game ++ /boot/system/develop/headers/os/interface ++ /boot/system/develop/headers/os/kernel ++ /boot/system/develop/headers/os/locale ++ /boot/system/develop/headers/os/mail ++ /boot/system/develop/headers/os/media ++ /boot/system/develop/headers/os/midi ++ /boot/system/develop/headers/os/midi2 ++ /boot/system/develop/headers/os/net ++ /boot/system/develop/headers/os/opengl ++ /boot/system/develop/headers/os/storage ++ /boot/system/develop/headers/os/support ++ /boot/system/develop/headers/os/translation ++ /boot/system/develop/headers/os/add-ons/graphics ++ /boot/system/develop/headers/os/add-ons/input_server ++ /boot/system/develop/headers/os/add-ons/screen_saver ++ /boot/system/develop/headers/os/add-ons/tracker ++ /boot/system/develop/headers/os/be_apps/Deskbar ++ /boot/system/develop/headers/os/be_apps/NetPositive ++ /boot/system/develop/headers/os/be_apps/Tracker ++ /boot/system/develop/headers/3rdparty ++ /boot/system/develop/headers/bsd ++ /boot/system/develop/headers/glibc ++ /boot/system/develop/headers/gnu ++ /boot/system/develop/headers/posix ++ /boot/system/develop/headers ++ ) ++ ++LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES}) ++ ++LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ++ /boot/common/non-packaged/develop/lib ++ /boot/common/develop/lib ++ /boot/system/develop/lib + ) -+LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/system/develop/headers/3rdparty) -+LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/system/develop/lib/x86) IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH -diff -ur cmake-2.8.5_orig/Source/cmCTest.cxx cmake-2.8.5/Source/cmCTest.cxx ---- cmake-2.8.5_orig/Source/cmCTest.cxx 2011-07-08 12:21:45.037486592 +0000 -+++ cmake-2.8.5/Source/cmCTest.cxx 2011-07-09 17:59:50.095682560 +0000 -@@ -53,7 +53,7 @@ +diff -ur orig/cmake-2.8.5/Source/cmCTest.cxx cmake-2.8.5/Source/cmCTest.cxx +--- orig/cmake-2.8.5/Source/cmCTest.cxx 2011-07-08 14:21:45.012320768 +0200 ++++ cmake-2.8.5/Source/cmCTest.cxx 2013-04-28 15:17:09.334757888 +0200 +@@ -53,14 +53,10 @@ #include #include -#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) ++#if defined(__BEOS__) || defined(__HAIKU__) #include /* disable_debugger() API. */ #endif -diff -ur cmake-2.8.5_orig/Source/cmExportCommand.cxx cmake-2.8.5/Source/cmExportCommand.cxx ---- cmake-2.8.5_orig/Source/cmExportCommand.cxx 2011-07-08 12:21:45.046923776 +0000 -+++ cmake-2.8.5/Source/cmExportCommand.cxx 2011-07-09 18:36:22.770179072 +0000 +-#if defined(__HAIKU__) +-#include /* disable_debugger() API. */ +-#endif +- + + #define DEBUGOUT std::cout << __LINE__ << " "; std::cout + #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr +diff -ur orig/cmake-2.8.5/Source/cmExportCommand.cxx cmake-2.8.5/Source/cmExportCommand.cxx +--- orig/cmake-2.8.5/Source/cmExportCommand.cxx 2011-07-08 14:21:45.021757952 +0200 ++++ cmake-2.8.5/Source/cmExportCommand.cxx 2013-04-28 15:17:09.335544320 +0200 @@ -20,7 +20,8 @@ #include "cmExportBuildFileGenerator.h" @@ -266,9 +320,9 @@ diff -ur cmake-2.8.5_orig/Source/cmExportCommand.cxx cmake-2.8.5/Source/cmExport #else const char* home = cmSystemTools::GetEnv("HOME"); if(!home) -diff -ur cmake-2.8.5_orig/Source/cmFindPackageCommand.cxx cmake-2.8.5/Source/cmFindPackageCommand.cxx ---- cmake-2.8.5_orig/Source/cmFindPackageCommand.cxx 2011-07-08 12:21:46.051118080 +0000 -+++ cmake-2.8.5/Source/cmFindPackageCommand.cxx 2011-07-09 18:26:27.005242880 +0000 +diff -ur orig/cmake-2.8.5/Source/cmFindPackageCommand.cxx cmake-2.8.5/Source/cmFindPackageCommand.cxx +--- orig/cmake-2.8.5/Source/cmFindPackageCommand.cxx 2011-07-08 14:21:46.025690112 +0200 ++++ cmake-2.8.5/Source/cmFindPackageCommand.cxx 2013-04-28 15:17:09.336855040 +0200 @@ -19,7 +19,9 @@ #endif @@ -299,9 +353,9 @@ diff -ur cmake-2.8.5_orig/Source/cmFindPackageCommand.cxx cmake-2.8.5/Source/cmF } #else if(const char* home = cmSystemTools::GetEnv("HOME")) -diff -ur cmake-2.8.5_orig/Source/cmLocalGenerator.cxx cmake-2.8.5/Source/cmLocalGenerator.cxx ---- cmake-2.8.5_orig/Source/cmLocalGenerator.cxx 2011-07-08 12:21:46.065273856 +0000 -+++ cmake-2.8.5/Source/cmLocalGenerator.cxx 2011-07-09 18:30:30.565182464 +0000 +diff -ur orig/cmake-2.8.5/Source/cmLocalGenerator.cxx cmake-2.8.5/Source/cmLocalGenerator.cxx +--- orig/cmake-2.8.5/Source/cmLocalGenerator.cxx 2011-07-08 14:21:46.039845888 +0200 ++++ cmake-2.8.5/Source/cmLocalGenerator.cxx 2013-04-28 15:17:09.338427904 +0200 @@ -37,7 +37,8 @@ #include @@ -328,9 +382,9 @@ diff -ur cmake-2.8.5_orig/Source/cmLocalGenerator.cxx cmake-2.8.5/Source/cmLocal } else { -diff -ur cmake-2.8.5_orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx ---- cmake-2.8.5_orig/Source/CPack/cmCPackGenerator.cxx 2011-07-08 12:21:47.017563648 +0000 -+++ cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx 2011-07-09 18:33:59.244842496 +0000 +diff -ur orig/cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx +--- orig/cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx 2011-07-08 14:21:47.059244544 +0200 ++++ cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx 2013-04-28 15:17:09.339476480 +0200 @@ -27,7 +27,8 @@ #include @@ -355,9 +409,9 @@ diff -ur cmake-2.8.5_orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8.5/Source/C } else { -diff -ur cmake-2.8.5_orig/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx ---- cmake-2.8.5_orig/Source/CPack/cmCPackGeneratorFactory.cxx 2011-07-08 12:21:47.017825792 +0000 -+++ cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx 2011-07-09 17:59:50.096731136 +0000 +diff -ur orig/cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx +--- orig/cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx 2011-07-08 14:21:47.059506688 +0200 ++++ cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx 2013-04-28 15:17:09.340262912 +0200 @@ -32,7 +32,7 @@ #endif @@ -376,9 +430,9 @@ diff -ur cmake-2.8.5_orig/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.8.5/S this->RegisterGenerator("DEB", "Debian packages", cmCPackDebGenerator::CreateGenerator); this->RegisterGenerator("RPM", "RPM packages", -diff -ur cmake-2.8.5_orig/Source/kwsys/ProcessUNIX.c cmake-2.8.5/Source/kwsys/ProcessUNIX.c ---- cmake-2.8.5_orig/Source/kwsys/ProcessUNIX.c 2011-07-08 12:21:48.042729472 +0000 -+++ cmake-2.8.5/Source/kwsys/ProcessUNIX.c 2011-07-09 17:59:50.100401152 +0000 +diff -ur orig/cmake-2.8.5/Source/kwsys/ProcessUNIX.c cmake-2.8.5/Source/kwsys/ProcessUNIX.c +--- orig/cmake-2.8.5/Source/kwsys/ProcessUNIX.c 2011-07-08 14:21:48.017301504 +0200 ++++ cmake-2.8.5/Source/kwsys/ProcessUNIX.c 2013-04-28 15:17:09.341835776 +0200 @@ -63,10 +63,6 @@ #include /* DIR, dirent */ #include /* isspace */ @@ -390,33 +444,45 @@ diff -ur cmake-2.8.5_orig/Source/kwsys/ProcessUNIX.c cmake-2.8.5/Source/kwsys/Pr #if defined(__VMS) # define KWSYSPE_VMS_NONBLOCK , O_NONBLOCK #else -diff -ur cmake-2.8.5_orig/Source/kwsys/SystemTools.cxx cmake-2.8.5/Source/kwsys/SystemTools.cxx ---- cmake-2.8.5_orig/Source/kwsys/SystemTools.cxx 2011-07-08 12:21:48.044826624 +0000 -+++ cmake-2.8.5/Source/kwsys/SystemTools.cxx 2011-07-09 17:59:50.103284736 +0000 -@@ -150,7 +150,7 @@ - #include +diff -ur orig/cmake-2.8.5/Source/kwsys/SystemTools.cxx cmake-2.8.5/Source/kwsys/SystemTools.cxx +--- orig/cmake-2.8.5/Source/kwsys/SystemTools.cxx 2011-07-08 14:21:48.019398656 +0200 ++++ cmake-2.8.5/Source/kwsys/SystemTools.cxx 2013-04-28 15:17:09.343670784 +0200 +@@ -145,12 +145,7 @@ + #define _chdir chdir #endif +-#if defined(__HAIKU__) +-#include +-#include +-#endif +- -#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) +#if defined(__BEOS__) && !defined(__ZETA__) #include #include -diff -ur cmake-2.8.5_orig/Source/kwsys/testDynamicLoader.cxx cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx ---- cmake-2.8.5_orig/Source/kwsys/testDynamicLoader.cxx 2011-07-08 12:21:49.045613056 +0000 -+++ cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx 2011-07-09 17:59:50.105119744 +0000 -@@ -15,7 +15,7 @@ +diff -ur orig/cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx +--- orig/cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx 2011-07-08 14:21:49.020447232 +0200 ++++ cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx 2013-04-28 15:17:09.344719360 +0200 +@@ -15,14 +15,10 @@ #include KWSYS_HEADER(ios/iostream) #include KWSYS_HEADER(stl/string) -#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) ++#if defined(__BEOS__) || defined(__HAIKU__) #include /* disable_debugger() API. */ #endif -diff -ur cmake-2.8.5_orig/Source/kwsys/testProcess.c cmake-2.8.5/Source/kwsys/testProcess.c ---- cmake-2.8.5_orig/Source/kwsys/testProcess.c 2011-07-08 12:21:49.046399488 +0000 -+++ cmake-2.8.5/Source/kwsys/testProcess.c 2011-07-09 17:59:50.108265472 +0000 +-#if defined(__HAIKU__) +-#include /* disable_debugger() API. */ +-#endif +- + // Work-around CMake dependency scanning limitation. This must + // duplicate the above list of headers. + #if 0 +diff -ur orig/cmake-2.8.5/Source/kwsys/testProcess.c cmake-2.8.5/Source/kwsys/testProcess.c +--- orig/cmake-2.8.5/Source/kwsys/testProcess.c 2011-07-08 14:21:49.020971520 +0200 ++++ cmake-2.8.5/Source/kwsys/testProcess.c 2013-04-28 15:17:09.345767936 +0200 @@ -32,7 +32,7 @@ # pragma warn -8060 /* possibly incorrect assignment */ #endif @@ -426,9 +492,9 @@ diff -ur cmake-2.8.5_orig/Source/kwsys/testProcess.c cmake-2.8.5/Source/kwsys/te /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ # include static inline void testProcess_usleep(unsigned int msec) -diff -ur cmake-2.8.5_orig/Tests/Complex/Library/CMakeLists.txt cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt ---- cmake-2.8.5_orig/Tests/Complex/Library/CMakeLists.txt 2011-07-08 12:21:50.003670016 +0000 -+++ cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt 2011-07-09 17:59:50.114294784 +0000 +diff -ur orig/cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt +--- orig/cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt 2011-07-08 14:21:50.045350912 +0200 ++++ cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt 2013-04-28 15:17:09.346292224 +0200 @@ -52,9 +52,9 @@ FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" ) @@ -441,9 +507,9 @@ diff -ur cmake-2.8.5_orig/Tests/Complex/Library/CMakeLists.txt cmake-2.8.5/Tests GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) IF(${FOO_BAR_VAR} MATCHES "BAR") ELSE(${FOO_BAR_VAR} MATCHES "BAR") -diff -ur cmake-2.8.5_orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt ---- cmake-2.8.5_orig/Tests/ComplexOneConfig/Library/CMakeLists.txt 2011-07-08 12:21:50.007864320 +0000 -+++ cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt 2011-07-09 17:59:50.116654080 +0000 +diff -ur orig/cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt +--- orig/cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt 2011-07-08 14:21:50.049807360 +0200 ++++ cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt 2013-04-28 15:17:09.347078656 +0200 @@ -52,9 +52,9 @@ FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" ) @@ -456,9 +522,9 @@ diff -ur cmake-2.8.5_orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2. GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) IF(${FOO_BAR_VAR} MATCHES "BAR") ELSE(${FOO_BAR_VAR} MATCHES "BAR") -diff -ur cmake-2.8.5_orig/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt ---- cmake-2.8.5_orig/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2011-07-08 12:21:50.012320768 +0000 -+++ cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2011-07-09 17:59:50.119013376 +0000 +diff -ur orig/cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt +--- orig/cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2011-07-08 14:21:50.054001664 +0200 ++++ cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2013-04-28 15:17:09.347865088 +0200 @@ -52,9 +52,9 @@ FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" ) @@ -471,9 +537,9 @@ diff -ur cmake-2.8.5_orig/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmak GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) IF(${FOO_BAR_VAR} MATCHES "BAR") ELSE(${FOO_BAR_VAR} MATCHES "BAR") -diff -ur cmake-2.8.5_orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c ---- cmake-2.8.5_orig/Utilities/cmcurl/CMake/CurlTests.c 2011-07-08 12:21:54.052953088 +0000 -+++ cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c 2011-07-09 17:59:50.122421248 +0000 +diff -ur orig/cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c +--- orig/cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c 2011-07-08 14:21:54.027262976 +0200 ++++ cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c 2013-04-28 15:17:09.348913664 +0200 @@ -38,7 +38,7 @@ # define PLATFORM_AIX_V3 #endif @@ -483,9 +549,9 @@ diff -ur cmake-2.8.5_orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.5/Utiliti #error "O_NONBLOCK does not work on this platform" #endif int socket; -diff -ur cmake-2.8.5_orig/Utilities/cmcurl/select.c cmake-2.8.5/Utilities/cmcurl/select.c ---- cmake-2.8.5_orig/Utilities/cmcurl/select.c 2011-07-08 12:21:55.063176704 +0000 -+++ cmake-2.8.5/Utilities/cmcurl/select.c 2011-07-09 17:59:50.125829120 +0000 +diff -ur orig/cmake-2.8.5/Utilities/cmcurl/select.c cmake-2.8.5/Utilities/cmcurl/select.c +--- orig/cmake-2.8.5/Utilities/cmcurl/select.c 2011-07-08 14:21:55.037486592 +0200 ++++ cmake-2.8.5/Utilities/cmcurl/select.c 2013-04-28 15:17:09.349437952 +0200 @@ -39,7 +39,7 @@ #error "We can't compile without select() support!" #endif @@ -495,9 +561,9 @@ diff -ur cmake-2.8.5_orig/Utilities/cmcurl/select.c cmake-2.8.5/Utilities/cmcurl /* BeOS has FD_SET defined in socket.h */ #include #endif -diff -ur cmake-2.8.5_orig/Utilities/cmzlib/zconf.h cmake-2.8.5/Utilities/cmzlib/zconf.h ---- cmake-2.8.5_orig/Utilities/cmzlib/zconf.h 2011-07-08 12:21:58.054001664 +0000 -+++ cmake-2.8.5/Utilities/cmzlib/zconf.h 2011-07-09 17:59:50.128712704 +0000 +diff -ur orig/cmake-2.8.5/Utilities/cmzlib/zconf.h cmake-2.8.5/Utilities/cmzlib/zconf.h +--- orig/cmake-2.8.5/Utilities/cmzlib/zconf.h 2011-07-08 14:21:58.028311552 +0200 ++++ cmake-2.8.5/Utilities/cmzlib/zconf.h 2013-04-28 15:17:09.350224384 +0200 @@ -237,7 +237,7 @@ # endif #endif @@ -507,9 +573,9 @@ diff -ur cmake-2.8.5_orig/Utilities/cmzlib/zconf.h cmake-2.8.5/Utilities/cmzlib/ # ifdef ZLIB_DLL # ifdef ZLIB_INTERNAL # define ZEXPORT __declspec(dllexport) -diff -ur cmake-2.8.5_orig/Utilities/cmzlib/zutil.h cmake-2.8.5/Utilities/cmzlib/zutil.h ---- cmake-2.8.5_orig/Utilities/cmzlib/zutil.h 2011-07-08 12:21:58.054525952 +0000 -+++ cmake-2.8.5/Utilities/cmzlib/zutil.h 2011-07-09 17:59:50.129761280 +0000 +diff -ur orig/cmake-2.8.5/Utilities/cmzlib/zutil.h cmake-2.8.5/Utilities/cmzlib/zutil.h +--- orig/cmake-2.8.5/Utilities/cmzlib/zutil.h 2011-07-08 14:21:58.029097984 +0200 ++++ cmake-2.8.5/Utilities/cmzlib/zutil.h 2013-04-28 15:17:09.350748672 +0200 @@ -147,12 +147,6 @@ # define OS_CODE 0x0f #endif From 0a9559b58198e93a5757aac44cbd3dd9874b4353 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 28 Apr 2013 19:19:28 +0200 Subject: [PATCH 163/587] Update libsolv recipe * Move build_requires to build_prerequires * Add requires zlib and expat. * Fix package directory layout. --- .../libsolv-0.3.0_haiku_2013_04_18.recipe | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) 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 5ff6c2b70..522d04a76 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 @@ -1,21 +1,27 @@ SUMMARY="Library for solving packages and reading repositories" DESCRIPTION="Library for solving packages and reading repositories." +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2013, Novell Inc." HOMEPAGE="http://github.com/openSUSE/libsolv" SRC_URI="git+git://github.com/weinhold/libsolv.git#85dcb683b0c705c1789a3f688bd0d02368107824" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="libsolv = $portVersion lib:libsolv = $portVersion lib:libsolvext = $portVersion" REQUIRES="haiku >= $haikuVersion - lib:libexpat >= 1.5" -BUILD_REQUIRES="lib:libexpat >= 1.5" + lib:libexpat >= 1.5 + lib:libz + " +BUILD_REQUIRES="$REQUIRES" BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:cmake cmd:gcc cmd:ld - cmd:make" + cmd:make + cmd:sed + " SOURCE_DIR="$portVersionedName" @@ -25,7 +31,7 @@ BUILD() mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix .. - make + make $jobArgs } INSTALL() @@ -33,9 +39,18 @@ INSTALL() cd build make install + # set up the develop directory correctly + prepareInstalledDevelLibs libsolv libsolvext + + mkdir -p $includeDir + mv $prefix/include/* $includeDir + rmdir $prefix/include + + # move cmake files + mkdir -p $dataDir + mv $prefix/share/cmake $dataDir + rmdir $prefix/share + # We don't want the executables. rm -r $prefix/bin } - -LICENSE="BSD (3-clause)" -COPYRIGHT="2007-2013, Novell Inc." From fde5fa38538d1055b044a9cbe4f4c23080fae4dd Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 17:46:25 +0200 Subject: [PATCH 164/587] Fix symlink to lpe in Pe package. --- haiku-apps/pe/pe-2.4.3_hg602.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe index df1369701..3f8d2eace 100644 --- a/haiku-apps/pe/pe-2.4.3_hg602.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe @@ -10,7 +10,7 @@ COPYRIGHT=" 2003-2012 Team Pe " SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#602" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -54,5 +54,5 @@ INSTALL() mkdir $prefix/bin cd $prefix/bin - ln -sfn ../apps/lpe . + ln -sfn ../apps/Pe/lpe . } From 052ffa137c8c3a696c5274f8f76fe691bf4468ae Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 17:46:56 +0200 Subject: [PATCH 165/587] Add recipe for ca_root_certificates. --- .../ca_root_certificates-121229.recipe | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 net-misc/ca_root_certificates/ca_root_certificates-121229.recipe diff --git a/net-misc/ca_root_certificates/ca_root_certificates-121229.recipe b/net-misc/ca_root_certificates/ca_root_certificates-121229.recipe new file mode 100644 index 000000000..6354c84a4 --- /dev/null +++ b/net-misc/ca_root_certificates/ca_root_certificates-121229.recipe @@ -0,0 +1,47 @@ +SUMMARY="Bundle of CA root certificates" +HOMEPAGE="http://curl.haxx.se/docs/caextract.html" +COPYRIGHT="2012 " +# No copyright seems to be specified anywhere ... +LICENSE=" + MPL v1.1 + GNU GPL v2 + GNU LGPL v2.1 + " +SRC_URI="http://haiku-files.org/files/data/cacert_121229.pem#noarchive" +CHECKSUM_MD5="47961e7ef15667c93cd99be01b51f00a" +REVISION="1" +ARCHITECTURES="any" + +PROVIDES=" + ca_root_certificates = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + coreutils + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +INSTALL() +{ + installDir="$dataRootDir/ssl" + mkdir -p "$installDir" + cp cacert_??????.pem "$installDir/CARootCertificates.pem" +} + +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. + " From 1c1c63685362be2b023f610f2705096d6b26dda6 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 17:47:26 +0200 Subject: [PATCH 166/587] Update curl-7.26.0 to use ca_root_certificates --- net-misc/curl/curl-7.26.0.recipe | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/net-misc/curl/curl-7.26.0.recipe b/net-misc/curl/curl-7.26.0.recipe index f55ce9f7c..ac298b722 100644 --- a/net-misc/curl/curl-7.26.0.recipe +++ b/net-misc/curl/curl-7.26.0.recipe @@ -4,7 +4,7 @@ COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." LICENSE="Curl" SRC_URI="http://curl.haxx.se/download/curl-7.26.0.tar.bz2" CHECKSUM_MD5="bfa80f01b3d300359cfb4d409b6136a3" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" # libcurl's SONAME is bumped whenever backward compat is broken, v7.16 @@ -16,10 +16,11 @@ PROVIDES=" " REQUIRES=" haiku >= $haikuVersion + ca_root_certificates lib:libssl " BUILD_REQUIRES=" - lib:libssl + $REQUIRES cmd:autoconf cmd:gcc cmd:ld @@ -34,10 +35,15 @@ SOURCE_DIR="$portVersionedName" BUILD() { + curlPackageLinksDir="$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName" + certsInstallDir="$curlPackageLinksDir/ca_root_certificates" + certsDir="$certsInstallDir/$relativeDataRootDir/ssl" + libtoolize --force --copy --install autoconf ./configure $configureDirArgs \ - --enable-ipv6 + --enable-ipv6 \ + --with-ca-bundle="$certsDir/CARootCertificates.pem" make } From f3060aac4aaa951a72caa37c29053a07a57518a9 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 19:25:34 +0200 Subject: [PATCH 167/587] Convert htmldoc-1.8.27.recipe into an actual recipe --- app-text/htmldoc/htmldoc-1.8.27.recipe | 63 ++++++++++++++++---------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe index 0cfc5a444..73f843df9 100644 --- a/app-text/htmldoc/htmldoc-1.8.27.recipe +++ b/app-text/htmldoc/htmldoc-1.8.27.recipe @@ -1,36 +1,51 @@ -DESCRIPTION="HTMLDOC converts HTML files and web pages into index HTML, Adobe Postscript or Adobe Portable Documenrt Format files (pdf)." -HOMEPAGE="http://www.htmldoc.org" -SRC_URI="http://ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="cb45c2823e282e3cd0cc05172e305072" +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). + " +HOMEPAGE="http://www.msweet.org/projects.php?Z1" +LICENSE="GNU GPL v2" +COPYRIGHT="1997-2006 Easy Software Products" +SRC_URI="http://www.msweet.org/files/project1/htmldoc-1.8.27-source.tar.bz2" +CHECKSUM_MD5="35589e7b8fe9c54e11be87cd5aec4dcc" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + htmldoc = $portVersion compat >= 1.8 + cmd:htmldoc = $portVersion compat >= 1.8 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:autoconf + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd htmldoc-1.8.27 autoconf chmod 755 configure - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=$COMMON_DOCS \ - --mandir=$COMMON_DOCS/man + ./configure $configureDirArgs make } INSTALL() { - cd htmldoc-1.8.27 make install -} -TEST() -{ - cd htmldoc-1.8.27 -# make test -# make check + # move html documentation out of man-dir + mkdir -p $docDir + mv $manDir/doc/htmldoc/* $docDir/ + rm -r $manDir/doc } - -#LICENSE="" -#COPYRIGHT="" From 87c255e9d672aa54933a9e93ea0c6f7b473a8840 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 19:40:54 +0200 Subject: [PATCH 168/587] Convert and adjust recipe for BePDF --- haiku-apps/bepdf/bepdf-1.1.1b4.recipe | 25 -------- .../bepdf/bepdf-1.1.1~beta5_130428.recipe | 58 +++++++++++++++++++ .../bepdf/patches/bepdf-1.1.1b2-532.patch | 21 ------- 3 files changed, 58 insertions(+), 46 deletions(-) delete mode 100644 haiku-apps/bepdf/bepdf-1.1.1b4.recipe create mode 100644 haiku-apps/bepdf/bepdf-1.1.1~beta5_130428.recipe delete mode 100644 haiku-apps/bepdf/patches/bepdf-1.1.1b2-532.patch diff --git a/haiku-apps/bepdf/bepdf-1.1.1b4.recipe b/haiku-apps/bepdf/bepdf-1.1.1b4.recipe deleted file mode 100644 index c2f2e10e8..000000000 --- a/haiku-apps/bepdf/bepdf-1.1.1b4.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="BePDF is a PDF viewer for the BeOS, Haiku & Zeta" -HOMEPAGE="http://bepdf.sourceforge.net/" -SRC_URI="cvs://:pserver:anonymous@bepdf.cvs.sourceforge.net:/cvsroot/bepdf/BePDF" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="app-text/htmldoc == 1.8.27" - -BUILD() -{ - export BEPDF_BUILD_GCC=`setgcc | cut -d/ -f2` - cd bepdf-1.1.1b4 - ./build.sh package -} - -INSTALL() -{ - cd bepdf-1.1.1b4 - mkdir -p ${DESTDIR}/boot/apps - unzip generated/BePDF-1.1.1b4.x86.zip -d ${DESTDIR}/boot/apps -} - -COPYRIGHT="1997 Benoit Triquet - 1999-2000 Hubert Figuiere - 2000-2010 Michael Pfeiffer" -LICENSE="GNU GPL v2" diff --git a/haiku-apps/bepdf/bepdf-1.1.1~beta5_130428.recipe b/haiku-apps/bepdf/bepdf-1.1.1~beta5_130428.recipe new file mode 100644 index 000000000..126e0ee06 --- /dev/null +++ b/haiku-apps/bepdf/bepdf-1.1.1~beta5_130428.recipe @@ -0,0 +1,58 @@ +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. + " +HOMEPAGE="http://bepdf.sourceforge.net/" +SRC_URI="cvs://:pserver:anonymous@bepdf.cvs.sourceforge.net:/cvsroot/bepdf/BePDF#04/28/13" +COPYRIGHT="1997 Benoit Triquet + 1999-2000 Hubert Figuiere + 2000-2010 Michael Pfeiffer" +LICENSE="GNU GPL v2" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + bepdf = $portVersion + cmd:BePDF = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:jam + cmd:htmldoc + cmd:ld + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + if [ $architecture == 'x86_gcc2' ]; then + export BEPDF_BUILD_GCC=gcc2 + else + export BEPDF_BUILD_GCC=gcc4 + fi + + ./build.sh +} + +INSTALL() +{ + if [ $architecture == 'x86_gcc2' ]; then + architecture='x86' + fi + mkdir -p $prefix/apps + rm -f generated/$architecture/*Deskbar + cp -dR generated/$architecture $prefix/apps/BePDF +} diff --git a/haiku-apps/bepdf/patches/bepdf-1.1.1b2-532.patch b/haiku-apps/bepdf/patches/bepdf-1.1.1b2-532.patch deleted file mode 100644 index 9d1c4df7b..000000000 --- a/haiku-apps/bepdf/patches/bepdf-1.1.1b2-532.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: bepdf-1.1.1b2-532/bepdf/Jamfile -=================================================================== ---- bepdf-1.1.1b2-532/bepdf/Jamfile (revision 532) -+++ bepdf-1.1.1b2-532/bepdf/Jamfile (working copy) -@@ -96,10 +96,14 @@ - # 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 = -+LIBS = stdc++.r4 ; -+if $(BEPDF_BUILD_GCC) = gcc4 { -+ # Use the standard libstdc++ name when building with gcc 4. -+ LIBS = stdc++ ; -+} -+LIBS += - # BeOS - be --stdc++.r4 - textencoding - tracker - translation From 3c0f0f1c01b1b4fa5daa274d92642bd2aaadf641 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 23:36:10 +0200 Subject: [PATCH 169/587] Added recipe for BeBook --- haiku-data/be_book/be_book-20081026.recipe | 22 +++++++ ...bution-NonCommercial-NoDerivs 3.0 Unported | 58 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 haiku-data/be_book/be_book-20081026.recipe create mode 100644 haiku-data/be_book/licenses/Attribution-NonCommercial-NoDerivs 3.0 Unported diff --git a/haiku-data/be_book/be_book-20081026.recipe b/haiku-data/be_book/be_book-20081026.recipe new file mode 100644 index 000000000..70a59e280 --- /dev/null +++ b/haiku-data/be_book/be_book-20081026.recipe @@ -0,0 +1,22 @@ +SUMMARY="The BeBook" +DESCRIPTION="The BeOS API documentation" +HOMEPAGE="http://www.haiku-os.org/documents" +COPYRIGHT="ACCESS Co., Ltd." +LICENSE="Attribution-NonCommercial-NoDerivs 3.0 Unported" +SRC_URI="http://haiku-files.org/files/data/bebook_20081026.zip" +CHECKSUM_MD5="78d58b64a41ae4e8f84a14f22aea4adb" +REVISION="1" +ARCHITECTURES="any" + +PROVIDES=" + be_book = $portVersion + " +BUILD_REQUIRES=" + coreutils + " + +INSTALL() +{ + mkdir -p $documentationDir + cp -dR bebook $documentationDir/BeBook +} diff --git a/haiku-data/be_book/licenses/Attribution-NonCommercial-NoDerivs 3.0 Unported b/haiku-data/be_book/licenses/Attribution-NonCommercial-NoDerivs 3.0 Unported new file mode 100644 index 000000000..26ed01699 --- /dev/null +++ b/haiku-data/be_book/licenses/Attribution-NonCommercial-NoDerivs 3.0 Unported @@ -0,0 +1,58 @@ +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + 1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. + 2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. + 3. "Distribute" means to make available to the public the original and copies of the Work through sale or other transfer of ownership. + 4. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. + 5. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. + 6. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. + 7. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + 8. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. + 9. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + 1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; and, + 2. to Distribute and Publicly Perform the Work including as incorporated in Collections. + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats, but otherwise you have no rights to make Adaptations. Subject to 8(f), all rights not expressly granted by Licensor are hereby reserved, including but not limited to the rights set forth in Section 4(d). + +4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + 1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. + 2. You may not exercise any of the rights granted to You in Section 3 above in any manner that is primarily intended for or directed toward commercial advantage or private monetary compensation. The exchange of the Work for other copyrighted works by means of digital file-sharing or otherwise shall not be considered to be intended for or directed toward commercial advantage or private monetary compensation, provided there is no payment of any monetary compensation in connection with the exchange of copyrighted works. + 3. If You Distribute, or Publicly Perform the Work or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work. The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Collection, at a minimum such credit will appear, if a credit for all contributing authors of Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. + 4. + + For the avoidance of doubt: + 1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; + 2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License if Your exercise of such rights is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(b) and otherwise waives the right to collect royalties through any statutory or compulsory licensing scheme; and, + 3. Voluntary License Schemes. The Licensor reserves the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License that is for a purpose or use which is otherwise than noncommercial as permitted under Section 4(b). + 5. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + 1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + 2. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + 3. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + 4. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. + 5. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. From ebec38d6180e8feb7678d5321a097b6d12aa1dae Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 28 Apr 2013 23:37:13 +0200 Subject: [PATCH 170/587] Moved ca_root_certificates into haiku-data --- .../ca_root_certificates/ca_root_certificates-121229.recipe | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {net-misc => haiku-data}/ca_root_certificates/ca_root_certificates-121229.recipe (100%) diff --git a/net-misc/ca_root_certificates/ca_root_certificates-121229.recipe b/haiku-data/ca_root_certificates/ca_root_certificates-121229.recipe similarity index 100% rename from net-misc/ca_root_certificates/ca_root_certificates-121229.recipe rename to haiku-data/ca_root_certificates/ca_root_certificates-121229.recipe From c7a47824839caeec231da98cd31e1ecea6d7b440 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 29 Apr 2013 00:43:36 +0200 Subject: [PATCH 171/587] Convert openssh 5.8p2 recipe to actual recipe --- net-misc/openssh/openssh-5.8p2.recipe | 109 +++++++++++++++++--------- 1 file changed, 74 insertions(+), 35 deletions(-) diff --git a/net-misc/openssh/openssh-5.8p2.recipe b/net-misc/openssh/openssh-5.8p2.recipe index 5fd558387..b3b5d972c 100644 --- a/net-misc/openssh/openssh-5.8p2.recipe +++ b/net-misc/openssh/openssh-5.8p2.recipe @@ -1,55 +1,94 @@ -DESCRIPTION="OpenSSH" +SUMMARY="Secure Shell Client and Server (Remote Login Program)" HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz - http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libedit >= 20090923" +LICENSE="OpenSSH" +COPYRIGHT="2005-2011 Tatu Ylonen et al." +SRC_URI=" + http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz + http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.8p2.tar.gz + " CHECKSUM_MD5="0541579adf9d55abb15ef927048d372e" +REVISION="4" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="openssh-5.8p2.patch" + +PROVIDES=" + openssh = $portVersion compat >= 5 + cmd:scp = $portVersion compat >= 5 + cmd:sftp = $portVersion compat >= 5 + cmd:sftp_server = $portVersion compat >= 5 + cmd:slogin = $portVersion compat >= 5 + cmd:ssh = $portVersion compat >= 5 + cmd:ssh_add = $portVersion compat >= 5 + cmd:ssh_agent = $portVersion compat >= 5 + cmd:ssh_keygen = $portVersion compat >= 5 + cmd:ssh_keyscan = $portVersion compat >= 5 + cmd:ssh_keysign = $portVersion compat >= 5 + cmd:ssh_pkcs11_helper = $portVersion compat >= 5 + cmd:sshd = $portVersion compat >= 5 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libcrypto + lib:libedit + lib:libssl + lib:libz + " +BUILD_REQUIRES=" + $REQUIRES + openssl + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac +} + BUILD() { - cd openssh-5.8p2 - autoconf mkdir -p m4 aclocal --install -I m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac libtoolize --force --copy aclocal -I m4 autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` - COMMON_DIR=`finddir B_COMMON_DIRECTORY` - ./configure --prefix=$COMMON_DIR \ - --sbindir=$COMMON_BIN \ - --bindir=$COMMON_BIN \ - --libexecdir=$COMMON_BIN \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=$COMMON_DIR/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=$COMMON_DOCS/man \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=${PATH} \ - --with-md5-passwords \ - --disable-utmpx \ - --with-libedit - make + defaultPath=".:/boot/home/config/non-packaged/bin:/boot/home/config/bin" + defaultPath+=":/boot/common/non-packaged/bin:/boot/common/bin:/bin" + defaultPath+=":/boot/common/apps:/boot/common/preferences:/boot/system/apps" + defaultPath+=":/boot/system/preferences" + runConfigure ./configure \ + --with-privsep-path=$dataDir/openssh/empty \ + --with-default-path="$defaultPath" \ + --with-md5-passwords \ + --disable-utmpx \ + --with-libedit + make $jobArgs } INSTALL() { - cd openssh-5.8p2 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install + make install-nokeys + postInstallDir=$prefix/boot/post_install + mkdir -p $postInstallDir + cp -f $portDir/sshd_keymaker.sh $postInstallDir } TEST() { - cd openssh-5.8p2 make tests } -LICENSE="OpenSSH" -COPYRIGHT="2005-2011 Tatu Ylonen et al." +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." From 2b0aeb6910ab2ce99aee964ffcd039d44bebfd4d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 29 Apr 2013 00:59:57 +0200 Subject: [PATCH 172/587] Convert openssh 6.0p1 recipe to an actual recipe --- net-misc/openssh/openssh-6.0p1.recipe | 103 +++++++++++++++++--------- 1 file changed, 70 insertions(+), 33 deletions(-) diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index 2781d3495..86618c5d9 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -1,54 +1,91 @@ -DESCRIPTION="OpenSSH" +SUMMARY="Secure Shell Client and Server (Remote Login Program)" HOMEPAGE="http://www.openssh.com/" +LICENSE="OpenSSH" +COPYRIGHT="2005-2012 Tatu Ylonen et al." SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libedit >= 20090923" CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="openssh-6.0p1.patch" + +PROVIDES=" + openssh = $portVersion compat >= 5 + cmd:scp = $portVersion compat >= 5 + cmd:sftp = $portVersion compat >= 5 + cmd:sftp_server = $portVersion compat >= 5 + cmd:slogin = $portVersion compat >= 5 + cmd:ssh = $portVersion compat >= 5 + cmd:ssh_add = $portVersion compat >= 5 + cmd:ssh_agent = $portVersion compat >= 5 + cmd:ssh_keygen = $portVersion compat >= 5 + cmd:ssh_keyscan = $portVersion compat >= 5 + cmd:ssh_keysign = $portVersion compat >= 5 + cmd:ssh_pkcs11_helper = $portVersion compat >= 5 + cmd:sshd = $portVersion compat >= 5 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libcrypto + lib:libedit + lib:libssl + lib:libz + " +BUILD_REQUIRES=" + $REQUIRES + openssl + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac +} + BUILD() { - cd openssh-6.0p1 - autoconf mkdir -p m4 aclocal --install -I m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac libtoolize --force --copy aclocal -I m4 autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` - COMMON_DIR=`finddir B_COMMON_DIRECTORY` - ./configure --prefix=$COMMON_DIR \ - --sbindir=$COMMON_BIN \ - --bindir=$COMMON_BIN \ - --libexecdir=$COMMON_BIN \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=$COMMON_DIR/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=$COMMON_DOCS/man \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=${PATH} \ - --with-md5-passwords \ - --disable-utmpx \ - --with-libedit - make + defaultPath=".:/boot/home/config/non-packaged/bin:/boot/home/config/bin" + defaultPath+=":/boot/common/non-packaged/bin:/boot/common/bin:/bin" + defaultPath+=":/boot/common/apps:/boot/common/preferences:/boot/system/apps" + defaultPath+=":/boot/system/preferences" + runConfigure ./configure \ + --with-privsep-path=$dataDir/openssh/empty \ + --with-default-path="$defaultPath" \ + --with-md5-passwords \ + --disable-utmpx \ + --with-libedit + make $jobArgs } INSTALL() { - cd openssh-6.0p1 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install + make install-nokeys + postInstallDir=$prefix/boot/post_install + mkdir -p $postInstallDir + cp -f $portDir/sshd_keymaker.sh $postInstallDir } TEST() { - cd openssh make tests } -LICENSE="OpenSSH" -COPYRIGHT="2005-2012 Tatu Ylonen et al." +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." From 5d2a935523da810325f26d6762602ddf50af4fa3 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 29 Apr 2013 01:01:17 +0200 Subject: [PATCH 173/587] Remove old and intermediate openssh non-recipes/patches --- net-misc/openssh/openssh-5.4p1.recipe | 41 ----- net-misc/openssh/openssh-5.5p1.recipe | 44 ------ net-misc/openssh/openssh-5.6p1.recipe | 51 ------- net-misc/openssh/openssh-5.7p1.recipe | 52 ------- net-misc/openssh/openssh-5.8p1.recipe | 53 ------- net-misc/openssh/openssh-5.9p1.recipe | 55 ------- .../openssh/patches/openssh-5.2p1-haiku.patch | 35 ----- net-misc/openssh/patches/openssh-5.4p1.patch | 35 ----- net-misc/openssh/patches/openssh-5.5p1.patch | 138 ----------------- net-misc/openssh/patches/openssh-5.6p1.patch | 138 ----------------- net-misc/openssh/patches/openssh-5.7p1.patch | 140 ------------------ net-misc/openssh/patches/openssh-5.8p1.patch | 140 ------------------ net-misc/openssh/patches/openssh-5.9p1.patch | 140 ------------------ 13 files changed, 1062 deletions(-) delete mode 100644 net-misc/openssh/openssh-5.4p1.recipe delete mode 100644 net-misc/openssh/openssh-5.5p1.recipe delete mode 100644 net-misc/openssh/openssh-5.6p1.recipe delete mode 100644 net-misc/openssh/openssh-5.7p1.recipe delete mode 100644 net-misc/openssh/openssh-5.8p1.recipe delete mode 100644 net-misc/openssh/openssh-5.9p1.recipe delete mode 100644 net-misc/openssh/patches/openssh-5.2p1-haiku.patch delete mode 100644 net-misc/openssh/patches/openssh-5.4p1.patch delete mode 100644 net-misc/openssh/patches/openssh-5.5p1.patch delete mode 100644 net-misc/openssh/patches/openssh-5.6p1.patch delete mode 100644 net-misc/openssh/patches/openssh-5.7p1.patch delete mode 100644 net-misc/openssh/patches/openssh-5.8p1.patch delete mode 100644 net-misc/openssh/patches/openssh-5.9p1.patch diff --git a/net-misc/openssh/openssh-5.4p1.recipe b/net-misc/openssh/openssh-5.4p1.recipe deleted file mode 100644 index 7aa9d7b30..000000000 --- a/net-misc/openssh/openssh-5.4p1.recipe +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION="OpenSSH" -HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.4p1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 0.9.8l" -CHECKSUM_MD5="da10af8a789fa2e83e3635f3a1b76f5e" -BUILD() -{ - cp ../patches/pathnames-haiku.h openssh-5.4p1/pathnames.h - cd openssh-5.4p1 - mkdir -p m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy - aclocal --install -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=`finddir B_COMMON_DIRECTORY`/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DIRECTORY`/man \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=PATH \ - --with-md5-passwords - make -} - -INSTALL() -{ - cd openssh-5.4p1 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install -} -LICENSE="OpenSSH" -COPYRIGHT="2005-2010 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-5.5p1.recipe b/net-misc/openssh/openssh-5.5p1.recipe deleted file mode 100644 index 67445c6f8..000000000 --- a/net-misc/openssh/openssh-5.5p1.recipe +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION="OpenSSH" -HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.5p1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libedit >= 20090923" -CHECKSUM_MD5="88633408f4cb1eb11ec7e2ec58b519eb" -BUILD() -{ - cd openssh-5.5p1 - autoconf - mkdir -p m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy - aclocal --install -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=`finddir B_COMMON_DIRECTORY`/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DIRECTORY`/man \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=${PATH} \ - --with-md5-passwords \ - --disable-utmpx \ - --with-libedit - make -} - -INSTALL() -{ - cd openssh-5.5p1 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install -} -LICENSE="OpenSSH" -COPYRIGHT="2005-2010 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-5.6p1.recipe b/net-misc/openssh/openssh-5.6p1.recipe deleted file mode 100644 index bbcdc33f3..000000000 --- a/net-misc/openssh/openssh-5.6p1.recipe +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION="OpenSSH" -HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.6p1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libedit >= 20090923" -CHECKSUM_MD5="e6ee52e47c768bf0ec42a232b5d18fb0" -BUILD() -{ - cd openssh-5.6p1 - autoconf - mkdir -p m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy - aclocal --install -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=`finddir B_COMMON_DIRECTORY`/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=${PATH} \ - --with-md5-passwords \ - --disable-utmpx \ - --with-libedit - make -} - -INSTALL() -{ - cd openssh-5.6p1 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install -} - -TEST() -{ - cd openssh-5.6p1 - make tests -} - -LICENSE="OpenSSH" -COPYRIGHT="2005-2010 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-5.7p1.recipe b/net-misc/openssh/openssh-5.7p1.recipe deleted file mode 100644 index 314979133..000000000 --- a/net-misc/openssh/openssh-5.7p1.recipe +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION="OpenSSH" -HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.7p1.tar.gz - http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.7p1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libedit >= 20090923" -CHECKSUM_MD5="50231fa257219791fa41b84a16c9df04" -BUILD() -{ - cd openssh-5.7p1 - autoconf - mkdir -p m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy - aclocal --install -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=`finddir B_COMMON_DIRECTORY`/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=${PATH} \ - --with-md5-passwords \ - --disable-utmpx \ - --with-libedit - make -} - -INSTALL() -{ - cd openssh-5.7p1 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install -} - -TEST() -{ - cd openssh-5.7p1 - make tests -} - -LICENSE="OpenSSH" -COPYRIGHT="2005-2011 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-5.8p1.recipe b/net-misc/openssh/openssh-5.8p1.recipe deleted file mode 100644 index bb0142c14..000000000 --- a/net-misc/openssh/openssh-5.8p1.recipe +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION="OpenSSH" -HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.8p1.tar.gz - http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.8p1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libedit >= 20090923" -CHECKSUM_MD5="86f5e1c23b4c4845f23b9b7b493fb53d" -BUILD() -{ - cd openssh-5.8p1 - autoconf - mkdir -p m4 - aclocal --install -I m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy - aclocal -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --bindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=`finddir B_COMMON_DIRECTORY`/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=${PATH} \ - --with-md5-passwords \ - --disable-utmpx \ - --with-libedit - make -} - -INSTALL() -{ - cd openssh-5.8p1 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install -} - -TEST() -{ - cd openssh-5.8p1 - make tests -} - -LICENSE="OpenSSH" -COPYRIGHT="2005-2011 Tatu Ylonen et al." diff --git a/net-misc/openssh/openssh-5.9p1.recipe b/net-misc/openssh/openssh-5.9p1.recipe deleted file mode 100644 index d37389f50..000000000 --- a/net-misc/openssh/openssh-5.9p1.recipe +++ /dev/null @@ -1,55 +0,0 @@ -DESCRIPTION="OpenSSH" -HOMEPAGE="http://www.openssh.com/" -SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.9p1.tar.gz - http://obsd.cec.mtu.edu/pub/OpenBSD/OpenSSH/portable/openssh-5.9p1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/openssl >= 1.0.0 - dev-libs/libedit >= 20090923" -CHECKSUM_MD5="afe17eee7e98d3b8550cc349834a85d0" -BUILD() -{ - cd openssh-5.9p1 - autoconf - mkdir -p m4 - aclocal --install -I m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - libtoolize --force --copy - aclocal -I m4 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` - COMMON_DIR=`finddir B_COMMON_DIRECTORY` - ./configure --prefix=$COMMON_DIR \ - --sbindir=$COMMON_BIN \ - --bindir=$COMMON_BIN \ - --libexecdir=$COMMON_BIN \ - --sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --includedir=$COMMON_DIR/include \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=$COMMON_DOCS/man \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ - --with-default-path=${PATH} \ - --with-md5-passwords \ - --disable-utmpx \ - --with-libedit - make -} - -INSTALL() -{ - cd openssh-5.9p1 - make install DESTDIR="${DESTDIR}" - mkdir -p ${DESTDIR}/boot/common/boot/post_install - cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install -} - -TEST() -{ - cd openssh-5.9p1 - make tests -} - -LICENSE="OpenSSH" -COPYRIGHT="2005-2011 Tatu Ylonen et al." diff --git a/net-misc/openssh/patches/openssh-5.2p1-haiku.patch b/net-misc/openssh/patches/openssh-5.2p1-haiku.patch deleted file mode 100644 index 61f87e9e8..000000000 --- a/net-misc/openssh/patches/openssh-5.2p1-haiku.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -urN openssh-5.2p1/configure.ac openssh-5.2p1-haiku/configure.ac ---- openssh-5.2p1/configure.ac 2009-05-19 03:58:15.000000000 +0000 -+++ openssh-5.2p1-haiku/configure.ac 2009-05-19 05:02:04.000000000 +0000 -@@ -484,6 +484,11 @@ - *-*-dragonfly*) - SSHDLIBS="$SSHDLIBS -lcrypt" - ;; -+*-*-haiku*) -+ LIBS="$LIBS -lbsd " -+ AC_CHECK_LIB(network, socket) -+ MANTYPE=man -+ ;; - *-*-hpux*) - # first we define all of the options common to all HP-UX releases - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" -@@ -2611,6 +2616,19 @@ - ) - fi - -+if test -z "$have_u_int64_t" ; then -+ AC_MSG_CHECKING([for u_int64_t type in posix/stdint.h]) -+ AC_TRY_COMPILE( -+ [ #include ], -+ [ u_int64_t a; a = 1], -+ [ -+ AC_DEFINE(HAVE_U_INT64_T) -+ AC_MSG_RESULT(yes) -+ ], -+ [ AC_MSG_RESULT(no) ] -+ ) -+fi -+ - if test -z "$have_u_intxx_t" ; then - AC_CACHE_CHECK([for uintXX_t types], ac_cv_have_uintxx_t, [ - AC_TRY_COMPILE( diff --git a/net-misc/openssh/patches/openssh-5.4p1.patch b/net-misc/openssh/patches/openssh-5.4p1.patch deleted file mode 100644 index 6b2669972..000000000 --- a/net-misc/openssh/patches/openssh-5.4p1.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -urN openssh-5.4p1/configure.ac openssh-5.4p1-haiku/configure.ac ---- openssh-5.4p1/configure.ac 2010-03-05 04:04:35.015990784 +0000 -+++ openssh-5.4p1-haiku/configure.ac 2010-03-16 09:39:10.537133056 +0000 -@@ -488,6 +488,11 @@ - *-*-dragonfly*) - SSHDLIBS="$SSHDLIBS -lcrypt" - ;; -+*-*-haiku*) -+ LIBS="$LIBS -lbsd " -+ AC_CHECK_LIB(network, socket) -+ MANTYPE=man -+ ;; - *-*-hpux*) - # first we define all of the options common to all HP-UX releases - CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" -@@ -2648,6 +2653,19 @@ - ) - fi - -+if test -z "$have_u_int64_t" ; then -+ AC_MSG_CHECKING([for u_int64_t type in posix/stdint.h]) -+ AC_TRY_COMPILE( -+ [ #include ], -+ [ u_int64_t a; a = 1], -+ [ -+ AC_DEFINE(HAVE_U_INT64_T) -+ AC_MSG_RESULT(yes) -+ ], -+ [ AC_MSG_RESULT(no) ] -+ ) -+fi -+ - if test -z "$have_u_intxx_t" ; then - AC_CACHE_CHECK([for uintXX_t types], ac_cv_have_uintxx_t, [ - AC_TRY_COMPILE( diff --git a/net-misc/openssh/patches/openssh-5.5p1.patch b/net-misc/openssh/patches/openssh-5.5p1.patch deleted file mode 100644 index 055b257d0..000000000 --- a/net-misc/openssh/patches/openssh-5.5p1.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -urN openssh-5.5p1/configure.ac openssh-5.5p1-haiku/configure.ac ---- openssh-5.5p1/configure.ac 2010-04-10 12:58:01.014942208 +0000 -+++ openssh-5.5p1-haiku/configure.ac 2010-04-30 05:09:08.936378368 +0000 -@@ -1277,7 +1277,7 @@ - LIBEDIT=`$PKGCONFIG --libs-only-l libedit` - CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" - else -- LIBEDIT="-ledit -lcurses" -+ AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) - fi - OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` - AC_CHECK_LIB(edit, el_init, -diff -urN openssh-5.5p1/pathnames.h openssh-5.5p1-haiku/pathnames.h ---- openssh-5.5p1/pathnames.h 2010-02-24 06:17:58.023592960 +0000 -+++ openssh-5.5p1-haiku/pathnames.h 2010-04-30 04:53:52.000000000 +0000 -@@ -12,7 +12,15 @@ - * called by a name other than "ssh" or "Secure Shell". - */ - --#define ETCDIR "/etc" -+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" -+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" -+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" -+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" -+#define HAIKU_COMMON_SERVERS_DIRECTORY "/boot/common/servers" -+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" -+ -+ -+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY - - #ifndef SSHDIR - #define SSHDIR ETCDIR "/ssh" -@@ -44,7 +52,7 @@ - #define _PATH_DH_PRIMES SSHDIR "/primes" - - #ifndef _PATH_SSH_PROGRAM --#define _PATH_SSH_PROGRAM "/usr/bin/ssh" -+#define _PATH_SSH_PROGRAM B_COMMON_BIN_DIRECTORY - #endif - - /* -@@ -57,24 +65,24 @@ - * The directory in user's home directory in which the files reside. The - * directory should be world-readable (though not all files are). - */ --#define _PATH_SSH_USER_DIR ".ssh" -+#define _PATH_SSH_USER_DIR "config/settings/ssh" - - /* - * Per-user file containing host keys of known hosts. This file need not be - * readable by anyone except the user him/herself, though this does not - * contain anything particularly secret. - */ --#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" -+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" - /* backward compat for protocol 2 */ --#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" -+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" - - /* - * Name of the default file containing client-side authentication key. This - * file should only be readable by the user him/herself. - */ --#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" --#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" --#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" -+#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" -+#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" -+#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" - - /* - * Configuration file in user's home directory. This file need not be -@@ -82,7 +90,7 @@ - * particularly secret. If the user's home directory resides on an NFS - * volume where root is mapped to nobody, this may need to be world-readable. - */ --#define _PATH_SSH_USER_CONFFILE ".ssh/config" -+#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" - - /* - * File containing a list of those rsa keys that permit logging in as this -@@ -92,10 +100,10 @@ - * may need to be world-readable. (This file is read by the daemon which is - * running as root.) - */ --#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" -+#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" - - /* backward compat for protocol v2 */ --#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" -+#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" - - /* - * Per-user and system-wide ssh "rc" files. These files are executed with -@@ -103,7 +111,7 @@ - * passed "proto cookie" as arguments if X11 forwarding with spoofing is in - * use. xauth will be run if neither of these exists. - */ --#define _PATH_SSH_USER_RC ".ssh/rc" -+#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" - #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" - - /* -@@ -147,17 +155,16 @@ - - /* for sftp */ - #ifndef _PATH_SFTP_SERVER --#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" -+#define _PATH_SFTP_SERVER HAIKU_COMMON_SERVERS_DIRECTORY "/sftp-server" - #endif - - /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ - #ifndef _PATH_PRIVSEP_CHROOT_DIR --#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" -+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" - #endif -- - /* for passwd change */ - #ifndef _PATH_PASSWD_PROG --#define _PATH_PASSWD_PROG "/usr/bin/passwd" -+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" - #endif - - #ifndef _PATH_LS -@@ -169,11 +176,11 @@ - # ifdef LOGIN_PROGRAM_FALLBACK - # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK - # else --# define LOGIN_PROGRAM "/usr/bin/login" -+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" - # endif - #endif /* LOGIN_PROGRAM */ - - /* Askpass program define */ - #ifndef ASKPASS_PROGRAM --#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" -+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" - #endif /* ASKPASS_PROGRAM */ diff --git a/net-misc/openssh/patches/openssh-5.6p1.patch b/net-misc/openssh/patches/openssh-5.6p1.patch deleted file mode 100644 index df54e5193..000000000 --- a/net-misc/openssh/patches/openssh-5.6p1.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -urN openssh-5.6p1/configure.ac openssh-5.6p1-haiku/configure.ac ---- openssh-5.6p1/configure.ac 2010-04-10 12:58:01.014942208 +0000 -+++ openssh-5.6p1-haiku/configure.ac 2010-04-30 05:09:08.936378368 +0000 -@@ -1277,7 +1277,7 @@ - LIBEDIT=`$PKGCONFIG --libs-only-l libedit` - CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" - else -- LIBEDIT="-ledit -lcurses" -+ AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) - fi - OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` - AC_CHECK_LIB(edit, el_init, -diff -urN openssh-5.6p1/pathnames.h openssh-5.6p1-haiku/pathnames.h ---- openssh-5.6p1/pathnames.h 2010-02-24 06:17:58.023592960 +0000 -+++ openssh-5.6p1-haiku/pathnames.h 2010-04-30 04:53:52.000000000 +0000 -@@ -12,7 +12,15 @@ - * called by a name other than "ssh" or "Secure Shell". - */ - --#define ETCDIR "/etc" -+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" -+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" -+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" -+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" -+#define HAIKU_COMMON_SERVERS_DIRECTORY "/boot/common/servers" -+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" -+ -+ -+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY - - #ifndef SSHDIR - #define SSHDIR ETCDIR "/ssh" -@@ -44,7 +52,7 @@ - #define _PATH_DH_PRIMES SSHDIR "/primes" - - #ifndef _PATH_SSH_PROGRAM --#define _PATH_SSH_PROGRAM "/usr/bin/ssh" -+#define _PATH_SSH_PROGRAM B_COMMON_BIN_DIRECTORY - #endif - - /* -@@ -57,24 +65,24 @@ - * The directory in user's home directory in which the files reside. The - * directory should be world-readable (though not all files are). - */ --#define _PATH_SSH_USER_DIR ".ssh" -+#define _PATH_SSH_USER_DIR "config/settings/ssh" - - /* - * Per-user file containing host keys of known hosts. This file need not be - * readable by anyone except the user him/herself, though this does not - * contain anything particularly secret. - */ --#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" -+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" - /* backward compat for protocol 2 */ --#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" -+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" - - /* - * Name of the default file containing client-side authentication key. This - * file should only be readable by the user him/herself. - */ --#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" --#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" --#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" -+#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" -+#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" -+#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" - - /* - * Configuration file in user's home directory. This file need not be -@@ -82,7 +90,7 @@ - * particularly secret. If the user's home directory resides on an NFS - * volume where root is mapped to nobody, this may need to be world-readable. - */ --#define _PATH_SSH_USER_CONFFILE ".ssh/config" -+#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" - - /* - * File containing a list of those rsa keys that permit logging in as this -@@ -92,10 +100,10 @@ - * may need to be world-readable. (This file is read by the daemon which is - * running as root.) - */ --#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" -+#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" - - /* backward compat for protocol v2 */ --#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" -+#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" - - /* - * Per-user and system-wide ssh "rc" files. These files are executed with -@@ -103,7 +111,7 @@ - * passed "proto cookie" as arguments if X11 forwarding with spoofing is in - * use. xauth will be run if neither of these exists. - */ --#define _PATH_SSH_USER_RC ".ssh/rc" -+#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" - #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" - - /* -@@ -147,17 +155,16 @@ - - /* for sftp */ - #ifndef _PATH_SFTP_SERVER --#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" -+#define _PATH_SFTP_SERVER HAIKU_COMMON_SERVERS_DIRECTORY "/sftp-server" - #endif - - /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ - #ifndef _PATH_PRIVSEP_CHROOT_DIR --#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" -+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" - #endif -- - /* for passwd change */ - #ifndef _PATH_PASSWD_PROG --#define _PATH_PASSWD_PROG "/usr/bin/passwd" -+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" - #endif - - #ifndef _PATH_LS -@@ -169,11 +176,11 @@ - # ifdef LOGIN_PROGRAM_FALLBACK - # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK - # else --# define LOGIN_PROGRAM "/usr/bin/login" -+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" - # endif - #endif /* LOGIN_PROGRAM */ - - /* Askpass program define */ - #ifndef ASKPASS_PROGRAM --#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" -+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" - #endif /* ASKPASS_PROGRAM */ diff --git a/net-misc/openssh/patches/openssh-5.7p1.patch b/net-misc/openssh/patches/openssh-5.7p1.patch deleted file mode 100644 index fc1b8579d..000000000 --- a/net-misc/openssh/patches/openssh-5.7p1.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -urN openssh-5.7p1/configure.ac openssh-5.7p1-haiku/configure.ac ---- openssh-5.7p1/configure.ac 2011-01-21 22:37:05.026738688 +0000 -+++ openssh-5.7p1-haiku/configure.ac 2011-01-25 08:26:16.039583744 +0000 -@@ -1347,7 +1347,7 @@ - LIBEDIT=`$PKGCONFIG --libs-only-l libedit` - CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" - else -- LIBEDIT="-ledit -lcurses" -+ AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) - fi - OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` - AC_CHECK_LIB(edit, el_init, -diff -urN openssh-5.7p1/pathnames.h openssh-5.7p1-haiku/pathnames.h ---- openssh-5.7p1/pathnames.h 2010-08-31 12:41:14.035651584 +0000 -+++ openssh-5.7p1-haiku/pathnames.h 2011-01-25 08:26:32.062914560 +0000 -@@ -12,7 +12,15 @@ - * called by a name other than "ssh" or "Secure Shell". - */ - --#define ETCDIR "/etc" -+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" -+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" -+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" -+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" -+#define HAIKU_COMMON_SERVERS_DIRECTORY "/boot/common/servers" -+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" -+ -+ -+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY - - #ifndef SSHDIR - #define SSHDIR ETCDIR "/ssh" -@@ -45,7 +53,7 @@ - #define _PATH_DH_PRIMES SSHDIR "/primes" - - #ifndef _PATH_SSH_PROGRAM --#define _PATH_SSH_PROGRAM "/usr/bin/ssh" -+#define _PATH_SSH_PROGRAM B_COMMON_BIN_DIRECTORY - #endif - - /* -@@ -58,25 +66,25 @@ - * The directory in user's home directory in which the files reside. The - * directory should be world-readable (though not all files are). - */ --#define _PATH_SSH_USER_DIR ".ssh" -+#define _PATH_SSH_USER_DIR "config/settings/ssh" - - /* - * Per-user file containing host keys of known hosts. This file need not be - * readable by anyone except the user him/herself, though this does not - * contain anything particularly secret. - */ --#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" -+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" - /* backward compat for protocol 2 */ --#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" -+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" - - /* - * Name of the default file containing client-side authentication key. This - * file should only be readable by the user him/herself. - */ --#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" --#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" --#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa" --#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" -+#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" -+#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" -+#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa" -+#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" - - /* - * Configuration file in user's home directory. This file need not be -@@ -84,7 +92,7 @@ - * particularly secret. If the user's home directory resides on an NFS - * volume where root is mapped to nobody, this may need to be world-readable. - */ --#define _PATH_SSH_USER_CONFFILE ".ssh/config" -+#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" - - /* - * File containing a list of those rsa keys that permit logging in as this -@@ -94,10 +102,10 @@ - * may need to be world-readable. (This file is read by the daemon which is - * running as root.) - */ --#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" -+#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" - - /* backward compat for protocol v2 */ --#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" -+#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" - - /* - * Per-user and system-wide ssh "rc" files. These files are executed with -@@ -105,7 +113,7 @@ - * passed "proto cookie" as arguments if X11 forwarding with spoofing is in - * use. xauth will be run if neither of these exists. - */ --#define _PATH_SSH_USER_RC ".ssh/rc" -+#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" - #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" - - /* -@@ -149,17 +157,16 @@ - - /* for sftp */ - #ifndef _PATH_SFTP_SERVER --#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" -+#define _PATH_SFTP_SERVER HAIKU_COMMON_SERVERS_DIRECTORY "/sftp-server" - #endif - - /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ - #ifndef _PATH_PRIVSEP_CHROOT_DIR --#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" -+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" - #endif -- - /* for passwd change */ - #ifndef _PATH_PASSWD_PROG --#define _PATH_PASSWD_PROG "/usr/bin/passwd" -+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" - #endif - - #ifndef _PATH_LS -@@ -171,11 +178,11 @@ - # ifdef LOGIN_PROGRAM_FALLBACK - # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK - # else --# define LOGIN_PROGRAM "/usr/bin/login" -+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" - # endif - #endif /* LOGIN_PROGRAM */ - - /* Askpass program define */ - #ifndef ASKPASS_PROGRAM --#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" -+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" - #endif /* ASKPASS_PROGRAM */ diff --git a/net-misc/openssh/patches/openssh-5.8p1.patch b/net-misc/openssh/patches/openssh-5.8p1.patch deleted file mode 100644 index cfa13681b..000000000 --- a/net-misc/openssh/patches/openssh-5.8p1.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -urN openssh-5.8p1/configure.ac openssh-5.8p1-haiku/configure.ac ---- openssh-5.8p1/configure.ac 2011-01-21 22:37:05.026738688 +0000 -+++ openssh-5.8p1-haiku/configure.ac 2011-01-25 08:26:16.039583744 +0000 -@@ -1347,7 +1347,7 @@ - LIBEDIT=`$PKGCONFIG --libs-only-l libedit` - CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" - else -- LIBEDIT="-ledit -lcurses" -+ AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) - fi - OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` - AC_CHECK_LIB(edit, el_init, -diff -urN openssh-5.8p1/pathnames.h openssh-5.8p1-haiku/pathnames.h ---- openssh-5.8p1/pathnames.h 2010-08-31 12:41:14.035651584 +0000 -+++ openssh-5.8p1-haiku/pathnames.h 2011-01-25 08:26:32.062914560 +0000 -@@ -12,7 +12,15 @@ - * called by a name other than "ssh" or "Secure Shell". - */ - --#define ETCDIR "/etc" -+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" -+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" -+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" -+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" -+#define HAIKU_COMMON_SERVERS_DIRECTORY "/boot/common/servers" -+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" -+ -+ -+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY - - #ifndef SSHDIR - #define SSHDIR ETCDIR "/ssh" -@@ -45,7 +53,7 @@ - #define _PATH_DH_PRIMES SSHDIR "/primes" - - #ifndef _PATH_SSH_PROGRAM --#define _PATH_SSH_PROGRAM "/usr/bin/ssh" -+#define _PATH_SSH_PROGRAM B_COMMON_BIN_DIRECTORY - #endif - - /* -@@ -58,25 +66,25 @@ - * The directory in user's home directory in which the files reside. The - * directory should be world-readable (though not all files are). - */ --#define _PATH_SSH_USER_DIR ".ssh" -+#define _PATH_SSH_USER_DIR "config/settings/ssh" - - /* - * Per-user file containing host keys of known hosts. This file need not be - * readable by anyone except the user him/herself, though this does not - * contain anything particularly secret. - */ --#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" -+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" - /* backward compat for protocol 2 */ --#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" -+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" - - /* - * Name of the default file containing client-side authentication key. This - * file should only be readable by the user him/herself. - */ --#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" --#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" --#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa" --#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" -+#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" -+#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" -+#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa" -+#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" - - /* - * Configuration file in user's home directory. This file need not be -@@ -84,7 +92,7 @@ - * particularly secret. If the user's home directory resides on an NFS - * volume where root is mapped to nobody, this may need to be world-readable. - */ --#define _PATH_SSH_USER_CONFFILE ".ssh/config" -+#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" - - /* - * File containing a list of those rsa keys that permit logging in as this -@@ -94,10 +102,10 @@ - * may need to be world-readable. (This file is read by the daemon which is - * running as root.) - */ --#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" -+#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" - - /* backward compat for protocol v2 */ --#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" -+#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" - - /* - * Per-user and system-wide ssh "rc" files. These files are executed with -@@ -105,7 +113,7 @@ - * passed "proto cookie" as arguments if X11 forwarding with spoofing is in - * use. xauth will be run if neither of these exists. - */ --#define _PATH_SSH_USER_RC ".ssh/rc" -+#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" - #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" - - /* -@@ -149,17 +157,16 @@ - - /* for sftp */ - #ifndef _PATH_SFTP_SERVER --#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" -+#define _PATH_SFTP_SERVER HAIKU_COMMON_SERVERS_DIRECTORY "/sftp-server" - #endif - - /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ - #ifndef _PATH_PRIVSEP_CHROOT_DIR --#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" -+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" - #endif -- - /* for passwd change */ - #ifndef _PATH_PASSWD_PROG --#define _PATH_PASSWD_PROG "/usr/bin/passwd" -+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" - #endif - - #ifndef _PATH_LS -@@ -171,11 +178,11 @@ - # ifdef LOGIN_PROGRAM_FALLBACK - # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK - # else --# define LOGIN_PROGRAM "/usr/bin/login" -+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" - # endif - #endif /* LOGIN_PROGRAM */ - - /* Askpass program define */ - #ifndef ASKPASS_PROGRAM --#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" -+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" - #endif /* ASKPASS_PROGRAM */ diff --git a/net-misc/openssh/patches/openssh-5.9p1.patch b/net-misc/openssh/patches/openssh-5.9p1.patch deleted file mode 100644 index 8e7d7d818..000000000 --- a/net-misc/openssh/patches/openssh-5.9p1.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -urN openssh-5.9p1/configure.ac openssh-5.9p1-haiku/configure.ac ---- openssh-5.9p1/configure.ac 2011-02-04 00:42:14.007077888 +0000 -+++ openssh-5.9p1-haiku/configure.ac 2011-05-04 16:01:02.093585408 +0000 -@@ -1345,7 +1345,7 @@ - LIBEDIT=`$PKGCONFIG --libs-only-l libedit` - CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" - else -- LIBEDIT="-ledit -lcurses" -+ AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) - fi - OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` - AC_CHECK_LIB(edit, el_init, -diff -urN openssh-5.9p1/pathnames.h openssh-5.9p1-haiku/pathnames.h ---- openssh-5.9p1/pathnames.h 2010-08-31 12:41:14.016252928 +0000 -+++ openssh-5.9p1-haiku/pathnames.h 2011-05-04 16:01:02.127139840 +0000 -@@ -12,7 +12,14 @@ - * called by a name other than "ssh" or "Secure Shell". - */ - --#define ETCDIR "/etc" -+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" -+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" -+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" -+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" -+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" -+ -+ -+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY - - #ifndef SSHDIR - #define SSHDIR ETCDIR "/ssh" -@@ -45,7 +53,7 @@ - #define _PATH_DH_PRIMES SSHDIR "/primes" - - #ifndef _PATH_SSH_PROGRAM --#define _PATH_SSH_PROGRAM "/usr/bin/ssh" -+#define _PATH_SSH_PROGRAM B_COMMON_BIN_DIRECTORY - #endif - - /* -@@ -58,25 +66,25 @@ - * The directory in user's home directory in which the files reside. The - * directory should be world-readable (though not all files are). - */ --#define _PATH_SSH_USER_DIR ".ssh" -+#define _PATH_SSH_USER_DIR "config/settings/ssh" - - /* - * Per-user file containing host keys of known hosts. This file need not be - * readable by anyone except the user him/herself, though this does not - * contain anything particularly secret. - */ --#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" -+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" - /* backward compat for protocol 2 */ --#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" -+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" - - /* - * Name of the default file containing client-side authentication key. This - * file should only be readable by the user him/herself. - */ --#define _PATH_SSH_CLIENT_IDENTITY ".ssh/identity" --#define _PATH_SSH_CLIENT_ID_DSA ".ssh/id_dsa" --#define _PATH_SSH_CLIENT_ID_ECDSA ".ssh/id_ecdsa" --#define _PATH_SSH_CLIENT_ID_RSA ".ssh/id_rsa" -+#define _PATH_SSH_CLIENT_IDENTITY _PATH_SSH_USER_DIR "/identity" -+#define _PATH_SSH_CLIENT_ID_DSA _PATH_SSH_USER_DIR "/id_dsa" -+#define _PATH_SSH_CLIENT_ID_ECDSA _PATH_SSH_USER_DIR "/id_ecdsa" -+#define _PATH_SSH_CLIENT_ID_RSA _PATH_SSH_USER_DIR "/id_rsa" - - /* - * Configuration file in user's home directory. This file need not be -@@ -84,7 +92,7 @@ - * particularly secret. If the user's home directory resides on an NFS - * volume where root is mapped to nobody, this may need to be world-readable. - */ --#define _PATH_SSH_USER_CONFFILE ".ssh/config" -+#define _PATH_SSH_USER_CONFFILE _PATH_SSH_USER_DIR "/config" - - /* - * File containing a list of those rsa keys that permit logging in as this -@@ -94,10 +102,10 @@ - * may need to be world-readable. (This file is read by the daemon which is - * running as root.) - */ --#define _PATH_SSH_USER_PERMITTED_KEYS ".ssh/authorized_keys" -+#define _PATH_SSH_USER_PERMITTED_KEYS _PATH_SSH_USER_DIR "/authorized_keys" - - /* backward compat for protocol v2 */ --#define _PATH_SSH_USER_PERMITTED_KEYS2 ".ssh/authorized_keys2" -+#define _PATH_SSH_USER_PERMITTED_KEYS2 _PATH_SSH_USER_DIR "/authorized_keys2" - - /* - * Per-user and system-wide ssh "rc" files. These files are executed with -@@ -105,7 +113,7 @@ - * passed "proto cookie" as arguments if X11 forwarding with spoofing is in - * use. xauth will be run if neither of these exists. - */ --#define _PATH_SSH_USER_RC ".ssh/rc" -+#define _PATH_SSH_USER_RC _PATH_SSH_USER_DIR "/rc" - #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" - - /* -@@ -149,17 +157,16 @@ - - /* for sftp */ - #ifndef _PATH_SFTP_SERVER --#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" -+#define _PATH_SFTP_SERVER HAIKU_COMMON_BIN_DIRECTORY"/sftp-server" - #endif - - /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ - #ifndef _PATH_PRIVSEP_CHROOT_DIR --#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" -+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" - #endif -- - /* for passwd change */ - #ifndef _PATH_PASSWD_PROG --#define _PATH_PASSWD_PROG "/usr/bin/passwd" -+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" - #endif - - #ifndef _PATH_LS -@@ -171,11 +178,11 @@ - # ifdef LOGIN_PROGRAM_FALLBACK - # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK - # else --# define LOGIN_PROGRAM "/usr/bin/login" -+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" - # endif - #endif /* LOGIN_PROGRAM */ - - /* Askpass program define */ - #ifndef ASKPASS_PROGRAM --#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" -+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" - #endif /* ASKPASS_PROGRAM */ - From d3b72fd5459544311261571732835b7e71f08a0b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 29 Apr 2013 01:38:33 +0200 Subject: [PATCH 174/587] Convert bzip2 1.0.6 recipe to an actual recipe Also remove the patch. It only concerns the installation locations. Instead move things around in INSTALL(). --- app-arch/bzip2/bzip2-1.0.6.recipe | 75 ++++++++++++++---- app-arch/bzip2/patches/bzip2-1.0.6.patch | 97 ------------------------ 2 files changed, 61 insertions(+), 111 deletions(-) delete mode 100644 app-arch/bzip2/patches/bzip2-1.0.6.patch diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe index cdd18ca38..849530802 100644 --- a/app-arch/bzip2/bzip2-1.0.6.recipe +++ b/app-arch/bzip2/bzip2-1.0.6.recipe @@ -1,23 +1,70 @@ -DESCRIPTION="bzip2" -HOMEPAGE="http://www.bzip.org/" +SUMMARY="bzip2 data compression utilities and libraries" +DESCRIPTION="bzip2 is a freely available, patent free (see below), 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." +HOMEPAGE="http://www.bzip.org/" +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="1" -STATUS_HAIKU="stable" -DEPEND="" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + bzip2 = $portVersion compat >= 1 + cmd:bzcat = $portVersion compat >= 1 + cmd:bzcmp = $portVersion compat >= 1 + cmd:bzdiff = $portVersion compat >= 1 + cmd:bzegrep = $portVersion compat >= 1 + cmd:bzfgrep = $portVersion compat >= 1 + cmd:bzgrep = $portVersion compat >= 1 + cmd:bzip2 = $portVersion compat >= 1 + cmd:bzip2recover = $portVersion compat >= 1 + cmd:bzless = $portVersion compat >= 1 + cmd:bzmore = $portVersion compat >= 1 + cmd:bunzip2 = $portVersion compat >= 1 + lib:libbz2 = $portVersion compat >= 1.0 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + $REQUIRES + cmd:ar + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd bzip2-1.0.6 - make - make -f Makefile-libbz2_so + make $jobArgs + make $jobArgs -f Makefile-libbz2_so + # shared libary not built by default } INSTALL() { - cd bzip2-1.0.6 - make install PREFIX=/boot/common - cp libbz2.so.1.0.6 /boot/common/lib - cp libbz2.so.1.0 /boot/common/lib + make install PREFIX=$prefix + + # also install shared lib + cp -a libbz2.so.1.0.6 libbz2.so.1.0 $libDir + + # move man pages + mkdir -p $manDir + mv $prefix/man/* $manDir + rmdir $prefix/man + + # move headers + bzip2IncludeDir=$includeDir/bzip2 + mkdir -p $bzip2IncludeDir + mv $prefix/include/* $bzip2IncludeDir + rmdir $prefix/include + + # prepare development lib links + prepareInstalledDevelLibs libbz2 } -LICENSE="bzip2" -COPYRIGHT="1996-2010 Julian R Seward" diff --git a/app-arch/bzip2/patches/bzip2-1.0.6.patch b/app-arch/bzip2/patches/bzip2-1.0.6.patch deleted file mode 100644 index 1ccb075d5..000000000 --- a/app-arch/bzip2/patches/bzip2-1.0.6.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -urN work/bzip2-1.0.6/Makefile work-haiku/bzip2-1.0.6/Makefile ---- bzip2-1.0.6/Makefile 2008-02-14 12:39:18.000000000 +0000 -+++ bzip2-1.0.6-haiku/Makefile 2009-12-27 00:29:38.000000000 +0000 -@@ -24,7 +24,8 @@ - CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) - - # Where you want it installed when you do 'make install' --PREFIX=/usr/local -+PREFIX=/boot/common -+DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - - - OBJS= blocksort.o \ -@@ -70,43 +70,46 @@ - @cat words3 - - install: bzip2 bzip2recover -- if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi -- if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi -- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi -- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi -- if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi -- cp -f bzip2 $(PREFIX)/bin/bzip2 -- cp -f bzip2 $(PREFIX)/bin/bunzip2 -- cp -f bzip2 $(PREFIX)/bin/bzcat -- cp -f bzip2recover $(PREFIX)/bin/bzip2recover -- chmod a+x $(PREFIX)/bin/bzip2 -- chmod a+x $(PREFIX)/bin/bunzip2 -- chmod a+x $(PREFIX)/bin/bzcat -- chmod a+x $(PREFIX)/bin/bzip2recover -- cp -f bzip2.1 $(PREFIX)/man/man1 -- chmod a+r $(PREFIX)/man/man1/bzip2.1 -- cp -f bzlib.h $(PREFIX)/include -- chmod a+r $(PREFIX)/include/bzlib.h -- cp -f libbz2.a $(PREFIX)/lib -- chmod a+r $(PREFIX)/lib/libbz2.a -- cp -f bzgrep $(PREFIX)/bin/bzgrep -- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep -- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep -- chmod a+x $(PREFIX)/bin/bzgrep -- cp -f bzmore $(PREFIX)/bin/bzmore -- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless -- chmod a+x $(PREFIX)/bin/bzmore -- cp -f bzdiff $(PREFIX)/bin/bzdiff -- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp -- chmod a+x $(PREFIX)/bin/bzdiff -- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 -- chmod a+r $(PREFIX)/man/man1/bzgrep.1 -- chmod a+r $(PREFIX)/man/man1/bzmore.1 -- chmod a+r $(PREFIX)/man/man1/bzdiff.1 -- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1 -- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1 -- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1 -- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 -+ if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi -+ if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi -+ if ( test ! -d $(DESTDIR)$(DOCDIR)/man ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man ; fi -+ if ( test ! -d $(DESTDIR)$(DOCDIR)/man/man1 ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man/man1 ; fi -+ if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi -+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2 -+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2 -+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat -+ cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2 -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2 -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover -+ cp -f bzip2.1 $(DESTDIR)$(DOCDIR)/man/man1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzip2.1 -+ cp -f bzlib.h $(DESTDIR)$(PREFIX)/include -+ chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h -+ cp -f libbz2.a $(DESTDIR)$(PREFIX)/lib -+ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a -+ cp -f libbz2.so.1.0.6 $(DESTDIR)$(PREFIX)/lib -+ ln -s -f $(PREFIX)/lib/libbz2.so.1.0.6 $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0 -+ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0.6 -+ cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep -+ ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep -+ ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep -+ cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore -+ ln -s -f $(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore -+ cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff -+ ln -s -f $(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff -+ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(DOCDIR)/man/man1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzgrep.1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzmore.1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzdiff.1 -+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzegrep.1 -+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzfgrep.1 -+ echo ".so man1/bzmore.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzless.1 -+ echo ".so man1/bzdiff.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzcmp.1 - - clean: - rm -f *.o libbz2.a bzip2 bzip2recover \ From 2089651b584fef1274b41d9832f0bd32b0697d08 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 29 Apr 2013 01:41:08 +0200 Subject: [PATCH 175/587] bzip2 1.0.5: Remove non-recipe and all other files --- app-arch/bzip2/bzip2-1.0.5-1.build | 3 - app-arch/bzip2/bzip2-1.0.5-1.install | 4 - app-arch/bzip2/bzip2-1.0.5.recipe | 23 ------ app-arch/bzip2/bzip2-1.0.5.sh | 33 -------- app-arch/bzip2/patches/bzip2-1.0.5.patch | 97 ------------------------ 5 files changed, 160 deletions(-) delete mode 100644 app-arch/bzip2/bzip2-1.0.5-1.build delete mode 100644 app-arch/bzip2/bzip2-1.0.5-1.install delete mode 100644 app-arch/bzip2/bzip2-1.0.5.recipe delete mode 100755 app-arch/bzip2/bzip2-1.0.5.sh delete mode 100644 app-arch/bzip2/patches/bzip2-1.0.5.patch diff --git a/app-arch/bzip2/bzip2-1.0.5-1.build b/app-arch/bzip2/bzip2-1.0.5-1.build deleted file mode 100644 index 5070a0134..000000000 --- a/app-arch/bzip2/bzip2-1.0.5-1.build +++ /dev/null @@ -1,3 +0,0 @@ -cd bzip2-1.0.5 -make -make -f Makefile-libbz2_so diff --git a/app-arch/bzip2/bzip2-1.0.5-1.install b/app-arch/bzip2/bzip2-1.0.5-1.install deleted file mode 100644 index f4e4734f1..000000000 --- a/app-arch/bzip2/bzip2-1.0.5-1.install +++ /dev/null @@ -1,4 +0,0 @@ -cd bzip2-1.0.5 -make install PREFIX=/boot/common -cp libbz2.so.1.0.4 /boot/common/lib -cp libbz2.so.1.0 /boot/common/lib diff --git a/app-arch/bzip2/bzip2-1.0.5.recipe b/app-arch/bzip2/bzip2-1.0.5.recipe deleted file mode 100644 index 4580dc8e2..000000000 --- a/app-arch/bzip2/bzip2-1.0.5.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="bzip2" -HOMEPAGE="http://www.bzip.org/" -SRC_URI="http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz" -CHECKSUM_MD5="3c15a0c8d1d3ee1c46a1634d00617b1a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd bzip2-1.0.5 - make - make -f Makefile-libbz2_so -} - -INSTALL() -{ - cd bzip2-1.0.5 - make install PREFIX=/boot/common - cp libbz2.so.1.0.4 /boot/common/lib - cp libbz2.so.1.0 /boot/common/lib -} -LICENSE="bzip2" -COPYRIGHT="1996-2007 Julian R Seward" diff --git a/app-arch/bzip2/bzip2-1.0.5.sh b/app-arch/bzip2/bzip2-1.0.5.sh deleted file mode 100755 index f14d9bbcf..000000000 --- a/app-arch/bzip2/bzip2-1.0.5.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -HOMEPAGE="http://www.bzip.org/" -PACKAGE="app-arch/bzip2/" -VERSION="1.0.5" -URL="http://www.bzip.org/1.0.5/" -FILE="bzip2-1.0.5.tar.gz" - -# ------- This should not be edited ------- -PFX=/boot/common/ -HAIKUPORTS="http://ports.haiku-files.org/wiki/" -CWD=`pwd`/ -if [ ! -d ${PACKAGE}${VERSION} ] ; then - mkdir -p ${PACKAGE}${VERSION} -fi -if [ ! -e ${FILE} ] ; then - wget ${URL}${FILE} -fi -cd ${PACKAGE}${VERSION} -if [ ${FILE:(-7)} = "tar.bz2" ] ; then - tar -jxvf ${CWD}${FILE} -elif [ ${FILE:(-7)} = ".tar.gz" ] ; then - tar xvf ${CWD}${FILE} -fi -# ------- Begin Instructions ------- -cd bzip2-1.0.5 -make PREFIX=${PFX} && make install PREFIX=${PFX} && echo && echo " Installation complete." || echo " Installation FAILED !" - - -echo " For more information, see:" -echo " ${HAIKUPORTS}${PACKAGE}" -echo " ${HOMEPAGE}" -echo diff --git a/app-arch/bzip2/patches/bzip2-1.0.5.patch b/app-arch/bzip2/patches/bzip2-1.0.5.patch deleted file mode 100644 index b53f738cc..000000000 --- a/app-arch/bzip2/patches/bzip2-1.0.5.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -urN work/bzip2-1.0.5/Makefile work-haiku/bzip2-1.0.5/Makefile ---- bzip2-1.0.5/Makefile 2008-02-14 12:39:18.000000000 +0000 -+++ bzip2-1.0.5-haiku/Makefile 2009-12-27 00:29:38.000000000 +0000 -@@ -24,7 +24,8 @@ - CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) - - # Where you want it installed when you do 'make install' --PREFIX=/usr/local -+PREFIX=/boot/common -+DOCDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - - - OBJS= blocksort.o \ -@@ -70,43 +70,46 @@ - @cat words3 - - install: bzip2 bzip2recover -- if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi -- if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi -- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi -- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi -- if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi -- cp -f bzip2 $(PREFIX)/bin/bzip2 -- cp -f bzip2 $(PREFIX)/bin/bunzip2 -- cp -f bzip2 $(PREFIX)/bin/bzcat -- cp -f bzip2recover $(PREFIX)/bin/bzip2recover -- chmod a+x $(PREFIX)/bin/bzip2 -- chmod a+x $(PREFIX)/bin/bunzip2 -- chmod a+x $(PREFIX)/bin/bzcat -- chmod a+x $(PREFIX)/bin/bzip2recover -- cp -f bzip2.1 $(PREFIX)/man/man1 -- chmod a+r $(PREFIX)/man/man1/bzip2.1 -- cp -f bzlib.h $(PREFIX)/include -- chmod a+r $(PREFIX)/include/bzlib.h -- cp -f libbz2.a $(PREFIX)/lib -- chmod a+r $(PREFIX)/lib/libbz2.a -- cp -f bzgrep $(PREFIX)/bin/bzgrep -- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep -- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep -- chmod a+x $(PREFIX)/bin/bzgrep -- cp -f bzmore $(PREFIX)/bin/bzmore -- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless -- chmod a+x $(PREFIX)/bin/bzmore -- cp -f bzdiff $(PREFIX)/bin/bzdiff -- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp -- chmod a+x $(PREFIX)/bin/bzdiff -- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 -- chmod a+r $(PREFIX)/man/man1/bzgrep.1 -- chmod a+r $(PREFIX)/man/man1/bzmore.1 -- chmod a+r $(PREFIX)/man/man1/bzdiff.1 -- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1 -- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1 -- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1 -- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 -+ if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi -+ if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi -+ if ( test ! -d $(DESTDIR)$(DOCDIR)/man ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man ; fi -+ if ( test ! -d $(DESTDIR)$(DOCDIR)/man/man1 ) ; then mkdir -p $(DESTDIR)$(DOCDIR)/man/man1 ; fi -+ if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi -+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2 -+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2 -+ cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat -+ cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2 -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2 -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover -+ cp -f bzip2.1 $(DESTDIR)$(DOCDIR)/man/man1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzip2.1 -+ cp -f bzlib.h $(DESTDIR)$(PREFIX)/include -+ chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h -+ cp -f libbz2.a $(DESTDIR)$(PREFIX)/lib -+ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a -+ cp -f libbz2.so.1.0.4 $(DESTDIR)$(PREFIX)/lib -+ ln -s -f $(PREFIX)/lib/libbz2.so.1.0.4 $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0 -+ chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.so.1.0.4 -+ cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep -+ ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep -+ ln -s -f $(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep -+ cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore -+ ln -s -f $(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore -+ cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff -+ ln -s -f $(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp -+ chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff -+ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(DOCDIR)/man/man1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzgrep.1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzmore.1 -+ chmod a+r $(DESTDIR)$(DOCDIR)/man/man1/bzdiff.1 -+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzegrep.1 -+ echo ".so man1/bzgrep.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzfgrep.1 -+ echo ".so man1/bzmore.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzless.1 -+ echo ".so man1/bzdiff.1" > $(DESTDIR)$(DOCDIR)/man/man1/bzcmp.1 - - clean: - rm -f *.o libbz2.a bzip2 bzip2recover \ From 80154ad2097ef92f83d1c57fc5b652a5e47c4ed6 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 29 Apr 2013 11:33:53 +0200 Subject: [PATCH 176/587] Convert gettext recipe to an actual recipe * The new recipe is based on the *-dev bep file. * Remove all other patches/non-recipes. --- sys-devel/gettext/gettext-0.18.1.1-dev.recipe | 36 ----- sys-devel/gettext/gettext-0.18.1.1.recipe | 106 ++++++++++----- sys-devel/gettext/patches/gettext-0.17.patch | 125 ------------------ .../patches/gettext-0.18.1.1-dev.patch | 11 -- .../gettext/patches/gettext-0.18.1.1.patch | 43 +----- sys-devel/gettext/patches/gettext-CVS.diff | 33 ----- 6 files changed, 83 insertions(+), 271 deletions(-) delete mode 100644 sys-devel/gettext/gettext-0.18.1.1-dev.recipe delete mode 100644 sys-devel/gettext/patches/gettext-0.17.patch delete mode 100644 sys-devel/gettext/patches/gettext-0.18.1.1-dev.patch delete mode 100644 sys-devel/gettext/patches/gettext-CVS.diff diff --git a/sys-devel/gettext/gettext-0.18.1.1-dev.recipe b/sys-devel/gettext/gettext-0.18.1.1-dev.recipe deleted file mode 100644 index c4964c6b9..000000000 --- a/sys-devel/gettext/gettext-0.18.1.1-dev.recipe +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION="gettext-dev - full tools included" -HOMEPAGE="http://www.gnu.org/software/gettext/" -SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz" -CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd gettext-0.18.1.1 - libtoolize --force --copy --install - ./autogen.sh --quick --skip-gnulib - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --disable-java --without-git \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/gettext \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd gettext-0.18.1.1 - make install -} - -TEST() -{ - cd gettext-0.18.1.1/gettext-runtime/tests - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1998, 2010 Free Software Foundation, Inc." diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe index f544bb76d..5305a6aeb 100644 --- a/sys-devel/gettext/gettext-0.18.1.1.recipe +++ b/sys-devel/gettext/gettext-0.18.1.1.recipe @@ -1,48 +1,94 @@ -DESCRIPTION="gettext" +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." HOMEPAGE="http://www.gnu.org/software/gettext/" +LICENSE="GNU GPL v3" +COPYRIGHT="1998, 2010 Free Software Foundation, Inc." SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz" CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" +REVISION="3" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="gettext-0.18.1.1.patch" + +# TODO: Check command versions! +PROVIDES=" + gettext = $portVersion compat >= 0.18.1 + cmd:autopoint = $portVersion compat >= 0 + cmd:envsubst = $portVersion compat >= 0 + cmd:gettext = $portVersion compat >= 0 + cmd:gettext.sh = $portVersion compat >= 0 + cmd:gettextize = $portVersion compat >= 0 + cmd:msgattrib = $portVersion compat >= 0 + cmd:msgcat = $portVersion compat >= 0 + cmd:msgcmp = $portVersion compat >= 0 + cmd:msgcomm = $portVersion compat >= 0 + cmd:msgconv = $portVersion compat >= 0 + cmd:msgen = $portVersion compat >= 0 + cmd:msgexec = $portVersion compat >= 0 + cmd:msgfilter = $portVersion compat >= 0 + cmd:msgfmt = $portVersion compat >= 0 + cmd:msggrep = $portVersion compat >= 0 + cmd:msginit = $portVersion compat >= 0 + cmd:msgmerge = $portVersion compat >= 0 + cmd:msgunfmt = $portVersion compat >= 0 + cmd:msguniq = $portVersion compat >= 0 + cmd:ngettext = $portVersion compat >= 0 + cmd:recode_sr_latin = $portVersion compat >= 0 + cmd:xgettext = $portVersion compat >= 0 + lib:libasprintf = 0.0.0 compat >= 0 + lib:libgettextlib = $portVersion + lib:libgettextpo = 0.5.1 compat >= 0 + lib:libgettextsrc = $portVersion + lib:libintl = 8.1.1 compat >= 8 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libiconv + " +BUILD_REQUIRES=" + $REQUIRES + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:makeinfo + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd gettext-0.18.1.1 libtoolize --force --copy --install - sed -i 's/AC_INIT/AC_INIT([gettext],[0.18.1.1])/' configure.ac ./autogen.sh --quick --skip-gnulib - cd gettext-runtime - sed -i 's/AC_INIT/AC_INIT([gettext-runtime],[0.18.1.1])/' configure.ac - sed -i 's/gl_INIT_PACKAGE/dnl gl_INIT_PACKAGE was here/' configure.ac - sed -i 's/gl_WOE32_DLL/dnl gl_WOE32_DLL was here/' configure.ac - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac - libtoolize --force --copy --install - autoconf -Wnone - aclocal -I m4 -I gnulib-m4 --install --force - libtoolize --force --copy --install - autoconf -Wnone - export EXTRA_CONF="--disable-java" -# export LDFLAGS="-lnetwork -liconv" - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/gettext \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make + runConfigure ./configure \ + --disable-java --without-git + make $jobArgs } INSTALL() { - cd gettext-0.18.1.1/gettext-runtime make install + + rm $libDir/charset.alias + + prepareInstalledDevelLibs libasprintf libgettextpo libintl + prepareInstalledDevelLib libgettextlib '*.so' '*' + prepareInstalledDevelLib libgettextsrc '*.so' '*' + + # TODO: Several programs are installed in $libDir/gettext ($(pkglibdir) in + # the respective Makefile.am files). A better place would be + # $libExecDir/gettext. Since the programs are probably invoked by other + # programs, that might require some additional changes to the sources. } TEST() { - cd gettext-0.18.1.1/gettext-runtime + cd gettext-runtime/tests make check } - -LICENSE="GNU GPL v3" -COPYRIGHT="1998, 2010 Free Software Foundation, Inc." diff --git a/sys-devel/gettext/patches/gettext-0.17.patch b/sys-devel/gettext/patches/gettext-0.17.patch deleted file mode 100644 index 0af1e7c81..000000000 --- a/sys-devel/gettext/patches/gettext-0.17.patch +++ /dev/null @@ -1,125 +0,0 @@ ---- gettext-0.17/gettext-runtime/intl/vasnprintf.c 2009-03-03 02:29:54.000000000 +0000 -+++ work-gettext/gettext-runtime/intl/vasnprintf.c 2009-03-03 02:27:36.000000000 +0000 -@@ -186,7 +186,7 @@ - # /* Use snprintf if it exists under the name 'snprintf' or '_snprintf'. - But don't use it on BeOS, since BeOS snprintf produces no output if the - size argument is >= 0x3000000. */ --# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __BEOS__ -+# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __HAIKU__ - # define USE_SNPRINTF 1 - # else - # define USE_SNPRINTF 0 - ---- gettext-0.17/gettext-runtime/libasprintf/vasnprintf.c 2009-03-03 02:29:54.000000000 +0000 -+++ work-gettext/gettext-runtime/libasprintf/vasnprintf.c 2009-03-03 02:27:52.000000000 +0000 -@@ -186,7 +186,7 @@ - # /* Use snprintf if it exists under the name 'snprintf' or '_snprintf'. - But don't use it on BeOS, since BeOS snprintf produces no output if the - size argument is >= 0x3000000. */ --# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __BEOS__ -+# if (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF) && !defined __HAIKU__ - # define USE_SNPRINTF 1 - # else - # define USE_SNPRINTF 0 - ---- gettext-0.17/gettext-tools/gnulib-lib/float.in.h 2009-03-03 02:29:57.000000000 +0000 -+++ work-gettext/gettext-tools/gnulib-lib/float.in.h 2009-03-03 02:28:19.000000000 +0000 -@@ -24,7 +24,7 @@ - #define _GL_FLOAT_H - - /* 'long double' properties. */ --#if defined __i386__ && defined __BEOS__ -+#if defined __i386__ && defined __HAIKU__ - /* Number of mantissa units, in base FLT_RADIX. */ - # undef LDBL_MANT_DIG - # define LDBL_MANT_DIG 64 - ---- gettext-0.17/gettext-tools/gnulib-lib/term-ostream.c 2009-03-03 02:29:57.000000000 +0000 -+++ work-gettext/gettext-tools/gnulib-lib/term-ostream.c 2009-03-03 02:28:43.000000000 +0000 -@@ -1780,7 +1780,7 @@ - stream->exit_underline_mode = xstrdup0 (tgetstr ("ue", TEBP)); - stream->exit_attribute_mode = xstrdup0 (tgetstr ("me", TEBP)); - --# ifdef __BEOS__ -+# ifdef __HAIKU__ - /* The BeOS termcap entry for "beterm" is broken: For "AF" and "AB" - it contains balues in terminfo syntax but the system's tparam() - function understands only the termcap syntax. */ - ---- gettext-0.17/gettext-tools/tests/gettext-4-prg.c 2009-03-03 02:29:58.000000000 +0000 -+++ work-gettext/gettext-tools/tests/gettext-4-prg.c 2009-03-03 02:29:26.000000000 +0000 -@@ -53,7 +53,7 @@ - /* Here we expect output in ISO-8859-1. - Except on Darwin 7 or newer and on BeOS, for which locale_charset () - always returns "UTF-8" (see config.charset). */ --#if !((defined __APPLE__ && defined __MACH__) || defined __BEOS__) -+#if !((defined __APPLE__ && defined __MACH__) || defined __HAIKU__) - s = gettext ("cheese"); - if (strcmp (s, "K\344se")) - { - ---- gettext-0.17/gnulib-local/lib/term-ostream.oo.c 2009-03-03 02:29:53.000000000 +0000 -+++ work-gettext/gnulib-local/lib/term-ostream.oo.c 2009-03-03 02:29:43.000000000 +0000 -@@ -1803,7 +1803,7 @@ - stream->exit_underline_mode = xstrdup0 (tgetstr ("ue", TEBP)); - stream->exit_attribute_mode = xstrdup0 (tgetstr ("me", TEBP)); - --# ifdef __BEOS__ -+# ifdef __HAIKU__ - /* The BeOS termcap entry for "beterm" is broken: For "AF" and "AB" - it contains balues in terminfo syntax but the system's tparam() - function understands only the termcap syntax. */ - ---- gettext-0.17/gettext-tools/gnulib-lib/libxml/encoding.c 2009-03-05 02:09:23.000000000 +0000 -+++ work-gettext/gettext-tools/gnulib-lib/libxml/encoding.c 2009-03-05 02:16:35.000000000 +0000 -@@ -1611,20 +1611,20 @@ - - #ifdef LIBXML_ICONV_ENABLED - /* check whether iconv can handle this */ -- icv_in = iconv_open("UTF-8", name); -- icv_out = iconv_open(name, "UTF-8"); -+ icv_in = libiconv_open("UTF-8", name); -+ icv_out = libiconv_open(name, "UTF-8"); - if (icv_in == (iconv_t) -1) { -- icv_in = iconv_open("UTF-8", upper); -+ icv_in = libiconv_open("UTF-8", upper); - } - if (icv_out == (iconv_t) -1) { -- icv_out = iconv_open(upper, "UTF-8"); -+ icv_out = libiconv_open(upper, "UTF-8"); - } - if ((icv_in != (iconv_t) -1) && (icv_out != (iconv_t) -1)) { - enc = (xmlCharEncodingHandlerPtr) - xmlMalloc(sizeof(xmlCharEncodingHandler)); - if (enc == NULL) { -- iconv_close(icv_in); -- iconv_close(icv_out); -+ libiconv_close(icv_in); -+ libiconv_close(icv_out); - return(NULL); - } - enc->name = xmlMemStrdup(name); -@@ -1703,7 +1703,7 @@ - } - icv_inlen = *inlen; - icv_outlen = *outlen; -- ret = iconv(cd, (char **) &icv_in, &icv_inlen, &icv_out, &icv_outlen); -+ ret = libiconv(cd, (char **) &icv_in, &icv_inlen, &icv_out, &icv_outlen); - *inlen -= icv_inlen; - *outlen -= icv_outlen; - if ((icv_inlen != 0) || (ret == -1)) { -@@ -2121,12 +2121,12 @@ - xmlFree(handler->name); - handler->name = NULL; - if (handler->iconv_out != NULL) { -- if (iconv_close(handler->iconv_out)) -+ if (libiconv_close(handler->iconv_out)) - ret = -1; - handler->iconv_out = NULL; - } - if (handler->iconv_in != NULL) { -- if (iconv_close(handler->iconv_in)) -+ if (libiconv_close(handler->iconv_in)) - ret = -1; - handler->iconv_in = NULL; - } diff --git a/sys-devel/gettext/patches/gettext-0.18.1.1-dev.patch b/sys-devel/gettext/patches/gettext-0.18.1.1-dev.patch deleted file mode 100644 index 0250765dc..000000000 --- a/sys-devel/gettext/patches/gettext-0.18.1.1-dev.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gettext-0.18.1.1-orig/gettext-tools/gnulib-lib/binary-io.h 2010-05-24 09:42:36.028573696 +0000 -+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h 2012-08-03 20:17:21.155189248 +0000 -@@ -31,7 +31,7 @@ - # define O_BINARY _O_BINARY - # define O_TEXT _O_TEXT - #endif --#if defined __BEOS__ || defined __HAIKU__ -+#if defined __BEOS__ - /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */ - # undef O_BINARY - # undef O_TEXT 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 a96aa8646..0250765dc 100644 --- a/sys-devel/gettext/patches/gettext-0.18.1.1.patch +++ b/sys-devel/gettext/patches/gettext-0.18.1.1.patch @@ -1,40 +1,11 @@ -diff -up gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac.orig gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac ---- gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac.orig 2010-06-06 06:49:57.058720256 -0600 -+++ gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac 2012-05-04 20:40:00.847511552 -0600 -@@ -44,7 +44,7 @@ LT_INIT([win32-dll]) - case "$host_os" in - # On Cygwin, without -no-undefined, a warning is emitted and only a static - # library is built. -- beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; -+ beos* | haiku* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; - *) LTNOUNDEF='' ;; - esac - AC_SUBST([LTNOUNDEF]) -diff -up gettext-0.18.1.1/gettext-tools/configure.ac.orig gettext-0.18.1.1/gettext-tools/configure.ac ---- gettext-0.18.1.1/gettext-tools/configure.ac.orig 2010-06-06 14:04:04.007602176 -0600 -+++ gettext-0.18.1.1/gettext-tools/configure.ac 2012-05-04 20:40:00.860880896 -0600 -@@ -100,7 +100,7 @@ LT_LANG([Windows Resource]) - case "$host_os" in - # On Cygwin, without -no-undefined, a warning is emitted and only a static - # library is built. -- beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; -+ beos* | haiku* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; - *) LTNOUNDEF='' ;; - esac - AC_SUBST([LTNOUNDEF]) -diff -up gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h.orig gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h ---- gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h.orig 2012-05-04 21:23:18.533200896 -0600 -+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h 2012-05-04 21:23:54.882900992 -0600 -@@ -31,11 +31,6 @@ +--- gettext-0.18.1.1-orig/gettext-tools/gnulib-lib/binary-io.h 2010-05-24 09:42:36.028573696 +0000 ++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/binary-io.h 2012-08-03 20:17:21.155189248 +0000 +@@ -31,7 +31,7 @@ # define O_BINARY _O_BINARY # define O_TEXT _O_TEXT #endif -#if defined __BEOS__ || defined __HAIKU__ -- /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */ --# undef O_BINARY --# undef O_TEXT --#endif - - /* SET_BINARY (fd); - changes the file descriptor fd to perform binary I/O. */ -diff -up gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe2.c.orig gettext-0.18.1.1/gettext-tools/gnulib-lib/pipe2.c ++#if defined __BEOS__ + /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect. */ + # undef O_BINARY + # undef O_TEXT diff --git a/sys-devel/gettext/patches/gettext-CVS.diff b/sys-devel/gettext/patches/gettext-CVS.diff deleted file mode 100644 index d93cfe755..000000000 --- a/sys-devel/gettext/patches/gettext-CVS.diff +++ /dev/null @@ -1,33 +0,0 @@ -? gettext-runtime/libasprintf/autom4te.cache -Index: gettext-runtime/libasprintf/configure.ac -=================================================================== -RCS file: /sources/gettext/gettext/gettext-runtime/libasprintf/configure.ac,v -retrieving revision 1.24 -diff -u -r1.24 configure.ac ---- gettext-runtime/libasprintf/configure.ac 20 Apr 2008 06:48:03 -0000 1.24 -+++ gettext-runtime/libasprintf/configure.ac 4 May 2008 17:26:34 -0000 -@@ -41,7 +41,7 @@ - case "$host_os" in - # On Cygwin, without -no-undefined, a warning is emitted and only a static - # library is built. -- beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; -+ beos* | haiku* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; - *) LTNOUNDEF='' ;; - esac - AC_SUBST([LTNOUNDEF]) -Index: gettext-tools/configure.ac -=================================================================== -RCS file: /sources/gettext/gettext/gettext-tools/configure.ac,v -retrieving revision 1.96 -diff -u -r1.96 configure.ac ---- gettext-tools/configure.ac 20 Apr 2008 06:48:03 -0000 1.96 -+++ gettext-tools/configure.ac 4 May 2008 17:29:23 -0000 -@@ -92,7 +92,7 @@ - case "$host_os" in - # On Cygwin, without -no-undefined, a warning is emitted and only a static - # library is built. -- beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; -+ beos* | haiku* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; - *) LTNOUNDEF='' ;; - esac - AC_SUBST([LTNOUNDEF]) From 903e8fb7c602e3367ba8d30e085d7ba69ed81ccd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 29 Apr 2013 11:37:19 +0200 Subject: [PATCH 177/587] Convert grep recipe to an actual recipe * Remove the other non-recipes/patches. * We use the bz2 source archive. The xz URL is included as a comment. Would be nice, if both could be specified and haikuporter would pick one it has an unarchiving tool for. --- sys-apps/grep/grep-2.12.recipe | 35 -------------- sys-apps/grep/grep-2.14-bz2.recipe | 29 ------------ sys-apps/grep/grep-2.14.recipe | 65 ++++++++++++++++++-------- sys-apps/grep/grep-2.5.4.recipe | 29 ------------ sys-apps/grep/grep-2.6.1.recipe | 29 ------------ sys-apps/grep/grep-2.6.3.recipe | 29 ------------ sys-apps/grep/grep-2.7.recipe | 35 -------------- sys-apps/grep/patches/grep-2.12.patch | 14 ------ sys-apps/grep/patches/grep-2.6.1.patch | 20 -------- sys-apps/grep/patches/grep-2.7.patch | 14 ------ 10 files changed, 46 insertions(+), 253 deletions(-) delete mode 100644 sys-apps/grep/grep-2.12.recipe delete mode 100644 sys-apps/grep/grep-2.14-bz2.recipe delete mode 100644 sys-apps/grep/grep-2.5.4.recipe delete mode 100644 sys-apps/grep/grep-2.6.1.recipe delete mode 100644 sys-apps/grep/grep-2.6.3.recipe delete mode 100644 sys-apps/grep/grep-2.7.recipe delete mode 100644 sys-apps/grep/patches/grep-2.12.patch delete mode 100644 sys-apps/grep/patches/grep-2.6.1.patch delete mode 100644 sys-apps/grep/patches/grep-2.7.patch diff --git a/sys-apps/grep/grep-2.12.recipe b/sys-apps/grep/grep-2.12.recipe deleted file mode 100644 index e80283c2b..000000000 --- a/sys-apps/grep/grep-2.12.recipe +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="http://ftpmirror.gnu.org/grep/grep-2.12.tar.xz" -CHECKSUM_MD5="8d2f0346d08b13c18afb81f0e8aa1e2f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-devel/gettext >= 0.17 - sys-devel/libiconv >= 1.13.1" -BUILD() -{ - cd grep-2.12 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd grep-2.12 - make install -} - -TEST() -{ - cd grep-2.12 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2012 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.14-bz2.recipe b/sys-apps/grep/grep-2.14-bz2.recipe deleted file mode 100644 index b2b487fdf..000000000 --- a/sys-apps/grep/grep-2.14-bz2.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="http://ports-space.haiku-files.org/source/grep-2.14.tar.bz2" -CHECKSUM_MD5="db55b9fc67d8c0895f3c73e94e2aebe3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-devel/gettext >= 0.17 - sys-devel/libiconv >= 1.13.1" -BUILD() -{ - cd grep-2.14 - - libtoolize --force --copy --install - aclocal -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd grep-2.14 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2012 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe index 6a045db54..3ab6e0c1d 100644 --- a/sys-apps/grep/grep-2.14.recipe +++ b/sys-apps/grep/grep-2.14.recipe @@ -1,37 +1,64 @@ -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz" -CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-devel/gettext >= 0.17 - sys-devel/libiconv >= 1.13.1" +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." +HOMEPAGE="http://www.gnu.org/software/grep/" +LICENSE="GNU GPL v3" +COPYRIGHT="1992-2012 Free Software Foundation, Inc." +SRC_URI="http://ports-space.haiku-files.org/source/grep-2.14.tar.bz2" +CHECKSUM_MD5="db55b9fc67d8c0895f3c73e94e2aebe3" +# XZ file format: +#SRC_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz" +#CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="grep-2.14-gcc2.patch" + +PROVIDES=" + grep = $portVersion compat >= 2 + cmd:egrep = $portVersion compat >= 2 + cmd:fgrep = $portVersion compat >= 2 + cmd:grep = $portVersion compat >= 2 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libiconv + " +BUILD_REQUIRES=" + $REQUIRES + gettext + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" BUILD() { - cd grep-2.14 libtoolize --force --copy --install aclocal -I m4 autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + runConfigure ./configure \ --disable-perl-regexp - make + make $jobArgs } INSTALL() { - cd grep-2.14 make install + + rm $libDir/charset.alias + rmdir $libDir } TEST() { - cd grep-2.14 make check } - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2012 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.5.4.recipe b/sys-apps/grep/grep-2.5.4.recipe deleted file mode 100644 index 995eee96c..000000000 --- a/sys-apps/grep/grep-2.5.4.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.5.4.tar.bz2" -CHECKSUM_MD5="5650ee2ae6ea4b39e9459d7d0585b315" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd grep-2.5.4 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd grep-2.5.4 - make install -} - -TEST() -{ - cd grep-2.5.4 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.6.1.recipe b/sys-apps/grep/grep-2.6.1.recipe deleted file mode 100644 index 59fdaac05..000000000 --- a/sys-apps/grep/grep-2.6.1.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.6.1.tar.gz" -CHECKSUM_MD5="8d1496da11029112a4d0986cbf09e26f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd grep-2.6.1 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd grep-2.6.1 - make install -} - -TEST() -{ - cd grep-2.6.1 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.6.3.recipe b/sys-apps/grep/grep-2.6.3.recipe deleted file mode 100644 index b28c35d7b..000000000 --- a/sys-apps/grep/grep-2.6.3.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.6.3.tar.gz" -CHECKSUM_MD5="3095b57837b312f087c0680559de7f13" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd grep-2.6.3 - libtoolize --force --copy --install - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd grep-2.6.3 - make install -} - -TEST() -{ - cd grep-2.6.3 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-apps/grep/grep-2.7.recipe b/sys-apps/grep/grep-2.7.recipe deleted file mode 100644 index 484684bc3..000000000 --- a/sys-apps/grep/grep-2.7.recipe +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="GNU regular expression matcher" -HOMEPAGE="http://www.gnu.org/software/grep/" -SRC_URI="ftp://mirrors.kernel.org/gnu/grep/grep-2.7.tar.gz" -CHECKSUM_MD5="e848f07e3e79aa7899345d17c7e4115e" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-devel/gettext >= 0.17 - sys-devel/libiconv >= 1.13.1" -BUILD() -{ - cd grep-2.7 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd grep-2.7 - make install -} - -TEST() -{ - cd grep-2.7 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." diff --git a/sys-apps/grep/patches/grep-2.12.patch b/sys-apps/grep/patches/grep-2.12.patch deleted file mode 100644 index d0f9ce918..000000000 --- a/sys-apps/grep/patches/grep-2.12.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up grep-2.12/src/kwsearch.c.orig grep-2.12/src/kwsearch.c ---- grep-2.12/src/kwsearch.c.orig 2012-02-27 02:35:19.015204352 -0700 -+++ grep-2.12/src/kwsearch.c 2012-05-02 22:46:36.262668288 -0600 -@@ -106,8 +106,9 @@ Fexecute (char const *buf, size_t size, - /* The match was a part of multibyte character, advance at least - one byte to ensure no infinite loop happens. */ - mbstate_t s; -+ size_t mb_len; - memset (&s, 0, sizeof s); -- size_t mb_len = mbrlen (mb_start, (buf + size) - (beg + offset), &s); -+ mb_len = mbrlen (mb_start, (buf + size) - (beg + offset), &s); - if (mb_len == (size_t) -2) - goto failure; - beg = mb_start; diff --git a/sys-apps/grep/patches/grep-2.6.1.patch b/sys-apps/grep/patches/grep-2.6.1.patch deleted file mode 100644 index 8a08c6439..000000000 --- a/sys-apps/grep/patches/grep-2.6.1.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urN grep-2.6.1/src/dfa.c grep-2.6.1-haiku/src/dfa.c ---- grep-2.6.1/src/dfa.c 2010-03-25 06:28:54.056098816 -0700 -+++ grep-2.6.1-haiku/src/dfa.c 2013-02-17 13:32:51.217055232 -0800 -@@ -2775,6 +2775,7 @@ - unsigned char eol = eolbyte; /* Likewise for eolbyte. */ - static int sbit[NOTCHAR]; /* Table for anding with d->success. */ - static int sbit_init; -+ unsigned char saved_end; - - if (! sbit_init) - { -@@ -2792,7 +2793,7 @@ - s = s1 = 0; - p = (unsigned char const *) begin; - trans = d->trans; -- unsigned char saved_end = *(unsigned char *) end; -+ saved_end = *(unsigned char *) end; - *end = eol; - - #ifdef MBS_SUPPORT diff --git a/sys-apps/grep/patches/grep-2.7.patch b/sys-apps/grep/patches/grep-2.7.patch deleted file mode 100644 index 8f4fb7f6d..000000000 --- a/sys-apps/grep/patches/grep-2.7.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN grep-2.7/src/kwsearch.c grep-2.7-haiku/src/kwsearch.c ---- grep-2.7/src/kwsearch.c 2010-08-13 23:36:17.039059456 +0000 -+++ grep-2.7-haiku/src/kwsearch.c 2010-09-22 12:39:11.677642240 +0000 -@@ -111,8 +111,9 @@ - /* The match was a part of multibyte character, advance at least - one byte to ensure no infinite loop happens. */ - mbstate_t s; -+ size_t mb_len; - memset (&s, 0, sizeof s); -- size_t mb_len = mbrlen (mb_start, (buf + size) - (beg + offset), &s); -+ mb_len = mbrlen (mb_start, (buf + size) - (beg + offset), &s); - if (mb_len == (size_t) -2) - goto failure; - beg = mb_start; From 3a380a174fcb8837911a3f71899ffeb1ff67bc6b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 29 Apr 2013 22:37:30 +0200 Subject: [PATCH 178/587] Update openssh 6.0p1 recipe and patch * Back-port (and fix) the AuthorizedKeysFile change in sshd_config from 6.2p1. * Declare login and passwd as requires and find them via the package links directory. * configure.ac: Allow passing the path to passwd via the environment. * Remove all but the ".ssh" dir related changes from the pathnames.h patch. The other paths can be specified/overridden via configure, so we don't need to patch them. Same for LOGIN_PROGRAM in sshd_config. * Fix sysconfdir and libexecdir paths. The build system doesn't append a subdir path. --- net-misc/openssh/openssh-6.0p1.recipe | 12 ++- net-misc/openssh/patches/openssh-6.0p1.patch | 105 ++++++------------- 2 files changed, 45 insertions(+), 72 deletions(-) diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index 86618c5d9..ee8ac8425 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -4,7 +4,7 @@ LICENSE="OpenSSH" COPYRIGHT="2005-2012 Tatu Ylonen et al." SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz" CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="openssh-6.0p1.patch" @@ -26,6 +26,8 @@ PROVIDES=" " REQUIRES=" haiku >= $haikuVersion + cmd:login + cmd:passwd lib:libcrypto lib:libedit lib:libssl @@ -64,8 +66,16 @@ BUILD() defaultPath+=":/boot/common/non-packaged/bin:/boot/common/bin:/bin" defaultPath+=":/boot/common/apps:/boot/common/preferences:/boot/system/apps" defaultPath+=":/boot/system/preferences" + + # Note: override sysconfdir and libexecdir since ssh doesn't create + # subdirectories as it should. + PATH_PASSWD_PROG=$portPackageLinksDir/cmd:passwd/bin/passwd \ + LOGIN_PROGRAM=$portPackageLinksDir/cmd:login/bin/login \ runConfigure ./configure \ + --sysconfdir=$sysconfDir/openssh \ + --libexecdir=$libExecDir/openssh \ --with-privsep-path=$dataDir/openssh/empty \ + --with-pid-dir=$prefix/var/run \ --with-default-path="$defaultPath" \ --with-md5-passwords \ --disable-utmpx \ diff --git a/net-misc/openssh/patches/openssh-6.0p1.patch b/net-misc/openssh/patches/openssh-6.0p1.patch index a61ef0c9e..018ec093b 100644 --- a/net-misc/openssh/patches/openssh-6.0p1.patch +++ b/net-misc/openssh/patches/openssh-6.0p1.patch @@ -1,7 +1,18 @@ -diff -urN openssh-6.0p1/configure.ac openssh-6.0p1-haiku/configure.ac ---- openssh-6.0p1/configure.ac 2012-04-19 11:46:38.030408704 +0000 -+++ openssh-6.0p1-haiku/configure.ac 2012-09-24 16:55:13.139198464 +0000 -@@ -1432,7 +1432,7 @@ +diff -ur orig/openssh-6.0p1/configure.ac openssh-6.0p1/configure.ac +--- orig/openssh-6.0p1/configure.ac 2012-04-19 13:46:38.045613056 +0200 ++++ openssh-6.0p1/configure.ac 2013-04-29 21:27:34.023068672 +0200 +@@ -92,7 +92,9 @@ + fi + fi + +-AC_PATH_PROG([PATH_PASSWD_PROG], [passwd]) ++if test -z "$PATH_PASSWD_PROG" ; then ++ AC_PATH_PROG([PATH_PASSWD_PROG], [passwd]) ++fi + if test ! -z "$PATH_PASSWD_PROG" ; then + AC_DEFINE_UNQUOTED([_PATH_PASSWD_PROG], ["$PATH_PASSWD_PROG"], + [Full path of your "passwd" program]) +@@ -1432,7 +1434,7 @@ LIBEDIT=`$PKGCONFIG --libs-only-l libedit` CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" else @@ -10,35 +21,10 @@ diff -urN openssh-6.0p1/configure.ac openssh-6.0p1-haiku/configure.ac fi OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` AC_CHECK_LIB([edit], [el_init], -diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-haiku/pathnames.h ---- openssh-6.0p1/pathnames.h 2011-05-29 11:39:38.039583744 +0000 -+++ openssh-6.0p1-haiku/pathnames.h 2012-09-24 16:55:13.148373504 +0000 -@@ -12,7 +12,14 @@ - * called by a name other than "ssh" or "Secure Shell". - */ - --#define ETCDIR "/etc" -+#define HAIKU_USER_SETTINGS_DIRECTORY "~/config/settings" -+#define HAIKU_COMMON_SETTINGS_DIRECTORY "/boot/common/settings" -+#define HAIKU_COMMON_BIN_DIRECTORY "/boot/common/bin" -+#define HAIKU_COMMON_VAR_DIRECTORY "/boot/common/var" -+#define HAIKU_SYSTEM_BIN_DIRECTORY "/boot/system/bin" -+ -+ -+#define ETCDIR HAIKU_COMMON_SETTINGS_DIRECTORY - - #ifndef SSHDIR - #define SSHDIR ETCDIR "/ssh" -@@ -45,7 +52,7 @@ - #define _PATH_DH_PRIMES SSHDIR "/primes" - - #ifndef _PATH_SSH_PROGRAM --#define _PATH_SSH_PROGRAM "/usr/bin/ssh" -+#define _PATH_SSH_PROGRAM HAIKU_COMMON_BIN_DIRECTORY - #endif - - /* -@@ -58,25 +65,25 @@ +diff -ur orig/openssh-6.0p1/pathnames.h openssh-6.0p1/pathnames.h +--- orig/openssh-6.0p1/pathnames.h 2011-05-29 13:39:38.054788096 +0200 ++++ openssh-6.0p1/pathnames.h 2013-04-29 21:29:17.578289664 +0200 +@@ -58,25 +58,25 @@ * The directory in user's home directory in which the files reside. The * directory should be world-readable (though not all files are). */ @@ -51,10 +37,10 @@ diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-haiku/pathnames.h * contain anything particularly secret. */ -#define _PATH_SSH_USER_HOSTFILE "~/.ssh/known_hosts" -+#define _PATH_SSH_USER_HOSTFILE "/boot/home/config/settings/ssh/known_hosts" ++#define _PATH_SSH_USER_HOSTFILE "~/" _PATH_SSH_USER_DIR "/known_hosts" /* backward compat for protocol 2 */ -#define _PATH_SSH_USER_HOSTFILE2 "~/.ssh/known_hosts2" -+#define _PATH_SSH_USER_HOSTFILE2 "/boot/home/config/settings/ssh/known_hosts2" ++#define _PATH_SSH_USER_HOSTFILE2 "~/" _PATH_SSH_USER_DIR "/known_hosts2" /* * Name of the default file containing client-side authentication key. This @@ -71,7 +57,7 @@ diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-haiku/pathnames.h /* * Configuration file in user's home directory. This file need not be -@@ -84,7 +91,7 @@ +@@ -84,7 +84,7 @@ * particularly secret. If the user's home directory resides on an NFS * volume where root is mapped to nobody, this may need to be world-readable. */ @@ -80,7 +66,7 @@ diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-haiku/pathnames.h /* * File containing a list of those rsa keys that permit logging in as this -@@ -94,10 +101,10 @@ +@@ -94,10 +94,10 @@ * may need to be world-readable. (This file is read by the daemon which is * running as root.) */ @@ -93,7 +79,7 @@ diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-haiku/pathnames.h /* * Per-user and system-wide ssh "rc" files. These files are executed with -@@ -105,7 +112,7 @@ +@@ -105,7 +105,7 @@ * passed "proto cookie" as arguments if X11 forwarding with spoofing is in * use. xauth will be run if neither of these exists. */ @@ -102,38 +88,15 @@ diff -urN openssh-6.0p1/pathnames.h openssh-6.0p1-haiku/pathnames.h #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" /* -@@ -149,17 +156,16 @@ +diff -ur orig/openssh-6.0p1/sshd_config openssh-6.0p1/sshd_config +--- orig/openssh-6.0p1/sshd_config 2011-05-29 13:39:39.064225280 +0200 ++++ openssh-6.0p1/sshd_config 2013-04-29 12:51:20.314834944 +0200 +@@ -47,7 +47,7 @@ - /* for sftp */ - #ifndef _PATH_SFTP_SERVER --#define _PATH_SFTP_SERVER "/usr/libexec/sftp-server" -+#define _PATH_SFTP_SERVER HAIKU_COMMON_BIN_DIRECTORY"/sftp-server" - #endif + # The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 + # but this is overridden so installations will only check .ssh/authorized_keys +-AuthorizedKeysFile .ssh/authorized_keys ++AuthorizedKeysFile config/settings/ssh/authorized_keys - /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */ - #ifndef _PATH_PRIVSEP_CHROOT_DIR --#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty" -+#define _PATH_PRIVSEP_CHROOT_DIR HAIKU_COMMON_VAR_DIRECTORY "/empty" - #endif -- - /* for passwd change */ - #ifndef _PATH_PASSWD_PROG --#define _PATH_PASSWD_PROG "/usr/bin/passwd" -+#define _PATH_PASSWD_PROG HAIKU_SYSTEM_BIN_DIRECTORY "/passwd" - #endif - - #ifndef _PATH_LS -@@ -171,11 +177,11 @@ - # ifdef LOGIN_PROGRAM_FALLBACK - # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK - # else --# define LOGIN_PROGRAM "/usr/bin/login" -+# define LOGIN_PROGRAM HAIKU_SYSTEM_BIN_DIRECTORY "/login" - # endif - #endif /* LOGIN_PROGRAM */ - - /* Askpass program define */ - #ifndef ASKPASS_PROGRAM --#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" -+#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" - #endif /* ASKPASS_PROGRAM */ + # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts + #RhostsRSAAuthentication no From abcc3832b8a71a4c812acbfff2954654d8485d4e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 30 Apr 2013 19:02:33 +0200 Subject: [PATCH 179/587] libxml2: Fix develop/lib paths * Replace $libDir by $developLibDir in xml2Conf.sh and xml2-config. * Make with multiple jobs. --- dev-libs/libxml2/libxml2-2.8.0.recipe | 5 +++-- dev-libs/libxml2/patches/libxml2-2.8.0.patch | 23 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe index ea7897ead..018e8d4a6 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.recipe +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -4,7 +4,7 @@ LICENSE="MIT" COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz" CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="libxml2-2.8.0.patch" @@ -54,7 +54,7 @@ BUILD() runConfigure ./configure LDFLAGS="-lnetwork" \ --with-html-dir=$docDir/html \ --with-html-subdir="" - make + make $jobArgs } INSTALL() @@ -65,6 +65,7 @@ INSTALL() prepareInstalledDevelLibs libxml2 fixPkgconfig mv $libDir/xml2Conf.sh $developLibDir/ + fixDevelopLibDirReferences $developLibDir/xml2Conf.sh $binDir/xml2-config } TEST() diff --git a/dev-libs/libxml2/patches/libxml2-2.8.0.patch b/dev-libs/libxml2/patches/libxml2-2.8.0.patch index 6973091ea..146abcb7f 100644 --- a/dev-libs/libxml2/patches/libxml2-2.8.0.patch +++ b/dev-libs/libxml2/patches/libxml2-2.8.0.patch @@ -24,3 +24,26 @@ diff -ur libxml2-2.8.0.orig/Makefile.am libxml2-2.8.0/Makefile.am EXAMPLES_DIR=$(BASE_DIR)/$(DOC_MODULE)/examples install-data-local: +diff -ur orig/libxml2-2.8.0/xml2-config.in libxml2-2.8.0/xml2-config.in +--- orig/libxml2-2.8.0/xml2-config.in 2009-07-30 17:24:35.050855936 +0200 ++++ libxml2-2.8.0/xml2-config.in 2013-04-30 18:29:36.158072832 +0200 +@@ -40,8 +40,8 @@ + case "$1" in + --prefix=*) + prefix=$optarg +- includedir=$prefix/include +- libdir=$prefix/lib ++ includedir=$prefix/develop/headers ++ libdir=$prefix/develop/lib + ;; + + --prefix) +@@ -50,7 +50,7 @@ + + --exec-prefix=*) + exec_prefix=$optarg +- libdir=$exec_prefix/lib ++ libdir=$exec_prefix/develop/lib + ;; + + --exec-prefix) From de4acc113e1e26af576e8508cf8f9c6d384f7555 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 30 Apr 2013 19:40:57 +0200 Subject: [PATCH 180/587] Update neon 0.29.6 * Patch Makefile.in so it uses the correct docdir. * Make with $jobArgs. * Move development libs, fix pkgconfig file. --- net-misc/neon/neon-0.29.6.recipe | 16 ++++++++++------ net-misc/neon/patches/neon-0.29.6.patch | 12 ++++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 net-misc/neon/patches/neon-0.29.6.patch diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe index fcbdb9e17..4e3691096 100644 --- a/net-misc/neon/neon-0.29.6.recipe +++ b/net-misc/neon/neon-0.29.6.recipe @@ -18,11 +18,15 @@ DESCRIPTION=" property manipulation. " HOMEPAGE="http://www.webdav.org/neon/" +LICENSE="GNU LGPL v2" +COPYRIGHT="1999-2011 Joe Orton" SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz" CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" +PATCHES="neon-0.29.6.patch" + PROVIDES=" neon = $portVersion compat >= 0.29 lib:libneon = 27.2.6 compat >= 27.2 @@ -59,18 +63,18 @@ BUILD() libtoolize --force --copy --install aclocal -I macros autoconf - ./configure $configureDirArgs \ + runConfigure ./configure \ --with-ssl \ --with-libxml2 \ --enable-shared \ --disable-nls - make + make $jobArgs } INSTALL() { make install + prepareInstalledDevelLibs libneon + fixDevelopLibDirReferences $binDir/neon-config + fixPkgconfig } - -LICENSE="GNU LGPL v2" -COPYRIGHT="1999-2011 Joe Orton" diff --git a/net-misc/neon/patches/neon-0.29.6.patch b/net-misc/neon/patches/neon-0.29.6.patch new file mode 100644 index 000000000..7bdb12180 --- /dev/null +++ b/net-misc/neon/patches/neon-0.29.6.patch @@ -0,0 +1,12 @@ +diff -ur orig/neon-0.29.6/Makefile.in neon-0.29.6/Makefile.in +--- orig/neon-0.29.6/Makefile.in 2009-09-04 09:36:26.062914560 +0200 ++++ neon-0.29.6/Makefile.in 2013-04-30 19:33:32.347340800 +0200 +@@ -22,7 +22,7 @@ + man3dir = $(mandir)/man3 + datarootdir = @datarootdir@ + datadir = @datadir@ +-docdir = $(datadir)/doc/neon-@NEON_VERSION@ ++docdir = @docdir@ + includedir = @includedir@ + neonincludes = $(includedir)/neon + pkgconfigdir = $(libdir)/pkgconfig From 72fc92d3ed40698a54105a98bb598ac776c0ccbd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 30 Apr 2013 20:06:30 +0200 Subject: [PATCH 181/587] Update curl recipe * Add cmd:curl_config to provides. * Use runConfigure. * Use jobArgs. * Use $developLibDir in curl-config. --- net-misc/curl/curl-7.26.0.recipe | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/net-misc/curl/curl-7.26.0.recipe b/net-misc/curl/curl-7.26.0.recipe index ac298b722..eb16c9e90 100644 --- a/net-misc/curl/curl-7.26.0.recipe +++ b/net-misc/curl/curl-7.26.0.recipe @@ -4,7 +4,7 @@ COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." LICENSE="Curl" SRC_URI="http://curl.haxx.se/download/curl-7.26.0.tar.bz2" CHECKSUM_MD5="bfa80f01b3d300359cfb4d409b6136a3" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" # libcurl's SONAME is bumped whenever backward compat is broken, v7.16 @@ -12,6 +12,7 @@ ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" curl = $portVersion cmd:curl = $portVersion compat >= 7.16 + cmd:curl_config = $portVersion compat >= 7.16 lib:libcurl = $portVersion compat >= 7.16 " REQUIRES=" @@ -35,16 +36,15 @@ SOURCE_DIR="$portVersionedName" BUILD() { - curlPackageLinksDir="$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName" - certsInstallDir="$curlPackageLinksDir/ca_root_certificates" + certsInstallDir="$portPackageLinksDir/ca_root_certificates" certsDir="$certsInstallDir/$relativeDataRootDir/ssl" libtoolize --force --copy --install autoconf - ./configure $configureDirArgs \ + runConfigure ./configure \ --enable-ipv6 \ --with-ca-bundle="$certsDir/CARootCertificates.pem" - make + make $jobArgs } INSTALL() @@ -54,7 +54,12 @@ INSTALL() # prepare develop/lib prepareInstalledDevelLibs libcurl fixPkgconfig - + + # fix curl-config + fixDevelopLibDirReferences $binDir/curl-config + sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \ + -e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config + # install html documentation for curl mkdir -p "$docDir" install -c -m 644 "docs/curl.html" "$docDir" From b922e12d8f5c86e9b212620c5b5685f25818a99c Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 30 Apr 2013 20:26:30 +0200 Subject: [PATCH 182/587] Update ncurses 5.9 recipe * Use jobArgs. * Fix developLibDir paths in ncurses[w]5-config. --- sys-libs/ncurses/ncurses-5.9.recipe | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index cefa69f34..143fcd38a 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -4,7 +4,7 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz" CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1" LICENSE="MIT" COPYRIGHT="1998-2011 Free Software Foundation, Inc." -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -68,7 +68,7 @@ doBuild() --enable-termcap \ --enable-hard-tabs \ $@ - make + make $jobArgs make install DESTDIR=$targetDir } @@ -90,6 +90,9 @@ INSTALL() prepareInstalledDevelLibs \ libform libmenu libncurses libncurses++ libpanel \ libformw libmenuw libncursesw libncurses++w libpanelw + + # fix ncurses[w]5-config + fixDevelopLibDirReferences $binDir/ncurses5-config $binDir/ncursesw5-config } 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. From 9323b45483f6674d75d5bffa47e3592e0b02c3c6 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 30 Apr 2013 20:38:41 +0200 Subject: [PATCH 183/587] Update libpcre recipe * Add commands to provides. * Fix autotools invocation order (it failed here before). * Use jobArgs. * Fix developLibDir paths in pcre-config. * Remove unnecessary cd in TEST() (untested). --- dev-libs/libpcre/libpcre-8.21.recipe | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe index 768c3bb42..94ffd25c4 100644 --- a/dev-libs/libpcre/libpcre-8.21.recipe +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -15,11 +15,14 @@ COPYRIGHT=" " SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2" CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" libpcre = $portVersion + cmd:pcre_config = $portVersion compat >= 8 + cmd:pcregrep = $portVersion compat >= 8 + cmd:pcretest = $portVersion compat >= 8 lib:libpcre = $portVersion compat >= 8 lib:libpcrecpp = $portVersion compat >= 8 lib:libpcreposix = $portVersion compat >= 8 @@ -45,16 +48,15 @@ SOURCE_DIR="pcre-$portVersion" BUILD() { - automake --add-missing libtoolize --force --copy --install aclocal autoconf - automake + automake --add-missing ./configure $configureDirArgs \ --enable-utf8 \ --enable-unicode-properties \ --with-pic - make + make $jobArgs } INSTALL() @@ -64,10 +66,12 @@ INSTALL() # prepare develop/lib prepareInstalledDevelLibs libpcre libpcrecpp libpcreposix fixPkgconfig + + # fix pcre-config + fixDevelopLibDirReferences $binDir/pcre-config } TEST() { - cd pcre-8.21 make check } From 14bed6a95839aae3048664d2d3558325d2271db1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 30 Apr 2013 20:52:36 +0200 Subject: [PATCH 184/587] Update apr recipe * Explicitly declare patch. * Add provides cmd:apr_1_config. * Use jobArgs. * Fix developLibDir paths in apr-1-config. --- dev-libs/apr/apr-1.4.6.recipe | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe index 971229796..e55147f38 100644 --- a/dev-libs/apr/apr-1.4.6.recipe +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -4,11 +4,14 @@ SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz" COPYRIGHT="2012 The Apache Software Foundation." LICENSE="Apache v2" CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 ?x86" +PATCHES="apr-1.4.6.patch" + PROVIDES=" apr = $portVersion compat >= 1 + cmd:apr_1_config lib:libapr = $portVersion compat >= 1 lib:libapr_1 = $portVersion compat >= 1 " @@ -41,7 +44,7 @@ BUILD() # TODO: fix this hack (by finding out why top_builddir seems to be unset)! ln -sfn $sourceDir/libtool /libtool - make + make $jobArgs } INSTALL() @@ -51,6 +54,9 @@ INSTALL() # prepare develop/lib prepareInstalledDevelLibs libapr-1 fixPkgconfig + + # fix apr-1-config + fixDevelopLibDirReferences $binDir/apr-1-config } TEST() From 14b77cfd599998cac250e267d77295898fcce40c Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 30 Apr 2013 21:11:41 +0200 Subject: [PATCH 185/587] Update expat recipe * Add cmd:xmlwf to provides. * Fix lib:libexpat versions in provides. * Move patch commands from BUILD() to PATCH(). * Use runConfigure. * Use jobArgs. * Use prepareInstalledDevelLibs. --- dev-libs/expat/expat-2.0.1.recipe | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe index 34348d6ad..7644f75e4 100644 --- a/dev-libs/expat/expat-2.0.1.recipe +++ b/dev-libs/expat/expat-2.0.1.recipe @@ -5,12 +5,13 @@ DESCRIPTION=" HOMEPAGE="http://expat.sourceforge.net/" SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz" CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" expat = $portVersion compat >= 2.0 - lib:libexpat = $portVersion compat >= 1.5 + cmd:xmlwf = $portVersion compat >= 2.0 + lib:libexpat = 1.5.2 compat >= 1 " REQUIRES=" haiku >= $haikuVersion @@ -29,21 +30,28 @@ BUILD_PREREQUIRES=" SOURCE_DIR="$portVersionedName" +PATCH() +{ + echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in + echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am +} + BUILD() { rm -f conftools/libtool.m4 - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am libtoolize --force --copy --install aclocal -I conftools -I m4 autoconf - configure $configureDirArgs - make + runConfigure ./configure + make $jobArgs } INSTALL() { make install + + # prepare develop/lib + prepareInstalledDevelLibs libexpat } LICENSE="MIT" From 88cc2bcdb995d1810905c848d2afa60fa458ff4d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 30 Apr 2013 21:37:58 +0200 Subject: [PATCH 186/587] Update apr_util recipe * Rename patch to match package name. * Specify patch explicitly. Previously patch wasn't picked up anymore due to its name not matching the package name. * Add cmd:apu_1_config to provides. * Move patch command from BUILD to PATCH. * Use runConfigure. * Use jobArgs. * Fix developLibDir paths in apu-1-config. * Patch build/apu-conf.m4 so the correct include and library path is used for expat. * Remove old patches. --- dev-libs/apr_util/apr_util-1.4.1.recipe | 24 +++++++--- .../patches/apr-util-0.9.x-haiku.diff | 24 ---------- dev-libs/apr_util/patches/apr-util-0.9.x.diff | 13 ------ .../apr_util/patches/apr-util-1.3.10.patch | 27 ----------- .../apr_util/patches/apr-util-1.3.11.patch | 27 ----------- .../apr_util/patches/apr-util-1.3.12.patch | 27 ----------- .../apr_util/patches/apr-util-1.4.1.patch | 27 ----------- .../apr_util/patches/apr_util-1.4.1.patch | 45 +++++++++++++++++++ 8 files changed, 62 insertions(+), 152 deletions(-) delete mode 100644 dev-libs/apr_util/patches/apr-util-0.9.x-haiku.diff delete mode 100644 dev-libs/apr_util/patches/apr-util-0.9.x.diff delete mode 100644 dev-libs/apr_util/patches/apr-util-1.3.10.patch delete mode 100644 dev-libs/apr_util/patches/apr-util-1.3.11.patch delete mode 100644 dev-libs/apr_util/patches/apr-util-1.3.12.patch delete mode 100644 dev-libs/apr_util/patches/apr-util-1.4.1.patch create mode 100644 dev-libs/apr_util/patches/apr_util-1.4.1.patch 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 bb4b7243e..9eb2a0d83 100644 --- a/dev-libs/apr_util/apr_util-1.4.1.recipe +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -4,11 +4,14 @@ SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz" LICENSE="Apache v2" COPYRIGHT="2011 The Apache Software Foundation." CHECKSUM_MD5="666a5d56098a9debf998510e304c8095" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" +PATCHES="apr_util-1.4.1.patch" + PROVIDES=" apr_util = $portVersion compat >= 1 + cmd:apu_1_config = $portVersion compat >= 1 lib:libaprutil = $portVersion compat >= 1 lib:libaprutil_1 = $portVersion compat >= 1 " @@ -33,20 +36,24 @@ BUILD_PREREQUIRES=" SOURCE_DIR="$portVersionedName" +PATCH() +{ + echo 'AM_INIT_AUTOMAKE' >> xml/expat/configure.in +} + BUILD() { - aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName - aprInstallDir=$aprUtilPackageLinksDir/apr - expatInstallDir=$aprUtilPackageLinksDir/expat + aprInstallDir=$portPackageLinksDir/apr + expatInstallDir=$portPackageLinksDir/expat rm -rf aclocal.m4 mkdir -p m4 libtoolize -fci aclocal --install -I m4 autoconf -f + cd xml/expat mkdir -p m4 - echo 'AM_INIT_AUTOMAKE' >> configure.in libtoolize -fci aclocal --install -I m4 autoconf --force @@ -58,10 +65,10 @@ BUILD() cp /boot/common/bin/libtool . ln -sfn $sourceDir/libtool /libtool - ./configure $configureDirArgs \ + runConfigure ./configure \ --with-apr=$aprInstallDir \ --with-expat=$expatInstallDir - make + make $jobArgs } INSTALL() @@ -71,6 +78,9 @@ INSTALL() # prepare develop/lib prepareInstalledDevelLibs libaprutil-1 fixPkgconfig + + # fix apu-1-config + fixDevelopLibDirReferences $binDir/apu-1-config } DESCRIPTION=" diff --git a/dev-libs/apr_util/patches/apr-util-0.9.x-haiku.diff b/dev-libs/apr_util/patches/apr-util-0.9.x-haiku.diff deleted file mode 100644 index 3c692e083..000000000 --- a/dev-libs/apr_util/patches/apr-util-0.9.x-haiku.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -u apr-util-0.9.15-orig/config.layout apr-util-0.9.15/config.layout ---- apr-util-0.9.15-orig/config.layout 2004-11-24 23:45:40.000000000 +0000 -+++ apr-util-0.9.15/config.layout 2008-05-14 15:03:22.000000000 +0000 -@@ -229,3 +229,20 @@ - infodir: ${exec_prefix}/share/info - libsuffix -${APRUTIL_MAJOR_VERSION} - -+ -+# Haiku layout -+ -+ prefix: /boot/common -+ exec_prefix: ${prefix} -+ bindir: ${exec_prefix}/bin -+ sbindir: ${exec_prefix}/bin -+ libdir: ${exec_prefix}/lib -+ libexecdir: ${exec_prefix}/bin -+ mandir: ${prefix}/man -+ sysconfdir: ${prefix}/conf -+ datadir: ${prefix} -+ installbuilddir: ${datadir}/build -+ includedir: ${prefix}/include/apr-${APRUTIL_MAJOR_VERSION} -+ localstatedir: ${prefix} -+ libsuffix: -${APRUTIL_MAJOR_VERSION} -+ diff --git a/dev-libs/apr_util/patches/apr-util-0.9.x.diff b/dev-libs/apr_util/patches/apr-util-0.9.x.diff deleted file mode 100644 index 804a56435..000000000 --- a/dev-libs/apr_util/patches/apr-util-0.9.x.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 645316) -+++ configure.in (working copy) -@@ -145,7 +145,7 @@ - dnl ### apr and expat libraries to the build or it'll die a truly horrible - dnl ### death. We now use the apr-config tool to determine the correct - dnl ### library to link against :) --*AIX*|*Darwin*|*BeOS*|CYGWIN*) -+*AIX*|*Darwin*|*BeOS*|*Haiku*|CYGWIN*) - dnl need such stuff as -liconv to be specified when building libaprutil.la - EXTRA_OS_LINK='$(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)' - ;; diff --git a/dev-libs/apr_util/patches/apr-util-1.3.10.patch b/dev-libs/apr_util/patches/apr-util-1.3.10.patch deleted file mode 100644 index 638694741..000000000 --- a/dev-libs/apr_util/patches/apr-util-1.3.10.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN apr-util-1.3.10/config.layout apr-util-1.3.10-haiku/config.layout ---- apr-util-1.3.10/config.layout 2005-02-09 12:18:43.049283072 +0000 -+++ apr-util-1.3.10-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000 -@@ -60,6 +60,23 @@ - runtimedir: ${localstatedir}/run - - -+# Haiku Layout making use of finddir -+ -+ prefix: /boot/common -+ exec_prefix: /boot/common -+ bindir: /boot/common/bin -+ sbindir: /boot/common/servers -+ libdir: /boot/common/lib -+ libexecdir: /boot/common/servers -+ mandir: /boot/common/documentation/man -+ sysconfdir: /boot/common/settings -+ datadir: /boot/common/data -+ installbuilddir: /boot/develop/build -+ includedir: /boot/common/include -+ localstatedir: /boot/common/var -+ runtimedir: ${localstatedir}/log -+ -+ - # Mac OS X Server (Rhapsody) - - prefix: /Local/Library/WebServer diff --git a/dev-libs/apr_util/patches/apr-util-1.3.11.patch b/dev-libs/apr_util/patches/apr-util-1.3.11.patch deleted file mode 100644 index 26633b67c..000000000 --- a/dev-libs/apr_util/patches/apr-util-1.3.11.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN apr-util-1.3.11/config.layout apr-util-1.3.11-haiku/config.layout ---- apr-util-1.3.11/config.layout 2005-02-09 12:18:43.049283072 +0000 -+++ apr-util-1.3.11-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000 -@@ -60,6 +60,23 @@ - runtimedir: ${localstatedir}/run - - -+# Haiku Layout making use of finddir -+ -+ prefix: /boot/common -+ exec_prefix: /boot/common -+ bindir: /boot/common/bin -+ sbindir: /boot/common/servers -+ libdir: /boot/common/lib -+ libexecdir: /boot/common/servers -+ mandir: /boot/common/documentation/man -+ sysconfdir: /boot/common/settings -+ datadir: /boot/common/data -+ installbuilddir: /boot/develop/build -+ includedir: /boot/common/include -+ localstatedir: /boot/common/var -+ runtimedir: ${localstatedir}/log -+ -+ - # Mac OS X Server (Rhapsody) - - prefix: /Local/Library/WebServer diff --git a/dev-libs/apr_util/patches/apr-util-1.3.12.patch b/dev-libs/apr_util/patches/apr-util-1.3.12.patch deleted file mode 100644 index c9873f4b3..000000000 --- a/dev-libs/apr_util/patches/apr-util-1.3.12.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN apr-util-1.3.12/config.layout apr-util-1.3.12-haiku/config.layout ---- apr-util-1.3.12/config.layout 2005-02-09 12:18:43.049283072 +0000 -+++ apr-util-1.3.12-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000 -@@ -60,6 +60,23 @@ - runtimedir: ${localstatedir}/run - - -+# Haiku Layout making use of finddir -+ -+ prefix: /boot/common -+ exec_prefix: /boot/common -+ bindir: /boot/common/bin -+ sbindir: /boot/common/servers -+ libdir: /boot/common/lib -+ libexecdir: /boot/common/servers -+ mandir: /boot/common/documentation/man -+ sysconfdir: /boot/common/settings -+ datadir: /boot/common/data -+ installbuilddir: /boot/develop/build -+ includedir: /boot/common/include -+ localstatedir: /boot/common/var -+ runtimedir: ${localstatedir}/log -+ -+ - # Mac OS X Server (Rhapsody) - - prefix: /Local/Library/WebServer diff --git a/dev-libs/apr_util/patches/apr-util-1.4.1.patch b/dev-libs/apr_util/patches/apr-util-1.4.1.patch deleted file mode 100644 index 799676743..000000000 --- a/dev-libs/apr_util/patches/apr-util-1.4.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN apr-util-1.4.1/config.layout apr-util-1.4.1-haiku/config.layout ---- apr-util-1.4.1/config.layout 2005-02-09 12:18:43.049283072 +0000 -+++ apr-util-1.4.1-haiku/config.layout 2011-03-25 11:04:46.549453824 +0000 -@@ -60,6 +60,23 @@ - runtimedir: ${localstatedir}/run - - -+# Haiku Layout making use of finddir -+ -+ prefix: /boot/common -+ exec_prefix: /boot/common -+ bindir: /boot/common/bin -+ sbindir: /boot/common/servers -+ libdir: /boot/common/lib -+ libexecdir: /boot/common/servers -+ mandir: /boot/common/documentation/man -+ sysconfdir: /boot/common/settings -+ datadir: /boot/common/data -+ installbuilddir: /boot/develop/build -+ includedir: /boot/common/include -+ localstatedir: /boot/common/var -+ runtimedir: ${localstatedir}/log -+ -+ - # Mac OS X Server (Rhapsody) - - prefix: /Local/Library/WebServer diff --git a/dev-libs/apr_util/patches/apr_util-1.4.1.patch b/dev-libs/apr_util/patches/apr_util-1.4.1.patch new file mode 100644 index 000000000..64006262e --- /dev/null +++ b/dev-libs/apr_util/patches/apr_util-1.4.1.patch @@ -0,0 +1,45 @@ +diff -ur orig/apr-util-1.4.1/build/apu-conf.m4 apr_util-1.4.1/build/apu-conf.m4 +--- orig/apr-util-1.4.1/build/apu-conf.m4 2011-08-08 11:32:27.026738688 +0200 ++++ apr_util-1.4.1/build/apu-conf.m4 2013-04-30 21:28:37.100401152 +0200 +@@ -145,10 +145,10 @@ + else + # Add given path to standard search paths if appropriate: + if test "$withval" != "/usr"; then +- APR_ADDTO(LDFLAGS, [-L$withval/lib]) +- APR_ADDTO(CPPFLAGS, [-I$withval/include]) +- APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include]) +- APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) ++ APR_ADDTO(LDFLAGS, [-L$withval/develop/lib]) ++ APR_ADDTO(CPPFLAGS, [-I$withval/develop/headers]) ++ APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/develop/headers]) ++ APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/develop/lib]) + fi + # ...and refuse to fall back on the builtin expat. + apu_try_builtin_expat=0 +diff -ur orig/apr-util-1.4.1/config.layout apr_util-1.4.1/config.layout +--- orig/apr-util-1.4.1/config.layout 2005-02-09 13:18:43.064749568 +0100 ++++ apr_util-1.4.1/config.layout 2013-04-30 21:27:27.079953920 +0200 +@@ -60,6 +60,23 @@ + runtimedir: ${localstatedir}/run + + ++# Haiku Layout making use of finddir ++ ++ prefix: /boot/common ++ exec_prefix: /boot/common ++ bindir: /boot/common/bin ++ sbindir: /boot/common/servers ++ libdir: /boot/common/lib ++ libexecdir: /boot/common/servers ++ mandir: /boot/common/documentation/man ++ sysconfdir: /boot/common/settings ++ datadir: /boot/common/data ++ installbuilddir: /boot/develop/build ++ includedir: /boot/common/include ++ localstatedir: /boot/common/var ++ runtimedir: ${localstatedir}/log ++ ++ + # Mac OS X Server (Rhapsody) + + prefix: /Local/Library/WebServer From 8fca2cffe2a7279009c9b23dee472c0b8722ff02 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 30 Apr 2013 21:57:28 +0200 Subject: [PATCH 187/587] Update subversion 1.6.15 recipe * Specify patch explicitly. * Remove bogus copied and pasted provides. Add the libraries. * Use runConfigure. * Use jobArgs. * Use prepareInstalledDevelLibs. --- dev-vcs/subversion/subversion-1.6.15.recipe | 52 +++++++++++++++------ 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe index 2ba1d878a..1b760fcbc 100644 --- a/dev-vcs/subversion/subversion-1.6.15.recipe +++ b/dev-vcs/subversion/subversion-1.6.15.recipe @@ -8,11 +8,15 @@ DESCRIPTION=" operations. " HOMEPAGE="http://subversion.apache.org" +LICENSE="Apache-Subversion" +COPYRIGHT="2010 The Apache Software Foundation" SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.15.tar.bz2" CHECKSUM_MD5="113fca1d9e4aa389d7dc2b210010fa69" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" +PATCHES="subversion-1.6.15.patch" + PROVIDES=" subversion = $portVersion compat >= 1.6 cmd:svn = $portVersion compat >= 1.6 @@ -22,8 +26,19 @@ PROVIDES=" cmd:svnserve = $portVersion compat >= 1.6 cmd:svnsync = $portVersion compat >= 1.6 cmd:svnversion = $portVersion compat >= 1.6 - lib:libiconv = 2.5.0 compat >= 2 - lib:libcharset = 1.0.0 compat >= 1 + lib:libsvn_client_1 = 0.0.0 compat >= 0 + lib:libsvn_delta_1 = 0.0.0 compat >= 0 + lib:libsvn_diff_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_fs_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_util_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_local_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_neon_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_svn_1 = 0.0.0 compat >= 0 + lib:libsvn_repos_1 = 0.0.0 compat >= 0 + lib:libsvn_subr_1 = 0.0.0 compat >= 0 + lib:libsvn_wc_1 = 0.0.0 compat >= 0 " REQUIRES=" haiku >= $haikuVersion @@ -56,15 +71,14 @@ BUILD() libtoolize --force --copy --install aclocal -I build -I build/ac-macros autoconf - subversionPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName - ./configure $configureDirArgs \ - --with-apr=$subversionPackageLinksDir/apr/bin/apr-1-config \ - --with-apr-util=$subversionPackageLinksDir/apr_util/bin/apu-1-config \ - --with-neon=$subversionPackageLinksDir/neon \ - --with-zlib=$subversionPackageLinksDir/zlib \ + runConfigure ./configure \ + --with-apr=$portPackageLinksDir/apr \ + --with-apr-util=$portPackageLinksDir/apr_util \ + --with-neon=$portPackageLinksDir/neon \ + --with-zlib=$portPackageLinksDir/zlib \ --with-editor=nano \ --disable-nls - make + make $jobArgs } INSTALL() @@ -82,7 +96,19 @@ INSTALL() # make install-swig-rb #fi fi -} -LICENSE="Apache-Subversion" -COPYRIGHT="2010 The Apache Software Foundation" + prepareInstalledDevelLibs \ + libsvn_client-1 \ + libsvn_delta-1 \ + libsvn_diff-1 \ + libsvn_fs-1 \ + libsvn_fs_fs-1 \ + libsvn_fs_util-1 \ + libsvn_ra-1 \ + libsvn_ra_local-1 \ + libsvn_ra_neon-1 \ + libsvn_ra_svn-1 \ + libsvn_repos-1 \ + libsvn_subr-1 \ + libsvn_wc-1 +} From 2dc7b777508fb2c1770eebf4d33a0dafdc3a97ad Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 30 Apr 2013 22:33:56 +0200 Subject: [PATCH 188/587] Convert subversion 1.6.18 recipe to an actual recipe * Adjust recipe similar to the 1.6.15 recipe. * Adjust the patch so that the correct global settings directory is used. --- .../patches/subversion-1.6.18.patch | 47 +++---- dev-vcs/subversion/subversion-1.6.18.recipe | 116 ++++++++++++++---- 2 files changed, 105 insertions(+), 58 deletions(-) diff --git a/dev-vcs/subversion/patches/subversion-1.6.18.patch b/dev-vcs/subversion/patches/subversion-1.6.18.patch index ac6c86321..097f8eebc 100644 --- a/dev-vcs/subversion/patches/subversion-1.6.18.patch +++ b/dev-vcs/subversion/patches/subversion-1.6.18.patch @@ -1,6 +1,6 @@ -diff -urN subversion-1.6.18/configure.ac subversion-1.6.18-haiku/configure.ac ---- subversion-1.6.18/configure.ac 2009-10-13 09:09:30.026214400 -0700 -+++ subversion-1.6.18-haiku/configure.ac 2011-08-02 14:32:39.227278848 -0700 +diff -ur orig/subversion-1.6.18/configure.ac subversion-1.6.18/configure.ac +--- orig/subversion-1.6.18/configure.ac 2009-10-13 18:09:30.043778048 +0200 ++++ subversion-1.6.18/configure.ac 2013-04-30 22:10:52.741605376 +0200 @@ -249,7 +249,7 @@ dnl Check for libraries -------------------- @@ -10,9 +10,9 @@ diff -urN subversion-1.6.18/configure.ac subversion-1.6.18-haiku/configure.ac # Build the BDB filesystem library only if we have an appropriate # version of Berkeley DB. -diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.18-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.18/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.18-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 +diff -ur orig/subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.18/subversion/libsvn_subr/config_file.c +--- orig/subversion-1.6.18/subversion/libsvn_subr/config_file.c 2009-11-25 18:27:35.015728640 +0100 ++++ subversion-1.6.18/subversion/libsvn_subr/config_file.c 2013-04-30 22:20:33.557842432 +0200 @@ -32,6 +32,11 @@ #include "svn_private_config.h" @@ -25,28 +25,7 @@ diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6. /* Used to terminate lines in large multi-line string literals. */ #define NL APR_EOL_STR -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many(pool, folder, -+ SVN_CONFIG__SYS_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ +@@ -1115,8 +1120,21 @@ *path = svn_path_join_many(pool, folder, SVN_CONFIG__SUBDIRECTORY, fname, NULL); } @@ -69,18 +48,20 @@ diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6. { const char *homedir = svn_user_get_homedir(pool); if (! homedir) -diff -urN subversion-1.6.18/subversion/libsvn_subr/config_impl.h subversion-1.6.18-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.18/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.18-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,10 @@ +diff -ur orig/subversion-1.6.18/subversion/libsvn_subr/config_impl.h subversion-1.6.18/subversion/libsvn_subr/config_impl.h +--- orig/subversion-1.6.18/subversion/libsvn_subr/config_impl.h 2009-01-27 14:23:50.020971520 +0100 ++++ subversion-1.6.18/subversion/libsvn_subr/config_impl.h 2013-04-30 22:19:32.338427904 +0200 +@@ -109,8 +109,11 @@ or svn_config_get_user_config_path() instead. */ #ifdef WIN32 # define SVN_CONFIG__SUBDIRECTORY "Subversion" -#else /* ! WIN32 */ +-# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" +#elif defined __HAIKU__ /* HAIKU */ +# define SVN_CONFIG__SYS_DIRECTORY "subversion" +# define SVN_CONFIG__USR_DIRECTORY "subversion" +#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" ++# define SVN_CONFIG__SYS_DIRECTORY "@HAIKU_GLOBAL_SETTINGS_DIR@" # define SVN_CONFIG__USR_DIRECTORY ".subversion" #endif /* WIN32 */ + diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe index d484a9bcd..1be5d0a78 100644 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -1,39 +1,94 @@ -DESCRIPTION="Subversion is an open source version control system" +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. + " HOMEPAGE="http://subversion.apache.org" +LICENSE="Apache-Subversion" +COPYRIGHT="2010 The Apache Software Foundation" SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2" CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.4.4 - dev-libs/apr-util >= 1.3.12 - net-misc/neon >= 0.29.6 - dev-libs/libiconv >= 1.13.1 - dev-db/sqlite >= 3.7.7.1 - dev-libs/expat >= 2.0.1 - dev-libs/openssl >= 1.0.0d - dev-libs/libxml2 >= 2.7.8" +REVISION="4" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="subversion-1.6.18.patch" + +PROVIDES=" + subversion = $portVersion compat >= 1.6 + cmd:svn = $portVersion compat >= 1.6 + cmd:svnadmin = $portVersion compat >= 1.6 + cmd:svndumpfilter = $portVersion compat >= 1.6 + cmd:svnlook = $portVersion compat >= 1.6 + cmd:svnserve = $portVersion compat >= 1.6 + cmd:svnsync = $portVersion compat >= 1.6 + cmd:svnversion = $portVersion compat >= 1.6 + lib:libsvn_client_1 = 0.0.0 compat >= 0 + lib:libsvn_delta_1 = 0.0.0 compat >= 0 + lib:libsvn_diff_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_fs_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_util_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_local_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_neon_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_svn_1 = 0.0.0 compat >= 0 + lib:libsvn_repos_1 = 0.0.0 compat >= 0 + lib:libsvn_subr_1 = 0.0.0 compat >= 0 + lib:libsvn_wc_1 = 0.0.0 compat >= 0 + " +REQUIRES=" + haiku >= $haikuVersion + apr >= 1.3 + apr_util >= 1.3 + expat >= 2.0 + libiconv >= 1.13 + libxml2 >= 2.7 + neon >= 0.29 + sqlite >= 3.4 + zlib + " +BUILD_REQUIRES=" + $REQUIRES + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + sed -i "s,@HAIKU_GLOBAL_SETTINGS_DIR@,$sysconfDir," \ + subversion/libsvn_subr/config_impl.h +} BUILD() { - cd subversion-1.6.18 libtoolize --force --copy --install aclocal -I build -I build/ac-macros autoconf - COMMON_DIR=`finddir B_COMMON_DIRECTORY` - ./configure --prefix=$COMMON_DIR \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=$COMMON_DIR \ - --with-zlib=$COMMON_DIR \ + runConfigure ./configure \ + --with-apr=$portPackageLinksDir/apr \ + --with-apr-util=$portPackageLinksDir/apr_util \ + --with-neon=$portPackageLinksDir/neon \ + --with-zlib=$portPackageLinksDir/zlib \ --with-editor=nano \ --disable-nls - make + make $jobArgs } INSTALL() { - cd subversion-1.6.18 make install if type -p swig > /dev/null;then if type -p python > /dev/null;then @@ -47,13 +102,24 @@ INSTALL() # make install-swig-rb #fi fi + + prepareInstalledDevelLibs \ + libsvn_client-1 \ + libsvn_delta-1 \ + libsvn_diff-1 \ + libsvn_fs-1 \ + libsvn_fs_fs-1 \ + libsvn_fs_util-1 \ + libsvn_ra-1 \ + libsvn_ra_local-1 \ + libsvn_ra_neon-1 \ + libsvn_ra_svn-1 \ + libsvn_repos-1 \ + libsvn_subr-1 \ + libsvn_wc-1 } TEST() { - cd subversion-1.6.18 make check } - -LICENSE="Apache-Subversion" -COPYRIGHT="2000-2009 CollabNet" From d71ff1949f435efe985773db2cc65761fcb04fb4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 30 Apr 2013 23:02:22 +0200 Subject: [PATCH 189/587] subversion: Remove old and intermediate non-recipes/patches --- .../subversion/patches/subversion-1.4.x.diff | 13 --- .../patches/subversion-1.5.4-haiku.diff | 11 --- .../patches/subversion-1.6.11.patch | 74 ---------------- .../patches/subversion-1.6.12.patch | 74 ---------------- .../patches/subversion-1.6.13.patch | 74 ---------------- .../patches/subversion-1.6.17.patch | 86 ------------------- .../patches/subversion-1.6.5-haiku-2.diff | 51 ----------- .../patches/subversion-1.6.5-haiku.diff | 13 --- .../subversion/patches/subversion-1.6.6.patch | 51 ----------- .../subversion/patches/subversion-1.6.9.patch | 74 ---------------- dev-vcs/subversion/subversion-1.6.11.recipe | 29 ------- dev-vcs/subversion/subversion-1.6.12.recipe | 30 ------- dev-vcs/subversion/subversion-1.6.13.recipe | 30 ------- dev-vcs/subversion/subversion-1.6.17.recipe | 59 ------------- dev-vcs/subversion/subversion-1.6.6.recipe | 24 ------ dev-vcs/subversion/subversion-1.6.9.recipe | 36 -------- 16 files changed, 729 deletions(-) delete mode 100644 dev-vcs/subversion/patches/subversion-1.4.x.diff delete mode 100644 dev-vcs/subversion/patches/subversion-1.5.4-haiku.diff delete mode 100644 dev-vcs/subversion/patches/subversion-1.6.11.patch delete mode 100644 dev-vcs/subversion/patches/subversion-1.6.12.patch delete mode 100644 dev-vcs/subversion/patches/subversion-1.6.13.patch delete mode 100644 dev-vcs/subversion/patches/subversion-1.6.17.patch delete mode 100644 dev-vcs/subversion/patches/subversion-1.6.5-haiku-2.diff delete mode 100644 dev-vcs/subversion/patches/subversion-1.6.5-haiku.diff delete mode 100644 dev-vcs/subversion/patches/subversion-1.6.6.patch delete mode 100644 dev-vcs/subversion/patches/subversion-1.6.9.patch delete mode 100644 dev-vcs/subversion/subversion-1.6.11.recipe delete mode 100644 dev-vcs/subversion/subversion-1.6.12.recipe delete mode 100644 dev-vcs/subversion/subversion-1.6.13.recipe delete mode 100644 dev-vcs/subversion/subversion-1.6.17.recipe delete mode 100644 dev-vcs/subversion/subversion-1.6.6.recipe delete mode 100644 dev-vcs/subversion/subversion-1.6.9.recipe diff --git a/dev-vcs/subversion/patches/subversion-1.4.x.diff b/dev-vcs/subversion/patches/subversion-1.4.x.diff deleted file mode 100644 index 85c272dc5..000000000 --- a/dev-vcs/subversion/patches/subversion-1.4.x.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 30382) -+++ configure.in (working copy) -@@ -184,7 +184,7 @@ - dnl So we only turn it on for platforms where we know we really need it. - AC_MSG_CHECKING([whether libtool needs -no-undefined]) - case $host in -- *-*-cygwin*) -+ *-*-cygwin* | *-*-beos* | *-*-haiku*) - AC_MSG_RESULT([yes]) - LT_NO_UNDEFINED="-no-undefined" - ;; diff --git a/dev-vcs/subversion/patches/subversion-1.5.4-haiku.diff b/dev-vcs/subversion/patches/subversion-1.5.4-haiku.diff deleted file mode 100644 index 04563f7bb..000000000 --- a/dev-vcs/subversion/patches/subversion-1.5.4-haiku.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN subversion-1.5.4/configure.ac subversion-1.5.4-haiku/configure.ac ---- subversion-1.5.4/configure.ac 2008-12-15 00:35:49.000000000 -0800 -+++ subversion-1.5.4-haiku/configure.ac 2008-12-15 00:32:30.000000000 -0800 -@@ -220,6 +220,7 @@ - - # Berkeley DB on SCO OpenServer needs -lsocket - AC_CHECK_LIB(socket, socket) -+AC_CHECK_LIB(network, socket) - - # Build the BDB filesystem library only if we have an appropriate - # version of Berkeley DB. diff --git a/dev-vcs/subversion/patches/subversion-1.6.11.patch b/dev-vcs/subversion/patches/subversion-1.6.11.patch deleted file mode 100644 index a3d5f7d17..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.11.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -urN subversion-1.6.11/subversion/libsvn_subr/config_file.c subversion-1.6.11-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.11/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.11-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.11/subversion/libsvn_subr/config_impl.h subversion-1.6.11-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.11/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.11-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.12.patch b/dev-vcs/subversion/patches/subversion-1.6.12.patch deleted file mode 100644 index b9cef3beb..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.12.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -urN subversion-1.6.12/subversion/libsvn_subr/config_file.c subversion-1.6.12-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.12/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.12-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many(pool, folder, -+ SVN_CONFIG__SYS_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path = svn_path_join_many(pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.12/subversion/libsvn_subr/config_impl.h subversion-1.6.12-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.12/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.12-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.13.patch b/dev-vcs/subversion/patches/subversion-1.6.13.patch deleted file mode 100644 index e1964f8e5..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.13.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -urN subversion-1.6.13/subversion/libsvn_subr/config_file.c subversion-1.6.13-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.13/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.13-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many(pool, folder, -+ SVN_CONFIG__SYS_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path = svn_path_join_many(pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.13/subversion/libsvn_subr/config_impl.h subversion-1.6.13-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.13/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.13-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.17.patch b/dev-vcs/subversion/patches/subversion-1.6.17.patch deleted file mode 100644 index 8db6b23c0..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.17.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -urN subversion-1.6.17/configure.ac subversion-1.6.17-haiku/configure.ac ---- subversion-1.6.17/configure.ac 2009-10-13 09:09:30.026214400 -0700 -+++ subversion-1.6.17-haiku/configure.ac 2011-08-02 14:32:39.227278848 -0700 -@@ -249,7 +249,7 @@ - dnl Check for libraries -------------------- - - # Berkeley DB on SCO OpenServer needs -lsocket --AC_CHECK_LIB(socket, socket) -+AC_SEARCH_LIBS(socket, socket network) - - # Build the BDB filesystem library only if we have an appropriate - # version of Berkeley DB. -diff -urN subversion-1.6.17/subversion/libsvn_subr/config_file.c subversion-1.6.17-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.17/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.17-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many(pool, folder, -+ SVN_CONFIG__SYS_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path = svn_path_join_many(pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.17/subversion/libsvn_subr/config_impl.h subversion-1.6.17-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.17/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.17-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.5-haiku-2.diff b/dev-vcs/subversion/patches/subversion-1.6.5-haiku-2.diff deleted file mode 100644 index fe47041ec..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.5-haiku-2.diff +++ /dev/null @@ -1,51 +0,0 @@ -diff -urN subversion-1.6.5/subversion/libsvn_subr/config_file.c subversion-1.6.5-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.5/subversion/libsvn_subr/config_file.c 2009-08-17 18:33:43.000000000 +0000 -+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_file.c 2009-09-03 09:01:10.000000000 +0000 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, true, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -diff -urN subversion-1.6.5/subversion/libsvn_subr/config_impl.h subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.5/subversion/libsvn_subr/config_impl.h 2009-01-27 13:23:50.000000000 +0000 -+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h 2009-09-03 08:54:11.000000000 +0000 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.5-haiku.diff b/dev-vcs/subversion/patches/subversion-1.6.5-haiku.diff deleted file mode 100644 index bf7847a0d..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.5-haiku.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN subversion-1.6.5/subversion/libsvn_subr/config_impl.h subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.5/subversion/libsvn_subr/config_impl.h 2009-01-27 13:23:50.000000000 +0000 -+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h 2009-09-02 13:43:03.000000000 +0000 -@@ -109,6 +109,9 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "/boot/common/etc/subversion" -+# define SVN_CONFIG__USR_DIRECTORY "config/settings/subversion" - #else /* ! WIN32 */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" diff --git a/dev-vcs/subversion/patches/subversion-1.6.6.patch b/dev-vcs/subversion/patches/subversion-1.6.6.patch deleted file mode 100644 index 6bbe00b59..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.6.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -urN subversion-1.6.6/subversion/libsvn_subr/config_file.c subversion-1.6.6-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.6/subversion/libsvn_subr/config_file.c 2009-08-17 18:33:43.000000000 +0000 -+++ subversion-1.6.6-haiku/subversion/libsvn_subr/config_file.c 2009-11-23 08:28:19.000000000 +0000 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, true, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -diff -urN subversion-1.6.6/subversion/libsvn_subr/config_impl.h subversion-1.6.6-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.6/subversion/libsvn_subr/config_impl.h 2009-01-27 13:23:50.000000000 +0000 -+++ subversion-1.6.6-haiku/subversion/libsvn_subr/config_impl.h 2009-11-23 08:28:19.000000000 +0000 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.9.patch b/dev-vcs/subversion/patches/subversion-1.6.9.patch deleted file mode 100644 index dee400526..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.9.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -urN subversion-1.6.9/subversion/libsvn_subr/config_file.c subversion-1.6.9-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.9/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.9-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -326,7 +331,19 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#elif defined(__HAIKU__) -+{ -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.9/subversion/libsvn_subr/config_impl.h subversion-1.6.9-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.9/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.9-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */ diff --git a/dev-vcs/subversion/subversion-1.6.11.recipe b/dev-vcs/subversion/subversion-1.6.11.recipe deleted file mode 100644 index 88c98644a..000000000 --- a/dev-vcs/subversion/subversion-1.6.11.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.tigris.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.11.tar.gz" -CHECKSUM_MD5="7331310fc786111899b305c6d141b02d" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd subversion-1.6.11 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=/boot/common \ - --with-editor=lpe \ - --with-zlib=/boot/common - make -} - -INSTALL() -{ - cd subversion-1.6.11 - make install -} -LICENSE="Subversion" -COPYRIGHT="2000-2010 CollabNet" diff --git a/dev-vcs/subversion/subversion-1.6.12.recipe b/dev-vcs/subversion/subversion-1.6.12.recipe deleted file mode 100644 index a0bd512b1..000000000 --- a/dev-vcs/subversion/subversion-1.6.12.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.12.tar.bz2" -CHECKSUM_MD5="a4b1d0d7f3a4587c59da9c1acf9dedd0" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd subversion-1.6.12 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=/boot/common \ - --with-editor=nano \ - --with-zlib=/boot/common - make -} - -INSTALL() -{ - cd subversion-1.6.12 - make install -} -LICENSE="Apache-Subversion" -COPYRIGHT="2010 The Apache Software Foundation" diff --git a/dev-vcs/subversion/subversion-1.6.13.recipe b/dev-vcs/subversion/subversion-1.6.13.recipe deleted file mode 100644 index 87caf344b..000000000 --- a/dev-vcs/subversion/subversion-1.6.13.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.13.tar.bz2" -CHECKSUM_MD5="7ae1c827689f21cf975804005be30aeb" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd subversion-1.6.13 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=/boot/common \ - --with-editor=nano \ - --with-zlib=/boot/common - make -} - -INSTALL() -{ - cd subversion-1.6.13 - make install -} -LICENSE="Apache-Subversion" -COPYRIGHT="2010 The Apache Software Foundation" diff --git a/dev-vcs/subversion/subversion-1.6.17.recipe b/dev-vcs/subversion/subversion-1.6.17.recipe deleted file mode 100644 index 4a6a0fe54..000000000 --- a/dev-vcs/subversion/subversion-1.6.17.recipe +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2" -CHECKSUM_MD5="81e5dc5beee4b3fc025ac70c0b6caa14" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.4.4 - dev-libs/apr-util >= 1.3.12 - net-misc/neon >= 0.29.6 - dev-libs/libiconv >= 1.13.1 - dev-db/sqlite >= 3.7.7.1 - dev-libs/expat >= 2.0.1 - dev-libs/openssl >= 1.0.0d - dev-libs/libxml2 >= 2.7.8" - -BUILD() -{ - cd subversion-1.6.17 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - COMMON_DIR=`finddir B_COMMON_DIRECTORY` - ./configure --prefix=$COMMON_DIR \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=$COMMON_DIR \ - --with-zlib=$COMMON_DIR \ - --with-editor=nano \ - --disable-nls - make -} - -INSTALL() -{ - cd subversion-1.6.17 - make install - if type -p swig > /dev/null;then - if type -p python > /dev/null;then - PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") - make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn - fi - #if type -p perl > /dev/null;then - # make install-swig-pl - #fi - #if type -p ruby > /dev/null;then - # make install-swig-rb - #fi - fi -} - -TEST() -{ - cd subversion-1.6.17 - make check -} - -LICENSE="Apache-Subversion" -COPYRIGHT="2011 The Apache Software Foundation" diff --git a/dev-vcs/subversion/subversion-1.6.6.recipe b/dev-vcs/subversion/subversion-1.6.6.recipe deleted file mode 100644 index 5822f2138..000000000 --- a/dev-vcs/subversion/subversion-1.6.6.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.tigris.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.6.tar.bz2" -CHECKSUM_MD5="e5109da756d74c7d98f683f004a539af" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd subversion-1.6.6 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config --with-neon=/boot/common --with-editor=lpe --with-zlib=/boot/common - make -} - -INSTALL() -{ - cd subversion-1.6.6 - make install -} -LICENSE="Subversion" -COPYRIGHT="2000-2010 CollabNet" diff --git a/dev-vcs/subversion/subversion-1.6.9.recipe b/dev-vcs/subversion/subversion-1.6.9.recipe deleted file mode 100644 index 5688cb562..000000000 --- a/dev-vcs/subversion/subversion-1.6.9.recipe +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.tigris.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.9.tar.gz" -CHECKSUM_MD5="facaa0ee78c8f24b9af12c74662bbd24" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd subversion-1.6.9 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config --with-neon=/boot/common --with-editor=nano --with-zlib=/boot/common - make -} - -INSTALL() -{ - cd subversion-1.6.9 - make install - if type -p swig > /dev/null;then - if type -p python > /dev/null;then - PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") - make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn - fi - #if type -p perl > /dev/null;then - # make install-swig-pl - #fi - #if type -p ruby > /dev/null;then - # make install-swig-rb - #fi - fi -} -LICENSE="Subversion" -COPYRIGHT="2000-2010 CollabNet" From 3fee9cc3cbe17ffb7468ecfee1d0d14173eca551 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 1 May 2013 01:33:42 +0200 Subject: [PATCH 190/587] Add icu 4.8.1.1 recipe and patch The patch is an unchanged version of the 4.8.1 patch and the recipe is derived from the non-recipe for 4.8.1. --- dev-libs/icu/icu-4.8.1.1.recipe | 98 ++++ dev-libs/icu/patches/icu-4.8.1.1.patch | 591 +++++++++++++++++++++++++ 2 files changed, 689 insertions(+) create mode 100644 dev-libs/icu/icu-4.8.1.1.recipe create mode 100644 dev-libs/icu/patches/icu-4.8.1.1.patch diff --git a/dev-libs/icu/icu-4.8.1.1.recipe b/dev-libs/icu/icu-4.8.1.1.recipe new file mode 100644 index 000000000..6aa66ecc3 --- /dev/null +++ b/dev-libs/icu/icu-4.8.1.1.recipe @@ -0,0 +1,98 @@ +SUMMARY="International Components for Unicode (ICU)" +HOMEPAGE="http://www.icu-project.org" +LICENSE="ICU" +COPYRIGHT="1997-2011 IBM Corporation and others." +SRC_URI="http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz" +CHECKSUM_MD5="ea93970a0275be6b42f56953cd332c17" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="icu-4.8.1.1.patch" + +PROVIDES=" + icu = $portVersion compat >= 4.8 + lib:libicudata = 48.1.1 compat >= 48 + lib:libicui18n = 48.1.1 compat >= 48 + lib:libicuio = 48.1.1 compat >= 48 + lib:libicule = 48.1.1 compat >= 48 + lib:libiculx = 48.1.1 compat >= 48 + lib:libicutu = 48.1.1 compat >= 48 + lib:libicuuc = 48.1.1 compat >= 48 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + $REQUIRES + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="icu/source" + +BUILD() +{ + runConfigure ./configure \ + --disable-renaming --disable-samples --disable-extras + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs \ + libicudata \ + libicui18n \ + libicuio \ + libicule \ + libiculx \ + libicutu \ + libicuuc + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir \ + $dataDir \ + $libDir/icu \ + $binDir/icu-config + + # main package cleanup + rm -r $binDir +} + +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." + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The ICU development files" +PROVIDES_devel="icu_devel = $portVersion" +REQUIRES_devel=" + icu == $portVersion + " diff --git a/dev-libs/icu/patches/icu-4.8.1.1.patch b/dev-libs/icu/patches/icu-4.8.1.1.patch new file mode 100644 index 000000000..0db0c4abe --- /dev/null +++ b/dev-libs/icu/patches/icu-4.8.1.1.patch @@ -0,0 +1,591 @@ +diff -ruN icu/source/common/messagepattern.cpp icu-haiku/source/common/messagepattern.cpp +--- icu/source/common/messagepattern.cpp 2011-07-19 23:16:28.046137344 +0200 ++++ icu-haiku/source/common/messagepattern.cpp 2011-08-19 15:48:48.211025920 +0200 +@@ -88,8 +88,12 @@ + int32_t length, + UErrorCode &errorCode); + UBool ensureCapacityForOneMore(int32_t oldLength, UErrorCode &errorCode); +- UBool memEquals(const MessagePatternList &other, int32_t length) const { +- return 0==uprv_memcmp(a.getAlias(), other.a.getAlias(), length*sizeof(T)); ++ UBool equals(const MessagePatternList &other, int32_t length) const { ++ for (int32_t i=0; i a; +@@ -309,7 +313,7 @@ + msg==other.msg && + // parts.equals(o.parts) + partsLength==other.partsLength && +- (partsLength==0 || partsList->memEquals(*other.partsList, partsLength)); ++ (partsLength==0 || partsList->equals(*other.partsList, partsLength)); + // No need to compare numericValues if msg and parts are the same. + } + +diff -ruN icu/source/common/normalizer2.cpp icu-haiku/source/common/normalizer2.cpp +--- icu/source/common/normalizer2.cpp 2011-07-19 23:16:24.008912896 +0200 ++++ icu-haiku/source/common/normalizer2.cpp 2011-08-19 15:46:55.276824064 +0200 +@@ -239,7 +239,7 @@ + ReorderingBuffer &buffer, UErrorCode &errorCode) const { + impl.decompose(src, limit, &buffer, errorCode); + } +- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. + virtual void + normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, + UnicodeString &safeMiddle, +@@ -250,7 +250,7 @@ + spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const { + return impl.decompose(src, limit, NULL, errorCode); + } +- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. + virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const { + return impl.isDecompYes(impl.getNorm16(c)) ? UNORM_YES : UNORM_NO; + } +@@ -270,7 +270,7 @@ + ReorderingBuffer &buffer, UErrorCode &errorCode) const { + impl.compose(src, limit, onlyContiguous, TRUE, buffer, errorCode); + } +- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. + virtual void + normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, + UnicodeString &safeMiddle, +@@ -313,7 +313,7 @@ + spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &) const { + return impl.composeQuickCheck(src, limit, onlyContiguous, NULL); + } +- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. + virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const { + return impl.getCompQuickCheck(impl.getNorm16(c)); + } +@@ -340,7 +340,7 @@ + ReorderingBuffer &buffer, UErrorCode &errorCode) const { + impl.makeFCD(src, limit, &buffer, errorCode); + } +- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. + virtual void + normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, + UnicodeString &safeMiddle, +@@ -351,7 +351,7 @@ + spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const { + return impl.makeFCD(src, limit, NULL, errorCode); + } +- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. ++// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. + virtual UBool hasBoundaryBefore(UChar32 c) const { return impl.hasFCDBoundaryBefore(c); } + virtual UBool hasBoundaryAfter(UChar32 c) const { return impl.hasFCDBoundaryAfter(c); } + virtual UBool isInert(UChar32 c) const { return impl.isFCDInert(c); } +diff -ruN icu/source/common/unicode/bytestrie.h icu-haiku/source/common/unicode/bytestrie.h +--- icu/source/common/unicode/bytestrie.h 2011-07-19 23:16:16.052953088 +0200 ++++ icu-haiku/source/common/unicode/bytestrie.h 2011-08-19 15:46:55.331874304 +0200 +@@ -338,6 +338,9 @@ + // but the code looks more confusing that way.) + UVector32 *stack_; + }; ++#if (__GNUC__ == 2) ++ friend class Iterator; ++#endif + + private: + friend class BytesTrieBuilder; +diff -ruN icu/source/common/unicode/bytestriebuilder.h icu-haiku/source/common/unicode/bytestriebuilder.h +--- icu/source/common/unicode/bytestriebuilder.h 2011-07-19 23:16:16.053477376 +0200 ++++ icu-haiku/source/common/unicode/bytestriebuilder.h 2011-08-19 15:46:55.333185024 +0200 +@@ -141,6 +141,9 @@ + private: + const char *s; + }; ++#if (__GNUC__ == 2) ++ friend class BTLinearMatchNode; ++#endif + + virtual Node *createLinearMatchNode(int32_t i, int32_t byteIndex, int32_t length, + Node *nextNode) const; +diff -ruN icu/source/common/unicode/platform.h.in icu-haiku/source/common/unicode/platform.h.in +--- icu/source/common/unicode/platform.h.in 2011-07-19 23:16:18.055574528 +0200 ++++ icu-haiku/source/common/unicode/platform.h.in 2011-08-19 15:46:55.346554368 +0200 +@@ -299,7 +299,7 @@ + + #ifdef U_STATIC_IMPLEMENTATION + #define U_EXPORT +-#elif @U_USE_GCC_VISIBILITY_ATTRIBUTE@ ++#elif (@U_USE_GCC_VISIBILITY_ATTRIBUTE@) && (__GNUC__ > 2) + #define U_EXPORT __attribute__((visibility("default"))) + #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \ + || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) +diff -ruN icu/source/common/unicode/stringtriebuilder.h icu-haiku/source/common/unicode/stringtriebuilder.h +--- icu/source/common/unicode/stringtriebuilder.h 2011-07-19 23:16:18.056623104 +0200 ++++ icu-haiku/source/common/unicode/stringtriebuilder.h 2011-08-19 15:46:55.336068608 +0200 +@@ -245,6 +245,9 @@ + protected: + int32_t value; + }; ++#if (__GNUC__ == 2) ++ friend class FinalValueNode; ++#endif + + /** @internal */ + class ValueNode : public Node { +@@ -272,6 +275,9 @@ + protected: + Node *next; + }; ++#if (__GNUC__ == 2) ++ friend class IntermediateValueNode; ++#endif + + /** @internal */ + class LinearMatchNode : public ValueNode { +@@ -323,6 +329,9 @@ + int32_t values[kMaxBranchLinearSubNodeLength]; + UChar units[kMaxBranchLinearSubNodeLength]; + }; ++#if (__GNUC__ == 2) ++ friend class ListBranchNode; ++#endif + + /** @internal */ + class SplitBranchNode : public BranchNode { +@@ -339,6 +348,9 @@ + Node *lessThan; + Node *greaterOrEqual; + }; ++#if (__GNUC__ == 2) ++ friend class SplitBranchNode; ++#endif + + // Branch head node, for writing the actual node lead unit. + /** @internal */ +@@ -354,6 +366,9 @@ + int32_t length; + Node *next; // A branch sub-node. + }; ++#if (__GNUC__ == 2) ++ friend class BranchHeadNode; ++#endif + + /** @internal */ + virtual Node *createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t length, +diff -ruN icu/source/common/unicode/ucharstrie.h icu-haiku/source/common/unicode/ucharstrie.h +--- icu/source/common/unicode/ucharstrie.h 2011-07-19 23:16:18.058720256 +0200 ++++ icu-haiku/source/common/unicode/ucharstrie.h 2011-08-19 15:46:55.338165760 +0200 +@@ -368,6 +368,9 @@ + // but the code looks more confusing that way.) + UVector32 *stack_; + }; ++#if (__GNUC__ == 2) ++ friend class Iterator; ++#endif + + private: + friend class UCharsTrieBuilder; +diff -ruN icu/source/common/unicode/ucharstriebuilder.h icu-haiku/source/common/unicode/ucharstriebuilder.h +--- icu/source/common/unicode/ucharstriebuilder.h 2011-07-19 23:16:18.059244544 +0200 ++++ icu-haiku/source/common/unicode/ucharstriebuilder.h 2011-08-19 15:46:55.339738624 +0200 +@@ -145,6 +145,9 @@ + private: + const UChar *s; + }; ++#if (__GNUC__ == 2) ++ friend class UCTLinearMatchNode; ++#endif + + virtual Node *createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t length, + Node *nextNode) const; +diff -ruN icu/source/config/mh-haiku icu-haiku/source/config/mh-haiku +--- icu/source/config/mh-haiku 2011-07-19 23:16:46.026214400 +0200 ++++ icu-haiku/source/config/mh-haiku 2011-08-19 15:46:55.328990720 +0200 +@@ -17,6 +17,9 @@ + LIBCPPFLAGS = + THREADSCPPFLAGS = + ++# ++CPPFLAGS += -D__STDC_ISO_10646__ -DU_CHARSET_IS_UTF8=1 ++ + ## Compiler switch to embed a runtime search path + LD_RPATH= + LD_RPATH_PRE = -Wl,-rpath, +@@ -31,35 +34,35 @@ + + ## Compilation rules + %.$(STATIC_O): $(srcdir)/%.c +- $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< ++ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< + %.o: $(srcdir)/%.c +- $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< ++ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< + + %.$(STATIC_O): $(srcdir)/%.cpp +- $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< ++ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< + %.o: $(srcdir)/%.cpp +- $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< ++ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< + + + ## Dependency rules + %.d: $(srcdir)/%.c +- @echo "generating dependency information for $<" +- @$(SHELL) -ec '$(GEN_DEPS.c) $< \ +- | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ +- [ -s $@ ] || rm -f $@' ++ @echo "generating dependency information for $<" ++ @$(SHELL) -ec '$(GEN_DEPS.c) $< \ ++ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ ++ [ -s $@ ] || rm -f $@' + + %.d: $(srcdir)/%.cpp +- @echo "generating dependency information for $<" +- @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ +- | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ +- [ -s $@ ] || rm -f $@' ++ @echo "generating dependency information for $<" ++ @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ ++ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ ++ [ -s $@ ] || rm -f $@' + + ## Versioned libraries rules + + %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) +- $(RM) $@ && ln -s ${(preferenceSorting.elementAt(psIndex)); ++ UnicodeString item = *static_cast(preferenceSorting.elementAt(psIndex)); + // TODO: Since preferenceSorting was originally populated from the contents of a UnicodeSet, + // is it even possible for duplicates to show up in this check? + if (labelSet.contains(item)) { +@@ -240,7 +240,7 @@ + int32_t count = 0; + int32_t old = -1; + for (int32_t srcIndex=0; srcIndexsize(); srcIndex++) { +- const UnicodeString *str = static_cast(labels_->elementAt(srcIndex)); ++ const UnicodeString *str = static_cast(labels_->elementAt(srcIndex)); + ++count; + const int32_t bump = count * maxLabelCount_ / size; + if (bump == old) { +@@ -528,7 +528,7 @@ + const UnicodeString &AlphabeticIndex::getOverflowComparisonString(const UnicodeString &lowerLimit, UErrorCode &/*status*/) { + for (int32_t i=0; isize(); i++) { + const UnicodeString *s = +- static_cast(firstScriptCharacters_->elementAt(i)); ++ const_cast(static_cast(firstScriptCharacters_->elementAt(i))); + if (collator_->compare(*s, lowerLimit) > 0) { + return *s; + } +@@ -735,8 +735,10 @@ + sortCollateComparator(const void *context, const void *left, const void *right) { + const UHashTok *leftTok = static_cast(left); + const UHashTok *rightTok = static_cast(right); +- const UnicodeString *leftString = static_cast(leftTok->pointer); +- const UnicodeString *rightString = static_cast(rightTok->pointer); ++ const UnicodeString *leftString ++ = const_cast(static_cast(leftTok->pointer)); ++ const UnicodeString *rightString ++ = const_cast(static_cast(rightTok->pointer)); + const Collator *col = static_cast(context); + + if (leftString == rightString) { +@@ -760,8 +762,10 @@ + recordCompareFn(const void *context, const void *left, const void *right) { + const UHashTok *leftTok = static_cast(left); + const UHashTok *rightTok = static_cast(right); +- const AlphabeticIndex::Record *leftRec = static_cast(leftTok->pointer); +- const AlphabeticIndex::Record *rightRec = static_cast(rightTok->pointer); ++ const AlphabeticIndex::Record *leftRec ++ = const_cast(static_cast(leftTok->pointer)); ++ const AlphabeticIndex::Record *rightRec ++ = const_cast(static_cast(rightTok->pointer)); + const Collator *col = static_cast(context); + + Collator::EComparisonResult r = col->compare(leftRec->sortingName_, rightRec->sortingName_); +@@ -1087,8 +1091,8 @@ + PreferenceComparator(const void *context, const void *left, const void *right) { + const UHashTok *leftTok = static_cast(left); + const UHashTok *rightTok = static_cast(right); +- const UnicodeString *s1 = static_cast(leftTok->pointer); +- const UnicodeString *s2 = static_cast(rightTok->pointer); ++ const UnicodeString *s1 = const_cast(static_cast(leftTok->pointer)); ++ const UnicodeString *s2 = const_cast(static_cast(rightTok->pointer)); + UErrorCode &status = *(UErrorCode *)(context); // Cast off both static and const. + if (s1 == s2) { + return 0; +diff -ruN icu/source/i18n/currfmt.h icu-haiku/source/i18n/currfmt.h +--- icu/source/i18n/currfmt.h 2011-07-19 23:16:00.058720256 +0200 ++++ icu-haiku/source/i18n/currfmt.h 2011-08-19 15:46:55.293339136 +0200 +@@ -63,7 +63,9 @@ + virtual Format* clone() const; + + ++#if (__GNUC__ > 2) + using MeasureFormat::format; ++#endif + + /** + * Override Format API. +diff -ruN icu/source/i18n/digitlst.cpp icu-haiku/source/i18n/digitlst.cpp +--- icu/source/i18n/digitlst.cpp 2011-07-19 23:16:00.050593792 +0200 ++++ icu-haiku/source/i18n/digitlst.cpp 2011-08-19 15:46:55.295698432 +0200 +@@ -37,7 +37,9 @@ + #include + #include + #include ++#if (__GNUC__ > 2) + #include ++#endif + + // *************************************************************************** + // class DigitList +@@ -423,11 +425,15 @@ + nonConstThis->fDouble /= -1; + } + } else if (isInfinite()) { ++#if (__GNUC__ > 2) + if (std::numeric_limits::has_infinity) { + nonConstThis->fDouble = std::numeric_limits::infinity(); + } else { + nonConstThis->fDouble = std::numeric_limits::max(); + } ++#else ++ nonConstThis->fDouble = DBL_MAX; ++#endif + if (!isPositive()) { + nonConstThis->fDouble = -fDouble; + } +diff -ruN icu/source/i18n/reldtfmt.h icu-haiku/source/i18n/reldtfmt.h +--- icu/source/i18n/reldtfmt.h 2011-07-19 23:16:06.034078720 +0200 ++++ icu-haiku/source/i18n/reldtfmt.h 2011-08-19 15:46:55.297533440 +0200 +@@ -79,7 +79,9 @@ + virtual UBool operator==(const Format& other) const; + + ++#if (__GNUC__ > 2) + using DateFormat::format; ++#endif + + /** + * Format a date or time, which is the standard millis since 24:00 GMT, Jan +diff -ruN icu/source/i18n/unicode/alphaindex.h icu-haiku/source/i18n/unicode/alphaindex.h +--- icu/source/i18n/unicode/alphaindex.h 2011-07-19 23:15:52.042467328 +0200 ++++ icu-haiku/source/i18n/unicode/alphaindex.h 2011-08-19 15:46:55.344719360 +0200 +@@ -588,6 +588,9 @@ + Record(AlphabeticIndex *alphaIndex, const UnicodeString &name, const void *data); + ~Record(); + }; ++#if (__GNUC__ == 2) ++ friend struct Record; ++#endif + + /** + * Holds all user records before they are distributed into buckets. +diff -ruN icu/source/i18n/unicode/choicfmt.h icu-haiku/source/i18n/unicode/choicfmt.h +--- icu/source/i18n/unicode/choicfmt.h 2011-07-19 23:15:52.038797312 +0200 ++++ icu-haiku/source/i18n/unicode/choicfmt.h 2011-08-19 15:46:55.300154880 +0200 +@@ -352,7 +352,9 @@ + virtual const UnicodeString* getFormats(int32_t& count) const; + + ++#if (__GNUC__ > 2) + using NumberFormat::format; ++#endif + + /** + * Formats a double number using this object's choices. +diff -ruN icu/source/i18n/unicode/datefmt.h icu-haiku/source/i18n/unicode/datefmt.h +--- icu/source/i18n/unicode/datefmt.h 2011-07-19 23:15:52.035389440 +0200 ++++ icu-haiku/source/i18n/unicode/datefmt.h 2011-08-19 15:46:55.302514176 +0200 +@@ -212,7 +212,9 @@ + virtual UBool operator==(const Format&) const; + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Format an object to produce a string. This method handles Formattable +diff -ruN icu/source/i18n/unicode/decimfmt.h icu-haiku/source/i18n/unicode/decimfmt.h +--- icu/source/i18n/unicode/decimfmt.h 2011-07-19 23:15:54.040370176 +0200 ++++ icu-haiku/source/i18n/unicode/decimfmt.h 2011-08-19 15:46:55.305397760 +0200 +@@ -834,7 +834,16 @@ + virtual UBool operator==(const Format& other) const; + + ++#if (__GNUC__ > 2) + using NumberFormat::format; ++#else ++ virtual UnicodeString& format(const Formattable& obj, ++ UnicodeString& appendTo, ++ FieldPositionIterator* posIter, ++ UErrorCode& status) const { ++ return NumberFormat::format(obj, appendTo, posIter, status); ++ } ++#endif + + /** + * Format a double or long number using base-10 representation. +diff -ruN icu/source/i18n/unicode/dtitvfmt.h icu-haiku/source/i18n/unicode/dtitvfmt.h +--- icu/source/i18n/unicode/dtitvfmt.h 2011-07-19 23:15:54.042467328 +0200 ++++ icu-haiku/source/i18n/unicode/dtitvfmt.h 2011-08-19 15:46:55.307757056 +0200 +@@ -363,7 +363,9 @@ + UBool operator!=(const Format& other) const; + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Format an object to produce a string. This method handles Formattable +diff -ruN icu/source/i18n/unicode/msgfmt.h icu-haiku/source/i18n/unicode/msgfmt.h +--- icu/source/i18n/unicode/msgfmt.h 2011-07-19 23:15:54.041156608 +0200 ++++ icu-haiku/source/i18n/unicode/msgfmt.h 2011-08-19 15:46:55.310116352 +0200 +@@ -615,7 +615,9 @@ + virtual const Format** getFormats(int32_t& count) const; + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Formats the given array of arguments into a user-readable string. +diff -ruN icu/source/i18n/unicode/numfmt.h icu-haiku/source/i18n/unicode/numfmt.h +--- icu/source/i18n/unicode/numfmt.h 2011-07-19 23:15:54.039059456 +0200 ++++ icu-haiku/source/i18n/unicode/numfmt.h 2011-08-19 15:46:55.312213504 +0200 +@@ -212,8 +212,9 @@ + */ + virtual UBool operator==(const Format& other) const; + +- ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Format an object to produce a string. This method handles +diff -ruN icu/source/i18n/unicode/plurfmt.h icu-haiku/source/i18n/unicode/plurfmt.h +--- icu/source/i18n/unicode/plurfmt.h 2011-07-19 23:15:52.044040192 +0200 ++++ icu-haiku/source/i18n/unicode/plurfmt.h 2011-08-19 15:46:55.314310656 +0200 +@@ -281,7 +281,9 @@ + void applyPattern(const UnicodeString& pattern, UErrorCode& status); + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Formats a plural message for a given number. +diff -ruN icu/source/i18n/unicode/rbnf.h icu-haiku/source/i18n/unicode/rbnf.h +--- icu/source/i18n/unicode/rbnf.h 2011-07-19 23:15:54.034340864 +0200 ++++ icu-haiku/source/i18n/unicode/rbnf.h 2011-08-19 15:46:55.316932096 +0200 +@@ -722,7 +722,9 @@ + const Locale& locale = Locale::getDefault()); + + ++#if (__GNUC__ > 2) + using NumberFormat::format; ++#endif + + /** + * Formats the specified 32-bit number using the default ruleset. +diff -ruN icu/source/i18n/unicode/selfmt.h icu-haiku/source/i18n/unicode/selfmt.h +--- icu/source/i18n/unicode/selfmt.h 2011-07-19 23:15:52.042991616 +0200 ++++ icu-haiku/source/i18n/unicode/selfmt.h 2011-08-19 15:46:55.318767104 +0200 +@@ -219,7 +219,9 @@ + void applyPattern(const UnicodeString& pattern, UErrorCode& status); + + ++#if (__GNUC__ > 2) + using Format::format; ++#endif + + /** + * Selects the phrase for the given keyword +diff -ruN icu/source/i18n/unicode/smpdtfmt.h icu-haiku/source/i18n/unicode/smpdtfmt.h +--- icu/source/i18n/unicode/smpdtfmt.h 2011-07-19 23:15:52.035127296 +0200 ++++ icu-haiku/source/i18n/unicode/smpdtfmt.h 2011-08-19 15:46:55.321126400 +0200 +@@ -369,7 +369,9 @@ + virtual UBool operator==(const Format& other) const; + + ++#if (__GNUC__ > 2) + using DateFormat::format; ++#endif + + /** + * Format a date or time, which is the standard millis since 24:00 GMT, Jan +diff -ruN icu/source/i18n/unicode/tmutfmt.h icu-haiku/source/i18n/unicode/tmutfmt.h +--- icu/source/i18n/unicode/tmutfmt.h 2011-07-19 23:15:54.039583744 +0200 ++++ icu-haiku/source/i18n/unicode/tmutfmt.h 2011-08-19 15:46:55.322961408 +0200 +@@ -162,7 +162,16 @@ + void setNumberFormat(const NumberFormat& format, UErrorCode& status); + + ++#if (__GNUC__ > 2) + using MeasureFormat::format; ++#else ++ virtual UnicodeString& format(const Formattable& obj, ++ UnicodeString& appendTo, ++ FieldPositionIterator* posIter, ++ UErrorCode& status) const { ++ return MeasureFormat::format(obj, appendTo, posIter, status); ++ } ++#endif + + /** + * Format a TimeUnitAmount. +diff -ruN icu/source/tools/pkgdata/pkgdata.cpp icu-haiku/source/tools/pkgdata/pkgdata.cpp +--- icu/source/tools/pkgdata/pkgdata.cpp 2011-07-19 23:16:36.003670016 +0200 ++++ icu-haiku/source/tools/pkgdata/pkgdata.cpp 2011-08-19 15:46:55.326107136 +0200 +@@ -476,7 +476,7 @@ + + static int runCommand(const char* command, UBool specialHandling) { + char *cmd = NULL; +- char cmdBuffer[SMALL_BUFFER_MAX_SIZE]; ++ char cmdBuffer[64000]; + int32_t len = strlen(command); + + if (len == 0) { From a2ed366b6bf617a45c37ffbb3a8cb5c11f33f2ba Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 1 May 2013 01:36:01 +0200 Subject: [PATCH 191/587] Remove older icu non-recipes and patches --- dev-libs/icu/icu-4.4.1.recipe | 22 - dev-libs/icu/icu-4.8.1.recipe | 22 - dev-libs/icu/patches/icu-4.4.1.patch | 510 ----------------------- dev-libs/icu/patches/icu-4.8.1.patch | 591 --------------------------- 4 files changed, 1145 deletions(-) delete mode 100644 dev-libs/icu/icu-4.4.1.recipe delete mode 100644 dev-libs/icu/icu-4.8.1.recipe delete mode 100644 dev-libs/icu/patches/icu-4.4.1.patch delete mode 100644 dev-libs/icu/patches/icu-4.8.1.patch diff --git a/dev-libs/icu/icu-4.4.1.recipe b/dev-libs/icu/icu-4.4.1.recipe deleted file mode 100644 index 45e38e444..000000000 --- a/dev-libs/icu/icu-4.4.1.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="icu" -HOMEPAGE="http://www.icu-project.org" -SRC_URI="http://download.icu-project.org/files/icu4c/4.4.1/icu4c-4_4_1-src.tgz" -CHECKSUM_MD5="b6bc0a1153540b2088f8b03e0ba625d3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd icu/source - CPPFLAGS="-D__STDC_ISO_10646__ -DU_CHARSET_IS_UTF8=1" ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd icu/source - make install -} - -LICENSE="ICU" -COPYRIGHT="1997-2010 IBM Corporation and others." diff --git a/dev-libs/icu/icu-4.8.1.recipe b/dev-libs/icu/icu-4.8.1.recipe deleted file mode 100644 index d4b141419..000000000 --- a/dev-libs/icu/icu-4.8.1.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="icu" -HOMEPAGE="http://www.icu-project.org" -SRC_URI="http://download.icu-project.org/files/icu4c/4.8.1/icu4c-4_8_1-src.tgz" -CHECKSUM_MD5="af36f635271a239d76d038d6cf8da8df" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd icu/source - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-renaming --disable-samples --disable-extras - make -} - -INSTALL() -{ - cd icu/source - make install -} - -LICENSE="ICU" -COPYRIGHT="1997-2011 IBM Corporation and others." diff --git a/dev-libs/icu/patches/icu-4.4.1.patch b/dev-libs/icu/patches/icu-4.4.1.patch deleted file mode 100644 index 93f8911f4..000000000 --- a/dev-libs/icu/patches/icu-4.4.1.patch +++ /dev/null @@ -1,510 +0,0 @@ -diff -ruwN icu/source/aclocal.m4 icu-haiku/source/aclocal.m4 ---- icu/source/aclocal.m4 2010-04-28 17:28:54.011796480 +0200 -+++ icu-haiku/source/aclocal.m4 2010-07-26 14:35:01.820248576 +0200 -@@ -59,7 +59,8 @@ - *-*-os400*) icu_cv_host_frag=mh-os400 ;; - *-apple-rhapsody*) icu_cv_host_frag=mh-darwin ;; - *-apple-darwin*) icu_cv_host_frag=mh-darwin ;; --*-*-beos|*-*-haiku) icu_cv_host_frag=mh-beos ;; -+*-*-beos) icu_cv_host_frag=mh-beos ;; -+*-*-haiku) icu_cv_host_frag=mh-haiku ;; - *-*-irix*) icu_cv_host_frag=mh-irix ;; - *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;; - *-*-nto*) icu_cv_host_frag=mh-qnx ;; -diff -ruwN icu/source/common/normalizer2.cpp icu-haiku/source/common/normalizer2.cpp ---- icu/source/common/normalizer2.cpp 2010-04-28 17:27:38.044040192 +0200 -+++ icu-haiku/source/common/normalizer2.cpp 2010-07-26 19:29:38.945553408 +0200 -@@ -221,7 +221,7 @@ - ReorderingBuffer &buffer, UErrorCode &errorCode) const { - impl.decompose(src, limit, &buffer, errorCode); - } -- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. - virtual void - normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, - ReorderingBuffer &buffer, UErrorCode &errorCode) const { -@@ -231,7 +231,7 @@ - spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const { - return impl.decompose(src, limit, NULL, errorCode); - } -- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. - virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const { - return impl.isDecompYes(impl.getNorm16(c)) ? UNORM_YES : UNORM_NO; - } -@@ -251,7 +251,7 @@ - ReorderingBuffer &buffer, UErrorCode &errorCode) const { - impl.compose(src, limit, onlyContiguous, TRUE, buffer, errorCode); - } -- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. - virtual void - normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, - ReorderingBuffer &buffer, UErrorCode &errorCode) const { -@@ -293,7 +293,7 @@ - spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &) const { - return impl.composeQuickCheck(src, limit, onlyContiguous, NULL); - } -- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. - virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const { - return impl.getCompQuickCheck(impl.getNorm16(c)); - } -@@ -320,7 +320,7 @@ - ReorderingBuffer &buffer, UErrorCode &errorCode) const { - impl.makeFCD(src, limit, &buffer, errorCode); - } -- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. - virtual void - normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, - ReorderingBuffer &buffer, UErrorCode &errorCode) const { -@@ -330,7 +330,7 @@ - spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const { - return impl.makeFCD(src, limit, NULL, errorCode); - } -- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. - virtual UBool hasBoundaryBefore(UChar32 c) const { return impl.hasFCDBoundaryBefore(c); } - virtual UBool hasBoundaryAfter(UChar32 c) const { return impl.hasFCDBoundaryAfter(c); } - virtual UBool isInert(UChar32 c) const { return impl.isFCDInert(c); } -diff -ruwN icu/source/config/mh-haiku icu-haiku/source/config/mh-haiku ---- icu/source/config/mh-haiku 1970-01-01 01:00:00.000000000 +0100 -+++ icu-haiku/source/config/mh-haiku 2010-07-26 21:54:15.739246080 +0200 -@@ -0,0 +1,82 @@ -+## -*-makefile-*- -+## haiku-specific setup -+## Copyright (c) 2009, International Business Machines Corporation and -+## others. All Rights Reserved. -+## -+ -+## Commands to generate dependency files -+GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) -+GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) -+ -+## Flags for position independent code -+SHAREDLIBCFLAGS = -fPIC -+SHAREDLIBCXXFLAGS = -fPIC -+SHAREDLIBCPPFLAGS = -DPIC -+ -+## Additional flags when building libraries and with threads -+LIBCPPFLAGS = -+THREADSCPPFLAGS = -+ -+## These are the library specific LDFLAGS -+LDFLAGSICUDT=-nodefaultlibs -nostdlib -+ -+## Compiler switch to embed a runtime search path -+LD_RPATH= -+LD_RPATH_PRE = -Wl,-rpath, -+ -+## Compiler switch to embed a library name -+LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET)) -+ -+## Shared library options -+LD_SOOPTIONS= -Wl,-Bsymbolic -+ -+## Shared object suffix -+SO = so -+## Non-shared intermediate object suffix -+STATIC_O = ao -+ -+## Compilation rules -+%.$(STATIC_O): $(srcdir)/%.c -+ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< -+%.o: $(srcdir)/%.c -+ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< -+ -+%.$(STATIC_O): $(srcdir)/%.cpp -+ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< -+%.o: $(srcdir)/%.cpp -+ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< -+ -+ -+## Dependency rules -+%.d: $(srcdir)/%.c -+ @echo "generating dependency information for $<" -+ @$(SHELL) -ec '$(GEN_DEPS.c) $< \ -+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ -+ [ -s $@ ] || rm -f $@' -+ -+%.d: $(srcdir)/%.cpp -+ @echo "generating dependency information for $<" -+ @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ -+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ -+ [ -s $@ ] || rm -f $@' -+ -+## Versioned libraries rules -+ -+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) -+ $(RM) $@ && ln -s ${ - #include - #include -+#if (__GNUC__ != 2) - #include -+#endif - - // *************************************************************************** - // class DigitList -@@ -399,11 +401,15 @@ - nonConstThis->fDouble /= -1; - } - } else if (isInfinite()) { -+#if (__GNUC__ != 2) - if (std::numeric_limits::has_infinity) { - nonConstThis->fDouble = std::numeric_limits::infinity(); - } else { - nonConstThis->fDouble = std::numeric_limits::max(); - } -+#else -+ nonConstThis->fDouble = DBL_MAX; -+#endif - if (!isPositive()) { - nonConstThis->fDouble = -fDouble; - } -diff -ruwN icu/source/i18n/reldtfmt.h icu-haiku/source/i18n/reldtfmt.h ---- icu/source/i18n/reldtfmt.h 2010-04-28 17:27:10.049283072 +0200 -+++ icu-haiku/source/i18n/reldtfmt.h 2010-07-26 19:08:52.212074496 +0200 -@@ -78,7 +78,9 @@ - virtual UBool operator==(const Format& other) const; - - -+#if (__GNUC__ != 2) - using DateFormat::format; -+#endif - - /** - * Format a date or time, which is the standard millis since 24:00 GMT, Jan -diff -ruwN icu/source/i18n/smpdtfmt.cpp icu-haiku/source/i18n/smpdtfmt.cpp ---- icu/source/i18n/smpdtfmt.cpp 2010-04-28 17:27:08.050855936 +0200 -+++ icu-haiku/source/i18n/smpdtfmt.cpp 2010-07-26 14:35:01.834142208 +0200 -@@ -1054,7 +1054,7 @@ - int32_t - SimpleDateFormat::parseGMTDefault(const UnicodeString &text, ParsePosition &pos) const { - int32_t start = pos.getIndex(); -- NumberFormat *currentNumberFormat = getNumberFormat(UDAT_TIMEZONE_RFC_FIELD); -+ NumberFormat *currentNumberFormat = getNumberFormatByIndex(UDAT_TIMEZONE_RFC_FIELD); - - if (start + kUtLen + 1 >= text.length()) { - pos.setErrorIndex(start); -@@ -1465,7 +1465,7 @@ - return; - } - -- currentNumberFormat = getNumberFormat(patternCharIndex); -+ currentNumberFormat = getNumberFormatByIndex(patternCharIndex); - switch (patternCharIndex) { - - // for any "G" symbol, write out the appropriate era string -@@ -1730,7 +1730,7 @@ - //---------------------------------------------------------------------- - - NumberFormat * --SimpleDateFormat::getNumberFormat(UDateFormatField index) const { -+SimpleDateFormat::getNumberFormatByIndex(UDateFormatField index) const { - if (fNumberFormatters != NULL) { - return fNumberFormatters[index]; - } else { -@@ -2365,7 +2365,7 @@ - } - - patternCharIndex = (UDateFormatField)(patternCharPtr - DateFormatSymbols::getPatternUChars()); -- currentNumberFormat = getNumberFormat(patternCharIndex); -+ currentNumberFormat = getNumberFormatByIndex(patternCharIndex); - UCalendarDateFields field = fgPatternIndexToCalendarField[patternCharIndex]; - - // If there are any spaces here, skip over them. If we hit the end -diff -ruwN icu/source/i18n/unicode/choicfmt.h icu-haiku/source/i18n/unicode/choicfmt.h ---- icu/source/i18n/unicode/choicfmt.h 2010-04-28 17:27:04.037486592 +0200 -+++ icu-haiku/source/i18n/unicode/choicfmt.h 2010-07-26 18:59:35.882114560 +0200 -@@ -441,7 +441,9 @@ - virtual const UnicodeString* getFormats(int32_t& count) const; - - -+#if (__GNUC__ != 2) - using NumberFormat::format; -+#endif - - /** - * Format a double or long number using this object's choices. -diff -ruwN icu/source/i18n/unicode/datefmt.h icu-haiku/source/i18n/unicode/datefmt.h ---- icu/source/i18n/unicode/datefmt.h 2010-04-28 17:27:04.036962304 +0200 -+++ icu-haiku/source/i18n/unicode/datefmt.h 2010-07-26 18:57:27.439615488 +0200 -@@ -212,7 +212,9 @@ - virtual UBool operator==(const Format&) const; - - -+#if (__GNUC__ != 2) - using Format::format; -+#endif - - /** - * Format an object to produce a string. This method handles Formattable -diff -ruwN icu/source/i18n/unicode/decimfmt.h icu-haiku/source/i18n/unicode/decimfmt.h ---- icu/source/i18n/unicode/decimfmt.h 2010-04-28 17:27:04.032505856 +0200 -+++ icu-haiku/source/i18n/unicode/decimfmt.h 2010-07-26 21:37:12.587202560 +0200 -@@ -824,7 +824,16 @@ - virtual UBool operator==(const Format& other) const; - - -+#if (__GNUC__ != 2) - using NumberFormat::format; -+#else -+ virtual UnicodeString& format(const Formattable& obj, -+ UnicodeString& appendTo, -+ FieldPositionIterator* posIter, -+ UErrorCode& status) const { -+ return NumberFormat::format(obj, appendTo, posIter, status); -+ } -+#endif - - /** - * Format a double or long number using base-10 representation. -diff -ruwN icu/source/i18n/unicode/dtitvfmt.h icu-haiku/source/i18n/unicode/dtitvfmt.h ---- icu/source/i18n/unicode/dtitvfmt.h 2010-04-28 17:27:04.036700160 +0200 -+++ icu-haiku/source/i18n/unicode/dtitvfmt.h 2010-07-26 19:12:22.191627264 +0200 -@@ -363,7 +363,9 @@ - UBool operator!=(const Format& other) const; - - -+#if (__GNUC__ != 2) - using Format::format; -+#endif - - /** - * Format an object to produce a string. This method handles Formattable -diff -ruwN icu/source/i18n/unicode/msgfmt.h icu-haiku/source/i18n/unicode/msgfmt.h ---- icu/source/i18n/unicode/msgfmt.h 2010-04-28 17:27:04.033554432 +0200 -+++ icu-haiku/source/i18n/unicode/msgfmt.h 2010-07-26 18:57:58.825753600 +0200 -@@ -584,7 +584,9 @@ - virtual const Format** getFormats(int32_t& count) const; - - -+#if (__GNUC__ != 2) - using Format::format; -+#endif - - /** - * Formats the given array of arguments into a user-readable string. -diff -ruwN icu/source/i18n/unicode/numfmt.h icu-haiku/source/i18n/unicode/numfmt.h ---- icu/source/i18n/unicode/numfmt.h 2010-04-28 17:27:04.037224448 +0200 -+++ icu-haiku/source/i18n/unicode/numfmt.h 2010-07-26 18:54:07.820510720 +0200 -@@ -234,8 +234,9 @@ - */ - virtual UBool operator==(const Format& other) const; - -- -+#if (__GNUC__ != 2) - using Format::format; -+#endif - - /** - * Format an object to produce a string. This method handles -diff -ruwN icu/source/i18n/unicode/plurfmt.h icu-haiku/source/i18n/unicode/plurfmt.h ---- icu/source/i18n/unicode/plurfmt.h 2010-04-28 17:27:04.031981568 +0200 -+++ icu-haiku/source/i18n/unicode/plurfmt.h 2010-07-26 19:00:08.335282176 +0200 -@@ -308,7 +308,9 @@ - void applyPattern(const UnicodeString& pattern, UErrorCode& status); - - -+#if (__GNUC__ != 2) - using Format::format; -+#endif - - /** - * Formats a plural message for a given number. -diff -ruwN icu/source/i18n/unicode/rbnf.h icu-haiku/source/i18n/unicode/rbnf.h ---- icu/source/i18n/unicode/rbnf.h 2010-04-28 17:27:04.039845888 +0200 -+++ icu-haiku/source/i18n/unicode/rbnf.h 2010-07-26 19:01:11.091226112 +0200 -@@ -722,7 +722,9 @@ - const Locale& locale = Locale::getDefault()); - - -+#if (__GNUC__ != 2) - using NumberFormat::format; -+#endif - - /** - * Formats the specified 32-bit number using the default ruleset. -diff -ruwN icu/source/i18n/unicode/selfmt.h icu-haiku/source/i18n/unicode/selfmt.h ---- icu/source/i18n/unicode/selfmt.h 2010-04-28 17:27:04.039583744 +0200 -+++ icu-haiku/source/i18n/unicode/selfmt.h 2010-07-26 19:00:39.130547712 +0200 -@@ -220,7 +220,9 @@ - void applyPattern(const UnicodeString& pattern, UErrorCode& status); - - -+#if (__GNUC__ != 2) - using Format::format; -+#endif - - /** - * Selects the phrase for the given keyword -diff -ruwN icu/source/i18n/unicode/smpdtfmt.h icu-haiku/source/i18n/unicode/smpdtfmt.h ---- icu/source/i18n/unicode/smpdtfmt.h 2010-04-28 17:27:04.034603008 +0200 -+++ icu-haiku/source/i18n/unicode/smpdtfmt.h 2010-07-26 18:58:52.592969728 +0200 -@@ -368,7 +368,9 @@ - virtual UBool operator==(const Format& other) const; - - -+#if (__GNUC__ != 2) - using DateFormat::format; -+#endif - - /** - * Format a date or time, which is the standard millis since 24:00 GMT, Jan -@@ -1021,8 +1023,7 @@ - /** - * Get the numbering system to be used for a particular field. - */ -- using DateFormat::getNumberFormat; // Do not hide visibility of base class function -- NumberFormat * getNumberFormat(UDateFormatField index) const; -+ NumberFormat * getNumberFormatByIndex(UDateFormatField index) const; - - /** - * Parse the given override string and set up structures for number formats -diff -ruwN icu/source/i18n/unicode/tmutfmt.h icu-haiku/source/i18n/unicode/tmutfmt.h ---- icu/source/i18n/unicode/tmutfmt.h 2010-04-28 17:27:04.037486592 +0200 -+++ icu-haiku/source/i18n/unicode/tmutfmt.h 2010-07-26 21:37:12.592969728 +0200 -@@ -164,7 +164,16 @@ - void setNumberFormat(const NumberFormat& format, UErrorCode& status); - - -+#if (__GNUC__ != 2) - using MeasureFormat::format; -+#else -+ virtual UnicodeString& format(const Formattable& obj, -+ UnicodeString& appendTo, -+ FieldPositionIterator* posIter, -+ UErrorCode& status) const { -+ return Format::format(obj, appendTo, posIter, status); -+ } -+#endif - - /** - * Format a TimeUnitAmount. -diff -ruwN icu/source/i18n/uspoof_conf.cpp icu-haiku/source/i18n/uspoof_conf.cpp ---- icu/source/i18n/uspoof_conf.cpp 2010-04-28 17:27:08.050069504 +0200 -+++ icu-haiku/source/i18n/uspoof_conf.cpp 2010-07-26 19:15:22.253231104 +0200 -@@ -106,8 +106,10 @@ - // Conforms to the type signature for a USortComparator in uvector.h - - static int8_t U_CALLCONV SPUStringCompare(UHashTok left, UHashTok right) { -- const SPUString *sL = static_cast(left.pointer); -- const SPUString *sR = static_cast(right.pointer); -+ const SPUString *sL = const_cast( -+ static_cast(left.pointer)); -+ const SPUString *sR = const_cast( -+ static_cast(right.pointer)); - int32_t lenL = sL->fStr->length(); - int32_t lenR = sR->fStr->length(); - if (lenL < lenR) { -diff -ruwN icu/source/io/unicode/ustream.h icu-haiku/source/io/unicode/ustream.h ---- icu/source/io/unicode/ustream.h 2010-04-28 17:27:52.013369344 +0200 -+++ icu-haiku/source/io/unicode/ustream.h 2010-07-26 14:35:01.843055104 +0200 -@@ -27,8 +27,13 @@ - */ - - #if U_IOSTREAM_SOURCE >= 199711 -+ -+#if (__GNUC__ == 2) -+#include -+#else - #include - #include -+#endif - - U_NAMESPACE_BEGIN - -diff -ruwN icu/source/tools/gennorm2/n2builder.cpp icu-haiku/source/tools/gennorm2/n2builder.cpp ---- icu/source/tools/gennorm2/n2builder.cpp 2010-04-28 17:27:42.052953088 +0200 -+++ icu-haiku/source/tools/gennorm2/n2builder.cpp 2010-07-26 19:18:33.715390976 +0200 -@@ -674,7 +674,11 @@ - } - int32_t length=p->compositions->size(); - for(int32_t i=0; icompositions)[i]; -+#else - CompositionPair &pair=p->compositions->at(i); -+#endif - // 22 bits for the composite character and whether it combines forward. - UChar32 compositeAndFwd=pair.composite<<1; - if(getNormRef(pair.composite).compositions!=NULL) { -diff -ruwN icu/source/tools/pkgdata/pkgdata.cpp icu-haiku/source/tools/pkgdata/pkgdata.cpp ---- icu/source/tools/pkgdata/pkgdata.cpp 2010-04-28 17:27:46.008912896 +0200 -+++ icu-haiku/source/tools/pkgdata/pkgdata.cpp 2010-07-26 18:30:06.726401024 +0200 -@@ -472,7 +472,7 @@ - } - - static int runCommand(const char* command, UBool specialHandling) { -- char cmd[SMALL_BUFFER_MAX_SIZE]; -+ char cmd[64000]; - - if (!specialHandling) { - #ifdef USING_CYGWIN diff --git a/dev-libs/icu/patches/icu-4.8.1.patch b/dev-libs/icu/patches/icu-4.8.1.patch deleted file mode 100644 index 0db0c4abe..000000000 --- a/dev-libs/icu/patches/icu-4.8.1.patch +++ /dev/null @@ -1,591 +0,0 @@ -diff -ruN icu/source/common/messagepattern.cpp icu-haiku/source/common/messagepattern.cpp ---- icu/source/common/messagepattern.cpp 2011-07-19 23:16:28.046137344 +0200 -+++ icu-haiku/source/common/messagepattern.cpp 2011-08-19 15:48:48.211025920 +0200 -@@ -88,8 +88,12 @@ - int32_t length, - UErrorCode &errorCode); - UBool ensureCapacityForOneMore(int32_t oldLength, UErrorCode &errorCode); -- UBool memEquals(const MessagePatternList &other, int32_t length) const { -- return 0==uprv_memcmp(a.getAlias(), other.a.getAlias(), length*sizeof(T)); -+ UBool equals(const MessagePatternList &other, int32_t length) const { -+ for (int32_t i=0; i a; -@@ -309,7 +313,7 @@ - msg==other.msg && - // parts.equals(o.parts) - partsLength==other.partsLength && -- (partsLength==0 || partsList->memEquals(*other.partsList, partsLength)); -+ (partsLength==0 || partsList->equals(*other.partsList, partsLength)); - // No need to compare numericValues if msg and parts are the same. - } - -diff -ruN icu/source/common/normalizer2.cpp icu-haiku/source/common/normalizer2.cpp ---- icu/source/common/normalizer2.cpp 2011-07-19 23:16:24.008912896 +0200 -+++ icu-haiku/source/common/normalizer2.cpp 2011-08-19 15:46:55.276824064 +0200 -@@ -239,7 +239,7 @@ - ReorderingBuffer &buffer, UErrorCode &errorCode) const { - impl.decompose(src, limit, &buffer, errorCode); - } -- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. - virtual void - normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, - UnicodeString &safeMiddle, -@@ -250,7 +250,7 @@ - spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const { - return impl.decompose(src, limit, NULL, errorCode); - } -- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. - virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const { - return impl.isDecompYes(impl.getNorm16(c)) ? UNORM_YES : UNORM_NO; - } -@@ -270,7 +270,7 @@ - ReorderingBuffer &buffer, UErrorCode &errorCode) const { - impl.compose(src, limit, onlyContiguous, TRUE, buffer, errorCode); - } -- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. - virtual void - normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, - UnicodeString &safeMiddle, -@@ -313,7 +313,7 @@ - spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &) const { - return impl.composeQuickCheck(src, limit, onlyContiguous, NULL); - } -- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. - virtual UNormalizationCheckResult getQuickCheck(UChar32 c) const { - return impl.getCompQuickCheck(impl.getNorm16(c)); - } -@@ -340,7 +340,7 @@ - ReorderingBuffer &buffer, UErrorCode &errorCode) const { - impl.makeFCD(src, limit, &buffer, errorCode); - } -- using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::normalize; // Avoid warning about hiding base class function. - virtual void - normalizeAndAppend(const UChar *src, const UChar *limit, UBool doNormalize, - UnicodeString &safeMiddle, -@@ -351,7 +351,7 @@ - spanQuickCheckYes(const UChar *src, const UChar *limit, UErrorCode &errorCode) const { - return impl.makeFCD(src, limit, NULL, errorCode); - } -- using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. -+// using Normalizer2WithImpl::spanQuickCheckYes; // Avoid warning about hiding base class function. - virtual UBool hasBoundaryBefore(UChar32 c) const { return impl.hasFCDBoundaryBefore(c); } - virtual UBool hasBoundaryAfter(UChar32 c) const { return impl.hasFCDBoundaryAfter(c); } - virtual UBool isInert(UChar32 c) const { return impl.isFCDInert(c); } -diff -ruN icu/source/common/unicode/bytestrie.h icu-haiku/source/common/unicode/bytestrie.h ---- icu/source/common/unicode/bytestrie.h 2011-07-19 23:16:16.052953088 +0200 -+++ icu-haiku/source/common/unicode/bytestrie.h 2011-08-19 15:46:55.331874304 +0200 -@@ -338,6 +338,9 @@ - // but the code looks more confusing that way.) - UVector32 *stack_; - }; -+#if (__GNUC__ == 2) -+ friend class Iterator; -+#endif - - private: - friend class BytesTrieBuilder; -diff -ruN icu/source/common/unicode/bytestriebuilder.h icu-haiku/source/common/unicode/bytestriebuilder.h ---- icu/source/common/unicode/bytestriebuilder.h 2011-07-19 23:16:16.053477376 +0200 -+++ icu-haiku/source/common/unicode/bytestriebuilder.h 2011-08-19 15:46:55.333185024 +0200 -@@ -141,6 +141,9 @@ - private: - const char *s; - }; -+#if (__GNUC__ == 2) -+ friend class BTLinearMatchNode; -+#endif - - virtual Node *createLinearMatchNode(int32_t i, int32_t byteIndex, int32_t length, - Node *nextNode) const; -diff -ruN icu/source/common/unicode/platform.h.in icu-haiku/source/common/unicode/platform.h.in ---- icu/source/common/unicode/platform.h.in 2011-07-19 23:16:18.055574528 +0200 -+++ icu-haiku/source/common/unicode/platform.h.in 2011-08-19 15:46:55.346554368 +0200 -@@ -299,7 +299,7 @@ - - #ifdef U_STATIC_IMPLEMENTATION - #define U_EXPORT --#elif @U_USE_GCC_VISIBILITY_ATTRIBUTE@ -+#elif (@U_USE_GCC_VISIBILITY_ATTRIBUTE@) && (__GNUC__ > 2) - #define U_EXPORT __attribute__((visibility("default"))) - #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \ - || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) -diff -ruN icu/source/common/unicode/stringtriebuilder.h icu-haiku/source/common/unicode/stringtriebuilder.h ---- icu/source/common/unicode/stringtriebuilder.h 2011-07-19 23:16:18.056623104 +0200 -+++ icu-haiku/source/common/unicode/stringtriebuilder.h 2011-08-19 15:46:55.336068608 +0200 -@@ -245,6 +245,9 @@ - protected: - int32_t value; - }; -+#if (__GNUC__ == 2) -+ friend class FinalValueNode; -+#endif - - /** @internal */ - class ValueNode : public Node { -@@ -272,6 +275,9 @@ - protected: - Node *next; - }; -+#if (__GNUC__ == 2) -+ friend class IntermediateValueNode; -+#endif - - /** @internal */ - class LinearMatchNode : public ValueNode { -@@ -323,6 +329,9 @@ - int32_t values[kMaxBranchLinearSubNodeLength]; - UChar units[kMaxBranchLinearSubNodeLength]; - }; -+#if (__GNUC__ == 2) -+ friend class ListBranchNode; -+#endif - - /** @internal */ - class SplitBranchNode : public BranchNode { -@@ -339,6 +348,9 @@ - Node *lessThan; - Node *greaterOrEqual; - }; -+#if (__GNUC__ == 2) -+ friend class SplitBranchNode; -+#endif - - // Branch head node, for writing the actual node lead unit. - /** @internal */ -@@ -354,6 +366,9 @@ - int32_t length; - Node *next; // A branch sub-node. - }; -+#if (__GNUC__ == 2) -+ friend class BranchHeadNode; -+#endif - - /** @internal */ - virtual Node *createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t length, -diff -ruN icu/source/common/unicode/ucharstrie.h icu-haiku/source/common/unicode/ucharstrie.h ---- icu/source/common/unicode/ucharstrie.h 2011-07-19 23:16:18.058720256 +0200 -+++ icu-haiku/source/common/unicode/ucharstrie.h 2011-08-19 15:46:55.338165760 +0200 -@@ -368,6 +368,9 @@ - // but the code looks more confusing that way.) - UVector32 *stack_; - }; -+#if (__GNUC__ == 2) -+ friend class Iterator; -+#endif - - private: - friend class UCharsTrieBuilder; -diff -ruN icu/source/common/unicode/ucharstriebuilder.h icu-haiku/source/common/unicode/ucharstriebuilder.h ---- icu/source/common/unicode/ucharstriebuilder.h 2011-07-19 23:16:18.059244544 +0200 -+++ icu-haiku/source/common/unicode/ucharstriebuilder.h 2011-08-19 15:46:55.339738624 +0200 -@@ -145,6 +145,9 @@ - private: - const UChar *s; - }; -+#if (__GNUC__ == 2) -+ friend class UCTLinearMatchNode; -+#endif - - virtual Node *createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t length, - Node *nextNode) const; -diff -ruN icu/source/config/mh-haiku icu-haiku/source/config/mh-haiku ---- icu/source/config/mh-haiku 2011-07-19 23:16:46.026214400 +0200 -+++ icu-haiku/source/config/mh-haiku 2011-08-19 15:46:55.328990720 +0200 -@@ -17,6 +17,9 @@ - LIBCPPFLAGS = - THREADSCPPFLAGS = - -+# -+CPPFLAGS += -D__STDC_ISO_10646__ -DU_CHARSET_IS_UTF8=1 -+ - ## Compiler switch to embed a runtime search path - LD_RPATH= - LD_RPATH_PRE = -Wl,-rpath, -@@ -31,35 +34,35 @@ - - ## Compilation rules - %.$(STATIC_O): $(srcdir)/%.c -- $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< -+ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< - %.o: $(srcdir)/%.c -- $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< -+ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< - - %.$(STATIC_O): $(srcdir)/%.cpp -- $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< -+ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< - %.o: $(srcdir)/%.cpp -- $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< -+ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< - - - ## Dependency rules - %.d: $(srcdir)/%.c -- @echo "generating dependency information for $<" -- @$(SHELL) -ec '$(GEN_DEPS.c) $< \ -- | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ -- [ -s $@ ] || rm -f $@' -+ @echo "generating dependency information for $<" -+ @$(SHELL) -ec '$(GEN_DEPS.c) $< \ -+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ -+ [ -s $@ ] || rm -f $@' - - %.d: $(srcdir)/%.cpp -- @echo "generating dependency information for $<" -- @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ -- | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ -- [ -s $@ ] || rm -f $@' -+ @echo "generating dependency information for $<" -+ @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ -+ | sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \ -+ [ -s $@ ] || rm -f $@' - - ## Versioned libraries rules - - %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) -- $(RM) $@ && ln -s ${(preferenceSorting.elementAt(psIndex)); -+ UnicodeString item = *static_cast(preferenceSorting.elementAt(psIndex)); - // TODO: Since preferenceSorting was originally populated from the contents of a UnicodeSet, - // is it even possible for duplicates to show up in this check? - if (labelSet.contains(item)) { -@@ -240,7 +240,7 @@ - int32_t count = 0; - int32_t old = -1; - for (int32_t srcIndex=0; srcIndexsize(); srcIndex++) { -- const UnicodeString *str = static_cast(labels_->elementAt(srcIndex)); -+ const UnicodeString *str = static_cast(labels_->elementAt(srcIndex)); - ++count; - const int32_t bump = count * maxLabelCount_ / size; - if (bump == old) { -@@ -528,7 +528,7 @@ - const UnicodeString &AlphabeticIndex::getOverflowComparisonString(const UnicodeString &lowerLimit, UErrorCode &/*status*/) { - for (int32_t i=0; isize(); i++) { - const UnicodeString *s = -- static_cast(firstScriptCharacters_->elementAt(i)); -+ const_cast(static_cast(firstScriptCharacters_->elementAt(i))); - if (collator_->compare(*s, lowerLimit) > 0) { - return *s; - } -@@ -735,8 +735,10 @@ - sortCollateComparator(const void *context, const void *left, const void *right) { - const UHashTok *leftTok = static_cast(left); - const UHashTok *rightTok = static_cast(right); -- const UnicodeString *leftString = static_cast(leftTok->pointer); -- const UnicodeString *rightString = static_cast(rightTok->pointer); -+ const UnicodeString *leftString -+ = const_cast(static_cast(leftTok->pointer)); -+ const UnicodeString *rightString -+ = const_cast(static_cast(rightTok->pointer)); - const Collator *col = static_cast(context); - - if (leftString == rightString) { -@@ -760,8 +762,10 @@ - recordCompareFn(const void *context, const void *left, const void *right) { - const UHashTok *leftTok = static_cast(left); - const UHashTok *rightTok = static_cast(right); -- const AlphabeticIndex::Record *leftRec = static_cast(leftTok->pointer); -- const AlphabeticIndex::Record *rightRec = static_cast(rightTok->pointer); -+ const AlphabeticIndex::Record *leftRec -+ = const_cast(static_cast(leftTok->pointer)); -+ const AlphabeticIndex::Record *rightRec -+ = const_cast(static_cast(rightTok->pointer)); - const Collator *col = static_cast(context); - - Collator::EComparisonResult r = col->compare(leftRec->sortingName_, rightRec->sortingName_); -@@ -1087,8 +1091,8 @@ - PreferenceComparator(const void *context, const void *left, const void *right) { - const UHashTok *leftTok = static_cast(left); - const UHashTok *rightTok = static_cast(right); -- const UnicodeString *s1 = static_cast(leftTok->pointer); -- const UnicodeString *s2 = static_cast(rightTok->pointer); -+ const UnicodeString *s1 = const_cast(static_cast(leftTok->pointer)); -+ const UnicodeString *s2 = const_cast(static_cast(rightTok->pointer)); - UErrorCode &status = *(UErrorCode *)(context); // Cast off both static and const. - if (s1 == s2) { - return 0; -diff -ruN icu/source/i18n/currfmt.h icu-haiku/source/i18n/currfmt.h ---- icu/source/i18n/currfmt.h 2011-07-19 23:16:00.058720256 +0200 -+++ icu-haiku/source/i18n/currfmt.h 2011-08-19 15:46:55.293339136 +0200 -@@ -63,7 +63,9 @@ - virtual Format* clone() const; - - -+#if (__GNUC__ > 2) - using MeasureFormat::format; -+#endif - - /** - * Override Format API. -diff -ruN icu/source/i18n/digitlst.cpp icu-haiku/source/i18n/digitlst.cpp ---- icu/source/i18n/digitlst.cpp 2011-07-19 23:16:00.050593792 +0200 -+++ icu-haiku/source/i18n/digitlst.cpp 2011-08-19 15:46:55.295698432 +0200 -@@ -37,7 +37,9 @@ - #include - #include - #include -+#if (__GNUC__ > 2) - #include -+#endif - - // *************************************************************************** - // class DigitList -@@ -423,11 +425,15 @@ - nonConstThis->fDouble /= -1; - } - } else if (isInfinite()) { -+#if (__GNUC__ > 2) - if (std::numeric_limits::has_infinity) { - nonConstThis->fDouble = std::numeric_limits::infinity(); - } else { - nonConstThis->fDouble = std::numeric_limits::max(); - } -+#else -+ nonConstThis->fDouble = DBL_MAX; -+#endif - if (!isPositive()) { - nonConstThis->fDouble = -fDouble; - } -diff -ruN icu/source/i18n/reldtfmt.h icu-haiku/source/i18n/reldtfmt.h ---- icu/source/i18n/reldtfmt.h 2011-07-19 23:16:06.034078720 +0200 -+++ icu-haiku/source/i18n/reldtfmt.h 2011-08-19 15:46:55.297533440 +0200 -@@ -79,7 +79,9 @@ - virtual UBool operator==(const Format& other) const; - - -+#if (__GNUC__ > 2) - using DateFormat::format; -+#endif - - /** - * Format a date or time, which is the standard millis since 24:00 GMT, Jan -diff -ruN icu/source/i18n/unicode/alphaindex.h icu-haiku/source/i18n/unicode/alphaindex.h ---- icu/source/i18n/unicode/alphaindex.h 2011-07-19 23:15:52.042467328 +0200 -+++ icu-haiku/source/i18n/unicode/alphaindex.h 2011-08-19 15:46:55.344719360 +0200 -@@ -588,6 +588,9 @@ - Record(AlphabeticIndex *alphaIndex, const UnicodeString &name, const void *data); - ~Record(); - }; -+#if (__GNUC__ == 2) -+ friend struct Record; -+#endif - - /** - * Holds all user records before they are distributed into buckets. -diff -ruN icu/source/i18n/unicode/choicfmt.h icu-haiku/source/i18n/unicode/choicfmt.h ---- icu/source/i18n/unicode/choicfmt.h 2011-07-19 23:15:52.038797312 +0200 -+++ icu-haiku/source/i18n/unicode/choicfmt.h 2011-08-19 15:46:55.300154880 +0200 -@@ -352,7 +352,9 @@ - virtual const UnicodeString* getFormats(int32_t& count) const; - - -+#if (__GNUC__ > 2) - using NumberFormat::format; -+#endif - - /** - * Formats a double number using this object's choices. -diff -ruN icu/source/i18n/unicode/datefmt.h icu-haiku/source/i18n/unicode/datefmt.h ---- icu/source/i18n/unicode/datefmt.h 2011-07-19 23:15:52.035389440 +0200 -+++ icu-haiku/source/i18n/unicode/datefmt.h 2011-08-19 15:46:55.302514176 +0200 -@@ -212,7 +212,9 @@ - virtual UBool operator==(const Format&) const; - - -+#if (__GNUC__ > 2) - using Format::format; -+#endif - - /** - * Format an object to produce a string. This method handles Formattable -diff -ruN icu/source/i18n/unicode/decimfmt.h icu-haiku/source/i18n/unicode/decimfmt.h ---- icu/source/i18n/unicode/decimfmt.h 2011-07-19 23:15:54.040370176 +0200 -+++ icu-haiku/source/i18n/unicode/decimfmt.h 2011-08-19 15:46:55.305397760 +0200 -@@ -834,7 +834,16 @@ - virtual UBool operator==(const Format& other) const; - - -+#if (__GNUC__ > 2) - using NumberFormat::format; -+#else -+ virtual UnicodeString& format(const Formattable& obj, -+ UnicodeString& appendTo, -+ FieldPositionIterator* posIter, -+ UErrorCode& status) const { -+ return NumberFormat::format(obj, appendTo, posIter, status); -+ } -+#endif - - /** - * Format a double or long number using base-10 representation. -diff -ruN icu/source/i18n/unicode/dtitvfmt.h icu-haiku/source/i18n/unicode/dtitvfmt.h ---- icu/source/i18n/unicode/dtitvfmt.h 2011-07-19 23:15:54.042467328 +0200 -+++ icu-haiku/source/i18n/unicode/dtitvfmt.h 2011-08-19 15:46:55.307757056 +0200 -@@ -363,7 +363,9 @@ - UBool operator!=(const Format& other) const; - - -+#if (__GNUC__ > 2) - using Format::format; -+#endif - - /** - * Format an object to produce a string. This method handles Formattable -diff -ruN icu/source/i18n/unicode/msgfmt.h icu-haiku/source/i18n/unicode/msgfmt.h ---- icu/source/i18n/unicode/msgfmt.h 2011-07-19 23:15:54.041156608 +0200 -+++ icu-haiku/source/i18n/unicode/msgfmt.h 2011-08-19 15:46:55.310116352 +0200 -@@ -615,7 +615,9 @@ - virtual const Format** getFormats(int32_t& count) const; - - -+#if (__GNUC__ > 2) - using Format::format; -+#endif - - /** - * Formats the given array of arguments into a user-readable string. -diff -ruN icu/source/i18n/unicode/numfmt.h icu-haiku/source/i18n/unicode/numfmt.h ---- icu/source/i18n/unicode/numfmt.h 2011-07-19 23:15:54.039059456 +0200 -+++ icu-haiku/source/i18n/unicode/numfmt.h 2011-08-19 15:46:55.312213504 +0200 -@@ -212,8 +212,9 @@ - */ - virtual UBool operator==(const Format& other) const; - -- -+#if (__GNUC__ > 2) - using Format::format; -+#endif - - /** - * Format an object to produce a string. This method handles -diff -ruN icu/source/i18n/unicode/plurfmt.h icu-haiku/source/i18n/unicode/plurfmt.h ---- icu/source/i18n/unicode/plurfmt.h 2011-07-19 23:15:52.044040192 +0200 -+++ icu-haiku/source/i18n/unicode/plurfmt.h 2011-08-19 15:46:55.314310656 +0200 -@@ -281,7 +281,9 @@ - void applyPattern(const UnicodeString& pattern, UErrorCode& status); - - -+#if (__GNUC__ > 2) - using Format::format; -+#endif - - /** - * Formats a plural message for a given number. -diff -ruN icu/source/i18n/unicode/rbnf.h icu-haiku/source/i18n/unicode/rbnf.h ---- icu/source/i18n/unicode/rbnf.h 2011-07-19 23:15:54.034340864 +0200 -+++ icu-haiku/source/i18n/unicode/rbnf.h 2011-08-19 15:46:55.316932096 +0200 -@@ -722,7 +722,9 @@ - const Locale& locale = Locale::getDefault()); - - -+#if (__GNUC__ > 2) - using NumberFormat::format; -+#endif - - /** - * Formats the specified 32-bit number using the default ruleset. -diff -ruN icu/source/i18n/unicode/selfmt.h icu-haiku/source/i18n/unicode/selfmt.h ---- icu/source/i18n/unicode/selfmt.h 2011-07-19 23:15:52.042991616 +0200 -+++ icu-haiku/source/i18n/unicode/selfmt.h 2011-08-19 15:46:55.318767104 +0200 -@@ -219,7 +219,9 @@ - void applyPattern(const UnicodeString& pattern, UErrorCode& status); - - -+#if (__GNUC__ > 2) - using Format::format; -+#endif - - /** - * Selects the phrase for the given keyword -diff -ruN icu/source/i18n/unicode/smpdtfmt.h icu-haiku/source/i18n/unicode/smpdtfmt.h ---- icu/source/i18n/unicode/smpdtfmt.h 2011-07-19 23:15:52.035127296 +0200 -+++ icu-haiku/source/i18n/unicode/smpdtfmt.h 2011-08-19 15:46:55.321126400 +0200 -@@ -369,7 +369,9 @@ - virtual UBool operator==(const Format& other) const; - - -+#if (__GNUC__ > 2) - using DateFormat::format; -+#endif - - /** - * Format a date or time, which is the standard millis since 24:00 GMT, Jan -diff -ruN icu/source/i18n/unicode/tmutfmt.h icu-haiku/source/i18n/unicode/tmutfmt.h ---- icu/source/i18n/unicode/tmutfmt.h 2011-07-19 23:15:54.039583744 +0200 -+++ icu-haiku/source/i18n/unicode/tmutfmt.h 2011-08-19 15:46:55.322961408 +0200 -@@ -162,7 +162,16 @@ - void setNumberFormat(const NumberFormat& format, UErrorCode& status); - - -+#if (__GNUC__ > 2) - using MeasureFormat::format; -+#else -+ virtual UnicodeString& format(const Formattable& obj, -+ UnicodeString& appendTo, -+ FieldPositionIterator* posIter, -+ UErrorCode& status) const { -+ return MeasureFormat::format(obj, appendTo, posIter, status); -+ } -+#endif - - /** - * Format a TimeUnitAmount. -diff -ruN icu/source/tools/pkgdata/pkgdata.cpp icu-haiku/source/tools/pkgdata/pkgdata.cpp ---- icu/source/tools/pkgdata/pkgdata.cpp 2011-07-19 23:16:36.003670016 +0200 -+++ icu-haiku/source/tools/pkgdata/pkgdata.cpp 2011-08-19 15:46:55.326107136 +0200 -@@ -476,7 +476,7 @@ - - static int runCommand(const char* command, UBool specialHandling) { - char *cmd = NULL; -- char cmdBuffer[SMALL_BUFFER_MAX_SIZE]; -+ char cmdBuffer[64000]; - int32_t len = strlen(command); - - if (len == 0) { From bc5c232ac01b90b8dc5b30e2a52dbb785bfda59a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 2 May 2013 15:19:55 +0200 Subject: [PATCH 192/587] Convert ctags recipe to an actual recipe --- dev-util/ctags/ctags-5.8.recipe | 44 ++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe index d00ceb3ff..37a000d72 100644 --- a/dev-util/ctags/ctags-5.8.recipe +++ b/dev-util/ctags/ctags-5.8.recipe @@ -1,24 +1,40 @@ -DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors" +SUMMARY="Exuberant Ctags 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" SRC_URI="http://prdownloads.sourceforge.net/ctags/ctags-5.8.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="c00f82ecdcc357434731913e5b48630d" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + ctags = $portVersion compat >= 5.8 + cmd:ctags = $portVersion compat >= 5.8 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + $REQUIRES + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd ctags-5.8 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd ctags-5.8 - make install prefix=${DESTDIR}`finddir B_COMMON_DIRECTORY` \ - mandir=${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + make install } - -LICENSE="GNU GPL v2" -COPYRIGHT="1996-2009, Darren Hiebert" From f515381e11e1afb7c97186137ba385e54921342f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 2 May 2013 15:39:39 +0200 Subject: [PATCH 193/587] Convert cdrtools 3.01a07 recipe to an actual recipe --- app-cdr/cdrtools/cdrtools-3.01a07.recipe | 29 ---- app-cdr/cdrtools/cdrtools-3.01~a07.recipe | 154 ++++++++++++++++++ ...-3.01a07.patch => cdrtools-3.01~a07.patch} | 0 3 files changed, 154 insertions(+), 29 deletions(-) delete mode 100644 app-cdr/cdrtools/cdrtools-3.01a07.recipe create mode 100644 app-cdr/cdrtools/cdrtools-3.01~a07.recipe rename app-cdr/cdrtools/patches/{cdrtools-3.01a07.patch => cdrtools-3.01~a07.patch} (100%) diff --git a/app-cdr/cdrtools/cdrtools-3.01a07.recipe b/app-cdr/cdrtools/cdrtools-3.01a07.recipe deleted file mode 100644 index f2b262ee7..000000000 --- a/app-cdr/cdrtools/cdrtools-3.01a07.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de" -SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a07.tar.bz2" -CHECKSUM_MD5="266bae8db7d1e5473555b48c306aa216" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd cdrtools-3.01 - sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc - sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype - sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/readme.mk - sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* - sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/R* - sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/R* - sed -i 's/share\/doc\//documentation\/doc\//g' libparanoia/R* - sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* - sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/r* - sed -i 's/sbin\/rscsi/ bin\/rscsi/g' pkgdefs/CSW/CSWcdrtools/prototype - sed -i 's/sbin/bin/' rscsi/Makefile - make GMAKE_NOWARN=true -} - -INSTALL() -{ - cd cdrtools-3.01 - make GMAKE_NOWARN=true DEFMANBASE=documentation install -} diff --git a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe new file mode 100644 index 000000000..a4c00ceaa --- /dev/null +++ b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe @@ -0,0 +1,154 @@ +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. + +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 + " +HOMEPAGE="http://cdrecord.berlios.de" +COPYRIGHT=" + 1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs) + 1995-2012 J. Schilling (cdrecord) + " +LICENSE=" + GNU GPL v2 + CDDL v1 + " +SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a07.tar.bz2" +CHECKSUM_MD5="266bae8db7d1e5473555b48c306aa216" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES='cdrtools-3.01~a07.patch' + +PROVIDES=" + cdrtools = $portVersion compat >= 3 + cmd:devdump = $portVersion compat >= 3 + cmd:rscsi = $portVersion compat >= 3 + cmd:scgcheck = $portVersion compat >= 3 + cmd:mkisofs = $portVersion compat >= 3 + cmd:btcflash = $portVersion compat >= 3 + cmd:scgskeleton = $portVersion compat >= 3 + cmd:isovfy = $portVersion compat >= 3 + cmd:readcd = $portVersion compat >= 3 + cmd:isodebug = $portVersion compat >= 3 + cmd:cdda2mp3 = $portVersion compat >= 3 + cmd:cdda2ogg = $portVersion compat >= 3 + cmd:cdda2wav = $portVersion compat >= 3 + cmd:mkhybrid = $portVersion compat >= 3 + cmd:cdrecord = $portVersion compat >= 3 + cmd:isodump = $portVersion compat >= 3 + cmd:isoinfo = $portVersion compat >= 3 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + $REQUIRES + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="cdrtools-3.01" + +patchInsdir() +{ + # Usage: patchInsdir ... + oldDir=$1 + newDir=$2 + shift 2 + + sed -i "s,^INSDIR=\s*$oldDir,INSDIR= $newDir," $@ +} + +PATCH() +{ + allMakefiles="$(find . -name Makefile\*) $(find . -name \*.mk)" + + patchInsdir bin $relativeBinDir $allMakefiles + patchInsdir sbin $relativeBinDir $allMakefiles + patchInsdir share/doc $relativeDocDir $allMakefiles + patchInsdir include $relativeIncludeDir $allMakefiles + patchInsdir lib $relativeLibDir $allMakefiles + patchInsdir etc/default settings $allMakefiles + + sed -i "s,/etc/default,$sysconfDir," \ + btcflash/btcflash.1 \ + cdda2wav/cdda2mp3 \ + cdda2wav/cdda2ogg \ + cdda2wav/cdda2*.1 \ + cdrecord/COPYING \ + cdrecord/README.* \ + cdrecord/auinfo.c \ + cdrecord/cdrecord.1 \ + doc/*.man \ + doc/*.ps \ + include/schily/deflts.h \ + libcdrdeflt/cdrdeflt.c \ + libcdrdeflt/cdrdeflt.h \ + mkisofs/diag/isoinfo.8 \ + readcd/readcd.1 \ + rscsi/rscsi.1 \ + rscsi/rscsi.c \ + scgskeleton/scgskeleton.1 +} + +BUILD() +{ + make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \ + RUNPATH="" DEFMANBASE=$relativeDocumentationDir + # not multi-job safe +} + +INSTALL() +{ + make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \ + RUNPATH="" DEFMANBASE=$relativeDocumentationDir install + + # The whole lib folder only contains static libraries (even in several + # subdirectories). + mkdir -p $developLibDir + mv $libDir/* $developLibDir/ + rmdir $libDir + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The development files for the cdrtools" +PROVIDES_devel=" + cdrtools_devel = $portVersion + lib:libcdrdeflt = $portVersion compat >= 3 + lib:libedc_ecc = $portVersion compat >= 3 + lib:libedc_ecc_dec = $portVersion compat >= 3 + lib:libdeflt = $portVersion compat >= 3 + lib:libfile = $portVersion compat >= 3 + lib:libfind = $portVersion compat >= 3 + lib:libhfs = $portVersion compat >= 3 + lib:libmdigest = $portVersion compat >= 3 + lib:libparanoia = $portVersion compat >= 3 + lib:librscg = $portVersion compat >= 3 + lib:libscg = $portVersion compat >= 3 + lib:libsiconv = $portVersion compat >= 3 + lib:libscgcmd = $portVersion compat >= 3 + lib:libschily = $portVersion compat >= 3 + " +REQUIRES_devel=" + cdrtools == $portVersion + " diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01a07.patch b/app-cdr/cdrtools/patches/cdrtools-3.01~a07.patch similarity index 100% rename from app-cdr/cdrtools/patches/cdrtools-3.01a07.patch rename to app-cdr/cdrtools/patches/cdrtools-3.01~a07.patch From b66031ce687d71caa84ab84bb929fba8c599322b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 2 May 2013 15:41:23 +0200 Subject: [PATCH 194/587] Remove old cdrtools non-recipes and patches --- app-cdr/cdrtools/cdrtools-2.01.01a66.recipe | 19 ----------- app-cdr/cdrtools/cdrtools-2.01.01a77.recipe | 18 ---------- app-cdr/cdrtools/cdrtools-3.00.recipe | 18 ---------- app-cdr/cdrtools/cdrtools-3.01a01.recipe | 29 ---------------- app-cdr/cdrtools/cdrtools-3.01a06.recipe | 29 ---------------- .../cdrtools.OptionalPackageDescription | 12 ------- .../patches/cdrtools-2.01.01a66.patch | 33 ------------------- .../patches/cdrtools-2.01.01a77.patch | 33 ------------------- app-cdr/cdrtools/patches/cdrtools-3.00.patch | 33 ------------------- .../cdrtools/patches/cdrtools-3.01a01.patch | 23 ------------- .../cdrtools/patches/cdrtools-3.01a06.patch | 23 ------------- 11 files changed, 270 deletions(-) delete mode 100644 app-cdr/cdrtools/cdrtools-2.01.01a66.recipe delete mode 100644 app-cdr/cdrtools/cdrtools-2.01.01a77.recipe delete mode 100644 app-cdr/cdrtools/cdrtools-3.00.recipe delete mode 100644 app-cdr/cdrtools/cdrtools-3.01a01.recipe delete mode 100644 app-cdr/cdrtools/cdrtools-3.01a06.recipe delete mode 100644 app-cdr/cdrtools/cdrtools.OptionalPackageDescription delete mode 100644 app-cdr/cdrtools/patches/cdrtools-2.01.01a66.patch delete mode 100644 app-cdr/cdrtools/patches/cdrtools-2.01.01a77.patch delete mode 100644 app-cdr/cdrtools/patches/cdrtools-3.00.patch delete mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01a01.patch delete mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01a06.patch diff --git a/app-cdr/cdrtools/cdrtools-2.01.01a66.recipe b/app-cdr/cdrtools/cdrtools-2.01.01a66.recipe deleted file mode 100644 index ae598c583..000000000 --- a/app-cdr/cdrtools/cdrtools-2.01.01a66.recipe +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de" -SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-2.01.01a66.tar.gz" -CHECKSUM_MD5="b9d40bddf1ce75989d0a36b939f0c3fb" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd cdrtools-2.01.01 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd cdrtools-2.01.01 - make install -} diff --git a/app-cdr/cdrtools/cdrtools-2.01.01a77.recipe b/app-cdr/cdrtools/cdrtools-2.01.01a77.recipe deleted file mode 100644 index 10b69724c..000000000 --- a/app-cdr/cdrtools/cdrtools-2.01.01a77.recipe +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de" -SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-2.01.01a77.tar.gz" -CHECKSUM_MD5="d0b4c56f1215be636996b8e1e3d2b284" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd cdrtools-2.01.01 - make -} - -INSTALL() -{ - cd cdrtools-2.01.01 - make install -} diff --git a/app-cdr/cdrtools/cdrtools-3.00.recipe b/app-cdr/cdrtools/cdrtools-3.00.recipe deleted file mode 100644 index a3692e607..000000000 --- a/app-cdr/cdrtools/cdrtools-3.00.recipe +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de" -SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/cdrtools-3.00.tar.bz2" -CHECKSUM_MD5="f9fbab08fbd458b0d2312976d8c5f558" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd cdrtools-3.00 - make GMAKE_NOWARN=true -} - -INSTALL() -{ - cd cdrtools-3.00 - make install -} diff --git a/app-cdr/cdrtools/cdrtools-3.01a01.recipe b/app-cdr/cdrtools/cdrtools-3.01a01.recipe deleted file mode 100644 index e85e084c7..000000000 --- a/app-cdr/cdrtools/cdrtools-3.01a01.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de" -SRC_URI="http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a01.tar.bz2" -CHECKSUM_MD5="6c81803b1e2bedefc1ad75fabd1c8474" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd cdrtools-3.01 - sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc - sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype - sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/readme.mk - sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* - sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/R* - sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/R* - sed -i 's/share\/doc\//documentation\/doc\//g' libparanoia/R* - sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* - sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/r* - sed -i 's/sbin\/rscsi/ bin\/rscsi/g' pkgdefs/CSW/CSWcdrtools/prototype - sed -i 's/sbin/bin/' rscsi/Makefile - make GMAKE_NOWARN=true -} - -INSTALL() -{ - cd cdrtools-3.01 - make GMAKE_NOWARN=true DEFMANBASE=documentation install -} diff --git a/app-cdr/cdrtools/cdrtools-3.01a06.recipe b/app-cdr/cdrtools/cdrtools-3.01a06.recipe deleted file mode 100644 index f9baf6c61..000000000 --- a/app-cdr/cdrtools/cdrtools-3.01a06.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="cdrtools - A set of tools for CD/DVD reading and recording, including cdrecord" -HOMEPAGE="http://cdrecord.berlios.de" -SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a06.tar.bz2" -CHECKSUM_MD5="00b6c2128023186e712cf27e629ed246" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd cdrtools-3.01 - sed -i 's/share\/doc\//documentation\/doc\//g' rscsi/Makefile.doc - sed -i 's/share\/doc\//documentation\/doc\//g' pkgdefs/CSW/CSWcdrtools/prototype - sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/readme.mk - sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* - sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/R* - sed -i 's/share\/doc\//documentation\/doc\//g' mkisofs/R* - sed -i 's/share\/doc\//documentation\/doc\//g' libparanoia/R* - sed -i 's/share\/doc\//documentation\/doc\//g' cdda2wav/M* - sed -i 's/share\/doc\//documentation\/doc\//g' cdrecord/r* - sed -i 's/sbin\/rscsi/ bin\/rscsi/g' pkgdefs/CSW/CSWcdrtools/prototype - sed -i 's/sbin/bin/' rscsi/Makefile - make GMAKE_NOWARN=true -} - -INSTALL() -{ - cd cdrtools-3.01 - make GMAKE_NOWARN=true DEFMANBASE=documentation install -} diff --git a/app-cdr/cdrtools/cdrtools.OptionalPackageDescription b/app-cdr/cdrtools/cdrtools.OptionalPackageDescription deleted file mode 100644 index ff1ba9702..000000000 --- a/app-cdr/cdrtools/cdrtools.OptionalPackageDescription +++ /dev/null @@ -1,12 +0,0 @@ -Package: cdrecord -Version: 3.00 -Copyright: 1995-2010 J. Schilling -License: CDDL v1 -URL: http://cdrecord.berlios.de - -Package: mkisofs -Version: 3.00 -Copyright: 1993-1997 Eric Youngdale, 1997-2010 J. Schilling -License: GNU GPL v2 -License: CDDL v1 -URL: http://cdrecord.berlios.de diff --git a/app-cdr/cdrtools/patches/cdrtools-2.01.01a66.patch b/app-cdr/cdrtools/patches/cdrtools-2.01.01a66.patch deleted file mode 100644 index 24ac6871c..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-2.01.01a66.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN cdrtools-2.01.01/DEFAULTS/Defaults.haiku cdrtools-2.01.01-haiku/DEFAULTS/Defaults.haiku ---- cdrtools-2.01.01/DEFAULTS/Defaults.haiku 2009-07-25 15:36:53.000000000 +0000 -+++ cdrtools-2.01.01-haiku/DEFAULTS/Defaults.haiku 2009-10-12 04:53:52.000000000 +0000 -@@ -1,7 +1,7 @@ --#ident "@(#)Defaults.haiku 1.3 09/07/25 " -+#ident "@(#)Defaults.beos 1.5 09/06/04 " - ########################################################################### - # --# global definitions for Haiku Systems -+# global definitions for BeOS Systems - # - ########################################################################### - # -@@ -29,16 +29,16 @@ - CWARNOPTS= - - DEFINCDIRS= $(SRCROOT)/include --LDPATH= -L/opt/schily/lib -+LDPATH= -L$(shell finddir B_APPS_DIRECTORY)/cdrtools/lib - #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) --RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -+RUNPATH= -R$(INS_BASE)/lib - - ########################################################################### - # - # Installation config stuff - # - ########################################################################### --INS_BASE= /boot/opt/schily -+INS_BASE= $(shell finddir B_APPS_DIRECTORY)/cdrtools - INS_KBASE= / - INS_RBASE= / - # diff --git a/app-cdr/cdrtools/patches/cdrtools-2.01.01a77.patch b/app-cdr/cdrtools/patches/cdrtools-2.01.01a77.patch deleted file mode 100644 index 24ac6871c..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-2.01.01a77.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN cdrtools-2.01.01/DEFAULTS/Defaults.haiku cdrtools-2.01.01-haiku/DEFAULTS/Defaults.haiku ---- cdrtools-2.01.01/DEFAULTS/Defaults.haiku 2009-07-25 15:36:53.000000000 +0000 -+++ cdrtools-2.01.01-haiku/DEFAULTS/Defaults.haiku 2009-10-12 04:53:52.000000000 +0000 -@@ -1,7 +1,7 @@ --#ident "@(#)Defaults.haiku 1.3 09/07/25 " -+#ident "@(#)Defaults.beos 1.5 09/06/04 " - ########################################################################### - # --# global definitions for Haiku Systems -+# global definitions for BeOS Systems - # - ########################################################################### - # -@@ -29,16 +29,16 @@ - CWARNOPTS= - - DEFINCDIRS= $(SRCROOT)/include --LDPATH= -L/opt/schily/lib -+LDPATH= -L$(shell finddir B_APPS_DIRECTORY)/cdrtools/lib - #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) --RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -+RUNPATH= -R$(INS_BASE)/lib - - ########################################################################### - # - # Installation config stuff - # - ########################################################################### --INS_BASE= /boot/opt/schily -+INS_BASE= $(shell finddir B_APPS_DIRECTORY)/cdrtools - INS_KBASE= / - INS_RBASE= / - # diff --git a/app-cdr/cdrtools/patches/cdrtools-3.00.patch b/app-cdr/cdrtools/patches/cdrtools-3.00.patch deleted file mode 100644 index 3c6a198ac..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-3.00.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -urN cdrtools-3.00/DEFAULTS/Defaults.haiku cdrtools-3.00-haiku/DEFAULTS/Defaults.haiku ---- cdrtools-3.00/DEFAULTS/Defaults.haiku 2009-07-25 15:36:53.000000000 +0000 -+++ cdrtools-3.00-haiku/DEFAULTS/Defaults.haiku 2009-10-12 04:53:52.000000000 +0000 -@@ -1,7 +1,7 @@ --#ident "@(#)Defaults.haiku 1.3 09/07/25 " -+#ident "@(#)Defaults.beos 1.5 09/06/04 " - ########################################################################### - # --# global definitions for Haiku Systems -+# global definitions for BeOS Systems - # - ########################################################################### - # -@@ -29,16 +29,16 @@ - CWARNOPTS= - - DEFINCDIRS= $(SRCROOT)/include --LDPATH= -L/opt/schily/lib -+LDPATH= -L$(shell finddir B_COMMON_LIB_DIRECTORY) - #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) --RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -+RUNPATH= -R$(INS_BASE)/lib - - ########################################################################### - # - # Installation config stuff - # - ########################################################################### --INS_BASE= /boot/opt/schily -+INS_BASE= $(shell finddir B_COMMON_DIRECTORY) - INS_KBASE= / - INS_RBASE= / - # diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01a01.patch b/app-cdr/cdrtools/patches/cdrtools-3.01a01.patch deleted file mode 100644 index b7cdc050f..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-3.01a01.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku ---- cdrtools-3.01/DEFAULTS/Defaults.haiku -+++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku -@@ -29,16 +29,16 @@ - CWARNOPTS= - - DEFINCDIRS= $(SRCROOT)/include --LDPATH= -L/opt/schily/lib -+LDPATH= -L$(shell finddir B_COMMON_LIB_DIRECTORY) - #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) --RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -+RUNPATH= -R$(INS_BASE)/lib - - ########################################################################### - # - # Installation config stuff - # - ########################################################################### --INS_BASE= /boot/opt/schily -+INS_BASE= $(shell finddir B_COMMON_DIRECTORY) - INS_KBASE= / - INS_RBASE= / - # diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01a06.patch b/app-cdr/cdrtools/patches/cdrtools-3.01a06.patch deleted file mode 100644 index b7cdc050f..000000000 --- a/app-cdr/cdrtools/patches/cdrtools-3.01a06.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku ---- cdrtools-3.01/DEFAULTS/Defaults.haiku -+++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku -@@ -29,16 +29,16 @@ - CWARNOPTS= - - DEFINCDIRS= $(SRCROOT)/include --LDPATH= -L/opt/schily/lib -+LDPATH= -L$(shell finddir B_COMMON_LIB_DIRECTORY) - #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) --RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -+RUNPATH= -R$(INS_BASE)/lib - - ########################################################################### - # - # Installation config stuff - # - ########################################################################### --INS_BASE= /boot/opt/schily -+INS_BASE= $(shell finddir B_COMMON_DIRECTORY) - INS_KBASE= / - INS_RBASE= / - # From b537b4b7a6128f48dc02534fd662c5dd38298ced Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 2 May 2013 17:13:47 +0200 Subject: [PATCH 195/587] Create recipe for keymapswitcher 1.2.7.9 ... based on 1.2.7 non-recipe. Due to some changes in Haiku the recipe needs to be updated once the Haiku PM branch has been synchronized with the master. --- .../keymapswitcher-1.2.7.9.recipe | 68 +++++++++++++++++++ .../keymapswitcher-1.2.7.recipe | 22 ------ 2 files changed, 68 insertions(+), 22 deletions(-) create mode 100644 haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe delete mode 100644 haiku-apps/keymapswitcher/keymapswitcher-1.2.7.recipe diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe new file mode 100644 index 000000000..a4f9de944 --- /dev/null +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe @@ -0,0 +1,68 @@ +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)." +HOMEPAGE="http://www.sf.net/projects/switcher" +COPYRIGHT="1999-2003 Stas Maximov" +LICENSE="BSD (4-clause)" +SRC_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher\(haiku\)#release_1_2_7_9" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + keymapswitcher = $portVersion compat >= 1.2.7 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + $REQUIRES + cmd:gcc + cmd:ld + cmd:make + cmd:mkdepend + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + makefile_engine + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + # TODO: Remove once in Haiku PM is in sync with master! + + # B_TRANSLATION_CONTEXT was formerly known as B_TRANSLATE_CONTEXT. + sed -i "s,B_TRANSLATION_CONTEXT,B_TRANSLATE_CONTEXT," \ + DeskView.cpp \ + KeymapSwitcher.cpp \ + SettingsWindow.cpp + + # add liblocale to libraries to link against + sed -i "s,^\(LIBS=.*\),\1 locale," app.makefile + + # patch away building the bindcatalogs target + sed -i "s,bindcatalogs,," makefile +} + +BUILD() +{ + make $jobArgs BUILDHOME=/boot/common/develop +} + +INSTALL() +{ + # We're not interested in the package, but that target copies the + # interesting files to a well-known directory structure. Otherwise we'd have + # to find out the name of the object dir and collect everything ourselves. + # Obviously an install target would be even better. + make BUILDHOME=/boot/common/develop package + + addOnInstallDir=$addOnsDir/input_server/filters + mkdir -p $addOnInstallDir $preferencesDir + cp -a dist/common/add-ons/input_server/filters/keymap_switcher \ + $addOnInstallDir + cp -a dist/common/bin/KeymapSwitcher $preferencesDir + + # TODO: Also copy the catalogs! + # TODO: Declare the Deskbar menu symlink! +} diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.recipe deleted file mode 100644 index bfc5da984..000000000 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="keymap switcher for Haiku." -HOMEPAGE="http://www.switcher.sourceforge.net" -SRC_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher\(haiku\)" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -#CHECKSUM_MD5="" -BUILD() -{ - cd keymapswitcher-1.2.7 - make -} - -INSTALL() -{ - cd keymapswitcher-1.2.7 - make package - cp dist/*.zip ../.. -} - -COPYRIGHT="1999-2003 Stas Maximov" -LICENSE="BSD (4-clause)" From 5f9045bdbd7a8ce9ebb99c06c9a64342c7c90b3f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 2 May 2013 17:33:36 +0200 Subject: [PATCH 196/587] Update cvs 1.12.13.1 recipe * Longer description (from the homepage). * Add other commands to provides. * Add cmd:nano to requires. Any CLI editor would suffice, so we might want to handle that differently. * Use runConfigure. * Use jobArgs. --- dev-vcs/cvs/cvs-1.12.13.1.recipe | 53 +++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe index 51f245058..6c36b0d41 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.recipe +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -1,36 +1,59 @@ SUMMARY="Concurrent Versions System" -DESCRIPTION="CVS is a version control 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." HOMEPAGE="http://www.nongnu.org/cvs/" +COPYRIGHT="1986-2005 Free Software Foundation, Inc." +LICENSE="GNU GPL v1 + GNU LGPL v2" SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2" CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="cvs = $portVersion compat >= 1.12 - cmd:cvs = $portVersion compat >= 1.12" -REQUIRES="haiku_devel >= $haikuVersion - zlib >= 1.1.4" -BUILD_REQUIRES="" -BUILD_PREREQUIRES="haiku_devel >= $haikuVersion +PATCHES="cvs-1.12.13.1.patch" + +PROVIDES=" + cvs = $portVersion compat >= 1.12 + cmd:cvs = $portVersion compat >= 1.12 + cmd:cvsbug = $portVersion compat >= 1.12 + cmd:rcs2log = $portVersion compat >= 1.12 + " +REQUIRES=" + haiku_devel >= $haikuVersion + cmd:nano + zlib >= 1.1.4 + " +BUILD_REQUIRES=" + $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:libtoolize - cmd:make" + cmd:make + " SOURCE_DIR="$portVersionedName" BUILD() { libtoolize --force --copy --install - ./configure $configureDirArgs --enable-rootcommit - make + runConfigure ./configure --enable-rootcommit + make $jobArgs } INSTALL() { make install } - -LICENSE="GNU GPL v1 - GNU LGPL v2" -COPYRIGHT="1986-2005 Free Software Foundation, Inc." From 4f504b878a33ef1bf944387246590bb5b5adbd9b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 2 May 2013 17:45:41 +0200 Subject: [PATCH 197/587] Remove old cvs non-recipe and patches --- dev-vcs/cvs/cvs-1.12.13.recipe | 29 --------- dev-vcs/cvs/patches/cvs-1.12.13-haiku.diff | 58 ----------------- dev-vcs/cvs/patches/cvs-1.12.13.patch | 75 ---------------------- 3 files changed, 162 deletions(-) delete mode 100644 dev-vcs/cvs/cvs-1.12.13.recipe delete mode 100644 dev-vcs/cvs/patches/cvs-1.12.13-haiku.diff delete mode 100644 dev-vcs/cvs/patches/cvs-1.12.13.patch diff --git a/dev-vcs/cvs/cvs-1.12.13.recipe b/dev-vcs/cvs/cvs-1.12.13.recipe deleted file mode 100644 index 7fc26e23e..000000000 --- a/dev-vcs/cvs/cvs-1.12.13.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="CVS is a version control system" -HOMEPAGE="http://www.nongnu.org/cvs/" -SRC_URI="http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.gz" -CHECKSUM_MD5="7a71a2e7a64973ecf255965956a1d338" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD() -{ - cd cvs-1.12.13 - libtoolize --force --copy --install - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --enable-rootcommit \ - EDITOR=nano - make -} - -INSTALL() -{ - cd cvs-1.12.13 - make install -} -LICENSE="GNU GPL v1 - GNU LGPL v2" -COPYRIGHT="1986-2005 Free Software Foundation, Inc." diff --git a/dev-vcs/cvs/patches/cvs-1.12.13-haiku.diff b/dev-vcs/cvs/patches/cvs-1.12.13-haiku.diff deleted file mode 100644 index d77500487..000000000 --- a/dev-vcs/cvs/patches/cvs-1.12.13-haiku.diff +++ /dev/null @@ -1,58 +0,0 @@ -diff -urN cvs-1.12.13/configure cvs-1.12.13-haiku/configure ---- cvs-1.12.13/configure 2005-10-03 13:36:42.000000000 +0000 -+++ cvs-1.12.13-haiku/configure 2008-09-30 18:38:24.000000000 +0000 -@@ -37138,7 +37138,7 @@ - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "$ac_cv_search_connect" = no; then -- for ac_lib in xnet socket inet; do -+ for ac_lib in xnet socket network inet; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -diff -urN cvs-1.12.13/configure.in cvs-1.12.13-haiku/configure.in ---- cvs-1.12.13/configure.in 2005-10-03 13:34:45.000000000 +0000 -+++ cvs-1.12.13-haiku/configure.in 2008-09-30 18:38:24.000000000 +0000 -@@ -515,7 +515,7 @@ - - # Try to find connect and gethostbyname. - AC_CHECK_LIB(nsl, main) --AC_SEARCH_LIBS(connect, xnet socket inet, -+AC_SEARCH_LIBS(connect, xnet socket network inet, - AC_DEFINE(HAVE_CONNECT, 1, - [Define if you have the connect function.])) - dnl no need to search nsl for gethostbyname here since we should have -diff -urN cvs-1.12.13/lib/getaddrinfo.h cvs-1.12.13-haiku/lib/getaddrinfo.h ---- cvs-1.12.13/lib/getaddrinfo.h 2005-09-08 15:55:53.000000000 +0000 -+++ cvs-1.12.13-haiku/lib/getaddrinfo.h 2008-09-30 19:33:49.000000000 +0000 -@@ -26,7 +26,7 @@ - # include - - # if !HAVE_GETADDRINFO -- -+#ifndef __HAIKU__ - /* Structure to contain information about address of a service provider. */ - struct addrinfo - { -@@ -61,6 +61,8 @@ - # define EAI_ADDRFAMILY -9 /* Address family for NAME not supported. */ - # define EAI_MEMORY -10 /* Memory allocation failure. */ - # define EAI_SYSTEM -11 /* System error returned in `errno'. */ -+#endif -+ - # define EAI_OVERFLOW -12 /* Argument buffer overflow. */ - # ifdef __USE_GNU - # define EAI_INPROGRESS -100 /* Processing request in progress. */ -diff -urN cvs-1.12.13/lib/getpass.c cvs-1.12.13-haiku/lib/getpass.c ---- cvs-1.12.13/lib/getpass.c 2005-09-19 21:12:21.000000000 +0000 -+++ cvs-1.12.13-haiku/lib/getpass.c 2008-09-30 19:53:05.000000000 +0000 -@@ -104,8 +104,9 @@ - else - { - /* We do the locking ourselves. */ -+#ifdef __HAIKU__ - __fsetlocking (tty, FSETLOCKING_BYCALLER); -- -+#endif - out = in = tty; - } diff --git a/dev-vcs/cvs/patches/cvs-1.12.13.patch b/dev-vcs/cvs/patches/cvs-1.12.13.patch deleted file mode 100644 index a128db9c8..000000000 --- a/dev-vcs/cvs/patches/cvs-1.12.13.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -up cvs-1.12.13/configure.in.orig cvs-1.12.13/configure.in ---- cvs-1.12.13/configure.in.orig 2010-04-28 23:59:18.202637312 -0600 -+++ cvs-1.12.13/configure.in 2010-04-29 00:01:51.938999808 -0600 -@@ -515,12 +515,12 @@ CVS_FUNC_PRINTF_PTR - - # Try to find connect and gethostbyname. - AC_CHECK_LIB(nsl, main) --AC_SEARCH_LIBS(connect, xnet socket inet, -+AC_SEARCH_LIBS(connect, xnet socket inet network, - AC_DEFINE(HAVE_CONNECT, 1, - [Define if you have the connect function.])) - dnl no need to search nsl for gethostbyname here since we should have - dnl just added libnsl above if we found it. --AC_SEARCH_LIBS(gethostbyname, netinet) -+AC_SEARCH_LIBS(gethostbyname, netinet network) - - AC_SUBST(cvs_client_objects) - -diff -up cvs-1.12.13/lib/getpass.c.orig cvs-1.12.13/lib/getpass.c ---- cvs-1.12.13/lib/getpass.c.orig 2005-09-19 15:12:21.001835008 -0600 -+++ cvs-1.12.13/lib/getpass.c 2010-04-28 23:55:13.523239424 -0600 -@@ -104,7 +104,7 @@ getpass (const char *prompt) - else - { - /* We do the locking ourselves. */ -- __fsetlocking (tty, FSETLOCKING_BYCALLER); -+// __fsetlocking (tty, FSETLOCKING_BYCALLER); - - out = in = tty; - } -diff -up cvs-1.12.13/lib/stdbool_.h.orig cvs-1.12.13/lib/stdbool_.h ---- cvs-1.12.13/lib/stdbool_.h.orig 2005-05-23 11:44:32.015204352 -0600 -+++ cvs-1.12.13/lib/stdbool_.h 2010-04-28 23:55:13.506724352 -0600 -@@ -55,7 +55,7 @@ - - /* BeOS already #defines false 0, true 1. We use the same - definitions below, but temporarily we have to #undef them. */ --#ifdef __BEOS__ -+#if defined(__BEOS__) && !defined(__HAIKU__) - # include /* defines bool but not _Bool */ - # undef false - # undef true -@@ -70,7 +70,7 @@ - (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' - (see ISO C 99 6.3.1.1.(2)). So we add a negative value to the - enum; this ensures that '_Bool' promotes to 'int'. */ --#if !(defined __cplusplus || defined __BEOS__) -+#if !(defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__)) - # if !@HAVE__BOOL@ - # if defined __SUNPRO_C && (__SUNPRO_C < 0x550 || __STDC__ == 1) - /* Avoid stupid "warning: _Bool is a keyword in ISO C99". */ -diff -up cvs-1.12.13/m4/getaddrinfo.m4.orig cvs-1.12.13/m4/getaddrinfo.m4 ---- cvs-1.12.13/m4/getaddrinfo.m4.orig 2010-04-29 00:00:46.542638080 -0600 -+++ cvs-1.12.13/m4/getaddrinfo.m4 2010-04-29 00:00:53.830996480 -0600 -@@ -6,7 +6,7 @@ dnl with or without modifications, as lo - - AC_DEFUN([gl_GETADDRINFO], - [ -- AC_SEARCH_LIBS(getaddrinfo, nsl socket) -+ AC_SEARCH_LIBS(getaddrinfo, nsl socket network) - AC_REPLACE_FUNCS(getaddrinfo gai_strerror) - gl_PREREQ_GETADDRINFO - ]) -diff -up cvs-1.12.13/src/buffer.c.orig cvs-1.12.13/src/buffer.c ---- cvs-1.12.13/src/buffer.c.orig 2005-10-02 09:17:20.017563648 -0600 -+++ cvs-1.12.13/src/buffer.c 2010-04-28 23:55:13.536084480 -0600 -@@ -2019,7 +2019,7 @@ fd_buffer_block (void *closure, bool blo - && sb.st_uid == devnull.st_uid - && sb.st_gid == devnull.st_gid - && sb.st_size == devnull.st_size -- && sb.st_blocks == devnull.st_blocks -+// && sb.st_blocks == devnull.st_blocks - && sb.st_blksize == devnull.st_blksize); - if (isdevnull) - errno = 0; From 7d4774a6ac350591c96fe89fa2e62b83206cafdb Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 2 May 2013 17:59:20 +0200 Subject: [PATCH 198/587] Convert doxygen 1.6.3 recipe to an actual recipe --- app-doc/doxygen/doxygen-1.6.3.recipe | 61 ++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe index 3711e6e59..6e47795fe 100644 --- a/app-doc/doxygen/doxygen-1.6.3.recipe +++ b/app-doc/doxygen/doxygen-1.6.3.recipe @@ -1,22 +1,59 @@ -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" +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. + +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)." +HOMEPAGE="http://www.doxygen.org" +COPYRIGHT="1997-2010 Dimitri van Heesch" +LICENSE="GNU GPL v2" SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz" CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="doxygen-1.6.3.patch" + +PROVIDES=" + doxygen = $portVersion compat >= 1.6 + cmd:doxygen = $portVersion compat >= 1.6 + cmd:doxytag = $portVersion compat >= 1.6 + " +REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_REQUIRES=" + $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + libiconv + cmd:bison + cmd:flex + cmd:gcc + cmd:ld +# cmd:libtoolize + cmd:make + cmd:perl + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + sed -i "s,MAN1DIR = man/man1,MAN1DIR = $relativeManDir/man1," Makefile.in +} + BUILD() { - cd doxygen-1.6.3 - sed -i 's/MAN1DIR = man\/man1/MAN1DIR = documentation\/man\/man1/' Makefile.in - ./configure --prefix `finddir B_COMMON_DIRECTORY` - make + ./configure --prefix $prefix --docdir $docDir + make $jobArgs } INSTALL() { - cd doxygen-1.6.3 make install } -LICENSE="GNU GPL v2" -COPYRIGHT="1997-2010 Dimitri van Heesch" From 7fba4d965eff697c50d53305a9828090bd113ce4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 2 May 2013 17:59:52 +0200 Subject: [PATCH 199/587] Remove old doxygen non-recipes and patches --- app-doc/doxygen/doxygen-1.6.1.recipe | 21 ---- app-doc/doxygen/doxygen-1.6.2.recipe | 21 ---- app-doc/doxygen/patches/doxygen-1.6.1.patch | 120 -------------------- app-doc/doxygen/patches/doxygen-1.6.2.patch | 120 -------------------- 4 files changed, 282 deletions(-) delete mode 100644 app-doc/doxygen/doxygen-1.6.1.recipe delete mode 100644 app-doc/doxygen/doxygen-1.6.2.recipe delete mode 100644 app-doc/doxygen/patches/doxygen-1.6.1.patch delete mode 100644 app-doc/doxygen/patches/doxygen-1.6.2.patch diff --git a/app-doc/doxygen/doxygen-1.6.1.recipe b/app-doc/doxygen/doxygen-1.6.1.recipe deleted file mode 100644 index 94f3c58ae..000000000 --- a/app-doc/doxygen/doxygen-1.6.1.recipe +++ /dev/null @@ -1,21 +0,0 @@ -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.6.1.src.tar.gz" -CHECKSUM_MD5="2ec343643e134f0d3ce2069420bcb4f0" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd doxygen-1.6.1 - ./configure --prefix /boot/common - make -} - -INSTALL() -{ - cd doxygen-1.6.1 - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1997-2010 Dimitri van Heesch" diff --git a/app-doc/doxygen/doxygen-1.6.2.recipe b/app-doc/doxygen/doxygen-1.6.2.recipe deleted file mode 100644 index 88d2e032d..000000000 --- a/app-doc/doxygen/doxygen-1.6.2.recipe +++ /dev/null @@ -1,21 +0,0 @@ -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.6.2.src.tar.gz" -CHECKSUM_MD5="70260101ef60952cb99484700241c99e" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd doxygen-1.6.2 - ./configure --prefix /boot/common - make -} - -INSTALL() -{ - cd doxygen-1.6.2 - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1997-2010 Dimitri van Heesch" diff --git a/app-doc/doxygen/patches/doxygen-1.6.1.patch b/app-doc/doxygen/patches/doxygen-1.6.1.patch deleted file mode 100644 index 1bf4d37f7..000000000 --- a/app-doc/doxygen/patches/doxygen-1.6.1.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -Naur doxygen-1.6.1/PLATFORMS doxygen-1.6.1-haiku/PLATFORMS ---- doxygen-1.6.1/PLATFORMS 2007-11-24 09:12:35.000000000 -0700 -+++ doxygen-1.6.1-haiku/PLATFORMS 2009-11-07 13:02:41.000000000 -0700 -@@ -4,6 +4,7 @@ - dgux-g++ - freebsd-g++ - gnu-g++ -+haiku-g++ - hpux-acc - hpux-cc - hpux-g++ -diff -Naur doxygen-1.6.1/configure doxygen-1.6.1-haiku/configure ---- doxygen-1.6.1/configure 2009-08-25 03:49:10.000000000 -0600 -+++ doxygen-1.6.1-haiku/configure 2009-11-07 13:01:31.000000000 -0700 -@@ -180,6 +180,9 @@ - f_insttool=/usr/bin/install - fi - ;; -+ Haiku:*) -+ f_platform=haiku-g++ -+ ;; - HP-UX:*) - f_platform=hpux-g++ - if test "$f_insttool" = NO; then -diff -Naur doxygen-1.6.1/qtools/qglobal.h doxygen-1.6.1-haiku/qtools/qglobal.h ---- doxygen-1.6.1/qtools/qglobal.h 2008-12-06 06:16:20.000000000 -0700 -+++ doxygen-1.6.1-haiku/qtools/qglobal.h 2009-11-07 13:09:09.000000000 -0700 -@@ -147,6 +147,8 @@ - #define _OS_CYGWIN_ - #elif defined(__BEOS__) - #define _OS_BEOS_ -+#elif defined(__HAIKU__) -+#define _OS_HAIKU_ - #elif defined(__MINT__) - #define _OS_MINT_ - #else -diff -Naur doxygen-1.6.1/src/doxygen.pro.in doxygen-1.6.1-haiku/src/doxygen.pro.in ---- doxygen-1.6.1/src/doxygen.pro.in 2009-08-02 07:55:02.000000000 -0600 -+++ doxygen-1.6.1-haiku/src/doxygen.pro.in 2009-11-07 13:19:57.000000000 -0700 -@@ -19,6 +19,7 @@ - HEADERS = doxygen.h - SOURCES = main.cpp - unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -+haiku-g++:LIBS += -L/boot/common/lib -liconv - win32:INCLUDEPATH += . - win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 - win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib -diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/app.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/app.t ---- doxygen-1.6.1/tmake/lib/haiku-g++/app.t 1969-12-31 17:00:00.000000000 -0700 -+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/app.t 2009-11-07 13:04:20.000000000 -0700 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/app.t"); -diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/lib.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/lib.t ---- doxygen-1.6.1/tmake/lib/haiku-g++/lib.t 1969-12-31 17:00:00.000000000 -0700 -+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/lib.t 2009-11-07 13:04:20.000000000 -0700 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/lib.t"); -diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/subdirs.t doxygen-1.6.1-haiku/tmake/lib/haiku-g++/subdirs.t ---- doxygen-1.6.1/tmake/lib/haiku-g++/subdirs.t 1969-12-31 17:00:00.000000000 -0700 -+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/subdirs.t 2009-11-07 13:04:20.000000000 -0700 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/subdirs.t"); -diff -Naur doxygen-1.6.1/tmake/lib/haiku-g++/tmake.conf doxygen-1.6.1-haiku/tmake/lib/haiku-g++/tmake.conf ---- doxygen-1.6.1/tmake/lib/haiku-g++/tmake.conf 1969-12-31 17:00:00.000000000 -0700 -+++ doxygen-1.6.1-haiku/tmake/lib/haiku-g++/tmake.conf 2009-11-07 13:09:42.000000000 -0700 -@@ -0,0 +1,51 @@ -+# -+# -+# -+# tmake configuration for haiku-g++ -+# -+ -+TEMPLATE = app -+CONFIG = qt warn_on release -+ -+TMAKE_CC = gcc -+TMAKE_CFLAGS = -+TMAKE_CFLAGS_WARN_ON = -Wall -W -+TMAKE_CFLAGS_WARN_OFF = -+TMAKE_CFLAGS_RELEASE = -+TMAKE_CFLAGS_DEBUG = -g -+TMAKE_CFLAGS_SHLIB = -fPIC -+TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -+ -+TMAKE_CXX = g++ -+TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -+TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -+TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -+TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -+TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -+TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -+TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC -+ -+TMAKE_INCDIR = -+TMAKE_LIBDIR = -+TMAKE_INCDIR_QT = $(QTDIR)/include -+TMAKE_LIBDIR_QT = $(QTDIR)/lib -+ -+TMAKE_LINK = g++ -+TMAKE_LINK_SHLIB = g++ -+TMAKE_LFLAGS = -Wl,-rpath=/lib:$(QTDIR)/lib -+TMAKE_LFLAGS_RELEASE = -+TMAKE_LFLAGS_DEBUG = -+TMAKE_LFLAGS_SHLIB = -shared -+TMAKE_LFLAGS_SONAME = -Wl,-soname, -+ -+TMAKE_LIBS = -+TMAKE_LIBS_QT = -lqt -+TMAKE_LIBS_QT_MT = -lqt-mt -+ -+TMAKE_MOC = moc -+ -+TMAKE_AR = ar cqs -+TMAKE_RANLIB = -+ -+TMAKE_TAR = tar -cf -+TMAKE_GZIP = gzip -9f diff --git a/app-doc/doxygen/patches/doxygen-1.6.2.patch b/app-doc/doxygen/patches/doxygen-1.6.2.patch deleted file mode 100644 index f0692e0bc..000000000 --- a/app-doc/doxygen/patches/doxygen-1.6.2.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -up doxygen-1.6.2/PLATFORMS.orig doxygen-1.6.2/PLATFORMS ---- doxygen-1.6.2/PLATFORMS.orig 2007-11-24 09:12:35.000000000 -0700 -+++ doxygen-1.6.2/PLATFORMS 2010-01-06 17:27:33.000000000 -0700 -@@ -4,6 +4,7 @@ beos-g++ - dgux-g++ - freebsd-g++ - gnu-g++ -+haiku-g++ - hpux-acc - hpux-cc - hpux-g++ -diff -up doxygen-1.6.2/configure.orig doxygen-1.6.2/configure ---- doxygen-1.6.2/configure.orig 2009-12-29 05:57:53.000000000 -0700 -+++ doxygen-1.6.2/configure 2010-01-06 17:27:33.000000000 -0700 -@@ -180,6 +180,9 @@ if test -z "$f_platform"; then - f_insttool=/usr/bin/install - fi - ;; -+ Haiku:*) -+ f_platform=haiku-g++ -+ ;; - HP-UX:*) - f_platform=hpux-g++ - if test "$f_insttool" = NO; then -diff -up doxygen-1.6.2/qtools/qglobal.h.orig doxygen-1.6.2/qtools/qglobal.h ---- doxygen-1.6.2/qtools/qglobal.h.orig 2009-10-25 09:44:29.000000000 -0600 -+++ doxygen-1.6.2/qtools/qglobal.h 2010-01-06 17:27:33.000000000 -0700 -@@ -150,6 +150,8 @@ - #define _OS_CYGWIN_ - #elif defined(__BEOS__) - #define _OS_BEOS_ -+#elif defined(__HAIKU__) -+#define _OS_HAIKU_ - #elif defined(__MINT__) - #define _OS_MINT_ - #else -diff -up doxygen-1.6.2/src/doxygen.pro.in.orig doxygen-1.6.2/src/doxygen.pro.in ---- doxygen-1.6.2/src/doxygen.pro.in.orig 2009-08-02 07:55:02.000000000 -0600 -+++ doxygen-1.6.2/src/doxygen.pro.in 2010-01-06 17:27:33.000000000 -0700 -@@ -19,6 +19,7 @@ CONFIG = console warn_on $extraopt - HEADERS = doxygen.h - SOURCES = main.cpp - unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -+haiku-g++:LIBS += -L/boot/common/lib -liconv - win32:INCLUDEPATH += . - win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 - win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib -diff -up doxygen-1.6.2/tmake/lib/haiku-g++/app.t.orig doxygen-1.6.2/tmake/lib/haiku-g++/app.t ---- doxygen-1.6.2/tmake/lib/haiku-g++/app.t.orig 2010-01-06 17:27:33.000000000 -0700 -+++ doxygen-1.6.2/tmake/lib/haiku-g++/app.t 2010-01-06 17:27:33.000000000 -0700 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/app.t"); -diff -up doxygen-1.6.2/tmake/lib/haiku-g++/lib.t.orig doxygen-1.6.2/tmake/lib/haiku-g++/lib.t ---- doxygen-1.6.2/tmake/lib/haiku-g++/lib.t.orig 2010-01-06 17:27:33.000000000 -0700 -+++ doxygen-1.6.2/tmake/lib/haiku-g++/lib.t 2010-01-06 17:27:33.000000000 -0700 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/lib.t"); -diff -up doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t.orig doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t ---- doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t.orig 2010-01-06 17:27:33.000000000 -0700 -+++ doxygen-1.6.2/tmake/lib/haiku-g++/subdirs.t 2010-01-06 17:27:33.000000000 -0700 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/subdirs.t"); -diff -up doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf ---- doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf.orig 2010-01-06 17:27:33.000000000 -0700 -+++ doxygen-1.6.2/tmake/lib/haiku-g++/tmake.conf 2010-01-06 17:27:33.000000000 -0700 -@@ -0,0 +1,51 @@ -+# -+# -+# -+# tmake configuration for haiku-g++ -+# -+ -+TEMPLATE = app -+CONFIG = qt warn_on release -+ -+TMAKE_CC = gcc -+TMAKE_CFLAGS = -+TMAKE_CFLAGS_WARN_ON = -Wall -W -+TMAKE_CFLAGS_WARN_OFF = -+TMAKE_CFLAGS_RELEASE = -+TMAKE_CFLAGS_DEBUG = -g -+TMAKE_CFLAGS_SHLIB = -fPIC -+TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -+ -+TMAKE_CXX = g++ -+TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -+TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -+TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -+TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -+TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -+TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -+TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC -+ -+TMAKE_INCDIR = -+TMAKE_LIBDIR = -+TMAKE_INCDIR_QT = $(QTDIR)/include -+TMAKE_LIBDIR_QT = $(QTDIR)/lib -+ -+TMAKE_LINK = g++ -+TMAKE_LINK_SHLIB = g++ -+TMAKE_LFLAGS = -Wl,-rpath=/lib:$(QTDIR)/lib -+TMAKE_LFLAGS_RELEASE = -+TMAKE_LFLAGS_DEBUG = -+TMAKE_LFLAGS_SHLIB = -shared -+TMAKE_LFLAGS_SONAME = -Wl,-soname, -+ -+TMAKE_LIBS = -+TMAKE_LIBS_QT = -lqt -+TMAKE_LIBS_QT_MT = -lqt-mt -+ -+TMAKE_MOC = moc -+ -+TMAKE_AR = ar cqs -+TMAKE_RANLIB = -+ -+TMAKE_TAR = tar -cf -+TMAKE_GZIP = gzip -9f From a215c8652523350bf84da4b9f1078caf0ac67dd1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 2 May 2013 19:34:48 +0200 Subject: [PATCH 200/587] doxygen: small cleanup --- app-doc/doxygen/doxygen-1.6.3.recipe | 1 - 1 file changed, 1 deletion(-) diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe index 6e47795fe..765c5d7a4 100644 --- a/app-doc/doxygen/doxygen-1.6.3.recipe +++ b/app-doc/doxygen/doxygen-1.6.3.recipe @@ -34,7 +34,6 @@ BUILD_PREREQUIRES=" cmd:flex cmd:gcc cmd:ld -# cmd:libtoolize cmd:make cmd:perl cmd:sed From a389ce304c66987177de76372c0204b8867744f6 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 3 May 2013 01:17:15 +0200 Subject: [PATCH 201/587] Convert readline 6.2 recipe to an actual recipe Also create a new patch to fix library building and installation. --- sys-libs/readline/patches/readline-6.2.patch | 24 +++++++++ sys-libs/readline/readline-6.2.recipe | 55 +++++++++++++++----- 2 files changed, 65 insertions(+), 14 deletions(-) create mode 100644 sys-libs/readline/patches/readline-6.2.patch diff --git a/sys-libs/readline/patches/readline-6.2.patch b/sys-libs/readline/patches/readline-6.2.patch new file mode 100644 index 000000000..c3f005381 --- /dev/null +++ b/sys-libs/readline/patches/readline-6.2.patch @@ -0,0 +1,24 @@ +diff -ur orig/readline-6.2/support/shlib-install readline-6.2/support/shlib-install +--- orig/readline-6.2/support/shlib-install 2009-10-28 14:30:18.057409536 +0100 ++++ readline-6.2/support/shlib-install 2013-05-03 01:12:28.695468032 +0200 +@@ -117,7 +117,7 @@ + # Create symlinks to the installed library. This section is incomplete. + # + case "$host_os-$host_vendor" in +-*linux*|freebsd*-gentoo) ++*linux*|freebsd*-gentoo|haiku*) + # libname.so.M -> libname.so.M.N + ${echo} ${RM} ${INSTALLDIR}/$LINK2 + if [ -z "$uninstall" ]; then +diff -ur orig/readline-6.2/support/shobj-conf readline-6.2/support/shobj-conf +--- orig/readline-6.2/support/shobj-conf 2009-10-28 14:20:21.057147392 +0100 ++++ readline-6.2/support/shobj-conf 2013-05-03 01:12:38.631242752 +0200 +@@ -109,7 +109,7 @@ + ;; + + # All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd. +-linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo) ++linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo|haiku*) + SHOBJ_CFLAGS=-fPIC + SHOBJ_LD='${CC}' + SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe index f53a06d9e..65f9a3b21 100644 --- a/sys-libs/readline/readline-6.2.recipe +++ b/sys-libs/readline/readline-6.2.recipe @@ -1,29 +1,56 @@ -DESCRIPTION="readline" +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." HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +COPYRIGHT="1989-2011 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz" CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c" REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="readline-6.2.patch" + +PROVIDES=" + readline = $portVersion compat >= 6 + lib:libhistory = $portVersion compat >= 6 + lib:libreadline = $portVersion compat >= 6 + " +REQUIRES=" + haiku >= $haikuVersion + ncurses + " +BUILD_REQUIRES=" + $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd readline-6.2 libtoolize --force --copy --install aclocal autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=$COMMON_DOCS/info \ - --mandir=$COMMON_DOCS/man - make + runConfigure ./configure \ + --with-curses + make $jobArgs } INSTALL() { - cd readline-6.2 - make install DESTDIR="${DESTDIR}" + make --debug install + + prepareInstalledDevelLibs libhistory libreadline + rmdir $binDir } -LICENSE="GNU GPL v3" -COPYRIGHT="1989-2011 Free Software Foundation, Inc." From 184c49ec2dfb4a2d151693c0f494db1dd6de5ddd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 3 May 2013 01:22:21 +0200 Subject: [PATCH 202/587] readline recipe: minor cleanup --- sys-libs/readline/readline-6.2.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe index 65f9a3b21..5ace613c7 100644 --- a/sys-libs/readline/readline-6.2.recipe +++ b/sys-libs/readline/readline-6.2.recipe @@ -48,7 +48,7 @@ BUILD() INSTALL() { - make --debug install + make install prepareInstalledDevelLibs libhistory libreadline rmdir $binDir From 2cddf1296e3c8e279bfcfd445f2967cc0ecf4e35 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 3 May 2013 01:22:55 +0200 Subject: [PATCH 203/587] Remove old readline non-recipes and patches --- sys-libs/readline/patches/readline-5.2.patch | 37 ------------------ sys-libs/readline/patches/readline-6.0.patch | 41 -------------------- sys-libs/readline/patches/readline-6.1.patch | 27 ------------- sys-libs/readline/readline-5.2.recipe | 21 ---------- sys-libs/readline/readline-6.0.recipe | 28 ------------- sys-libs/readline/readline-6.1.recipe | 28 ------------- 6 files changed, 182 deletions(-) delete mode 100644 sys-libs/readline/patches/readline-5.2.patch delete mode 100644 sys-libs/readline/patches/readline-6.0.patch delete mode 100644 sys-libs/readline/patches/readline-6.1.patch delete mode 100644 sys-libs/readline/readline-5.2.recipe delete mode 100644 sys-libs/readline/readline-6.0.recipe delete mode 100644 sys-libs/readline/readline-6.1.recipe diff --git a/sys-libs/readline/patches/readline-5.2.patch b/sys-libs/readline/patches/readline-5.2.patch deleted file mode 100644 index 8b8d37343..000000000 --- a/sys-libs/readline/patches/readline-5.2.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -urN readline-5.2/configure.in readline-5.2-haiku/configure.in ---- readline-5.2/configure.in 2006-09-28 16:04:24.000000000 +0000 -+++ readline-5.2-haiku/configure.in 2008-08-22 11:14:49.000000000 +0000 -@@ -87,6 +87,9 @@ - i[[3456]]86-*-beos*) - cross_cache=${srcdir}/cross-build/x86-beos.cache - ;; -+ i[[3456]]86-*-haiku*) -+ cross_cache=${srcdir}/cross-build/x86-haiku.cache -+ ;; - *) echo "configure: cross-compiling for $host is not supported" >&2 - ;; - esac -diff -urN readline-5.2/histfile.c readline-5.2-haiku/histfile.c ---- readline-5.2/histfile.c 2006-03-31 20:48:43.000000000 +0000 -+++ readline-5.2-haiku/histfile.c 2008-08-22 10:45:20.000000000 +0000 -@@ -400,7 +400,7 @@ - { - write (file, bp, chars_read - (bp - buffer)); - --#if defined (__BEOS__) -+#if defined (__BEOS__) && !defined(__HAIKU__) - /* BeOS ignores O_TRUNC. */ - ftruncate (file, chars_read - (bp - buffer)); - #endif -diff -urN readline-5.2/input.c readline-5.2-haiku/input.c ---- readline-5.2/input.c 2006-08-16 19:15:16.000000000 +0000 -+++ readline-5.2-haiku/input.c 2008-08-22 11:08:52.000000000 +0000 -@@ -471,7 +471,7 @@ - if (result == 0) - return (EOF); - --#if defined (__BEOS__) -+#if defined (__BEOS__) && !defined(__HAIKU__) - if (errno == EINTR) - continue; - #endif diff --git a/sys-libs/readline/patches/readline-6.0.patch b/sys-libs/readline/patches/readline-6.0.patch deleted file mode 100644 index bf0b96636..000000000 --- a/sys-libs/readline/patches/readline-6.0.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -urN readline-6.0/configure.in readline-6.0-haiku/configure.in ---- readline-6.0/configure.in 2009-06-29 10:44:13.000000000 +0000 -+++ readline-6.0-haiku/configure.in 2009-06-29 10:39:19.000000000 +0000 -@@ -85,6 +85,9 @@ - i[[3456]]86-*-beos*) - cross_cache=${srcdir}/cross-build/x86-beos.cache - ;; -+ i[[3456]]86-*-haiku*) -+ cross_cache=${srcdir}/cross-build/x86-haiku.cache -+ ;; - *) echo "configure: cross-compiling for $host is not supported" >&2 - ;; - esac -diff -urN readline-6.0/rltty.c readline-6.0-haiku/rltty.c ---- readline-6.0/rltty.c 2009-06-29 10:44:16.000000000 +0000 -+++ readline-6.0-haiku/rltty.c 2009-06-29 11:21:11.000000000 +0000 -@@ -238,7 +238,12 @@ - TIOTYPE oldtio, *tiop; - { - _rl_echoing_p = (oldtio.sgttyb.sg_flags & ECHO); -+ -+#if defined (ECHOCTL) - _rl_echoctl = (oldtio.sgttyb.sg_flags & ECHOCTL); -+#else -+ _rl_echoctl = (oldtio.sgttyb.sg_flags); -+#endif - - /* Copy the original settings to the structure we're going to use for - our settings. */ -@@ -517,7 +522,11 @@ - TIOTYPE oldtio, *tiop; - { - _rl_echoing_p = (oldtio.c_lflag & ECHO); -+#if defined (ECHOCTL) - _rl_echoctl = (oldtio.c_lflag & ECHOCTL); -+#else -+ _rl_echoctl = (oldtio.c_lflag); -+#endif - - tiop->c_lflag &= ~(ICANON | ECHO); - diff --git a/sys-libs/readline/patches/readline-6.1.patch b/sys-libs/readline/patches/readline-6.1.patch deleted file mode 100644 index f5d75f829..000000000 --- a/sys-libs/readline/patches/readline-6.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN readline-6.1/configure.in readline-6.1-haiku/configure.in ---- readline-6.1/configure.in 2009-10-12 07:12:15.054788096 -0700 -+++ readline-6.1-haiku/configure.in 2010-10-26 10:21:29.204210176 -0700 -@@ -85,6 +85,9 @@ - i[[3456]]86-*-beos*) - cross_cache=${srcdir}/cross-build/x86-beos.cache - ;; -+ i[[3456]]86-*-haiku*) -+ cross_cache=${srcdir}/cross-build/x86-haiku.cache -+ ;; - *) echo "configure: cross-compiling for $host is not supported" >&2 - ;; - esac -diff -urN readline-6.1/rltty.c readline-6.1-haiku/rltty.c ---- readline-6.1/rltty.c 2009-11-19 06:42:02.059768832 -0800 -+++ readline-6.1-haiku/rltty.c 2010-10-26 10:25:50.489160704 -0700 -@@ -238,7 +238,10 @@ - TIOTYPE oldtio, *tiop; - { - _rl_echoing_p = (oldtio.sgttyb.sg_flags & ECHO); -+ -+#if defined (ECHOCTL) - _rl_echoctl = (oldtio.sgttyb.sg_flags & ECHOCTL); -+#endif - - /* Copy the original settings to the structure we're going to use for - our settings. */ diff --git a/sys-libs/readline/readline-5.2.recipe b/sys-libs/readline/readline-5.2.recipe deleted file mode 100644 index e8d97ae75..000000000 --- a/sys-libs/readline/readline-5.2.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="readline" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" -SRC_URI="ftp://ftp.cwru.edu/pub/bash/readline-5.2.tar.gz" -CHECKSUM_MD5="e39331f32ad14009b9ff49cc10c5e751" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd readline-5.2 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd readline-5.2 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1989-2009 Free Software Foundation, Inc." diff --git a/sys-libs/readline/readline-6.0.recipe b/sys-libs/readline/readline-6.0.recipe deleted file mode 100644 index 3cc6001b9..000000000 --- a/sys-libs/readline/readline-6.0.recipe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="readline" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" -SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.0.tar.gz" -CHECKSUM_MD5="b7f65a48add447693be6e86f04a63019" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd readline-6.0 - libtoolize --force --copy --install - aclocal - autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make -} - -INSTALL() -{ - cd readline-6.0 - make install DESTDIR="${DESTDIR}" -} -LICENSE="GNU GPL v3" -COPYRIGHT="1989-2009 Free Software Foundation, Inc." diff --git a/sys-libs/readline/readline-6.1.recipe b/sys-libs/readline/readline-6.1.recipe deleted file mode 100644 index 5e38331a9..000000000 --- a/sys-libs/readline/readline-6.1.recipe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="readline" -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" -SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.1.tar.gz" -CHECKSUM_MD5="fc2f7e714fe792db1ce6ddc4c9fb4ef3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd readline-6.1 - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ -# --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd readline-6.1 - make install DESTDIR="${DESTDIR}" -} -LICENSE="GNU GPL v3" -COPYRIGHT="1989-2010 Free Software Foundation, Inc." From a678bf06bf8bf5641840c2eecba8cfe3f9e7585a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 3 May 2013 15:39:45 +0200 Subject: [PATCH 204/587] Convert python 2.6.8 recipe to an actual recipe Some additional patching was required to get things to build (among other things the bz2, ssl, and related modules). Remove superfluous Modules/timemodule.c patch. --- dev-lang/python/patches/python-2.6.8.patch | 393 ++++++++++++--------- dev-lang/python/python-2.6.8.recipe | 87 ++++- 2 files changed, 304 insertions(+), 176 deletions(-) diff --git a/dev-lang/python/patches/python-2.6.8.patch b/dev-lang/python/patches/python-2.6.8.patch index 9a2e064a5..38bb43083 100644 --- a/dev-lang/python/patches/python-2.6.8.patch +++ b/dev-lang/python/patches/python-2.6.8.patch @@ -1,6 +1,101 @@ -diff -urN Python-2.6.8/Lib/plat-haiku1/IN.py Python-2.6.8-haiku/Lib/plat-haiku1/IN.py ---- Python-2.6.8/Lib/plat-haiku1/IN.py 1970-01-01 00:00:00.000000000 +0000 -+++ Python-2.6.8-haiku/Lib/plat-haiku1/IN.py 2010-08-30 04:52:27.223346688 +0000 +diff -urN orig/Python-2.6.8/configure.in Python-2.6.8/configure.in +--- orig/Python-2.6.8/configure.in 2012-04-10 17:32:11.057409536 +0200 ++++ Python-2.6.8/configure.in 2013-05-03 15:23:53.332922880 +0200 +@@ -745,7 +745,7 @@ + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) ++ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} +@@ -753,6 +753,9 @@ + FreeBSD*) + SOVERSION=`echo $SOVERSION|cut -d "." -f 1` + ;; ++ Haiku*) ++ RUNSHARED=LIBRARY_PATH=`pwd`:${LIBRARY_PATH} ++ ;; + esac + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +@@ -823,7 +826,7 @@ + AC_SUBST(LN) + if test -z "$LN" ; then + case $ac_sys_system in +- BeOS*) LN="ln -s";; ++ BeOS*|Haiku*) LN="ln -s";; + CYGWIN*) LN="ln -s";; + atheos*) LN="ln -s";; + *) LN=ln;; +@@ -1829,7 +1832,7 @@ + fi + fi + ;; +- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; ++ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; + BSD/OS*/4*) LDSHARED="gcc -shared";; + FreeBSD*) + if [[ "`$CC -dM -E - +-#include ++#include + #include "structmember.h" + + #ifdef WITH_THREAD +diff -urN orig/Python-2.6.8/Modules/resource.c Python-2.6.8/Modules/resource.c +--- orig/Python-2.6.8/Modules/resource.c 2012-04-10 17:32:10.057147392 +0200 ++++ Python-2.6.8/Modules/resource.c 2013-05-03 15:23:53.340787200 +0200 @@ -86,6 +86,7 @@ PyFloat_FromDouble(doubletime(ru.ru_utime))); PyStructSequence_SET_ITEM(result, 1, @@ -360,9 +490,9 @@ diff -urN Python-2.6.8/Modules/resource.c Python-2.6.8-haiku/Modules/resource.c if (PyErr_Occurred()) { Py_DECREF(result); return NULL; -diff -urN Python-2.6.8/Modules/socketmodule.c Python-2.6.8-haiku/Modules/socketmodule.c ---- Python-2.6.8/Modules/socketmodule.c 2010-05-23 15:22:08.054525952 +0000 -+++ Python-2.6.8-haiku/Modules/socketmodule.c 2010-08-30 04:53:35.429916160 +0000 +diff -urN orig/Python-2.6.8/Modules/socketmodule.c Python-2.6.8/Modules/socketmodule.c +--- orig/Python-2.6.8/Modules/socketmodule.c 2012-04-10 17:32:10.066846720 +0200 ++++ Python-2.6.8/Modules/socketmodule.c 2013-05-03 15:23:53.342622208 +0200 @@ -4661,7 +4661,9 @@ #ifndef __BEOS__ /* We have incomplete socket support. */ @@ -374,9 +504,9 @@ diff -urN Python-2.6.8/Modules/socketmodule.c Python-2.6.8-haiku/Modules/socketm #if defined(SOCK_RDM) PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); #endif -diff -urN Python-2.6.8/Modules/socketmodule.h Python-2.6.8-haiku/Modules/socketmodule.h ---- Python-2.6.8/Modules/socketmodule.h 2010-05-09 15:15:40.053739520 +0000 -+++ Python-2.6.8-haiku/Modules/socketmodule.h 2010-08-30 04:52:24.667942912 +0000 +diff -urN orig/Python-2.6.8/Modules/socketmodule.h Python-2.6.8/Modules/socketmodule.h +--- orig/Python-2.6.8/Modules/socketmodule.h 2012-04-10 17:32:10.006029312 +0200 ++++ Python-2.6.8/Modules/socketmodule.h 2013-05-03 15:23:53.343146496 +0200 @@ -47,6 +47,10 @@ # undef AF_NETLINK #endif @@ -388,9 +518,9 @@ diff -urN Python-2.6.8/Modules/socketmodule.h Python-2.6.8-haiku/Modules/socketm #ifdef HAVE_BLUETOOTH_BLUETOOTH_H #include #include -diff -urN Python-2.6.8/Modules/spwdmodule.c Python-2.6.8-haiku/Modules/spwdmodule.c ---- Python-2.6.8/Modules/spwdmodule.c 2010-05-09 15:15:40.030408704 +0000 -+++ Python-2.6.8-haiku/Modules/spwdmodule.c 2010-08-30 04:52:24.709623808 +0000 +diff -urN orig/Python-2.6.8/Modules/spwdmodule.c Python-2.6.8/Modules/spwdmodule.c +--- orig/Python-2.6.8/Modules/spwdmodule.c 2012-04-10 17:32:10.033554432 +0200 ++++ Python-2.6.8/Modules/spwdmodule.c 2013-05-03 15:23:53.343670784 +0200 @@ -79,7 +79,9 @@ SETS(setIndex++, p->sp_namp); @@ -401,35 +531,9 @@ diff -urN Python-2.6.8/Modules/spwdmodule.c Python-2.6.8-haiku/Modules/spwdmodul SETI(setIndex++, p->sp_min); SETI(setIndex++, p->sp_max); SETI(setIndex++, p->sp_warn); -diff -urN Python-2.6.8/Modules/timemodule.c Python-2.6.8-haiku/Modules/timemodule.c ---- Python-2.6.8/Modules/timemodule.c 2010-05-09 15:15:40.015204352 +0000 -+++ Python-2.6.8-haiku/Modules/timemodule.c 2010-08-30 04:52:24.721944576 +0000 -@@ -972,11 +972,11 @@ - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -urN Python-2.6.8/Parser/asdl_c.py Python-2.6.8-haiku/Parser/asdl_c.py ---- Python-2.6.8/Parser/asdl_c.py 2009-12-13 00:59:01.059768832 +0000 -+++ Python-2.6.8-haiku/Parser/asdl_c.py 2010-08-30 04:52:27.169607168 +0000 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - """Generate C code from an ASDL description.""" - - # TO DO -diff -urN Python-2.6.8/Python/bltinmodule.c Python-2.6.8-haiku/Python/bltinmodule.c ---- Python-2.6.8/Python/bltinmodule.c 2010-05-09 15:15:40.065011712 +0000 -+++ Python-2.6.8-haiku/Python/bltinmodule.c 2010-08-30 04:52:27.186646528 +0000 +diff -urN orig/Python-2.6.8/Python/bltinmodule.c Python-2.6.8/Python/bltinmodule.c +--- orig/Python-2.6.8/Python/bltinmodule.c 2012-04-10 17:32:11.047710208 +0200 ++++ Python-2.6.8/Python/bltinmodule.c 2013-05-03 15:23:53.344981504 +0200 @@ -18,7 +18,7 @@ */ #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) @@ -439,9 +543,89 @@ diff -urN Python-2.6.8/Python/bltinmodule.c Python-2.6.8-haiku/Python/bltinmodul const char *Py_FileSystemDefaultEncoding = "utf-8"; #else const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ -diff -urN Python-2.6.8/Tools/scripts/h2py.py Python-2.6.8-haiku/Tools/scripts/h2py.py ---- Python-2.6.8/Tools/scripts/h2py.py 2004-08-09 17:27:55.066584576 +0000 -+++ Python-2.6.8-haiku/Tools/scripts/h2py.py 2010-08-30 04:52:27.188219392 +0000 +diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py +--- orig/Python-2.6.8/setup.py 2012-04-10 17:32:11.057147392 +0200 ++++ Python-2.6.8/setup.py 2013-05-03 15:23:53.346816512 +0200 +@@ -428,6 +428,10 @@ + inc_dirs += ['/system/include', '/atheos/autolnk/include'] + inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) + ++ if platform == 'haiku1': ++ inc_dirs += ['/boot/common/non-packaged/develop/headers', '/boot/common/develop/headers', '/boot/system/develop/headers/posix', '/boot/system/develop/headers/3rdparty'] ++ lib_dirs += ['/boot/common/non-packaged/develop/lib', '/boot/common/develop/lib', '/boot/system/develop/lib'] ++ + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) + if platform in ['osf1', 'unixware7', 'openunix8']: + lib_dirs += ['/usr/ccs/lib'] +@@ -451,7 +455,7 @@ + + # Check for MacOS X, which doesn't need libm.a at all + math_libs = ['m'] +- if platform in ['darwin', 'beos', 'mac']: ++ if platform in ['darwin', 'beos', 'haiku1', 'mac']: + math_libs = [] + + # XXX Omitted modules: gl, pure, dl, SGI-specific modules +@@ -694,15 +698,22 @@ + '/usr/local/ssl/include', + '/usr/contrib/ssl/include/' + ] +- ssl_incs = find_file('openssl/ssl.h', inc_dirs, ++ ssl_incs = find_file('openssl/ssl.h', [], ++ inc_dirs + search_for_ssl_incs_in ++ ) ++ ssl_incs_to_add = find_file('openssl/ssl.h', inc_dirs, + search_for_ssl_incs_in + ) + if ssl_incs is not None: + krb5_h = find_file('krb5.h', inc_dirs, + ['/usr/kerberos/include']) + if krb5_h: +- ssl_incs += krb5_h +- ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, ++ ssl_incs_to_add += krb5_h ++ ssl_libs = find_library_file(self.compiler, 'ssl', [], ++ lib_dirs + ['/usr/local/ssl/lib', ++ '/usr/contrib/ssl/lib/' ++ ] ) ++ ssl_libs_to_add = find_library_file(self.compiler, 'ssl', lib_dirs, + ['/usr/local/ssl/lib', + '/usr/contrib/ssl/lib/' + ] ) +@@ -710,8 +721,8 @@ + if (ssl_incs is not None and + ssl_libs is not None): + exts.append( Extension('_ssl', ['_ssl.c'], +- include_dirs = ssl_incs, +- library_dirs = ssl_libs, ++ include_dirs = ssl_incs_to_add, ++ library_dirs = ssl_libs_to_add, + libraries = ['ssl', 'crypto'], + depends = ['socketmodule.h']), ) + else: +@@ -746,8 +757,8 @@ + # The _hashlib module wraps optimized implementations + # of hash functions from the OpenSSL library. + exts.append( Extension('_hashlib', ['_hashopenssl.c'], +- include_dirs = ssl_incs, +- library_dirs = ssl_libs, ++ include_dirs = ssl_incs_to_add, ++ library_dirs = ssl_libs_to_add, + libraries = ['ssl', 'crypto']) ) + # these aren't strictly missing since they are unneeded. + #missing.extend(['_sha', '_md5']) +@@ -1176,7 +1187,7 @@ + missing.append('resource') + + # Sun yellow pages. Some systems have the functions in libc. +- if (platform not in ['cygwin', 'atheos', 'qnx6'] and ++ if (platform not in ['cygwin', 'atheos', 'qnx6', 'haiku1'] and + find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None): + if (self.compiler.find_library_file(lib_dirs, 'nsl')): + libs = ['nsl'] +diff -urN orig/Python-2.6.8/Tools/scripts/h2py.py Python-2.6.8/Tools/scripts/h2py.py +--- orig/Python-2.6.8/Tools/scripts/h2py.py 2012-04-10 17:32:11.043253760 +0200 ++++ Python-2.6.8/Tools/scripts/h2py.py 2013-05-03 15:23:53.347340800 +0200 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /bin/env python @@ -457,112 +641,3 @@ diff -urN Python-2.6.8/Tools/scripts/h2py.py Python-2.6.8-haiku/Tools/scripts/h2 searchdirs=os.environ['BEINCLUDES'].split(';') elif sys.platform.startswith("atheos"): searchdirs=os.environ['C_INCLUDE_PATH'].split(':') -diff -urN Python-2.6.8/configure.in Python-2.6.8-haiku/configure.in ---- Python-2.6.8/configure.in 2010-05-25 02:27:03.064225280 +0000 -+++ Python-2.6.8-haiku/configure.in 2010-08-30 04:52:27.207880192 +0000 -@@ -745,7 +745,7 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; -- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) -+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -@@ -823,7 +823,7 @@ - AC_SUBST(LN) - if test -z "$LN" ; then - case $ac_sys_system in -- BeOS*) LN="ln -s";; -+ BeOS*|Haiku*) LN="ln -s";; - CYGWIN*) LN="ln -s";; - atheos*) LN="ln -s";; - *) LN=ln;; -@@ -1829,7 +1829,7 @@ - fi - fi - ;; -- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; -+ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; - BSD/OS*/4*) LDSHARED="gcc -shared";; - FreeBSD*) - if [[ "`$CC -dM -E - > configure.in + find . -name '*.py' -exec sed -i -e 's|/usr/bin/env|/bin/env|g' {} \; +} + BUILD() { - cd Python-2.6.8/Modules/_ctypes/libffi + cd Modules/_ctypes/libffi libtoolize --force --copy --install cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in + libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-shared LDFLAGS=-L/boot/common/lib \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - CFLAGS=-I/boot/develop/headers/3rdparty - make + runConfigure ./configure \ + --enable-shared \ + --enable-unicode=ucs4 + + # prevent make from rebuilding stuff that requires python + touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h + + make $jobArgs } INSTALL() { - cd Python-2.6.8 make install + + prepareInstalledDevelLibs libpython2.6 } TEST() { - cd Python-2.6.8 cd Lib/test rm test_asynchat.py # this one stalls, so skip it for now rm test_multiprocessing.py # this one stalls, so skip it for now python regrtest.py } - -LICENSE="Python" -COPYRIGHT="1990-2012, Python Software Foundation" From ee6358786c7458d1f31b19a2def74e324634f164 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 3 May 2013 15:45:03 +0200 Subject: [PATCH 205/587] Add recipe for timgmsoundfont --- .../timgmsoundfont/licenses/Public Domain | 2 + .../Installing alternative sound fonts | 3 ++ .../timgmsoundfont-2004_01_24.recipe | 41 +++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 haiku-data/timgmsoundfont/licenses/Public Domain create mode 100644 haiku-data/timgmsoundfont/sources/Installing alternative sound fonts create mode 100644 haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe diff --git a/haiku-data/timgmsoundfont/licenses/Public Domain b/haiku-data/timgmsoundfont/licenses/Public Domain new file mode 100644 index 000000000..9064db33c --- /dev/null +++ b/haiku-data/timgmsoundfont/licenses/Public Domain @@ -0,0 +1,2 @@ +Any copyright is dedicated to the Public Domain. +http://creativecommons.org/publicdomain/zero/1.0/ \ No newline at end of file diff --git a/haiku-data/timgmsoundfont/sources/Installing alternative sound fonts b/haiku-data/timgmsoundfont/sources/Installing alternative sound fonts new file mode 100644 index 000000000..98096c0a2 --- /dev/null +++ b/haiku-data/timgmsoundfont/sources/Installing alternative sound fonts @@ -0,0 +1,3 @@ +The sound font used by the system is always "big_synth.sy". You can replace the default General Midi sound font with a better version by linking "big_synth.sy" to your alternative sound font. One example of a better quality (and much bigger) sound font can be downloaded here (MIT license): + + diff --git a/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe new file mode 100644 index 000000000..474d6f5c1 --- /dev/null +++ b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe @@ -0,0 +1,41 @@ +SUMMARY="A good quality General Midi Soundfont" +DESCRIPTION="A good quality General Midi Soundfont." +HOMEPAGE="http://ocmnet.com/saxguru/Timidity.htm" +LICENSE="Public Domain" + # TODO: Remove "licenses" directory once updated to the current Haiku, since + # there "Public Domain" is included. +COPYRIGHT="2004 Tim Brechbill" +SRC_URI="http://ocmnet.com/saxguru/TimGM6mb.sf2#noarchive" +CHECKSUM_MD5="1f569cc40159a6bd9250f816225ae222" +REVISION="2" +ARCHITECTURES="any" + +PROVIDES=" + timgmsoundfont = $portVersion compat >= 0 + " +REQUIRES=" + " +BUILD_REQUIRES=" + cmd:cp + " +BUILD_PREREQUIRES=" + haiku + " + +BUILD() +{ + true +} + +INSTALL() +{ + synthDir=$dataDir/synth + mkdir $synthDir + cp TimGM6mb.sf2 "$portDir/sources/Installing alternative sound fonts" \ + $synthDir + ln -s TimGM6mb.sf2 $synthDir/big_synth.sy + # TODO: Since the data directory is read-only, replacing the symlink isn't + # possible as described in the read-me file. This requires changes in the + # midi kit and possibly a preferences application to set the sound font to + # use. +} From 3d40334ec51d10d77f3c27bc592514a3a40cb037 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 4 May 2013 00:47:58 +0200 Subject: [PATCH 206/587] python 2.6.8: Fix python-config Python was looking for its config header in the wrong directory (/include). --- dev-lang/python/patches/python-2.6.8.patch | 65 +++++++++++++--------- dev-lang/python/python-2.6.8.recipe | 2 +- 2 files changed, 40 insertions(+), 27 deletions(-) diff --git a/dev-lang/python/patches/python-2.6.8.patch b/dev-lang/python/patches/python-2.6.8.patch index 38bb43083..cf46984a2 100644 --- a/dev-lang/python/patches/python-2.6.8.patch +++ b/dev-lang/python/patches/python-2.6.8.patch @@ -1,6 +1,6 @@ diff -urN orig/Python-2.6.8/configure.in Python-2.6.8/configure.in ---- orig/Python-2.6.8/configure.in 2012-04-10 17:32:11.057409536 +0200 -+++ Python-2.6.8/configure.in 2013-05-03 15:23:53.332922880 +0200 +--- orig/Python-2.6.8/configure.in 2012-04-10 17:32:11.008650752 +0200 ++++ Python-2.6.8/configure.in 2013-05-04 00:18:11.912523264 +0200 @@ -745,7 +745,7 @@ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} INSTSONAME="$LDLIBRARY".$SOVERSION @@ -76,8 +76,8 @@ diff -urN orig/Python-2.6.8/configure.in Python-2.6.8/configure.in esac AC_MSG_CHECKING(for --with-libm=STRING) diff -urN orig/Python-2.6.8/Lib/distutils/command/build_ext.py Python-2.6.8/Lib/distutils/command/build_ext.py ---- orig/Python-2.6.8/Lib/distutils/command/build_ext.py 2012-04-10 17:32:04.066846720 +0200 -+++ Python-2.6.8/Lib/distutils/command/build_ext.py 2013-05-03 15:23:53.334233600 +0200 +--- orig/Python-2.6.8/Lib/distutils/command/build_ext.py 2012-04-10 17:32:04.018087936 +0200 ++++ Python-2.6.8/Lib/distutils/command/build_ext.py 2013-05-04 00:18:11.913833984 +0200 @@ -234,9 +234,13 @@ # for extensions under Linux or Solaris with a shared Python library, @@ -93,9 +93,22 @@ diff -urN orig/Python-2.6.8/Lib/distutils/command/build_ext.py Python-2.6.8/Lib/ and sysconfig.get_config_var('Py_ENABLE_SHARED')): if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): # building third party extensions +diff -urN orig/Python-2.6.8/Lib/distutils/sysconfig.py Python-2.6.8/Lib/distutils/sysconfig.py +--- orig/Python-2.6.8/Lib/distutils/sysconfig.py 2012-04-10 17:32:04.014942208 +0200 ++++ Python-2.6.8/Lib/distutils/sysconfig.py 2013-05-04 00:31:41.977534976 +0200 +@@ -85,7 +85,8 @@ + # Include is located in the srcdir + inc_dir = os.path.join(srcdir, "Include") + return inc_dir +- return os.path.join(prefix, "include", "python" + get_python_version()) ++ inc_dir = "include" if sys.platform != "haiku1" else "develop/headers" ++ return os.path.join(prefix, inc_dir, "python" + get_python_version()) + elif os.name == "nt": + return os.path.join(prefix, "include") + elif os.name == "mac": diff -urN orig/Python-2.6.8/Lib/plat-haiku1/IN.py Python-2.6.8/Lib/plat-haiku1/IN.py --- orig/Python-2.6.8/Lib/plat-haiku1/IN.py 1970-01-01 01:00:00.000000000 +0100 -+++ Python-2.6.8/Lib/plat-haiku1/IN.py 2013-05-03 15:23:53.336330752 +0200 ++++ Python-2.6.8/Lib/plat-haiku1/IN.py 2013-05-04 00:18:11.917766144 +0200 @@ -0,0 +1,327 @@ +# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h + @@ -426,7 +439,7 @@ diff -urN orig/Python-2.6.8/Lib/plat-haiku1/IN.py Python-2.6.8/Lib/plat-haiku1/I +def _FDBITNO(fd): return ((fd) % NFDBITS) diff -urN orig/Python-2.6.8/Lib/plat-haiku1/regen Python-2.6.8/Lib/plat-haiku1/regen --- orig/Python-2.6.8/Lib/plat-haiku1/regen 1970-01-01 01:00:00.000000000 +0100 -+++ Python-2.6.8/Lib/plat-haiku1/regen 2013-05-03 15:23:53.336855040 +0200 ++++ Python-2.6.8/Lib/plat-haiku1/regen 2013-05-04 00:18:11.918552576 +0200 @@ -0,0 +1,7 @@ +#! /bin/sh + @@ -436,8 +449,8 @@ diff -urN orig/Python-2.6.8/Lib/plat-haiku1/regen Python-2.6.8/Lib/plat-haiku1/r +set -v +python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h diff -urN orig/Python-2.6.8/Lib/test/test_fileio.py Python-2.6.8/Lib/test/test_fileio.py ---- orig/Python-2.6.8/Lib/test/test_fileio.py 2012-04-10 17:32:07.043515904 +0200 -+++ Python-2.6.8/Lib/test/test_fileio.py 2013-05-03 15:23:53.338952192 +0200 +--- orig/Python-2.6.8/Lib/test/test_fileio.py 2012-04-10 17:32:07.061865984 +0200 ++++ Python-2.6.8/Lib/test/test_fileio.py 2013-05-04 00:18:11.920911872 +0200 @@ -152,6 +152,7 @@ self.assertEquals(f.writable(), True) if sys.platform != "darwin" and \ @@ -447,8 +460,8 @@ diff -urN orig/Python-2.6.8/Lib/test/test_fileio.py Python-2.6.8/Lib/test/test_f # Somehow /dev/tty appears seekable on some BSDs self.assertEquals(f.seekable(), False) diff -urN orig/Python-2.6.8/Makefile.pre.in Python-2.6.8/Makefile.pre.in ---- orig/Python-2.6.8/Makefile.pre.in 2012-04-10 17:32:08.047448064 +0200 -+++ Python-2.6.8/Makefile.pre.in 2013-05-03 15:23:53.340000768 +0200 +--- orig/Python-2.6.8/Makefile.pre.in 2012-04-10 17:32:08.065798144 +0200 ++++ Python-2.6.8/Makefile.pre.in 2013-05-04 00:18:11.922222592 +0200 @@ -90,7 +90,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ @@ -459,8 +472,8 @@ diff -urN orig/Python-2.6.8/Makefile.pre.in Python-2.6.8/Makefile.pre.in # Detailed destination directories diff -urN orig/Python-2.6.8/Modules/bz2module.c Python-2.6.8/Modules/bz2module.c ---- orig/Python-2.6.8/Modules/bz2module.c 2012-04-10 17:32:09.031457280 +0200 -+++ Python-2.6.8/Modules/bz2module.c 2013-05-03 15:28:16.616562688 +0200 +--- orig/Python-2.6.8/Modules/bz2module.c 2012-04-10 17:32:09.049545216 +0200 ++++ Python-2.6.8/Modules/bz2module.c 2013-05-04 00:18:11.923533312 +0200 @@ -9,7 +9,7 @@ #include "Python.h" @@ -471,8 +484,8 @@ diff -urN orig/Python-2.6.8/Modules/bz2module.c Python-2.6.8/Modules/bz2module.c #ifdef WITH_THREAD diff -urN orig/Python-2.6.8/Modules/resource.c Python-2.6.8/Modules/resource.c ---- orig/Python-2.6.8/Modules/resource.c 2012-04-10 17:32:10.057147392 +0200 -+++ Python-2.6.8/Modules/resource.c 2013-05-03 15:23:53.340787200 +0200 +--- orig/Python-2.6.8/Modules/resource.c 2012-04-10 17:32:10.008388608 +0200 ++++ Python-2.6.8/Modules/resource.c 2013-05-04 00:18:11.926679040 +0200 @@ -86,6 +86,7 @@ PyFloat_FromDouble(doubletime(ru.ru_utime))); PyStructSequence_SET_ITEM(result, 1, @@ -491,8 +504,8 @@ diff -urN orig/Python-2.6.8/Modules/resource.c Python-2.6.8/Modules/resource.c Py_DECREF(result); return NULL; diff -urN orig/Python-2.6.8/Modules/socketmodule.c Python-2.6.8/Modules/socketmodule.c ---- orig/Python-2.6.8/Modules/socketmodule.c 2012-04-10 17:32:10.066846720 +0200 -+++ Python-2.6.8/Modules/socketmodule.c 2013-05-03 15:23:53.342622208 +0200 +--- orig/Python-2.6.8/Modules/socketmodule.c 2012-04-10 17:32:10.017825792 +0200 ++++ Python-2.6.8/Modules/socketmodule.c 2013-05-04 00:18:11.929824768 +0200 @@ -4661,7 +4661,9 @@ #ifndef __BEOS__ /* We have incomplete socket support. */ @@ -505,8 +518,8 @@ diff -urN orig/Python-2.6.8/Modules/socketmodule.c Python-2.6.8/Modules/socketmo PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); #endif diff -urN orig/Python-2.6.8/Modules/socketmodule.h Python-2.6.8/Modules/socketmodule.h ---- orig/Python-2.6.8/Modules/socketmodule.h 2012-04-10 17:32:10.006029312 +0200 -+++ Python-2.6.8/Modules/socketmodule.h 2013-05-03 15:23:53.343146496 +0200 +--- orig/Python-2.6.8/Modules/socketmodule.h 2012-04-10 17:32:10.024379392 +0200 ++++ Python-2.6.8/Modules/socketmodule.h 2013-05-04 00:18:11.930349056 +0200 @@ -47,6 +47,10 @@ # undef AF_NETLINK #endif @@ -519,8 +532,8 @@ diff -urN orig/Python-2.6.8/Modules/socketmodule.h Python-2.6.8/Modules/socketmo #include #include diff -urN orig/Python-2.6.8/Modules/spwdmodule.c Python-2.6.8/Modules/spwdmodule.c ---- orig/Python-2.6.8/Modules/spwdmodule.c 2012-04-10 17:32:10.033554432 +0200 -+++ Python-2.6.8/Modules/spwdmodule.c 2013-05-03 15:23:53.343670784 +0200 +--- orig/Python-2.6.8/Modules/spwdmodule.c 2012-04-10 17:32:10.051904512 +0200 ++++ Python-2.6.8/Modules/spwdmodule.c 2013-05-04 00:18:11.932446208 +0200 @@ -79,7 +79,9 @@ SETS(setIndex++, p->sp_namp); @@ -532,8 +545,8 @@ diff -urN orig/Python-2.6.8/Modules/spwdmodule.c Python-2.6.8/Modules/spwdmodule SETI(setIndex++, p->sp_max); SETI(setIndex++, p->sp_warn); diff -urN orig/Python-2.6.8/Python/bltinmodule.c Python-2.6.8/Python/bltinmodule.c ---- orig/Python-2.6.8/Python/bltinmodule.c 2012-04-10 17:32:11.047710208 +0200 -+++ Python-2.6.8/Python/bltinmodule.c 2013-05-03 15:23:53.344981504 +0200 +--- orig/Python-2.6.8/Python/bltinmodule.c 2012-04-10 17:32:11.066060288 +0200 ++++ Python-2.6.8/Python/bltinmodule.c 2013-05-04 00:18:11.936378368 +0200 @@ -18,7 +18,7 @@ */ #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) @@ -544,8 +557,8 @@ diff -urN orig/Python-2.6.8/Python/bltinmodule.c Python-2.6.8/Python/bltinmodule #else const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py ---- orig/Python-2.6.8/setup.py 2012-04-10 17:32:11.057147392 +0200 -+++ Python-2.6.8/setup.py 2013-05-03 15:23:53.346816512 +0200 +--- orig/Python-2.6.8/setup.py 2012-04-10 17:32:11.008388608 +0200 ++++ Python-2.6.8/setup.py 2013-05-04 00:18:11.938737664 +0200 @@ -428,6 +428,10 @@ inc_dirs += ['/system/include', '/atheos/autolnk/include'] inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) @@ -624,8 +637,8 @@ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py if (self.compiler.find_library_file(lib_dirs, 'nsl')): libs = ['nsl'] diff -urN orig/Python-2.6.8/Tools/scripts/h2py.py Python-2.6.8/Tools/scripts/h2py.py ---- orig/Python-2.6.8/Tools/scripts/h2py.py 2012-04-10 17:32:11.043253760 +0200 -+++ Python-2.6.8/Tools/scripts/h2py.py 2013-05-03 15:23:53.347340800 +0200 +--- orig/Python-2.6.8/Tools/scripts/h2py.py 2012-04-10 17:32:11.061603840 +0200 ++++ Python-2.6.8/Tools/scripts/h2py.py 2013-05-04 00:18:11.939261952 +0200 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /bin/env python diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe index 9e4c4bf9f..90e42a3f0 100644 --- a/dev-lang/python/python-2.6.8.recipe +++ b/dev-lang/python/python-2.6.8.recipe @@ -9,7 +9,7 @@ LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2" CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="python-2.6.8.patch" From 64fed6e7ba47913d46e2deefda7aadf419463cc6 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 4 May 2013 01:00:42 +0200 Subject: [PATCH 207/587] Convert mercurial 2.2.2 recipe to an actual recipe --- dev-vcs/mercurial/mercurial-2.2.2.recipe | 54 +++++++++++++++++------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe index fc13e661d..3d3bbf397 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -1,33 +1,57 @@ -DESCRIPTION="Mercurial is a free, distributed source control management tool" +SUMMARY="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" SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz" CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-lang/python >= 2.3" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="mercurial-2.2.2.patch" + +PROVIDES=" + mercurial = $portVersion compat >= 2 + cmd:hg = $portVersion compat >= 2 + " +REQUIRES=" + haiku_devel >= $haikuVersion + python + cmd:nano + " +BUILD_REQUIRES=" + $REQUIRES + gettext + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd mercurial-2.2.2 python setup.py build --force } INSTALL() { - cd mercurial-2.2.2 - if [ -n "${DESTDIR}" ];then - python setup.py install --root="${DESTDIR}" --prefix="$(finddir B_COMMON_DIRECTORY)" --force - else - python setup.py install --prefix="$(finddir B_COMMON_DIRECTORY)" --force - fi + python setup.py install \ + --prefix="$prefix" \ + --install-headers="$includedir" \ + --force } shopt -s extglob TEST() { - cd mercurial-2.2.2/tests + cd tests sed -i 's,/usr/bin/env,/bin/env,' !(blacklists|bundles|gpg|svn) python run-tests.py } - -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2012 Matt Mackall et al." From 387dff0977f39e2949c068c51f5132b962ec45c5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 4 May 2013 01:01:44 +0200 Subject: [PATCH 208/587] Remove old python non-recipes and patches --- dev-lang/python/fix-haiku.sh | 2 - dev-lang/python/patches/python-2.5.4.patch | 203 -------- dev-lang/python/patches/python-2.6.4.patch | 544 -------------------- dev-lang/python/patches/python-2.6.5.patch | 556 -------------------- dev-lang/python/patches/python-2.6.6.patch | 558 -------------------- dev-lang/python/patches/python-2.6.7.patch | 568 --------------------- dev-lang/python/python-2.5.4.recipe | 28 - dev-lang/python/python-2.6.4.recipe | 27 - dev-lang/python/python-2.6.5.recipe | 27 - dev-lang/python/python-2.6.6.recipe | 41 -- dev-lang/python/python-2.6.7.recipe | 41 -- 11 files changed, 2595 deletions(-) delete mode 100644 dev-lang/python/fix-haiku.sh delete mode 100644 dev-lang/python/patches/python-2.5.4.patch delete mode 100644 dev-lang/python/patches/python-2.6.4.patch delete mode 100644 dev-lang/python/patches/python-2.6.5.patch delete mode 100644 dev-lang/python/patches/python-2.6.6.patch delete mode 100644 dev-lang/python/patches/python-2.6.7.patch delete mode 100644 dev-lang/python/python-2.5.4.recipe delete mode 100644 dev-lang/python/python-2.6.4.recipe delete mode 100644 dev-lang/python/python-2.6.5.recipe delete mode 100644 dev-lang/python/python-2.6.6.recipe delete mode 100644 dev-lang/python/python-2.6.7.recipe diff --git a/dev-lang/python/fix-haiku.sh b/dev-lang/python/fix-haiku.sh deleted file mode 100644 index c13f7ddea..000000000 --- a/dev-lang/python/fix-haiku.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -find . -name '*.py' -exec sed -i -e 's|/usr/bin/env|/bin/env|g' {} \; diff --git a/dev-lang/python/patches/python-2.5.4.patch b/dev-lang/python/patches/python-2.5.4.patch deleted file mode 100644 index 9bb9f3ae5..000000000 --- a/dev-lang/python/patches/python-2.5.4.patch +++ /dev/null @@ -1,203 +0,0 @@ -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/_ctypes/libffi/configure.ac ./Python-2.5.4/Modules/_ctypes/libffi/configure.ac ---- ./Python-2.5.4.orig/Modules/_ctypes/libffi/configure.ac 2007-09-05 01:47:16.942407680 +0200 -+++ ./Python-2.5.4/Modules/_ctypes/libffi/configure.ac 2010-06-07 16:42:39.216006656 +0200 -@@ -8,16 +8,16 @@ - AC_CANONICAL_SYSTEM - target_alias=${target_alias-$host_alias} - --m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) -+#m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) - m4_define([_AC_ARG_VAR_PRECIOUS],[]) - AC_PROG_CC --m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) -+#m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) - - AC_SUBST(CFLAGS) - - AC_CHECK_HEADERS(sys/mman.h) - AC_CHECK_FUNCS(mmap) --AC_FUNC_MMAP_BLACKLIST -+#AC_FUNC_MMAP_BLACKLIST - - TARGETDIR="unknown" - case "$host" in -@@ -34,6 +34,7 @@ - i*86-*-solaris2.1[[0-9]]*) TARGET=X86_64; TARGETDIR=x86;; - i*86-*-solaris*) TARGET=X86; TARGETDIR=x86;; - i*86-*-beos*) TARGET=X86; TARGETDIR=x86;; -+i*86-*-haiku*) TARGET=X86; TARGETDIR=x86;; - i*86-*-freebsd* | i*86-*-kfreebsd*-gnu) TARGET=X86; TARGETDIR=x86;; - i*86-*-netbsdelf* | i*86-*-knetbsd*-gnu) TARGET=X86; TARGETDIR=x86;; - i*86-*-openbsd*) TARGET=X86; TARGETDIR=x86;; -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/resource.c ./Python-2.5.4/Modules/resource.c ---- ./Python-2.5.4.orig/Modules/resource.c 2006-05-29 23:04:52.942407680 +0200 -+++ ./Python-2.5.4/Modules/resource.c 2010-06-03 18:12:58.990380032 +0200 -@@ -86,6 +86,7 @@ - PyFloat_FromDouble(doubletime(ru.ru_utime))); - PyStructSequence_SET_ITEM(result, 1, - PyFloat_FromDouble(doubletime(ru.ru_stime))); -+#ifndef __HAIKU__ - PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss)); - PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss)); - PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss)); -@@ -100,6 +101,7 @@ - PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); - PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); - PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); -+#endif - - if (PyErr_Occurred()) { - Py_DECREF(result); -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/socketmodule.h ./Python-2.5.4/Modules/socketmodule.h ---- ./Python-2.5.4.orig/Modules/socketmodule.h 2006-12-03 12:24:00.942407680 +0100 -+++ ./Python-2.5.4/Modules/socketmodule.h 2010-06-03 18:12:58.991952896 +0200 -@@ -41,6 +41,10 @@ - # undef AF_NETLINK - #endif - -+#if defined(__HAIKU__) -+#undef HAVE_BLUETOOTH_BLUETOOTH_H -+#endif -+ - #ifdef HAVE_BLUETOOTH_BLUETOOTH_H - #include - #include -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/spwdmodule.c ./Python-2.5.4/Modules/spwdmodule.c ---- ./Python-2.5.4.orig/Modules/spwdmodule.c 2006-08-02 08:15:10.942407680 +0200 -+++ ./Python-2.5.4/Modules/spwdmodule.c 2010-06-03 18:12:58.994312192 +0200 -@@ -79,7 +79,9 @@ - - SETS(setIndex++, p->sp_namp); - SETS(setIndex++, p->sp_pwdp); -+#ifndef __HAIKU__ - SETI(setIndex++, p->sp_lstchg); -+#endif - SETI(setIndex++, p->sp_min); - SETI(setIndex++, p->sp_max); - SETI(setIndex++, p->sp_warn); -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/timemodule.c ./Python-2.5.4/Modules/timemodule.c ---- ./Python-2.5.4.orig/Modules/timemodule.c 2007-12-24 21:00:42.942407680 +0100 -+++ ./Python-2.5.4/Modules/timemodule.c 2010-06-03 18:12:59.021757952 +0200 -@@ -968,11 +968,11 @@ - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Tools/scripts/h2py.py ./Python-2.5.4/Tools/scripts/h2py.py ---- ./Python-2.5.4.orig/Tools/scripts/h2py.py 2004-08-09 19:27:55.942407680 +0200 -+++ ./Python-2.5.4/Tools/scripts/h2py.py 2010-06-06 11:00:49.436731904 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/configure.in ./Python-2.5.4/configure.in ---- ./Python-2.5.4.orig/configure.in 2008-12-13 15:13:52.942407680 +0100 -+++ ./Python-2.5.4/configure.in 2010-06-07 16:53:42.874250240 +0200 -@@ -7,6 +7,7 @@ - AC_PREREQ(2.59) - AC_INIT(python, PYTHON_VERSION, http://www.python.org/python-bugs) - AC_CONFIG_SRCDIR([Include/object.h]) -+AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADER(pyconfig.h) - - dnl This is for stuff that absolutely must end up in pyconfig.h. -@@ -627,6 +628,11 @@ - BeOS*) - LDLIBRARY='libpython$(VERSION).so' - ;; -+ Haiku*) -+ LDLIBRARY='libpython$(VERSION).so' -+ BLDLIBRARY='-L. -lpython$(VERSION)' -+ RUNSHARED=LIBRARY_PATH=`pwd`:${LIBRARY_PATH} -+ ;; - CYGWIN*) - LDLIBRARY='libpython$(VERSION).dll.a' - DLLLIBRARY='libpython$(VERSION).dll' -@@ -709,7 +715,7 @@ - AC_SUBST(LN) - if test -z "$LN" ; then - case $ac_sys_system in -- BeOS*) LN="ln -s";; -+ BeOS*|Haiku*) LN="ln -s";; - CYGWIN*) LN="ln -s";; - atheos*) LN="ln -s";; - *) LN=ln;; -@@ -1445,6 +1451,10 @@ - BLDSHARED="\$(srcdir)/Modules/ld_so_beos $LDLIBRARY" - LDSHARED="\$(BINLIBDEST)/config/ld_so_beos \$(LIBDIR)/$LDLIBRARY" - ;; -+ Haiku*) -+ LDFLAGS="-L." # help ld find libpythonX.Y.so in root directory -+ LDSHARED="gcc -shared" -+ ;; - IRIX/5*) LDSHARED="ld -shared";; - IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";; - SunOS/5*) -@@ -1585,6 +1595,7 @@ - *) CCSHARED="";; - esac;; - atheos*) CCSHARED="-fPIC";; -+ Haiku*) CCSHARED="-fPIC";; - esac - fi - AC_MSG_RESULT($CCSHARED) -@@ -1710,6 +1721,9 @@ - BeOS*) - AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS) # BeOS - ;; -+Haiku*) -+AC_CHECK_LIB(network, socket, [LIBS="-lnetwork $LIBS"], [], $LIBS) # Haiku -+;; - esac - - AC_MSG_CHECKING(for --with-libs) -@@ -2879,7 +2893,7 @@ - AC_SUBST(LIBM) - case $ac_sys_system in - Darwin) ;; --BeOS) ;; -+BeOS|Haiku) ;; - *) LIBM=-lm - esac - AC_MSG_CHECKING(for --with-libm=STRING) -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/setup.py ./Python-2.5.4/setup.py ---- ./Python-2.5.4.orig/setup.py 2008-10-16 20:58:19.942407680 +0200 -+++ ./Python-2.5.4/setup.py 2010-06-03 18:12:59.056885248 +0200 -@@ -338,7 +338,7 @@ - - # Check for MacOS X, which doesn't need libm.a at all - math_libs = ['m'] -- if platform in ['darwin', 'beos', 'mac']: -+ if platform in ['darwin', 'beos', 'haiku1', 'mac']: - math_libs = [] - - # XXX Omitted modules: gl, pure, dl, SGI-specific modules -@@ -912,7 +912,7 @@ - exts.append( Extension('resource', ['resource.c']) ) - - # Sun yellow pages. Some systems have the functions in libc. -- if platform not in ['cygwin', 'atheos']: -+ if platform not in ['cygwin', 'atheos', 'haiku1']: - if (self.compiler.find_library_file(lib_dirs, 'nsl')): - libs = ['nsl'] - else: diff --git a/dev-lang/python/patches/python-2.6.4.patch b/dev-lang/python/patches/python-2.6.4.patch deleted file mode 100644 index 2fa785ec5..000000000 --- a/dev-lang/python/patches/python-2.6.4.patch +++ /dev/null @@ -1,544 +0,0 @@ -diff -ruN Python-2.6.4/Lib/plat-haiku1/IN.py Python-2.6.4-haiku/Lib/plat-haiku1/IN.py ---- Python-2.6.4/Lib/plat-haiku1/IN.py 1969-12-31 17:00:00.000000000 -0700 -+++ Python-2.6.4-haiku/Lib/plat-haiku1/IN.py 2009-10-27 13:31:08.000000000 -0600 -@@ -0,0 +1,327 @@ -+# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h -+ -+# Included from socket.h -+ -+# Included from BeBuild.h -+B_BEOS_VERSION_4 = 0x0400 -+B_BEOS_VERSION_4_5 = 0x0450 -+B_BEOS_VERSION_5 = 0x0500 -+B_BEOS_VERSION = B_BEOS_VERSION_5 -+B_BEOS_VERSION_MAUI = B_BEOS_VERSION_5 -+_PR2_COMPATIBLE_ = 1 -+_PR3_COMPATIBLE_ = 1 -+_R4_COMPATIBLE_ = 1 -+_R4_5_COMPATIBLE_ = 1 -+_PR2_COMPATIBLE_ = 0 -+_PR3_COMPATIBLE_ = 0 -+_R4_COMPATIBLE_ = 1 -+_R4_5_COMPATIBLE_ = 1 -+def _UNUSED(x): return x -+ -+ -+# Included from sys/types.h -+ -+# Included from time.h -+ -+# Included from be_setup.h -+def __std(ref): return ref -+ -+__be_os = 2 -+__dest_os = __be_os -+__MSL__ = 0x4011 -+__GLIBC__ = -2 -+__GLIBC_MINOR__ = 1 -+ -+# Included from null.h -+NULL = (0) -+NULL = 0L -+ -+# Included from size_t.h -+ -+# Included from stddef.h -+ -+# Included from wchar_t.h -+CLOCKS_PER_SEC = 1000 -+CLK_TCK = CLOCKS_PER_SEC -+MAX_TIMESTR = 70 -+ -+# Included from sys/time.h -+ -+# Included from ByteOrder.h -+ -+# Included from endian.h -+__LITTLE_ENDIAN = 1234 -+LITTLE_ENDIAN = __LITTLE_ENDIAN -+__BYTE_ORDER = __LITTLE_ENDIAN -+BYTE_ORDER = __BYTE_ORDER -+__BIG_ENDIAN = 0 -+BIG_ENDIAN = 0 -+__BIG_ENDIAN = 4321 -+BIG_ENDIAN = __BIG_ENDIAN -+__BYTE_ORDER = __BIG_ENDIAN -+BYTE_ORDER = __BYTE_ORDER -+__LITTLE_ENDIAN = 0 -+LITTLE_ENDIAN = 0 -+__PDP_ENDIAN = 3412 -+PDP_ENDIAN = __PDP_ENDIAN -+ -+# Included from SupportDefs.h -+ -+# Included from Errors.h -+ -+# Included from limits.h -+ -+# Included from float.h -+FLT_ROUNDS = 1 -+FLT_RADIX = 2 -+FLT_MANT_DIG = 24 -+FLT_DIG = 6 -+FLT_MIN_EXP = (-125) -+FLT_MIN_10_EXP = (-37) -+FLT_MAX_EXP = 128 -+FLT_MAX_10_EXP = 38 -+DBL_MANT_DIG = 53 -+DBL_DIG = 15 -+DBL_MIN_EXP = (-1021) -+DBL_MIN_10_EXP = (-308) -+DBL_MAX_EXP = 1024 -+DBL_MAX_10_EXP = 308 -+LDBL_MANT_DIG = DBL_MANT_DIG -+LDBL_DIG = DBL_DIG -+LDBL_MIN_EXP = DBL_MIN_EXP -+LDBL_MIN_10_EXP = DBL_MIN_10_EXP -+LDBL_MAX_EXP = DBL_MAX_EXP -+LDBL_MAX_10_EXP = DBL_MAX_10_EXP -+CHAR_BIT = (8) -+SCHAR_MIN = (-127-1) -+SCHAR_MAX = (127) -+CHAR_MIN = SCHAR_MIN -+CHAR_MAX = SCHAR_MAX -+MB_LEN_MAX = (1) -+SHRT_MIN = (-32767-1) -+SHRT_MAX = (32767) -+LONG_MIN = (-2147483647L-1) -+LONG_MAX = (2147483647L) -+INT_MIN = LONG_MIN -+INT_MAX = LONG_MAX -+ARG_MAX = (32768) -+ATEXIT_MAX = (32) -+CHILD_MAX = (1024) -+IOV_MAX = (256) -+FILESIZEBITS = (64) -+LINK_MAX = (1) -+LOGIN_NAME_MAX = (32) -+MAX_CANON = (255) -+MAX_INPUT = (255) -+NAME_MAX = (256) -+NGROUPS_MAX = (32) -+OPEN_MAX = (128) -+PATH_MAX = (1024) -+PIPE_MAX = (512) -+SSIZE_MAX = (2147483647L) -+TTY_NAME_MAX = (256) -+TZNAME_MAX = (32) -+SYMLINKS_MAX = (16) -+_POSIX_ARG_MAX = (32768) -+_POSIX_CHILD_MAX = (1024) -+_POSIX_LINK_MAX = (1) -+_POSIX_LOGIN_NAME_MAX = (9) -+_POSIX_MAX_CANON = (255) -+_POSIX_MAX_INPUT = (255) -+_POSIX_NAME_MAX = (255) -+_POSIX_NGROUPS_MAX = (0) -+_POSIX_OPEN_MAX = (128) -+_POSIX_PATH_MAX = (1024) -+_POSIX_PIPE_BUF = (512) -+_POSIX_SSIZE_MAX = (2147483647L) -+_POSIX_STREAM_MAX = (8) -+_POSIX_TTY_NAME_MAX = (256) -+_POSIX_TZNAME_MAX = (3) -+B_GENERAL_ERROR_BASE = LONG_MIN -+B_OS_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x1000 -+B_APP_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x2000 -+B_INTERFACE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x3000 -+B_MEDIA_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4000 -+B_TRANSLATION_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4800 -+B_MIDI_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x5000 -+B_STORAGE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x6000 -+B_POSIX_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x7000 -+B_MAIL_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x8000 -+B_PRINT_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x9000 -+B_DEVICE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0xa000 -+B_ERRORS_END = (B_GENERAL_ERROR_BASE + 0xffff) -+E2BIG = (B_POSIX_ERROR_BASE + 1) -+ECHILD = (B_POSIX_ERROR_BASE + 2) -+EDEADLK = (B_POSIX_ERROR_BASE + 3) -+EFBIG = (B_POSIX_ERROR_BASE + 4) -+EMLINK = (B_POSIX_ERROR_BASE + 5) -+ENFILE = (B_POSIX_ERROR_BASE + 6) -+ENODEV = (B_POSIX_ERROR_BASE + 7) -+ENOLCK = (B_POSIX_ERROR_BASE + 8) -+ENOSYS = (B_POSIX_ERROR_BASE + 9) -+ENOTTY = (B_POSIX_ERROR_BASE + 10) -+ENXIO = (B_POSIX_ERROR_BASE + 11) -+ESPIPE = (B_POSIX_ERROR_BASE + 12) -+ESRCH = (B_POSIX_ERROR_BASE + 13) -+EFPOS = (B_POSIX_ERROR_BASE + 14) -+ESIGPARM = (B_POSIX_ERROR_BASE + 15) -+EDOM = (B_POSIX_ERROR_BASE + 16) -+ERANGE = (B_POSIX_ERROR_BASE + 17) -+EPROTOTYPE = (B_POSIX_ERROR_BASE + 18) -+EPROTONOSUPPORT = (B_POSIX_ERROR_BASE + 19) -+EPFNOSUPPORT = (B_POSIX_ERROR_BASE + 20) -+EAFNOSUPPORT = (B_POSIX_ERROR_BASE + 21) -+EADDRINUSE = (B_POSIX_ERROR_BASE + 22) -+EADDRNOTAVAIL = (B_POSIX_ERROR_BASE + 23) -+ENETDOWN = (B_POSIX_ERROR_BASE + 24) -+ENETUNREACH = (B_POSIX_ERROR_BASE + 25) -+ENETRESET = (B_POSIX_ERROR_BASE + 26) -+ECONNABORTED = (B_POSIX_ERROR_BASE + 27) -+ECONNRESET = (B_POSIX_ERROR_BASE + 28) -+EISCONN = (B_POSIX_ERROR_BASE + 29) -+ENOTCONN = (B_POSIX_ERROR_BASE + 30) -+ESHUTDOWN = (B_POSIX_ERROR_BASE + 31) -+ECONNREFUSED = (B_POSIX_ERROR_BASE + 32) -+EHOSTUNREACH = (B_POSIX_ERROR_BASE + 33) -+ENOPROTOOPT = (B_POSIX_ERROR_BASE + 34) -+ENOBUFS = (B_POSIX_ERROR_BASE + 35) -+EINPROGRESS = (B_POSIX_ERROR_BASE + 36) -+EALREADY = (B_POSIX_ERROR_BASE + 37) -+EILSEQ = (B_POSIX_ERROR_BASE + 38) -+ENOMSG = (B_POSIX_ERROR_BASE + 39) -+ESTALE = (B_POSIX_ERROR_BASE + 40) -+EOVERFLOW = (B_POSIX_ERROR_BASE + 41) -+EMSGSIZE = (B_POSIX_ERROR_BASE + 42) -+EOPNOTSUPP = (B_POSIX_ERROR_BASE + 43) -+ENOTSOCK = (B_POSIX_ERROR_BASE + 44) -+false = 0 -+true = 1 -+NULL = (0) -+FALSE = 0 -+TRUE = 1 -+ -+# Included from TypeConstants.h -+B_HOST_IS_LENDIAN = 1 -+B_HOST_IS_BENDIAN = 0 -+def B_HOST_TO_LENDIAN_DOUBLE(arg): return (double)(arg) -+ -+def B_HOST_TO_LENDIAN_FLOAT(arg): return (float)(arg) -+ -+def B_HOST_TO_LENDIAN_INT64(arg): return (uint64)(arg) -+ -+def B_HOST_TO_LENDIAN_INT32(arg): return (uint32)(arg) -+ -+def B_HOST_TO_LENDIAN_INT16(arg): return (uint16)(arg) -+ -+def B_HOST_TO_BENDIAN_DOUBLE(arg): return __swap_double(arg) -+ -+def B_HOST_TO_BENDIAN_FLOAT(arg): return __swap_float(arg) -+ -+def B_HOST_TO_BENDIAN_INT64(arg): return __swap_int64(arg) -+ -+def B_HOST_TO_BENDIAN_INT32(arg): return __swap_int32(arg) -+ -+def B_HOST_TO_BENDIAN_INT16(arg): return __swap_int16(arg) -+ -+def B_LENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) -+ -+def B_LENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) -+ -+def B_LENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) -+ -+def B_LENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) -+ -+def B_LENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) -+ -+def B_BENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) -+ -+def B_BENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) -+ -+def B_BENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) -+ -+def B_BENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) -+ -+def B_BENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) -+ -+B_HOST_IS_LENDIAN = 0 -+B_HOST_IS_BENDIAN = 1 -+def B_HOST_TO_LENDIAN_DOUBLE(arg): return __swap_double(arg) -+ -+def B_HOST_TO_LENDIAN_FLOAT(arg): return __swap_float(arg) -+ -+def B_HOST_TO_LENDIAN_INT64(arg): return __swap_int64(arg) -+ -+def B_HOST_TO_LENDIAN_INT32(arg): return __swap_int32(arg) -+ -+def B_HOST_TO_LENDIAN_INT16(arg): return __swap_int16(arg) -+ -+def B_HOST_TO_BENDIAN_DOUBLE(arg): return (double)(arg) -+ -+def B_HOST_TO_BENDIAN_FLOAT(arg): return (float)(arg) -+ -+def B_HOST_TO_BENDIAN_INT64(arg): return (uint64)(arg) -+ -+def B_HOST_TO_BENDIAN_INT32(arg): return (uint32)(arg) -+ -+def B_HOST_TO_BENDIAN_INT16(arg): return (uint16)(arg) -+ -+def B_LENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) -+ -+def B_LENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) -+ -+def B_LENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) -+ -+def B_LENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) -+ -+def B_LENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) -+ -+def B_BENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) -+ -+def B_BENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) -+ -+def B_BENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) -+ -+def B_BENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) -+ -+def B_BENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) -+ -+def B_SWAP_DOUBLE(arg): return __swap_double(arg) -+ -+def B_SWAP_FLOAT(arg): return __swap_float(arg) -+ -+def B_SWAP_INT64(arg): return __swap_int64(arg) -+ -+def B_SWAP_INT32(arg): return __swap_int32(arg) -+ -+def B_SWAP_INT16(arg): return __swap_int16(arg) -+ -+def htonl(x): return B_HOST_TO_BENDIAN_INT32(x) -+ -+def ntohl(x): return B_BENDIAN_TO_HOST_INT32(x) -+ -+def htons(x): return B_HOST_TO_BENDIAN_INT16(x) -+ -+def ntohs(x): return B_BENDIAN_TO_HOST_INT16(x) -+ -+AF_INET = 1 -+INADDR_ANY = 0x00000000 -+INADDR_BROADCAST = 0xffffffff -+INADDR_LOOPBACK = 0x7f000001 -+SOL_SOCKET = 1 -+SO_DEBUG = 1 -+SO_REUSEADDR = 2 -+SO_NONBLOCK = 3 -+SO_REUSEPORT = 4 -+MSG_OOB = 0x1 -+SOCK_DGRAM = 1 -+SOCK_STREAM = 2 -+IPPROTO_UDP = 1 -+IPPROTO_TCP = 2 -+IPPROTO_ICMP = 3 -+B_UDP_MAX_SIZE = (65536 - 1024) -+FD_SETSIZE = 256 -+FDSETSIZE = FD_SETSIZE -+NFDBITS = 32 -+def _FDMSKNO(fd): return ((fd) / NFDBITS) -+ -+def _FDBITNO(fd): return ((fd) % NFDBITS) -diff -ruN Python-2.6.4/Lib/plat-haiku1/regen Python-2.6.4-haiku/Lib/plat-haiku1/regen ---- Python-2.6.4/Lib/plat-haiku1/regen 1969-12-31 17:00:00.000000000 -0700 -+++ Python-2.6.4-haiku/Lib/plat-haiku1/regen 2009-10-27 13:31:08.000000000 -0600 -@@ -0,0 +1,7 @@ -+#! /bin/sh -+ -+H2PY=../../Tools/scripts/h2py.py -+HEADERS=/boot/develop/headers -+ -+set -v -+python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h -diff -ruN Python-2.6.4/Modules/resource.c Python-2.6.4-haiku/Modules/resource.c ---- Python-2.6.4/Modules/resource.c 2009-05-08 14:59:57.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/resource.c 2009-10-27 13:31:08.000000000 -0600 -@@ -86,6 +86,7 @@ - PyFloat_FromDouble(doubletime(ru.ru_utime))); - PyStructSequence_SET_ITEM(result, 1, - PyFloat_FromDouble(doubletime(ru.ru_stime))); -+#ifndef __HAIKU__ - PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss)); - PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss)); - PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss)); -@@ -100,6 +101,7 @@ - PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); - PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); - PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); -+#endif - - if (PyErr_Occurred()) { - Py_DECREF(result); -diff -ruN Python-2.6.4/Modules/socketmodule.c Python-2.6.4-haiku/Modules/socketmodule.c ---- Python-2.6.4/Modules/socketmodule.c 2009-09-19 01:46:24.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/socketmodule.c 2009-10-27 13:31:08.000000000 -0600 -@@ -4640,7 +4640,9 @@ - #ifndef __BEOS__ - /* We have incomplete socket support. */ - PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW); -+#ifndef __HAIKU__ - PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); -+#endif - #if defined(SOCK_RDM) - PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); - #endif -diff -ruN Python-2.6.4/Modules/socketmodule.h Python-2.6.4-haiku/Modules/socketmodule.h ---- Python-2.6.4/Modules/socketmodule.h 2008-06-14 02:36:07.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/socketmodule.h 2009-10-27 13:31:08.000000000 -0600 -@@ -47,6 +47,10 @@ - # undef AF_NETLINK - #endif - -+#if defined(__HAIKU__) -+#undef HAVE_BLUETOOTH_BLUETOOTH_H -+#endif -+ - #ifdef HAVE_BLUETOOTH_BLUETOOTH_H - #include - #include -diff -ruN Python-2.6.4/Modules/spwdmodule.c Python-2.6.4-haiku/Modules/spwdmodule.c ---- Python-2.6.4/Modules/spwdmodule.c 2008-06-08 22:58:54.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/spwdmodule.c 2009-10-27 13:31:08.000000000 -0600 -@@ -79,7 +79,9 @@ - - SETS(setIndex++, p->sp_namp); - SETS(setIndex++, p->sp_pwdp); -+#ifndef __HAIKU__ - SETI(setIndex++, p->sp_lstchg); -+#endif - SETI(setIndex++, p->sp_min); - SETI(setIndex++, p->sp_max); - SETI(setIndex++, p->sp_warn); -diff -ruN Python-2.6.4/Modules/timemodule.c Python-2.6.4-haiku/Modules/timemodule.c ---- Python-2.6.4/Modules/timemodule.c 2008-07-05 13:19:50.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/timemodule.c 2009-10-27 13:31:08.000000000 -0600 -@@ -968,11 +968,11 @@ - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -ruN Python-2.6.4/Parser/asdl_c.py Python-2.6.4-haiku/Parser/asdl_c.py ---- Python-2.6.4/Parser/asdl_c.py 2008-11-07 01:56:27.000000000 -0700 -+++ Python-2.6.4-haiku/Parser/asdl_c.py 2009-10-27 13:31:08.000000000 -0600 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - """Generate C code from an ASDL description.""" - - # TO DO -diff -ruN Python-2.6.4/Tools/scripts/h2py.py Python-2.6.4-haiku/Tools/scripts/h2py.py ---- Python-2.6.4/Tools/scripts/h2py.py 2004-08-09 11:27:55.000000000 -0600 -+++ Python-2.6.4-haiku/Tools/scripts/h2py.py 2009-10-27 13:31:08.000000000 -0600 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') -diff -ruN Python-2.6.4/configure.in Python-2.6.4-haiku/configure.in ---- Python-2.6.4/configure.in 2009-09-29 07:01:59.000000000 -0600 -+++ Python-2.6.4-haiku/configure.in 2009-10-27 13:31:08.000000000 -0600 -@@ -715,7 +715,7 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; -- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) -+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -@@ -793,7 +793,7 @@ - AC_SUBST(LN) - if test -z "$LN" ; then - case $ac_sys_system in -- BeOS*) LN="ln -s";; -+ BeOS*|Haiku*) LN="ln -s";; - CYGWIN*) LN="ln -s";; - atheos*) LN="ln -s";; - *) LN=ln;; -@@ -1766,7 +1766,7 @@ - fi - fi - ;; -- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; -+ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; - BSD/OS*/4*) LDSHARED="gcc -shared";; - FreeBSD*) - if [[ "`$CC -dM -E - - #include -diff -up Python-2.6.5/Modules/spwdmodule.c.orig Python-2.6.5/Modules/spwdmodule.c ---- Python-2.6.5/Modules/spwdmodule.c.orig 2008-06-08 22:58:54.041418752 -0600 -+++ Python-2.6.5/Modules/spwdmodule.c 2010-04-26 15:46:55.977534976 -0600 -@@ -79,7 +79,9 @@ static PyObject *mkspent(struct spwd *p) - - SETS(setIndex++, p->sp_namp); - SETS(setIndex++, p->sp_pwdp); -+#ifndef __HAIKU__ - SETI(setIndex++, p->sp_lstchg); -+#endif - SETI(setIndex++, p->sp_min); - SETI(setIndex++, p->sp_max); - SETI(setIndex++, p->sp_warn); -diff -up Python-2.6.5/Modules/timemodule.c.orig Python-2.6.5/Modules/timemodule.c ---- Python-2.6.5/Modules/timemodule.c.orig 2008-07-05 13:19:50.026214400 -0600 -+++ Python-2.6.5/Modules/timemodule.c 2010-04-26 15:46:56.001048576 -0600 -@@ -968,11 +968,11 @@ floatsleep(double secs) - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -up Python-2.6.5/Parser/asdl_c.py.orig Python-2.6.5/Parser/asdl_c.py ---- Python-2.6.5/Parser/asdl_c.py.orig 2009-12-12 17:59:01.002621440 -0700 -+++ Python-2.6.5/Parser/asdl_c.py 2010-04-26 15:46:56.004456448 -0600 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - """Generate C code from an ASDL description.""" - - # TO DO -diff -up Python-2.6.5/Python/bltinmodule.c.orig Python-2.6.5/Python/bltinmodule.c ---- Python-2.6.5/Python/bltinmodule.c.orig 2010-04-26 15:47:08.138936320 -0600 -+++ Python-2.6.5/Python/bltinmodule.c 2010-04-26 15:47:23.016777216 -0600 -@@ -18,7 +18,7 @@ - */ - #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) - const char *Py_FileSystemDefaultEncoding = "mbcs"; --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__HAIKU__) - const char *Py_FileSystemDefaultEncoding = "utf-8"; - #else - const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ -diff -up Python-2.6.5/Tools/scripts/h2py.py.orig Python-2.6.5/Tools/scripts/h2py.py ---- Python-2.6.5/Tools/scripts/h2py.py.orig 2004-08-09 11:27:55.006815744 -0600 -+++ Python-2.6.5/Tools/scripts/h2py.py 2010-04-26 15:46:56.047710208 -0600 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ except KeyError: - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') diff --git a/dev-lang/python/patches/python-2.6.6.patch b/dev-lang/python/patches/python-2.6.6.patch deleted file mode 100644 index b2b70cafd..000000000 --- a/dev-lang/python/patches/python-2.6.6.patch +++ /dev/null @@ -1,558 +0,0 @@ -diff -urN Python-2.6.6/Lib/plat-haiku1/IN.py Python-2.6.6-haiku/Lib/plat-haiku1/IN.py ---- Python-2.6.6/Lib/plat-haiku1/IN.py 1970-01-01 00:00:00.000000000 +0000 -+++ Python-2.6.6-haiku/Lib/plat-haiku1/IN.py 2010-08-30 04:52:27.223346688 +0000 -@@ -0,0 +1,327 @@ -+# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h -+ -+# Included from socket.h -+ -+# Included from BeBuild.h -+B_BEOS_VERSION_4 = 0x0400 -+B_BEOS_VERSION_4_5 = 0x0450 -+B_BEOS_VERSION_5 = 0x0500 -+B_BEOS_VERSION = B_BEOS_VERSION_5 -+B_BEOS_VERSION_MAUI = B_BEOS_VERSION_5 -+_PR2_COMPATIBLE_ = 1 -+_PR3_COMPATIBLE_ = 1 -+_R4_COMPATIBLE_ = 1 -+_R4_5_COMPATIBLE_ = 1 -+_PR2_COMPATIBLE_ = 0 -+_PR3_COMPATIBLE_ = 0 -+_R4_COMPATIBLE_ = 1 -+_R4_5_COMPATIBLE_ = 1 -+def _UNUSED(x): return x -+ -+ -+# Included from sys/types.h -+ -+# Included from time.h -+ -+# Included from be_setup.h -+def __std(ref): return ref -+ -+__be_os = 2 -+__dest_os = __be_os -+__MSL__ = 0x4011 -+__GLIBC__ = -2 -+__GLIBC_MINOR__ = 1 -+ -+# Included from null.h -+NULL = (0) -+NULL = 0L -+ -+# Included from size_t.h -+ -+# Included from stddef.h -+ -+# Included from wchar_t.h -+CLOCKS_PER_SEC = 1000 -+CLK_TCK = CLOCKS_PER_SEC -+MAX_TIMESTR = 70 -+ -+# Included from sys/time.h -+ -+# Included from ByteOrder.h -+ -+# Included from endian.h -+__LITTLE_ENDIAN = 1234 -+LITTLE_ENDIAN = __LITTLE_ENDIAN -+__BYTE_ORDER = __LITTLE_ENDIAN -+BYTE_ORDER = __BYTE_ORDER -+__BIG_ENDIAN = 0 -+BIG_ENDIAN = 0 -+__BIG_ENDIAN = 4321 -+BIG_ENDIAN = __BIG_ENDIAN -+__BYTE_ORDER = __BIG_ENDIAN -+BYTE_ORDER = __BYTE_ORDER -+__LITTLE_ENDIAN = 0 -+LITTLE_ENDIAN = 0 -+__PDP_ENDIAN = 3412 -+PDP_ENDIAN = __PDP_ENDIAN -+ -+# Included from SupportDefs.h -+ -+# Included from Errors.h -+ -+# Included from limits.h -+ -+# Included from float.h -+FLT_ROUNDS = 1 -+FLT_RADIX = 2 -+FLT_MANT_DIG = 24 -+FLT_DIG = 6 -+FLT_MIN_EXP = (-125) -+FLT_MIN_10_EXP = (-37) -+FLT_MAX_EXP = 128 -+FLT_MAX_10_EXP = 38 -+DBL_MANT_DIG = 53 -+DBL_DIG = 15 -+DBL_MIN_EXP = (-1021) -+DBL_MIN_10_EXP = (-308) -+DBL_MAX_EXP = 1024 -+DBL_MAX_10_EXP = 308 -+LDBL_MANT_DIG = DBL_MANT_DIG -+LDBL_DIG = DBL_DIG -+LDBL_MIN_EXP = DBL_MIN_EXP -+LDBL_MIN_10_EXP = DBL_MIN_10_EXP -+LDBL_MAX_EXP = DBL_MAX_EXP -+LDBL_MAX_10_EXP = DBL_MAX_10_EXP -+CHAR_BIT = (8) -+SCHAR_MIN = (-127-1) -+SCHAR_MAX = (127) -+CHAR_MIN = SCHAR_MIN -+CHAR_MAX = SCHAR_MAX -+MB_LEN_MAX = (1) -+SHRT_MIN = (-32767-1) -+SHRT_MAX = (32767) -+LONG_MIN = (-2147483647L-1) -+LONG_MAX = (2147483647L) -+INT_MIN = LONG_MIN -+INT_MAX = LONG_MAX -+ARG_MAX = (32768) -+ATEXIT_MAX = (32) -+CHILD_MAX = (1024) -+IOV_MAX = (256) -+FILESIZEBITS = (64) -+LINK_MAX = (1) -+LOGIN_NAME_MAX = (32) -+MAX_CANON = (255) -+MAX_INPUT = (255) -+NAME_MAX = (256) -+NGROUPS_MAX = (32) -+OPEN_MAX = (128) -+PATH_MAX = (1024) -+PIPE_MAX = (512) -+SSIZE_MAX = (2147483647L) -+TTY_NAME_MAX = (256) -+TZNAME_MAX = (32) -+SYMLINKS_MAX = (16) -+_POSIX_ARG_MAX = (32768) -+_POSIX_CHILD_MAX = (1024) -+_POSIX_LINK_MAX = (1) -+_POSIX_LOGIN_NAME_MAX = (9) -+_POSIX_MAX_CANON = (255) -+_POSIX_MAX_INPUT = (255) -+_POSIX_NAME_MAX = (255) -+_POSIX_NGROUPS_MAX = (0) -+_POSIX_OPEN_MAX = (128) -+_POSIX_PATH_MAX = (1024) -+_POSIX_PIPE_BUF = (512) -+_POSIX_SSIZE_MAX = (2147483647L) -+_POSIX_STREAM_MAX = (8) -+_POSIX_TTY_NAME_MAX = (256) -+_POSIX_TZNAME_MAX = (3) -+B_GENERAL_ERROR_BASE = LONG_MIN -+B_OS_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x1000 -+B_APP_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x2000 -+B_INTERFACE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x3000 -+B_MEDIA_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4000 -+B_TRANSLATION_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4800 -+B_MIDI_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x5000 -+B_STORAGE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x6000 -+B_POSIX_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x7000 -+B_MAIL_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x8000 -+B_PRINT_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x9000 -+B_DEVICE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0xa000 -+B_ERRORS_END = (B_GENERAL_ERROR_BASE + 0xffff) -+E2BIG = (B_POSIX_ERROR_BASE + 1) -+ECHILD = (B_POSIX_ERROR_BASE + 2) -+EDEADLK = (B_POSIX_ERROR_BASE + 3) -+EFBIG = (B_POSIX_ERROR_BASE + 4) -+EMLINK = (B_POSIX_ERROR_BASE + 5) -+ENFILE = (B_POSIX_ERROR_BASE + 6) -+ENODEV = (B_POSIX_ERROR_BASE + 7) -+ENOLCK = (B_POSIX_ERROR_BASE + 8) -+ENOSYS = (B_POSIX_ERROR_BASE + 9) -+ENOTTY = (B_POSIX_ERROR_BASE + 10) -+ENXIO = (B_POSIX_ERROR_BASE + 11) -+ESPIPE = (B_POSIX_ERROR_BASE + 12) -+ESRCH = (B_POSIX_ERROR_BASE + 13) -+EFPOS = (B_POSIX_ERROR_BASE + 14) -+ESIGPARM = (B_POSIX_ERROR_BASE + 15) -+EDOM = (B_POSIX_ERROR_BASE + 16) -+ERANGE = (B_POSIX_ERROR_BASE + 17) -+EPROTOTYPE = (B_POSIX_ERROR_BASE + 18) -+EPROTONOSUPPORT = (B_POSIX_ERROR_BASE + 19) -+EPFNOSUPPORT = (B_POSIX_ERROR_BASE + 20) -+EAFNOSUPPORT = (B_POSIX_ERROR_BASE + 21) -+EADDRINUSE = (B_POSIX_ERROR_BASE + 22) -+EADDRNOTAVAIL = (B_POSIX_ERROR_BASE + 23) -+ENETDOWN = (B_POSIX_ERROR_BASE + 24) -+ENETUNREACH = (B_POSIX_ERROR_BASE + 25) -+ENETRESET = (B_POSIX_ERROR_BASE + 26) -+ECONNABORTED = (B_POSIX_ERROR_BASE + 27) -+ECONNRESET = (B_POSIX_ERROR_BASE + 28) -+EISCONN = (B_POSIX_ERROR_BASE + 29) -+ENOTCONN = (B_POSIX_ERROR_BASE + 30) -+ESHUTDOWN = (B_POSIX_ERROR_BASE + 31) -+ECONNREFUSED = (B_POSIX_ERROR_BASE + 32) -+EHOSTUNREACH = (B_POSIX_ERROR_BASE + 33) -+ENOPROTOOPT = (B_POSIX_ERROR_BASE + 34) -+ENOBUFS = (B_POSIX_ERROR_BASE + 35) -+EINPROGRESS = (B_POSIX_ERROR_BASE + 36) -+EALREADY = (B_POSIX_ERROR_BASE + 37) -+EILSEQ = (B_POSIX_ERROR_BASE + 38) -+ENOMSG = (B_POSIX_ERROR_BASE + 39) -+ESTALE = (B_POSIX_ERROR_BASE + 40) -+EOVERFLOW = (B_POSIX_ERROR_BASE + 41) -+EMSGSIZE = (B_POSIX_ERROR_BASE + 42) -+EOPNOTSUPP = (B_POSIX_ERROR_BASE + 43) -+ENOTSOCK = (B_POSIX_ERROR_BASE + 44) -+false = 0 -+true = 1 -+NULL = (0) -+FALSE = 0 -+TRUE = 1 -+ -+# Included from TypeConstants.h -+B_HOST_IS_LENDIAN = 1 -+B_HOST_IS_BENDIAN = 0 -+def B_HOST_TO_LENDIAN_DOUBLE(arg): return (double)(arg) -+ -+def B_HOST_TO_LENDIAN_FLOAT(arg): return (float)(arg) -+ -+def B_HOST_TO_LENDIAN_INT64(arg): return (uint64)(arg) -+ -+def B_HOST_TO_LENDIAN_INT32(arg): return (uint32)(arg) -+ -+def B_HOST_TO_LENDIAN_INT16(arg): return (uint16)(arg) -+ -+def B_HOST_TO_BENDIAN_DOUBLE(arg): return __swap_double(arg) -+ -+def B_HOST_TO_BENDIAN_FLOAT(arg): return __swap_float(arg) -+ -+def B_HOST_TO_BENDIAN_INT64(arg): return __swap_int64(arg) -+ -+def B_HOST_TO_BENDIAN_INT32(arg): return __swap_int32(arg) -+ -+def B_HOST_TO_BENDIAN_INT16(arg): return __swap_int16(arg) -+ -+def B_LENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) -+ -+def B_LENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) -+ -+def B_LENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) -+ -+def B_LENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) -+ -+def B_LENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) -+ -+def B_BENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) -+ -+def B_BENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) -+ -+def B_BENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) -+ -+def B_BENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) -+ -+def B_BENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) -+ -+B_HOST_IS_LENDIAN = 0 -+B_HOST_IS_BENDIAN = 1 -+def B_HOST_TO_LENDIAN_DOUBLE(arg): return __swap_double(arg) -+ -+def B_HOST_TO_LENDIAN_FLOAT(arg): return __swap_float(arg) -+ -+def B_HOST_TO_LENDIAN_INT64(arg): return __swap_int64(arg) -+ -+def B_HOST_TO_LENDIAN_INT32(arg): return __swap_int32(arg) -+ -+def B_HOST_TO_LENDIAN_INT16(arg): return __swap_int16(arg) -+ -+def B_HOST_TO_BENDIAN_DOUBLE(arg): return (double)(arg) -+ -+def B_HOST_TO_BENDIAN_FLOAT(arg): return (float)(arg) -+ -+def B_HOST_TO_BENDIAN_INT64(arg): return (uint64)(arg) -+ -+def B_HOST_TO_BENDIAN_INT32(arg): return (uint32)(arg) -+ -+def B_HOST_TO_BENDIAN_INT16(arg): return (uint16)(arg) -+ -+def B_LENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) -+ -+def B_LENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) -+ -+def B_LENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) -+ -+def B_LENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) -+ -+def B_LENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) -+ -+def B_BENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) -+ -+def B_BENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) -+ -+def B_BENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) -+ -+def B_BENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) -+ -+def B_BENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) -+ -+def B_SWAP_DOUBLE(arg): return __swap_double(arg) -+ -+def B_SWAP_FLOAT(arg): return __swap_float(arg) -+ -+def B_SWAP_INT64(arg): return __swap_int64(arg) -+ -+def B_SWAP_INT32(arg): return __swap_int32(arg) -+ -+def B_SWAP_INT16(arg): return __swap_int16(arg) -+ -+def htonl(x): return B_HOST_TO_BENDIAN_INT32(x) -+ -+def ntohl(x): return B_BENDIAN_TO_HOST_INT32(x) -+ -+def htons(x): return B_HOST_TO_BENDIAN_INT16(x) -+ -+def ntohs(x): return B_BENDIAN_TO_HOST_INT16(x) -+ -+AF_INET = 1 -+INADDR_ANY = 0x00000000 -+INADDR_BROADCAST = 0xffffffff -+INADDR_LOOPBACK = 0x7f000001 -+SOL_SOCKET = 1 -+SO_DEBUG = 1 -+SO_REUSEADDR = 2 -+SO_NONBLOCK = 3 -+SO_REUSEPORT = 4 -+MSG_OOB = 0x1 -+SOCK_DGRAM = 1 -+SOCK_STREAM = 2 -+IPPROTO_UDP = 1 -+IPPROTO_TCP = 2 -+IPPROTO_ICMP = 3 -+B_UDP_MAX_SIZE = (65536 - 1024) -+FD_SETSIZE = 256 -+FDSETSIZE = FD_SETSIZE -+NFDBITS = 32 -+def _FDMSKNO(fd): return ((fd) / NFDBITS) -+ -+def _FDBITNO(fd): return ((fd) % NFDBITS) -diff -urN Python-2.6.6/Lib/plat-haiku1/regen Python-2.6.6-haiku/Lib/plat-haiku1/regen ---- Python-2.6.6/Lib/plat-haiku1/regen 1970-01-01 00:00:00.000000000 +0000 -+++ Python-2.6.6-haiku/Lib/plat-haiku1/regen 2010-08-30 04:52:27.237502464 +0000 -@@ -0,0 +1,7 @@ -+#! /bin/sh -+ -+H2PY=../../Tools/scripts/h2py.py -+HEADERS=/boot/develop/headers -+ -+set -v -+python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h -diff -urN Python-2.6.6/Modules/resource.c Python-2.6.6-haiku/Modules/resource.c ---- Python-2.6.6/Modules/resource.c 2010-05-09 15:15:40.053739520 +0000 -+++ Python-2.6.6-haiku/Modules/resource.c 2010-08-30 04:52:24.666370048 +0000 -@@ -86,6 +86,7 @@ - PyFloat_FromDouble(doubletime(ru.ru_utime))); - PyStructSequence_SET_ITEM(result, 1, - PyFloat_FromDouble(doubletime(ru.ru_stime))); -+#ifndef __HAIKU__ - PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss)); - PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss)); - PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss)); -@@ -100,7 +101,7 @@ - PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); - PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); - PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); -- -+#endif - if (PyErr_Occurred()) { - Py_DECREF(result); - return NULL; -diff -urN Python-2.6.6/Modules/socketmodule.c Python-2.6.6-haiku/Modules/socketmodule.c ---- Python-2.6.6/Modules/socketmodule.c 2010-05-23 15:22:08.054525952 +0000 -+++ Python-2.6.6-haiku/Modules/socketmodule.c 2010-08-30 04:53:35.429916160 +0000 -@@ -4661,7 +4661,9 @@ - #ifndef __BEOS__ - /* We have incomplete socket support. */ - PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW); -- PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); -+#ifndef __HAIKU__ -+ PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); -+#endif - #if defined(SOCK_RDM) - PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); - #endif -diff -urN Python-2.6.6/Modules/socketmodule.h Python-2.6.6-haiku/Modules/socketmodule.h ---- Python-2.6.6/Modules/socketmodule.h 2010-05-09 15:15:40.053739520 +0000 -+++ Python-2.6.6-haiku/Modules/socketmodule.h 2010-08-30 04:52:24.667942912 +0000 -@@ -47,6 +47,10 @@ - # undef AF_NETLINK - #endif - -+#if defined(__HAIKU__) -+#undef HAVE_BLUETOOTH_BLUETOOTH_H -+#endif -+ - #ifdef HAVE_BLUETOOTH_BLUETOOTH_H - #include - #include -diff -urN Python-2.6.6/Modules/spwdmodule.c Python-2.6.6-haiku/Modules/spwdmodule.c ---- Python-2.6.6/Modules/spwdmodule.c 2010-05-09 15:15:40.030408704 +0000 -+++ Python-2.6.6-haiku/Modules/spwdmodule.c 2010-08-30 04:52:24.709623808 +0000 -@@ -79,7 +79,9 @@ - - SETS(setIndex++, p->sp_namp); - SETS(setIndex++, p->sp_pwdp); -+#ifndef __HAIKU__ - SETI(setIndex++, p->sp_lstchg); -+#endif - SETI(setIndex++, p->sp_min); - SETI(setIndex++, p->sp_max); - SETI(setIndex++, p->sp_warn); -diff -urN Python-2.6.6/Modules/timemodule.c Python-2.6.6-haiku/Modules/timemodule.c ---- Python-2.6.6/Modules/timemodule.c 2010-05-09 15:15:40.015204352 +0000 -+++ Python-2.6.6-haiku/Modules/timemodule.c 2010-08-30 04:52:24.721944576 +0000 -@@ -968,11 +968,11 @@ - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -urN Python-2.6.6/Parser/asdl_c.py Python-2.6.6-haiku/Parser/asdl_c.py ---- Python-2.6.6/Parser/asdl_c.py 2009-12-13 00:59:01.059768832 +0000 -+++ Python-2.6.6-haiku/Parser/asdl_c.py 2010-08-30 04:52:27.169607168 +0000 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - """Generate C code from an ASDL description.""" - - # TO DO -diff -urN Python-2.6.6/Python/bltinmodule.c Python-2.6.6-haiku/Python/bltinmodule.c ---- Python-2.6.6/Python/bltinmodule.c 2010-05-09 15:15:40.065011712 +0000 -+++ Python-2.6.6-haiku/Python/bltinmodule.c 2010-08-30 04:52:27.186646528 +0000 -@@ -18,7 +18,7 @@ - */ - #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) - const char *Py_FileSystemDefaultEncoding = "mbcs"; --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__HAIKU__) - const char *Py_FileSystemDefaultEncoding = "utf-8"; - #else - const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ -diff -urN Python-2.6.6/Tools/scripts/h2py.py Python-2.6.6-haiku/Tools/scripts/h2py.py ---- Python-2.6.6/Tools/scripts/h2py.py 2004-08-09 17:27:55.066584576 +0000 -+++ Python-2.6.6-haiku/Tools/scripts/h2py.py 2010-08-30 04:52:27.188219392 +0000 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') -diff -urN Python-2.6.6/configure.in Python-2.6.6-haiku/configure.in ---- Python-2.6.6/configure.in 2010-05-25 02:27:03.064225280 +0000 -+++ Python-2.6.6-haiku/configure.in 2010-08-30 04:52:27.207880192 +0000 -@@ -745,7 +745,7 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; -- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) -+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -@@ -823,7 +823,7 @@ - AC_SUBST(LN) - if test -z "$LN" ; then - case $ac_sys_system in -- BeOS*) LN="ln -s";; -+ BeOS*|Haiku*) LN="ln -s";; - CYGWIN*) LN="ln -s";; - atheos*) LN="ln -s";; - *) LN=ln;; -@@ -1829,7 +1829,7 @@ - fi - fi - ;; -- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; -+ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; - BSD/OS*/4*) LDSHARED="gcc -shared";; - FreeBSD*) - if [[ "`$CC -dM -E - - #include -diff -urN Python-2.6.7/Modules/spwdmodule.c Python-2.6.7-haiku/Modules/spwdmodule.c ---- Python-2.6.7/Modules/spwdmodule.c 2010-05-09 15:15:40.030408704 +0000 -+++ Python-2.6.7-haiku/Modules/spwdmodule.c 2010-08-30 04:52:24.709623808 +0000 -@@ -79,7 +79,9 @@ - - SETS(setIndex++, p->sp_namp); - SETS(setIndex++, p->sp_pwdp); -+#ifndef __HAIKU__ - SETI(setIndex++, p->sp_lstchg); -+#endif - SETI(setIndex++, p->sp_min); - SETI(setIndex++, p->sp_max); - SETI(setIndex++, p->sp_warn); -diff -urN Python-2.6.7/Modules/timemodule.c Python-2.6.7-haiku/Modules/timemodule.c ---- Python-2.6.7/Modules/timemodule.c 2010-05-09 15:15:40.015204352 +0000 -+++ Python-2.6.7-haiku/Modules/timemodule.c 2010-08-30 04:52:24.721944576 +0000 -@@ -972,11 +972,11 @@ - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -urN Python-2.6.7/Parser/asdl_c.py Python-2.6.7-haiku/Parser/asdl_c.py ---- Python-2.6.7/Parser/asdl_c.py 2009-12-13 00:59:01.059768832 +0000 -+++ Python-2.6.7-haiku/Parser/asdl_c.py 2010-08-30 04:52:27.169607168 +0000 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - """Generate C code from an ASDL description.""" - - # TO DO -diff -urN Python-2.6.7/Python/bltinmodule.c Python-2.6.7-haiku/Python/bltinmodule.c ---- Python-2.6.7/Python/bltinmodule.c 2010-05-09 15:15:40.065011712 +0000 -+++ Python-2.6.7-haiku/Python/bltinmodule.c 2010-08-30 04:52:27.186646528 +0000 -@@ -18,7 +18,7 @@ - */ - #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) - const char *Py_FileSystemDefaultEncoding = "mbcs"; --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__HAIKU__) - const char *Py_FileSystemDefaultEncoding = "utf-8"; - #else - const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ -diff -urN Python-2.6.7/Tools/scripts/h2py.py Python-2.6.7-haiku/Tools/scripts/h2py.py ---- Python-2.6.7/Tools/scripts/h2py.py 2004-08-09 17:27:55.066584576 +0000 -+++ Python-2.6.7-haiku/Tools/scripts/h2py.py 2010-08-30 04:52:27.188219392 +0000 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') -diff -urN Python-2.6.7/configure.in Python-2.6.7-haiku/configure.in ---- Python-2.6.7/configure.in 2010-05-25 02:27:03.064225280 +0000 -+++ Python-2.6.7-haiku/configure.in 2010-08-30 04:52:27.207880192 +0000 -@@ -745,7 +745,7 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; -- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) -+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -@@ -823,7 +823,7 @@ - AC_SUBST(LN) - if test -z "$LN" ; then - case $ac_sys_system in -- BeOS*) LN="ln -s";; -+ BeOS*|Haiku*) LN="ln -s";; - CYGWIN*) LN="ln -s";; - atheos*) LN="ln -s";; - *) LN=ln;; -@@ -1829,7 +1829,7 @@ - fi - fi - ;; -- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; -+ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; - BSD/OS*/4*) LDSHARED="gcc -shared";; - FreeBSD*) - if [[ "`$CC -dM -E - > configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL() -{ - cd Python-2.6.4 - make install -} -LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" diff --git a/dev-lang/python/python-2.6.5.recipe b/dev-lang/python/python-2.6.5.recipe deleted file mode 100644 index ee375a445..000000000 --- a/dev-lang/python/python-2.6.5.recipe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/2.6.5/Python-2.6.5.tgz" -CHECKSUM_MD5="cd04b5b9383b6c1fccdaa991af762cf4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd Python-2.6.5/Modules/_ctypes/libffi - libtoolize --force --copy --install - cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared LDFLAGS=-L/boot/common/lib CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL() -{ - cd Python-2.6.5 - make install -} -LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" diff --git a/dev-lang/python/python-2.6.6.recipe b/dev-lang/python/python-2.6.6.recipe deleted file mode 100644 index cdc28008f..000000000 --- a/dev-lang/python/python-2.6.6.recipe +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/2.6.6/Python-2.6.6.tar.bz2" -CHECKSUM_MD5="cf4e6881bb84a7ce6089e4a307f71f14" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/readline >= 6.0" -BUILD() -{ - cd Python-2.6.6/Modules/_ctypes/libffi - libtoolize --force --copy --install - cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-shared LDFLAGS=-L/boot/common/lib \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL() -{ - cd Python-2.6.6 - make install -} - -TEST() -{ - cd Python-2.6.6 - cd Lib/test - rm test_asynchat.py # this one stalls, so skip it for now - rm test_multiprocessing.py # this one stalls, so skip it for now - - python regrtest.py -} - -LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" diff --git a/dev-lang/python/python-2.6.7.recipe b/dev-lang/python/python-2.6.7.recipe deleted file mode 100644 index af4de579a..000000000 --- a/dev-lang/python/python-2.6.7.recipe +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/2.6.7/Python-2.6.7.tar.bz2" -CHECKSUM_MD5="d40ef58ed88438a870bbeb0ac5d4217b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/readline >= 6.0" -BUILD() -{ - cd Python-2.6.7/Modules/_ctypes/libffi - libtoolize --force --copy --install - cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-shared LDFLAGS=-L/boot/common/lib \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL() -{ - cd Python-2.6.7 - make install -} - -TEST() -{ - cd Python-2.6.7 - cd Lib/test - rm test_asynchat.py # this one stalls, so skip it for now - rm test_multiprocessing.py # this one stalls, so skip it for now - - python regrtest.py -} - -LICENSE="Python" -COPYRIGHT="1990-2011, Python Software Foundation" From f9c0aa28b422990b5d746a77491f760725b4dbc9 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 24 Apr 2013 21:23:46 +0000 Subject: [PATCH 209/587] Mesa: Update Mesa 7.8.2 patch * Utilize mmap vs malloc due to the new NX support * GL applications no longer crash * Fixes #9685 gcc2 --- sys-libs/mesa/patches/mesa-7.8.2.patch | 48 ++++++++++++++++---------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/sys-libs/mesa/patches/mesa-7.8.2.patch b/sys-libs/mesa/patches/mesa-7.8.2.patch index a01fc9d20..d51062ec9 100644 --- a/sys-libs/mesa/patches/mesa-7.8.2.patch +++ b/sys-libs/mesa/patches/mesa-7.8.2.patch @@ -1,6 +1,6 @@ diff -Naur Mesa-7.8.2/bin/mklib Mesa-7.8.2-haiku/bin/mklib ---- Mesa-7.8.2/bin/mklib 2010-06-15 17:43:41.034865152 +0000 -+++ Mesa-7.8.2-haiku/bin/mklib 2013-02-17 22:26:13.017301504 +0000 +--- Mesa-7.8.2/bin/mklib 2010-06-15 17:43:41.036438016 +0000 ++++ Mesa-7.8.2-haiku/bin/mklib 2013-04-24 20:34:52.664010752 +0000 @@ -260,7 +260,7 @@ NEWOBJECTS="" for OBJ in $OBJECTS ; do @@ -236,7 +236,7 @@ diff -Naur Mesa-7.8.2/bin/mklib Mesa-7.8.2-haiku/bin/mklib fi diff -Naur Mesa-7.8.2/configs/current Mesa-7.8.2-haiku/configs/current --- Mesa-7.8.2/configs/current 1970-01-01 00:00:00.000000000 +0000 -+++ Mesa-7.8.2-haiku/configs/current 2013-02-17 22:26:13.021495808 +0000 ++++ Mesa-7.8.2-haiku/configs/current 2013-04-24 20:34:52.673972224 +0000 @@ -0,0 +1,63 @@ +# Configuration for Haiku +# Written by Alexander von Gluck IV @@ -303,7 +303,7 @@ diff -Naur Mesa-7.8.2/configs/current Mesa-7.8.2-haiku/configs/current +APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB) diff -Naur Mesa-7.8.2/configs/haiku Mesa-7.8.2-haiku/configs/haiku --- Mesa-7.8.2/configs/haiku 1970-01-01 00:00:00.000000000 +0000 -+++ Mesa-7.8.2-haiku/configs/haiku 2013-02-17 22:26:13.031195136 +0000 ++++ Mesa-7.8.2-haiku/configs/haiku 2013-04-24 20:34:52.675282944 +0000 @@ -0,0 +1,63 @@ +# Configuration for Haiku +# Written by Alexander von Gluck IV @@ -369,8 +369,8 @@ diff -Naur Mesa-7.8.2/configs/haiku Mesa-7.8.2-haiku/configs/haiku +GLU_LIB_DEPS = +APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB) diff -Naur Mesa-7.8.2/include/GL/gl.h Mesa-7.8.2-haiku/include/GL/gl.h ---- Mesa-7.8.2/include/GL/gl.h 2010-04-27 21:41:21.060555264 +0000 -+++ Mesa-7.8.2-haiku/include/GL/gl.h 2013-02-17 22:30:31.274989056 +0000 +--- Mesa-7.8.2/include/GL/gl.h 2010-04-27 21:41:21.061865984 +0000 ++++ Mesa-7.8.2-haiku/include/GL/gl.h 2013-04-24 20:34:52.693895168 +0000 @@ -67,7 +67,8 @@ #elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */ # define GLAPI extern @@ -382,8 +382,8 @@ diff -Naur Mesa-7.8.2/include/GL/gl.h Mesa-7.8.2-haiku/include/GL/gl.h # define GLAPIENTRY #endif /* WIN32 && !CYGWIN */ diff -Naur Mesa-7.8.2/Makefile Mesa-7.8.2-haiku/Makefile ---- Mesa-7.8.2/Makefile 2010-06-16 21:22:57.033292288 +0000 -+++ Mesa-7.8.2-haiku/Makefile 2013-02-17 22:26:13.034340864 +0000 +--- Mesa-7.8.2/Makefile 2010-06-16 21:22:57.034865152 +0000 ++++ Mesa-7.8.2-haiku/Makefile 2013-04-24 20:34:52.695468032 +0000 @@ -84,6 +84,7 @@ freebsd-dri \ freebsd-dri-amd64 \ @@ -393,8 +393,8 @@ diff -Naur Mesa-7.8.2/Makefile Mesa-7.8.2-haiku/Makefile hpux10-gcc \ hpux10-static \ diff -Naur Mesa-7.8.2/src/gallium/auxiliary/draw/draw_private.h Mesa-7.8.2-haiku/src/gallium/auxiliary/draw/draw_private.h ---- Mesa-7.8.2/src/gallium/auxiliary/draw/draw_private.h 2010-06-15 17:43:42.046661632 +0000 -+++ Mesa-7.8.2-haiku/src/gallium/auxiliary/draw/draw_private.h 2013-02-17 22:26:13.037486592 +0000 +--- Mesa-7.8.2/src/gallium/auxiliary/draw/draw_private.h 2010-06-15 17:43:42.048234496 +0000 ++++ Mesa-7.8.2-haiku/src/gallium/auxiliary/draw/draw_private.h 2013-04-24 20:34:52.704380928 +0000 @@ -70,7 +70,7 @@ /* This will probably become float (*data)[4] soon: @@ -405,8 +405,8 @@ diff -Naur Mesa-7.8.2/src/gallium/auxiliary/draw/draw_private.h Mesa-7.8.2-haiku /* NOTE: It should match vertex_id size above */ diff -Naur Mesa-7.8.2/src/gallium/auxiliary/os/os_thread.h Mesa-7.8.2-haiku/src/gallium/auxiliary/os/os_thread.h ---- Mesa-7.8.2/src/gallium/auxiliary/os/os_thread.h 2010-06-15 17:43:42.056623104 +0000 -+++ Mesa-7.8.2-haiku/src/gallium/auxiliary/os/os_thread.h 2013-02-17 22:26:13.040370176 +0000 +--- Mesa-7.8.2/src/gallium/auxiliary/os/os_thread.h 2010-06-15 17:43:42.058195968 +0000 ++++ Mesa-7.8.2-haiku/src/gallium/auxiliary/os/os_thread.h 2013-04-24 20:34:52.705953792 +0000 @@ -257,7 +257,7 @@ * pipe_barrier */ @@ -417,8 +417,8 @@ diff -Naur Mesa-7.8.2/src/gallium/auxiliary/os/os_thread.h Mesa-7.8.2-haiku/src/ typedef pthread_barrier_t pipe_barrier; diff -Naur Mesa-7.8.2/src/gallium/auxiliary/util/u_debug.h Mesa-7.8.2-haiku/src/gallium/auxiliary/util/u_debug.h ---- Mesa-7.8.2/src/gallium/auxiliary/util/u_debug.h 2010-06-15 17:43:42.000000000 +0000 -+++ Mesa-7.8.2-haiku/src/gallium/auxiliary/util/u_debug.h 2013-02-17 22:26:13.046923776 +0000 +--- Mesa-7.8.2/src/gallium/auxiliary/util/u_debug.h 2010-06-15 17:43:42.001572864 +0000 ++++ Mesa-7.8.2-haiku/src/gallium/auxiliary/util/u_debug.h 2013-04-24 20:34:52.728498176 +0000 @@ -91,8 +91,10 @@ (void) format; /* silence warning */ #endif @@ -433,8 +433,8 @@ diff -Naur Mesa-7.8.2/src/gallium/auxiliary/util/u_debug.h Mesa-7.8.2-haiku/src/ /* * ... isn't portable so we need to pass arguments in parentheses. diff -Naur Mesa-7.8.2/src/glu/sgi/Makefile Mesa-7.8.2-haiku/src/glu/sgi/Makefile ---- Mesa-7.8.2/src/glu/sgi/Makefile 2010-02-05 00:10:40.064487424 +0000 -+++ Mesa-7.8.2-haiku/src/glu/sgi/Makefile 2013-02-17 22:26:13.049545216 +0000 +--- Mesa-7.8.2/src/glu/sgi/Makefile 2010-02-05 00:10:40.066060288 +0000 ++++ Mesa-7.8.2-haiku/src/glu/sgi/Makefile 2013-04-24 20:34:52.730071040 +0000 @@ -135,13 +135,19 @@ -mkdir $(TOP)/$(LIB_DIR) @@ -457,8 +457,8 @@ diff -Naur Mesa-7.8.2/src/glu/sgi/Makefile Mesa-7.8.2-haiku/src/glu/sgi/Makefile clean: -rm -f *.o */*.o */*/*.o diff -Naur Mesa-7.8.2/src/mesa/glapi/glapi.h Mesa-7.8.2-haiku/src/mesa/glapi/glapi.h ---- Mesa-7.8.2/src/mesa/glapi/glapi.h 2010-06-15 17:43:43.026476544 +0000 -+++ Mesa-7.8.2-haiku/src/mesa/glapi/glapi.h 2013-02-17 22:26:13.052428800 +0000 +--- Mesa-7.8.2/src/mesa/glapi/glapi.h 2010-06-15 17:43:43.028049408 +0000 ++++ Mesa-7.8.2-haiku/src/mesa/glapi/glapi.h 2013-04-24 20:34:52.747634688 +0000 @@ -62,7 +62,7 @@ #endif @@ -468,3 +468,15 @@ diff -Naur Mesa-7.8.2/src/mesa/glapi/glapi.h Mesa-7.8.2-haiku/src/mesa/glapi/gla # define likely(x) __builtin_expect(!!(x), 1) # define unlikely(x) __builtin_expect(!!(x), 0) #else +diff -Naur Mesa-7.8.2/src/mesa/main/execmem.c Mesa-7.8.2-haiku/src/mesa/main/execmem.c +--- Mesa-7.8.2/src/mesa/main/execmem.c 2010-04-27 21:41:21.011272192 +0000 ++++ Mesa-7.8.2-haiku/src/mesa/main/execmem.c 2013-04-24 20:35:32.244056064 +0000 +@@ -36,7 +36,7 @@ + + + +-#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) ++#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__) + + /* + * Allocate a large block of memory which can hold code then dole it out From 6003610c35c89047f1cd2ff69e57b0665d556145 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sat, 27 Apr 2013 01:51:39 +0000 Subject: [PATCH 210/587] Mesa: Update 9.1.1 patch * Use mmap vs malloc for exec memory * Solves #9685 on gcc4 Conflicts: sys-libs/mesa/mesa-9.1.1.recipe --- sys-libs/mesa/mesa-9.1.1.recipe | 2 +- sys-libs/mesa/patches/mesa-9.1.1.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 sys-libs/mesa/patches/mesa-9.1.1.patch diff --git a/sys-libs/mesa/mesa-9.1.1.recipe b/sys-libs/mesa/mesa-9.1.1.recipe index d663f81c9..9e18d55ac 100644 --- a/sys-libs/mesa/mesa-9.1.1.recipe +++ b/sys-libs/mesa/mesa-9.1.1.recipe @@ -14,7 +14,7 @@ CHECKSUM_MD5="6ea2bdc3b7ecfb4257b39814b4182580" MESSAGE="This port only builds with gcc4. Not for general use." BUILD() { - export DEBUG=1 + export DEBUG=0 echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" echo "This generates a Mesa3D build package for Haiku... not for general use" echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" diff --git a/sys-libs/mesa/patches/mesa-9.1.1.patch b/sys-libs/mesa/patches/mesa-9.1.1.patch new file mode 100644 index 000000000..65aa229e8 --- /dev/null +++ b/sys-libs/mesa/patches/mesa-9.1.1.patch @@ -0,0 +1,12 @@ +diff -Naur Mesa-9.1.1/src/mesa/main/execmem.c Mesa-9.1.1-haiku/src/mesa/main/execmem.c +--- Mesa-9.1.1/src/mesa/main/execmem.c 2013-03-20 00:14:38.014417920 +0000 ++++ Mesa-9.1.1-haiku/src/mesa/main/execmem.c 2013-04-27 00:42:08.707264512 +0000 +@@ -36,7 +36,7 @@ + + + +-#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) ++#if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__) + + /* + * Allocate a large block of memory which can hold code then dole it out From 2ed97855e11605096ee3abfa69796bc0632d3628 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 28 Apr 2013 15:13:30 +0000 Subject: [PATCH 211/587] Mesa: Update Mesa 7.8.2 patch * ifeq vs ifdef to ensure DEBUG is disabled properly * call make haiku vs copying haiku to current * Fixes #9685 gcc2 debug --- sys-libs/mesa/mesa-7.8.2.recipe | 2 +- sys-libs/mesa/patches/mesa-7.8.2.patch | 71 +------------------------- 2 files changed, 3 insertions(+), 70 deletions(-) diff --git a/sys-libs/mesa/mesa-7.8.2.recipe b/sys-libs/mesa/mesa-7.8.2.recipe index e908cd79a..0b63bc774 100644 --- a/sys-libs/mesa/mesa-7.8.2.recipe +++ b/sys-libs/mesa/mesa-7.8.2.recipe @@ -16,7 +16,7 @@ BUILD() { export DEBUG=0 cd Mesa-7.8.2 - make + make haiku cd .. sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 7.8.2 ./Mesa-7.8.2 echo "There should be a Mesa OptionalBuild package in your home if everything went well!" diff --git a/sys-libs/mesa/patches/mesa-7.8.2.patch b/sys-libs/mesa/patches/mesa-7.8.2.patch index d51062ec9..7a4e37ab1 100644 --- a/sys-libs/mesa/patches/mesa-7.8.2.patch +++ b/sys-libs/mesa/patches/mesa-7.8.2.patch @@ -234,76 +234,9 @@ diff -Naur Mesa-7.8.2/bin/mklib Mesa-7.8.2-haiku/bin/mklib + mv ${FINAL_BINS} ${INSTALLDIR}/ + fi fi -diff -Naur Mesa-7.8.2/configs/current Mesa-7.8.2-haiku/configs/current ---- Mesa-7.8.2/configs/current 1970-01-01 00:00:00.000000000 +0000 -+++ Mesa-7.8.2-haiku/configs/current 2013-04-24 20:34:52.673972224 +0000 -@@ -0,0 +1,63 @@ -+# Configuration for Haiku -+# Written by Alexander von Gluck IV -+# -+# Based on the BeOS config -+# written by Philippe Houdoin -+ -+include $(TOP)/configs/default -+ -+CONFIG_NAME = haiku -+ -+# Haiku settings -+ -+DEFINES = \ -+ -DBEOS_THREADS \ -+ -DGNU_ASSEMBLER \ -+ -DUSE_X86_ASM \ -+ -DUSE_MMX_ASM \ -+ -DUSE_3DNOW_ASM \ -+ -DUSE_SSE_ASM -+ -+MESA_ASM_SOURCES = $(X86_SOURCES) -+GLAPI_ASM_SOURCES = $(X86_API) -+ -+CC = gcc -+CXX = g++ -+LD = gcc -+ -+CFLAGS = -Wall -Wno-multichar $(DEFINES) -+CXXFLAGS = $(CFLAGS) -+LDFLAGS += -+ -+# Work around aliasing bugs - developers should comment this out -+CFLAGS += -fno-strict-aliasing -+#CFLAGS += -std=c99 -+CXXFLAGS += -fno-strict-aliasing -+ -+# No makedepend on Haiku, this will solve it -+MKDEP = true -+ -+# Debug defines -+ifdef DEBUG -+ CFLAGS += -g -O0 -+ LDFLAGS += -g -+ DEFINES += -DDEBUG -+else -+ CFLAGS += -O3 -+endif -+ -+# GLU settings -+GLU_LIB_NAME = libglu.a -+GLU_LIB = glu -+ -+# Directories -+SRC_DIRS = glsl mesa/x86 mapi/glapi mesa glu -+GLU_DIRS = sgi -+DRIVER_DIRS = -+PROGRAM_DIRS = -+ -+# Library/program dependencies -+GL_LIB_DEPS = -+OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -+GLU_LIB_DEPS = -+APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB) diff -Naur Mesa-7.8.2/configs/haiku Mesa-7.8.2-haiku/configs/haiku --- Mesa-7.8.2/configs/haiku 1970-01-01 00:00:00.000000000 +0000 -+++ Mesa-7.8.2-haiku/configs/haiku 2013-04-24 20:34:52.675282944 +0000 ++++ Mesa-7.8.2-haiku/configs/haiku 2013-04-28 15:02:58.028573696 +0000 @@ -0,0 +1,63 @@ +# Configuration for Haiku +# Written by Alexander von Gluck IV @@ -345,7 +278,7 @@ diff -Naur Mesa-7.8.2/configs/haiku Mesa-7.8.2-haiku/configs/haiku +MKDEP = true + +# Debug defines -+ifdef DEBUG ++ifeq ($(DEBUG),1) + CFLAGS += -g -O0 + LDFLAGS += -g + DEFINES += -DDEBUG From 60401255e65aca4fe6d065aa46c7cea9cbc27247 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 4 May 2013 02:48:06 +0200 Subject: [PATCH 212/587] Convert mesa 7.8.2 recipe to an actual recipe --- sys-libs/mesa/mesa-7.8.2.recipe | 67 +++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/sys-libs/mesa/mesa-7.8.2.recipe b/sys-libs/mesa/mesa-7.8.2.recipe index 0b63bc774..631423dba 100644 --- a/sys-libs/mesa/mesa-7.8.2.recipe +++ b/sys-libs/mesa/mesa-7.8.2.recipe @@ -1,26 +1,55 @@ -############################################################### -# THIS IS NOT FOR GENERAL USE! -# This builds a buildpackage for the Haiku build system to link -# the OpenGL kit!! -############################################################### +SUMMARY="Multi-platform GL implementation" +DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics. -DESCRIPTION="Mesa3D is a multi-platform GL implementation" -HOMEPAGE="http://www.freedesktop.org/" +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" SRC_URI="ftp://freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="6be2d343a0089bfd395ce02aaf8adb57" -MESSAGE="This port only builds with gcc2. Not for general use." +REVISION="2" +ARCHITECTURES="x86_gcc2 !x86" + +PROVIDES=" + mesa = $portVersion + lib:libglapi = $portVersion + lib:libglslcl = $portVersion + lib:libglslpp = $portVersion + lib:libglu = $portVersion + lib:libmesa = $portVersion + lib:libmesagallium = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + $REQUIRES + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="Mesa-$portVersion" + BUILD() { - export DEBUG=0 - cd Mesa-7.8.2 - make haiku - cd .. - sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 7.8.2 ./Mesa-7.8.2 - echo "There should be a Mesa OptionalBuild package in your home if everything went well!" + DEBUG=0 make $jobArgs haiku } -LICENSE="MIT" -COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." +INSTALL() +{ + # "make install" seems to be broken, so we copy the headers and libraries + # manually. + + mkdir -p $includeDir + cp -r include/* $includeDir + + mkdir -p $developLibDir + cp lib/libglu.a src/mesa/*.a src/glsl/*/*.a $developLibDir +} From 8b805bf3d9412cbf342cc9249ae215032b976aab Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 3 May 2013 23:57:46 +0200 Subject: [PATCH 213/587] Add recipe for asciidoc (required to build git documentation) --- app-text/asciidoc/asciidoc-8.6.8.recipe | 51 +++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 app-text/asciidoc/asciidoc-8.6.8.recipe diff --git a/app-text/asciidoc/asciidoc-8.6.8.recipe b/app-text/asciidoc/asciidoc-8.6.8.recipe new file mode 100644 index 000000000..6fa1f00c2 --- /dev/null +++ b/app-text/asciidoc/asciidoc-8.6.8.recipe @@ -0,0 +1,51 @@ +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." +HOMEPAGE="http://asciidoc.org" +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2011 Stuart Rackham" +SRC_URI="http://sourceforge.net/projects/asciidoc/files/asciidoc/8.6.8/asciidoc-8.6.8.tar.gz" +CHECKSUM_MD5="6ffff1ab211f30481741ce4d1e4b12bf" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + asciidoc = $portVersion compat >= 8.6.8 + cmd:a2x = $portVersion compat >= 8 + cmd:asciidoc = $portVersion compat >= 8 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + sed -i -e 's|/usr/bin/env|/bin/env|' *.py +} + +BUILD() +{ + # TODO: separate data and configuration files. + runConfigure ./configure \ + --sysconfdir=$dataDir/asciidoc + make +} + +INSTALL() +{ + make install +} From 638535666f155757386917c3a9e69e4cef6606ac Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 5 May 2013 01:16:29 +0200 Subject: [PATCH 214/587] Convert git-1.7.10.2.recipe into an actual recipe and adjust the patch --- dev-vcs/git/git-1.7.10.2.recipe | 183 ++++++++++++++++++++++--- dev-vcs/git/patches/git-1.7.10.2.patch | 34 ++--- 2 files changed, 182 insertions(+), 35 deletions(-) diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe index 0e7929703..50e161d0a 100644 --- a/dev-vcs/git/git-1.7.10.2.recipe +++ b/dev-vcs/git/git-1.7.10.2.recipe @@ -1,29 +1,180 @@ -DESCRIPTION="git a fast version control system" +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. + " HOMEPAGE="http://git-scm.com/" +LICENSE="GNU GPL v2" +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" +CHECKSUM_MD5_2="79bae5456db8366803d28db867892d74" + +SRC_URI_3="http://git-core.googlecode.com/files/git-htmldocs-1.7.10.2.tar.gz" +CHECKSUM_MD5_3="9c401a36aee40d68f5ca3513818e8f29" + REVISION="1" -STATUS_HAIKU="stable" -DEPEND="net-misc/curl >= 7.20.0 - dev-lang/perl >= 5.10.1 - dev-vcs/gitdoc == 1.7.10" + +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + git = $portVersion compat >= 1.7 + cmd:git = $portVersion compat >= 1.7 + cmd:git_receive_pack = $portVersion compat >= 1.7 + cmd:git_shell = $portVersion compat >= 1.7 + cmd:git_upload_archive = $portVersion compat >= 1.7 + cmd:git_upload_pack = $portVersion compat >= 1.7 + " +PROVIDES_arch=" + git_arch = $portVersion compat >= 1.7 + cmd:git_archimport = $portVersion compat >= 1.7 + " +PROVIDES_cvs=" + git_cvs = $portVersion compat >= 1.7 + cmd:git_cvsserver = $portVersion compat >= 1.7 + " +PROVIDES_daemon=" + git_daemon = $portVersion compat >= 1.7 + cmd:git_daemon = $portVersion compat >= 1.7 + " +PROVIDES_email=" + git_email = $portVersion compat >= 1.7 + cmd:git_send_email = $portVersion compat >= 1.7 + " +PROVIDES_source=" + git_source = $portVersion compat >= 1.7 + " +PROVIDES_svn=" + git_svn = $portVersion compat >= 1.7 + cmd:git_svn = $portVersion compat >= 1.7 + " + +REQUIRES=" + haiku >= $haikuVersion + curl + expat + openssl + perl + python + zlib + cmd:nano + " +REQUIRES_arch=" + haiku >= $haikuVersion + git == $portVersion + " +REQUIRES_cvs=" + haiku >= $haikuVersion + git == $portVersion + " +REQUIRES_daemon=" + haiku >= $haikuVersion + git == $portVersion + " +REQUIRES_email=" + haiku >= $haikuVersion + git == $portVersion + " +REQUIRES_svn=" + haiku >= $haikuVersion + git == $portVersion + " + +BUILD_REQUIRES=" + $REQUIRES + cmd:gcc + cmd:ld + cmd:make + cmd:sed + cmd:tar + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + BUILD() { - cd git-1.7.10.2 - make strip + make } INSTALL() { - cd git-1.7.10.2 + make strip make install -} + + # replace copies of git binaries with symlinks + cd $prefix/bin + for program in git*; do + ln -sfn "../lib/git-core/$program" "$program" + done -TEST() -{ - cd git-1.7.10.2 - make check -} + # copy manpages + mkdir -p $manDir + cp -rd $sourceDir2/* $manDir/ -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2012 Git Authors (see git web site for list)" + # copy html documentation + htmlDir=$docDir/html + mkdir -p $htmlDir + cp -rd $sourceDir3/*.html $htmlDir/ + rm $htmlDir/git-gui.html + + # copy asciidoc documentation for which there isn't any corresponding html + asciidocDir=$docDir/asciidoc + mkdir -p $asciidocDir + for f in $sourceDir3/*.txt; do + html=$sourceDir3/$(basename $f .txt).html + if ! [ -e $html ]; then + cp -d $f $asciidocDir/ + fi + done + + packageEntries arch \ + documentation/packages/git/html/git-archimport.html \ + documentation/man/man1/git-archimport.1 \ + lib/git-core/git-archimport + + packageEntries cvs \ + bin/git-cvsserver \ + documentation/packages/git/html/git-cvsexportcommit.html \ + documentation/packages/git/html/git-cvsimport.html \ + documentation/packages/git/html/git-cvsserver.html \ + documentation/man/man1/git-cvsexportcommit.1 \ + documentation/man/man1/git-cvsimport.1 \ + documentation/man/man1/git-cvsserver.1 \ + documentation/man/man7/gitcvs-migration.7 \ + lib/git-core/git-cvsexportcommit \ + lib/git-core/git-cvsimport \ + lib/git-core/git-cvsserver + + packageEntries daemon \ + documentation/packages/git/html/git-credential-cache--daemon.html \ + documentation/packages/git/html/git-credential-cache.html \ + documentation/packages/git/html/git-daemon.html \ + documentation/man/man1/git-credential-cache--daemon.1 \ + documentation/man/man1/git-credential-cache.1 \ + documentation/man/man1/git-daemon.1 \ + lib/git-core/git-credential-cache--daemon \ + lib/git-core/git-credential-cache \ + lib/git-core/git-daemon + + packageEntries email \ + documentation/packages/git/html/git-send-email.html \ + documentation/man/man1/git-send-email.1 \ + lib/git-core/git-send-email + + packageEntries svn \ + documentation/packages/git/html/git-svn.html \ + documentation/man/man1/git-svn.1 \ + lib/git-core/git-svn +} diff --git a/dev-vcs/git/patches/git-1.7.10.2.patch b/dev-vcs/git/patches/git-1.7.10.2.patch index 36c719f64..29dfa45df 100644 --- a/dev-vcs/git/patches/git-1.7.10.2.patch +++ b/dev-vcs/git/patches/git-1.7.10.2.patch @@ -1,34 +1,30 @@ diff -up git-1.7.10.2/Makefile.orig git-1.7.10.2/Makefile --- git-1.7.10.2/Makefile.orig 2012-05-11 14:25:45.066322432 -0600 +++ git-1.7.10.2/Makefile 2012-05-19 12:53:42.392429568 -0600 -@@ -1242,6 +1242,31 @@ ifeq ($(uname_S),Minix) +@@ -1242,6 +1242,27 @@ ifeq ($(uname_S),Minix) NO_CURL = NO_EXPAT = endif +ifeq ($(uname_S),Haiku) ++ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease ++ NO_GETTEXT = YesPlease ++ NO_ICONV = YesPlease + NO_LIBGEN_H = YesPlease + NO_MEMMEM = YesPlease + NO_MKSTEMPS = YesPlease -+ NEEDS_LIBICONV = YesPlease -+ PERL_PATH = perl -+ PYTHON_PATH = python -+# TCL_PATH = tclsh -+ mandir = /boot/common/documentation/man -+ infodir = /boot/common/documentation/info -+ htmldir = /boot/common/documentation/doc/git-1.7.10.2 -+ gitexecdir = /boot/common/bin/git-core -+ gitwebdir = /boot/common/data/gitweb -+ template_dir = /boot/common/data/git-core/templates + NO_TCLTK = YesPlease -+ DEFAULT_EDITOR = nano -+ CURL_DIR = /boot/common -+ EXPAT_DIR = /boot/common -+ BASIC_CFLAGS += -I/boot/common/include -+ BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib + PTHREAD_LIBS = -+ prefix = /boot/common -+ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease -+ NO_GETTEXT = YesPlease ++ BASIC_LDFLAGS += -lnetwork -lbsd ++ DEFAULT_EDITOR = nano ++ PERL_PATH = $(portPackageLinksDir)/perl/bin/perl ++ PYTHON_PATH = $(portPackageLinksDir)/python/bin/python ++ prefix = $(portPackageLinksDir)/.self ++ mandir = $(manDir) ++ infodir = $(infoDir) ++ htmldir = $(docDir) ++ gitexecdir = $(libDir)/git-core ++ gitwebdir = $(dataDir)/gitweb ++ template_dir = $(dataDir)/git-core/templates +endif ifneq (,$(findstring MINGW,$(uname_S))) pathsep = ; From 5f1c1279e151defb4b8d75348e49e34c11febd1b Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 5 May 2013 01:52:33 +0200 Subject: [PATCH 215/587] git: add runtime dependency on man --- dev-vcs/git/git-1.7.10.2.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe index 50e161d0a..67d4d5e54 100644 --- a/dev-vcs/git/git-1.7.10.2.recipe +++ b/dev-vcs/git/git-1.7.10.2.recipe @@ -24,7 +24,7 @@ CHECKSUM_MD5_2="79bae5456db8366803d28db867892d74" SRC_URI_3="http://git-core.googlecode.com/files/git-htmldocs-1.7.10.2.tar.gz" CHECKSUM_MD5_3="9c401a36aee40d68f5ca3513818e8f29" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" @@ -64,6 +64,7 @@ REQUIRES=" haiku >= $haikuVersion curl expat + man openssl perl python From 4dadfa2866abb170f544ab63bef4a2e00a4cbe6a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 5 May 2013 22:04:58 +0200 Subject: [PATCH 216/587] Add recipe for zlib 1.2.8 Based on the non-recipe for 1.2.7. --- sys-libs/zlib/zlib-1.2.8.recipe | 71 +++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 sys-libs/zlib/zlib-1.2.8.recipe diff --git a/sys-libs/zlib/zlib-1.2.8.recipe b/sys-libs/zlib/zlib-1.2.8.recipe new file mode 100644 index 000000000..f13eb805f --- /dev/null +++ b/sys-libs/zlib/zlib-1.2.8.recipe @@ -0,0 +1,71 @@ +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." +HOMEPAGE="http://www.zlib.net/" +COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" +LICENSE="Zlib" +SRC_URI="http://zlib.net/zlib-1.2.8.tar.gz" +CHECKSUM_MD5="44d667c142d7cda120332623eab69f40" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + zlib = $portVersion compat >= 1 + lib:libz = $portVersion compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + $REQUIRES + cmd:cmake + cmd:gcc + cmd:gettext + # TODO: Remove! Undeclared dependency of grep! + cmd:grep + cmd:ld + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + sed -i 's,${CMAKE_INSTALL_PREFIX}/include',$includeDir, CMakeLists.txt + sed -i 's,${CMAKE_INSTALL_PREFIX}/share/man',$manDir, CMakeLists.txt + sed -i 's,${CMAKE_INSTALL_PREFIX}/share/pkgconfig',$developLibDir/pkgconfig, \ + CMakeLists.txt +} + +BUILD() +{ + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix . + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libz + + # devel package + packageEntries devel \ + $developDir \ + $documentationDir +} + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The zlib development files" +PROVIDES_devel="zlib_devel = $portVersion" +REQUIRES_devel=" + zlib == $portVersion + " + +# ----- source package ------------------------------------------------------- + +PROVIDES_source="zlib_source = $portVersion" From 2e69dcdd60392e8702f9902139cbdf6ea60652ea Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 5 May 2013 22:05:35 +0200 Subject: [PATCH 217/587] Remove old zlib non-recipes --- sys-libs/zlib/zlib-1.2.3.recipe | 21 --------------------- sys-libs/zlib/zlib-1.2.5.recipe | 22 ---------------------- sys-libs/zlib/zlib-1.2.7.recipe | 23 ----------------------- 3 files changed, 66 deletions(-) delete mode 100644 sys-libs/zlib/zlib-1.2.3.recipe delete mode 100644 sys-libs/zlib/zlib-1.2.5.recipe delete mode 100644 sys-libs/zlib/zlib-1.2.7.recipe diff --git a/sys-libs/zlib/zlib-1.2.3.recipe b/sys-libs/zlib/zlib-1.2.3.recipe deleted file mode 100644 index 388677748..000000000 --- a/sys-libs/zlib/zlib-1.2.3.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="zlib" -HOMEPAGE="http://www.zlib.net/" -SRC_URI="http://www.zlib.net/zlib-1.2.3.tar.bz2" -CHECKSUM_MD5="dee233bf288ee795ac96a98cc2e369b6" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd zlib-1.2.3 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd zlib-1.2.3 - make install -} -LICENSE="Zlib" -COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" diff --git a/sys-libs/zlib/zlib-1.2.5.recipe b/sys-libs/zlib/zlib-1.2.5.recipe deleted file mode 100644 index e5a947a9e..000000000 --- a/sys-libs/zlib/zlib-1.2.5.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="zlib" -HOMEPAGE="http://www.zlib.net/" -SRC_URI="http://www.zlib.net/zlib-1.2.5.tar.bz2" -CHECKSUM_MD5="be1e89810e66150f5b0327984d8625a0" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd zlib-1.2.5 - sed -i 's/share\/man/documentation\/man/' CMakeLists.txt - cmake . - make -} - -INSTALL() -{ - cd zlib-1.2.5 - make install -} -LICENSE="Zlib" -COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" diff --git a/sys-libs/zlib/zlib-1.2.7.recipe b/sys-libs/zlib/zlib-1.2.7.recipe deleted file mode 100644 index f3b1b8ad9..000000000 --- a/sys-libs/zlib/zlib-1.2.7.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="zlib" -HOMEPAGE="http://www.zlib.net/" -SRC_URI="http://zlib.net/zlib-1.2.7.tar.gz" -CHECKSUM_MD5="60df6a37c56e7c1366cca812414f7b85" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd zlib-1.2.7 - sed -i 's/share\/man/documentation\/man/' CMakeLists.txt - sed -i 's/share\/pkgconfig/lib\/pkgconfig/' CMakeLists.txt - cmake . - make -} - -INSTALL() -{ - cd zlib-1.2.7 - make install -} -LICENSE="Zlib" -COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" From 03c95d9f16fbf42c97a466e8c4f8a471658f3d92 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 9 May 2013 21:32:20 +0200 Subject: [PATCH 218/587] be_book: Bump the recipe revision Nothing changed really, but due to haikuporter now mimesetting the contents the resulting package differs. --- haiku-data/be_book/be_book-20081026.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-data/be_book/be_book-20081026.recipe b/haiku-data/be_book/be_book-20081026.recipe index 70a59e280..1938c0a87 100644 --- a/haiku-data/be_book/be_book-20081026.recipe +++ b/haiku-data/be_book/be_book-20081026.recipe @@ -5,7 +5,7 @@ COPYRIGHT="ACCESS Co., Ltd." LICENSE="Attribution-NonCommercial-NoDerivs 3.0 Unported" SRC_URI="http://haiku-files.org/files/data/bebook_20081026.zip" CHECKSUM_MD5="78d58b64a41ae4e8f84a14f22aea4adb" -REVISION="1" +REVISION="2" ARCHITECTURES="any" PROVIDES=" From 2b1ceca61961ce2a8b4c4b63137652daae80e6b7 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 9 May 2013 21:33:52 +0200 Subject: [PATCH 219/587] Update vision recipe * Use jobArgs. * No longer copy the settings file to settings/Vision. Rather leave it in the apps/Vision directory for the user to copy. Ideally Vision would just use it as a fallback, when no user settings file is present. --- haiku-apps/vision/vision-908.recipe | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/haiku-apps/vision/vision-908.recipe b/haiku-apps/vision/vision-908.recipe index 3c33e5442..70fc48db2 100644 --- a/haiku-apps/vision/vision-908.recipe +++ b/haiku-apps/vision/vision-908.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://vision.sourceforge.net/" SRC_URI="svn+http://vision.svn.sourceforge.net/svnroot/vision/trunk#908" LICENSE="MPL v1.1" COPYRIGHT="1999-2010 The Vision Team" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" if [ $architecture != x86_gcc2 ]; then @@ -31,17 +31,15 @@ SOURCE_DIR="$portVersionedName" BUILD() { cd Vision - make + make $jobArgs } INSTALL() { visionDir=$appsDir/Vision - visionSettingsDir=$settingsDir/Vision mkdir -p $visionDir - mkdir -p $visionSettingsDir - cp -a $portDir/VisionSettings $visionSettingsDir + cp -a $portDir/VisionSettings $visionDir cd Vision cp Vision $visionDir From 3315657faeb012db9ec7b0e74bd140551e0c85ca Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 20 May 2013 18:11:03 +0200 Subject: [PATCH 220/587] cmake: Fix finding libraries Set CMAKE_SYSTEM_LIBRARY_PATH in Haiku.cmake by default after all. CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES doesn't really seem to be used. --- dev-util/cmake/cmake-2.8.5.recipe | 2 +- dev-util/cmake/patches/cmake-2.8.5.patch | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe index cd8943eec..3ae91f976 100644 --- a/dev-util/cmake/cmake-2.8.5.recipe +++ b/dev-util/cmake/cmake-2.8.5.recipe @@ -5,7 +5,7 @@ LICENSE="CMake" COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz" CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="cmake-2.8.5.patch" diff --git a/dev-util/cmake/patches/cmake-2.8.5.patch b/dev-util/cmake/patches/cmake-2.8.5.patch index b1b016368..ab49e2913 100644 --- a/dev-util/cmake/patches/cmake-2.8.5.patch +++ b/dev-util/cmake/patches/cmake-2.8.5.patch @@ -171,9 +171,9 @@ diff -ur orig/cmake-2.8.5/Modules/FindOpenGL.cmake cmake-2.8.5/Modules/FindOpenG FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h diff -ur orig/cmake-2.8.5/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platform/Haiku.cmake ---- orig/cmake-2.8.5/Modules/Platform/Haiku.cmake 2011-07-08 14:21:44.058458112 +0200 -+++ cmake-2.8.5/Modules/Platform/Haiku.cmake 2013-04-28 15:57:05.984875008 +0200 -@@ -1,20 +1,82 @@ +--- orig/cmake-2.8.5/Modules/Platform/Haiku.cmake 2011-07-08 14:21:44.013107200 +0200 ++++ cmake-2.8.5/Modules/Platform/Haiku.cmake 2013-05-20 17:09:28.999292928 +0200 +@@ -1,20 +1,88 @@ -SET(BEOS 1) +SET(HAIKU 1) +SET(UNIX 1) @@ -259,11 +259,17 @@ diff -ur orig/cmake-2.8.5/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf + +LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES}) + -+LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ++LIST(APPEND CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES + /boot/common/non-packaged/develop/lib + /boot/common/develop/lib + /boot/system/develop/lib + ) ++ ++LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ++ ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES} ++ ) ++ ++LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES}) IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH From 342bbced52f1e2bf492f3f941ca9a145f068c4e1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 20 May 2013 18:15:36 +0200 Subject: [PATCH 221/587] libsolv: Update to newer version Fixes comparison of versions with pre-release. --- .../libsolv-0.3.0_haiku_2013_05_20.recipe | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe 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 new file mode 100644 index 000000000..9f14ce4ff --- /dev/null +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe @@ -0,0 +1,56 @@ +SUMMARY="Library for solving packages and reading repositories" +DESCRIPTION="Library for solving packages and reading repositories." +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2013, Novell Inc." +HOMEPAGE="http://github.com/openSUSE/libsolv" +SRC_URI="git+git://github.com/weinhold/libsolv.git#162ae79ad078caa7bb9c3ca44a76380093463ca9" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES="libsolv = $portVersion + lib:libsolv = $portVersion + lib:libsolvext = $portVersion" +REQUIRES="haiku >= $haikuVersion + lib:libexpat >= 1.5 + lib:libz + " +BUILD_REQUIRES="$REQUIRES" +BUILD_PREREQUIRES="haiku_devel >= $haikuVersion + cmd:cmake + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + rm -rf build + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix .. + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + # set up the develop directory correctly + prepareInstalledDevelLibs libsolv libsolvext + + mkdir -p $includeDir + mv $prefix/include/* $includeDir + rmdir $prefix/include + + # move cmake files + mkdir -p $dataDir + mv $prefix/share/cmake $dataDir + rmdir $prefix/share + + # We don't want the executables. + rm -r $prefix/bin +} From 1de46c205a8cfa59216aef777419bf7ca7649d90 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 5 May 2013 16:23:09 +0200 Subject: [PATCH 222/587] add local binutils git clone as src-uri to gcc recipes --- sys-devel/gcc/gcc-2.95.3_110711.recipe | 5 ++++- sys-devel/gcc/gcc-2.95.3_130421.recipe | 5 ++++- sys-devel/gcc/gcc-2.95.3_130425.recipe | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sys-devel/gcc/gcc-2.95.3_110711.recipe b/sys-devel/gcc/gcc-2.95.3_110711.recipe index 2f3b5ac81..6d5b5138e 100644 --- a/sys-devel/gcc/gcc-2.95.3_110711.recipe +++ b/sys-devel/gcc/gcc-2.95.3_110711.recipe @@ -6,7 +6,10 @@ LICENSE=" GNU LGPL v2 " COPYRIGHT="1988-2000 Free Software Foundation, Inc." -SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#9f9e588ceb7baa6bc5ac0193fb90212fc7fd667c" +SRC_URI=" + git+file://$portBaseDir/../binutils/work-2.17_130421/sources/binutils-2.17_130421#9f9e588ceb7baa6bc5ac0193fb90212fc7fd667c + git+git://github.com/haiku/BuildtoolsPM.git#9f9e588ceb7baa6bc5ac0193fb90212fc7fd667c + " REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" diff --git a/sys-devel/gcc/gcc-2.95.3_130421.recipe b/sys-devel/gcc/gcc-2.95.3_130421.recipe index 21a0fbfd1..720efa4e6 100644 --- a/sys-devel/gcc/gcc-2.95.3_130421.recipe +++ b/sys-devel/gcc/gcc-2.95.3_130421.recipe @@ -6,7 +6,10 @@ LICENSE=" GNU LGPL v2 " COPYRIGHT="1988-2000 Free Software Foundation, Inc." -SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462" +SRC_URI=" + git+file://$portBaseDir/../binutils/work-2.17_130421/sources/binutils-2.17_130421#278de7bc9243876c2e08f8d6a243d510c5000462 + git+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462 + " REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" diff --git a/sys-devel/gcc/gcc-2.95.3_130425.recipe b/sys-devel/gcc/gcc-2.95.3_130425.recipe index 78d7fdb42..dea97fe49 100644 --- a/sys-devel/gcc/gcc-2.95.3_130425.recipe +++ b/sys-devel/gcc/gcc-2.95.3_130425.recipe @@ -6,7 +6,10 @@ LICENSE=" GNU LGPL v2 " COPYRIGHT="1988-2000 Free Software Foundation, Inc." -SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045" +SRC_URI=" + git+file://$portBaseDir/../binutils/work-2.17_130421/sources/binutils-2.17_130421#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045 + git+git://github.com/haiku/BuildtoolsPM.git#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045 + " REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" From 98b0b42a51a97d9b231b01a2050a01a000f277bf Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 5 May 2013 17:26:26 +0200 Subject: [PATCH 223/587] add local binutils git clone as src-uri to jam recipe --- sys-devel/jam/jam-2.5_121012.recipe | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys-devel/jam/jam-2.5_121012.recipe b/sys-devel/jam/jam-2.5_121012.recipe index 3d8195ac2..d030648ad 100644 --- a/sys-devel/jam/jam-2.5_121012.recipe +++ b/sys-devel/jam/jam-2.5_121012.recipe @@ -18,7 +18,10 @@ DESCRIPTION=" HOMEPAGE="http://www.perforce.com/jam/jam.html" LICENSE="Jam" COPYRIGHT="1993-2003 Christopher Seiwald" -SRC_URI="git://git.haiku-os.org/buildtools" +SRC_URI=" + git+file://$portBaseDir/../binutils/work-2.17_130421/sources/binutils-2.17_130421 + git+git://github.com/haiku/BuildtoolsPM.git + " REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" From 0eec34c0ca1ba75f45bbc91c3b853ab88989192b Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 5 May 2013 17:28:26 +0200 Subject: [PATCH 224/587] Convert recipe for rman-3.2 into an actual recipe --- app-text/rman/rman-3.2.recipe | 48 +++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/app-text/rman/rman-3.2.recipe b/app-text/rman/rman-3.2.recipe index abbe39f1c..670887803 100644 --- a/app-text/rman/rman-3.2.recipe +++ b/app-text/rman/rman-3.2.recipe @@ -1,26 +1,42 @@ -DESCRIPTION="PolyGlotMan man page translator AKA RosettaMan" +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. + " HOMEPAGE="http://www.sourceforge.net/project/polyglotman" +LICENSE="Artistic" +COPYRIGHT="2003 Thomas A. Phelps" SRC_URI="http://downloads.sourceforge.net/project/polyglotman/polyglotman/3.2/rman-3.2.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="6d1d67641c6d042595a96a62340d3cc6" +PATCHES="rman-3.2.patch" +SOURCE_DIR="$portVersionedName" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + rman = $portVersion + cmd:rman = $portVersion compat >= 3 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:make + cmd:ld + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + BUILD() { - cd rman-3.2 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` - make BINDIR=$COMMON_BIN MANDIR=$COMMON_DOCS/man + make BINDIR=$binDir MANDIR=$manDir } INSTALL() { - cd rman-3.2 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` - mkdir -p ${DESTDIR}/$COMMON_BIN - mkdir -p ${DESTDIR}/$COMMON_DOCS/man - make install BINDIR=${DESTDIR}/$COMMON_BIN MANDIR=${DESTDIR}/$COMMON_DOCS/man + mkdir -p $binDir $manDir + make install BINDIR=$binDir MANDIR=$manDir } -LICENSE="Artistic" -COPYRIGHT="2003 Thomas A. Phelps" From e345a1f231a1022cced87ee9db48ad038e6c151d Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 8 May 2013 23:24:46 +0200 Subject: [PATCH 225/587] Add zlib_devel as build requirement for openssl --- dev-libs/openssl/openssl-1.0.0d.recipe | 1 + dev-libs/openssl/openssl-1.0.0j.recipe | 1 + 2 files changed, 2 insertions(+) diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe index 3c131f28e..a00ea6d4d 100644 --- a/dev-libs/openssl/openssl-1.0.0d.recipe +++ b/dev-libs/openssl/openssl-1.0.0d.recipe @@ -45,6 +45,7 @@ BUILD_REQUIRES=" cmd:make cmd:perl >= 5 cmd:sed + zlib_devel >= 1.2.3 " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion diff --git a/dev-libs/openssl/openssl-1.0.0j.recipe b/dev-libs/openssl/openssl-1.0.0j.recipe index 05fba8124..fde0ea5a3 100644 --- a/dev-libs/openssl/openssl-1.0.0j.recipe +++ b/dev-libs/openssl/openssl-1.0.0j.recipe @@ -45,6 +45,7 @@ BUILD_REQUIRES=" cmd:make cmd:perl >= 5 cmd:sed + zlib_devel >= 1.2.3 " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion From b7e15bc175e712a7bfbf70c92a2c450a13aaadac Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 20 May 2013 19:24:14 +0200 Subject: [PATCH 226/587] declare libintl as runtime requirement of grep --- sys-apps/grep/grep-2.14.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe index 3ab6e0c1d..0ea871761 100644 --- a/sys-apps/grep/grep-2.14.recipe +++ b/sys-apps/grep/grep-2.14.recipe @@ -22,10 +22,10 @@ PROVIDES=" REQUIRES=" haiku >= $haikuVersion lib:libiconv + lib:libintl " BUILD_REQUIRES=" $REQUIRES - gettext cmd:aclocal cmd:autoconf cmd:automake From d6439dab798a28a8cdac3991fcae4a73f09c572b Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 20 May 2013 19:24:38 +0200 Subject: [PATCH 227/587] Make grep and sed prerequirements of ncurses --- sys-libs/ncurses/ncurses-5.9.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index 143fcd38a..536192a9b 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -37,14 +37,14 @@ REQUIRES=" " BUILD_REQUIRES=" cmd:gcc - cmd:grep cmd:ld cmd:libtool cmd:make - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:grep + cmd:sed " SOURCE_DIR="$portVersionedName" From 7e03f12fa3aa9fe9a89724fb83b051a8ea48c88c Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 27 May 2013 04:23:37 +0200 Subject: [PATCH 228/587] grep: Fix paths in patch They had a leading "./" which "git apply" doesn't seem to ignore. --- sys-apps/grep/patches/grep-2.14-gcc2.patch | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/sys-apps/grep/patches/grep-2.14-gcc2.patch b/sys-apps/grep/patches/grep-2.14-gcc2.patch index c59075af6..eb81be74b 100644 --- a/sys-apps/grep/patches/grep-2.14-gcc2.patch +++ b/sys-apps/grep/patches/grep-2.14-gcc2.patch @@ -1,6 +1,6 @@ -diff -Naur ./grep-2.14-original/lib/fts.c ./grep-2.14/lib/fts.c ---- ./grep-2.14-original/lib/fts.c 2012-02-26 14:01:23.001310720 +0000 -+++ ./grep-2.14/lib/fts.c 2012-12-26 19:30:29.630718464 +0000 +diff -Naur grep-2.14-original/lib/fts.c grep-2.14/lib/fts.c +--- grep-2.14-original/lib/fts.c 2012-02-26 14:01:23.001310720 +0000 ++++ grep-2.14/lib/fts.c 2012-12-26 19:30:29.630718464 +0000 @@ -1278,6 +1278,7 @@ nlink_t nlinks; bool nostat; @@ -20,9 +20,9 @@ diff -Naur ./grep-2.14-original/lib/fts.c ./grep-2.14/lib/fts.c /* * Nlinks is the number of possible entries of type directory in the -diff -Naur ./grep-2.14-original/lib/regcomp.c ./grep-2.14/lib/regcomp.c ---- ./grep-2.14-original/lib/regcomp.c 2012-07-03 12:54:55.058982400 +0000 -+++ ./grep-2.14/lib/regcomp.c 2012-12-26 19:31:31.972029952 +0000 +diff -Naur grep-2.14-original/lib/regcomp.c grep-2.14/lib/regcomp.c +--- grep-2.14-original/lib/regcomp.c 2012-07-03 12:54:55.058982400 +0000 ++++ grep-2.14/lib/regcomp.c 2012-12-26 19:31:31.972029952 +0000 @@ -952,10 +952,10 @@ internal_function init_word_char (re_dfa_t *dfa) @@ -35,9 +35,9 @@ diff -Naur ./grep-2.14-original/lib/regcomp.c ./grep-2.14/lib/regcomp.c if (BE (dfa->map_notascii == 0, 1)) { bitset_word_t bits0 = 0x00000000; -diff -Naur ./grep-2.14-original/src/dfasearch.c ./grep-2.14/src/dfasearch.c ---- ./grep-2.14-original/src/dfasearch.c 2012-08-07 15:01:53.033030144 +0000 -+++ ./grep-2.14/src/dfasearch.c 2012-12-26 19:33:56.699138048 +0000 +diff -Naur grep-2.14-original/src/dfasearch.c grep-2.14/src/dfasearch.c +--- grep-2.14-original/src/dfasearch.c 2012-08-07 15:01:53.033030144 +0000 ++++ grep-2.14/src/dfasearch.c 2012-12-26 19:33:56.699138048 +0000 @@ -216,6 +216,7 @@ int backref; regoff_t start; @@ -55,9 +55,9 @@ diff -Naur ./grep-2.14-original/src/dfasearch.c ./grep-2.14/src/dfasearch.c mb_case_map_apply (map, &off, &len); *match_size = len; ret_val = off; -diff -Naur ./grep-2.14-original/src/kwsearch.c ./grep-2.14/src/kwsearch.c ---- ./grep-2.14-original/src/kwsearch.c 2012-06-16 17:08:38.034078720 +0000 -+++ ./grep-2.14/src/kwsearch.c 2012-12-26 19:36:28.265814016 +0000 +diff -Naur grep-2.14-original/src/kwsearch.c grep-2.14/src/kwsearch.c +--- grep-2.14-original/src/kwsearch.c 2012-06-16 17:08:38.034078720 +0000 ++++ grep-2.14/src/kwsearch.c 2012-12-26 19:36:28.265814016 +0000 @@ -39,9 +39,9 @@ ? mbtolower (pattern, &psize, &map) : pattern); @@ -104,9 +104,9 @@ diff -Naur ./grep-2.14-original/src/kwsearch.c ./grep-2.14/src/kwsearch.c mb_case_map_apply (map, &off, &len); *match_size = len; -diff -Naur ./grep-2.14-original/src/main.c ./grep-2.14/src/main.c ---- ./grep-2.14-original/src/main.c 2012-08-06 11:38:32.032768000 +0000 -+++ ./grep-2.14/src/main.c 2012-12-26 19:39:22.737411072 +0000 +diff -Naur grep-2.14-original/src/main.c grep-2.14/src/main.c +--- grep-2.14-original/src/main.c 2012-08-06 11:38:32.032768000 +0000 ++++ grep-2.14/src/main.c 2012-12-26 19:39:22.737411072 +0000 @@ -460,6 +460,7 @@ if (SEEK_HOLE != SEEK_END && usable_st_size (st)) { @@ -140,9 +140,9 @@ diff -Naur ./grep-2.14-original/src/main.c ./grep-2.14/src/main.c if (fstat (STDOUT_FILENO, &tmp_stat) == 0 && S_ISREG (tmp_stat.st_mode)) out_stat = tmp_stat; -diff -Naur ./grep-2.14-original/src/searchutils.c ./grep-2.14/src/searchutils.c ---- ./grep-2.14-original/src/searchutils.c 2012-06-16 17:08:38.034340864 +0000 -+++ ./grep-2.14/src/searchutils.c 2012-12-26 19:32:59.044826624 +0000 +diff -Naur grep-2.14-original/src/searchutils.c grep-2.14/src/searchutils.c +--- grep-2.14-original/src/searchutils.c 2012-06-16 17:08:38.034340864 +0000 ++++ grep-2.14/src/searchutils.c 2012-12-26 19:32:59.044826624 +0000 @@ -80,6 +80,7 @@ static mb_len_map_t *len_map; static size_t outalloc; From 834609bc0c2f176d3ec1303c970719225aaf28da Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 27 May 2013 04:24:54 +0200 Subject: [PATCH 229/587] grep: Re-add gettext to build_requires, bump revision In the likely event that we split the gettext package, the build would otherwise break. --- sys-apps/grep/grep-2.14.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe index 0ea871761..700a7df29 100644 --- a/sys-apps/grep/grep-2.14.recipe +++ b/sys-apps/grep/grep-2.14.recipe @@ -8,7 +8,7 @@ CHECKSUM_MD5="db55b9fc67d8c0895f3c73e94e2aebe3" # XZ file format: #SRC_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz" #CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="grep-2.14-gcc2.patch" @@ -26,6 +26,7 @@ REQUIRES=" " BUILD_REQUIRES=" $REQUIRES + gettext cmd:aclocal cmd:autoconf cmd:automake From 39f16df92acb1025ecbef3c9f0dc750d7a925236 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 27 May 2013 15:09:15 +0200 Subject: [PATCH 230/587] Drop '.'-dir from patches such that git apply will accept them --- app-arch/gzip/patches/gzip-1.4.patch | 4 ++-- dev-util/scons/patches/scons-2.2.0.patch | 12 ++++++------ .../patches/transmission-2.73.patch | 18 +++++++++--------- .../patches/transmission-2.75.patch | 18 +++++++++--------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app-arch/gzip/patches/gzip-1.4.patch b/app-arch/gzip/patches/gzip-1.4.patch index 8b7051d87..d682f553e 100644 --- a/app-arch/gzip/patches/gzip-1.4.patch +++ b/app-arch/gzip/patches/gzip-1.4.patch @@ -1,5 +1,5 @@ ---- ./gzip-1.4/inflate.c 2010-01-20 14:15:12.017039360 +0100 -+++ ./gzip-1.4/inflate.c 2011-12-03 00:03:37.421003264 +0100 +--- gzip-1.4/inflate.c 2010-01-20 14:15:12.017039360 +0100 ++++ gzip-1.4/inflate.c 2011-12-03 00:03:37.421003264 +0100 @@ -588,6 +588,7 @@ /* do the copy */ do { diff --git a/dev-util/scons/patches/scons-2.2.0.patch b/dev-util/scons/patches/scons-2.2.0.patch index 15d06891d..233c252b3 100644 --- a/dev-util/scons/patches/scons-2.2.0.patch +++ b/dev-util/scons/patches/scons-2.2.0.patch @@ -1,6 +1,6 @@ -diff -Naur ./scons-2.2.0/engine/SCons/Platform/__init__.py ./scons-2.2.0-haiku/engine/SCons/Platform/__init__.py ---- ./scons-2.2.0/engine/SCons/Platform/__init__.py 2012-08-05 15:38:31.009961472 +0000 -+++ ./scons-2.2.0-haiku/engine/SCons/Platform/__init__.py 2012-09-30 13:28:21.978583552 +0000 +diff -Naur scons-2.2.0/engine/SCons/Platform/__init__.py scons-2.2.0-haiku/engine/SCons/Platform/__init__.py +--- scons-2.2.0/engine/SCons/Platform/__init__.py 2012-08-05 15:38:31.009961472 +0000 ++++ scons-2.2.0-haiku/engine/SCons/Platform/__init__.py 2012-09-30 13:28:21.978583552 +0000 @@ -78,6 +78,8 @@ return 'aix' elif sys.platform.find('darwin') != -1: @@ -10,9 +10,9 @@ diff -Naur ./scons-2.2.0/engine/SCons/Platform/__init__.py ./scons-2.2.0-haiku/e else: return 'posix' elif os.name == 'os2': -diff -Naur ./scons-2.2.0/engine/SCons/Platform/haiku.py ./scons-2.2.0-haiku/engine/SCons/Platform/haiku.py ---- ./scons-2.2.0/engine/SCons/Platform/haiku.py 1970-01-01 00:00:00.000000000 +0000 -+++ ./scons-2.2.0-haiku/engine/SCons/Platform/haiku.py 2012-09-30 13:30:07.109051904 +0000 +diff -Naur scons-2.2.0/engine/SCons/Platform/haiku.py scons-2.2.0-haiku/engine/SCons/Platform/haiku.py +--- scons-2.2.0/engine/SCons/Platform/haiku.py 1970-01-01 00:00:00.000000000 +0000 ++++ scons-2.2.0-haiku/engine/SCons/Platform/haiku.py 2012-09-30 13:30:07.109051904 +0000 @@ -0,0 +1,54 @@ +"""SCons.Platform.haiku + diff --git a/net-p2p/transmission/patches/transmission-2.73.patch b/net-p2p/transmission/patches/transmission-2.73.patch index b719e158a..80d694fa4 100644 --- a/net-p2p/transmission/patches/transmission-2.73.patch +++ b/net-p2p/transmission/patches/transmission-2.73.patch @@ -1,6 +1,6 @@ -diff -Naur ./transmission-2.73/third-party/miniupnp/connecthostport.c ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/connecthostport.c ---- ./transmission-2.73/third-party/miniupnp/connecthostport.c 2012-10-24 13:01:10.429654016 +0000 -+++ ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/connecthostport.c 2012-12-08 17:06:33.040632320 +0000 +diff -Naur transmission-2.73/third-party/miniupnp/connecthostport.c transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/connecthostport.c +--- transmission-2.73/third-party/miniupnp/connecthostport.c 2012-10-24 13:01:10.429654016 +0000 ++++ transmission-2.73-haiku/transmission-2.73/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.73/third-party/miniupnp/connecthostport.c ./transmis #include #define closesocket close #include -diff -Naur ./transmission-2.73/third-party/miniupnp/miniupnpc.c ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/miniupnpc.c ---- ./transmission-2.73/third-party/miniupnp/miniupnpc.c 2012-10-24 13:01:10.457703424 +0000 -+++ ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/miniupnpc.c 2012-12-08 17:09:12.018087936 +0000 +diff -Naur transmission-2.73/third-party/miniupnp/miniupnpc.c transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/miniupnpc.c +--- transmission-2.73/third-party/miniupnp/miniupnpc.c 2012-10-24 13:01:10.457703424 +0000 ++++ transmission-2.73-haiku/transmission-2.73/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.73/third-party/miniupnp/miniupnpc.c ./transmission-2 #define HAS_IP_MREQN #endif -diff -Naur ./transmission-2.73/third-party/miniupnp/portlistingparse.c ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/portlistingparse.c ---- ./transmission-2.73/third-party/miniupnp/portlistingparse.c 2012-10-24 13:01:10.221511680 +0000 -+++ ./transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 +diff -Naur transmission-2.73/third-party/miniupnp/portlistingparse.c transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/portlistingparse.c +--- transmission-2.73/third-party/miniupnp/portlistingparse.c 2012-10-24 13:01:10.221511680 +0000 ++++ transmission-2.73-haiku/transmission-2.73/third-party/miniupnp/portlistingparse.c 2012-12-08 17:09:49.941359104 +0000 @@ -28,7 +28,7 @@ /* Helper function */ diff --git a/net-p2p/transmission/patches/transmission-2.75.patch b/net-p2p/transmission/patches/transmission-2.75.patch index 074c85751..91a47f0a3 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 ---- ./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 +diff -Naur transmission-2.75/third-party/miniupnp/connecthostport.c transmission-2.75-haiku/transmission-2.75/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 @@ -24,6 +24,7 @@ #else /* #ifdef _WIN32 */ #include @@ -9,9 +9,9 @@ diff -Naur ./transmission-2.75/third-party/miniupnp/connecthostport.c ./transmis #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 ---- ./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 +diff -Naur transmission-2.75/third-party/miniupnp/miniupnpc.c transmission-2.75-haiku/transmission-2.75/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 @@ -17,7 +17,7 @@ #endif #endif @@ -21,9 +21,9 @@ diff -Naur ./transmission-2.75/third-party/miniupnp/miniupnpc.c ./transmission-2 #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 ---- ./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 +diff -Naur transmission-2.75/third-party/miniupnp/portlistingparse.c transmission-2.75-haiku/transmission-2.75/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 @@ -28,7 +28,7 @@ /* Helper function */ From d776f01aa0c2f6311104a3265c8cff295f575245 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 30 May 2013 23:48:30 +0200 Subject: [PATCH 231/587] Update libsolv: Supports B_PACKAGE_ARCHITECTURE_SOURCE, now --- .../libsolv-0.3.0_haiku_2013_05_30.recipe | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe 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 new file mode 100644 index 000000000..5f50f0cb9 --- /dev/null +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe @@ -0,0 +1,56 @@ +SUMMARY="Library for solving packages and reading repositories" +DESCRIPTION="Library for solving packages and reading repositories." +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2013, Novell Inc." +HOMEPAGE="http://github.com/openSUSE/libsolv" +SRC_URI="git+git://github.com/weinhold/libsolv.git#a53a69500a56fa1056c6f3a4b17cc91a50c51395" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES="libsolv = $portVersion + lib:libsolv = $portVersion + lib:libsolvext = $portVersion" +REQUIRES="haiku >= $haikuVersion + lib:libexpat >= 1.5 + lib:libz + " +BUILD_REQUIRES="$REQUIRES" +BUILD_PREREQUIRES="haiku_devel >= $haikuVersion + cmd:cmake + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + rm -rf build + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix .. + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + # set up the develop directory correctly + prepareInstalledDevelLibs libsolv libsolvext + + mkdir -p $includeDir + mv $prefix/include/* $includeDir + rmdir $prefix/include + + # move cmake files + mkdir -p $dataDir + mv $prefix/share/cmake $dataDir + rmdir $prefix/share + + # We don't want the executables. + rm -r $prefix/bin +} From 07997e2a4bf6c3ad20f41545da72461d994927be Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 31 May 2013 02:28:47 +0200 Subject: [PATCH 232/587] graphviz: Attempt to make the recipe an actual recipe Runs into internal compiler error on gcc 2. Won't pursue this any further. --- media-gfx/graphviz/graphviz-2.26.3.recipe | 56 +++++++++++++++++------ 1 file changed, 43 insertions(+), 13 deletions(-) diff --git a/media-gfx/graphviz/graphviz-2.26.3.recipe b/media-gfx/graphviz/graphviz-2.26.3.recipe index ca426fd62..dbb349bf1 100644 --- a/media-gfx/graphviz/graphviz-2.26.3.recipe +++ b/media-gfx/graphviz/graphviz-2.26.3.recipe @@ -1,28 +1,58 @@ -DESCRIPTION="graphviz - Open Source Graph Visualization Software." +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." HOMEPAGE="http://www.graphviz.org/" +LICENSE="CPL v1.0" +COPYRIGHT="1994-2010 AT&T Corp." SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.26.3.tar.gz" CHECKSUM_MD5="6f45946fa622770c45609778c0a982ee" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="graphviz-2.26.3.patch" + +PROVIDES=" + graphviz = $portVersion compat >= 2 + " + +# TODO: There are several of optional features (e.g. png and jpeg), some of +# which should be enabled. +REQUIRES=" + haiku >= $haikuVersion + lib:libfreetype + " +BUILD_REQUIRES=" + $REQUIRES + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd graphviz-2.26.3 libtoolize -fci autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ + # The CPPFLAGS, LDFLAGS paths hack is currently required to get the freetype + # headers and library to be found. freetype is part of the system package + # and not in the proper paths. + runConfigure ./configure \ + CPPFLAGS="-I/boot/system/develop/headers/3rdparty/freetype2" \ + LDFLAGS="-L/boot/system/lib" \ --enable-shared \ --disable-perl - make + make $jobArgs } INSTALL() { - cd graphviz-2.26.3 make install } - -LICENSE="CPL v1.0" -COPYRIGHT="1994-2010 AT&T Corp." From ab4ef98db5626ddb88673ed50ce0ed13f1ce5f53 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 31 May 2013 07:14:06 +0200 Subject: [PATCH 233/587] graphviz: Mark recipe as broken --- media-gfx/graphviz/graphviz-2.26.3.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/graphviz/graphviz-2.26.3.recipe b/media-gfx/graphviz/graphviz-2.26.3.recipe index dbb349bf1..6af6fd804 100644 --- a/media-gfx/graphviz/graphviz-2.26.3.recipe +++ b/media-gfx/graphviz/graphviz-2.26.3.recipe @@ -8,7 +8,7 @@ COPYRIGHT="1994-2010 AT&T Corp." SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.26.3.tar.gz" CHECKSUM_MD5="6f45946fa622770c45609778c0a982ee" REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="!x86_gcc2" PATCHES="graphviz-2.26.3.patch" From f35419c13816940e29518a267e9ee4cfc9905c5e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 2 Jun 2013 01:13:18 +0000 Subject: [PATCH 234/587] Updated Vision to r942 --- haiku-apps/vision/vision-942.recipe | 46 +++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 haiku-apps/vision/vision-942.recipe diff --git a/haiku-apps/vision/vision-942.recipe b/haiku-apps/vision/vision-942.recipe new file mode 100644 index 000000000..da079aa51 --- /dev/null +++ b/haiku-apps/vision/vision-942.recipe @@ -0,0 +1,46 @@ +SUMMARY="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#942" +LICENSE="MPL v1.1" +COPYRIGHT="1999-2010 The Vision Team" +REVISION="3" +ARCHITECTURES="x86_gcc2 ?x86" + +if [ $architecture != x86_gcc2 ]; then + PATCHES="vision-908-gcc4.patch" +fi + +PROVIDES=" + vision = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:ld + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + make $jobArgs +} + +INSTALL() +{ + visionDir=$appsDir/Vision + mkdir -p $visionDir + + cp -a $portDir/VisionSettings $visionDir + + cp Vision $visionDir + cd data + copyattr -d -r -x .svn * $visionDir +} From c0b91677ef2f3952ec06340a6d222233c91495a6 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 4 Jun 2013 15:00:38 +0200 Subject: [PATCH 235/587] vision: Fix architecture check variable architecture -> targetArchitecture --- haiku-apps/vision/vision-908.recipe | 2 +- haiku-apps/vision/vision-942.recipe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/vision/vision-908.recipe b/haiku-apps/vision/vision-908.recipe index 70fc48db2..5959561a7 100644 --- a/haiku-apps/vision/vision-908.recipe +++ b/haiku-apps/vision/vision-908.recipe @@ -7,7 +7,7 @@ COPYRIGHT="1999-2010 The Vision Team" REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -if [ $architecture != x86_gcc2 ]; then +if [ $targetArchitecture != x86_gcc2 ]; then PATCHES="vision-908-gcc4.patch" fi diff --git a/haiku-apps/vision/vision-942.recipe b/haiku-apps/vision/vision-942.recipe index da079aa51..a97718bad 100644 --- a/haiku-apps/vision/vision-942.recipe +++ b/haiku-apps/vision/vision-942.recipe @@ -7,7 +7,7 @@ COPYRIGHT="1999-2010 The Vision Team" REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" -if [ $architecture != x86_gcc2 ]; then +if [ $targetArchitecture != x86_gcc2 ]; then PATCHES="vision-908-gcc4.patch" fi From c53699dbc22c0bed1197dd9b7b17340882aab6aa Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 9 Jun 2013 02:26:13 +0200 Subject: [PATCH 236/587] freetype: Convert 2.4.9 recipe to an actual recipe --- media-libs/freetype/freetype-2.4.9.recipe | 72 +++++++++++++++++++---- 1 file changed, 59 insertions(+), 13 deletions(-) diff --git a/media-libs/freetype/freetype-2.4.9.recipe b/media-libs/freetype/freetype-2.4.9.recipe index 5c2a3adf1..7ad1e0911 100644 --- a/media-libs/freetype/freetype-2.4.9.recipe +++ b/media-libs/freetype/freetype-2.4.9.recipe @@ -1,24 +1,70 @@ -DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" -HOMEPAGE="http://www.freetype.org" +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." +HOMEPAGE="http://www.freetype.org" +LICENSE="FreeType" +COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2" CHECKSUM_MD5="77a893dae81fd5b896632715ca041179" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + freetype = $portVersion + lib:libfreetype = 6.8.1 compat >= 6 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libz >= 1 + " +BUILD_REQUIRES=" + $REQUIRES + zlib_devel + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd freetype-2.4.9 - sh ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --includedir=/boot/develop/headers/3rdparty \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` - make + ./autogen.sh + runConfigure ./configure + make $jobArgs } INSTALL() { - cd freetype-2.4.9 make install + + prepareInstalledDevelLibs libfreetype + fixPkgconfig + + # devel package + packageEntries devel \ + $binDir \ + $dataRootDir/aclocal \ + $developDir } -LICENSE="FreeType" -COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The freetype development files" +PROVIDES_devel=" + freetype_devel = $portVersion + cmd:freetype_config = $portVersion + " +REQUIRES_devel=" + freetype == $portVersion + " + +# ----- source package ------------------------------------------------------- + +PROVIDES_source="freetype_source = $portVersion" From c2547ca45e891282791f22cfa0c3631d75561e03 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 9 Jun 2013 02:26:56 +0200 Subject: [PATCH 237/587] Remove old freetype non-recipes --- media-libs/freetype/freetype-2.3.11.recipe | 22 -------------------- media-libs/freetype/freetype-2.4.2.recipe | 22 -------------------- media-libs/freetype/freetype-2.4.4.recipe | 22 -------------------- media-libs/freetype/freetype-2.4.6.recipe | 24 ---------------------- 4 files changed, 90 deletions(-) delete mode 100644 media-libs/freetype/freetype-2.3.11.recipe delete mode 100644 media-libs/freetype/freetype-2.4.2.recipe delete mode 100644 media-libs/freetype/freetype-2.4.4.recipe delete mode 100644 media-libs/freetype/freetype-2.4.6.recipe diff --git a/media-libs/freetype/freetype-2.3.11.recipe b/media-libs/freetype/freetype-2.3.11.recipe deleted file mode 100644 index adf60d5fe..000000000 --- a/media-libs/freetype/freetype-2.3.11.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" -HOMEPAGE="http://www.freetype.org" -SRC_URI="http://download.savannah.gnu.org/releases-noredirect/freetype/freetype-2.3.11.tar.gz" -CHECKSUM_MD5="a693c9a4b0121890ca71e39364ffea4a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd freetype-2.3.11 - sh ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty - make -} - -INSTALL() -{ - cd freetype-2.3.11 - make install -} -LICENSE="FreeType" -COPYRIGHT="1996-2009 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/freetype/freetype-2.4.2.recipe b/media-libs/freetype/freetype-2.4.2.recipe deleted file mode 100644 index 346cd16fc..000000000 --- a/media-libs/freetype/freetype-2.4.2.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" -HOMEPAGE="http://www.freetype.org" -SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.2.tar.bz2" -CHECKSUM_MD5="647ee8ed266f9a4117c8d0a4855b3d3e" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd freetype-2.4.2 - sh ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty - make -} - -INSTALL() -{ - cd freetype-2.4.2 - make install -} -LICENSE="FreeType" -COPYRIGHT="1996-2010 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/freetype/freetype-2.4.4.recipe b/media-libs/freetype/freetype-2.4.4.recipe deleted file mode 100644 index 684f2c221..000000000 --- a/media-libs/freetype/freetype-2.4.4.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" -HOMEPAGE="http://www.freetype.org" -SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.4.tar.bz2" -CHECKSUM_MD5="b3e2b6e2f1c3e0dffa1fd2a0f848b671" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd freetype-2.4.4 - sh ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --includedir=/boot/develop/headers/3rdparty - make -} - -INSTALL() -{ - cd freetype-2.4.4 - make install -} -LICENSE="FreeType" -COPYRIGHT="1996-2011 David Turner, Robert Wilhelm, Werner Lemberg, et al." diff --git a/media-libs/freetype/freetype-2.4.6.recipe b/media-libs/freetype/freetype-2.4.6.recipe deleted file mode 100644 index 7c19c245a..000000000 --- a/media-libs/freetype/freetype-2.4.6.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="Freetype - A Free, High-Quality, and Portable Font Engine" -HOMEPAGE="http://www.freetype.org" -SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.6.tar.bz2" -CHECKSUM_MD5="5e6510613f612809d2d7862592b92ab7" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd freetype-2.4.6 - sh ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --includedir=/boot/develop/headers/3rdparty \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` - make -} - -INSTALL() -{ - cd freetype-2.4.6 - make install -} -LICENSE="FreeType" -COPYRIGHT="1996-2011 David Turner, Robert Wilhelm, Werner Lemberg, et al." From 9597d783c1291c6405a0dd708606f9bb7ff5fe3a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 10 Jun 2013 02:31:09 +0200 Subject: [PATCH 238/587] zlib: update recipe --- sys-libs/zlib/zlib-1.2.8.recipe | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/sys-libs/zlib/zlib-1.2.8.recipe b/sys-libs/zlib/zlib-1.2.8.recipe index f13eb805f..84acc04f8 100644 --- a/sys-libs/zlib/zlib-1.2.8.recipe +++ b/sys-libs/zlib/zlib-1.2.8.recipe @@ -5,7 +5,7 @@ COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" LICENSE="Zlib" SRC_URI="http://zlib.net/zlib-1.2.8.tar.gz" CHECKSUM_MD5="44d667c142d7cda120332623eab69f40" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -19,8 +19,6 @@ BUILD_REQUIRES=" $REQUIRES cmd:cmake cmd:gcc - cmd:gettext - # TODO: Remove! Undeclared dependency of grep! cmd:grep cmd:ld cmd:make @@ -61,11 +59,10 @@ INSTALL() # ----- devel package ------------------------------------------------------- SUMMARY_devel="The zlib development files" -PROVIDES_devel="zlib_devel = $portVersion" -REQUIRES_devel=" - zlib == $portVersion +PROVIDES_devel=" + zlib_devel = $portVersion compat >= 1 + devel:libz = $portVersion compat >= 1 + " +REQUIRES_devel=" + zlib == $portVersion base " - -# ----- source package ------------------------------------------------------- - -PROVIDES_source="zlib_source = $portVersion" From 7ab786ee2f0ba90ee8c358f7264365b3968c84dc Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 10 Jun 2013 02:31:43 +0200 Subject: [PATCH 239/587] ncurses: update recipe Build separate devel package. --- sys-libs/ncurses/ncurses-5.9.recipe | 33 ++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index 536192a9b..3be55157a 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -4,7 +4,7 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz" CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1" LICENSE="MIT" COPYRIGHT="1998-2011 Free Software Foundation, Inc." -REVISION="6" +REVISION="7" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -13,8 +13,6 @@ PROVIDES=" cmd:clear = $portVersion compat >= 5 cmd:infocmp = $portVersion compat >= 5 cmd:infotocap = $portVersion compat >= 5 - cmd:ncurses5_config = $portVersion compat >= 5 - cmd:ncursesw5_config = $portVersion compat >= 5 cmd:reset = $portVersion compat >= 5 cmd:tabs = $portVersion compat >= 5 cmd:tic = $portVersion compat >= 5 @@ -93,6 +91,13 @@ INSTALL() # fix ncurses[w]5-config fixDevelopLibDirReferences $binDir/ncurses5-config $binDir/ncursesw5-config + + # devel package + packageEntries devel \ + $binDir/ncurses5-config \ + $binDir/ncursesw5-config \ + $developDir \ + $manDir/man3 } 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. @@ -100,3 +105,25 @@ DESCRIPTION="The Ncurses (new curses) library is a free software emulation of cu 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 ------------------------------------------------------- + +SUMMARY_devel="The ncurses development files" +PROVIDES_devel=" + ncurses_devel = $portVersion compat >= 5 + cmd:ncurses5_config = $portVersion compat >= 5 + cmd:ncursesw5_config = $portVersion compat >= 5 + devel:libform = $portVersion compat >= 5 + devel:libformw = $portVersion compat >= 5 + devel:libmenu = $portVersion compat >= 5 + devel:libmenuw = $portVersion compat >= 5 + devel:libncurses = $portVersion compat >= 5 + devel:libncursesw = $portVersion compat >= 5 + devel:libncurses++ = $portVersion compat >= 5 + devel:libncurses++w = $portVersion compat >= 5 + devel:libpanel = $portVersion compat >= 5 + devel:libpanelw = $portVersion compat >= 5 + " +REQUIRES_devel=" + ncurses == $portVersion base + " From 8192cb422bb01ed3cfb459f98371136368a5570f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 10 Jun 2013 14:42:10 +0200 Subject: [PATCH 240/587] libiconv: update recipe Build separate devel package. --- dev-libs/libiconv/libiconv-1.13.1.recipe | 40 ++++++++++++++++++++---- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe index 7e90fec31..c58dc54e0 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.recipe +++ b/dev-libs/libiconv/libiconv-1.13.1.recipe @@ -1,10 +1,16 @@ SUMMARY="GNU iconv implementation" -HOMEPAGE="http://www.gnu.org/software/libiconv/" -LICENSE="GNU GPL v3" +HOMEPAGE=" + http://www.gnu.org/software/libiconv + http://www.gnu.org/software/iconv + " +LICENSE=" + GNU LGPL v2 + GNU GPL v3 + " COPYRIGHT="2000-2009 Free Software Foundation, Inc." SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz" CHECKSUM_MD5="7ab33ebd26687c744a37264a330bbe9a" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -45,13 +51,12 @@ BUILD() autoconf autoheader cd .. - ./configure $configureDirArgs \ - --localedir=$dataRootDir/locale \ + runConfigure ./configure \ --enable-relocatable \ --enable-shared \ --enable-static \ --disable-nls - make + make $jobArgs } INSTALL() @@ -60,6 +65,17 @@ INSTALL() mkdir -p ${ACLOCALDIR} cp -f srcm4/iconv.m4 ${ACLOCALDIR}/iconv.m4 make install + + rm $libDir/charset.alias + + prepareInstalledDevelLibs libiconv libcharset + + # devel package + packageEntries devel \ + $developDir \ + $manDir/man3 \ + $dataDir \ + $docDir/*.3.html } TEST() @@ -167,3 +183,15 @@ DESCRIPTION=" libiconv is for you if your application needs to support multiple character encodings, but that support lacks from your system. " + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The libiconv development files" +PROVIDES_devel=" + libiconv_devel = $portVersion compat >= 1.13 + devel:libiconv = 2.5.0 compat >= 2 + devel:libcharset = 1.0.0 compat >= 1 + " +REQUIRES_devel=" + libiconv == $portVersion base + " From 0be68bd73f024202714948484f7298a62c3ea073 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 10 Jun 2013 14:43:28 +0200 Subject: [PATCH 241/587] libiconv: remove old non-recipe/related files --- dev-libs/libiconv/libiconv-1.12.recipe | 50 -- .../libiconv.OptionalPackageDescription | 17 - .../libiconv/patches/libiconv-1.12-haiku.diff | 813 ------------------ 3 files changed, 880 deletions(-) delete mode 100644 dev-libs/libiconv/libiconv-1.12.recipe delete mode 100644 dev-libs/libiconv/libiconv.OptionalPackageDescription delete mode 100644 dev-libs/libiconv/patches/libiconv-1.12-haiku.diff diff --git a/dev-libs/libiconv/libiconv-1.12.recipe b/dev-libs/libiconv/libiconv-1.12.recipe deleted file mode 100644 index 06ce5c699..000000000 --- a/dev-libs/libiconv/libiconv-1.12.recipe +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION="libiconv" -HOMEPAGE="http://www.gnu.org/software/libiconv/" -SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.12.tar.gz" -CHECKSUM_MD5="c2be282595751535a618ae0edeb8f648" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libiconv-1.12 - rm -rf aclocal.m4 - echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" - libtoolize -fci - aclocal --install -I m4 -I srcm4 - autoconf - autoheader - cd libcharset - echo "AC_CONFIG_MACRO_DIR([m4]) >> configure.ac" - libtoolize -fci - aclocal --install -I m4 - autoconf - autoheader - cd .. - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale \ - --docdir=$COMMON_DOCS/doc/iconv \ - --mandir=$COMMON_DOCS/man \ - --enable-relocatable \ - --enable-shared \ - --enable-static \ - --disable-nls - make -} - -INSTALL() -{ - cd libiconv-1.12 - ACLOCALDIR=${DESTDIR}/`aclocal --print-ac-dir` - mkdir -p ${ACLOCALDIR} - cp -f srcm4/iconv.m4 ${ACLOCALDIR}/iconv.m4 - make install -} - -TEST() -{ - cd libiconv-1.12 - make check -} diff --git a/dev-libs/libiconv/libiconv.OptionalPackageDescription b/dev-libs/libiconv/libiconv.OptionalPackageDescription deleted file mode 100644 index aa34e4d12..000000000 --- a/dev-libs/libiconv/libiconv.OptionalPackageDescription +++ /dev/null @@ -1,17 +0,0 @@ -Package: libiconv -Version: 1.13.1 -Copyright: 1998-2009 Free Software Foundation, Inc. -License: GNU LGPL v2 -URL: http://www.gnu.org/software/libiconv - -Package: libcharset -Version: 1.13.1 -Copyright: 1998-2009 Free Software Foundation, Inc. -License: GNU LGPL v2 -URL: http://www.gnu.org/software/libiconv - -Package: iconv -Version: 1.13.1 -Copyright: 1998-2009 Free Software Foundation, Inc. -License: GNU GPL v3 -URL: http://www.gnu.org/software/iconv diff --git a/dev-libs/libiconv/patches/libiconv-1.12-haiku.diff b/dev-libs/libiconv/patches/libiconv-1.12-haiku.diff deleted file mode 100644 index e2cc9cd3f..000000000 --- a/dev-libs/libiconv/patches/libiconv-1.12-haiku.diff +++ /dev/null @@ -1,813 +0,0 @@ -diff -ur libiconv-1.12/build-aux/config.guess libiconv-1.12-haiku/build-aux/config.guess ---- libiconv-1.12/build-aux/config.guess 2007-09-30 01:30:02.000000000 +0000 -+++ libiconv-1.12-haiku/build-aux/config.guess 2008-05-25 16:59:19.000000000 +0000 -@@ -1,10 +1,10 @@ - #! /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 Free Software Foundation, --# Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. - --timestamp='2007-07-22' -+timestamp='2008-01-08' - - # 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 -@@ -56,8 +56,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 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006, 2007, 2008 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." -@@ -532,7 +532,7 @@ - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[45]) -+ *:AIX:*:[456]) - 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 -@@ -799,6 +799,9 @@ - EM64T | authenticamd) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks -@@ -833,7 +836,14 @@ - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -954,8 +964,8 @@ - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; -- xtensa:Linux:*:*) -- echo xtensa-unknown-linux-gnu -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so -@@ -1206,6 +1216,12 @@ - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ BeMac:Haiku:*:*) -+ echo powerpc-apple-haiku -+ exit ;; -+ BePC:Haiku:*:*) -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -diff -ur libiconv-1.12/build-aux/config.libpath libiconv-1.12-haiku/build-aux/config.libpath ---- libiconv-1.12/build-aux/config.libpath 2007-10-23 23:31:23.000000000 +0000 -+++ libiconv-1.12-haiku/build-aux/config.libpath 2008-05-26 04:06:01.000000000 +0000 -@@ -50,7 +50,7 @@ - shlibpath_var=LIBPATH - fi - ;; -- beos*) -+ beos* | haiku*) - shlibpath_var=LIBRARY_PATH - ;; - bsdi[45]*) -diff -ur libiconv-1.12/build-aux/config.rpath libiconv-1.12-haiku/build-aux/config.rpath ---- libiconv-1.12/build-aux/config.rpath 2007-11-11 16:41:16.000000000 +0000 -+++ libiconv-1.12-haiku/build-aux/config.rpath 2008-05-26 02:47:52.000000000 +0000 -@@ -175,7 +175,7 @@ - # them. - ld_shlibs=no - ;; -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else -@@ -511,7 +511,7 @@ - amigaos*) - library_names_spec='$libname.a' - ;; -- beos*) -+ beos* | haiku*) - library_names_spec='$libname$shrext' - ;; - bsdi[45]*) -diff -ur libiconv-1.12/build-aux/ltmain.sh libiconv-1.12-haiku/build-aux/ltmain.sh ---- libiconv-1.12/build-aux/ltmain.sh 2007-10-27 00:28:24.000000000 +0000 -+++ libiconv-1.12-haiku/build-aux/ltmain.sh 2008-05-26 02:58:38.000000000 +0000 -@@ -1593,7 +1593,7 @@ - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-*-haiku) - # These systems don't actually have a C or math library (as such) - continue - ;; -@@ -3505,7 +3505,7 @@ - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) -diff -ur libiconv-1.12/configure libiconv-1.12-haiku/configure ---- libiconv-1.12/configure 2007-11-11 16:46:26.000000000 +0000 -+++ libiconv-1.12-haiku/configure 2008-05-26 03:04:26.000000000 +0000 -@@ -5876,7 +5876,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --beos*) -+beos* | haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -8697,7 +8697,7 @@ - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -9217,7 +9217,7 @@ - ld_shlibs=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -10272,7 +10272,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -10825,7 +10825,7 @@ - lt_cv_dlopen_libs= - - case $host_os in -- beos*) -+ beos* | haiku*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes -@@ -12686,7 +12686,7 @@ - fi - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -13624,7 +13624,7 @@ - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) -@@ -14243,7 +14243,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -15343,7 +15343,7 @@ - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -15863,7 +15863,7 @@ - ld_shlibs_F77=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_F77=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -16847,7 +16847,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -17931,7 +17931,7 @@ - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -18451,7 +18451,7 @@ - ld_shlibs_GCJ=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_GCJ=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -19455,7 +19455,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -diff -ur libiconv-1.12/libcharset/build-aux/config.guess libiconv-1.12-haiku/libcharset/build-aux/config.guess ---- libiconv-1.12/libcharset/build-aux/config.guess 2005-12-29 12:12:25.000000000 +0000 -+++ libiconv-1.12-haiku/libcharset/build-aux/config.guess 2008-05-25 16:59:19.000000000 +0000 -@@ -1,9 +1,10 @@ - #! /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 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. - --timestamp='2005-12-23' -+timestamp='2008-01-08' - - # 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 -@@ -55,8 +56,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 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006, 2007, 2008 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." -@@ -106,7 +107,7 @@ - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; - trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; -- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -@@ -160,6 +161,7 @@ - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -206,8 +208,11 @@ - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; - macppc:MirBSD:*:*) -- echo powerppc-unknown-mirbsd${UNAME_RELEASE} -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -@@ -325,7 +330,7 @@ - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; -- i86pc:SunOS:5.*:*) -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) -@@ -527,7 +532,7 @@ - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[45]) -+ *:AIX:*:[456]) - 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 -@@ -767,6 +772,8 @@ - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac -@@ -774,7 +781,7 @@ - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -- i*:MINGW*:*) -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) -@@ -784,9 +791,18 @@ - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; -- x86:Interix*:[345]*) -- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' -- exit ;; -+ *:Interix*:[3456]*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ EM64T | authenticamd) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; -@@ -820,6 +836,16 @@ - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -@@ -856,7 +882,11 @@ - #endif - #endif - EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) -@@ -875,7 +905,11 @@ - #endif - #endif - EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -@@ -930,6 +964,9 @@ - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent -@@ -972,7 +1009,7 @@ - LIBC=gnulibc1 - # endif - #else -- #if defined(__INTEL_COMPILER) || defined(__PGI) -+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout -@@ -982,7 +1019,11 @@ - LIBC=dietlibc - #endif - EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^LIBC/{ -+ s: ::g -+ p -+ }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit -@@ -1175,6 +1216,12 @@ - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ BeMac:Haiku:*:*) -+ echo powerpc-apple-haiku -+ exit ;; -+ BePC:Haiku:*:*) -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1184,6 +1231,15 @@ - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; -diff -ur libiconv-1.12/libcharset/build-aux/config.libpath libiconv-1.12-haiku/libcharset/build-aux/config.libpath ---- libiconv-1.12/libcharset/build-aux/config.libpath 2005-12-29 12:12:25.000000000 +0000 -+++ libiconv-1.12-haiku/libcharset/build-aux/config.libpath 2008-05-26 03:14:14.000000000 +0000 -@@ -51,7 +51,7 @@ - shlibpath_var=LIBPATH - fi - ;; -- beos*) -+ beos* | haiku*) - shlibpath_var=LIBRARY_PATH - ;; - bsdi4*) -diff -ur libiconv-1.12/libcharset/build-aux/ltmain.sh libiconv-1.12-haiku/libcharset/build-aux/ltmain.sh ---- libiconv-1.12/libcharset/build-aux/ltmain.sh 2007-10-27 00:28:36.000000000 +0000 -+++ libiconv-1.12-haiku/libcharset/build-aux/ltmain.sh 2008-05-26 03:18:48.000000000 +0000 -@@ -1593,7 +1593,7 @@ - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; -@@ -3505,7 +3505,7 @@ - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) -diff -ur libiconv-1.12/libcharset/configure libiconv-1.12-haiku/libcharset/configure ---- libiconv-1.12/libcharset/configure 2007-11-11 16:48:07.000000000 +0000 -+++ libiconv-1.12-haiku/libcharset/configure 2008-05-26 03:22:22.000000000 +0000 -@@ -4272,7 +4272,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --beos*) -+beos* | haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -6985,7 +6985,7 @@ - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -7505,7 +7505,7 @@ - ld_shlibs=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -8560,7 +8560,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -9113,7 +9113,7 @@ - lt_cv_dlopen_libs= - - case $host_os in -- beos*) -+ beos* | haiku*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes -@@ -10974,7 +10974,7 @@ - fi - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_CXX=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -11912,7 +11912,7 @@ - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) -@@ -12531,7 +12531,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -13631,7 +13631,7 @@ - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -14151,7 +14151,7 @@ - ld_shlibs_F77=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_F77=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -15135,7 +15135,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -16219,7 +16219,7 @@ - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -16739,7 +16739,7 @@ - ld_shlibs_GCJ=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_GCJ=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -17743,7 +17743,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -diff -ur libiconv-1.12/libcharset/lib/config.charset libiconv-1.12-haiku/libcharset/lib/config.charset ---- libiconv-1.12/libcharset/lib/config.charset 2006-06-19 10:40:15.000000000 +0000 -+++ libiconv-1.12-haiku/libcharset/lib/config.charset 2008-05-26 03:24:24.000000000 +0000 -@@ -469,7 +469,7 @@ - # space nevertheless. - echo "* UTF-8" - ;; -- beos*) -+ beos* | haiku*) - # BeOS has a single locale, and it has UTF-8 encoding. - echo "* UTF-8" - ;; -diff -ur libiconv-1.12/libcharset/m4/libtool.m4 libiconv-1.12-haiku/libcharset/m4/libtool.m4 ---- libiconv-1.12/libcharset/m4/libtool.m4 2007-10-27 00:46:10.000000000 +0000 -+++ libiconv-1.12-haiku/libcharset/m4/libtool.m4 2008-05-26 03:29:49.000000000 +0000 -@@ -937,7 +937,7 @@ - lt_cv_dlopen_libs= - - case $host_os in -- beos*) -+ beos* | haiku*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes -@@ -1342,7 +1342,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -2316,7 +2316,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --beos*) -+beos* | haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -2542,7 +2542,7 @@ - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - LIBM= - case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; - *-ncr-sysv4.3*) -@@ -3033,7 +3033,7 @@ - fi - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -4955,7 +4955,7 @@ - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) -@@ -5238,7 +5238,7 @@ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -5631,7 +5631,7 @@ - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc -diff -ur libiconv-1.12/m4/libtool.m4 libiconv-1.12-haiku/m4/libtool.m4 ---- libiconv-1.12/m4/libtool.m4 2007-10-27 00:46:10.000000000 +0000 -+++ libiconv-1.12-haiku/m4/libtool.m4 2008-05-26 03:33:20.000000000 +0000 -@@ -937,7 +937,7 @@ - lt_cv_dlopen_libs= - - case $host_os in -- beos*) -+ beos* | haiku*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes -@@ -1342,7 +1342,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -2316,7 +2316,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --beos*) -+beos* | haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -2542,7 +2542,7 @@ - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - LIBM= - case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; - *-ncr-sysv4.3*) -@@ -3033,7 +3033,7 @@ - fi - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc -@@ -4955,7 +4955,7 @@ - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | os2* | pw32*) -@@ -5238,7 +5238,7 @@ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -@@ -5631,7 +5631,7 @@ - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - -- beos*) -+ beos* | haiku*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc From 520d99bc1d9521cc33ec5ad060bf12d22afc245e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 10 Jun 2013 22:03:04 +0200 Subject: [PATCH 242/587] gettext: update recipe Build a separate gettext_libintl package, which only contains libintl, the runtime dependency of gettext'ified ports. --- sys-devel/gettext/gettext-0.18.1.1.recipe | 39 +++++++++++++++++------ 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe index 5305a6aeb..e16d0fcf5 100644 --- a/sys-devel/gettext/gettext-0.18.1.1.recipe +++ b/sys-devel/gettext/gettext-0.18.1.1.recipe @@ -5,12 +5,11 @@ LICENSE="GNU GPL v3" COPYRIGHT="1998, 2010 Free Software Foundation, Inc." SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz" CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="gettext-0.18.1.1.patch" -# TODO: Check command versions! PROVIDES=" gettext = $portVersion compat >= 0.18.1 cmd:autopoint = $portVersion compat >= 0 @@ -35,18 +34,25 @@ PROVIDES=" cmd:ngettext = $portVersion compat >= 0 cmd:recode_sr_latin = $portVersion compat >= 0 cmd:xgettext = $portVersion compat >= 0 + devel:libasprintf = 0.0.0 compat >= 0 + devel:libgettextlib = $portVersion + devel:libgettextlib_0.18.1 = $portVersion + devel:libgettextpo = 0.5.1 compat >= 0 + devel:libgettextsrc = $portVersion + devel:libgettextsrc_0.18.1 = $portVersion + devel:libintl = 8.1.1 compat >= 8 lib:libasprintf = 0.0.0 compat >= 0 - lib:libgettextlib = $portVersion + lib:libgettextlib_0.18.1 = $portVersion lib:libgettextpo = 0.5.1 compat >= 0 - lib:libgettextsrc = $portVersion - lib:libintl = 8.1.1 compat >= 8 + lib:libgettextsrc_0.18.1 = $portVersion " REQUIRES=" haiku >= $haikuVersion + gettext_libintl == $portVersion base lib:libiconv + lib:libncurses " BUILD_REQUIRES=" - $REQUIRES cmd:aclocal cmd:autoconf cmd:automake @@ -55,6 +61,8 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make cmd:makeinfo + devel:libiconv + devel:libncurses " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -81,10 +89,9 @@ INSTALL() prepareInstalledDevelLib libgettextlib '*.so' '*' prepareInstalledDevelLib libgettextsrc '*.so' '*' - # TODO: Several programs are installed in $libDir/gettext ($(pkglibdir) in - # the respective Makefile.am files). A better place would be - # $libExecDir/gettext. Since the programs are probably invoked by other - # programs, that might require some additional changes to the sources. + # libintl package + packageEntries libintl \ + $libDir/libintl* } TEST() @@ -92,3 +99,15 @@ TEST() cd gettext-runtime/tests make check } + +# ----- libintl package ------------------------------------------------------- + +SUMMARY_libintl="The gettext internationalization library" +PROVIDES_libintl=" + gettext_libintl = $portVersion compat >= 1 + lib:libintl = 8.1.1 compat >= 8 + " +REQUIRES_libintl=" + haiku >= $haikuVersion + lib:libiconv + " From 70f67f0e47464a00aa563e2e341d0e55d10dd687 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 10 Jun 2013 22:04:43 +0200 Subject: [PATCH 243/587] gettext: remove old non-recipe --- sys-devel/gettext/gettext-0.17.recipe | 50 --------------------------- 1 file changed, 50 deletions(-) delete mode 100644 sys-devel/gettext/gettext-0.17.recipe diff --git a/sys-devel/gettext/gettext-0.17.recipe b/sys-devel/gettext/gettext-0.17.recipe deleted file mode 100644 index f3ccbea5f..000000000 --- a/sys-devel/gettext/gettext-0.17.recipe +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION="gettext" -HOMEPAGE="http://www.gnu.org/software/gettext/" -SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.17.tar.gz" -CHECKSUM_MD5="58a2bc6d39c0ba57823034d55d65d606" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd gettext-0.17 - rm ./gettext-tools/gnulib-m4/openmp.m4 - libtoolize --force --copy --install - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac - libtoolize --force --copy --install - cd autoconf-lib-link - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac - libtoolize --force --copy --install - cd .. - cd gettext-runtime - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac - libtoolize --force --copy --install - cd .. - cd gettext-tools - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac - libtoolize --force --copy --install - cd .. - cd gettext-runtime/libasprintf - libtoolize --force --copy --install - cd ../.. - export EXTRA_CONF="--disable-java" -# export LDFLAGS="-lnetwork -liconv" - ./autogen.sh --quick --skip-gnulib - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd gettext-0.17 - make install -} - -TEST() -{ - cd gettext-0.17 - make check -} - -LICENSE="GNU GPL v2" -COPYRIGHT="1998, 2009 Free Software Foundation, Inc." From 9dae5eb84d43a3590bd3c04667e8df1335403e4e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 10 Jun 2013 22:06:36 +0200 Subject: [PATCH 244/587] freetype: declare zlib requires correctly, remove source package --- media-libs/freetype/freetype-2.4.9.recipe | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/media-libs/freetype/freetype-2.4.9.recipe b/media-libs/freetype/freetype-2.4.9.recipe index 7ad1e0911..39f26330d 100644 --- a/media-libs/freetype/freetype-2.4.9.recipe +++ b/media-libs/freetype/freetype-2.4.9.recipe @@ -17,8 +17,6 @@ REQUIRES=" lib:libz >= 1 " BUILD_REQUIRES=" - $REQUIRES - zlib_devel cmd:aclocal cmd:autoconf cmd:automake @@ -26,6 +24,7 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize cmd:make + devel:libz " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -60,11 +59,8 @@ SUMMARY_devel="The freetype development files" PROVIDES_devel=" freetype_devel = $portVersion cmd:freetype_config = $portVersion + devel:libfreetype = 6.8.1 compat >= 6 " REQUIRES_devel=" freetype == $portVersion " - -# ----- source package ------------------------------------------------------- - -PROVIDES_source="freetype_source = $portVersion" From 1215ce9c75df9127fcff0df86128811cb60938f1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 10 Jun 2013 23:10:30 +0200 Subject: [PATCH 245/587] jpeg: add recipe for version 9 * Add version 9 since our auto tools don't like the 8d build system. Hopefullly that also works with Haiku's JPEG translator. * Omit patch for this version. This should rather be solved in the JPEG translator. * Build 3 packages: The base package only contains the library, the devel package the usual development files, and the tools package contains the executable which probably no one ever uses. --- media-libs/jpeg/jpeg-9.recipe | 95 +++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 media-libs/jpeg/jpeg-9.recipe diff --git a/media-libs/jpeg/jpeg-9.recipe b/media-libs/jpeg/jpeg-9.recipe new file mode 100644 index 000000000..58bc495af --- /dev/null +++ b/media-libs/jpeg/jpeg-9.recipe @@ -0,0 +1,95 @@ +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." +HOMEPAGE="http://www.ijg.org" +LICENSE="JPEG" +COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding. All Rights Reserved" +SRC_URI="http://www.ijg.org/files/jpegsrc.v9.tar.gz" +CHECKSUM_MD5="b397211ddfd506b92cd5e02a22ac924d" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + jpeg = $portVersion compat >= 9 + lib:libjpeg = $portVersion compat >= 9 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + $REQUIRES + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:grep + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + aclocal + libtoolize --force --copy --install + automake --add-missing + autoconf + runConfigure ./configure \ + --enable-shared + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libjpeg + + # devel package + packageEntries devel \ + $developDir + + # tools package + packageEntries tools \ + $binDir \ + $documentationDir +} + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The JPEG development files" +PROVIDES_devel=" + jpeg_devel = $portVersion compat >= 9 + devel:libjpeg = $portVersion compat >= 9 + " +REQUIRES_devel=" + jpeg == $portVersion base + " + +# ----- tools package ------------------------------------------------------- + +SUMMARY_tools="The JPEG tools" +PROVIDES_tools=" + jpeg_tools = $portVersion compat >= 9 + cmd:cjpeg = $portVersion compat >= 9 + cmd:djpeg = $portVersion compat >= 9 + cmd:jpegtran = $portVersion compat >= 9 + cmd:rdjpgcom = $portVersion compat >= 9 + cmd:wrjpgcom = $portVersion compat >= 9 + " +REQUIRES_tools=" + haiku >= $haikuVersion + jpeg == $portVersion base + " From a6f8eb84f8e8abf5a8d4018f54b1cf2e87dd359c Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 10 Jun 2013 23:15:17 +0200 Subject: [PATCH 246/587] jpeg: remove old non-recipes Keep 8d for the time being until 9 has been verified to work. --- media-libs/jpeg/jpeg-7.recipe | 23 ----------------------- media-libs/jpeg/jpeg-8b.recipe | 23 ----------------------- media-libs/jpeg/jpeg-8c.recipe | 29 ----------------------------- 3 files changed, 75 deletions(-) delete mode 100644 media-libs/jpeg/jpeg-7.recipe delete mode 100644 media-libs/jpeg/jpeg-8b.recipe delete mode 100644 media-libs/jpeg/jpeg-8c.recipe diff --git a/media-libs/jpeg/jpeg-7.recipe b/media-libs/jpeg/jpeg-7.recipe deleted file mode 100644 index 3fbb5277d..000000000 --- a/media-libs/jpeg/jpeg-7.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="jpeg" -HOMEPAGE="http://www.ijg.org" -SRC_URI="http://www.ijg.org/files/jpegsrc.v7.tar.gz" -CHECKSUM_MD5="382ef33b339c299b56baf1296cda9785" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd jpeg-7 - aclocal - libtoolize --force --copy --install - automake --add-missing - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared - make -} - -INSTALL() -{ - cd jpeg-7 - make install -} diff --git a/media-libs/jpeg/jpeg-8b.recipe b/media-libs/jpeg/jpeg-8b.recipe deleted file mode 100644 index 96add2dd1..000000000 --- a/media-libs/jpeg/jpeg-8b.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="jpeg" -HOMEPAGE="http://www.ijg.org" -SRC_URI="http://www.ijg.org/files/jpegsrc.v8b.tar.gz" -CHECKSUM_MD5="e022acbc5b36cd2cb70785f5b575661e" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd jpeg-8b - aclocal - libtoolize --force --copy --install - automake --add-missing - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared - make -} - -INSTALL() -{ - cd jpeg-8b - make install -} diff --git a/media-libs/jpeg/jpeg-8c.recipe b/media-libs/jpeg/jpeg-8c.recipe deleted file mode 100644 index eb4f28643..000000000 --- a/media-libs/jpeg/jpeg-8c.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="jpeg" -HOMEPAGE="http://www.ijg.org" -SRC_URI="http://www.ijg.org/files/jpegsrc.v8c.tar.gz" -CHECKSUM_MD5="a2c10c04f396a9ce72894beb18b4e1f9" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd jpeg-8c - aclocal - libtoolize --force --copy --install - automake --add-missing - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --enable-shared - make -} - -INSTALL() -{ - cd jpeg-8c - make install -} - -LICENSE="JPEG" -COPYRIGHT="1991-2011, Thomas G. Lane, Guido Vollbeding. All Rights Reserved" - From d4f155d5291744aeabac28d79d47cde18ba62a11 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 00:01:12 +0200 Subject: [PATCH 247/587] libpng: convert recipe to actual recipe --- media-libs/libpng/libpng-1.5.12.recipe | 78 +++++++++++++++---- .../libpng/patches/libpng-1.5.12.patchset | 22 ++++++ 2 files changed, 86 insertions(+), 14 deletions(-) create mode 100644 media-libs/libpng/patches/libpng-1.5.12.patchset diff --git a/media-libs/libpng/libpng-1.5.12.recipe b/media-libs/libpng/libpng-1.5.12.recipe index ea6a3db26..3364959f7 100644 --- a/media-libs/libpng/libpng-1.5.12.recipe +++ b/media-libs/libpng/libpng-1.5.12.recipe @@ -1,27 +1,77 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2011 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." +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." +HOMEPAGE="http://www.libpng.org" +COPYRIGHT=" + 1998-2011 Glenn Randers-Pehrson + 1996-1997 Andreas Dilger + 1995-1996 Guy Eric Schalnat, Group 42, Inc. + " LICENSE="LibPNG" - SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.12.tar.gz?download" CHECKSUM_MD5="8ea7f60347a306c5faf70b977fa80e28" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="libpng-1.5.12.patchset" + +PROVIDES=" + libpng = $portVersion compat >= 1.5 + lib:libpng = 15.12.0 compat >= 15 + lib:libpng15 = 15.12.0 compat >= 15 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libz + " +BUILD_REQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + devel:libz >= 1.0.4 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd libpng-1.5.12 - libtoolize --force --copy + aclocal + libtoolize --force --copy --install ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd libpng-1.5.12 make install + + prepareInstalledDevelLibs libpng + fixPkgconfig + + # devel package + packageEntries devel \ + $binDir \ + $developDir \ + $manDir/man3 } + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The libpng development files" +PROVIDES_devel=" + libpng_devel = $portVersion compat >= 1.5 + cmd:libpng_config = $portVersion compat >= 1.5 + cmd:libpng15_config = $portVersion compat >= 1.5 + devel:libpng = 15.12.0 compat >= 15 + devel:libpng15 = 15.12.0 compat >= 15 + " +REQUIRES_devel=" + libpng == $portVersion base + " diff --git a/media-libs/libpng/patches/libpng-1.5.12.patchset b/media-libs/libpng/patches/libpng-1.5.12.patchset new file mode 100644 index 000000000..9d93644d2 --- /dev/null +++ b/media-libs/libpng/patches/libpng-1.5.12.patchset @@ -0,0 +1,22 @@ +From ca47ea510b8f381f4cd3f0dbf887faa0b95257ca Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Mon, 10 Jun 2013 23:42:11 +0200 +Subject: configure.ac: replace obsolete AM_CONFIG_HEADER + + +diff --git a/configure.ac b/configure.ac +index beeeb81..8f51ada 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -31,7 +31,7 @@ PNGLIB_RELEASE=12 + dnl End of version number stuff + + AC_CONFIG_SRCDIR([pngget.c]) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + # Checks for programs. + AC_LANG([C]) +-- +1.7.5 + From 4b7ae1d56ccdfac4d70a16b821ebcb092debb2bf Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 00:01:59 +0200 Subject: [PATCH 248/587] libpng: remove old non-recipes --- media-libs/libpng/libpng-1.2.29.recipe | 23 ---------------------- media-libs/libpng/libpng-1.2.30.recipe | 26 ------------------------- media-libs/libpng/libpng-1.2.40.recipe | 25 ------------------------ media-libs/libpng/libpng-1.2.41.recipe | 25 ------------------------ media-libs/libpng/libpng-1.2.43.recipe | 25 ------------------------ media-libs/libpng/libpng-1.2.44.recipe | 25 ------------------------ media-libs/libpng/libpng-1.2.46.recipe | 25 ------------------------ media-libs/libpng/libpng-1.4.1.recipe | 25 ------------------------ media-libs/libpng/libpng-1.4.2.recipe | 26 ------------------------- media-libs/libpng/libpng-1.4.3.recipe | 26 ------------------------- media-libs/libpng/libpng-1.4.4.recipe | 26 ------------------------- media-libs/libpng/libpng-1.5.0.recipe | 27 -------------------------- media-libs/libpng/libpng-1.5.2.recipe | 27 -------------------------- media-libs/libpng/libpng-1.5.4.recipe | 27 -------------------------- media-libs/libpng/libpng-1.5.7.recipe | 27 -------------------------- 15 files changed, 385 deletions(-) delete mode 100644 media-libs/libpng/libpng-1.2.29.recipe delete mode 100644 media-libs/libpng/libpng-1.2.30.recipe delete mode 100644 media-libs/libpng/libpng-1.2.40.recipe delete mode 100644 media-libs/libpng/libpng-1.2.41.recipe delete mode 100644 media-libs/libpng/libpng-1.2.43.recipe delete mode 100644 media-libs/libpng/libpng-1.2.44.recipe delete mode 100644 media-libs/libpng/libpng-1.2.46.recipe delete mode 100644 media-libs/libpng/libpng-1.4.1.recipe delete mode 100644 media-libs/libpng/libpng-1.4.2.recipe delete mode 100644 media-libs/libpng/libpng-1.4.3.recipe delete mode 100644 media-libs/libpng/libpng-1.4.4.recipe delete mode 100644 media-libs/libpng/libpng-1.5.0.recipe delete mode 100644 media-libs/libpng/libpng-1.5.2.recipe delete mode 100644 media-libs/libpng/libpng-1.5.4.recipe delete mode 100644 media-libs/libpng/libpng-1.5.7.recipe diff --git a/media-libs/libpng/libpng-1.2.29.recipe b/media-libs/libpng/libpng-1.2.29.recipe deleted file mode 100644 index 7c21c5353..000000000 --- a/media-libs/libpng/libpng-1.2.29.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="http://superb-east.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.29.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libpng-1.2.29 - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libpng-1.2.29 - make install -} -LICENSE="LIBPNG" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.2.30.recipe b/media-libs/libpng/libpng-1.2.30.recipe deleted file mode 100644 index bc79c0eac..000000000 --- a/media-libs/libpng/libpng-1.2.30.recipe +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="http://superb-east.dl.sourceforge.net/sourceforge/libpng/libpng-1.2.30.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libpng-1.2.30 - cp /boot/common/share/libtool/config.guess . - cp /boot/common/share/libtool/config.sub - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libpng-1.2.30 - make install -} -LICENSE="LIBPNG" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.2.40.recipe b/media-libs/libpng/libpng-1.2.40.recipe deleted file mode 100644 index 207338d34..000000000 --- a/media-libs/libpng/libpng-1.2.40.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="ftp://ftp.simplesystems.org/pub/png/src/history/libpng-1.2.40.tar.gz" -CHECKSUM_MD5="a2f6808735bf404967f81519a967fb2a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libpng-1.2.40 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libpng-1.2.40 - make install -} -LICENSE="LIBPNG" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.2.41.recipe b/media-libs/libpng/libpng-1.2.41.recipe deleted file mode 100644 index df4cef202..000000000 --- a/media-libs/libpng/libpng-1.2.41.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng-1.2.41.tar.gz" -CHECKSUM_MD5="82ab87818fb22961620aac7eca9fea14" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libpng-1.2.41 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libpng-1.2.41 - make install -} -LICENSE="LIBPNG" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.2.43.recipe b/media-libs/libpng/libpng-1.2.43.recipe deleted file mode 100644 index 9d846cffa..000000000 --- a/media-libs/libpng/libpng-1.2.43.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng-1.2.43.tar.gz" -CHECKSUM_MD5="00f3f6bfadbd4f83e351558ad6bb46b5" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libpng-1.2.43 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libpng-1.2.43 - make install -} -LICENSE="LIBPNG" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.2.44.recipe b/media-libs/libpng/libpng-1.2.44.recipe deleted file mode 100644 index b45fbe8fe..000000000 --- a/media-libs/libpng/libpng-1.2.44.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.2.44.tar.gz?download" -CHECKSUM_MD5="89b62f8daaeeab1342e307d6d1411ff1" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libpng-1.2.44 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libpng-1.2.44 - make install -} -LICENSE="LibPNG" -COPYRIGHT="1998-2010 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.2.46.recipe b/media-libs/libpng/libpng-1.2.46.recipe deleted file mode 100644 index 747808949..000000000 --- a/media-libs/libpng/libpng-1.2.46.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.2.46.tar.gz?download" -CHECKSUM_MD5="03ddfc17ad321db93f984581e9415d22" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libpng-1.2.46 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libpng-1.2.46 - make install -} -LICENSE="LibPNG" -COPYRIGHT="1998-2011 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.4.1.recipe b/media-libs/libpng/libpng-1.4.1.recipe deleted file mode 100644 index 3f14ced79..000000000 --- a/media-libs/libpng/libpng-1.4.1.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -SRC_URI="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.4.1.tar.gz" -CHECKSUM_MD5="fa0b2a84733463f90d3ac9f43ccafabc" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libpng-1.4.1 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libpng-1.4.1 - make install -} -LICENSE="LibPNG" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." diff --git a/media-libs/libpng/libpng-1.4.2.recipe b/media-libs/libpng/libpng-1.4.2.recipe deleted file mode 100644 index f89b98f20..000000000 --- a/media-libs/libpng/libpng-1.4.2.recipe +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.4.2.tar.gz" -CHECKSUM_MD5="89fd334dc5fc84ff146b9269c4fa452f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libpng-1.4.2 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libpng-1.4.2 - make install -} diff --git a/media-libs/libpng/libpng-1.4.3.recipe b/media-libs/libpng/libpng-1.4.3.recipe deleted file mode 100644 index e6c7e4978..000000000 --- a/media-libs/libpng/libpng-1.4.3.recipe +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2010 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.4.3.tar.gz" -CHECKSUM_MD5="df3521f61a1b8b69489d297c0ca8c1f8" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libpng-1.4.3 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libpng-1.4.3 - make install -} diff --git a/media-libs/libpng/libpng-1.4.4.recipe b/media-libs/libpng/libpng-1.4.4.recipe deleted file mode 100644 index bbbd67ae6..000000000 --- a/media-libs/libpng/libpng-1.4.4.recipe +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2010 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.4.4.tar.gz" -CHECKSUM_MD5="297b38f925e745061489b41b1f7c4bb1" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD() -{ - cd libpng-1.4.4 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libpng-1.4.4 - make install -} diff --git a/media-libs/libpng/libpng-1.5.0.recipe b/media-libs/libpng/libpng-1.5.0.recipe deleted file mode 100644 index 57f886d83..000000000 --- a/media-libs/libpng/libpng-1.5.0.recipe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2011 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.0.tar.gz?download" -CHECKSUM_MD5="32a9f9c8f7f020bf7867a453d81fcb51" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libpng-1.5.0 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd libpng-1.5.0 - make install -} diff --git a/media-libs/libpng/libpng-1.5.2.recipe b/media-libs/libpng/libpng-1.5.2.recipe deleted file mode 100644 index fe9daef1a..000000000 --- a/media-libs/libpng/libpng-1.5.2.recipe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2011 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.2.tar.gz?download" -CHECKSUM_MD5="31d448eb93a1646359a23f1b23434ab3" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libpng-1.5.2 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd libpng-1.5.2 - make install -} diff --git a/media-libs/libpng/libpng-1.5.4.recipe b/media-libs/libpng/libpng-1.5.4.recipe deleted file mode 100644 index 82b9201c0..000000000 --- a/media-libs/libpng/libpng-1.5.4.recipe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2011 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.4.tar.gz?download" -CHECKSUM_MD5="dea4d1fd671160424923e92ff0cdda78" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libpng-1.5.4 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd libpng-1.5.4 - make install -} diff --git a/media-libs/libpng/libpng-1.5.7.recipe b/media-libs/libpng/libpng-1.5.7.recipe deleted file mode 100644 index dd3e2263d..000000000 --- a/media-libs/libpng/libpng-1.5.7.recipe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="libpng" -HOMEPAGE="http://www.libpng.org" -COPYRIGHT="1998-2011 Glenn Randers-Pehrson - 1996-1997 Andreas Dilger - 1995-1996 Guy Eric Schalnat, Group 42, Inc." -LICENSE="LibPNG" - -SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.7.tar.gz?download" -CHECKSUM_MD5="944b56a84b65d94054cc73d7ff965de8" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libpng-1.5.7 - libtoolize --force --copy - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd libpng-1.5.7 - make install -} From ad8389127a901df172cb82a61571be10d617c033 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 14:26:11 +0200 Subject: [PATCH 249/587] libogg: convert recipe to an actual recipe --- media-libs/libogg/libogg-1.3.0.recipe | 73 ++++++++++++++++--- .../libogg/patches/libogg-1.3.0.patchset | 57 +++++++++++++++ 2 files changed, 118 insertions(+), 12 deletions(-) create mode 100644 media-libs/libogg/patches/libogg-1.3.0.patchset diff --git a/media-libs/libogg/libogg-1.3.0.recipe b/media-libs/libogg/libogg-1.3.0.recipe index 9cc92e61c..a2e931020 100644 --- a/media-libs/libogg/libogg-1.3.0.recipe +++ b/media-libs/libogg/libogg-1.3.0.recipe @@ -1,24 +1,73 @@ -DESCRIPTION="libogg" -HOMEPAGE="http://www.xiph.org" +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." +HOMEPAGE="http://www.xiph.org" +LICENSE="BSD (3-clause)" +COPYRIGHT="1994-2011 Xiph.Org Foundation" SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.gz" CHECKSUM_MD5="0a7eb40b86ac050db3a789ab65fe21c2" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="libogg-1.3.0.patchset" + +PROVIDES=" + libogg = $portVersion + lib:libogg = 0.8.0 compat >= 0 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd libogg-1.3.0 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS - make + libtoolize --force --copy --install + aclocal + autoconf + automake + runConfigure ./configure \ + --docdir $developDocDir + make $jobArgs } INSTALL() { - cd libogg-1.3.0 make install + prepareInstalledDevelLibs libogg + fixPkgconfig + + # devel package + packageEntries devel \ + $dataDir \ + $developDir } -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2011 Xiph.Org Foundation" +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The libogg development files" +PROVIDES_devel=" + libogg_devel = $portVersion + devel:libogg = 0.8.0 compat >= 0 + " +REQUIRES_devel=" + libogg == $portVersion + " diff --git a/media-libs/libogg/patches/libogg-1.3.0.patchset b/media-libs/libogg/patches/libogg-1.3.0.patchset new file mode 100644 index 000000000..12ee3c920 --- /dev/null +++ b/media-libs/libogg/patches/libogg-1.3.0.patchset @@ -0,0 +1,57 @@ +From 2620afc432e102f21a44de0576eb9d901cb7c069 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 14:17:52 +0200 +Subject: configure.in: use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER + + +diff --git a/configure.in b/configure.in +index 7141645..3a01896 100644 +--- a/configure.in ++++ b/configure.in +@@ -19,7 +19,7 @@ AM_PROG_LIBTOOL + AM_PROG_CC_C_O + + dnl config.h +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + dnl Set some options based on environment + +-- +1.7.5 + + +From 79c094d54944f3a970851157f7937811fb73f9d7 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 14:18:38 +0200 +Subject: doc[/libogg]/Makefile.am: don't hard-code docdir + + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 9c2c316..9c727c4 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -2,8 +2,6 @@ + + SUBDIRS = libogg + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) +- + doc_DATA = framing.html index.html oggstream.html ogg-multiplex.html \ + stream.png vorbisword2.png white-ogg.png white-xifish.png \ + rfc3533.txt rfc5334.txt skeleton.html +diff --git a/doc/libogg/Makefile.am b/doc/libogg/Makefile.am +index 9eb7d34..e34c8a8 100644 +--- a/doc/libogg/Makefile.am ++++ b/doc/libogg/Makefile.am +@@ -1,7 +1,5 @@ + ## Process this file with automake to produce Makefile.in + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/ogg +- + doc_DATA = bitpacking.html datastructures.html decoding.html encoding.html\ + general.html index.html ogg_packet.html ogg_packet_clear.html\ + ogg_page.html ogg_page_bos.html ogg_page_checksum_set.html\ +-- +1.7.5 + From 6cf4ac12346bfd6c7e2309b523c59346dd73d48e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 14:36:29 +0200 Subject: [PATCH 250/587] libogg: remove old non-recipes --- media-libs/libogg/libogg-1.1.3.recipe | 21 ----------------- media-libs/libogg/libogg-1.1.4.recipe | 25 -------------------- media-libs/libogg/libogg-1.2.0.recipe | 28 ---------------------- media-libs/libogg/libogg-1.2.2.recipe | 34 --------------------------- 4 files changed, 108 deletions(-) delete mode 100644 media-libs/libogg/libogg-1.1.3.recipe delete mode 100644 media-libs/libogg/libogg-1.1.4.recipe delete mode 100644 media-libs/libogg/libogg-1.2.0.recipe delete mode 100644 media-libs/libogg/libogg-1.2.2.recipe diff --git a/media-libs/libogg/libogg-1.1.3.recipe b/media-libs/libogg/libogg-1.1.3.recipe deleted file mode 100644 index 161b2f857..000000000 --- a/media-libs/libogg/libogg-1.1.3.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="libogg" -HOMEPAGE="http://www.xiph.org" -SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz" -CHECKSUM_MD5="eaf7dc6ebbff30975de7527a80831585" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libogg-1.1.3 - ./configure --prefix=/boot/home/config - make -} - -INSTALL() -{ - cd libogg-1.1.3 - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libogg/libogg-1.1.4.recipe b/media-libs/libogg/libogg-1.1.4.recipe deleted file mode 100644 index 0e30cbddb..000000000 --- a/media-libs/libogg/libogg-1.1.4.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libogg" -HOMEPAGE="http://www.xiph.org" -SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.1.4.tar.gz" -CHECKSUM_MD5="10200ec22543841d9d1c23e0aed4e5e9" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libogg-1.1.4 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libogg-1.1.4 - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libogg/libogg-1.2.0.recipe b/media-libs/libogg/libogg-1.2.0.recipe deleted file mode 100644 index 35b05a421..000000000 --- a/media-libs/libogg/libogg-1.2.0.recipe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="libogg" -HOMEPAGE="http://www.xiph.org" -SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.2.0.tar.gz" -CHECKSUM_MD5="c95b73759acfc30712beef6ce4e88efa" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libogg-1.2.0 - rm aclocal.m4 - mkdir -p m4 - libtoolize --force --copy --install - echo 'AC_CONFIG_MACRO_DIR([m4]) >> configure.in' - aclocal --install -I m4 - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libogg-1.2.0 - make install -} - -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libogg/libogg-1.2.2.recipe b/media-libs/libogg/libogg-1.2.2.recipe deleted file mode 100644 index 7348503a7..000000000 --- a/media-libs/libogg/libogg-1.2.2.recipe +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION="libogg" -HOMEPAGE="http://www.xiph.org" -SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.2.2.tar.gz" -CHECKSUM_MD5="5a9fcabc9a1b7c6f1cd75ddc78f36c56" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libogg-1.2.2 - rm aclocal.m4 - mkdir -p m4 - cp `aclocal --print-ac-dir`/ltversion.m4 m4 - libtoolize -fci - echo 'AC_CONFIG_MACRO_DIR([m4]) >> configure.in' - libtoolize -fci - aclocal --install -I m4 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' Make* - sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' src/Make* - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS - make -} - -INSTALL() -{ - cd libogg-1.2.2 - make install -} - -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" From 2af394537ab82816f1780eb24ee04b5aad58529b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 16:56:49 +0200 Subject: [PATCH 251/587] pkgconfig: add recipe for 0.27.1 --- .../patches/pkgconfig-0.27.1.patchset | 60 ++++++++++++++++++ dev-util/pkgconfig/pkgconfig-0.27.1.recipe | 63 +++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 dev-util/pkgconfig/patches/pkgconfig-0.27.1.patchset create mode 100644 dev-util/pkgconfig/pkgconfig-0.27.1.recipe diff --git a/dev-util/pkgconfig/patches/pkgconfig-0.27.1.patchset b/dev-util/pkgconfig/patches/pkgconfig-0.27.1.patchset new file mode 100644 index 000000000..2eb090a78 --- /dev/null +++ b/dev-util/pkgconfig/patches/pkgconfig-0.27.1.patchset @@ -0,0 +1,60 @@ +From 2d186a28945868303f8e40b728058f979f77b3b5 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 14:59:02 +0200 +Subject: glib/configure.ac: use AC_PROG_CC instead of AM_PROG_CC_STDC + + +diff --git a/glib/configure.ac b/glib/configure.ac +index 9e48cc9..f51d103 100644 +--- a/glib/configure.ac ++++ b/glib/configure.ac +@@ -288,7 +288,7 @@ AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=) + AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""]) + AC_LANG_RESTORE + +-AM_PROG_CC_STDC ++AC_PROG_CC + AM_PROG_CC_C_O + AC_PROG_INSTALL + +-- +1.7.5 + + +From 8a711d6bac22f0334acf6eecc83a3b38b19e2409 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 16:16:06 +0200 +Subject: glib/configure.ac: search for stuff in -lnetwork + + +diff --git a/glib/configure.ac b/glib/configure.ac +index f51d103..d41bef3 100644 +--- a/glib/configure.ac ++++ b/glib/configure.ac +@@ -1057,11 +1057,19 @@ if test $glib_native_win32 = no; then + [res_query("test", 0, 0, (void *)0, 0);], + [AC_MSG_RESULT([in -lbind]) + NETWORK_LIBS="-lbind $NETWORK_LIBS"], +- [AC_MSG_ERROR(not found)])]) ++ [LIBS="-lnetwork $save_libs" ++ AC_TRY_LINK([#include ], ++ [res_query("test", 0, 0, (void *)0, 0);], ++ [AC_MSG_RESULT([in -lbind]) ++ NETWORK_LIBS="-lnetwork $NETWORK_LIBS"], ++ [AC_MSG_ERROR(not found)])])]) + LIBS="$save_libs"]) +- AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket, +- [NETWORK_LIBS="-lsocket $NETWORK_LIBS"], +- [AC_MSG_ERROR(Could not find socket())])) ++ AC_CHECK_FUNC(socket, :, ++ AC_CHECK_LIB(socket, socket, ++ [NETWORK_LIBS="-lsocket $NETWORK_LIBS"], ++ [AC_CHECK_LIB(network, socket, ++ [NETWORK_LIBS="-lnetwork $NETWORK_LIBS"], ++ [AC_MSG_ERROR(Could not find socket())])])) + fi + AC_SUBST(NETWORK_LIBS) + +-- +1.7.5 + diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe new file mode 100644 index 000000000..74ccd4529 --- /dev/null +++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe @@ -0,0 +1,63 @@ +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." +HOMEPAGE="http://pkg-config.freedesktop.org/wiki/" +LICENSE="GNU GPL v2" +COPYRIGHT="1998, 2001-2006 Red Hat Inc." +SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz" +CHECKSUM_MD5="5392b4e3372879c5bf856173b418d6a2" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="pkgconfig-0.27.1.patchset" + +PROVIDES=" + pkgconfig = $portVersion compat >= 0.27 + cmd:pkg_config = $portVersion compat >= 0.27 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libiconv + " +BUILD_REQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:autoreconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + devel:libiconv + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="pkg-config-0.27.1" + +BUILD() +{ + cd glib + libtoolize --force --copy --install + autoreconf + cd .. + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + + pcPathSubdir="develop/lib/pkgconfig" + pcPath="/boot/common/non-packaged/$pcPathSubdir" + pcPath="$pcPath:/boot/common/$pcPathSubdir" + pcPath="$pcPath:/boot/system/$pcPathSubdir" + + runConfigure ./configure \ + --with-internal-glib \ + --with-pc_path="$pcPath" + make $jobArgs +} + +INSTALL() +{ + make install +} From fe182f845198bc0cd7797096d847d5eba949ddea Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 16:57:42 +0200 Subject: [PATCH 252/587] pkgconfig: remove old non-recipes and patches --- .../pkgconfig/patches/pkgconfig-0.25.patch | 26 -------------- dev-util/pkgconfig/pkgconfig-0.23.recipe | 33 ----------------- dev-util/pkgconfig/pkgconfig-0.25.recipe | 36 ------------------- 3 files changed, 95 deletions(-) delete mode 100644 dev-util/pkgconfig/patches/pkgconfig-0.25.patch delete mode 100644 dev-util/pkgconfig/pkgconfig-0.23.recipe delete mode 100644 dev-util/pkgconfig/pkgconfig-0.25.recipe diff --git a/dev-util/pkgconfig/patches/pkgconfig-0.25.patch b/dev-util/pkgconfig/patches/pkgconfig-0.25.patch deleted file mode 100644 index 907a3178d..000000000 --- a/dev-util/pkgconfig/patches/pkgconfig-0.25.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- pkg-config-0.25/parse.c 2010-05-27 20:21:36.003670016 +0000 -+++ pkg-config-0.25-haiku/parse.c 2010-08-05 02:44:44.243269632 +0000 -@@ -880,8 +880,9 @@ - pkg->other_cflags = g_slist_prepend (pkg->other_cflags, - g_strdup (arg)); - if (strcmp("-idirafter", arg) == 0) { -- tmp = trim_string(argv[++i]); -- char *n = strdup_escape_shell(tmp); -+ char *n; -+ tmp = trim_string(argv[++i]); -+ n = strdup_escape_shell(tmp); - pkg->other_cflags = g_slist_prepend(pkg->other_cflags, n); - g_free(tmp); - } -diff -urN pkg-config-0.25/pkg.m4 pkg-config-0.25-dnlfixed/pkg.m4 ---- pkg-config-0.25/pkg.m4 2009-12-06 20:39:02.000524288 +0000 -+++ pkg-config-0.25-dnlfixed/pkg.m4 2010-09-07 20:24:30.345505792 +0000 -@@ -135,7 +135,7 @@ - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --_PKG_TEXT])dnl -+_PKG_TEXT])[]dnl - ]) - elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) diff --git a/dev-util/pkgconfig/pkgconfig-0.23.recipe b/dev-util/pkgconfig/pkgconfig-0.23.recipe deleted file mode 100644 index f5bd3a43d..000000000 --- a/dev-util/pkgconfig/pkgconfig-0.23.recipe +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="pkgconfig" -HOMEPAGE="http://pkg-config.freedesktop.org/wiki/" -SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz" -CHECKSUM_MD5="d922a88782b64441d06547632fd85744" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd pkg-config-0.23/glib-1.2.10 - mkdir -p m4 - libtoolize --force --copy --install - aclocal --install -I m4 - autoreconf - cd .. - mkdir -p m4 - libtoolize --force --copy --install - aclocal --install -I m4 - autoreconf - automake - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd pkg-config-0.23 - make install -} - -LICENSE="GNU GPL v2" -COPYRIGHT="1998, 2001-2006 Red Hat Inc." diff --git a/dev-util/pkgconfig/pkgconfig-0.25.recipe b/dev-util/pkgconfig/pkgconfig-0.25.recipe deleted file mode 100644 index 8c3067e73..000000000 --- a/dev-util/pkgconfig/pkgconfig-0.25.recipe +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION="pkgconfig" -HOMEPAGE="http://pkg-config.freedesktop.org/wiki/" -SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.25.tar.gz" -CHECKSUM_MD5="a3270bab3f4b69b7dc6dbdacbcae9745" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd pkg-config-0.25/glib-1.2.10 - mkdir -p m4 - libtoolize --force --copy --install - aclocal --install -I m4 - autoreconf - cd .. - mkdir -p m4 - libtoolize --force --copy --install - aclocal --install -I m4 - autoreconf - automake - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=$COMMON_DOCS/doc/pkg-config \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL() -{ - cd pkg-config-0.25 - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1998, 2001-2006 Red Hat Inc." From c90957557de4d6bf31f1bd917c0ef24a0aeced0b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 17:35:15 +0200 Subject: [PATCH 253/587] speex: convert recipe to an actual recipe --- media-libs/speex/patches/speex-1.2rc1.patch | 19 ----- .../speex/patches/speex-1.2~rc1.patchset | 52 ++++++++++++ media-libs/speex/speex-1.2rc1.recipe | 36 -------- media-libs/speex/speex-1.2~rc1.recipe | 82 +++++++++++++++++++ 4 files changed, 134 insertions(+), 55 deletions(-) delete mode 100644 media-libs/speex/patches/speex-1.2rc1.patch create mode 100644 media-libs/speex/patches/speex-1.2~rc1.patchset delete mode 100644 media-libs/speex/speex-1.2rc1.recipe create mode 100644 media-libs/speex/speex-1.2~rc1.recipe diff --git a/media-libs/speex/patches/speex-1.2rc1.patch b/media-libs/speex/patches/speex-1.2rc1.patch deleted file mode 100644 index 8950f992d..000000000 --- a/media-libs/speex/patches/speex-1.2rc1.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urN speex-1.2rc1/include/speex/speex_types.h speex-1.2rc1-haiku/include/speex/speex_types.h ---- speex-1.2rc1/include/speex/speex_types.h 2009-02-19 00:38:33.000000000 +0000 -+++ speex-1.2rc1-haiku/include/speex/speex_types.h 2009-02-19 00:35:50.000000000 +0000 -@@ -73,6 +73,15 @@ - typedef int32_t spx_int32_t; - typedef u_int32_t spx_uint32_t; - -+#elif defined(__HAIKU__) -+ -+ /* Haiku */ -+# include -+ typedef short spx_int16_t; -+ typedef unsigned short spx_uint16_t; -+ typedef int spx_int32_t; -+ typedef unsigned int spx_uint32_t; -+ - #elif defined (__EMX__) - - /* OS/2 GCC */ diff --git a/media-libs/speex/patches/speex-1.2~rc1.patchset b/media-libs/speex/patches/speex-1.2~rc1.patchset new file mode 100644 index 000000000..c979f0257 --- /dev/null +++ b/media-libs/speex/patches/speex-1.2~rc1.patchset @@ -0,0 +1,52 @@ +From 1342da5851b17b65e2fe12136cd854b47acc7452 Mon Sep 17 00:00:00 2001 +From: Scott McCreary +Date: Sat, 4 Sep 2010 06:59:30 +0000 +Subject: Speex patch to fix typedefs for Haiku build + + +diff --git a/include/speex/speex_types.h b/include/speex/speex_types.h +index 852fed8..217bdfc 100644 +--- a/include/speex/speex_types.h ++++ b/include/speex/speex_types.h +@@ -73,6 +73,15 @@ + typedef int32_t spx_int32_t; + typedef u_int32_t spx_uint32_t; + ++#elif defined(__HAIKU__) ++ ++ /* Haiku */ ++# include ++ typedef short spx_int16_t; ++ typedef unsigned short spx_uint16_t; ++ typedef int spx_int32_t; ++ typedef unsigned int spx_uint32_t; ++ + #elif defined (__EMX__) + + /* OS/2 GCC */ +-- +1.7.5 + + +From 7ec1c5672675e7d89ab5b6d1d6550f7d04c7e688 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 17:15:15 +0200 +Subject: configure.ac: AM_CONFIG_HEADER -> AC_CONFIG_HEADERS + + +diff --git a/configure.ac b/configure.ac +index 057d888..9d0caec 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -*-m4-*- + + AC_INIT(libspeex/speex.c) + +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + SPEEX_MAJOR_VERSION=1 + SPEEX_MINOR_VERSION=1 +-- +1.7.5 + diff --git a/media-libs/speex/speex-1.2rc1.recipe b/media-libs/speex/speex-1.2rc1.recipe deleted file mode 100644 index 489052c8c..000000000 --- a/media-libs/speex/speex-1.2rc1.recipe +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION="Speex" -HOMEPAGE="http://www.speex.org" -SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz" -CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="pkgconfig >= 0.25 - libogg > 1.3.0" -BUILD() -{ - cd speex-1.2rc1 - libtoolize --copy --force --install - aclocal - automake - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --docdir=$COMMON_DOCS/doc/speex \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL() -{ - cd speex-1.2rc1 - make install -} -LICENSE="Speex" -COPYRIGHT="2002-2009 Xiph.org Foundation - 2002-2008 Jean-Marc Valin - 2005-2007 Analog Devices Inc. - 2005-2008 Commonwealth Scientific and Industrial Research Organisation (CSIRO) - 1993, 2002, 2006 David Rowe - 2003 EpicGames - 1992-1994 Jutta Degener, Carsten Bormann" diff --git a/media-libs/speex/speex-1.2~rc1.recipe b/media-libs/speex/speex-1.2~rc1.recipe new file mode 100644 index 000000000..18bd26502 --- /dev/null +++ b/media-libs/speex/speex-1.2~rc1.recipe @@ -0,0 +1,82 @@ +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." +HOMEPAGE="http://www.speex.org" +LICENSE="Speex" +COPYRIGHT=" + 2002-2009 Xiph.org Foundation + 2002-2008 Jean-Marc Valin + 2005-2007 Analog Devices Inc. + 2005-2008 Commonwealth Scientific and Industrial Research Organisation (CSIRO) + 1993, 2002, 2006 David Rowe + 2003 EpicGames + 1992-1994 Jutta Degener, Carsten Bormann + " +SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz" +CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="speex-1.2~rc1.patchset" + +PROVIDES=" + speex = $portVersion + cmd:speexdec = $portVersion + cmd:speexenc = $portVersion + lib:libspeex = 1.5.0 compat >= 1 + lib:libspeexdsp = 1.5.0 compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libogg + " +BUILD_REQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:pkg_config + devel:libogg + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="speex-1.2rc1" + +BUILD() +{ + libtoolize --copy --force --install + aclocal + automake + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libspeex libspeexdsp + fixPkgconfig + + # devel package + packageEntries devel \ + $dataDir/aclocal \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The speex development files" +PROVIDES_devel=" + speex_devel = $portVersion + devel:libspeex = 1.5.0 compat >= 1 + devel:libspeexdsp = 1.5.0 compat >= 1 + " +REQUIRES_devel=" + speex == $portVersion + " From 215337d19315503622f7a86b442b833f7ff118ae Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 18:17:34 +0200 Subject: [PATCH 254/587] libvorbis: convert 1.3.2 recipe to an actual recipe --- media-libs/libvorbis/libvorbis-1.3.2.recipe | 76 +++++++++-- .../libvorbis/patches/libvorbis-1.3.2.patch | 14 -- .../patches/libvorbis-1.3.2.patchset | 127 ++++++++++++++++++ 3 files changed, 189 insertions(+), 28 deletions(-) delete mode 100644 media-libs/libvorbis/patches/libvorbis-1.3.2.patch create mode 100644 media-libs/libvorbis/patches/libvorbis-1.3.2.patchset diff --git a/media-libs/libvorbis/libvorbis-1.3.2.recipe b/media-libs/libvorbis/libvorbis-1.3.2.recipe index 2d6e23cc6..cf759e7ef 100644 --- a/media-libs/libvorbis/libvorbis-1.3.2.recipe +++ b/media-libs/libvorbis/libvorbis-1.3.2.recipe @@ -1,30 +1,78 @@ -DESCRIPTION="libvorbis" -HOMEPAGE="http://www.xiph.org" +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." +HOMEPAGE="http://www.xiph.org/vorbis/" +LICENSE="BSD (3-clause)" +COPYRIGHT="1994-2010 Xiph.Org Foundation" SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.gz" CHECKSUM_MD5="c870b9bd5858a0ecb5275c14486d9554" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/pkgconfig >= 0.23 - media-libs/libogg >= 1.2.0" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="libvorbis-1.3.2.patchset" + +PROVIDES=" + libvorbis = $portVersion + lib:libvorbis = 0.4.5 compat >= 0 + lib:libvorbisenc = 2.0.8 compat >= 2 + lib:libvorbisfile = 3.3.4 compat >= 3 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libogg + " +BUILD_REQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:pkg_config + devel:libogg + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd libvorbis-1.3.2 libtoolize -fci mkdir -p m4 aclocal --install -I m4 autoconf automake - sed -i 's/-lvorbis -lm/-lvorbis/' vorbis.pc.in - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS - make + runConfigure ./configure \ + --docdir $developDocDir + make $jobArgs } INSTALL() { - cd libvorbis-1.3.2 make install + + prepareInstalledDevelLibs libvorbis libvorbisenc libvorbisfile + fixPkgconfig + + # devel package + packageEntries devel \ + $dataDir \ + $developDir } -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The libvorbis development files" +PROVIDES_devel=" + libvorbis_devel = $portVersion + devel:libvorbis = 0.4.5 compat >= 0 + devel:libvorbisenc = 2.0.8 compat >= 2 + devel:libvorbisfile = 3.3.4 compat >= 3 + " +REQUIRES_devel=" + libvorbis == $portVersion + " diff --git a/media-libs/libvorbis/patches/libvorbis-1.3.2.patch b/media-libs/libvorbis/patches/libvorbis-1.3.2.patch deleted file mode 100644 index 2aa48fe68..000000000 --- a/media-libs/libvorbis/patches/libvorbis-1.3.2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN libvorbis-1.3.2-orig/configure.ac libvorbis-1.3.2/configure.ac ---- libvorbis-1.3.2-orig/configure.ac 2010-03-26 06:56:58.061079552 +0000 -+++ libvorbis-1.3.2/configure.ac 2010-05-12 05:56:55.536870912 +0000 -@@ -206,6 +206,10 @@ - DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" - PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; -+ *-*-haiku*) -+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" -+ CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char" -+ PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; - *) - DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" diff --git a/media-libs/libvorbis/patches/libvorbis-1.3.2.patchset b/media-libs/libvorbis/patches/libvorbis-1.3.2.patchset new file mode 100644 index 000000000..8bac20948 --- /dev/null +++ b/media-libs/libvorbis/patches/libvorbis-1.3.2.patchset @@ -0,0 +1,127 @@ +From 70dcb91819b2acac447344c2ad6b0c5c89dfa630 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 17:54:49 +0200 +Subject: applying patch libvorbis-1.3.2.patch + + +diff --git a/configure.ac b/configure.ac +index 98b78ac..4b881b6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -206,6 +206,10 @@ else + DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" + CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" + PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; ++ *-*-haiku*) ++ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" ++ CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char" ++ PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; + *) + DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" + CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" +-- +1.7.5 + + +From c5e8052a27c7c178afbc25194eeb48b7d1394ad7 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 17:58:19 +0200 +Subject: configure.ac: AM_CONFIG_HEADER -> AC_CONFIG_HEADERS + + +diff --git a/configure.ac b/configure.ac +index 4b881b6..64858d1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13,7 +13,7 @@ AC_CANONICAL_TARGET([]) + + AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION) + AM_MAINTAINER_MODE +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + dnl Add parameters for aclocal + AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") +-- +1.7.5 + + +From 3e8abf19defbbef8ac44abc602112f8b5b2c4273 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 17:58:44 +0200 +Subject: vorbis.pc.in: remove -lm + + +diff --git a/vorbis.pc.in b/vorbis.pc.in +index 259abe7..54dca60 100644 +--- a/vorbis.pc.in ++++ b/vorbis.pc.in +@@ -10,5 +10,5 @@ Description: vorbis is the primary Ogg Vorbis library + Version: @VERSION@ + Requires: ogg + Conflicts: +-Libs: -L${libdir} -lvorbis -lm ++Libs: -L${libdir} -lvorbis + Cflags: -I${includedir} +-- +1.7.5 + + +From ef7dac90d78c39bb3990d66ff932d50bc1ea98d3 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 18:06:31 +0200 +Subject: doc/*/Makefile.am: remove hard-coded docdir + + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 2870528..6d7851b 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -2,8 +2,6 @@ + + SUBDIRS = libvorbis vorbisfile vorbisenc + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) +- + ### all of the static docs, commited to SVN and included as is + static_docs = \ + rfc5215.xml \ +diff --git a/doc/libvorbis/Makefile.am b/doc/libvorbis/Makefile.am +index 0bcc135..aea57e9 100644 +--- a/doc/libvorbis/Makefile.am ++++ b/doc/libvorbis/Makefile.am +@@ -1,7 +1,5 @@ + ## Process this file with automake to produce Makefile.in + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/libvorbis +- + doc_DATA = index.html reference.html style.css vorbis_comment.html\ + vorbis_info.html vorbis_analysis_blockout.html vorbis_analysis_buffer.html\ + vorbis_analysis_headerout.html vorbis_analysis_init.html \ +diff --git a/doc/vorbisenc/Makefile.am b/doc/vorbisenc/Makefile.am +index bbab3c5..008586e 100644 +--- a/doc/vorbisenc/Makefile.am ++++ b/doc/vorbisenc/Makefile.am +@@ -1,7 +1,5 @@ + ## Process this file with automake to produce Makefile.in + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc +- + doc_DATA = changes.html examples.html index.html ovectl_ratemanage2_arg.html \ + ovectl_ratemanage_arg.html overview.html reference.html style.css\ + vorbis_encode_ctl.html vorbis_encode_init.html vorbis_encode_setup_init.html \ +diff --git a/doc/vorbisfile/Makefile.am b/doc/vorbisfile/Makefile.am +index fb27d44..faa6352 100644 +--- a/doc/vorbisfile/Makefile.am ++++ b/doc/vorbisfile/Makefile.am +@@ -1,7 +1,5 @@ + ## Process this file with automake to produce Makefile.in + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile +- + doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html\ + chainingexample.html crosslap.html datastructures.html decoding.html\ + example.html exampleindex.html fileinfo.html index.html\ +-- +1.7.5 + From 1a3b968ccbff0264a4997327c042070e1b75823a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 18:18:17 +0200 Subject: [PATCH 255/587] libvorbis: remove old non-recipes and patches --- media-libs/libvorbis/libvorbis-1.2.3.recipe | 27 ----------- media-libs/libvorbis/libvorbis-1.3.1.recipe | 27 ----------- .../libvorbis/patches/libvorbis-1.2.0.patch | 48 ------------------- .../libvorbis/patches/libvorbis-1.2.3.patch | 14 ------ .../libvorbis/patches/libvorbis-1.3.1.patch | 14 ------ 5 files changed, 130 deletions(-) delete mode 100644 media-libs/libvorbis/libvorbis-1.2.3.recipe delete mode 100644 media-libs/libvorbis/libvorbis-1.3.1.recipe delete mode 100644 media-libs/libvorbis/patches/libvorbis-1.2.0.patch delete mode 100644 media-libs/libvorbis/patches/libvorbis-1.2.3.patch delete mode 100644 media-libs/libvorbis/patches/libvorbis-1.3.1.patch diff --git a/media-libs/libvorbis/libvorbis-1.2.3.recipe b/media-libs/libvorbis/libvorbis-1.2.3.recipe deleted file mode 100644 index 17e3e87eb..000000000 --- a/media-libs/libvorbis/libvorbis-1.2.3.recipe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="libvorbis" -HOMEPAGE="http://www.xiph.org" -SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.3.tar.gz" -CHECKSUM_MD5="5aa77f55c0e0aab8eb8ed982335daac8" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/pkgconfig >= 0.23" -BUILD() -{ - cd libvorbis-1.2.3 - libtoolize --force --copy --install - mkdir -p m4 - aclocal --install -I m4 - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libvorbis-1.2.3 - make install -} - -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libvorbis/libvorbis-1.3.1.recipe b/media-libs/libvorbis/libvorbis-1.3.1.recipe deleted file mode 100644 index 1fb63be62..000000000 --- a/media-libs/libvorbis/libvorbis-1.3.1.recipe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="libvorbis" -HOMEPAGE="http://www.xiph.org" -SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.1.tar.gz" -CHECKSUM_MD5="016e523fac70bdd786258a9d15fd36e9" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/pkgconfig >= 0.23 - media-libs/libogg >= 1.2.0" -BUILD() -{ - cd libvorbis-1.3.1 - libtoolize --force --copy --install - mkdir -p m4 - aclocal --install -I m4 - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libvorbis-1.3.1 - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="1994-2010 Xiph.Org Foundation" diff --git a/media-libs/libvorbis/patches/libvorbis-1.2.0.patch b/media-libs/libvorbis/patches/libvorbis-1.2.0.patch deleted file mode 100644 index bbec77239..000000000 --- a/media-libs/libvorbis/patches/libvorbis-1.2.0.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urN libvorbis-1.2.0/aclocal.m4 libvorbis-1.2.0-haiku/aclocal.m4 ---- libvorbis-1.2.0/aclocal.m4 2007-07-25 16:46:33.000000000 +0000 -+++ libvorbis-1.2.0-haiku/aclocal.m4 2008-07-14 09:15:18.000000000 +0000 -@@ -1291,7 +1291,7 @@ - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - --beos*) -+beos* | haiku*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH -@@ -2276,7 +2276,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --beos*) -+beos* | haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -2492,7 +2492,7 @@ - [AC_REQUIRE([AC_CANONICAL_HOST])dnl - LIBM= - case $host in --*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; - *-ncr-sysv4.3*) -@@ -4825,7 +4825,7 @@ - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | os2* | pw32*) -@@ -5098,7 +5098,7 @@ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | haiku* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - diff --git a/media-libs/libvorbis/patches/libvorbis-1.2.3.patch b/media-libs/libvorbis/patches/libvorbis-1.2.3.patch deleted file mode 100644 index e3dea0b64..000000000 --- a/media-libs/libvorbis/patches/libvorbis-1.2.3.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN libvorbis-1.2.3/configure.ac libvorbis-1.2.3-haiku/configure.ac ---- libvorbis-1.2.3/configure.ac 2009-07-09 10:02:25.000000000 +0000 -+++ libvorbis-1.2.3-haiku/configure.ac 2009-09-13 21:56:38.000000000 +0000 -@@ -185,6 +185,10 @@ - DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" - PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; -+ *-*-haiku*) -+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" -+ CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char" -+ PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; - *) - DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" diff --git a/media-libs/libvorbis/patches/libvorbis-1.3.1.patch b/media-libs/libvorbis/patches/libvorbis-1.3.1.patch deleted file mode 100644 index ecacce794..000000000 --- a/media-libs/libvorbis/patches/libvorbis-1.3.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN libvorbis-1.3.1-orig/configure.ac libvorbis-1.3.1/configure.ac ---- libvorbis-1.3.1-orig/configure.ac 2010-03-26 06:56:58.061079552 +0000 -+++ libvorbis-1.3.1/configure.ac 2010-05-12 05:56:55.536870912 +0000 -@@ -206,6 +206,10 @@ - DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char" - PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";; -+ *-*-haiku*) -+ DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" -+ CFLAGS="-O20 -Wall -D__NO_MATH_INLINES -fsigned-char" -+ PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; - *) - DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char" From 105918e37f92cfe1c78e2176f9717062dd0e76a0 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 20:27:36 +0200 Subject: [PATCH 256/587] libtheora: convert recipe to an actual recipe --- media-libs/libtheora/libtheora-1.1.1.recipe | 79 +++++++++++++++---- .../patches/libtheora-1.1.1.patchset | 58 ++++++++++++++ 2 files changed, 123 insertions(+), 14 deletions(-) create mode 100644 media-libs/libtheora/patches/libtheora-1.1.1.patchset diff --git a/media-libs/libtheora/libtheora-1.1.1.recipe b/media-libs/libtheora/libtheora-1.1.1.recipe index 3af046122..2d6c771de 100644 --- a/media-libs/libtheora/libtheora-1.1.1.recipe +++ b/media-libs/libtheora/libtheora-1.1.1.recipe @@ -1,29 +1,80 @@ -DESCRIPTION="Theora is a free and open video compression format from the Xiph.org Foundation." -HOMEPAGE="http://www.theora.org/" +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." +HOMEPAGE="http://www.theora.org/" +LICENSE="BSD (3-clause)" +COPYRIGHT="2002-2009 Xiph.Org Foundation" SRC_URI="http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libogg >= 1.2.0 - media-libs/libvorbis >= 1.3.0" CHECKSUM_MD5="292ab65cedd5021d6b7ddd117e07cd8e" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="libtheora-1.1.1.patchset" + +PROVIDES=" + libtheora = $portVersion + lib:libtheora = 0.3.10 compat >= 0 + lib:libtheoradec = 1.1.4 compat >= 1 + lib:libtheoraenc = 1.1.2 compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libogg + " +BUILD_REQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:pkg_config + devel:libogg + " + # Note: The build system also looks for libvorbis and SDL, but that seems + # to be needed only for building the sample player, which we don't need. +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd libtheora-1.1.1 libtoolize --force --copy --install aclocal -I m4 autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS \ + automake --add-missing + runConfigure ./configure \ + --docdir $developDocDir \ --disable-asm - make + make $jobArgs } INSTALL() { - cd libtheora-1.1.1 make install + + prepareInstalledDevelLibs libtheora libtheoradec libtheoraenc + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir } -LICENSE="BSD (3-clause)" -COPYRIGHT="2002-2009 Xiph.Org Foundation" +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The libtheora development files" +PROVIDES_devel=" + libtheora_devel = $portVersion + devel:libtheora = 0.3.10 compat >= 0 + devel:libtheoradec = 1.1.4 compat >= 1 + devel:libtheoraenc = 1.1.2 compat >= 1 + " +REQUIRES_devel=" + libtheora == $portVersion + " diff --git a/media-libs/libtheora/patches/libtheora-1.1.1.patchset b/media-libs/libtheora/patches/libtheora-1.1.1.patchset new file mode 100644 index 000000000..f18435cd1 --- /dev/null +++ b/media-libs/libtheora/patches/libtheora-1.1.1.patchset @@ -0,0 +1,58 @@ +From 57bef9f56b8e4baa23023a8bc044e1a0c35f9431 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 19:50:31 +0200 +Subject: configure.ac: AM_CONFIG_HEADER -> AC_CONFIG_HEADERS + + +diff --git a/configure.ac b/configure.ac +index 8260bdf..c81fdb6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9,7 +9,7 @@ AC_INIT(libtheora,[1.1.1]) + AC_CANONICAL_HOST + AC_CANONICAL_TARGET + +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_SRCDIR([lib/fdct.c]) + AM_INIT_AUTOMAKE + AM_MAINTAINER_MODE +-- +1.7.5 + + +From bb50525dec8c8c7f11ec958ac9329333be027949 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 20:20:58 +0200 +Subject: */Makefile.am: remove hard-coded docdir + + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 30eaad8..5aeda7d 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -2,8 +2,6 @@ + + SUBDIRS = spec + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) +- + static_docs = vp3-format.txt color.html \ + draft-ietf-avt-rtp-theora-00.xml \ + draft-ietf-avt-rtp-theora-00.txt +diff --git a/doc/spec/Makefile.am b/doc/spec/Makefile.am +index 3a181a2..00e9271 100644 +--- a/doc/spec/Makefile.am ++++ b/doc/spec/Makefile.am +@@ -3,8 +3,6 @@ + # makefile to generate the spec document from sources + # requires transfig and pdflatex + +-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) +- + built_docs = Theora.pdf + + if BUILD_SPEC +-- +1.7.5 + From 6092f5728d3c2c3241dbff386418f93db9b9518c Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 20:28:58 +0200 Subject: [PATCH 257/587] libtheora: remove old patch --- media-libs/libtheora/patches/libtheora-1.0.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 media-libs/libtheora/patches/libtheora-1.0.patch diff --git a/media-libs/libtheora/patches/libtheora-1.0.patch b/media-libs/libtheora/patches/libtheora-1.0.patch deleted file mode 100644 index 965a4ad18..000000000 --- a/media-libs/libtheora/patches/libtheora-1.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN libtheora-1.0/configure.ac libtheora-1.0-haiku/configure.ac ---- libtheora-1.0/configure.ac 2008-10-24 04:07:32.000000000 +0000 -+++ libtheora-1.0-haiku/configure.ac 2009-09-14 02:21:57.000000000 +0000 -@@ -404,7 +404,7 @@ - if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes -a x$HAVE_VORBIS = xyes; then - BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES player_example" - fi --if test x$HAVE_PNG = xyes; then -+if test x$HAVE_PNG = xyes -a $target_os != 'haiku'; then - BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES png2theora" - fi - AC_SUBST(BUILDABLE_EXAMPLES) From 6b558bc606618d327fee8f229c27a3868d85b35d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 21:49:09 +0200 Subject: [PATCH 258/587] libvpx: convert recipe to an actual recipe --- media-libs/libvpx/libvpx-1.0.0.recipe | 95 ++++++++++--- media-libs/libvpx/patches/libvpx-1.0.0.patch | 66 --------- .../libvpx/patches/libvpx-1.0.0.patchset | 132 ++++++++++++++++++ 3 files changed, 206 insertions(+), 87 deletions(-) delete mode 100644 media-libs/libvpx/patches/libvpx-1.0.0.patch create mode 100644 media-libs/libvpx/patches/libvpx-1.0.0.patchset diff --git a/media-libs/libvpx/libvpx-1.0.0.recipe b/media-libs/libvpx/libvpx-1.0.0.recipe index 0d1488c3a..e7a33a90a 100644 --- a/media-libs/libvpx/libvpx-1.0.0.recipe +++ b/media-libs/libvpx/libvpx-1.0.0.recipe @@ -1,26 +1,79 @@ -DESCRIPTION="libvpx - WebM VP8 Codec SDK" -HOMEPAGE="http://www.webmproject.org" -SRC_URI="http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2" -CHECKSUM_MD5="d987b5140412edd37d2c6b10c29ad484" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libvpx-v1.0.0 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-pic \ - --enable-vp8 - make -} - -INSTALL() -{ - cd libvpx-v1.0.0 - make install -} +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. +This distribution of the WebM VP8 Codec SDK includes the following support: + * WebM VP8 Encoder + * WebM VP8 Decoder" +HOMEPAGE="http://www.webmproject.org" LICENSE="BSD (3-clause)" COPYRIGHT="2009-2012 Google Inc., The Mozilla Foundation and The Xiph.Org Foundation" +SRC_URI="http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2" +CHECKSUM_MD5="d987b5140412edd37d2c6b10c29ad484" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="libvpx-1.0.0.patchset" + +PROVIDES=" + libvpx = $portVersion + cmd:vp8_scalable_patterns = $portVersion + cmd:vpxdec = $portVersion compat >= 1 + cmd:vpxenc = $portVersion compat >= 1 + lib:libvpx = $portVersion compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:ld + cmd:make + cmd:perl + cmd:yasm + " + # Note: The build system also looks for libvorbis and SDL, but that seems + # to be needed only for building the sample player, which we don't need. +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="libvpx-v1.0.0" + +BUILD() +{ + # not an auto tools configure + ./configure \ + --prefix="$prefix" \ + --as=yasm \ + --enable-pic \ + --enable-shared \ + --enable-vp8 + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libvpx + fixPkgconfig + + mv $prefix/include $includeDir + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The libvpx development files" +PROVIDES_devel=" + libvpx_devel = $portVersion + devel:libvpx = $portVersion compat >= 1 + " +REQUIRES_devel=" + libvpx == $portVersion + " diff --git a/media-libs/libvpx/patches/libvpx-1.0.0.patch b/media-libs/libvpx/patches/libvpx-1.0.0.patch deleted file mode 100644 index da04b72ff..000000000 --- a/media-libs/libvpx/patches/libvpx-1.0.0.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ruN libvpx-v1.0.0/build/make/configure.sh libvpx-v1.0.0-haiku/build/make/configure.sh ---- libvpx-v1.0.0/build/make/configure.sh 2012-01-27 18:36:39.038535168 +0000 -+++ libvpx-v1.0.0-haiku/build/make/configure.sh 2012-03-14 00:47:54.780926976 +0000 -@@ -579,6 +579,9 @@ - *solaris2.10) - tgt_os=solaris - ;; -+ *haiku*) -+ tgt_os=haiku -+ ;; - esac - - if [ -n "$tgt_isa" ] && [ -n "$tgt_os" ]; then -@@ -909,8 +912,8 @@ - esac - ;; - gcc*) -- add_cflags -m${bits} -- add_ldflags -m${bits} -+ enabled haiku || add_cflags -m${bits} -+ enabled haiku || add_ldflags -m${bits} - link_with_cc=gcc - tune_cflags="-march=" - setup_gnu_toolchain -@@ -939,7 +942,7 @@ - add_asflags -f x64 - enabled debug && add_asflags -g cv8 - ;; -- linux*|solaris*) -+ linux*|solaris*|haiku*) - add_asflags -f elf${bits} - enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2 - enabled debug && [ "${AS}" = nasm ] && add_asflags -g -@@ -1019,6 +1022,7 @@ - case ${toolchain} in - *-win*);; - *-android-gcc);; -+ *-haiku*);; - *) check_header pthread.h && add_extralibs -lpthread - esac - fi -diff -ruN libvpx-v1.0.0/configure libvpx-v1.0.0-haiku/configure ---- libvpx-v1.0.0/configure 2012-01-27 18:36:39.039583744 +0000 -+++ libvpx-v1.0.0-haiku/configure 2012-03-14 00:46:37.182976512 +0000 -@@ -107,6 +107,7 @@ - all_platforms="${all_platforms} x86-darwin9-gcc" - all_platforms="${all_platforms} x86-darwin9-icc" - all_platforms="${all_platforms} x86-darwin10-gcc" -+all_platforms="${all_platforms} x86-haiku-gcc" - all_platforms="${all_platforms} x86-linux-gcc" - all_platforms="${all_platforms} x86-linux-icc" - all_platforms="${all_platforms} x86-solaris-gcc" -diff -ruN libvpx-v1.0.0/examples.mk libvpx-v1.0.0-haiku/examples.mk ---- libvpx-v1.0.0/examples.mk 2012-01-27 18:36:39.040108032 +0000 -+++ libvpx-v1.0.0-haiku/examples.mk 2012-03-14 00:46:37.187432960 +0000 -@@ -113,7 +113,9 @@ - # We should not link to math library (libm) on RVCT - # when building for bare-metal targets - ifeq ($(CONFIG_OS_SUPPORT), yes) --CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m -+ ifneq ($(TOOLCHAIN),x86-haiku-gcc) -+ CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m -+ endif - else - ifeq ($(CONFIG_GCC), yes) - CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m diff --git a/media-libs/libvpx/patches/libvpx-1.0.0.patchset b/media-libs/libvpx/patches/libvpx-1.0.0.patchset new file mode 100644 index 000000000..eba3dc397 --- /dev/null +++ b/media-libs/libvpx/patches/libvpx-1.0.0.patchset @@ -0,0 +1,132 @@ +From 0c31cfc2c7429f81129c3403d9bc03bd245db71c Mon Sep 17 00:00:00 2001 +From: korli +Date: Wed, 14 Mar 2012 00:15:38 +0000 +Subject: patch for 1.0.0 + + +diff --git a/build/make/configure.sh b/build/make/configure.sh +index cbf000b..4222e52 100755 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -579,6 +579,9 @@ process_common_toolchain() { + *solaris2.10) + tgt_os=solaris + ;; ++ *haiku*) ++ tgt_os=haiku ++ ;; + esac + + if [ -n "$tgt_isa" ] && [ -n "$tgt_os" ]; then +@@ -909,8 +912,8 @@ process_common_toolchain() { + esac + ;; + gcc*) +- add_cflags -m${bits} +- add_ldflags -m${bits} ++ enabled haiku || add_cflags -m${bits} ++ enabled haiku || add_ldflags -m${bits} + link_with_cc=gcc + tune_cflags="-march=" + setup_gnu_toolchain +@@ -939,7 +942,7 @@ process_common_toolchain() { + add_asflags -f x64 + enabled debug && add_asflags -g cv8 + ;; +- linux*|solaris*) ++ linux*|solaris*|haiku*) + add_asflags -f elf${bits} + enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2 + enabled debug && [ "${AS}" = nasm ] && add_asflags -g +@@ -1019,6 +1022,7 @@ EOF + case ${toolchain} in + *-win*);; + *-android-gcc);; ++ *-haiku*);; + *) check_header pthread.h && add_extralibs -lpthread + esac + fi +diff --git a/configure b/configure +index 6195b2d..eb8a359 100755 +--- a/configure ++++ b/configure +@@ -107,6 +107,7 @@ all_platforms="${all_platforms} x86-darwin8-icc" + all_platforms="${all_platforms} x86-darwin9-gcc" + all_platforms="${all_platforms} x86-darwin9-icc" + all_platforms="${all_platforms} x86-darwin10-gcc" ++all_platforms="${all_platforms} x86-haiku-gcc" + all_platforms="${all_platforms} x86-linux-gcc" + all_platforms="${all_platforms} x86-linux-icc" + all_platforms="${all_platforms} x86-solaris-gcc" +diff --git a/examples.mk b/examples.mk +index f6c9045..ab9657f 100644 +--- a/examples.mk ++++ b/examples.mk +@@ -113,7 +113,9 @@ vp8_multi_resolution_encoder.DESCRIPTION = VP8 Multiple-resolution Encoding + # We should not link to math library (libm) on RVCT + # when building for bare-metal targets + ifeq ($(CONFIG_OS_SUPPORT), yes) +-CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m ++ ifneq ($(TOOLCHAIN),x86-haiku-gcc) ++ CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m ++ endif + else + ifeq ($(CONFIG_GCC), yes) + CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m +-- +1.7.5 + + +From dd76984687465e457d9e3dcd0b4bdc4bd46225dd Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 21:09:11 +0200 +Subject: configure: enable shared library building for Haiku + + +diff --git a/configure b/configure +index eb8a359..a2ef98d 100755 +--- a/configure ++++ b/configure +@@ -438,7 +438,7 @@ process_detect() { + # Can only build shared libs on a subset of platforms. Doing this check + # here rather than at option parse time because the target auto-detect + # magic happens after the command line has been parsed. +- enabled linux || die "--enable-shared only supported on ELF for now" ++ enabled linux || enabled haiku || die "--enable-shared only supported on ELF for now" + fi + if [ -z "$CC" ]; then + echo "Bypassing toolchain for environment detection." +-- +1.7.5 + + +From 87b2816834bb2bbfc1e13765084a0c21eb46cf13 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 11 Jun 2013 21:09:28 +0200 +Subject: libs.mk: no -lm or -lpthread on Haiku + + +diff --git a/libs.mk b/libs.mk +index 79a1d00..d88cfa7 100644 +--- a/libs.mk ++++ b/libs.mk +@@ -196,7 +196,6 @@ LIBVPX_SO := libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION + LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)\ + $(notdir $(LIBVPX_SO_SYMLINKS)) + $(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) libvpx.ver +-$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm + $(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(VERSION_MAJOR) + $(BUILD_PFX)$(LIBVPX_SO): SO_VERSION_SCRIPT = libvpx.ver + LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \ +@@ -398,7 +397,7 @@ $(foreach bin,$(LIBVPX_TEST_BINS),\ + $(if $(BUILD_LIBVPX),$(eval $(bin): libvpx.a libgtest.a ))\ + $(if $(BUILD_LIBVPX),$(eval $(call linkerxx_template,$(bin),\ + $(bin).cc.o \ +- -L. -lvpx -lgtest -lpthread -lm)\ ++ -L. -lvpx -lgtest)\ + )))\ + $(if $(LIPO_LIBS),$(eval $(call lipo_bin_template,$(bin))))\ + +-- +1.7.5 + From 9e78cd3f853a0d3f58555eda7806aecb48fda3bd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 21:49:50 +0200 Subject: [PATCH 259/587] libvpx: remove old non-recipe and patch --- media-libs/libvpx/libvpx-0.9.2-git.recipe | 25 ---------- .../libvpx/patches/libvpx-0.9.2-git.patch | 46 ------------------- 2 files changed, 71 deletions(-) delete mode 100644 media-libs/libvpx/libvpx-0.9.2-git.recipe delete mode 100644 media-libs/libvpx/patches/libvpx-0.9.2-git.patch diff --git a/media-libs/libvpx/libvpx-0.9.2-git.recipe b/media-libs/libvpx/libvpx-0.9.2-git.recipe deleted file mode 100644 index eb598448f..000000000 --- a/media-libs/libvpx/libvpx-0.9.2-git.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libvpx - WebM VP8 Codec SDK" -HOMEPAGE="http://www.webmproject.org" -SRC_URI="git+git://review.webmproject.org/libvpx.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libvpx-0.9.2-git - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-pic \ - --enable-vp8 - make -} - -INSTALL() -{ - cd libvpx-0.9.2-git - make install -} - -LICENSE="BSD (3-clause)" -COPYRIGHT="2009-2010 Google Inc., - The Mozilla Foundation and - The Xiph.Org Foundation" diff --git a/media-libs/libvpx/patches/libvpx-0.9.2-git.patch b/media-libs/libvpx/patches/libvpx-0.9.2-git.patch deleted file mode 100644 index 29d5cd342..000000000 --- a/media-libs/libvpx/patches/libvpx-0.9.2-git.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur libvpx-0.9.2-git/build/make/configure.sh libvpx-0.9.2-git-haiku/build/make/configure.sh ---- libvpx-0.9.2-git/build/make/configure.sh 2010-10-01 11:22:21.319815680 +0000 -+++ libvpx-0.9.2-git-haiku/build/make/configure.sh 2010-10-01 11:30:22.888406016 +0000 -@@ -905,8 +908,14 @@ - # Almost every platform uses pthreads. - if enabled multithread; then - case ${toolchain} in -- *-win*);; -- *) check_header pthread.h && add_extralibs -lpthread -+ *-win*) -+ ;; -+ *linux*|*bsd*) -+ check_header pthread.h && add_extralibs -lpthread -+ ;; -+ *-haiku*) -+ check_header pthread.h -+ ;; - esac - fi - -diff -Naur libvpx-0.9.2-git/examples.mk libvpx-0.9.2-git-haiku/examples.mk ---- libvpx-0.9.2-git/examples.mk 2010-10-01 11:22:21.332398592 +0000 -+++ libvpx-0.9.2-git-haiku/examples.mk 2010-10-01 11:19:40.000000000 +0000 -@@ -72,7 +72,9 @@ - - - # Handle extra library flags depending on codec configuration -+ifeq ($(TOOLCHAIN),Unix) - CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m -+endif - - # - # End of specified files. The rest of the build rules should happen -diff -Naur libvpx-0.9.2-git/libs.mk libvpx-0.9.2-git-haiku/libs.mk ---- libvpx-0.9.2-git/libs.mk 2010-10-01 11:22:21.525074432 +0000 -+++ libvpx-0.9.2-git-haiku/libs.mk 2010-10-01 11:13:12.000000000 +0000 -@@ -182,6 +182,9 @@ - LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO) - $(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) libvpx.ver - $(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm -pthread -+ifeq ($(TOOLCHAIN),Haiku) -+ extralibs += -+endif - $(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(VERSION_MAJOR) - $(BUILD_PFX)$(LIBVPX_SO): SO_VERSION_SCRIPT = libvpx.ver - LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \ From a1ec7ced9d17f54c88ee7cbcebd257b077ddc7ba Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 22:53:30 +0200 Subject: [PATCH 260/587] ffmpeg-0.10.2-gcc2.patch: make "git apply" happy --- media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch b/media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch index 48b059d5a..7c7f0231f 100644 --- a/media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch +++ b/media-video/ffmpeg/patches/ffmpeg-0.10.2-gcc2.patch @@ -210,8 +210,8 @@ index e1ba799..3820056 100644 av_log(c, AV_LOG_ERROR, "unsupported planar RGB conversion %s -> %s\n", av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat)); diff --git a/configure b/configure ---- ffmpeg-0.10.2/configure 2012-01-26 22:15:59.047710208 +0000 -+++ ffmpeg-0.10-haiku/configure 2012-03-28 22:30:34.330563584 +0000 +--- ffmpeg-0.10.2/configure ++++ ffmpeg-0.10-haiku/configure @@ -1359,7 +1359,6 @@ aligned_stack_if_any="ppc x86" From 497b892ab0bbadb5a8cf96c94dfbc68c95684cf5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 22:54:09 +0200 Subject: [PATCH 261/587] ffmpeg: convert 0.10.2 recipe to an actual recipe --- media-video/ffmpeg/ffmpeg-0.10.2.recipe | 125 ++++++++++++++++++++---- 1 file changed, 107 insertions(+), 18 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.recipe b/media-video/ffmpeg/ffmpeg-0.10.2.recipe index 8016d4281..d94ad6254 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.2.recipe +++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe @@ -1,30 +1,119 @@ -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" +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." +HOMEPAGE="http://www.ffmpeg.org" +LICENSE=" + GNU LGPL v2.1 + GNU GPL v2 + " +COPYRIGHT=" + 2000-2003 Fabrice Bellard + 2003-2012 the FFmpeg developers + " SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2" CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libogg >= 1.3.0 - media-libs/speex >= 1.2rc1 - media-libs/libtheora >= 1.1.0 - media-libs/libvorbis >= 1.3.2 - media-libs/libvpx >= 1.0.0" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="ffmpeg-0.10.2-gcc2.patch" + +PROVIDES=" + ffmpeg = $portVersion compat >= 0.10 + cmd:ffmpeg = $portVersion compat >= 0.10 + cmd:ffprobe = $portVersion compat >= 0.10 + cmd:ffserver = $portVersion compat >= 0.10 + lib:libavcodec = 53.61.100 compat >= 53 + lib:libavdevice = 53.4.100 compat >= 53 + lib:libavfilter = 2.61.100 compat >= 2 + lib:libavformat = 53.32.100 compat >= 53 + lib:libavutil = 51.35.100 compat >= 51 + lib:libswresample = 0.6.100 compat >= 0 + lib:libswscale = 2.1.100 compat >= 2 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libogg + lib:libspeex + lib:libtheoradec + lib:libtheoraenc + lib:libvorbis + lib:libvorbisenc + lib:libvpx + lib:libz + " +BUILD_REQUIRES=" + cmd:gcc + cmd:ld + cmd:make + cmd:pkg_config + cmd:yasm + devel:libogg + devel:libspeex + devel:libtheora + devel:libvorbis + devel:libvpx + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd ffmpeg-0.10.2 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ - --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` - make + # not an auto tools configure + ./configure \ + --prefix=$prefix \ + --datadir=$dataDir/ffmpeg \ + --incdir=$includeDir \ + --mandir=$manDir \ + --disable-debug \ + --enable-shared \ + --enable-libvorbis \ + --enable-libspeex \ + --enable-libtheora \ + --enable-libvpx + make $jobArgs } INSTALL() { - cd ffmpeg-0.10.2 make install + + rm $binDir/ffprobe + # TODO: Determine and fix what is wrong with ffprobe! The executable + # seems to be broken. The NEEDED entries in the dynamic section look + # weird and the runtime loader fails relocating with "Operation not + # allowed". + + prepareInstalledDevelLibs \ + libavcodec \ + libavdevice \ + libavfilter \ + libavformat \ + libavutil \ + libswresample \ + libswscale + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir } -LICENSE="GNU LGPL v2.1 - GNU GPL v2" -COPYRIGHT="2000-2003 Fabrice Bellard - 2003-2012 the FFmpeg developers" +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The libtheora development files" +PROVIDES_devel=" + ffmpeg_devel = $portVersion compat >= 0.10 + devel:libavcodec = 53.61.100 compat >= 53 + devel:libavdevice = 53.4.100 compat >= 53 + devel:libavfilter = 2.61.100 compat >= 2 + devel:libavformat = 53.32.100 compat >= 53 + devel:libavutil = 51.35.100 compat >= 51 + devel:libswresample = 0.6.100 compat >= 0 + devel:libswscale = 2.1.100 compat >= 2 + " +REQUIRES_devel=" + ffmpeg == $portVersion + " From 22ceadf77c818d6f19a8d39926cabd0177a751cd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 11 Jun 2013 22:54:53 +0200 Subject: [PATCH 262/587] ffmpeg: remove old non-recipes and patches --- media-video/ffmpeg/ffmpeg-0.5.recipe | 19 --------------- media-video/ffmpeg/ffmpeg-0.6.recipe | 24 ------------------- media-video/ffmpeg/patches/ffmpeg-0.5.patch | 26 --------------------- media-video/ffmpeg/patches/ffmpeg-0.6.patch | 22 ----------------- 4 files changed, 91 deletions(-) delete mode 100644 media-video/ffmpeg/ffmpeg-0.5.recipe delete mode 100644 media-video/ffmpeg/ffmpeg-0.6.recipe delete mode 100644 media-video/ffmpeg/patches/ffmpeg-0.5.patch delete mode 100644 media-video/ffmpeg/patches/ffmpeg-0.6.patch diff --git a/media-video/ffmpeg/ffmpeg-0.5.recipe b/media-video/ffmpeg/ffmpeg-0.5.recipe deleted file mode 100644 index d06e4376a..000000000 --- a/media-video/ffmpeg/ffmpeg-0.5.recipe +++ /dev/null @@ -1,19 +0,0 @@ -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://ffmpeg.org/releases/ffmpeg-0.5.tar.bz2" -CHECKSUM_MD5="be8503f15c3b81ba00eb8379ca8dcf33" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd ffmpeg-0.5 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared - make -} - -INSTALL() -{ - cd ffmpeg-0.5 - make install -} diff --git a/media-video/ffmpeg/ffmpeg-0.6.recipe b/media-video/ffmpeg/ffmpeg-0.6.recipe deleted file mode 100644 index a538f342c..000000000 --- a/media-video/ffmpeg/ffmpeg-0.6.recipe +++ /dev/null @@ -1,24 +0,0 @@ -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://ffmpeg.org/releases/ffmpeg-0.6.tar.bz2" -CHECKSUM_MD5="d6142a9a5821d6a6262a6edb903faa24" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd ffmpeg-0.6 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --disable-mmx --enable-shared - make -} - -INSTALL() -{ - cd ffmpeg-0.6 - make install -} - -LICENSE="GNU LGPL v2.1 - GNU GPL v2" -COPYRIGHT="2000-2003 Fabrice Bellard - 2003-2010 the FFmpeg developers" diff --git a/media-video/ffmpeg/patches/ffmpeg-0.5.patch b/media-video/ffmpeg/patches/ffmpeg-0.5.patch deleted file mode 100644 index 1b507ea74..000000000 --- a/media-video/ffmpeg/patches/ffmpeg-0.5.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -urN ffmpeg-0.5/configure ffmpeg-0.5-haiku/configure ---- ffmpeg-0.5/configure 2009-03-01 17:57:14.000000000 +0000 -+++ ffmpeg-0.5-haiku/configure 2009-10-18 22:24:38.000000000 +0000 -@@ -1483,7 +1483,7 @@ - - # OS specific - case $target_os in -- beos|haiku|zeta) -+ beos|zeta) - prefix_default="$HOME/config" - # helps building libavcodec - add_cflags -DPIC -fomit-frame-pointer -@@ -1509,6 +1509,13 @@ - enable beos_netserver - network_extralibs="-lnet" - fi ;; -+ haiku) -+ prefix_default="/boot/common" -+ SHFLAGS=' -shared' -+ disable audio_beos -+ enable beosthreads -+ network_extralibs="-lnetwork" -+ ;; - sunos) - FFSERVERLDFLAGS="" - SHFLAGS='-shared -Wl,-h,$$(@F)' diff --git a/media-video/ffmpeg/patches/ffmpeg-0.6.patch b/media-video/ffmpeg/patches/ffmpeg-0.6.patch deleted file mode 100644 index c29fea383..000000000 --- a/media-video/ffmpeg/patches/ffmpeg-0.6.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ffmpeg-0.6/configure 2010-06-15 19:44:30.020447232 +0000 -+++ ffmpeg-0.6-haiku/configure 2010-07-13 20:40:48.244056064 +0000 -@@ -2127,7 +2127,7 @@ - - # OS specific - case $target_os in -- beos|haiku|zeta) -+ beos|zeta) - prefix_default="$HOME/config" - # 3 gcc releases known for BeOS, each with ugly bugs - gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)" -@@ -2151,6 +2148,10 @@ - enable beos_netserver - network_extralibs="-lnet" - fi ;; -+ haiku) -+ prefix_default="/boot/common" -+ network_extralibs="-lnetwork" -+ ;; - sunos) - FFSERVERLDFLAGS="" - SHFLAGS='-shared -Wl,-h,$$(@F)' From 81e80eadb90ee7f721958b38780eeab17e52d7d4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 12 Jun 2013 14:17:30 +0200 Subject: [PATCH 263/587] expat: update recipe --- dev-libs/expat/expat-2.0.1.recipe | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe index 7644f75e4..2f84eda12 100644 --- a/dev-libs/expat/expat-2.0.1.recipe +++ b/dev-libs/expat/expat-2.0.1.recipe @@ -1,11 +1,14 @@ -SUMMARY="XML parser toolkit" -DESCRIPTION=" - XML Parser Toolkit - " +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)." HOMEPAGE="http://expat.sourceforge.net/" +COPYRIGHT=" + 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper + 2001-2006 Expat maintainers. + " +LICENSE="MIT" SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz" CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -52,10 +55,19 @@ INSTALL() # prepare develop/lib prepareInstalledDevelLibs libexpat + + # devel package + packageEntries devel \ + $developDir } -LICENSE="MIT" -COPYRIGHT=" - 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper - 2001-2006 Expat maintainers. +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The expat development files" +PROVIDES_devel=" + expat_devel = $portVersion + devel:libexpat = 1.5.2 compat >= 1 + " +REQUIRES_devel=" + expat == $portVersion base " From 0a8e0502dec5eae76128c712b74f75a09eec18e8 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 12 Jun 2013 15:19:18 +0200 Subject: [PATCH 264/587] icu: update recipe --- dev-libs/icu/icu-4.8.1.1.recipe | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dev-libs/icu/icu-4.8.1.1.recipe b/dev-libs/icu/icu-4.8.1.1.recipe index 6aa66ecc3..7b45bbc01 100644 --- a/dev-libs/icu/icu-4.8.1.1.recipe +++ b/dev-libs/icu/icu-4.8.1.1.recipe @@ -4,7 +4,7 @@ LICENSE="ICU" COPYRIGHT="1997-2011 IBM Corporation and others." SRC_URI="http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz" CHECKSUM_MD5="ea93970a0275be6b42f56953cd332c17" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="icu-4.8.1.1.patch" @@ -16,6 +16,7 @@ PROVIDES=" lib:libicuio = 48.1.1 compat >= 48 lib:libicule = 48.1.1 compat >= 48 lib:libiculx = 48.1.1 compat >= 48 + lib:libicutest = 48.1.1 compat >= 48 lib:libicutu = 48.1.1 compat >= 48 lib:libicuuc = 48.1.1 compat >= 48 " @@ -33,10 +34,11 @@ BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion " -SOURCE_DIR="icu/source" +SOURCE_DIR="icu" BUILD() { + cd source runConfigure ./configure \ --disable-renaming --disable-samples --disable-extras make $jobArgs @@ -44,6 +46,7 @@ BUILD() INSTALL() { + cd source make install prepareInstalledDevelLibs \ @@ -92,7 +95,18 @@ Here are a few highlights of the services provided by ICU: # ----- devel package ------------------------------------------------------- SUMMARY_devel="The ICU development files" -PROVIDES_devel="icu_devel = $portVersion" -REQUIRES_devel=" - icu == $portVersion +PROVIDES_devel=" + icu_devel = $portVersion + cmd:icu_config = $portVersion compat >= 4.8 + devel:libicudata = 48.1.1 compat >= 48 + devel:libicui18n = 48.1.1 compat >= 48 + devel:libicuio = 48.1.1 compat >= 48 + devel:libicule = 48.1.1 compat >= 48 + devel:libiculx = 48.1.1 compat >= 48 + devel:libicutest.so = 48.1.1 compat >= 48 + devel:libicutu = 48.1.1 compat >= 48 + devel:libicuuc = 48.1.1 compat >= 48 + " +REQUIRES_devel=" + icu == $portVersion base " From 4932f569c7131d53601bbb2ad5a206a6364d6760 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 12 Jun 2013 15:29:44 +0200 Subject: [PATCH 265/587] libsolv: update recipe --- .../libsolv-0.3.0_haiku_2013_05_30.recipe | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) 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 5f50f0cb9..3d86900af 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 @@ -4,17 +4,21 @@ LICENSE="BSD (3-clause)" COPYRIGHT="2007-2013, Novell Inc." HOMEPAGE="http://github.com/openSUSE/libsolv" SRC_URI="git+git://github.com/weinhold/libsolv.git#a53a69500a56fa1056c6f3a4b17cc91a50c51395" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="libsolv = $portVersion lib:libsolv = $portVersion - lib:libsolvext = $portVersion" + lib:libsolvext = $portVersion + " REQUIRES="haiku >= $haikuVersion - lib:libexpat >= 1.5 + lib:libexpat lib:libz " -BUILD_REQUIRES="$REQUIRES" +BUILD_REQUIRES=" + devel:libexpat + devel:libz + " BUILD_PREREQUIRES="haiku_devel >= $haikuVersion cmd:cmake cmd:gcc @@ -53,4 +57,21 @@ INSTALL() # We don't want the executables. rm -r $prefix/bin + + # devel package + packageEntries devel \ + $dataDir \ + $developDir } + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The libsolv development files" +PROVIDES_devel=" + libsolv_devel = $portVersion + devel:libsolv = $portVersion + devel:libsolvext = $portVersion + " +REQUIRES_devel=" + libsolv == $portVersion base + " From a96af2db2552cae5fb04e6a48c799072453dcb95 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 12 Jun 2013 16:02:43 +0200 Subject: [PATCH 266/587] openssl: update recipe --- dev-libs/openssl/openssl-1.0.0j.recipe | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/dev-libs/openssl/openssl-1.0.0j.recipe b/dev-libs/openssl/openssl-1.0.0j.recipe index fde0ea5a3..aa565941f 100644 --- a/dev-libs/openssl/openssl-1.0.0j.recipe +++ b/dev-libs/openssl/openssl-1.0.0j.recipe @@ -22,7 +22,7 @@ COPYRIGHT=" 1995-1998 Eric Young 1998-2012 The OpenSSL Project. " -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="openssl-1.0.0j.patch" @@ -36,16 +36,15 @@ PROVIDES=" " REQUIRES=" haiku >= $haikuVersion - zlib >= 1.2.3 + lib:libz >= 1.2.3 " BUILD_REQUIRES=" - $REQUIRES cmd:gcc cmd:ld cmd:make cmd:perl >= 5 cmd:sed - zlib_devel >= 1.2.3 + devel:libz >= 1.2.3 " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -61,6 +60,7 @@ BUILD() ./config --prefix=$prefix zlib shared --openssldir=$dataRootDir/ssl make + # multi-job builds don't work correctly } INSTALL() @@ -74,6 +74,11 @@ INSTALL() # prepare develop/lib prepareInstalledDevelLibs libcrypto libssl fixPkgconfig + + # devel package + packageEntries devel \ + $developDir \ + $manDir/man3 } TEST() @@ -81,3 +86,15 @@ TEST() cd openssl-1.0.0j make test } + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The openssl development files" +PROVIDES_devel=" + openssl_devel = $portVersion + devel:libcrypto = $portVersion compat >= 1.0.0 + devel:libssl = $portVersion compat >= 1.0.0 + " +REQUIRES_devel=" + openssl == $portVersion base + " From 91400442da18eef64f5f84966d4ba614e3b0a0e8 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 12 Jun 2013 16:19:39 +0200 Subject: [PATCH 267/587] glu: convert recipe to an actual recipe Also rename from version 9.0 to 9.0.0, which seems to be the correct one. --- sys-libs/glu/glu-9.0.0.recipe | 58 +++++++++++++++++++++++++++++++++++ sys-libs/glu/glu-9.0.recipe | 25 --------------- 2 files changed, 58 insertions(+), 25 deletions(-) create mode 100644 sys-libs/glu/glu-9.0.0.recipe delete mode 100644 sys-libs/glu/glu-9.0.recipe diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe new file mode 100644 index 000000000..92bd81431 --- /dev/null +++ b/sys-libs/glu/glu-9.0.0.recipe @@ -0,0 +1,58 @@ +SUMMARY="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" +SRC_URI="ftp://freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.gz" +CHECKSUM_MD5="bbc57d4fe3bd3fb095bdbef6fcb977c4" +REVISION="1" +ARCHITECTURES="x86_gcc2 !x86" + +PROVIDES=" + glu = $portVersion + lib:libGLU = 1.3.1 compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + $REQUIRES + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libGLU + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The glu development files" +PROVIDES_devel=" + glu_devel = $portVersion + devel:libGLU = 1.3.1 compat >= 1 + " +REQUIRES_devel=" + glu == $portVersion base + " diff --git a/sys-libs/glu/glu-9.0.recipe b/sys-libs/glu/glu-9.0.recipe deleted file mode 100644 index a8a380c00..000000000 --- a/sys-libs/glu/glu-9.0.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="glu" -HOMEPAGE="http://freedesktop.org" -SRC_URI="ftp://freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.gz" -CHECKSUM_MD5="bbc57d4fe3bd3fb095bdbef6fcb977c4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd glu-9.0.0 - ./configure --prefix=`finddir B_SYSTEM_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY`/ \ - --includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY`/os/opengl \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} - -INSTALL() -{ - cd glu-9.0.0 - make install DESTDIR="${DESTDIR}" -} - -LICENSE="MIT" -COPYRIGHT="Copyright (C) 1999-2012 Brian Paul and others. All Rights Reserved." From c0987b24cc8a3224fd47036a6033d53864588107 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 13 Jun 2013 00:16:11 +0200 Subject: [PATCH 268/587] mesa 7.8.2: update recipe * Build a separate devel package. The base package is empty now. We can use it as a requires for haiku.hpkg to automatically include the copyright info. * Include the private headers. They are needed by the Haiku build. --- sys-libs/mesa/mesa-7.8.2.recipe | 41 ++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/sys-libs/mesa/mesa-7.8.2.recipe b/sys-libs/mesa/mesa-7.8.2.recipe index 631423dba..bfde9e98c 100644 --- a/sys-libs/mesa/mesa-7.8.2.recipe +++ b/sys-libs/mesa/mesa-7.8.2.recipe @@ -1,3 +1,9 @@ +# NOTE: This recipe doesn't generate packages for general use: +# * mesa_devel: Is a service package for the Haiku build system. It contains the +# Mesa libraries and headers, which are built into the Haiku system package. +# * mesa: Is an empty package which we keep as a dependency for the Haiku system +# 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. @@ -9,23 +15,17 @@ COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." LICENSE="MIT" SRC_URI="ftp://freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2" CHECKSUM_MD5="6be2d343a0089bfd395ce02aaf8adb57" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 !x86" PROVIDES=" mesa = $portVersion - lib:libglapi = $portVersion - lib:libglslcl = $portVersion - lib:libglslpp = $portVersion - lib:libglu = $portVersion - lib:libmesa = $portVersion - lib:libmesagallium = $portVersion " REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES + cmd:find cmd:gcc cmd:ld cmd:make @@ -52,4 +52,29 @@ INSTALL() mkdir -p $developLibDir cp lib/libglu.a src/mesa/*.a src/glsl/*/*.a $developLibDir + + mesaPrivateHeaders=$includeDir/mesa_private + for header in $(find src -name '*\.h' | sed "s,^src/,,"); do + mkdir -p $mesaPrivateHeaders/$(dirname $header) + cp src/$header $mesaPrivateHeaders/$header + done + + # devel package + packageEntries devel \ + $developDir } + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + mesa_devel = $portVersion + devel:libglapi = $portVersion + devel:libglslcl = $portVersion + devel:libglslpp = $portVersion + devel:libglu = $portVersion + devel:libmesa = $portVersion + devel:libmesagallium = $portVersion + " +REQUIRES_devel=" + mesa == $portVersion base + " From a5a6c048db8c55bbe483acff98a39fc2e44ddb2c Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 13 Jun 2013 22:41:15 +0200 Subject: [PATCH 269/587] libpng 1.5.12: fix misplaced libpng15* development libraries --- media-libs/libpng/libpng-1.5.12.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/libpng/libpng-1.5.12.recipe b/media-libs/libpng/libpng-1.5.12.recipe index 3364959f7..ec9340345 100644 --- a/media-libs/libpng/libpng-1.5.12.recipe +++ b/media-libs/libpng/libpng-1.5.12.recipe @@ -9,7 +9,7 @@ COPYRIGHT=" LICENSE="LibPNG" SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.12.tar.gz?download" CHECKSUM_MD5="8ea7f60347a306c5faf70b977fa80e28" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="libpng-1.5.12.patchset" @@ -52,7 +52,7 @@ INSTALL() { make install - prepareInstalledDevelLibs libpng + prepareInstalledDevelLibs libpng libpng15 fixPkgconfig # devel package From ad01af5eae509c7ad0f0732db3d91a07f40a2f56 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 14 Jun 2013 00:01:10 +0200 Subject: [PATCH 270/587] jpeg 9: jconfig.h: fix issue with type boolean on Haiku --- media-libs/jpeg/jpeg-9.recipe | 4 +++- media-libs/jpeg/patches/jpeg-9.patchset | 27 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 media-libs/jpeg/patches/jpeg-9.patchset diff --git a/media-libs/jpeg/jpeg-9.recipe b/media-libs/jpeg/jpeg-9.recipe index 58bc495af..208b89733 100644 --- a/media-libs/jpeg/jpeg-9.recipe +++ b/media-libs/jpeg/jpeg-9.recipe @@ -13,9 +13,11 @@ LICENSE="JPEG" COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding. All Rights Reserved" SRC_URI="http://www.ijg.org/files/jpegsrc.v9.tar.gz" CHECKSUM_MD5="b397211ddfd506b92cd5e02a22ac924d" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" +PATCHES="jpeg-9.patchset" + PROVIDES=" jpeg = $portVersion compat >= 9 lib:libjpeg = $portVersion compat >= 9 diff --git a/media-libs/jpeg/patches/jpeg-9.patchset b/media-libs/jpeg/patches/jpeg-9.patchset new file mode 100644 index 000000000..87b0aac39 --- /dev/null +++ b/media-libs/jpeg/patches/jpeg-9.patchset @@ -0,0 +1,27 @@ +From b176455d2abc3a95f7e9133c8f4e18ba6f8678b5 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Thu, 13 Jun 2013 23:56:48 +0200 +Subject: jconfig.cfg: fix handling of "boolean" on Haiku + + +diff --git a/jconfig.cfg b/jconfig.cfg +index bb7435c..69a1c31 100644 +--- a/jconfig.cfg ++++ b/jconfig.cfg +@@ -25,6 +25,13 @@ typedef unsigned char boolean; + #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ + #endif + ++/* On Haiku defines macros TRUE and FALSE, but not the type ++ boolean. */ ++#ifdef __HAIKU__ ++typedef int boolean; ++#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ ++#endif ++ + #ifdef JPEG_INTERNALS + + #undef RIGHT_SHIFT_IS_UNSIGNED +-- +1.7.5 + From 525157555b0ab0c3bf95ef153c5404b29de7b69e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 14 Jun 2013 01:20:08 +0200 Subject: [PATCH 271/587] m4 1.4.16: update recipe --- sys-devel/m4/m4-1.4.16.recipe | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe index 6ebdc1889..f62dfc58e 100644 --- a/sys-devel/m4/m4-1.4.16.recipe +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -17,9 +17,11 @@ DESCRIPTION=" 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" SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz" CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -43,21 +45,21 @@ SOURCE_DIR="$portVersionedName" BUILD() { - ./configure $configureDirArgs \ + runConfigure ./configure \ --disable-rpath --with-gnu-ld \ --enable-changeword - make -j$jobs + make $jobArgs } INSTALL() { make install + + rm $libDir/charset.alias + rmdir $libDir } TEST() { make check } - -LICENSE="GNU GPL v3" -COPYRIGHT="2000, 2005-2011 Free Software Foundation, Inc." From 3a10e5134d695af7f0fc465ea120f9eb4db5f055 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 14 Jun 2013 01:55:24 +0200 Subject: [PATCH 272/587] perl 5.10.1: update recipe --- dev-lang/perl/perl-5.10.1.recipe | 57 +++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe index 66ebd3c7a..5358aca53 100644 --- a/dev-lang/perl/perl-5.10.1.recipe +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -15,13 +15,55 @@ DESCRIPTION=" because of its perceived 'ugliness'. " HOMEPAGE="http://www.perl.org/" +COPYRIGHT="1993-2009 Larry Wall and others" +LICENSE="GNU GPL v1 + Artistic (Perl)" SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz" CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" + PROVIDES=" perl = $portVersion compat >= 5 + cmd:a2p = $portVersion compat >= 5 + cmd:c2ph = $portVersion compat >= 5 + cmd:config_data = $portVersion compat >= 5 + cmd:corelist = $portVersion compat >= 5 + cmd:cpan = $portVersion compat >= 5 + cmd:cpan2dist = $portVersion compat >= 5 + cmd:cpanp = $portVersion compat >= 5 + cmd:cpanp_run_perl = $portVersion compat >= 5 + cmd:dprofpp = $portVersion compat >= 5 + cmd:enc2xs = $portVersion compat >= 5 + cmd:find2perl = $portVersion compat >= 5 + cmd:h2ph = $portVersion compat >= 5 + cmd:h2xs = $portVersion compat >= 5 + cmd:instmodsh = $portVersion compat >= 5 + cmd:libnetcfg = $portVersion compat >= 5 cmd:perl = $portVersion compat >= 5 + cmd:perl5.10.1 = $portVersion compat >= 5 + cmd:perlbug = $portVersion compat >= 5 + cmd:perldoc = $portVersion compat >= 5 + cmd:perlivp = $portVersion compat >= 5 + cmd:perlthanks = $portVersion compat >= 5 + cmd:piconv = $portVersion compat >= 5 + cmd:pl2pm = $portVersion compat >= 5 + cmd:pod2html = $portVersion compat >= 5 + cmd:pod2latex = $portVersion compat >= 5 + cmd:pod2man = $portVersion compat >= 5 + cmd:pod2text = $portVersion compat >= 5 + cmd:pod2usage = $portVersion compat >= 5 + cmd:podchecker = $portVersion compat >= 5 + cmd:podselect = $portVersion compat >= 5 + cmd:prove = $portVersion compat >= 5 + cmd:psed = $portVersion compat >= 5 + cmd:pstruct = $portVersion compat >= 5 + cmd:ptar = $portVersion compat >= 5 + cmd:ptardiff = $portVersion compat >= 5 + cmd:s2p = $portVersion compat >= 5 + cmd:shasum = $portVersion compat >= 5 + cmd:splain = $portVersion compat >= 5 + cmd:xsubpp = $portVersion compat >= 5 lib:libperl = $portVersion compat >= 5 " REQUIRES=" @@ -37,6 +79,10 @@ BUILD_PREREQUIRES=" cmd:make " +GLOBAL_WRITABLE_FILES=" + non-packaged/lib/perl5/site_perl/5.10.1/BePC-haiku directory + " + SOURCE_DIR="$portVersionedName" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL @@ -62,7 +108,7 @@ BUILD() # force-remove path from sed sed -i -e 's/LOC_SED\s*"\/boot\/common\/bin\/sed/LOC_SED "sed/' config.h - make + make $jobArgs } INSTALL() @@ -73,7 +119,8 @@ INSTALL() chmod a+x perl psed pstruct perlthanks cd "$libDir" ln -sf perl5/core_perl/5.10.1/$perlArch/CORE/libperl.so . + + # The "site-perl" stuff is automatically created, when necessary, so we can + # as well remove it. + rm -r $prefix/non-packaged } -LICENSE="GNU GPL v1 - Artistic (Perl)" -COPYRIGHT="1993-2009 Larry Wall and others" From 0c70460f03a812ebcb43be59e170849af58b78f9 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 15 Jun 2013 21:09:09 +0200 Subject: [PATCH 273/587] binutils: update recipe * Remove libiberty, move libbfs and libocodes to develop/lib. * For the source package export only legacy/binutils. * Change documentation directory to $docDir-$version. --- .../binutils/binutils-2.17_130421.recipe | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/sys-devel/binutils/binutils-2.17_130421.recipe b/sys-devel/binutils/binutils-2.17_130421.recipe index d02db30e1..46eddae6e 100644 --- a/sys-devel/binutils/binutils-2.17_130421.recipe +++ b/sys-devel/binutils/binutils-2.17_130421.recipe @@ -1,7 +1,7 @@ SUMMARY="The GNU assembler, linker and binary utilities" HOMEPAGE="http://www.gnu.org/software/binutils" SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" LICENSE=" GNU GPL v2 @@ -9,7 +9,6 @@ LICENSE=" " COPYRIGHT="1988-2006 Free Software Foundation, Inc." - PROVIDES=" binutils = $portVersion compat >= 2.17 cmd:addr2line = $portVersion compat >= 2.17 @@ -26,6 +25,8 @@ PROVIDES=" cmd:size = $portVersion compat >= 2.17 cmd:strings = $portVersion compat >= 2.17 cmd:strip = $portVersion compat >= 2.17 + devel:libbfd = $portVersion compat >= 2.17 + devel:libopcodes = $portVersion compat >= 2.17 " REQUIRES=" @@ -46,30 +47,33 @@ BUILD_PREREQUIRES=" " SOURCE_DIR="$portVersionedName" +SOURCE_EXPORT_SUBDIR="legacy/binutils" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL binutilsDir=$(pwd)/legacy/binutils relativeArchInstallDir="develop/tools/${portVersionedName}" archInstallDir="$prefix/$relativeArchInstallDir" -objectsDir=$(pwd)/../${portVersionedName}-obj -binutilsObjectsDir=$objectsDir/binutils +binutilsObjectsDir=$binutilsDir/../binutils-obj +relativeBinutilsDocDir=$relativeDocDir-2.17 +binutilsDocDir=$prefix/$relativeBinutilsDocDir BUILD() { - rm -rf $objectsDir + rm -rf $binutilsObjectsDir # Touch all *.info files, as newer texinfos don't like their format - (cd $binutilsDir; find . -name \*.info | xargs touch) + cd $binutilsDir + find . -name \*.info | xargs touch # build binutils mkdir -p $binutilsObjectsDir cd $binutilsObjectsDir CFLAGS="-O2" CXXFLAGS="-O2" "$binutilsDir/configure" \ --prefix=$prefix --exec-prefix=$archInstallDir \ - --bindir=$prefix/bin --libdir=$prefix/lib \ - --includedir=$prefix/develop/headers/binutils \ - --mandir=$prefix/documentation/man \ - --with-htmldir=documentation/html/binutils \ + --bindir=$binDir --libdir=$libDir \ + --includedir=$includeDir/binutils \ + --mandir=$manDir \ + --with-htmldir=$relativeBinutilsDocDir \ --disable-nls --enable-shared=yes make } @@ -82,11 +86,15 @@ INSTALL() make install make install-html + prepareInstalledDevelLibs libbfd libopcodes + rm $libDir/libiberty.a + # libiberty is only needed for building binutils + rmdir $libDir + ### HTML documentation #################################### echo "Organizing HTML documentation..." - html_base=$prefix/documentation/html/binutils - cd $html_base + cd $binutilsDocDir mv as.html as ln -sf as/index.html as.html @@ -113,15 +121,15 @@ INSTALL() echo "Creating required symlinks" - # remove duplicate architecture-dependent binaries from $prefix/bin - cd $prefix/bin + # remove duplicate architecture-dependent binaries from $binDir + cd $binDir rm ar as ld nm objdump ranlib strip # make all tools available via default paths if these are # the system binutils - if [ $architecture = 'x86_gcc2' ]; then + if [ $targetArchitecture = 'x86_gcc2' ]; then echo "Symlinking binaries into default path" - mkdir -p $prefix/bin + mkdir -p $binDir ln -sfn ../$relativeArchInstallDir/$archName/bin/* . fi From 635075a603e8db2c5433e761ed46701d0f32e473 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 15 Jun 2013 21:11:33 +0200 Subject: [PATCH 274/587] gcc: update recipe * Fix incorrect gccDate. * For the source package only export legacy/gcc. * architecture -> targetArchitecture * Add missing provides for c++filt and i586-pc-haiku-gcc. --- sys-devel/gcc/gcc-2.95.3_130425.recipe | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/sys-devel/gcc/gcc-2.95.3_130425.recipe b/sys-devel/gcc/gcc-2.95.3_130425.recipe index dea97fe49..fa559fb61 100644 --- a/sys-devel/gcc/gcc-2.95.3_130425.recipe +++ b/sys-devel/gcc/gcc-2.95.3_130425.recipe @@ -10,16 +10,19 @@ SRC_URI=" git+file://$portBaseDir/../binutils/work-2.17_130421/sources/binutils-2.17_130421#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045 git+git://github.com/haiku/BuildtoolsPM.git#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045 " -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" gcc = $portVersion compat >= 2.95.3 + cmd:cc cmd:c++ = $portVersion compat >= 2.95.3 + cmd:c++filt = $portVersion compat >= 2.95.3 cmd:cpp = $portVersion compat >= 2.95.3 cmd:g++ = $portVersion compat >= 2.95.3 cmd:gcc = $portVersion compat >= 2.95.3 cmd:gcov = 1.5 compat >= 1.5 + cmd:i586_pc_haiku_gcc = $portVersion compat >= 2.95.3 cmd:protoize = $portVersion compat >= 2.95.3 cmd:unprotoize = $portVersion compat >= 2.95.3 " @@ -42,18 +45,19 @@ BUILD_PREREQUIRES=" " SOURCE_DIR="$portVersionedName" +SOURCE_EXPORT_SUBDIR="legacy/gcc" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL gccDir=$(pwd)/legacy/gcc -gccDate=110711 -relativeGccInstallDir="develop/tools/gcc-2.95.3-${gccDate}" +gccDate=$(echo $portVersion | sed 's,.*_,,') +relativeGccInstallDir="develop/tools/gcc-2.95.3_${gccDate}" gccInstallDir="$prefix/$relativeGccInstallDir" -objectsDir=$(pwd)/../${portVersionedName}-obj -gccObjectsDir=$objectsDir/gcc +gccObjectsDir=$gccDir/../gcc-obj +gccDocDir=$docDir-2.95.3 BUILD() { - rm -rf $objectsDir + rm -rf $gccObjectsDir # Touch some files generated by bison, so that bison won't run to update # them. Fixes issues with newer bison versions. @@ -78,11 +82,14 @@ INSTALL() cd $gccObjectsDir make install + rm $gccInstallDir/lib/libiberty.a + # only needed for building gcc + base=$gccInstallDir ### HTML documentation #################################### - html_base=$prefix/documentation/packages/$portVersionedName + html_base=$gccDocDir if [ ! -d "$html_base" ]; then echo "Building HTML documentation..." mkdir -p $html_base @@ -111,7 +118,7 @@ INSTALL() # make all tools available via default paths if this is the system # compiler - if [ $architecture = 'x86_gcc2' ]; then + if [ $targetArchitecture = 'x86_gcc2' ]; then echo "Symlinking binaries into default path" mkdir -p $prefix/bin cd $prefix/bin From 14910ebf1664f4e74aaf866caa89ac68e1f2c6fc Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 15 Jun 2013 21:41:52 +0200 Subject: [PATCH 275/587] sed: update recipe * Use runConfigure. * Use jobArgs. --- sys-apps/sed/sed-4.2.1.recipe | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe index f3e4cface..df4fb1d54 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -10,9 +10,11 @@ DESCRIPTION=" editors. " HOMEPAGE="http://www.gnu.org/software/sed" +COPYRIGHT="1989-2009 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz" CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -35,10 +37,10 @@ SOURCE_DIR="$portVersionedName" BUILD() { - ./configure $configureDirArgs \ + runConfigure ./configure \ --enable-regex-tests --without-included-regex \ --disable-rpath --with-gnu-ld - make + make $jobArgs } INSTALL() @@ -47,6 +49,3 @@ INSTALL() rm $libDir/charset.alias rmdir $libDir } - -LICENSE="GNU GPL v3" -COPYRIGHT="1989-2009 Free Software Foundation, Inc." From f527844ec33a58ccb04abd76275b4560dece8570 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 15 Jun 2013 21:54:07 +0200 Subject: [PATCH 276/587] grep: update build requires --- sys-apps/grep/grep-2.14.recipe | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe index 700a7df29..a785439f5 100644 --- a/sys-apps/grep/grep-2.14.recipe +++ b/sys-apps/grep/grep-2.14.recipe @@ -8,7 +8,7 @@ CHECKSUM_MD5="db55b9fc67d8c0895f3c73e94e2aebe3" # XZ file format: #SRC_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz" #CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="grep-2.14-gcc2.patch" @@ -25,15 +25,16 @@ REQUIRES=" lib:libintl " BUILD_REQUIRES=" - $REQUIRES - gettext cmd:aclocal cmd:autoconf cmd:automake cmd:gcc + cmd:gettext cmd:ld cmd:libtoolize cmd:make + devel:libiconv + devel:libintl " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion From 1e2cafa16fa639e205fd94b88762f6430bef008c Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 15 Jun 2013 22:03:16 +0200 Subject: [PATCH 277/587] automake: update recipe Use runConfigure and jobArgs. --- sys-devel/automake/automake-1.13.1.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index 2f6186f0f..4f5136555 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -10,7 +10,7 @@ COPYRIGHT="2013 Free Software Foundation, Inc." LICENSE="GNU GPL v2" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz" CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -44,8 +44,8 @@ SOURCE_DIR="$portVersionedName" BUILD() { - PERL="/bin/env perl" ./configure $configureDirArgs - make -j$jobs + PERL="/bin/env perl" runConfigure ./configure + make $jobArgs } INSTALL() From a3885cf3df7e80683e9b6a743b5cf1dadb3ef4b7 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 15 Jun 2013 22:11:10 +0200 Subject: [PATCH 278/587] texinfo: update recipe * Fix requires/build requires. * Use runConfigure and jobArgs. --- sys-apps/texinfo/texinfo-4.13a.recipe | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe index 1602b8428..4d65ccff8 100644 --- a/sys-apps/texinfo/texinfo-4.13a.recipe +++ b/sys-apps/texinfo/texinfo-4.13a.recipe @@ -1,12 +1,15 @@ SUMMARY="Standard GNU documentation format tool" 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" SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz" CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb" -REVISION="6" +REVISION="7" ARCHITECTURES="x86_gcc2 ?x86" -PROVIDES="texinfo = $portVersion compat >= 4.13 +PROVIDES=" + texinfo = $portVersion compat >= 4.13 cmd:info = $portVersion compat >= 4.13 cmd:makeinfo = $portVersion compat >= 4.13 cmd:install_info = $portVersion compat >= 4.13 @@ -16,25 +19,28 @@ PROVIDES="texinfo = $portVersion compat >= 4.13 cmd:infokey = $portVersion compat >= 4.13 cmd:pdftexi2dvi = $portVersion compat >= 4.13" REQUIRES=" - ncurses + haiku >= $haikuVersion + lib:libncurses " BUILD_REQUIRES=" - $REQUIRES + devel:libncurses " -BUILD_PREREQUIRES="haiku_devel >= $haikuVersion +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:libtoolize cmd:make - cmd:sed" + cmd:sed + " SOURCE_DIR="texinfo-4.13" BUILD() { libtoolize --force --copy --install - ./configure $configureDirArgs - make + runConfigure ./configure + make $jobArgs } INSTALL() @@ -43,6 +49,3 @@ INSTALL() rm $libDir/charset.alias rmdir $libDir } - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2008 Free Software Foundation, Inc." From 21599237464e1cc20fe4688baa9a84f3e6f70e99 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 15 Jun 2013 22:14:14 +0200 Subject: [PATCH 279/587] autoconf: use runConfigure and jobArgs --- sys-devel/autoconf/autoconf-2.69.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index 17d071f0f..a81d82031 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -13,7 +13,7 @@ LICENSE=" " SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz" CHECKSUM_MD5="50f97f4159805e374639a73e2636f22e" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -52,8 +52,8 @@ BUILD() { autoreconf PERL="perl" M4="m4" SED="sed" \ - ./configure $configureDirArgs - make -j$jobs + runConfigure ./configure + make $jobArgs } INSTALL() From b8867b8fd6ad4762ceb903142ef03a761d6e42bd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 15 Jun 2013 22:32:22 +0200 Subject: [PATCH 280/587] libtool: update recipe * Move libltdl into new package libtool_libltdl. * Use runConfigure, jobArgs. --- sys-devel/libtool/libtool-2.4.recipe | 32 ++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index 348ccdeec..4942c01ff 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -4,9 +4,11 @@ DESCRIPTION=" architectures to build shared libraries in a generic fashion. " HOMEPAGE="http://www.gnu.org/software/libtool" +COPYRIGHT="2004-2010 Free Software Foundation, Inc." +LICENSE="GNU GPL v2" SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz" CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" -REVISION="7" +REVISION="8" ARCHITECTURES="x86_gcc2 ?x86" PATCHES=" @@ -18,11 +20,11 @@ PROVIDES=" libtool = $portVersion compat >= 2.4 cmd:libtool = $portVersion compat >= 2.4 cmd:libtoolize = $portVersion compat >= 2.4 - lib:libltdl.a = 7.3.0 compat >= 7 - lib:libltdl = 7.3.0 compat >= 7 + devel:libltdl = 7.3.0 compat >= 7 " REQUIRES=" haiku >= $haikuVersion + libtool_libltdl == $portVersion base cmd:aclocal cmd:automake cmd:sed @@ -48,8 +50,9 @@ SOURCE_DIR="$portVersionedName" BUILD() { ./bootstrap - SED='sed' NM='nm' LD=ld ./configure $configureDirArgs --with-gnu-ld - make -j$jobs + SED='sed' NM='nm' LD=ld runConfigure ./configure \ + --with-gnu-ld + make $jobArgs # Desperate move to remove the absolute paths from libtool. For some reason # only for the C++ compiler those are set (not for the C compiler). In # openSuse libtool doesn't have those variables set either, but building @@ -68,6 +71,13 @@ INSTALL() { make install prepareInstalledDevelLibs libltdl + + # libltdl package + packageEntries libltdl \ + $libDir/libltdl* + + # main package + rmdir $libDir } TEST() @@ -75,5 +85,13 @@ TEST() make check } -LICENSE="GNU GPL v2" -COPYRIGHT="2004-2010 Free Software Foundation, Inc." +# ----- libltdl package ------------------------------------------------------- + +SUMMARY_libltdl="The libtool libltdl library" +PROVIDES_libltdl=" + libtool_libltdl = $portVersion compat >= 2.4 + lib:libltdl = 7.3.0 compat >= 7 + " +REQUIRES_libltdl=" + haiku >= $haikuVersion + " From 73c57a17bccf0e1dc6ccd8ebd0b2d03f75bebb14 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 15 Jun 2013 22:37:41 +0200 Subject: [PATCH 281/587] make: update recipe * Use runConfigure. * Remove explicit declaration of source package. --- sys-devel/make/make-3.82.recipe | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index f185c9434..c5c7c990b 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -14,7 +14,7 @@ LICENSE="GNU GPL v3" COPYRIGHT="1988-2010 Free Software Foundation, Inc." SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2" CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -39,7 +39,7 @@ SOURCE_DIR="$portVersionedName" BUILD() { libtoolize --force --copy --install - ./configure $configureDirArgs \ + runConfigure ./configure \ --disable-rpath --with-gnu-ld ./build.sh } @@ -48,7 +48,3 @@ INSTALL() { ./make install } - -# ----- source package ------------------------------------------------------- - -PROVIDES_source="make_source = $portVersion" From 5e69362f2e1abdbd25a8f1f0f701c186fa674058 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 15 Jun 2013 22:48:45 +0200 Subject: [PATCH 282/587] flex: update recipe * Declare library provides correctly. * Move development libraries to develop/lib. * Add missing cmd:makeinfo build requires. * Use runConfigure, jobArgs. --- sys-devel/flex/flex-2.5.35.recipe | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index 22038aa0d..2d331ffae 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -4,16 +4,18 @@ DESCRIPTION=" 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" SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download" CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" flex = $portVersion compat >= 2.5 cmd:flex = $portVersion compat >= 2.5 - lib:libfl.a = $portVersion compat >= 2.5 - lib:libfl_pic.a = $portVersion compat >= 2.5 + devel:libfl = $portVersion compat >= 2.5 + devel:libfl_pic = $portVersion compat >= 2.5 " REQUIRES=" haiku >= $haikuVersion @@ -25,6 +27,7 @@ BUILD_REQUIRES=" cmd:automake cmd:libtoolize cmd:make + cmd:makeinfo " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -41,15 +44,16 @@ BUILD() aclocal -I m4 autoconf automake --add-missing --force-missing - ./configure $configureDirArgs \ + runConfigure ./configure \ --disable-rpath --with-gnu-ld - make -j$jobs + make $jobArgs } INSTALL() { make install -} -LICENSE="Flex" -COPYRIGHT="2001-2007 The Flex Project; 1990, 1997 The Regents of the University of California" + # prepare develop/lib + prepareInstalledDevelLibs libfl libfl_pic + rmdir $libDir +} From 1a565ed1a8483f2c11ca92521e2213792651a404 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 15 Jun 2013 22:58:58 +0200 Subject: [PATCH 283/587] bison: update recipe * Move liby to develop/lib and declare the respective provides correctly. * Use runConfigure, jobArgs. * Remove charset.alias. --- sys-devel/bison/bison-2.4.3.recipe | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe index 8a98b4c02..4f81f81c6 100644 --- a/sys-devel/bison/bison-2.4.3.recipe +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -16,14 +16,14 @@ COPYRIGHT="1992-2010 Free Software Foundation, Inc." LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz" CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" bison = $portVersion compat >= 2.4 cmd:bison = $portVersion compat >= 2.4 cmd:yacc - lib:liby.a = $portVersion compat >= 2.4 + devel:liby = $portVersion compat >= 2.4 " REQUIRES=" haiku >= $haikuVersion @@ -45,18 +45,23 @@ BUILD() { # bison looks for m4 in an absolute path, but uses that only within # its own testsuite, so we let it be ... - ./configure $configureDirArgs \ + runConfigure ./configure \ --disable-rpath --with-gnu-ld - make -j$jobs + make $jobArgs } INSTALL() { make install + + # prepare develop/lib + prepareInstalledDevelLibs liby + + rm $libDir/charset.alias + rmdir $libDir } TEST() { make check } - From 7e7bfa9ead11005206bc307f8601c82604372e41 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 00:41:23 +0200 Subject: [PATCH 284/587] apr: update recipe * provides: - Remove lib:libapr. A library with that base name doesn't exist. - lib:libapr_1: Fix version. * Remove lib/apr.exp. * Build separate devel package. * Remove explicit source package declaration. --- dev-libs/apr/apr-1.4.6.recipe | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe index e55147f38..a0e172c37 100644 --- a/dev-libs/apr/apr-1.4.6.recipe +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -4,16 +4,14 @@ SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz" COPYRIGHT="2012 The Apache Software Foundation." LICENSE="Apache v2" CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb" -REVISION="6" +REVISION="7" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="apr-1.4.6.patch" PROVIDES=" apr = $portVersion compat >= 1 - cmd:apr_1_config - lib:libapr = $portVersion compat >= 1 - lib:libapr_1 = $portVersion compat >= 1 + lib:libapr_1 = 0.4.6 compat >= 0 " REQUIRES=" haiku >= $haikuVersion @@ -57,6 +55,15 @@ INSTALL() # fix apr-1-config fixDevelopLibDirReferences $binDir/apr-1-config + + # remove superfluous .exp file + rm $libDir/apr.exp + + # devel package + packageEntries devel \ + $binDir \ + $dataDir \ + $developDir } TEST() @@ -64,10 +71,6 @@ TEST() make test } -# ----- source package ------------------------------------------------------- - -PROVIDES_source="apr_source = $portVersion compat = $portVersion" - # ----- description ---------------------------------------------------------- DESCRIPTION=" @@ -95,3 +98,14 @@ DESCRIPTION=" - thread and Process management - various data structures (tables, hashes, priority queues, etc) " + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + apr_devel = portVersion compat >= 1 + cmd:apr_1_config = portVersion compat >= 1 + devel:libapr_1 = 0.4.6 compat >= 0 + " +REQUIRES_devel=" + apr == $portVersion base + " From ad370fc3a05f838ee07e52ca68d158386f5214d1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 00:44:55 +0200 Subject: [PATCH 285/587] apr_util: update recipe * provides: - Remove lib:libaprutil. A library with that base name doesn't exist. - lib:libaprutil_1: Fix version. * requires: Require the actual apr and expat libraries. * build_requires: Don't include requires, rather specify the build packages explicitly. * Remove lib/aprutil.exp. * Build separate devel package. --- dev-libs/apr_util/apr_util-1.4.1.recipe | 36 ++++++++++++++++++------- 1 file changed, 27 insertions(+), 9 deletions(-) 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 9eb2a0d83..4444950fa 100644 --- a/dev-libs/apr_util/apr_util-1.4.1.recipe +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -4,24 +4,23 @@ SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz" LICENSE="Apache v2" COPYRIGHT="2011 The Apache Software Foundation." CHECKSUM_MD5="666a5d56098a9debf998510e304c8095" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="apr_util-1.4.1.patch" PROVIDES=" apr_util = $portVersion compat >= 1 - cmd:apu_1_config = $portVersion compat >= 1 - lib:libaprutil = $portVersion compat >= 1 - lib:libaprutil_1 = $portVersion compat >= 1 + lib:libaprutil_1 = 0.4.1 compat >= 0 " REQUIRES=" haiku >= $haikuVersion - apr >= 1.4.6 - expat >= 2.0 + lib:libapr_1 + lib:libexpat " BUILD_REQUIRES=" - $REQUIRES + apr_devel >= 1.4.6 + expat_devel >= 2.0 cmd:aclocal cmd:autoconf cmd:autoheader @@ -43,8 +42,8 @@ PATCH() BUILD() { - aprInstallDir=$portPackageLinksDir/apr - expatInstallDir=$portPackageLinksDir/expat + aprInstallDir=$portPackageLinksDir/apr_devel + expatInstallDir=$portPackageLinksDir/expat_devel rm -rf aclocal.m4 mkdir -p m4 @@ -81,6 +80,14 @@ INSTALL() # fix apu-1-config fixDevelopLibDirReferences $binDir/apu-1-config + + # remove superfluous .exp file + rm $libDir/aprutil.exp + + # devel package + packageEntries devel \ + $binDir \ + $developDir } DESCRIPTION=" @@ -108,3 +115,14 @@ DESCRIPTION=" - thread and Process management - various data structures (tables, hashes, priority queues, etc) " + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + apr_util_devel = portVersion compat >= 1 + cmd:apu_1_config = $portVersion compat >= 1 + devel:libaprutil_1 = 0.4.1 compat >= 0 + " +REQUIRES_devel=" + apr_util == $portVersion base + " From f9cfc60b09d0cdc8767ea191528996daec6a9cd8 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 00:55:17 +0200 Subject: [PATCH 286/587] be_book: rename version: 20081026 -> 2008_10_26 --- .../{be_book-20081026.recipe => be_book-2008_10_26.recipe} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename haiku-data/be_book/{be_book-20081026.recipe => be_book-2008_10_26.recipe} (92%) diff --git a/haiku-data/be_book/be_book-20081026.recipe b/haiku-data/be_book/be_book-2008_10_26.recipe similarity index 92% rename from haiku-data/be_book/be_book-20081026.recipe rename to haiku-data/be_book/be_book-2008_10_26.recipe index 1938c0a87..326fd46ae 100644 --- a/haiku-data/be_book/be_book-20081026.recipe +++ b/haiku-data/be_book/be_book-2008_10_26.recipe @@ -5,8 +5,9 @@ COPYRIGHT="ACCESS Co., Ltd." LICENSE="Attribution-NonCommercial-NoDerivs 3.0 Unported" SRC_URI="http://haiku-files.org/files/data/bebook_20081026.zip" CHECKSUM_MD5="78d58b64a41ae4e8f84a14f22aea4adb" -REVISION="2" +REVISION="1" ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes PROVIDES=" be_book = $portVersion From bf21ad655ee2c51a2253f39987e3b49747ba6ee1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 02:02:51 +0200 Subject: [PATCH 287/587] jam: update recipe * Rename version: 2.5_121012 -> 2.5_2012_10_12. * Don't put Jambase.html, Jamfile.html into development directory. While correct in principle, it is not so nice to separate them from Jam.html, which is mostly development documentation as well (documenting the tool invocation and the Jam language). --- ...am-2.5_121012.recipe => jam-2.5_2012_10_12.recipe} | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) rename sys-devel/jam/{jam-2.5_121012.recipe => jam-2.5_2012_10_12.recipe} (85%) diff --git a/sys-devel/jam/jam-2.5_121012.recipe b/sys-devel/jam/jam-2.5_2012_10_12.recipe similarity index 85% rename from sys-devel/jam/jam-2.5_121012.recipe rename to sys-devel/jam/jam-2.5_2012_10_12.recipe index d030648ad..dbf3125cf 100644 --- a/sys-devel/jam/jam-2.5_121012.recipe +++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe @@ -19,10 +19,10 @@ HOMEPAGE="http://www.perforce.com/jam/jam.html" LICENSE="Jam" COPYRIGHT="1993-2003 Christopher Seiwald" SRC_URI=" - git+file://$portBaseDir/../binutils/work-2.17_130421/sources/binutils-2.17_130421 - git+git://github.com/haiku/BuildtoolsPM.git + git+file://$portBaseDir/../binutils/work-2.17_130421/sources/binutils-2.17_130421#278de7bc9243876c2e08f8d6a243d510c5000462 + git+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462 " -REVISION="2" +REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -55,8 +55,5 @@ INSTALL() cp bin.haikux86/jam "$binDir" mkdir -p "$docDir" - cp Jam.html README* "$docDir" - - mkdir -p "$developDocDir" - cp Jambase.html Jamfile.html "$developDocDir" + cp Jam.html Jambase.html Jamfile.html README* "$docDir" } From f494c141dc658b3e29714e815b40d8f61238f2e0 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 03:40:45 +0200 Subject: [PATCH 288/587] htmldoc: update recipe and patch * [build_]requires: add libjpeg, libpng, libz. * Use runConfigure, jobArgs. * Fix build with libpng 1.5.x. --- app-text/htmldoc/htmldoc-1.8.27.recipe | 14 +- app-text/htmldoc/patches/htmldoc-1.8.27.patch | 124 -------- .../htmldoc/patches/htmldoc-1.8.27.patchset | 273 ++++++++++++++++++ 3 files changed, 284 insertions(+), 127 deletions(-) delete mode 100644 app-text/htmldoc/patches/htmldoc-1.8.27.patch create mode 100644 app-text/htmldoc/patches/htmldoc-1.8.27.patchset diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe index 73f843df9..3286f627c 100644 --- a/app-text/htmldoc/htmldoc-1.8.27.recipe +++ b/app-text/htmldoc/htmldoc-1.8.27.recipe @@ -8,9 +8,11 @@ LICENSE="GNU GPL v2" COPYRIGHT="1997-2006 Easy Software Products" SRC_URI="http://www.msweet.org/files/project1/htmldoc-1.8.27-source.tar.bz2" CHECKSUM_MD5="35589e7b8fe9c54e11be87cd5aec4dcc" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" +PATCHES="htmldoc-1.8.27.patchset" + PROVIDES=" htmldoc = $portVersion compat >= 1.8 cmd:htmldoc = $portVersion compat >= 1.8 @@ -18,6 +20,9 @@ PROVIDES=" REQUIRES=" haiku >= $haikuVersion + lib:libjpeg + lib:libpng + lib:libz " BUILD_REQUIRES=" cmd:autoconf @@ -25,6 +30,9 @@ BUILD_REQUIRES=" cmd:ld cmd:make cmd:sed + devel:libjpeg + devel:libpng + devel:libz " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -36,8 +44,8 @@ BUILD() { autoconf chmod 755 configure - ./configure $configureDirArgs - make + runConfigure ./configure + make $jobArgs } INSTALL() diff --git a/app-text/htmldoc/patches/htmldoc-1.8.27.patch b/app-text/htmldoc/patches/htmldoc-1.8.27.patch deleted file mode 100644 index a0d81716c..000000000 --- a/app-text/htmldoc/patches/htmldoc-1.8.27.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff -urN htmldoc-1.8.27-orig/configure.in htmldoc-1.8.27/configure.in ---- htmldoc-1.8.27-orig/configure.in 2006-08-02 19:36:53.000000000 +0000 -+++ htmldoc-1.8.27/configure.in 2011-05-23 09:05:32.608174080 +0000 -@@ -109,7 +109,7 @@ - AC_SUBST(LDFLAGS) - - AC_CHECK_LIB(m,pow) --AC_SEARCH_LIBS(socket, socket) -+AC_SEARCH_LIBS(socket, network socket) - AC_SEARCH_LIBS(gethostbyaddr, nsl) - AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO)) - AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO)) -@@ -316,8 +316,8 @@ - bindir="$exec_prefix/bin" - fi - --AC_DEFINE_UNQUOTED(DOCUMENTATION, "$prefix/share/doc/htmldoc") --AC_DEFINE_UNQUOTED(HTML_DATA, "$prefix/share/htmldoc") -+AC_DEFINE_UNQUOTED(DOCUMENTATION, "$prefix/data/doc/htmldoc") -+AC_DEFINE_UNQUOTED(HTML_DATA, "$prefix/data/htmldoc") - - dnl Update compiler options... - if test -n "$GXX"; then -diff -urN htmldoc-1.8.27-orig/data/Makefile htmldoc-1.8.27/data/Makefile ---- htmldoc-1.8.27-orig/data/Makefile 2004-05-10 01:14:53.000000000 +0000 -+++ htmldoc-1.8.27/data/Makefile 2011-05-23 09:03:53.007602176 +0000 -@@ -53,11 +53,11 @@ - # - - install: -- if [ ! -d $(datadir)/htmldoc/data ]; then\ -- $(MKDIR) $(datadir)/htmldoc/data;\ -+ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\ -+ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\ - fi -- $(CP) $(FILES) $(datadir)/htmldoc/data -- $(CHMOD) ugo+r $(datadir)/htmldoc/data/* -+ $(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data -+ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/* - - - # -diff -urN htmldoc-1.8.27-orig/doc/Makefile htmldoc-1.8.27/doc/Makefile ---- htmldoc-1.8.27-orig/doc/Makefile 2005-10-28 20:32:59.000000000 +0000 -+++ htmldoc-1.8.27/doc/Makefile 2011-05-23 09:03:57.148897792 +0000 -@@ -57,16 +57,16 @@ - # - - install: $(DOCUMENTS) -- if [ ! -d $(datadir)/doc/htmldoc ]; then\ -- $(MKDIR) $(datadir)/doc/htmldoc;\ -+ if [ ! -d $(DESTDIR)$(mandir)/doc/htmldoc ]; then\ -+ $(MKDIR) $(DESTDIR)$(mandir)/doc/htmldoc;\ - fi -- $(CP) $(DOCFILES) $(datadir)/doc/htmldoc -- $(CHMOD) ugo+r $(datadir)/doc/htmldoc/* -- if [ ! -d $(mandir)/man1 ]; then\ -- $(MKDIR) $(mandir)/man1;\ -+ $(CP) $(DOCFILES) $(DESTDIR)/$(mandir)/doc/htmldoc -+ $(CHMOD) ugo+r $(DESTDIR)/$(mandir)/doc/htmldoc/* -+ if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then\ -+ $(MKDIR) $(DESTDIR)/$(mandir)/man1;\ - fi -- $(CP) htmldoc.man $(mandir)/man1/htmldoc.1 -- $(CHMOD) ugo+r $(mandir)/man1/htmldoc.1 -+ $(CP) htmldoc.man $(DESTDIR)/$(mandir)/man1/htmldoc.1 -+ $(CHMOD) ugo+r $(DESTDIR)/$(mandir)/man1/htmldoc.1 - - - # -diff -urN htmldoc-1.8.27-orig/fonts/Makefile htmldoc-1.8.27/fonts/Makefile ---- htmldoc-1.8.27-orig/fonts/Makefile 2005-10-28 20:32:59.000000000 +0000 -+++ htmldoc-1.8.27/fonts/Makefile 2011-05-23 09:04:00.721682432 +0000 -@@ -75,14 +75,14 @@ - - install: - echo "Installing font files in $(datadir)/htmldoc/fonts..." -- if [ ! -d $(datadir)/htmldoc/fonts ]; then\ -- $(MKDIR) $(datadir)/htmldoc/fonts;\ -+ if [ ! -d $(DESTDIR)/$(datadir)/htmldoc/fonts ]; then\ -+ $(MKDIR) $(DESTDIR)/$(datadir)/htmldoc/fonts;\ - fi - for font in $(FONTS); do \ -- $(CP) $$font.afm $(datadir)/htmldoc/fonts; \ -- $(CP) $$font.pfa $(datadir)/htmldoc/fonts; \ -+ $(CP) $$font.afm $(DESTDIR)/$(datadir)/htmldoc/fonts; \ -+ $(CP) $$font.pfa $(DESTDIR)/$(datadir)/htmldoc/fonts; \ - done -- $(CHMOD) ugo+r $(datadir)/htmldoc/fonts/* -+ $(CHMOD) ugo+r $(DESTDIR)/$(datadir)/htmldoc/fonts/* - - - # -diff -urN htmldoc-1.8.27-orig/htmldoc/Makefile htmldoc-1.8.27/htmldoc/Makefile ---- htmldoc-1.8.27-orig/htmldoc/Makefile 2005-10-28 20:32:59.000000000 +0000 -+++ htmldoc-1.8.27/htmldoc/Makefile 2011-05-23 09:04:04.563609600 +0000 -@@ -50,11 +50,11 @@ - # - - install: all -- if [ ! -d $(bindir) ]; then\ -- $(MKDIR) $(bindir);\ -+ if [ ! -d $(DESTDIR)/$(bindir) ]; then\ -+ $(MKDIR) $(DESTDIR)/$(bindir);\ - fi -- cp htmldoc$(EXEEXT) $(bindir) -- chmod ugo+rx $(bindir)/htmldoc$(EXEEXT) -+ cp htmldoc$(EXEEXT) $(DESTDIR)/$(bindir) -+ chmod ugo+rx $(DESTDIR)/$(bindir)/htmldoc$(EXEEXT) - - - # -diff -urN htmldoc-1.8.27-orig/htmldoc/http.h htmldoc-1.8.27/htmldoc/http.h ---- htmldoc-1.8.27-orig/htmldoc/http.h 2006-04-03 15:41:08.000000000 +0000 -+++ htmldoc-1.8.27/htmldoc/http.h 2011-05-23 09:04:08.438304768 +0000 -@@ -102,6 +102,8 @@ - # define s6_addr32 _S6_un._S6_u32 - # elif defined(__FreeBSD__) || defined(__APPLE__) - # define s6_addr32 __u6_addr.__u6_addr32 -+# elif defined(__HAIKU__) -+# define s6_addr32 s6_addr - # elif defined(__osf__) - # define s6_addr32 s6_un.sa6_laddr - # elif defined(WIN32) diff --git a/app-text/htmldoc/patches/htmldoc-1.8.27.patchset b/app-text/htmldoc/patches/htmldoc-1.8.27.patchset new file mode 100644 index 000000000..750c0a19a --- /dev/null +++ b/app-text/htmldoc/patches/htmldoc-1.8.27.patchset @@ -0,0 +1,273 @@ +From 71b6617cdb5042458030b3aec5bfce81273e6de0 Mon Sep 17 00:00:00 2001 +From: Scott McCreary +Date: Mon May 23 16:13:13 2011 +0000 +Subject: Fixed directories for htmldoc. + + +diff --git a/configure.in b/configure.in +index 640f8ac..5ef51a8 100644 +--- a/configure.in ++++ b/configure.in +@@ -109,7 +109,7 @@ LDFLAGS="${LDFLAGS:=}" + AC_SUBST(LDFLAGS) + + AC_CHECK_LIB(m,pow) +-AC_SEARCH_LIBS(socket, socket) ++AC_SEARCH_LIBS(socket, network socket) + AC_SEARCH_LIBS(gethostbyaddr, nsl) + AC_SEARCH_LIBS(getaddrinfo, nsl, AC_DEFINE(HAVE_GETADDRINFO)) + AC_SEARCH_LIBS(getnameinfo, nsl, AC_DEFINE(HAVE_GETNAMEINFO)) +@@ -316,8 +316,8 @@ if test "$bindir" = "\${exec_prefix}/bin"; then + bindir="$exec_prefix/bin" + fi + +-AC_DEFINE_UNQUOTED(DOCUMENTATION, "$prefix/share/doc/htmldoc") +-AC_DEFINE_UNQUOTED(HTML_DATA, "$prefix/share/htmldoc") ++AC_DEFINE_UNQUOTED(DOCUMENTATION, "$prefix/data/doc/htmldoc") ++AC_DEFINE_UNQUOTED(HTML_DATA, "$prefix/data/htmldoc") + + dnl Update compiler options... + if test -n "$GXX"; then +diff --git a/data/Makefile b/data/Makefile +index ee9b7de..f416fad 100644 +--- a/data/Makefile ++++ b/data/Makefile +@@ -53,11 +53,11 @@ all: + # + + install: +- if [ ! -d $(datadir)/htmldoc/data ]; then\ +- $(MKDIR) $(datadir)/htmldoc/data;\ ++ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\ ++ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\ + fi +- $(CP) $(FILES) $(datadir)/htmldoc/data +- $(CHMOD) ugo+r $(datadir)/htmldoc/data/* ++ $(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data ++ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/* + + + # +diff --git a/doc/Makefile b/doc/Makefile +index 87292f6..666c80d 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -57,16 +57,16 @@ all: $(DOCUMENTS) + # + + install: $(DOCUMENTS) +- if [ ! -d $(datadir)/doc/htmldoc ]; then\ +- $(MKDIR) $(datadir)/doc/htmldoc;\ ++ if [ ! -d $(DESTDIR)$(mandir)/doc/htmldoc ]; then\ ++ $(MKDIR) $(DESTDIR)$(mandir)/doc/htmldoc;\ + fi +- $(CP) $(DOCFILES) $(datadir)/doc/htmldoc +- $(CHMOD) ugo+r $(datadir)/doc/htmldoc/* +- if [ ! -d $(mandir)/man1 ]; then\ +- $(MKDIR) $(mandir)/man1;\ ++ $(CP) $(DOCFILES) $(DESTDIR)/$(mandir)/doc/htmldoc ++ $(CHMOD) ugo+r $(DESTDIR)/$(mandir)/doc/htmldoc/* ++ if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then\ ++ $(MKDIR) $(DESTDIR)/$(mandir)/man1;\ + fi +- $(CP) htmldoc.man $(mandir)/man1/htmldoc.1 +- $(CHMOD) ugo+r $(mandir)/man1/htmldoc.1 ++ $(CP) htmldoc.man $(DESTDIR)/$(mandir)/man1/htmldoc.1 ++ $(CHMOD) ugo+r $(DESTDIR)/$(mandir)/man1/htmldoc.1 + + + # +diff --git a/fonts/Makefile b/fonts/Makefile +index 3afefa3..a0a396a 100644 +--- a/fonts/Makefile ++++ b/fonts/Makefile +@@ -75,14 +75,14 @@ all: + + install: + echo "Installing font files in $(datadir)/htmldoc/fonts..." +- if [ ! -d $(datadir)/htmldoc/fonts ]; then\ +- $(MKDIR) $(datadir)/htmldoc/fonts;\ ++ if [ ! -d $(DESTDIR)/$(datadir)/htmldoc/fonts ]; then\ ++ $(MKDIR) $(DESTDIR)/$(datadir)/htmldoc/fonts;\ + fi + for font in $(FONTS); do \ +- $(CP) $$font.afm $(datadir)/htmldoc/fonts; \ +- $(CP) $$font.pfa $(datadir)/htmldoc/fonts; \ ++ $(CP) $$font.afm $(DESTDIR)/$(datadir)/htmldoc/fonts; \ ++ $(CP) $$font.pfa $(DESTDIR)/$(datadir)/htmldoc/fonts; \ + done +- $(CHMOD) ugo+r $(datadir)/htmldoc/fonts/* ++ $(CHMOD) ugo+r $(DESTDIR)/$(datadir)/htmldoc/fonts/* + + + # +diff --git a/htmldoc/Makefile b/htmldoc/Makefile +index 9ebc412..c17b6d0 100644 +--- a/htmldoc/Makefile ++++ b/htmldoc/Makefile +@@ -50,11 +50,11 @@ all: htmldoc$(EXEEXT) + # + + install: all +- if [ ! -d $(bindir) ]; then\ +- $(MKDIR) $(bindir);\ ++ if [ ! -d $(DESTDIR)/$(bindir) ]; then\ ++ $(MKDIR) $(DESTDIR)/$(bindir);\ + fi +- cp htmldoc$(EXEEXT) $(bindir) +- chmod ugo+rx $(bindir)/htmldoc$(EXEEXT) ++ cp htmldoc$(EXEEXT) $(DESTDIR)/$(bindir) ++ chmod ugo+rx $(DESTDIR)/$(bindir)/htmldoc$(EXEEXT) + + + # +diff --git a/htmldoc/http.h b/htmldoc/http.h +index 4012f92..b3b9b09 100644 +--- a/htmldoc/http.h ++++ b/htmldoc/http.h +@@ -102,6 +102,8 @@ extern "C" { + # define s6_addr32 _S6_un._S6_u32 + # elif defined(__FreeBSD__) || defined(__APPLE__) + # define s6_addr32 __u6_addr.__u6_addr32 ++# elif defined(__HAIKU__) ++# define s6_addr32 s6_addr + # elif defined(__osf__) + # define s6_addr32 s6_un.sa6_laddr + # elif defined(WIN32) +-- +1.7.5 + + +From 33b0369d77315b32c03d311112add0df8eb63fad Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sun, 16 Jun 2013 02:59:17 +0200 +Subject: image.cxx: libpng 1.5 fixes + + +diff --git a/htmldoc/image.cxx b/htmldoc/image.cxx +index 574ff7c..9a35db2 100644 +--- a/htmldoc/image.cxx ++++ b/htmldoc/image.cxx +@@ -55,6 +55,7 @@ extern "C" { /* Workaround for JPEG header problems... */ + #include /* JPEG/JFIF image definitions */ + } + ++#define PNG_SETJMP_SUPPORTED + #include /* Portable Network Graphics (PNG) definitions */ + + +@@ -1472,6 +1473,9 @@ image_load_png(image_t *img, /* I - Image pointer */ + png_bytep *rows; /* PNG row pointers */ + uchar *inptr, /* Input pixels */ + *outptr; /* Output pixels */ ++ png_bytep trans_alpha; ++ png_color_16p trans_color; ++ int num_trans = 0; + + + /* +@@ -1499,7 +1503,7 @@ image_load_png(image_t *img, /* I - Image pointer */ + + rows = NULL; + +- if (setjmp(pp->jmpbuf)) ++ if (setjmp(png_jmpbuf(pp))) + { + progress_error(HD_ERROR_BAD_FORMAT, "PNG file contains errors!"); + +@@ -1526,7 +1530,7 @@ image_load_png(image_t *img, /* I - Image pointer */ + + png_read_info(pp, info); + +- if (info->color_type & PNG_COLOR_MASK_PALETTE) ++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE) + { + png_set_expand(pp); + +@@ -1535,15 +1539,15 @@ image_load_png(image_t *img, /* I - Image pointer */ + if (Encryption) + img->use ++; + } +- else if (info->bit_depth < 8) ++ else if (png_get_bit_depth(pp, info) < 8) + { + png_set_packing(pp); + png_set_expand(pp); + } +- else if (info->bit_depth == 16) ++ else if (png_get_bit_depth(pp, info) == 16) + png_set_strip_16(pp); + +- if (info->color_type & PNG_COLOR_MASK_COLOR) ++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR) + { + depth = 3; + img->depth = gray ? 1 : 3; +@@ -1554,10 +1558,12 @@ image_load_png(image_t *img, /* I - Image pointer */ + img->depth = 1; + } + +- img->width = info->width; +- img->height = info->height; ++ img->width = png_get_image_width(pp, info); ++ img->height = png_get_image_height(pp, info); + +- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans) ++ png_get_tRNS(pp, info, &trans_alpha, &num_trans, &trans_color); ++ ++ if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans) + { + if ((PSLevel == 0 && PDFVersion >= 14) || PSLevel == 3) + image_need_mask(img, 8); +@@ -1571,14 +1577,14 @@ image_load_png(image_t *img, /* I - Image pointer */ + + #ifdef DEBUG + printf("color_type=0x%04x, depth=%d, img->width=%d, img->height=%d, img->depth=%d\n", +- info->color_type, depth, img->width, img->height, img->depth); +- if (info->color_type & PNG_COLOR_MASK_COLOR) ++ png_get_color_type(pp, info), depth, img->width, img->height, img->depth); ++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR) + puts(" COLOR"); + else + puts(" GRAYSCALE"); +- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans) ++ if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans) + puts(" ALPHA"); +- if (info->color_type & PNG_COLOR_MASK_PALETTE) ++ if (png_get_color_type(pp, info) & PNG_COLOR_MASK_PALETTE) + puts(" PALETTE"); + #endif // DEBUG + +@@ -1594,9 +1600,9 @@ image_load_png(image_t *img, /* I - Image pointer */ + * Allocate pointers... + */ + +- rows = (png_bytep *)calloc(info->height, sizeof(png_bytep)); ++ rows = (png_bytep *)calloc(img->height, sizeof(png_bytep)); + +- for (i = 0; i < (int)info->height; i ++) ++ for (i = 0; i < (int)img->height; i ++) + rows[i] = img->pixels + i * img->width * depth; + + /* +@@ -1610,7 +1616,7 @@ image_load_png(image_t *img, /* I - Image pointer */ + * Generate the alpha mask as necessary... + */ + +- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans) ++ if ((png_get_color_type(pp, info) & PNG_COLOR_MASK_ALPHA) || num_trans) + { + #ifdef DEBUG + for (inptr = img->pixels, i = 0; i < img->height; i ++) +@@ -1639,7 +1645,7 @@ image_load_png(image_t *img, /* I - Image pointer */ + * Reformat the data as necessary for the reader... + */ + +- if (gray && info->color_type & PNG_COLOR_MASK_COLOR) ++ if (gray && png_get_color_type(pp, info) & PNG_COLOR_MASK_COLOR) + { + /* + * Greyscale output needed... +-- +1.7.5 + From a2faa8434652c769b1ba402eefd1e298dc2476d1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 03:41:20 +0200 Subject: [PATCH 289/587] bepdf: update recipe * Rename version: 1.1.1~beta5_130428 -> 1.1.1~beta5_2013_04_28 * Add Deskbar symlink for BePDF. --- ...pe => bepdf-1.1.1~beta5_2013_04_28.recipe} | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) rename haiku-apps/bepdf/{bepdf-1.1.1~beta5_130428.recipe => bepdf-1.1.1~beta5_2013_04_28.recipe} (74%) diff --git a/haiku-apps/bepdf/bepdf-1.1.1~beta5_130428.recipe b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe similarity index 74% rename from haiku-apps/bepdf/bepdf-1.1.1~beta5_130428.recipe rename to haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe index 126e0ee06..370153481 100644 --- a/haiku-apps/bepdf/bepdf-1.1.1~beta5_130428.recipe +++ b/haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe @@ -8,7 +8,8 @@ DESCRIPTION=" " HOMEPAGE="http://bepdf.sourceforge.net/" SRC_URI="cvs://:pserver:anonymous@bepdf.cvs.sourceforge.net:/cvsroot/bepdf/BePDF#04/28/13" -COPYRIGHT="1997 Benoit Triquet +COPYRIGHT=" + 1997 Benoit Triquet 1999-2000 Hubert Figuiere 2000-2010 Michael Pfeiffer" LICENSE="GNU GPL v2" @@ -19,7 +20,6 @@ PROVIDES=" bepdf = $portVersion cmd:BePDF = $portVersion " - REQUIRES=" haiku >= $haikuVersion " @@ -38,7 +38,8 @@ SOURCE_DIR="$portVersionedName" BUILD() { - if [ $architecture == 'x86_gcc2' ]; then +exit 0 + if [ $targetArchitecture == 'x86_gcc2' ]; then export BEPDF_BUILD_GCC=gcc2 else export BEPDF_BUILD_GCC=gcc4 @@ -49,10 +50,13 @@ BUILD() INSTALL() { - if [ $architecture == 'x86_gcc2' ]; then - architecture='x86' + bepdfArch=$targetArchitecture + if [ $bepdfArch == 'x86_gcc2' ]; then + bepdfArch='x86' fi - mkdir -p $prefix/apps - rm -f generated/$architecture/*Deskbar - cp -dR generated/$architecture $prefix/apps/BePDF + mkdir -p $appsDir + rm -f generated/$bepdfArch/*Deskbar + cp -dR generated/$bepdfArch $appsDir/BePDF + + addAppDeskbarSymlink $appsDir/BePDF/BePDF } From 03a7755fb1846fadcb54ab2d730fc18b1fd2ba44 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 16 Jun 2013 19:29:07 +0200 Subject: [PATCH 290/587] Adjust recipes for binutils and gcc to changes in HaikuPorter --- sys-devel/binutils/binutils-2.17_130421.recipe | 2 +- sys-devel/gcc/gcc-2.95.3_130425.recipe | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-devel/binutils/binutils-2.17_130421.recipe b/sys-devel/binutils/binutils-2.17_130421.recipe index 46eddae6e..faf2d48f6 100644 --- a/sys-devel/binutils/binutils-2.17_130421.recipe +++ b/sys-devel/binutils/binutils-2.17_130421.recipe @@ -50,7 +50,7 @@ SOURCE_DIR="$portVersionedName" SOURCE_EXPORT_SUBDIR="legacy/binutils" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL -binutilsDir=$(pwd)/legacy/binutils +binutilsDir=$(pwd) relativeArchInstallDir="develop/tools/${portVersionedName}" archInstallDir="$prefix/$relativeArchInstallDir" binutilsObjectsDir=$binutilsDir/../binutils-obj diff --git a/sys-devel/gcc/gcc-2.95.3_130425.recipe b/sys-devel/gcc/gcc-2.95.3_130425.recipe index fa559fb61..6d9064cca 100644 --- a/sys-devel/gcc/gcc-2.95.3_130425.recipe +++ b/sys-devel/gcc/gcc-2.95.3_130425.recipe @@ -7,7 +7,7 @@ LICENSE=" " COPYRIGHT="1988-2000 Free Software Foundation, Inc." SRC_URI=" - git+file://$portBaseDir/../binutils/work-2.17_130421/sources/binutils-2.17_130421#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045 + git+file://$portBaseDir/../binutils/work-2.17_130421/download/BuildtoolsPM.git#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045 git+git://github.com/haiku/BuildtoolsPM.git#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045 " REVISION="2" @@ -48,7 +48,7 @@ SOURCE_DIR="$portVersionedName" SOURCE_EXPORT_SUBDIR="legacy/gcc" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL -gccDir=$(pwd)/legacy/gcc +gccDir=$(pwd) gccDate=$(echo $portVersion | sed 's,.*_,,') relativeGccInstallDir="develop/tools/gcc-2.95.3_${gccDate}" gccInstallDir="$prefix/$relativeGccInstallDir" From c0d0a3490f78b32f20a627ecbd93d86d4a7a2140 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 17 Jun 2013 00:08:49 +0200 Subject: [PATCH 291/587] Adjust recipe for be-book to changes in HaikuPorter --- haiku-data/be_book/be_book-2008_10_26.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/haiku-data/be_book/be_book-2008_10_26.recipe b/haiku-data/be_book/be_book-2008_10_26.recipe index 326fd46ae..8dbf954b8 100644 --- a/haiku-data/be_book/be_book-2008_10_26.recipe +++ b/haiku-data/be_book/be_book-2008_10_26.recipe @@ -16,8 +16,10 @@ BUILD_REQUIRES=" coreutils " +SOURCE_DIR='bebook' + INSTALL() { mkdir -p $documentationDir - cp -dR bebook $documentationDir/BeBook + cp -dR $sourceDir $documentationDir/BeBook } From 0759462b73f4c92fc76e57bb43e27ef95d786ab6 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 19:12:10 +0200 Subject: [PATCH 292/587] bzip2: build separate devel package --- 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 849530802..bb657a062 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="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -27,7 +27,6 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES cmd:ar cmd:gcc cmd:ld @@ -67,4 +66,18 @@ INSTALL() # prepare development lib links prepareInstalledDevelLibs libbz2 + + # devel package + packageEntries devel \ + $developDir } + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + bzip2_devel = $portVersion compat >= 1 + devel:libbz2 = $portVersion compat >= 1.0 + " +REQUIRES_devel=" + bzip2 == $portVersion base + " From 20220e20964e1b675cd73c26d523b7bc2309cb1e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 19:18:38 +0200 Subject: [PATCH 293/587] ca_root_certificates: rename version: 121229 -> 2012_12_29 --- ...ates-121229.recipe => ca_root_certificates-2012_12_29.recipe} | 1 + 1 file changed, 1 insertion(+) rename haiku-data/ca_root_certificates/{ca_root_certificates-121229.recipe => ca_root_certificates-2012_12_29.recipe} (97%) diff --git a/haiku-data/ca_root_certificates/ca_root_certificates-121229.recipe b/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe similarity index 97% rename from haiku-data/ca_root_certificates/ca_root_certificates-121229.recipe rename to haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe index 6354c84a4..c61aa3988 100644 --- a/haiku-data/ca_root_certificates/ca_root_certificates-121229.recipe +++ b/haiku-data/ca_root_certificates/ca_root_certificates-2012_12_29.recipe @@ -11,6 +11,7 @@ SRC_URI="http://haiku-files.org/files/data/cacert_121229.pem#noarchive" CHECKSUM_MD5="47961e7ef15667c93cd99be01b51f00a" REVISION="1" ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes PROVIDES=" ca_root_certificates = $portVersion From 86c07a480b06456cdff5cea6646f255a559e21e8 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 21:10:49 +0200 Subject: [PATCH 294/587] cdrtools: update recipe * Declare global settings files. * PROVIDES_devel: Use "devel:..." instead of "lib:..." for the static libraries. --- app-cdr/cdrtools/cdrtools-3.01~a07.recipe | 37 ++++++++++++----------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe index a4c00ceaa..ab8a61586 100644 --- a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe +++ b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe @@ -24,7 +24,7 @@ LICENSE=" " SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a07.tar.bz2" CHECKSUM_MD5="266bae8db7d1e5473555b48c306aa216" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PATCHES='cdrtools-3.01~a07.patch' @@ -52,7 +52,6 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES cmd:gcc cmd:ld cmd:make @@ -62,6 +61,11 @@ BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion " +GLOBAL_WRITABLE_FILES=" + settings/cdrecord keep-old + settings/rscsi keep-old + " + SOURCE_DIR="cdrtools-3.01" patchInsdir() @@ -131,23 +135,22 @@ INSTALL() # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The development files for the cdrtools" PROVIDES_devel=" cdrtools_devel = $portVersion - lib:libcdrdeflt = $portVersion compat >= 3 - lib:libedc_ecc = $portVersion compat >= 3 - lib:libedc_ecc_dec = $portVersion compat >= 3 - lib:libdeflt = $portVersion compat >= 3 - lib:libfile = $portVersion compat >= 3 - lib:libfind = $portVersion compat >= 3 - lib:libhfs = $portVersion compat >= 3 - lib:libmdigest = $portVersion compat >= 3 - lib:libparanoia = $portVersion compat >= 3 - lib:librscg = $portVersion compat >= 3 - lib:libscg = $portVersion compat >= 3 - lib:libsiconv = $portVersion compat >= 3 - lib:libscgcmd = $portVersion compat >= 3 - lib:libschily = $portVersion compat >= 3 + devel:libcdrdeflt = $portVersion compat >= 3 + devel:libedc_ecc = $portVersion compat >= 3 + devel:libedc_ecc_dec = $portVersion compat >= 3 + devel:libdeflt = $portVersion compat >= 3 + devel:libfile = $portVersion compat >= 3 + devel:libfind = $portVersion compat >= 3 + devel:libhfs = $portVersion compat >= 3 + devel:libmdigest = $portVersion compat >= 3 + devel:libparanoia = $portVersion compat >= 3 + devel:librscg = $portVersion compat >= 3 + devel:libscg = $portVersion compat >= 3 + devel:libsiconv = $portVersion compat >= 3 + devel:libscgcmd = $portVersion compat >= 3 + devel:libschily = $portVersion compat >= 3 " REQUIRES_devel=" cdrtools == $portVersion From 92911986337581c5804f0730511833a8773023ac Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 21:45:59 +0200 Subject: [PATCH 295/587] ctags: bump revision --- dev-util/ctags/ctags-5.8.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe index 37a000d72..2713f599f 100644 --- a/dev-util/ctags/ctags-5.8.recipe +++ b/dev-util/ctags/ctags-5.8.recipe @@ -5,7 +5,7 @@ COPYRIGHT="1996-2009, Darren Hiebert" LICENSE="GNU GPL v2" SRC_URI="http://prdownloads.sourceforge.net/ctags/ctags-5.8.tar.gz" CHECKSUM_MD5="c00f82ecdcc357434731913e5b48630d" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -16,7 +16,6 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES cmd:gcc cmd:ld cmd:make From 0dd756390e4ce4048abe1aa64a68773e0c3713ee Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 21:48:23 +0200 Subject: [PATCH 296/587] cmake: bump revision --- dev-util/cmake/cmake-2.8.5.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe index 3ae91f976..f3f111386 100644 --- a/dev-util/cmake/cmake-2.8.5.recipe +++ b/dev-util/cmake/cmake-2.8.5.recipe @@ -5,7 +5,7 @@ LICENSE="CMake" COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz" CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="cmake-2.8.5.patch" @@ -46,4 +46,3 @@ INSTALL() { make install } - From 132645d25ef581177193c02e5e1313e0453435bc Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 22:03:07 +0200 Subject: [PATCH 297/587] curl: update recipe * Add PATCHES. * Change lib:libcurl version to match soname. * Declare [BUILD_]REQUIRES more correctly. * Build a separate curl_devel package. --- net-misc/curl/curl-7.26.0.recipe | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/net-misc/curl/curl-7.26.0.recipe b/net-misc/curl/curl-7.26.0.recipe index eb16c9e90..f4b439e7e 100644 --- a/net-misc/curl/curl-7.26.0.recipe +++ b/net-misc/curl/curl-7.26.0.recipe @@ -4,29 +4,30 @@ COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." LICENSE="Curl" SRC_URI="http://curl.haxx.se/download/curl-7.26.0.tar.bz2" CHECKSUM_MD5="bfa80f01b3d300359cfb4d409b6136a3" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" -# libcurl's SONAME is bumped whenever backward compat is broken, v7.16 -# introduced SO-version 4, which is still current +PATCHES="curl-7.26.0.patch" + PROVIDES=" curl = $portVersion cmd:curl = $portVersion compat >= 7.16 - cmd:curl_config = $portVersion compat >= 7.16 - lib:libcurl = $portVersion compat >= 7.16 + lib:libcurl = 4.2.0 compat >= 4 " REQUIRES=" haiku >= $haikuVersion ca_root_certificates lib:libssl + lib:libz " BUILD_REQUIRES=" - $REQUIRES cmd:autoconf cmd:gcc cmd:ld cmd:libtoolize cmd:make + devel:libssl + devel:libz " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -69,6 +70,12 @@ INSTALL() for h in docs/libcurl/*.html; do install -c -m 644 "$h" "$developDocDir" done + + # devel package + packageEntries devel \ + $binDir/curl-config \ + $developDir \ + $manDir/man3 } TEST() @@ -85,3 +92,14 @@ DESCRIPTION=" (Basic, Digest, NTLM, Negotiate, kerberos...), file transfer resume, proxy tunneling and a busload of other useful tricks. " + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + curl_devel = $portVersion + cmd:curl_config = $portVersion compat >= 7.16 + devel:libcurl = 4.2.0 compat >= 4 + " +REQUIRES_devel=" + curl == $portVersion base + " From d4accb202446b050eed447019cc5d91884c8dbfa Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 22:15:17 +0200 Subject: [PATCH 298/587] cvs: update [BUILD_]REQUIRES * REQUIRES: - haiku_devel -> haiku - zlib -> lib:libz * BUILD_REQUIRES: - Remove $REQUIRES. - Add devel:libz. --- dev-vcs/cvs/cvs-1.12.13.1.recipe | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe index 6c36b0d41..cc339f193 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.recipe +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -17,7 +17,7 @@ LICENSE="GNU GPL v1 GNU LGPL v2" SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2" CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="cvs-1.12.13.1.patch" @@ -29,12 +29,13 @@ PROVIDES=" cmd:rcs2log = $portVersion compat >= 1.12 " REQUIRES=" - haiku_devel >= $haikuVersion + haiku >= $haikuVersion cmd:nano - zlib >= 1.1.4 + lib:libz " BUILD_REQUIRES=" - $REQUIRES + cmd:nano + devel:libz >= 1.1.4 " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion From 163d081c4d952e5a3077193beecb3797f158abf4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 22:19:05 +0200 Subject: [PATCH 299/587] doxygen: update recipe * Remove libiconv from BUILD_PREREQUIRES. Add lib:libiconv to REQUIRES and devel:libiconv to BUILD_REQUIRES instead. * REQUIRES: haiku_devel -> haiku --- app-doc/doxygen/doxygen-1.6.3.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe index 765c5d7a4..04fecbb0f 100644 --- a/app-doc/doxygen/doxygen-1.6.3.recipe +++ b/app-doc/doxygen/doxygen-1.6.3.recipe @@ -11,7 +11,7 @@ COPYRIGHT="1997-2010 Dimitri van Heesch" LICENSE="GNU GPL v2" SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz" CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="doxygen-1.6.3.patch" @@ -22,14 +22,14 @@ PROVIDES=" cmd:doxytag = $portVersion compat >= 1.6 " REQUIRES=" - haiku_devel >= $haikuVersion + haiku >= $haikuVersion + lib:libiconv " BUILD_REQUIRES=" - $REQUIRES + devel:libiconv " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion - libiconv cmd:bison cmd:flex cmd:gcc From 04fbe4257289cb713987c7155b5d8b53f018675f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 22:29:35 +0200 Subject: [PATCH 300/587] groff: make use of runConfigure, jobArgs --- sys-apps/groff/groff-1.20.1.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe index 345512d71..9a3d19e7b 100644 --- a/sys-apps/groff/groff-1.20.1.recipe +++ b/sys-apps/groff/groff-1.20.1.recipe @@ -5,7 +5,7 @@ SRC_URI="http://ftp.gnu.org/gnu/groff/groff-1.20.1.tar.gz" CHECKSUM_MD5="48fa768dd6fdeb7968041dd5ae8e2b02" LICENSE="GNU GPL v3" COPYRIGHT="2003-2009 Free Software Foundation, Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -77,8 +77,8 @@ BUILD() aclocal -I m4 autoconf sed -i s@docdir='$(datadir)/doc/groff/'@docdir=$docDir/@g Ma* - ./configure $configureDirArgs - make + runConfigure ./configure + make $jobArgs } INSTALL() From 8c77ae3e2ee6245a81b12c283130898ff423ac08 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 22:36:27 +0200 Subject: [PATCH 301/587] man: update recipe * Add missing provides. * Add GLOBAL_WRITABLE_FILES. * Make use of jobArgs. --- sys-apps/man/man-1.6g.recipe | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe index 96f589644..242209a13 100644 --- a/sys-apps/man/man-1.6g.recipe +++ b/sys-apps/man/man-1.6g.recipe @@ -5,14 +5,21 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz" CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660" LICENSE="GNU GPL v2" COPYRIGHT="1989-2012 Free Software Foundation, Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="man-1.6g.patch" PROVIDES=" man = $portVersion compat >= 1.6 + cmd:apropos = $portVersion compat >= 1.6 + cmd:makewhatis = $portVersion compat >= 1.6 + cmd:man = $portVersion compat >= 1.6 + cmd:man2dvi = $portVersion compat >= 1.6 + cmd:man2html = $portVersion compat >= 1.6 + cmd:whatis = $portVersion compat >= 1.6 " + REQUIRES=" haiku >= $haikuVersion cmd:groff @@ -34,6 +41,10 @@ BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion " +GLOBAL_WRITABLE_FILES=" + settings/man.conf keep-old +" + SOURCE_DIR="$portVersionedName" BUILD() @@ -45,7 +56,8 @@ BUILD() -sbindir=$sbinDir \ -confdir=$sysconfDir \ -mandir=$manDir - make + # no autotools configure + make $jobArgs } INSTALL() From 51e144151a22ae7e40ffe78553985bdd68c2a366 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 22:52:46 +0200 Subject: [PATCH 302/587] nano: update recipe * Fix location of HTML documentation. * BUILD_REQUIRES: ncurses -> devel:libncurses * Use jobArgs. --- app-editors/nano/nano-2.2.6.recipe | 11 ++++++---- app-editors/nano/patches/nano-2.2.6.patchset | 22 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 app-editors/nano/patches/nano-2.2.6.patchset diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe index 74951a39e..e57222eb7 100644 --- a/app-editors/nano/nano-2.2.6.recipe +++ b/app-editors/nano/nano-2.2.6.recipe @@ -5,9 +5,11 @@ SRC_URI="http://www.nano-editor.org/dist/v2.2/nano-2.2.6.tar.gz" CHECKSUM_MD5="03233ae480689a008eb98feb1b599807" LICENSE="GNU GPL v3" COPYRIGHT="1999-2010 Free Software Foundation, Inc. " -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" +PATCHES="nano-2.2.6.patchset" + PROVIDES=" nano = $portVersion compat >= 2 cmd:nano = $portVersion compat >= 2 @@ -19,12 +21,13 @@ REQUIRES=" lib:libncurses " BUILD_REQUIRES=" + cmd:autoreconf cmd:gcc cmd:groff cmd:ld cmd:libtoolize cmd:make - ncurses + devel:libncurses " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -34,12 +37,12 @@ SOURCE_DIR="$portVersionedName" BUILD() { + autoreconf runConfigure ./configure - make + make $jobArgs } INSTALL() { make install } - diff --git a/app-editors/nano/patches/nano-2.2.6.patchset b/app-editors/nano/patches/nano-2.2.6.patchset new file mode 100644 index 000000000..eb3f5435b --- /dev/null +++ b/app-editors/nano/patches/nano-2.2.6.patchset @@ -0,0 +1,22 @@ +From 46be39445685504279a76f9eb09a961708d7e497 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sun, 16 Jun 2013 22:50:15 +0200 +Subject: doc/Makefile.am: use docdir instead of hard-coded path + + +diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am +index fbcdce8..2d7ad47 100644 +--- a/doc/man/Makefile.am ++++ b/doc/man/Makefile.am +@@ -19,7 +19,7 @@ endif + nano_man_mans = nano.1 nanorc.5 rnano.1 + if GROFF_HTML + htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html +-htmlmandir = $(datadir)/nano/man-html ++htmlmandir = $(docdir) + nano_built_sources = nano.1.html nanorc.5.html rnano.1.html + + nano.1.html: nano.1 +-- +1.7.5 + From 627c409c972520e5d81e902f49ae6f14f47456d7 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 23:12:59 +0200 Subject: [PATCH 303/587] readline: update recipe * [BUILD_]REQUIRES: ncurses -> lib:libncurses/devel:libncurses * Build separate devel package. --- sys-libs/readline/readline-6.2.recipe | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe index 5ace613c7..65bb97c6d 100644 --- a/sys-libs/readline/readline-6.2.recipe +++ b/sys-libs/readline/readline-6.2.recipe @@ -19,10 +19,10 @@ PROVIDES=" " REQUIRES=" haiku >= $haikuVersion - ncurses + lib:libncurses " BUILD_REQUIRES=" - $REQUIRES + devel:libncurses " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -52,5 +52,21 @@ INSTALL() prepareInstalledDevelLibs libhistory libreadline rmdir $binDir + + # devel package + packageEntries devel \ + $dataDir \ + $developDir \ + $documentationDir } +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + readline_devel = $portVersion + devel:libhistory = $portVersion compat >= 6 + devel:libreadline = $portVersion compat >= 6 + " +REQUIRES_devel=" + readline == $portVersion base + " From 501e998c3808d68018de5747c3b45bc4a41cff4a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 23:21:42 +0200 Subject: [PATCH 304/587] sqlite 3.7.13: update recipe * Use runConfigure, jobArgs. * Build separate devel package. --- dev-db/sqlite/sqlite-3.7.13.recipe | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dev-db/sqlite/sqlite-3.7.13.recipe b/dev-db/sqlite/sqlite-3.7.13.recipe index 2ff9b79dc..354bcdf4d 100644 --- a/dev-db/sqlite/sqlite-3.7.13.recipe +++ b/dev-db/sqlite/sqlite-3.7.13.recipe @@ -11,7 +11,7 @@ SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz" CHECKSUM_MD5="c97df403e8a3d5b67bb408fcd6aabd8e" LICENSE="SQLite" COPYRIGHT="Public Domain" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="sqlite-3.7.13.patch" @@ -45,8 +45,8 @@ BUILD() aclocal autoconf automake - ./configure $configureDirArgs - make + runConfigure ./configure + make $jobArgs } INSTALL() @@ -56,4 +56,18 @@ INSTALL() # prepare develop/lib prepareInstalledDevelLibs libsqlite3 fixPkgconfig + + # devel package + packageEntries devel \ + $developDir } + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + sqlite_devel = $portVersion + devel:libsqlite3 = 0.8.6 compat >= 0 + " +REQUIRES_devel=" + sqlite == $portVersion base + " From 61aeb1ca73e295e5c20b2ecb5bff169dd7eac6e6 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 23:39:14 +0200 Subject: [PATCH 305/587] freetype 2.4.9: declare base package correctly --- media-libs/freetype/freetype-2.4.9.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/freetype/freetype-2.4.9.recipe b/media-libs/freetype/freetype-2.4.9.recipe index 39f26330d..19fc8d608 100644 --- a/media-libs/freetype/freetype-2.4.9.recipe +++ b/media-libs/freetype/freetype-2.4.9.recipe @@ -5,7 +5,7 @@ LICENSE="FreeType" COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2" CHECKSUM_MD5="77a893dae81fd5b896632715ca041179" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -62,5 +62,5 @@ PROVIDES_devel=" devel:libfreetype = 6.8.1 compat >= 6 " REQUIRES_devel=" - freetype == $portVersion + freetype == $portVersion base " From 5bc49d0d80b06e3d7dd45b6d06c5510f12333524 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Jun 2013 23:41:00 +0200 Subject: [PATCH 306/587] python 2.6.8: update recipe * PROVIDES: Add devel:libpython2.6. * [BUILD_]REQUIRES: Use lib:*/devel:* where appropriate. --- dev-lang/python/python-2.6.8.recipe | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe index 90e42a3f0..f4e72ac9c 100644 --- a/dev-lang/python/python-2.6.8.recipe +++ b/dev-lang/python/python-2.6.8.recipe @@ -9,7 +9,7 @@ LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2" CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="python-2.6.8.patch" @@ -24,20 +24,27 @@ PROVIDES=" cmd:python2.6_config = $portVersion compat >= 2.6 cmd:python_config = $portVersion compat >= 2.6 cmd:smtpd.py = $portVersion compat >= 2.6 + devel:libpython2.6 = 1.0 lib:libpython2.6 = 1.0 " REQUIRES=" - haiku_devel >= $haikuVersion - bzip2 - ncurses - openssl - readline - sqlite - zlib + haiku >= $haikuVersion cmd:nano + lib:libbz2 + lib:libncurses + lib:libssl + lib:libreadline + lib:libsqlite3 + lib:libz " BUILD_REQUIRES=" - $REQUIRES + cmd:nano + devel:libbz2 + devel:libncurses + devel:libssl + devel:libreadline + devel:libsqlite3 + devel:libz " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion From 86eb2202a7d339c511ee210a299ef4c3ae964209 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 17 Jun 2013 01:34:18 +0200 Subject: [PATCH 307/587] libsolv: update to new version Fixes a version comparison issue. --- .../libsolv-0.3.0_haiku_2013_06_16.recipe | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe new file mode 100644 index 000000000..86ca41a69 --- /dev/null +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe @@ -0,0 +1,80 @@ +SUMMARY="Library for solving packages and reading repositories" +DESCRIPTION="Library for solving packages and reading repositories." +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2013, Novell Inc." +HOMEPAGE="http://github.com/openSUSE/libsolv" +SRC_URI="git+git://github.com/weinhold/libsolv.git#ef4a8778ef567224feb35019b711507ae1d6e7c3" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + libsolv = $portVersion + lib:libsolv = $portVersion + lib:libsolvext = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + lib:libexpat + lib:libz + " +BUILD_REQUIRES=" + devel:libexpat + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:cmake + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + rm -rf build + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix .. + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + # set up the develop directory correctly + prepareInstalledDevelLibs libsolv libsolvext + + mkdir -p $includeDir + mv $prefix/include/* $includeDir + rmdir $prefix/include + + # move cmake files + mkdir -p $dataDir + mv $prefix/share/cmake $dataDir + rmdir $prefix/share + + # We don't want the executables. + rm -r $prefix/bin + + # devel package + packageEntries devel \ + $dataDir \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The libsolv development files" +PROVIDES_devel=" + libsolv_devel = $portVersion + devel:libsolv = $portVersion + devel:libsolvext = $portVersion + " +REQUIRES_devel=" + libsolv == $portVersion base + " From 468f676a471f0426af1201deccb60dfbc28f463e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 17 Jun 2013 18:58:45 +0200 Subject: [PATCH 308/587] git 1.7.10.2: update [BUILD_]REQUIRES --- dev-vcs/git/git-1.7.10.2.recipe | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe index 67d4d5e54..80f222c05 100644 --- a/dev-vcs/git/git-1.7.10.2.recipe +++ b/dev-vcs/git/git-1.7.10.2.recipe @@ -62,44 +62,52 @@ PROVIDES_svn=" REQUIRES=" haiku >= $haikuVersion - curl - expat - man - openssl perl python - zlib + cmd:man cmd:nano + lib:libcurl + lib:libexpat + lib:libssl + lib:libz " REQUIRES_arch=" haiku >= $haikuVersion - git == $portVersion + git == $portVersion base " REQUIRES_cvs=" haiku >= $haikuVersion - git == $portVersion + git == $portVersion base " REQUIRES_daemon=" haiku >= $haikuVersion - git == $portVersion + git == $portVersion base " REQUIRES_email=" haiku >= $haikuVersion - git == $portVersion + git == $portVersion base " REQUIRES_svn=" haiku >= $haikuVersion - git == $portVersion + git == $portVersion base " BUILD_REQUIRES=" - $REQUIRES + perl + python cmd:gcc cmd:ld cmd:make + cmd:man + cmd:nano cmd:sed cmd:tar + devel:libcurl + devel:libexpat + devel:libssl + devel:libz " + BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion " From 927ca71d3dfdff7f65dbd8f18a36bd74873e08b3 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 17 Jun 2013 19:13:20 +0200 Subject: [PATCH 309/587] readline: forgot to bump revision --- sys-libs/readline/readline-6.2.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe index 65bb97c6d..ba26d751e 100644 --- a/sys-libs/readline/readline-6.2.recipe +++ b/sys-libs/readline/readline-6.2.recipe @@ -7,7 +7,7 @@ COPYRIGHT="1989-2011 Free Software Foundation, Inc." LICENSE="GNU GPL v3" SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz" CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="readline-6.2.patch" From c62fcf14f6c7537a2118ae91c1ef719b688952ba Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 17 Jun 2013 20:34:29 +0200 Subject: [PATCH 310/587] Add recipe for keymapswitcher 1.2.7.10 Mostly a copy of the 1.2.7.9 recipe, but with the TODOs addressed. Patching the makefile is still necessary. --- .../keymapswitcher-1.2.7.10.recipe | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe new file mode 100644 index 000000000..edb544b93 --- /dev/null +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe @@ -0,0 +1,53 @@ +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)." +HOMEPAGE="http://www.sf.net/projects/switcher" +COPYRIGHT="1999-2003 Stas Maximov" +LICENSE="BSD (4-clause)" +SRC_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher(haiku)#release_1_2_7_10" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + keymapswitcher = $portVersion compat >= 1.2.7 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:ld + cmd:make + cmd:mkdepend + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + makefile_engine + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + # Fix makefile not to use BUILDHOME as an install dir variable. + sed -i "s,BUILDHOME,HPKG_INSTALL_DIR,g" makefile +} + +BUILD() +{ + make $jobArgs BUILDHOME=/boot/common/develop HPKG_INSTALL_DIR=$prefix +} + +INSTALL() +{ + # We're not interested in the package, but that target copies the + # interesting files to a well-known directory structure. Otherwise we'd have + # to find out the name of the object dir and collect everything ourselves. + # Obviously an install target would be even better. + make BUILDHOME=/boot/common/develop HPKG_INSTALL_DIR=$prefix hpkg + + # move misplaced KeymapSwitcher + mkdir $preferencesDir + mv $binDir/KeymapSwitcher $preferencesDir + + addPreferencesDeskbarSymlink $preferencesDir/KeymapSwitcher +} From 4b2db2873f10bed126cfa61842ae71d366fd0eb0 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 17 Jun 2013 20:44:36 +0200 Subject: [PATCH 311/587] libedit: update recipe * Rename versions: 20120601_3.0 -> 2012_06_01_3.0 * Build separate devel package. --- ...0.recipe => libedit-2012_06_01_3.0.recipe} | 27 +++++++++++++++---- ...3.0.patch => libedit-2012_06_01_3.0.patch} | 0 2 files changed, 22 insertions(+), 5 deletions(-) rename dev-libs/libedit/{libedit-20120601_3.0.recipe => libedit-2012_06_01_3.0.recipe} (72%) rename dev-libs/libedit/patches/{libedit-20120601_3.0.patch => libedit-2012_06_01_3.0.patch} (100%) diff --git a/dev-libs/libedit/libedit-20120601_3.0.recipe b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe similarity index 72% rename from dev-libs/libedit/libedit-20120601_3.0.recipe rename to dev-libs/libedit/libedit-2012_06_01_3.0.recipe index 3afddae89..e50e53562 100644 --- a/dev-libs/libedit/libedit-20120601_3.0.recipe +++ b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe @@ -5,10 +5,10 @@ COPYRIGHT="1992-2012 The NetBSD Foundation, Inc." HOMEPAGE="http://www.thrysoee.dk/editline/" SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz" CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea" -REVISION="2" +REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" -PATCHES="libedit-20120601_3.0.patch" +PATCHES="libedit-2012_06_01_3.0.patch" PROVIDES=" libedit = $portVersion @@ -16,10 +16,9 @@ PROVIDES=" " REQUIRES=" haiku >= $haikuVersion - ncurses + lib:libncurses " BUILD_REQUIRES=" - $REQUIRES cmd:aclocal cmd:autoreconf cmd:gcc @@ -27,6 +26,7 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make cmd:sed + devel:libncurses " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -38,12 +38,29 @@ BUILD() { autoreconf --force --install runConfigure ./configure - make + make $jobArgs } INSTALL() { make install + prepareInstalledDevelLibs libedit fixPkgconfig + + # devel package + packageEntries devel \ + $developDir \ + $manDir/man3 } + + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libedit_devel = $portVersion + devel:libedit = 0.0.41 compat >= 0 + " +REQUIRES_devel=" + libedit == $portVersion base + " diff --git a/dev-libs/libedit/patches/libedit-20120601_3.0.patch b/dev-libs/libedit/patches/libedit-2012_06_01_3.0.patch similarity index 100% rename from dev-libs/libedit/patches/libedit-20120601_3.0.patch rename to dev-libs/libedit/patches/libedit-2012_06_01_3.0.patch From 4bb41e62261e4875c82317be5489b10794f442fc Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 17 Jun 2013 20:52:44 +0200 Subject: [PATCH 312/587] libpcre: update recipe * Fix library versions. * Use runConfigure. * Build separate devel package. --- dev-libs/libpcre/libpcre-8.21.recipe | 30 ++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe index 94ffd25c4..23c99baa0 100644 --- a/dev-libs/libpcre/libpcre-8.21.recipe +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -15,17 +15,16 @@ COPYRIGHT=" " SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2" CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" libpcre = $portVersion - cmd:pcre_config = $portVersion compat >= 8 cmd:pcregrep = $portVersion compat >= 8 cmd:pcretest = $portVersion compat >= 8 - lib:libpcre = $portVersion compat >= 8 - lib:libpcrecpp = $portVersion compat >= 8 - lib:libpcreposix = $portVersion compat >= 8 + lib:libpcre = 0.0.1 compat >= 0 + lib:libpcrecpp = 0.0.1 compat >= 0 + lib:libpcreposix = 0.0.1 compat >= 0 " REQUIRES=" @@ -52,7 +51,7 @@ BUILD() aclocal autoconf automake --add-missing - ./configure $configureDirArgs \ + runConfigure ./configure \ --enable-utf8 \ --enable-unicode-properties \ --with-pic @@ -69,9 +68,28 @@ INSTALL() # fix pcre-config fixDevelopLibDirReferences $binDir/pcre-config + + # devel package + packageEntries devel \ + $binDir/pcre-config \ + $developDir \ + $manDir/man3 } TEST() { make check } + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libpcre_devel = $portVersion + cmd:pcre_config = $portVersion compat >= 8 + devel:libpcre = 0.0.1 compat >= 0 + devel:libpcrecpp = 0.0.1 compat >= 0 + devel:libpcreposix = 0.0.1 compat >= 0 + " +REQUIRES_devel=" + libpcre == $portVersion base + " From bc9da42f9262a1701aaa42e7ad918432d4aa985a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 17 Jun 2013 21:02:43 +0200 Subject: [PATCH 313/587] libxml2: update recipe * Update zlib in [BUILD_]REQUIRES. * Build separate devel package. --- dev-libs/libxml2/libxml2-2.8.0.recipe | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe index 018e8d4a6..fa9501ce3 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.recipe +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -4,24 +4,22 @@ LICENSE="MIT" COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz" CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="libxml2-2.8.0.patch" PROVIDES=" libxml2 = $portVersion compat >= 2 - cmd:xml2_config = $portVersion compat >= 2 cmd:xmlcatalog = $portVersion compat >= 2 cmd:xmllint = $portVersion compat >= 2 lib:libxml2 = $portVersion compat >= 2 " REQUIRES=" haiku >= $haikuVersion - zlib + lib:libz " BUILD_REQUIRES=" - $REQUIRES cmd:aclocal cmd:autoconf cmd:automake @@ -29,6 +27,7 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize cmd:make + devel:libz " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -66,6 +65,15 @@ INSTALL() fixPkgconfig mv $libDir/xml2Conf.sh $developLibDir/ fixDevelopLibDirReferences $developLibDir/xml2Conf.sh $binDir/xml2-config + + # devel package + packageEntries devel \ + $binDir/xml2-config \ + $dataDir \ + $developDir \ + $docDir \ + $manDir/man1/xml2-config.1 \ + $manDir/man3 } TEST() @@ -126,3 +134,14 @@ DESCRIPTION=" on but it would be far too early to make any conformance statement about it at the moment. " + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libxml2_devel = $portVersion + cmd:xml2_config = $portVersion compat >= 2 + devel:libxml2 = $portVersion compat >= 2 + " +REQUIRES_devel=" + libxml2 == $portVersion base + " From e3454017c968cd525031b75a2c84aedb702e70bd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 17 Jun 2013 21:15:27 +0200 Subject: [PATCH 314/587] mercurial 2.2.2: update [BUILD_]REQUIRES --- dev-vcs/mercurial/mercurial-2.2.2.recipe | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe index 3d3bbf397..931df8156 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2005-2012 Matt Mackall et al." LICENSE="GNU GPL v2" SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz" CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="mercurial-2.2.2.patch" @@ -18,10 +18,12 @@ REQUIRES=" haiku_devel >= $haikuVersion python cmd:nano + lib:libintl " BUILD_REQUIRES=" - $REQUIRES - gettext + python + cmd:gettext + cmd:nano " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion From b3b0c712d58ed2b2ad7882370e0216c4710ee3d5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 00:59:00 +0200 Subject: [PATCH 315/587] neon: update recipe * Update [BUILD_]REQUIRES. * Build separate devel package. --- net-misc/neon/neon-0.29.6.recipe | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe index 4e3691096..bac6ecf5b 100644 --- a/net-misc/neon/neon-0.29.6.recipe +++ b/net-misc/neon/neon-0.29.6.recipe @@ -22,7 +22,7 @@ LICENSE="GNU LGPL v2" COPYRIGHT="1999-2011 Joe Orton" SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz" CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="neon-0.29.6.patch" @@ -33,17 +33,22 @@ PROVIDES=" " REQUIRES=" haiku >= $haikuVersion - openssl >= 1.0.0 - libxml2 >= 2.7.8 + lib:libncurses + lib:libssl + lib:libxml2 + lib:libz " BUILD_REQUIRES=" - $REQUIRES cmd:aclocal cmd:autoconf cmd:libtoolize cmd:gcc cmd:ld cmd:make + devel:libncurses + devel:libssl >= 1.0.0 + devel:libxml2 >= 2.7.8 + devel:libz " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -74,7 +79,25 @@ BUILD() INSTALL() { make install + prepareInstalledDevelLibs libneon fixDevelopLibDirReferences $binDir/neon-config fixPkgconfig + + # devel package + packageEntries devel \ + $binDir/neon-config \ + $developDir \ + $documentationDir } + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + neon_devel = $portVersion compat >= 0.29 + cmd:neon_config = $portVersion compat >= 0.29 + devel:libneon = 27.2.6 compat >= 27 + " +REQUIRES_devel=" + neon == $portVersion base + " From d073d900c31301ee85d1f8b514af9c1f2ba25f34 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 01:01:52 +0200 Subject: [PATCH 316/587] mkdepend: update recipe --- haiku-apps/mkdepend/mkdepend-1.7.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe index ed098dbf2..582e835f2 100644 --- a/haiku-apps/mkdepend/mkdepend-1.7.recipe +++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe @@ -6,7 +6,7 @@ COPYRIGHT="1995-2001 Lars Düning. All Rights Reserved" #SRC_URI="http://ports.haiku-files.org/export/1051/haikuports/trunk/haiku-apps/mkdepend/source/mkdepend-1.7.zip" SRC_URI="source/mkdepend-1.7.zip" CHECKSUM_MD5="d4ec4fea9dd9b7292b52d780c8ee3387" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -17,7 +17,6 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES cmd:gcc cmd:ld " From 205db01824147e65ea7e90177d44656623b33aa7 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 01:59:42 +0200 Subject: [PATCH 317/587] openssh: update recipe * Update [BUILD_]REQUIRES. * Add GLOBAL_WRITABLE_FILES, USER_SETTINGS_FILES, POST_INSTALL_SCRIPTS, and PACKAGE_USERS attributes. * Change global settings directory back to $sysconfDir/ssh (as expected by sshd_keymaker.sh). --- net-misc/openssh/openssh-6.0p1.recipe | 28 ++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index ee8ac8425..0ba3dbc5c 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -4,7 +4,7 @@ LICENSE="OpenSSH" COPYRIGHT="2005-2012 Tatu Ylonen et al." SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz" CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="openssh-6.0p1.patch" @@ -30,12 +30,11 @@ REQUIRES=" cmd:passwd lib:libcrypto lib:libedit + lib:libncurses lib:libssl lib:libz " BUILD_REQUIRES=" - $REQUIRES - openssl cmd:aclocal cmd:autoconf cmd:automake @@ -43,11 +42,31 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize cmd:make + cmd:pkg_config + devel:libcrypto + devel:libedit + devel:libncurses + devel:libssl + devel:libz " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion " +GLOBAL_WRITABLE_FILES=" + settings/ssh directory keep-old + " +USER_SETTINGS_FILES=" + settings/ssh directory + " +POST_INSTALL_SCRIPTS=" + $relativePostInstallDir/sshd_keymaker.sh + " +sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty" +PACKAGE_USERS=" + sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\" + " + SOURCE_DIR="$portVersionedName" PATCH() @@ -72,7 +91,7 @@ BUILD() PATH_PASSWD_PROG=$portPackageLinksDir/cmd:passwd/bin/passwd \ LOGIN_PROGRAM=$portPackageLinksDir/cmd:login/bin/login \ runConfigure ./configure \ - --sysconfdir=$sysconfDir/openssh \ + --sysconfdir=$sysconfDir/ssh \ --libexecdir=$libExecDir/openssh \ --with-privsep-path=$dataDir/openssh/empty \ --with-pid-dir=$prefix/var/run \ @@ -86,7 +105,6 @@ BUILD() INSTALL() { make install-nokeys - postInstallDir=$prefix/boot/post_install mkdir -p $postInstallDir cp -f $portDir/sshd_keymaker.sh $postInstallDir } From 6f1342c52b5b6c075f18869df71e584125941a82 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 02:19:18 +0200 Subject: [PATCH 318/587] p7zip: fix broken directory layout --- app-arch/p7zip/p7zip-9.20.1.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe index eff191d12..eb3a6dbd2 100644 --- a/app-arch/p7zip/p7zip-9.20.1.recipe +++ b/app-arch/p7zip/p7zip-9.20.1.recipe @@ -5,7 +5,7 @@ SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20. CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89" LICENSE="GNU LGPL v2.1" COPYRIGHT="1999-2011 7-Zip Igor Pavlov." -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="p7zip-9.20.1.patch" @@ -36,6 +36,6 @@ BUILD() INSTALL() { - make install DEST_DIR=$prefix DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \ + make install DEST_DIR="" DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \ DEST_MAN=$manDir } From 3e4aba1a7ac614ff76db1d4dbc7e1ef75fcb6e45 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 02:52:54 +0200 Subject: [PATCH 319/587] pe: update recipe * Declare patch explicitly. * Update [BUILD_]REQUIRES. * Declare USER_SETTINGS_FILES. * Don't allow multi-job builds. They don't work reliably. * INSTALL(): Simplify a bit. Add Deskbar menu symlink. --- haiku-apps/pe/pe-2.4.3_hg602.recipe | 34 ++++++++++++++++++----------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe index 3f8d2eace..a41ca3f67 100644 --- a/haiku-apps/pe/pe-2.4.3_hg602.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe @@ -10,9 +10,11 @@ COPYRIGHT=" 2003-2012 Team Pe " SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#602" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" +PATCHES="pe-2.4.3_hg602.patch" + PROVIDES=" pe = $portVersion cmd:Pe = $portVersion compat >= 2 @@ -21,38 +23,44 @@ PROVIDES=" REQUIRES=" haiku >= $haikuVersion - lib:libpcre >= 8 - lib:libpcreposix >= 8 + lib:libpcre + lib:libpcreposix " BUILD_REQUIRES=" - $REQUIRES cmd:bison cmd:flex cmd:gcc cmd:jam cmd:ld + devel:libpcre >= 0.0.1 + devel:libpcreposix >= 0.0.1 " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion " +USER_SETTINGS_FILES=" + settings/pe directory + " + SOURCE_DIR="$portVersionedName" BUILD() { - jam -q -j$jobs + jam -q + # multi-job builds don't work reliably } INSTALL() { - apps=$prefix/apps - mkdir -p $apps + peDir=$appsDir/Pe - peBase=$apps/Pe - cp -a generated/distro $peBase - cp -a doc $peBase/Documentation + mkdir -p $appsDir + cp -a generated/distro $peDir + cp -a doc $peDir/Documentation - mkdir $prefix/bin - cd $prefix/bin - ln -sfn ../apps/Pe/lpe . + mkdir $binDir + ln -sfn $peDir/lpe $binDir + + addAppDeskbarSymlink $peDir/Pe } From db0a06e1fc6023421e700976452ea7c6ef55d4fe Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 03:38:42 +0200 Subject: [PATCH 320/587] subversion: update recipe * Update [BUILD_]REQUIRES. * Add USER_SETTINGS_FILES. * Build separate devel package. --- dev-vcs/subversion/subversion-1.6.18.recipe | 70 ++++++++++++++++----- 1 file changed, 56 insertions(+), 14 deletions(-) diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe index 1be5d0a78..744cc87af 100644 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -12,7 +12,7 @@ LICENSE="Apache-Subversion" COPYRIGHT="2010 The Apache Software Foundation" SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2" CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="subversion-1.6.18.patch" @@ -42,28 +42,44 @@ PROVIDES=" " REQUIRES=" haiku >= $haikuVersion - apr >= 1.3 - apr_util >= 1.3 - expat >= 2.0 - libiconv >= 1.13 - libxml2 >= 2.7 - neon >= 0.29 - sqlite >= 3.4 - zlib + lib:libapr_1 + lib:libaprutil_1 + lib:libcrypto + lib:libexpat + lib:libiconv + lib:libneon + lib:libsqlite3 + lib:libssl + lib:libxml2 + lib:libz " BUILD_REQUIRES=" - $REQUIRES + expat_devel >= 2.0 + libiconv_devel >= 1.13 + neon_devel >= 0.29 + python + sqlite_devel >= 3.4 cmd:aclocal cmd:autoconf cmd:gcc cmd:ld cmd:libtoolize cmd:make + devel:libapr_1 >= 0.3 + devel:libaprutil_1 >= 0.3 + devel:libcrypto + devel:libssl + devel:libxml2 >= 2.7 + devel:libz " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion " +USER_SETTINGS_FILES=" + settings/subversion directory + " + SOURCE_DIR="$portVersionedName" PATCH() @@ -78,10 +94,10 @@ BUILD() aclocal -I build -I build/ac-macros autoconf runConfigure ./configure \ - --with-apr=$portPackageLinksDir/apr \ - --with-apr-util=$portPackageLinksDir/apr_util \ - --with-neon=$portPackageLinksDir/neon \ - --with-zlib=$portPackageLinksDir/zlib \ + --with-apr=$portPackageLinksDir/devel:libapr_1 \ + --with-apr-util=$portPackageLinksDir/devel:libaprutil_1 \ + --with-neon=$portPackageLinksDir/neon_devel \ + --with-zlib=$portPackageLinksDir/devel:libz \ --with-editor=nano \ --disable-nls make $jobArgs @@ -117,9 +133,35 @@ INSTALL() libsvn_repos-1 \ libsvn_subr-1 \ libsvn_wc-1 + + # devel package + packageEntries devel \ + $developDir } TEST() { make check } + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + subversion_devel = $portVersion compat >= 1.6 + devel:libsvn_client_1 = 0.0.0 compat >= 0 + devel:libsvn_delta_1 = 0.0.0 compat >= 0 + devel:libsvn_diff_1 = 0.0.0 compat >= 0 + devel:libsvn_fs_1 = 0.0.0 compat >= 0 + devel:libsvn_fs_fs_1 = 0.0.0 compat >= 0 + devel:libsvn_fs_util_1 = 0.0.0 compat >= 0 + devel:libsvn_ra_1 = 0.0.0 compat >= 0 + devel:libsvn_ra_local_1 = 0.0.0 compat >= 0 + devel:libsvn_ra_neon_1 = 0.0.0 compat >= 0 + devel:libsvn_ra_svn_1 = 0.0.0 compat >= 0 + devel:libsvn_repos_1 = 0.0.0 compat >= 0 + devel:libsvn_subr_1 = 0.0.0 compat >= 0 + devel:libsvn_wc_1 = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + subversion == $portVersion base + " From 80ceb837f096ab5a12653e04c76ae5220ccbeae7 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 03:40:26 +0200 Subject: [PATCH 321/587] tar: update recipe * Make use of runConfigure and jobArgs. * Remove lib/charset.alias from package. --- app-arch/tar/tar-1.26.recipe | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index d60cd4f5c..8f5af3419 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -12,9 +12,11 @@ DESCRIPTION=" devices or files (as archives). " HOMEPAGE="http://www.gnu.org/software/tar/" +COPYRIGHT="1990-2011 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2" CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -40,17 +42,16 @@ SOURCE_DIR="$portVersionedName" BUILD() { - ./configure $configureDirArgs \ + runConfigure ./configure \ --disable-nls \ LDFLAGS="-lnetwork" \ FORCE_UNSAFE_CONFIGURE=1 - make + make $jobArgs } INSTALL() { make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1990-2011 Free Software Foundation, Inc." + rm $libDir/charset.alias +} From d6abc2d21a377b77e38e7db4ddc75c6369560e8e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 05:02:35 +0200 Subject: [PATCH 322/587] timgmsoundfont: update recipe --- haiku-data/timgmsoundfont/licenses/Public Domain | 2 -- .../timgmsoundfont/timgmsoundfont-2004_01_24.recipe | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 haiku-data/timgmsoundfont/licenses/Public Domain diff --git a/haiku-data/timgmsoundfont/licenses/Public Domain b/haiku-data/timgmsoundfont/licenses/Public Domain deleted file mode 100644 index 9064db33c..000000000 --- a/haiku-data/timgmsoundfont/licenses/Public Domain +++ /dev/null @@ -1,2 +0,0 @@ -Any copyright is dedicated to the Public Domain. -http://creativecommons.org/publicdomain/zero/1.0/ \ No newline at end of file diff --git a/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe index 474d6f5c1..ac8081ae9 100644 --- a/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe +++ b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe @@ -2,13 +2,12 @@ SUMMARY="A good quality General Midi Soundfont" DESCRIPTION="A good quality General Midi Soundfont." HOMEPAGE="http://ocmnet.com/saxguru/Timidity.htm" LICENSE="Public Domain" - # TODO: Remove "licenses" directory once updated to the current Haiku, since - # there "Public Domain" is included. COPYRIGHT="2004 Tim Brechbill" SRC_URI="http://ocmnet.com/saxguru/TimGM6mb.sf2#noarchive" CHECKSUM_MD5="1f569cc40159a6bd9250f816225ae222" -REVISION="2" +REVISION="3" ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes PROVIDES=" timgmsoundfont = $portVersion compat >= 0 @@ -19,7 +18,6 @@ BUILD_REQUIRES=" cmd:cp " BUILD_PREREQUIRES=" - haiku " BUILD() @@ -30,7 +28,7 @@ BUILD() INSTALL() { synthDir=$dataDir/synth - mkdir $synthDir + mkdir -p $synthDir cp TimGM6mb.sf2 "$portDir/sources/Installing alternative sound fonts" \ $synthDir ln -s TimGM6mb.sf2 $synthDir/big_synth.sy From bf2f5a0308540a7d378ffdeaa5de9b9e2419f655 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 05:03:33 +0200 Subject: [PATCH 323/587] Add recipe for WonderBrush It downloads the zip file and repackages it. The recipe also works around the issue that libfreetype.so and libz.so are no longer known by those names -- that broke the previous package revision. --- haiku-apps/wonderbrush/licenses/WonderBrush | 151 ++++++++++++++++++ .../wonderbrush/wonderbrush-2.1.2.recipe | 56 +++++++ 2 files changed, 207 insertions(+) create mode 100644 haiku-apps/wonderbrush/licenses/WonderBrush create mode 100644 haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe diff --git a/haiku-apps/wonderbrush/licenses/WonderBrush b/haiku-apps/wonderbrush/licenses/WonderBrush new file mode 100644 index 000000000..f8c1c8f84 --- /dev/null +++ b/haiku-apps/wonderbrush/licenses/WonderBrush @@ -0,0 +1,151 @@ + +_English_____________(für deutsche Version bitte nach unten scrollen)__________ + + +WonderBrush License Agreement + Potsdam, Sep.29.2005 + +About this Agreement + +This Agreement regulates the rights and obligations between the purchaser of the "WonderBrush" software package and the producer of this package, the "Stephan Aßmus und Ingo Weinhold GbR". + + +Parties to this contract, definition of terms + +By installing the "WonderBrush" software package, you agree to be bound by the terms of this license. Please read this agreement carefully. DO NOT INSTALL THE SOFTWARE, IF YOU DO NOT AGREE TO THIS LICENSE, BUT RETURN THE COMPLETE PACKAGE TO WHERE YOU OBTAINED IT AND YOUR MONEY WILL BE REFUNDED. + +The computer program "WonderBrush", its documentation and all other material included on the WonderBrush CD, will be referred to as "Software" from hereon. + +By purchasing the WonderBrush package, you have only obtained ownership of the physical materials. The complete Software on the CD remains the intellectual property of the "Stephan Aßmus und Ingo Weinhold GbR", to be referred as "YellowBites" from hereon. + + +Right to use + +If you agree to this license, you obtain furthermore the right to use this Software for your own purposes. This right is limited to yourself, other persons may not use the Software. You may install the Software onto multiple computers, as long as you are the only person using the Software on those computers and the only person with access to it. Should you install the Software on multiple computers, you may only execute it on one of them at the same time. "Execute" means that the WonderBrush program was launched and resides within the main memory (RAM) of the computer. If you want to use the program on more than one computer at the same time, you have to purchase more licenses by purchasing more WonderBrush packages. + + +Limitations + +- The Software is the intellectual property of YellowBites. To protect it, and except as permitted by applicable legislation, you may not decompile, reverse engineer, disassemble or otherwise revert the Software into human perceivable form. + +- You may not create derivative works based upon the Software in whole or in part. + +- You may not rent, lease, distribute, send or otherwise make this Software accessible to other persons, except as described in the following paragraph. + + +Resale + +You have the right to resale the Software to another person, if you pass on your entire rights to use the Software to this person and dispense from it. The other person must accept this agreement and you must delete every installation of the Software from your computers before the resale. You can only resale the complete bundle with all materials which were part of the package when you originally obtained it. If you made a backup copy, as described in the next paragraph, you have to destroy it before the resale. + + +Backup copy + +You may produce a backup copy of the original disc, on which you have obtained the Software. The backup copy must remain in your custody and must be destroyed at the termination of this agreement. + + +Warranty on media + +YellowBites warrents the compact disc on which the Software is recorded to be free from defects in material. This warranty is limited to a period of ninety days under normal use from the date of purchase. Yellowbies entire liability and your exclusive remedy will be replacement of the compact disc not meeting this warranty and which is returned to YellowBites with a copy of the receipt. YellowBites is not responsible to replace a compact disc damaged by accident, abuse or misapplication. + + +Warranty on the Software + +YellowBites delivers the software WonderBrush in the knowledge that it contains errors. All errors known at the time of delivery are described in the document BUGS. These errors do not harm the functionality of the Software. The Software may further contain yet unkown errors, which may hinder the functionality of the Software in non critical or critical ways. If you become aware of any such error within a year after purchase, YellowBites commits to correction of the error(s) or, should this be impossible or mean disproportional economical effort, to partly refunding the price of purchase. For this you must prove that the error(s) are directly contained in the WonderBrush program, and not within the software components that are not part of the original WonderBrush software package. The computer on which you installed the Software must further comply to the system requirements stated on the outside of the package. You further commit to doing your best at helping YellowBites with the localisation of the error(s). Versions of the software, in which such an error has been fixed, may be transfered to you by YellowBites via electronical means, especially via the Internet. + + +Limitation on liability + +The associates of YellowBites are not liable for any kind of economical losses, that result or from the use or indirect use of the Software. This limitation does not extend to injures, that emerged on your live, body or health and that directly lead back to an error in the Software. YellowBites is not liable of any injures that resulted from over use or unergonomic use of the Software. + + +Termination of this agreement + +You can terminate this agreement at any time by deleting every installation and backup copy of the Software. Should you violate any of the terms in this agreement, the agreement and all rights granted therein are terminated also. + + +Court of jurisdiction + +The competend court of jurisdiction is Potsdam, Germany. + + +Copyright (c) 2005, Stephan Aßmus und Ingo Weinhold GbR. All rights reserved. + + + + + + + + + +_Deutsch______________________________________________________________________ + + +WonderBrush Lizenzvertrag + Potsdam, 08.09.2005 + +Vertragsgegenstand + +Dieser Vertrag regelt die Rechte und Pflichten zwischen der Käuferin oder dem Käufer eines "WonderBrush" Softwarepakets und dem Hersteller dieses Pakets, der "Stephan Aßmus und Ingo Weinhold GbR". + +Vertragsparteien, Begriffsdefinitionen + +Mit der Installation des "WonderBrush" Softwarepakets stimmen Sie diesem Vertrag zu. Bitte lesen Sie sich den Vertrag aufmerksam durch. INSTALLIEREN SIE DIE SOFTWARE NICHT, WENN SIE DEM VERTRAG NICHT ZUSTIMMEN, SONDERN BRINGEN SIE BITTE DAS GESAMTE SOFTWAREPAKET DORTHIN ZURüCK, WO SIE ES ERWORBEN HABEN UND LASSEN SIE SICH DEN KAUFPREIS RüCKERSTATTEN. + +Das Computerprogramm "WonderBrush", seine Dokumentation sowie alle weiteren Daten, die sich auf der WonderBrush CD befinden werden im folgenden zusammenfassend "Software" genannt. + +Sie haben durch den Kauf des WonderBrush Pakets nur die physikalischen Materialien erworben. Die gesamte Software auf der CD bleibt das geistige Eigentum der "Stephan Aßmus und Ingo Weinhold GbR", im folgenden "YellowBites" genannt. + + +Nutzungsrecht + +Wenn Sie dem Vertrag zustimmen, erwerben Sie außerdem das Recht, die Software für Ihre Zwecke zu nutzen. Dieses Recht steht Ihnen alleine zu, andere Personen dürfen die Software nicht benutzen. Sie dürfen die Software auf beliebig vielen Rechnern installieren, insofern nur Sie und keine weiteren Personen die Software an diesen Rechnern benutzen oder Zugriff darauf haben. Sollten Sie die Software auf mehreren Rechnern installieren, so dürfen Sie sie nur auf einem dieser Rechner zeitgleich ausführen. "Ausführen" bedeutet, dass das WonderBrush Programm gestartet wurde und sich im Arbeitsspeicher des Rechners befindet. Wenn Sie das Programm auf mehreren Rechnern zeitgleich betreiben wollen, so müssen Sie weitere Nutzungslizenzen erwerben indem Sie weitere WonderBrush Pakete kaufen. + + +Einschränkungen + +- Bei der Software handelt es sich um geistiges Eigentum von YellowBites. Um dieses zu schützen dürfen Sie die Software nicht dekompilieren, disassemblieren oder auf andere Art in eine menschenlesbare Form zurückwandeln, es sei denn, dies wird Ihnen durch für Sie geltendes Recht gestattet. + +- Sie dürfen keine auf der Software oder Teile der Software basierenden Werke oder Produkte anfertigen. + +- Sie dürfen die Software nicht verleihen, vermieten, weiterverbreiten, verschicken oder in anderer Weise dritten Personen zugänglich machen. Eine Ausnahme bildet der Weiterverkauf, wie im folgenden Abschnitt beschrieben. + + +Weiterverkauf + +Sie haben das Recht, die Software an eine andere Person weiterzuverkaufen, sofern Sie Ihr Nutzungsrecht damit komplett an diese Person übertragen und selbst abtreten. Dazu muss diese Person diesem Vertrag zustimmen und Sie müssen sämtliche Installationen dieser Software vor dem Weiterverkauf von Ihren Rechnern löschen. Die Software kann nur vollständig weiterverkauft werden mit sämtlichen Materialien, die ursprünglich Bestandteil des Pakets waren, das Sie selbst gekauft haben. Eventuell angefertigte Sicherheitskopien, wie im nächsten Abschnitt beschrieben, müssen Sie vor dem Weiterverkauf vernichten. + + +Sicherheitskopie + +Sie dürfen eine Sicherheitskopie von der Original-CD anfertigen, auf der Sie das Softwarepaket erhalten haben. Diese Sicherheitskopie muss in Ihrem Besitz verbleiben und bei Beendigung des Vertragsverhältnisses von Ihnen vernichtet werden. + + +Gewährleistung für Materialien + +YellowBites garantiert für die Fehlerfreiheit der CD, auf der die Software aufgezeichnet ist. Diese Garantie gilt nur unter normaler Benutzung der CD innerhalb eines Zeitraums von 90 Tagen ab Kaufdatum. YellowBites' Verpflichtung und Ihr gänzlicher Anspruch besteht in dem Ersatz der CD, die nicht dem garantierten Zustand entspricht, und die an YellowBites samt Kaufbeleg übersendet wurde. YellowBites ist nicht verpflichtet, durch Unfall oder Fehlbenutzung schadhafte CDs zu ersetzen. + + +Gewährleistung für Software + +YellowBites liefert die Software WonderBrush in dem Wissen aus, dass darin Fehler enthalten sind. Alle zum Zeitpunkt der Auslieferung bekannten Fehler sind in der Datei BUGS dokumentiert. Es handelt sich um Fehler, die die Funktionsweise des Programms nicht beeinträchtigen oder mindern. Darüber hinaus kann die Software weitere, gegenwärtig unbekannte Fehler beinhalten, die die Funktionsweise des Programms unwesentlich aber auch wesentlich beeinträchtigen können. Soweit Ihnen diese Mängel innerhalb eines Jahres ab Kaufdatum bekannt werden, verpflichtet sich YellowBites zur Behebung der Mängel oder, sofern dies nicht möglich ist oder wirtschaftlich unverhältnismäßigen Aufwand bedeutet, zu teilweiser Rückerstattung des Kaufpreises. Dazu müssen Sie nachweisen, dass es sich bei den Beanstandungen tatsächlich um Fehler direkt im WonderBrush-Programm handelt, und nicht etwa um Bedienungsfehler oder Fehler in Softwarekomponenten, die nicht original Bestandteil des WonderBrush Softwarepakets sind. Außerdem müssen die auf der Packung genannten Systemvorraussetzungen von dem Rechner erfüllt sein, auf dem Sie WonderBrush installiert haben. Sie verpflichten sich außerdem, YellowBites bei der Fehlerlokalisierung nach bestem Wissen und Gewissen behilflich zu sein. +Softwareversionen von WonderBrush, in denen ein von Ihnen rechtmäßig beanstandeter Fehler behoben wurde, können von YellowBites auf elektronischem Wege, insbesondere über das Internet, an Sie ausgeliefert werden. + + +Haftungsbeschränkung + +Die Gesellschafter von YellowBites haften für keine Art von wirtschaftlichen Schäden, die aus der Verwendung oder der indirekten Verwendung der Software entstanden sind. Von dieser Haftungsbeschränkung ausgenommen sind Schäden, die Ihnen an Leben, Körper oder Gesundheit widerfahren sind und direkt auf einen Fehler in der Software zurückzuführen sind. Für gesundheitliche Schäden, die Ihnen durch übermäßige oder unergonomische Nutzung der Software entstanden sind, übernimmt YellowBites keine Verantwortung. + + +Beendigung des Vertragsverhältnisses + +Sie können dieses Vertragsverhältnis jederzeit beenden, indem Sie sämtliche Installationen und angefertigte Sicherungskopien löschen. Sollten Sie einen Punkt dieses Vertrages verletzen, so erlöschen das Vertragsverhältnis sowie alle damit erworbenen Rechte ebenfalls. + +Rechtsstandort + +Der Rechtsstandort ist Potsdam, Deutschland. + + +Copyright (c) 2005, Stephan Aßmus und Ingo Weinhold GbR. Alle Rechte vorbehalten. + + diff --git a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe new file mode 100644 index 000000000..61cf0789d --- /dev/null +++ b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe @@ -0,0 +1,56 @@ +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." +HOMEPAGE="http://yellowbites.com/wonderbrush.html" +LICENSE="WonderBrush" +COPYRIGHT="2005, Stephan Aßmus und Ingo Weinhold GbR" +SRC_URI="http://yellowbites.com/downloads/WonderBrush-2.1.2-x86-gcc2-2013-01-02.zip#noarchive" +CHECKSUM_MD5="28e64a56946c9f5aefa40486f35ffc77" +REVISION="2" +ARCHITECTURES="x86_gcc2 !x86" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES=" + wonderbrush = $portVersion compat >= 2 + " +REQUIRES=" + haiku >= r1~alpha3_pm-1 + lib:libfreetype >= 6 + lib:libz >= 1 + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku + coreutils + cmd:unzip + " + +USER_SETTINGS_FILES=" + settings/WonderBrush directory + " + +SOURCE_DIR="WonderBrush" + +BUILD() +{ + : +} + +INSTALL() +{ + wonderbrushDir=$appsDir/WonderBrush + mkdir -p $appsDir + unzip -d $appsDir WonderBrush-2.1.2-x86-gcc2-2013-01-02.zip + + # Hack to make libfreetype and libz available under the name WonderBrush + # has been linked against them. + ln -s $portPackageLinksDir/lib:libfreetype/lib/libfreetype.so.6 \ + $wonderbrushDir/lib/libfreetype.so + ln -s $portPackageLinksDir/lib:libfreetype/lib/libz.so.1 \ + $wonderbrushDir/lib/libz.so + + addAppDeskbarSymlink $wonderbrushDir/WonderBrush +} From b712289fadcaceac04935a169f8a33ef2b607e16 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 10:17:24 +0200 Subject: [PATCH 324/587] Remove SOURCE_EXPORT_SUBDIR --- sys-devel/binutils/binutils-2.17_130421.recipe | 3 +-- sys-devel/gcc/gcc-2.95.3_130425.recipe | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys-devel/binutils/binutils-2.17_130421.recipe b/sys-devel/binutils/binutils-2.17_130421.recipe index faf2d48f6..e2d8a8e6e 100644 --- a/sys-devel/binutils/binutils-2.17_130421.recipe +++ b/sys-devel/binutils/binutils-2.17_130421.recipe @@ -46,8 +46,7 @@ BUILD_PREREQUIRES=" texinfo " -SOURCE_DIR="$portVersionedName" -SOURCE_EXPORT_SUBDIR="legacy/binutils" +SOURCE_DIR="$portVersionedName/legacy/binutils" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL binutilsDir=$(pwd) diff --git a/sys-devel/gcc/gcc-2.95.3_130425.recipe b/sys-devel/gcc/gcc-2.95.3_130425.recipe index 6d9064cca..96a76d9b9 100644 --- a/sys-devel/gcc/gcc-2.95.3_130425.recipe +++ b/sys-devel/gcc/gcc-2.95.3_130425.recipe @@ -44,8 +44,7 @@ BUILD_PREREQUIRES=" cmd:makeinfo " -SOURCE_DIR="$portVersionedName" -SOURCE_EXPORT_SUBDIR="legacy/gcc" +SOURCE_DIR="$portVersionedName/legacy/gcc" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL gccDir=$(pwd) From 272581b5f3e136a6045bbf24e0eb13a33ed9f5e4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 10:23:38 +0200 Subject: [PATCH 325/587] wpa_supplicant 2.0: update recipe --- net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe index e5f6fe587..8694426ba 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe @@ -8,37 +8,40 @@ LICENSE=" GNU GPL v2 " COPYRIGHT="2003-2012 Jouni Malinen" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="wpa_supplicant-2.0.patch" PROVIDES=" wpa_supplicant = $portVersion compat >= 2 + cmd:wpa_supplicant = $portVersion compat >= 2 " REQUIRES=" haiku >= $haikuVersion - openssl >= 1.0.0 + lib:libssl " BUILD_REQUIRES=" cmd:gcc cmd:ld cmd:make - openssl >= 1.0.0 + devel:libssl >= 1.0.0 " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion " -SOURCE_DIR="$portVersionedName/wpa_supplicant" +SOURCE_DIR="$portVersionedName" BUILD() { + cd wpa_supplicant CFLAGS="-MMD -O2 -Wall" make wpa_supplicant } INSTALL() { + cd wpa_supplicant mkdir -p $binDir cp -v wpa_supplicant $binDir } From 34b4ca0d3cf54079b815c5bd2d090ed92f8c20c3 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 11:12:15 +0200 Subject: [PATCH 326/587] vision: update recipe * Based on vision-942.recipe add new recipe vision-0.9.7.r944.recipe. * Remove older recipes. * Rename patch. * Rename VisionSettings to InitialSettings as done in master. * Add USER_SETTINGS_FILES declaration. * Add Deskbar menu symlink. --- .../{VisionSettings => InitialSettings} | Bin ...908-gcc4.patch => vision-0.9.7-gcc4.patch} | 0 ...on-942.recipe => vision-0.9.7.r944.recipe} | 21 +++++--- haiku-apps/vision/vision-908.recipe | 48 ------------------ haiku-apps/vision/vision-933.recipe | 32 ------------ 5 files changed, 14 insertions(+), 87 deletions(-) rename haiku-apps/vision/{VisionSettings => InitialSettings} (100%) rename haiku-apps/vision/patches/{vision-908-gcc4.patch => vision-0.9.7-gcc4.patch} (100%) rename haiku-apps/vision/{vision-942.recipe => vision-0.9.7.r944.recipe} (65%) delete mode 100644 haiku-apps/vision/vision-908.recipe delete mode 100644 haiku-apps/vision/vision-933.recipe diff --git a/haiku-apps/vision/VisionSettings b/haiku-apps/vision/InitialSettings similarity index 100% rename from haiku-apps/vision/VisionSettings rename to haiku-apps/vision/InitialSettings diff --git a/haiku-apps/vision/patches/vision-908-gcc4.patch b/haiku-apps/vision/patches/vision-0.9.7-gcc4.patch similarity index 100% rename from haiku-apps/vision/patches/vision-908-gcc4.patch rename to haiku-apps/vision/patches/vision-0.9.7-gcc4.patch diff --git a/haiku-apps/vision/vision-942.recipe b/haiku-apps/vision/vision-0.9.7.r944.recipe similarity index 65% rename from haiku-apps/vision/vision-942.recipe rename to haiku-apps/vision/vision-0.9.7.r944.recipe index a97718bad..5e4508b79 100644 --- a/haiku-apps/vision/vision-942.recipe +++ b/haiku-apps/vision/vision-0.9.7.r944.recipe @@ -1,14 +1,14 @@ SUMMARY="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#942" +SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7#944" LICENSE="MPL v1.1" COPYRIGHT="1999-2010 The Vision Team" -REVISION="3" +REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" if [ $targetArchitecture != x86_gcc2 ]; then - PATCHES="vision-908-gcc4.patch" + PATCHES="vision-0.9.7-gcc4.patch" fi PROVIDES=" @@ -26,11 +26,16 @@ BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion " +USER_SETTINGS_FILES=" + settings/Vision directory + " + SOURCE_DIR="$portVersionedName" BUILD() { - make $jobArgs + make + # multi-job build not supported } INSTALL() @@ -38,9 +43,11 @@ INSTALL() visionDir=$appsDir/Vision mkdir -p $visionDir - cp -a $portDir/VisionSettings $visionDir - cp Vision $visionDir + cp -a $portDir/InitialSettings $visionDir + cd data - copyattr -d -r -x .svn * $visionDir + cp -a * $visionDir + + addAppDeskbarSymlink $visionDir/Vision } diff --git a/haiku-apps/vision/vision-908.recipe b/haiku-apps/vision/vision-908.recipe deleted file mode 100644 index 5959561a7..000000000 --- a/haiku-apps/vision/vision-908.recipe +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY="IRC client for Haiku" -DESCRIPTION="Vision is an IRC client for Haiku." -HOMEPAGE="http://vision.sourceforge.net/" -SRC_URI="svn+http://vision.svn.sourceforge.net/svnroot/vision/trunk#908" -LICENSE="MPL v1.1" -COPYRIGHT="1999-2010 The Vision Team" -REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" - -if [ $targetArchitecture != x86_gcc2 ]; then - PATCHES="vision-908-gcc4.patch" -fi - -PROVIDES=" - vision = $portVersion - " -REQUIRES=" - haiku >= $haikuVersion - " -BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " - -SOURCE_DIR="$portVersionedName" - -BUILD() -{ - cd Vision - make $jobArgs -} - -INSTALL() -{ - visionDir=$appsDir/Vision - mkdir -p $visionDir - - cp -a $portDir/VisionSettings $visionDir - - cd Vision - cp Vision $visionDir - cd data - copyattr -d -r -x .svn * $visionDir -} diff --git a/haiku-apps/vision/vision-933.recipe b/haiku-apps/vision/vision-933.recipe deleted file mode 100644 index 41876b723..000000000 --- a/haiku-apps/vision/vision-933.recipe +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="Vision is an irc client for Haiku" -HOMEPAGE="http://vision.sourceforge.net/" -SRC_URI="svn+http://vision.svn.sourceforge.net/svnroot/vision/trunk#933" -REVISION="1" -STATUS_HAIKU="unstable" -DEPEND="" - -BUILD() -{ - cd vision-933 - cd Vision - if [ -n "$(setgcc | grep '2')" ]; then - cp Makefile.gcc2 Makefile - else - rm Makefile - cp Makefile.gcc4 Makefile - fi - make -} - -INSTALL() -{ - cd vision-933 - cd Vision - mkdir -p ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision - cp Vision ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision - cd data - cp -r * ${DESTDIR}`finddir B_APPS_DIRECTORY`/Vision -} - -COPYRIGHT="1999-2010 The Vision Team" -LICENSE="MPL v1.1" From ca9d5d96f943dc0f843919f72900fd94ce1e699b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 11:15:33 +0200 Subject: [PATCH 327/587] wqy_microhei: bump revision --- media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 8e5c39975..05855a509 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 @@ -12,15 +12,17 @@ COPYRIGHT=" 2007 Google Corp. 2008-2010 WenQuanYi Board of Trustees and Qianqian Fang " -REVISION="2" +REVISION="3" ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes PROVIDES=" wqy_microhei = $portVersion " REQUIRES="" BUILD_REQUIRES=" - coreutils" + coreutils + " BUILD_PREREQUIRES="" SOURCE_DIR="wqy-microhei" From 1bd14cdf9ba4088d3e50c1938cdee6a00d003fcd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 11:23:59 +0200 Subject: [PATCH 328/587] yasm: update recipe * Complete/fix provides. * Use runConfigure and jobArgs. * Move libyasm.a to develop/lib. --- dev-lang/yasm/yasm-1.2.0.recipe | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe index 45b9e7371..2f1ba2c4e 100644 --- a/dev-lang/yasm/yasm-1.2.0.recipe +++ b/dev-lang/yasm/yasm-1.2.0.recipe @@ -10,13 +10,15 @@ LICENSE=" GNU LGPL v2 " COPYRIGHT="2001-2011 Peter Johnson and other Yasm developers." -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" yasm = $portVersion compat >= 1 + cmd:vsyasm = $portVersion compat >= 1 cmd:yasm = $portVersion compat >= 1 - lib:libyasm = $portVersion compat >= 1.2 + cmd:ytasm = $portVersion compat >= 1 + devel:libyasm = $portVersion compat >= 1.2 " REQUIRES=" haiku >= $haikuVersion @@ -36,14 +38,17 @@ SOURCE_DIR="$portVersionedName" BUILD() { libtoolize --force --copy --install - ./configure $configureDirArgs \ + runConfigure ./configure \ --disable-nls - make + make $jobArgs + } INSTALL() { make install + + prepareInstalledDevelLibs libyasm } From 43f72867c77c9fa4a7359646c07540d63f4b3dc0 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 18 Jun 2013 11:53:19 +0200 Subject: [PATCH 329/587] openssh: bump revision --- net-misc/openssh/openssh-6.0p1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index 0ba3dbc5c..a03c4e9ec 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -4,7 +4,7 @@ LICENSE="OpenSSH" COPYRIGHT="2005-2012 Tatu Ylonen et al." SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz" CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="openssh-6.0p1.patch" From eb53e23f6c28731b839082af27c18840ce232ed2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 19 Jun 2013 05:06:25 +0200 Subject: [PATCH 330/587] wonderbrush: fix libz symlink Spotted by Michael Schroeder. Thanks! --- haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe index 61cf0789d..7f3142bb4 100644 --- a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe +++ b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe @@ -8,7 +8,7 @@ LICENSE="WonderBrush" COPYRIGHT="2005, Stephan Aßmus und Ingo Weinhold GbR" SRC_URI="http://yellowbites.com/downloads/WonderBrush-2.1.2-x86-gcc2-2013-01-02.zip#noarchive" CHECKSUM_MD5="28e64a56946c9f5aefa40486f35ffc77" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 !x86" DISABLE_SOURCE_PACKAGE=yes @@ -49,7 +49,7 @@ INSTALL() # has been linked against them. ln -s $portPackageLinksDir/lib:libfreetype/lib/libfreetype.so.6 \ $wonderbrushDir/lib/libfreetype.so - ln -s $portPackageLinksDir/lib:libfreetype/lib/libz.so.1 \ + ln -s $portPackageLinksDir/lib:libz/lib/libz.so.1 \ $wonderbrushDir/lib/libz.so addAppDeskbarSymlink $wonderbrushDir/WonderBrush From db2eb7bf3e4e0757dbdcf489cf59abff5dd5ef55 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 30 Jun 2013 10:55:16 +0200 Subject: [PATCH 331/587] texi2html: convert recipe to an actual recipe --- .../texi2html/patches/texi2html-1.82.patchset | 22 +++++++++ app-text/texi2html/texi2html-1.82.recipe | 48 ++++++++++++++----- 2 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 app-text/texi2html/patches/texi2html-1.82.patchset diff --git a/app-text/texi2html/patches/texi2html-1.82.patchset b/app-text/texi2html/patches/texi2html-1.82.patchset new file mode 100644 index 000000000..168b71776 --- /dev/null +++ b/app-text/texi2html/patches/texi2html-1.82.patchset @@ -0,0 +1,22 @@ +From 280524560a17d59215d9641b50abaf0e87ca296a Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sun, 30 Jun 2013 10:24:11 +0200 +Subject: doc/Makefile.am: fix location of HTML documentation + + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index f27b3bf..4567c56 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -5,7 +5,7 @@ info_TEXINFOS = texi2html.texi + # texi2html.ascii + # + texinfodata = $(datadir)/texinfo +-texinfohtmldir = $(texinfodata)/html ++texinfohtmldir = $(htmldir)/html + texinfohtml_DATA = texi2html.html + + # use the script out of the distribution NOT +-- +1.7.10.2 + diff --git a/app-text/texi2html/texi2html-1.82.recipe b/app-text/texi2html/texi2html-1.82.recipe index 3aea7ad1f..4ed8158c8 100644 --- a/app-text/texi2html/texi2html-1.82.recipe +++ b/app-text/texi2html/texi2html-1.82.recipe @@ -1,30 +1,54 @@ -DESCRIPTION="Perl script that converts Texinfo to HTML" +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." HOMEPAGE="http://www.nongnu.org/texi2html/" +COPYRIGHT="1999-2005 Patrice Dumas, Derek Price, Adrian Aichner & others." +LICENSE="GNU GPL v2" SRC_URI="http://download.savannah.gnu.org/releases/texi2html/texi2html-1.82.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="a8a9193c0ac1bec2f3ca7be40a5a82eb" +REVISION="1" +ARCHITECTURES="any" + +PATCHES="texi2html-1.82.patchset" + +PROVIDES=" + texi2html = $portVersion compat >= 1.82 + cmd:texi2html = $portVersion compat >= 1.82 + " +REQUIRES=" + cmd:perl + " +BUILD_REQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:libtoolize + cmd:make + cmd:perl + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd texi2html-1.82 libtoolize --force --copy --install ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + PERL="$portPackageLinksDir/cmd:perl/bin/perl" runConfigure ./configure + make $jobArgs } INSTALL() { - cd texi2html-1.82 make install } TEST() { - cd texi2html-1.82 make check } - -LICENSE="GNU GPL v2" -COPYRIGHT="1999-2005 Patrice Dumas, Derek Price, Adrian Aichner & others." From d465081d2f36a88508bc4afb83285abaca89d4ec Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 30 Jun 2013 10:56:03 +0200 Subject: [PATCH 332/587] ffmpeg: fix ffserver.conf path, include docs * Patch the hard-coded /etc/ffserver.conf path and declare it as global writable file. * Build the documentation. * Also include ffserver.conf as a documentation file. It requires editing, so we can't include it as a default settings file. --- media-video/ffmpeg/ffmpeg-0.10.2.recipe | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.recipe b/media-video/ffmpeg/ffmpeg-0.10.2.recipe index d94ad6254..3a2c1414d 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.2.recipe +++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe @@ -11,7 +11,7 @@ COPYRIGHT=" " SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2" CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="ffmpeg-0.10.2-gcc2.patch" @@ -44,7 +44,9 @@ BUILD_REQUIRES=" cmd:gcc cmd:ld cmd:make + cmd:perl cmd:pkg_config + cmd:texi2html cmd:yasm devel:libogg devel:libspeex @@ -57,8 +59,25 @@ BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion " +GLOBAL_WRITABLE_FILES=" + settings/ffserver.conf +" + SOURCE_DIR="$portVersionedName" +PATCH() +{ + # patch hard-coded config file path + sed -i "s,/etc/ffserver.conf,$sysconfDir/ffserver.conf," \ + ffserver.c \ + doc/ffserver.texi + + # patch hard-coded paths to perl + sed -i "s,/usr/bin/perl,$portPackageLinksDir/cmd:perl/bin/perl," \ + Doxyfile \ + doc/texi2pod.pl +} + BUILD() { # not an auto tools configure @@ -96,6 +115,10 @@ INSTALL() libswscale fixPkgconfig + # include the documented ffserver.conf + mkdir -p $docDir + cp doc/ffserver.conf $docDir + # devel package packageEntries devel \ $developDir From 85838439d003afa36f57fdaf02f4c139f41733ce Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 30 Jun 2013 11:21:06 +0200 Subject: [PATCH 333/587] openssh: bump revision The previously built package was broken (using package links paths for revision 4). Couldn't determine why -- possibly forgot to remove the work dir before building the final packages and somehow the revision increment wasn't picked up. --- net-misc/openssh/openssh-6.0p1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index a03c4e9ec..9d7a5e5aa 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -4,7 +4,7 @@ LICENSE="OpenSSH" COPYRIGHT="2005-2012 Tatu Ylonen et al." SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz" CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="openssh-6.0p1.patch" From 1fb79e7091588d98ee611502ede35739c4eb43c2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 30 Jun 2013 11:45:16 +0200 Subject: [PATCH 334/587] p7zip: add expander rules file --- app-arch/p7zip/p7zip-9.20.1.recipe | 6 +++++- app-arch/p7zip/sources/p7zip-expander-rules | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 app-arch/p7zip/sources/p7zip-expander-rules diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe index eb3a6dbd2..8b7d6bbaf 100644 --- a/app-arch/p7zip/p7zip-9.20.1.recipe +++ b/app-arch/p7zip/p7zip-9.20.1.recipe @@ -5,7 +5,7 @@ SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20. CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89" LICENSE="GNU LGPL v2.1" COPYRIGHT="1999-2011 7-Zip Igor Pavlov." -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="p7zip-9.20.1.patch" @@ -38,4 +38,8 @@ INSTALL() { make install DEST_DIR="" DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \ DEST_MAN=$manDir + + expanderRulesDir=$dataDir/expander/rules + mkdir -p $expanderRulesDir + cp "$portDir/sources/p7zip-expander-rules" "$expanderRulesDir/p7zip" } diff --git a/app-arch/p7zip/sources/p7zip-expander-rules b/app-arch/p7zip/sources/p7zip-expander-rules new file mode 100644 index 000000000..42e093864 --- /dev/null +++ b/app-arch/p7zip/sources/p7zip-expander-rules @@ -0,0 +1 @@ +"application/x-7z-compressed" .7z "7za l %s" "7za x -y %s" From 37ddc69743fd35257ac3f6af06c57b445efc844a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 30 Jun 2013 11:47:31 +0200 Subject: [PATCH 335/587] xz_utils: add expander rules file Untested. --- app-arch/xz_utils/sources/xz_utils-expander-rules | 3 +++ app-arch/xz_utils/xz_utils-5.0.1.recipe | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 app-arch/xz_utils/sources/xz_utils-expander-rules diff --git a/app-arch/xz_utils/sources/xz_utils-expander-rules b/app-arch/xz_utils/sources/xz_utils-expander-rules new file mode 100644 index 000000000..5645ec272 --- /dev/null +++ b/app-arch/xz_utils/sources/xz_utils-expander-rules @@ -0,0 +1,3 @@ +"application/x-xz" .tar.xz "tar -Jtvf %s" "tar -Jxvf %s" +"application/x-xz" .txz "tar -Jtvf %s" "tar -Jxvf %s" +"application/x-xz" .xz "echo %s | sed 's/.xz$//g'" "xz -df %s" diff --git a/app-arch/xz_utils/xz_utils-5.0.1.recipe b/app-arch/xz_utils/xz_utils-5.0.1.recipe index c55bf9fcf..1f8a52190 100644 --- a/app-arch/xz_utils/xz_utils-5.0.1.recipe +++ b/app-arch/xz_utils/xz_utils-5.0.1.recipe @@ -8,7 +8,7 @@ LICENSE=" GNU GPL v3 " COPYRIGHT="2005-2011 Lasse Collin" -REVISION="2" +REVISION="3" ARCHITECTURES="!x86_gcc2 ?x86" PROVIDES=" @@ -65,6 +65,10 @@ BUILD() INSTALL() { make install + + expanderRulesDir=$dataDir/expander/rules + mkdir -p $expanderRulesDir + cp "$portDir/sources/xz_utils-expander-rules" "$expanderRulesDir/xz_utils" } TEST() From f7b2bc97fab03f41de82f58ab825253f0135cc32 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 5 Jul 2013 11:22:46 +0200 Subject: [PATCH 336/587] bepdf: unbreak recipe --- haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe | 1 - 1 file changed, 1 deletion(-) 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 370153481..3280b1c70 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 @@ -38,7 +38,6 @@ SOURCE_DIR="$portVersionedName" BUILD() { -exit 0 if [ $targetArchitecture == 'x86_gcc2' ]; then export BEPDF_BUILD_GCC=gcc2 else From b3b4d3a35bfb117d37f36abdfd6f2e305aab41f9 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 5 Jul 2013 11:57:19 +0200 Subject: [PATCH 337/587] binutils: update recipe to new versioning scheme * 130421 -> 2013_04_21 * Remove 110711 recipe. It would otherwise appear to have a greater version. --- .../binutils/binutils-2.17_110711.recipe | 169 ------------------ ...recipe => binutils-2.17_2013_04_21.recipe} | 4 +- 2 files changed, 2 insertions(+), 171 deletions(-) delete mode 100644 sys-devel/binutils/binutils-2.17_110711.recipe rename sys-devel/binutils/{binutils-2.17_130421.recipe => binutils-2.17_2013_04_21.recipe} (97%) diff --git a/sys-devel/binutils/binutils-2.17_110711.recipe b/sys-devel/binutils/binutils-2.17_110711.recipe deleted file mode 100644 index 0ecdbe42c..000000000 --- a/sys-devel/binutils/binutils-2.17_110711.recipe +++ /dev/null @@ -1,169 +0,0 @@ -SUMMARY="The GNU assembler, linker and binary utilities" -HOMEPAGE="http://www.gnu.org/software/binutils" -SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#9f9e588ceb7baa6bc5ac0193fb90212fc7fd667c" -REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" -LICENSE=" - GNU GPL v2 - GNU LGPL v2 - " -COPYRIGHT="1988-2006 Free Software Foundation, Inc." - - -PROVIDES=" - binutils = $portVersion compat >= 2.17 - cmd:addr2line = $portVersion compat >= 2.17 - cmd:ar = $portVersion compat >= 2.17 - cmd:as = $portVersion compat >= 2.17 - cmd:c++filt = $portVersion compat >= 2.17 - cmd:gprof = $portVersion compat >= 2.17 - cmd:ld = $portVersion compat >= 2.17 - cmd:nm = $portVersion compat >= 2.17 - cmd:objcopy = $portVersion compat >= 2.17 - cmd:objdump = $portVersion compat >= 2.17 - cmd:ranlib = $portVersion compat >= 2.17 - cmd:readelf = $portVersion compat >= 2.17 - cmd:size = $portVersion compat >= 2.17 - cmd:strings = $portVersion compat >= 2.17 - cmd:strip = $portVersion compat >= 2.17 - " - -REQUIRES=" - haiku >= $haikuVersion - " -BUILD_REQUIRES=" - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:autoconf - binutils - gcc - cmd:flex - cmd:make - cmd:sed - cmd:tar - texinfo - " - -SOURCE_DIR="$portVersionedName" -BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL - -binutilsDir=$(pwd)/legacy/binutils -relativeArchInstallDir="develop/tools/${portVersionedName}" -archInstallDir="$prefix/$relativeArchInstallDir" -objectsDir=$(pwd)/../${portVersionedName}-obj -binutilsObjectsDir=$objectsDir/binutils - -BUILD() -{ - rm -rf $objectsDir - - # Touch all *.info files, as newer texinfos don't like their format - (cd $binutilsDir; find . -name \*.info | xargs touch) - - # build binutils - mkdir -p $binutilsObjectsDir - cd $binutilsObjectsDir - CFLAGS="-O2" CXXFLAGS="-O2" "$binutilsDir/configure" \ - --prefix=$prefix --exec-prefix=$archInstallDir \ - --bindir=$prefix/bin --libdir=$prefix/lib \ - --includedir=$prefix/develop/headers/binutils \ - --mandir=$prefix/documentation/man \ - --with-htmldir=documentation/html/binutils \ - --disable-nls --enable-shared=yes - make -} - -INSTALL() -{ - cd $binutilsObjectsDir - archName=$(grep '^target_alias' Makefile | cut -d= -f2) - - make install - make install-html - - ### HTML documentation #################################### - - echo "Organizing HTML documentation..." - html_base=$prefix/documentation/html/binutils - cd $html_base - - mv as.html as - ln -sf as/index.html as.html - mv bfd.html bfd - ln -sf bfd/index.html bfd.html - mv binutils.html binutils - ln -sf binutils/index.html binutils.html - mv gprof.html gprof - ln -sf gprof/index.html gprof.html - mv ld.html ld - ln -sf ld/index.html ld.html - rm standards.html - - ### Strip ################################################# - - echo "Strip debug info" - - cd $prefix - find bin -type f | xargs -r strip --strip-debug - strip --strip-debug lib/*.a - strip --strip-debug $archInstallDir/$archName/bin/* - - ### Symlinks ############################################## - - echo "Creating required symlinks" - - # remove duplicate architecture-dependent binaries from $prefix/bin - cd $prefix/bin - rm ar as ld nm objdump ranlib strip - - # make all tools available via default paths if these are - # the system binutils - if [ $architecture = 'x86_gcc2' ]; then - echo "Symlinking binaries into default path" - mkdir -p $prefix/bin - ln -sfn ../$relativeArchInstallDir/$archName/bin/* . - fi - - ### Cleanup ################################################# - - echo "Cleanup" - - cd $prefix - rm -rf info -} - -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. - " diff --git a/sys-devel/binutils/binutils-2.17_130421.recipe b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe similarity index 97% rename from sys-devel/binutils/binutils-2.17_130421.recipe rename to sys-devel/binutils/binutils-2.17_2013_04_21.recipe index e2d8a8e6e..104d759b3 100644 --- a/sys-devel/binutils/binutils-2.17_130421.recipe +++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe @@ -1,7 +1,7 @@ SUMMARY="The GNU assembler, linker and binary utilities" HOMEPAGE="http://www.gnu.org/software/binutils" -SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462" -REVISION="2" +SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#d0613f2026ca25e7f673188291b63fd5d7a51c72" +REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" LICENSE=" GNU GPL v2 From d92b425466487172c0fdf06aceb16b0aad8e0b7e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 5 Jul 2013 13:04:32 +0200 Subject: [PATCH 338/587] gcc: add recipe for current version 2.95.3_2013_05_04 Also remove older recipes. --- sys-devel/gcc/gcc-2.95.3_110711.recipe | 151 ----------------- sys-devel/gcc/gcc-2.95.3_130421.recipe | 152 ------------------ ...25.recipe => gcc-2.95.3_2013_05_04.recipe} | 6 +- 3 files changed, 3 insertions(+), 306 deletions(-) delete mode 100644 sys-devel/gcc/gcc-2.95.3_110711.recipe delete mode 100644 sys-devel/gcc/gcc-2.95.3_130421.recipe rename sys-devel/gcc/{gcc-2.95.3_130425.recipe => gcc-2.95.3_2013_05_04.recipe} (94%) diff --git a/sys-devel/gcc/gcc-2.95.3_110711.recipe b/sys-devel/gcc/gcc-2.95.3_110711.recipe deleted file mode 100644 index 6d5b5138e..000000000 --- a/sys-devel/gcc/gcc-2.95.3_110711.recipe +++ /dev/null @@ -1,151 +0,0 @@ -SUMMARY="C/C++ compiler" -DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5." -HOMEPAGE="http://gcc.gnu.org" -LICENSE=" - GNU GPL v2 - GNU LGPL v2 - " -COPYRIGHT="1988-2000 Free Software Foundation, Inc." -SRC_URI=" - git+file://$portBaseDir/../binutils/work-2.17_130421/sources/binutils-2.17_130421#9f9e588ceb7baa6bc5ac0193fb90212fc7fd667c - git+git://github.com/haiku/BuildtoolsPM.git#9f9e588ceb7baa6bc5ac0193fb90212fc7fd667c - " -REVISION="5" -ARCHITECTURES="x86_gcc2 ?x86" - -PROVIDES=" - gcc = $portVersion compat >= 2.95.3 - cmd:c++ = $portVersion compat >= 2.95.3 - cmd:cpp = $portVersion compat >= 2.95.3 - cmd:g++ = $portVersion compat >= 2.95.3 - cmd:gcc = $portVersion compat >= 2.95.3 - cmd:gcov = 1.5 compat >= 1.5 - cmd:protoize = $portVersion compat >= 2.95.3 - cmd:unprotoize = $portVersion compat >= 2.95.3 - " - -REQUIRES=" - haiku >= $haikuVersion - " -BUILD_REQUIRES=" - binutils - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:autoconf - gcc - cmd:flex - cmd:make - cmd:sed - cmd:tar - cmd:makeinfo - " - -SOURCE_DIR="$portVersionedName" -BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL - -gccDir=$(pwd)/legacy/gcc -gccDate=110711 -relativeGccInstallDir="develop/tools/gcc-2.95.3-${gccDate}" -gccInstallDir="$prefix/$relativeGccInstallDir" -objectsDir=$(pwd)/../${portVersionedName}-obj -gccObjectsDir=$objectsDir/gcc - -BUILD() -{ - rm -rf $objectsDir - - # Touch some files generated by bison, so that bison won't run to update - # them. Fixes issues with newer bison versions. - # And while at it, touch gperf target, too (as gperf may not be installed). - (cd $gccDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ - cp/parse.h c-gperf.h) - - # build gcc - mkdir -p $gccObjectsDir - cd $gccObjectsDir - CFLAGS="-O2" CXXFLAGS="-O2" "$gccDir/configure" \ - --prefix=$gccInstallDir \ - --disable-nls --enable-shared=yes --enable-languages=c,c++ - make bootstrap || true - # The above will fail when compiling builtinbuf.cc, but we can ignore - # that since it's trying to build libstdc++.so, which haiku provides - # anyway. -} - -INSTALL() -{ - cd $gccObjectsDir - make install - - base=$gccInstallDir - - ### HTML documentation #################################### - - html_base=$prefix/documentation/packages/$portVersionedName - if [ ! -d "$html_base" ]; then - echo "Building HTML documentation..." - mkdir -p $html_base - cd $html_base - - makeinfo --html "$gccDir/gcc/cpp.texi" - makeinfo --html "$gccDir/gcc/gcc.texi" - makeinfo --force --html "$gccDir/libio/iostream.texi" \ - && true - # some errors - - ln -sf cpp/index.html $html_base/cpp.html - ln -sf gcc/index.html $html_base/gcc.html - ln -sf iostream/index.html $html_base/iostream.html - fi - - ### Symlinks ############################################## - - echo "Creating required symlinks" - - # convert to absolute links to relative ones - cd $base/bin - ln -sfn g++ c++ - ln -sfn gcc i586-pc-haiku-gcc - - # make all tools available via default paths if this is the system - # compiler - if [ $architecture = 'x86_gcc2' ]; then - echo "Symlinking binaries into default path" - mkdir -p $prefix/bin - cd $prefix/bin - ln -sfn ../$relativeGccInstallDir/bin/* . - fi - - ### Strip ################################################# - - echo "Strip debug info" - - cd $base - strip --strip-debug bin/* - strip --strip-debug i586-pc-haiku/bin/* - strip --strip-debug lib/gcc-lib/i586-pc-haiku/2.95.3-${gccDate}/* \ - &>/dev/null || true - - ### Cleanup ############################################### - - echo "Cleanup" - - if [ -d $base/man -o -d $base/info -o -d $base/share ]; then - rm -rf $base/man - rm -rf $base/info - rm -rf $base/share - fi - - rm -f $base/lib/gcc-lib/i586-pc-haiku/2.95.3-haiku-$gccDate/include/math.h - - ### C++ includes ########################################## - - echo "Install C++ includes & library" - - rm -rf $base/include/g++ - ln -snf /boot/system/develop/headers/c++/2.95.3 $base/include/g++ - - ln -snf /boot/system/lib/libstdc++.r4.so $base/lib/ - ln -snf /boot/system/lib/libstdc++.so $base/lib/ -} diff --git a/sys-devel/gcc/gcc-2.95.3_130421.recipe b/sys-devel/gcc/gcc-2.95.3_130421.recipe deleted file mode 100644 index 720efa4e6..000000000 --- a/sys-devel/gcc/gcc-2.95.3_130421.recipe +++ /dev/null @@ -1,152 +0,0 @@ -SUMMARY="C/C++ compiler" -DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5." -HOMEPAGE="http://gcc.gnu.org" -LICENSE=" - GNU GPL v2 - GNU LGPL v2 - " -COPYRIGHT="1988-2000 Free Software Foundation, Inc." -SRC_URI=" - git+file://$portBaseDir/../binutils/work-2.17_130421/sources/binutils-2.17_130421#278de7bc9243876c2e08f8d6a243d510c5000462 - git+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462 - " -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" - -PROVIDES=" - gcc = $portVersion compat >= 2.95.3 - cmd:c++ = $portVersion compat >= 2.95.3 - cmd:cpp = $portVersion compat >= 2.95.3 - cmd:g++ = $portVersion compat >= 2.95.3 - cmd:gcc = $portVersion compat >= 2.95.3 - cmd:gcov = 1.5 compat >= 1.5 - cmd:protoize = $portVersion compat >= 2.95.3 - cmd:unprotoize = $portVersion compat >= 2.95.3 - " - -REQUIRES=" - haiku >= $haikuVersion - " -BUILD_REQUIRES=" - binutils - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:autoconf - gcc - cmd:flex - cmd:make - cmd:sed - cmd:tar - cmd:makeinfo - " - -SOURCE_DIR="$portVersionedName" -BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL - -gccDir=$(pwd)/legacy/gcc -gccDate=110711 -relativeGccInstallDir="develop/tools/gcc-2.95.3-${gccDate}" -gccInstallDir="$prefix/$relativeGccInstallDir" -objectsDir=$(pwd)/../${portVersionedName}-obj -gccObjectsDir=$objectsDir/gcc - -BUILD() -{ - rm -rf $objectsDir - - # Touch some files generated by bison, so that bison won't run to update - # them. Fixes issues with newer bison versions. - # And while at it, touch gperf target, too (as gperf may not be installed). - (cd $gccDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ - cp/parse.h c-gperf.h) - - # build gcc - mkdir -p $gccObjectsDir - cd $gccObjectsDir - CFLAGS="-O2" CXXFLAGS="-O2" "$gccDir/configure" \ - --prefix=$gccInstallDir \ - --disable-nls --enable-shared=yes --enable-languages=c,c++ - make bootstrap || true - # The above will fail when compiling builtinbuf.cc, but we can ignore - # that since it's trying to build libstdc++.so, which haiku provides - # anyway. -} - -INSTALL() -{ - cd $gccObjectsDir - make install - - base=$gccInstallDir - - ### HTML documentation #################################### - - html_base=$prefix/documentation/packages/$portVersionedName - if [ ! -d "$html_base" ]; then - echo "Building HTML documentation..." - mkdir -p $html_base - cd $html_base - - makeinfo --html "$gccDir/gcc/cpp.texi" - makeinfo --html "$gccDir/gcc/gcc.texi" - makeinfo --force --html "$gccDir/libio/iostream.texi" \ - && true - # some errors - - ln -sf cpp/index.html $html_base/cpp.html - ln -sf gcc/index.html $html_base/gcc.html - ln -sf iostream/index.html $html_base/iostream.html - fi - - ### Symlinks ############################################## - - echo "Creating required symlinks" - - # convert to absolute links to relative ones - cd $base/bin - ln -sfn g++ c++ - ln -sfn gcc cc - ln -sfn gcc i586-pc-haiku-gcc - - # make all tools available via default paths if this is the system - # compiler - if [ $architecture = 'x86_gcc2' ]; then - echo "Symlinking binaries into default path" - mkdir -p $prefix/bin - cd $prefix/bin - ln -sfn ../$relativeGccInstallDir/bin/* . - fi - - ### Strip ################################################# - - echo "Strip debug info" - - cd $base - strip --strip-debug bin/* - strip --strip-debug i586-pc-haiku/bin/* - strip --strip-debug lib/gcc-lib/i586-pc-haiku/2.95.3-${gccDate}/* \ - &>/dev/null || true - - ### Cleanup ############################################### - - echo "Cleanup" - - if [ -d $base/man -o -d $base/info -o -d $base/share ]; then - rm -rf $base/man - rm -rf $base/info - rm -rf $base/share - fi - - rm -f $base/lib/gcc-lib/i586-pc-haiku/2.95.3-haiku-$gccDate/include/math.h - - ### C++ includes ########################################## - - echo "Install C++ includes & library" - - rm -rf $base/include/g++ - ln -snf /boot/system/develop/headers/c++/2.95.3 $base/include/g++ - - ln -snf /boot/system/lib/libstdc++.r4.so $base/lib/ - ln -snf /boot/system/lib/libstdc++.so $base/lib/ -} diff --git a/sys-devel/gcc/gcc-2.95.3_130425.recipe b/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe similarity index 94% rename from sys-devel/gcc/gcc-2.95.3_130425.recipe rename to sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe index 96a76d9b9..3625cb85b 100644 --- a/sys-devel/gcc/gcc-2.95.3_130425.recipe +++ b/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe @@ -7,10 +7,10 @@ LICENSE=" " COPYRIGHT="1988-2000 Free Software Foundation, Inc." SRC_URI=" - git+file://$portBaseDir/../binutils/work-2.17_130421/download/BuildtoolsPM.git#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045 - git+git://github.com/haiku/BuildtoolsPM.git#a57415355d72c2f0aa2afd1c374c9f7f9fc7f045 + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#d0613f2026ca25e7f673188291b63fd5d7a51c72 + git+git://github.com/haiku/BuildtoolsPM.git#d0613f2026ca25e7f673188291b63fd5d7a51c72 " -REVISION="2" +REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" From b961047794ea5e2f248b5f46480173c0e6438cf7 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 8 Jul 2013 16:18:42 +0200 Subject: [PATCH 339/587] ncurses: the wrong program files were installed The build system installed the libtool wrapper scripts (used only for the build) instead of the built program files. --- sys-libs/ncurses/ncurses-5.9.recipe | 4 +- sys-libs/ncurses/patches/ncurses-5.9.patchset | 42 +++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 sys-libs/ncurses/patches/ncurses-5.9.patchset diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index 3be55157a..f257c3aef 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -4,9 +4,11 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz" CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1" LICENSE="MIT" COPYRIGHT="1998-2011 Free Software Foundation, Inc." -REVISION="7" +REVISION="8" ARCHITECTURES="x86_gcc2 ?x86" +PATCHES="ncurses-5.9.patchset" + PROVIDES=" ncurses = $portVersion compat >= 5 cmd:captoinfo = $portVersion compat >= 5 diff --git a/sys-libs/ncurses/patches/ncurses-5.9.patchset b/sys-libs/ncurses/patches/ncurses-5.9.patchset new file mode 100644 index 000000000..5b2d05fd1 --- /dev/null +++ b/sys-libs/ncurses/patches/ncurses-5.9.patchset @@ -0,0 +1,42 @@ +From c10c7316b0be6ee2249ee2eeeeea6bbeb973d4cd Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Mon, 8 Jul 2013 15:51:09 +0200 +Subject: progs/Makefile.in: make sure the right programs are installed + +The Makefile installed the libtool wrapper scripts which are only meant +to be used for the build. + +diff --git a/progs/Makefile.in b/progs/Makefile.in +index bdb8a0f..f3170f1 100644 +--- a/progs/Makefile.in ++++ b/progs/Makefile.in +@@ -188,19 +188,19 @@ transform.h : + echo "#endif /* __TRANSFORM_H */" >>$@ + + install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir) +-@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) tic$x $(DESTDIR)$(bindir)/$(actual_tic) +-@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) toe$x $(DESTDIR)$(bindir)/$(actual_toe) ++@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/tic$x $(DESTDIR)$(bindir)/$(actual_tic) ++@MAKE_TERMINFO@ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/toe$x $(DESTDIR)$(bindir)/$(actual_toe) + @MAKE_TERMINFO@ @echo "linking $(actual_infotocap) to $(actual_tic)" + @MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap) + @MAKE_TERMINFO@ (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_infotocap)) + @MAKE_TERMINFO@ @echo "linking $(actual_captoinfo) to $(actual_tic)" + @MAKE_TERMINFO@ -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo) + @MAKE_TERMINFO@ (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo)) +- $(LIBTOOL_INSTALL) $(INSTALL_PROG) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp) +- $(LIBTOOL_INSTALL) $(INSTALL_PROG) clear$x $(DESTDIR)$(bindir)/$(actual_clear) +- $(LIBTOOL_INSTALL) $(INSTALL_PROG) tabs$x $(DESTDIR)$(bindir)/$(actual_tabs) +- $(LIBTOOL_INSTALL) $(INSTALL_PROG) tput$x $(DESTDIR)$(bindir)/$(actual_tput) +- $(LIBTOOL_INSTALL) $(INSTALL_PROG) tset$x $(DESTDIR)$(bindir)/$(actual_tset) ++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp) ++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/clear$x $(DESTDIR)$(bindir)/$(actual_clear) ++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/tabs$x $(DESTDIR)$(bindir)/$(actual_tabs) ++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/tput$x $(DESTDIR)$(bindir)/$(actual_tput) ++ $(LIBTOOL_INSTALL) $(INSTALL_PROG) .libs/tset$x $(DESTDIR)$(bindir)/$(actual_tset) + @echo "linking $(actual_reset) to $(actual_tset)" + -@rm -f $(DESTDIR)$(bindir)/$(actual_reset) + (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset)) +-- +1.7.10.2 + From 9592e95b6e080177d56d1fb6b8fb15a053561bfe Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 11 Jul 2013 13:46:34 +0200 Subject: [PATCH 340/587] Build debug info packages for grep, sed, and tar --- app-arch/tar/tar-1.26.recipe | 5 ++++- sys-apps/grep/grep-2.14.recipe | 7 ++++++- sys-apps/sed/sed-4.2.1.recipe | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index 8f5af3419..831d7a73d 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -16,7 +16,7 @@ COPYRIGHT="1990-2011 Free Software Foundation, Inc." LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2" CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -38,6 +38,9 @@ BUILD_PREREQUIRES=" cmd:make " +defineDebugInfoPackage tar \ + $binDir/tar + SOURCE_DIR="$portVersionedName" BUILD() diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe index a785439f5..d6f66fa86 100644 --- a/sys-apps/grep/grep-2.14.recipe +++ b/sys-apps/grep/grep-2.14.recipe @@ -8,7 +8,7 @@ CHECKSUM_MD5="db55b9fc67d8c0895f3c73e94e2aebe3" # XZ file format: #SRC_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz" #CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="grep-2.14-gcc2.patch" @@ -40,6 +40,11 @@ BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion " +defineDebugInfoPackage grep \ + $binDir/egrep \ + $binDir/fgrep \ + $binDir/grep + 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 df4fb1d54..61ea22987 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -14,7 +14,7 @@ COPYRIGHT="1989-2009 Free Software Foundation, Inc." LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz" CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -33,6 +33,9 @@ BUILD_PREREQUIRES=" cmd:sed " +defineDebugInfoPackage sed \ + $binDir/sed + SOURCE_DIR="$portVersionedName" BUILD() From d689bb63d81eb72c7683437fce2be840332720e0 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 29 Jul 2013 15:54:37 +0200 Subject: [PATCH 341/587] Drop 'packs' directory. * grouping of packages will soon re-emerge as 'meta' ports. --- packs/libpak/libpak-0.9.1.recipe | 117 -------- packs/libpak/libpak-0.9.2.recipe | 122 -------- packs/libpak/libpak-0.9.3.recipe | 166 ----------- packs/libpak/libpak-0.9.4-gcc2.recipe | 140 ---------- packs/libpak/libpak-0.9.4-gcc4.recipe | 147 ---------- packs/libpak/libpak-0.9.4.recipe | 263 ------------------ packs/libpak/libpak-0.9.5-gcc2.recipe | 143 ---------- packs/libpak/libpak-0.9.6-gcc2.recipe | 152 ---------- packs/libpak/libpak-0.9.6-gcc4.recipe | 159 ----------- packs/libpak/libpak-0.9.recipe | 112 -------- .../optionalpackages-0.5.recipe | 260 ----------------- .../optionalpackages-0.6-gcc2.recipe | 179 ------------ .../optionalpackages-0.6-gcc4.recipe | 179 ------------ .../optionalpackages-0.6.recipe | 262 ----------------- .../optionalpackages-0.7-gcc2.recipe | 184 ------------ .../optionalpackages-0.7-gcc4.recipe | 178 ------------ 16 files changed, 2763 deletions(-) delete mode 100644 packs/libpak/libpak-0.9.1.recipe delete mode 100644 packs/libpak/libpak-0.9.2.recipe delete mode 100644 packs/libpak/libpak-0.9.3.recipe delete mode 100644 packs/libpak/libpak-0.9.4-gcc2.recipe delete mode 100644 packs/libpak/libpak-0.9.4-gcc4.recipe delete mode 100644 packs/libpak/libpak-0.9.4.recipe delete mode 100644 packs/libpak/libpak-0.9.5-gcc2.recipe delete mode 100644 packs/libpak/libpak-0.9.6-gcc2.recipe delete mode 100644 packs/libpak/libpak-0.9.6-gcc4.recipe delete mode 100644 packs/libpak/libpak-0.9.recipe delete mode 100644 packs/optionalpackages/optionalpackages-0.5.recipe delete mode 100644 packs/optionalpackages/optionalpackages-0.6-gcc2.recipe delete mode 100644 packs/optionalpackages/optionalpackages-0.6-gcc4.recipe delete mode 100644 packs/optionalpackages/optionalpackages-0.6.recipe delete mode 100644 packs/optionalpackages/optionalpackages-0.7-gcc2.recipe delete mode 100644 packs/optionalpackages/optionalpackages-0.7-gcc4.recipe diff --git a/packs/libpak/libpak-0.9.1.recipe b/packs/libpak/libpak-0.9.1.recipe deleted file mode 100644 index d78b19c27..000000000 --- a/packs/libpak/libpak-0.9.1.recipe +++ /dev/null @@ -1,117 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.1.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/mercurial >= 1.6 - dev-libs/libedit >= 20100424" -CHECKSUM_MD5="16c697819a60958a4aaaef772a46c726" -BUILD() -{ - HPLOC=`haikuporter -t` - cd libpak-0.9.1 - -## these are needed for building package in the libpak - haikuporter -i cmake-2.8.1 - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip . - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip . - haikuporter -i -d -y gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip . -## - haikuporter -y -d -i readline-6.0 - mv ${HPLOC}/sys-libs/readline/*.zip . - haikuporter -y -d -i zlib-1.2.5 - mv ${HPLOC}/sys-libs/zlib/*.zip . - haikuporter -y -d -i gettext-0.17 - mv ${HPLOC}/sys-devel/gettext/*.zip . - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip . - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip . - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip . - haikuporter -y -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip . - haikuporter -y -d -i speex-1.2-git - mv ${HPLOC}/media-libs/speex/*.zip . - haikuporter -y -d -i jpeg-7 - mv ${HPLOC}/media-libs/jpeg/*.zip . - haikuporter -y -d -i libpng-1.2.44 - mv ${HPLOC}/media-libs/libpng/*.zip . - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip . - haikuporter -y -d -i tiff-3.9.1 - mv ${HPLOC}/media-libs/tiff/*.zip . - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip . - haikuporter -y -d -i lcms-2.0a - mv ${HPLOC}/media-libs/lcms/*.zip . - haikuporter -y -d -i libogg-1.2.0 - mv ${HPLOC}/media-libs/libogg/*.zip . - haikuporter -y -d -i libvorbis-1.3.1 - mv ${HPLOC}/media-libs/libvorbis/*.zip . - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip . - haikuporter -y -d -i libmodplug-0.8.7 - mv ${HPLOC}/media-libs/libmodplug/*.zip . - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip . - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip . - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip . - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip . - haikuporter -y -d -i libsdl-1.2.14 - mv ${HPLOC}/media-libs/libsdl/*.zip . - haikuporter -y -d -i sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip . - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip . - haikuporter -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip . - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip . - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip . - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip . - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip . - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip . - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip . -## these don't build correctly with gcc4 - if [ -n "$(setgcc | grep '2')" ]; then - haikuporter -y -d -i libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.zip . - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip . - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip . - haikuporter -y -d -i jgmod-0.99 - mv ${HPLOC}/media-libs/jgmod/*.zip . - fi -## these don't build correctly yet -## haikuporter -y -d -i fblend-0.4 -## mv ${HPLOC}/media-libs/fblend/*.zip . -} - -INSTALL() -{ - cd libpak-0.9.1 - mkdir -p ${DESTDIR}/boot - echo "" > ${DESTDIR}/boot/.opd - for z in *.zip; - do unzip -o $z -d ${DESTDIR}/boot - echo -e "\n" >> ${DESTDIR}/boot/.opd - cat ${DESTDIR}/boot/.OptionalPackageDescription >> ${DESTDIR}/boot/.opd - done - cp ${DESTDIR}/boot/.opd ${DESTDIR}/boot/.OptionalPackageDescription -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.2.recipe b/packs/libpak/libpak-0.9.2.recipe deleted file mode 100644 index 7f012e8c9..000000000 --- a/packs/libpak/libpak-0.9.2.recipe +++ /dev/null @@ -1,122 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.2.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-vcs/mercurial >= 1.6 - dev-vcs/git >= 1.7.1 - dev-libs/libedit >= 20100424" -CHECKSUM_MD5="7c42abb8d837ead79bf64e3c276b1170" -BUILD() -{ - HPLOC=`haikuporter -t` - cd libpak-0.9.2 - -## these are needed for building package in the libpak - haikuporter -i cmake-2.8.1 - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip . - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip . - haikuporter -i -d -y gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip . -## - haikuporter -y -d -i readline-6.0 - mv ${HPLOC}/sys-libs/readline/*.zip . - haikuporter -y -d -i zlib-1.2.5 - mv ${HPLOC}/sys-libs/zlib/*.zip . - haikuporter -y -d -i lua-5.1.4 - mv ${HPLOC}/dev-lang/lua/*.zip . - haikuporter -y -d -i gettext-0.17 - mv ${HPLOC}/sys-devel/gettext/*.zip . - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip . - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip . - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip . - haikuporter -y -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip . - haikuporter -y -d -i speex-1.2-git - mv ${HPLOC}/media-libs/speex/*.zip . - haikuporter -y -d -i jpeg-8b - mv ${HPLOC}/media-libs/jpeg/*.zip . - haikuporter -y -d -i libpng-1.2.44 - mv ${HPLOC}/media-libs/libpng/*.zip . - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip . - haikuporter -y -d -i giflib-4.1.6 - mv ${HPLOC}/media-libs/giflib/*.zip . - haikuporter -y -d -i tiff-3.9.4 - mv ${HPLOC}/media-libs/tiff/*.zip . - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip . - haikuporter -y -d -i lcms-2.0a - mv ${HPLOC}/media-libs/lcms/*.zip . - haikuporter -y -d -i libogg-1.2.0 - mv ${HPLOC}/media-libs/libogg/*.zip . - haikuporter -y -d -i libvorbis-1.3.1 - mv ${HPLOC}/media-libs/libvorbis/*.zip . - haikuporter -y -d -i libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.zip . - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip . - haikuporter -y -d -i libmodplug-0.8.7 - mv ${HPLOC}/media-libs/libmodplug/*.zip . - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip . - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip . - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip . - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip . - haikuporter -y -d -i libsdl-1.2-hg - mv ${HPLOC}/media-libs/libsdl/*.zip . - haikuporter -y -d -i sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip . - haikuporter -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip . - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip . - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip . - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip . - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip . - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip . - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip . - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip . - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip . - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip . - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip . - haikuporter -y -d -i jgmod-0.99 - mv ${HPLOC}/media-libs/jgmod/*.zip . -## these don't build correctly yet -## haikuporter -y -d -i fblend-0.4 -## mv ${HPLOC}/media-libs/fblend/*.zip . -} - -INSTALL() -{ - cd libpak-0.9.2 - mkdir -p ${DESTDIR}/boot - echo "" > ${DESTDIR}/boot/.opd - for z in *.zip; - do unzip -o $z -d ${DESTDIR}/boot - echo -e "\n" >> ${DESTDIR}/boot/.opd - cat ${DESTDIR}/boot/.OptionalPackageDescription >> ${DESTDIR}/boot/.opd - done - cp ${DESTDIR}/boot/.opd ${DESTDIR}/boot/Full.OptionalPackageDescription - rm ${DESTDIR}/boot/.opd -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.3.recipe b/packs/libpak/libpak-0.9.3.recipe deleted file mode 100644 index 03778310c..000000000 --- a/packs/libpak/libpak-0.9.3.recipe +++ /dev/null @@ -1,166 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.3.zip" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libedit >= 20100424 - dev-util/cmake >= 2.6 - dev-util/gperf >= 3.0.4 - dev-vcs/git >= 1.7.1 - dev-vcs/mercurial >= 1.6 - sys-devel/gettext >= 0.17" - -CHECKSUM_MD5="f183eb4b0b6ac2282a9f1c7fd41ac282" -BUILD() -{ - HPLOC=`haikuporter -t` - cd libpak-0.9.3 - -## these are needed for building package in the libpak - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip . - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip . -## - setgcc gcc2 - haikuporter -y -d -i readline-6.1 - mv ${HPLOC}/sys-libs/readline/*.zip . - haikuporter -y -d -i lua-5.1.4 - mv ${HPLOC}/dev-lang/lua/*.zip . - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip . - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip . - haikuporter -y -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip . - haikuporter -y -d -i speex-1.2-git - mv ${HPLOC}/media-libs/speex/*.zip . - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip . - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip . - haikuporter -y -d -i lcms-2.0a - mv ${HPLOC}/media-libs/lcms/*.zip . - haikuporter -y -d -i libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.zip . - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip . - haikuporter -y -d -i libmodplug-0.8.7 - mv ${HPLOC}/media-libs/libmodplug/*.zip . - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip . - haikuporter -y -d -i libogg-1.2.0 - mv ${HPLOC}/media-libs/libogg/*.zip . - haikuporter -y -d -i libvorbis-1.3.1 - mv ${HPLOC}/media-libs/libvorbis/*.zip . - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip . - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip . - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip . - haikuporter -y -d -i libsdl-1.2-hg - mv ${HPLOC}/media-libs/libsdl/*.zip . - haikuporter -y -d -i sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip . - haikuporter -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip . - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip . - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip . - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip . - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip . - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip . - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip . - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip . - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip . - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip . - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip . - haikuporter -y -d -i jgmod-0.99 - mv ${HPLOC}/media-libs/jgmod/*.zip . - - setgcc gcc4 - haikuporter -y -d -i readline-6.0 - mv ${HPLOC}/sys-libs/readline/*.zip . - haikuporter -y -d -i lua-5.1.4 - mv ${HPLOC}/dev-lang/lua/*.zip . - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip . - haikuporter -c -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip . - haikuporter -c -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip . -## Flac fails to build on gcc4 currently -## haikuporter -c -y -d -i flac-1.2.1 -## mv ${HPLOC}/media-libs/flac/*.zip . - haikuporter -c -y -d -i speex-1.2-git - mv ${HPLOC}/media-libs/speex/*.zip . - haikuporter -c -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip . - haikuporter -c -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip . - haikuporter -c -y -d -i lcms-2.0a - mv ${HPLOC}/media-libs/lcms/*.zip . - haikuporter -c -y -d -i libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.zip . - haikuporter -c -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip . - haikuporter -c -y -d -i libmodplug-0.8.7 - mv ${HPLOC}/media-libs/libmodplug/*.zip . - haikuporter -c -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip . - haikuporter -c -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip . - haikuporter -c -y -d -i libsdl-1.2-hg - mv ${HPLOC}/media-libs/libsdl/*.zip . - haikuporter -c -y -d -i sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip . - haikuporter -c -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip . - haikuporter -c -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip . - haikuporter -c -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip . - haikuporter -c -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip . - haikuporter -c -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip . - haikuporter -c -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip . - haikuporter -c -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip . - haikuporter -c -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip . - haikuporter -c -y -d -i box2d-2.1.2 - mv ${HPLOC}/dev-games/box2d/*.zip . - -## these don't build correctly yet -## haikuporter -y -d -i fblend-0.4 -## mv ${HPLOC}/media-libs/fblend/*.zip . -} - -INSTALL() -{ - cd libpak-0.9.3 - mkdir -p ${DESTDIR}/boot - echo "" > ${DESTDIR}/boot/.opd - for z in *.zip; - do unzip -o $z -d ${DESTDIR}/boot - echo -e "\n" >> ${DESTDIR}/boot/.opd - cat ${DESTDIR}/boot/.OptionalPackageDescription >> ${DESTDIR}/boot/.opd - done - cp ${DESTDIR}/boot/.opd ${DESTDIR}/boot/Full.OptionalPackageDescription - rm ${DESTDIR}/boot/.opd -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.4-gcc2.recipe b/packs/libpak/libpak-0.9.4-gcc2.recipe deleted file mode 100644 index 1d807bb85..000000000 --- a/packs/libpak/libpak-0.9.4-gcc2.recipe +++ /dev/null @@ -1,140 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libedit >= 20100424 - dev-util/cmake >= 2.6 - dev-util/gperf >= 3.0.4 - dev-vcs/git >= 1.7.1 - dev-vcs/mercurial >= 1.6 - sys-devel/gettext >= 0.17" - -CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD() -{ - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - export HAIKUVERSION="r1a3" - cd libpak-0.9.4 - -## these are needed for building package in the libpak - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips -## - haikuporter -y -d -i readline-6.2 - mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lua-5.1.4-3 - mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -c -d -i speex-1.2-git -#b mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lcms-2.1 - mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmad-0.15.1b - mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmodplug-0.8.8.1 - mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libogg-1.2.2 - mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libtheora-1.1.1 - mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libvorbis-1.3.2 - mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libsdl-1.2.14 - mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-gfx-2.0.22 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -d -i jgmod-0.99 -#b mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips -} - -INSTALL() -{ - cd libpak-0.9.4 - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.4-gcc4.recipe b/packs/libpak/libpak-0.9.4-gcc4.recipe deleted file mode 100644 index 5765db9e2..000000000 --- a/packs/libpak/libpak-0.9.4-gcc4.recipe +++ /dev/null @@ -1,147 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libedit >= 20100424 - dev-util/cmake >= 2.6 - dev-util/gperf >= 3.0.4 - dev-vcs/git >= 1.7.1 - dev-vcs/mercurial >= 1.6 - sys-devel/gettext >= 0.17" - -CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD() -{ - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - export HAIKUVERSION="r1a3" - cd libpak-0.9.4 - -## these are needed for building package in the libpak - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips -## - haikuporter -y -d -i readline-6.2 - mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lua-5.1.4-3 - mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -c -d -i speex-1.2rc1 -#b mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lcms-2.1 - mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmad-0.15.1b - mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmodplug-0.8.8.1 - mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libogg-1.2.2 - mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libtheora-1.1.1 - mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libvorbis-1.3.2 - mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -c -d -i physfs-2.0.1 -#b mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libsdl-1.2.14 - mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-gfx-2.0.22 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i jgmod-0.99 - mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i box2d-2.1.2 - mv ${HPLOC}/dev-games/box2d/*.zip ${HPLOC}/packs/libpak/zips - -## these don't build correctly yet -## haikuporter -y -d -i fblend-0.4 -## mv ${HPLOC}/media-libs/fblend/*.zip ${HPLOC}/packs/libpak/zips -} - -INSTALL() -{ - cd libpak-0.9.4 - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.4.recipe b/packs/libpak/libpak-0.9.4.recipe deleted file mode 100644 index aa6779909..000000000 --- a/packs/libpak/libpak-0.9.4.recipe +++ /dev/null @@ -1,263 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libedit >= 20100424 - dev-util/cmake >= 2.6 - dev-util/gperf >= 3.0.4 - dev-vcs/git >= 1.7.1 - dev-vcs/mercurial >= 1.6 - sys-devel/gettext >= 0.17" - -CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD() -{ - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - export HAIKUVERSION="" - cd libpak-0.9.4 - -## these are needed for building package in the libpak - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips -## - setgcc gcc2 - haikuporter -y -d -i readline-6.1 - mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z readline-6.1 - mv ${HPLOC}/sys-libs/readline/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i lua-5.1.4 - mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -c -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -c -d -i speex-1.2-git - mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i lcms-2.0a - mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i libmodplug-0.8.7 - mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i libogg-1.2.0 - mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libtheora-1.1.1 - mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libvorbis-1.3.1 - mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libsdl-1.2-hg - mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z libsdl-1.2-hg - mv ${HPLOC}/media-libs/libsdl/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.xz ${HPLOC}/packs/optionalpackages/sources - -# haikuporter -y -d -i sdl-ttf-2.0.10 -# mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z sge-030809 - mv ${HPLOC}/media-libs/sge/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -y -z sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i jgmod-0.99 - mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips - - setgcc gcc4 - haikuporter -c -y -d -i readline-6.1 - mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i lua-5.1.4 - mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips - -## Flac fails to build on gcc4 currently -## haikuporter -c -y -d -i flac-1.2.1 -## mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i speex-1.2-git - mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i lcms-2.0a - mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libmodplug-0.8.7 - mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i libsdl-1.2-hg - mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips - -# haikuporter -c -y -d -i sdl-ttf-2.0.10 -# mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -c -y -d -i box2d-2.1.2 - mv ${HPLOC}/dev-games/box2d/*.zip ${HPLOC}/packs/libpak/zips - -## these don't build correctly yet -## haikuporter -y -d -i fblend-0.4 -## mv ${HPLOC}/media-libs/fblend/*.zip ${HPLOC}/packs/libpak/zips -} - -INSTALL() -{ - cd libpak-0.9.4 - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.5-gcc2.recipe b/packs/libpak/libpak-0.9.5-gcc2.recipe deleted file mode 100644 index a9606619f..000000000 --- a/packs/libpak/libpak-0.9.5-gcc2.recipe +++ /dev/null @@ -1,143 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libedit >= 20100424 - dev-util/cmake >= 2.6 - dev-util/gperf >= 3.0.4 - dev-vcs/git >= 1.7.1 - dev-vcs/mercurial >= 1.6 - sys-devel/gettext >= 0.17" - -CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD() -{ - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - export HAIKUVERSION="r1a4" - cd libpak-0.9.5 - -## these are needed for building package in the libpak - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips -## - haikuporter -y -d -i readline-6.2 - mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lua-5.1.4-3 - mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i speex-1.2rc1 - mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lcms-2.1 - mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmad-0.15.1b - mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmodplug-0.8.8.1 - mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i libogg-1.3.0 - mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i libvorbis-1.3.2 - mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i libtheora-1.1.1 - mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libsdl-1.2.14 - mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-gfx-2.0.22 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -d -i jgmod-0.99 -#b mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i ffmpeg-0.10 - mv ${HPLOC}/media-video/ffmpeg/*.zip ${HPLOC}/packs/libpak/zips -} - -INSTALL() -{ - cd libpak-0.9.5 - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.6-gcc2.recipe b/packs/libpak/libpak-0.9.6-gcc2.recipe deleted file mode 100644 index 5518cccb1..000000000 --- a/packs/libpak/libpak-0.9.6-gcc2.recipe +++ /dev/null @@ -1,152 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libedit >= 20100424 - dev-util/cmake >= 2.6 - dev-util/gperf >= 3.0.4 - dev-vcs/git >= 1.7.1 - dev-vcs/mercurial >= 1.6 - sys-devel/gettext >= 0.17" - -CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD() -{ - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - export HAIKUVERSION="r1a4" - -## these are needed for building package in the libpak - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips -## - haikuporter -y -d -i readline-6.2 - mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i jpeg-8d - mv ${HPLOC}/media-libs/jpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libpng-1.5.12 - mv ${HPLOC}/media-libs/libpng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lua-5.1.4-3 - mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i speex-1.2rc1 - mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lcms-2.1 - mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmad-0.15.1b - mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmodplug-0.8.8.4 - mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libogg-1.3.0 - mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libvorbis-1.3.2 - mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libtheora-1.1.1 - mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i freetype-2.4.9 - mv ${HPLOC}/media-libs/freetype/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libsdl-1.2.15 - mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-gfx-2.0.23 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-ttf-2.0.11 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-image-1.2.12 - mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-net-1.2.8 - mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -d -i allegro-4.4.1.1 -#b mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -d -i jgmod-0.99 -#b mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libvpx-1.0.0 - mv ${HPLOC}/media-libs/libvpx/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i ffmpeg-0.10.2 - mv ${HPLOC}/media-video/ffmpeg/*.zip ${HPLOC}/packs/libpak/zips -} - -INSTALL() -{ - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.6-gcc4.recipe b/packs/libpak/libpak-0.9.6-gcc4.recipe deleted file mode 100644 index 2ad1ecbf7..000000000 --- a/packs/libpak/libpak-0.9.6-gcc4.recipe +++ /dev/null @@ -1,159 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.4.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libedit >= 20100424 - dev-util/cmake >= 2.6 - dev-util/gperf >= 3.0.4 - dev-vcs/git >= 1.7.1 - dev-vcs/mercurial >= 1.6 - sys-devel/gettext >= 0.17" - -CHECKSUM_MD5="785751b34f60c4a28a746749a00ae8d4" -BUILD() -{ - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - export HAIKUVERSION="r1a4" - -## these are needed for building package in the libpak - haikuporter -i -d -y dos2unix - mv ${HPLOC}/app-text/dos2unix/*.zip ${HPLOC}/packs/libpak/zips - haikuporter -i -d -y pkgconfig-0.25 - mv ${HPLOC}/dev-util/pkgconfig/*.zip ${HPLOC}/packs/libpak/zips -## - haikuporter -y -d -i readline-6.2 - mv ${HPLOC}/sys-libs/readline/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i jpeg-8d - mv ${HPLOC}/media-libs/jpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libpng-1.5.12 - mv ${HPLOC}/media-libs/libpng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lua-5.1.4-3 - mv ${HPLOC}/dev-lang/lua/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i fribidi-0.19.2 - mv ${HPLOC}/dev-libs/fribidi/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libpaper-1.1.24 - mv ${HPLOC}/app-text/libpaper/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i flac-1.2.1 - mv ${HPLOC}/media-libs/flac/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i speex-1.2rc1 - mv ${HPLOC}/media-libs/speex/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i lcms-2.1 - mv ${HPLOC}/media-libs/lcms/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmad-0.15.1b - mv ${HPLOC}/media-libs/libmad/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmodplug-0.8.8.4 - mv ${HPLOC}/media-libs/libmodplug/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libogg-1.3.0 - mv ${HPLOC}/media-libs/libogg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libvorbis-1.3.2 - mv ${HPLOC}/media-libs/libvorbis/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libtheora-1.1.1 - mv ${HPLOC}/media-libs/libtheora/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -c -d -i physfs-2.0.1 -#b mv ${HPLOC}/dev-games/physfs/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i freetype-2.4.9 - mv ${HPLOC}/media-libs/freetype/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libsdl-1.2.15 - mv ${HPLOC}/media-libs/libsdl/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-gfx-2.0.23 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-ttf-2.0.11 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-image-1.2.12 - mv ${HPLOC}/media-libs/sdl-image/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i guilib-1.2.1 - mv ${HPLOC}/media-libs/guilib/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-net-1.2.8 - mv ${HPLOC}/media-libs/sdl-net/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -d -i allegro-4.4.1.1 -#b mv ${HPLOC}/media-libs/allegro/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i dumb-0.9.3 - mv ${HPLOC}/media-libs/dumb/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -y -d -i jgmod-0.99 -#b mv ${HPLOC}/media-libs/jgmod/*.zip ${HPLOC}/packs/libpak/zips - -#b haikuporter -c -y -d -i box2d-2.1.2 -#b mv ${HPLOC}/dev-games/box2d/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -d -i libvpx-1.0.0 - mv ${HPLOC}/media-libs/libvpx/*.zip ${HPLOC}/packs/libpak/zips - - haikuporter -y -c -d -i ffmpeg-0.10.2 - mv ${HPLOC}/media-video/ffmpeg/*.zip ${HPLOC}/packs/libpak/zips - -## these don't build correctly yet -## haikuporter -y -d -i fblend-0.4 -## mv ${HPLOC}/media-libs/fblend/*.zip ${HPLOC}/packs/libpak/zips -} - -INSTALL() -{ - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/libpak/libpak-0.9.recipe b/packs/libpak/libpak-0.9.recipe deleted file mode 100644 index 8f890f10b..000000000 --- a/packs/libpak/libpak-0.9.recipe +++ /dev/null @@ -1,112 +0,0 @@ -DESCRIPTION="Libpak is a set of commonly used libraries." -HOMEPAGE="http://ports.haiku-files.org/wiki/LibPak" -SRC_URI="http://ports.haiku-files.org/raw-attachment/wiki/LibPak/libpak-0.9.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/mercurial >= 1.6 - dev-libs/libedit >= 20100424" -CHECKSUM_MD5="59bc51118c6be6ef40f4fe681ef783a0" -BUILD() -{ - HPLOC=`haikuporter -t` - cd libpak-0.9 -## these are needed for building package in the libpak - haikuporter -i cmake-2.8.1 - haikuporter -i dos2unix - haikuporter -i pkgconfig-0.25 -## - haikuporter -y -d -i readline-6.0 - mv ${HPLOC}/sys-libs/readline/*.zip . - haikuporter -y -d -i zlib-1.2.5 - mv ${HPLOC}/sys-libs/zlib/*.zip . - haikuporter -y -d -i gettext-0.17 - mv ${HPLOC}/sys-devel/gettext/*.zip . - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip . - haikuporter -y -d -i jpeg-7 - mv ${HPLOC}/media-libs/jpeg/*.zip . - haikuporter -y -d -i libpng-1.2.44 - mv ${HPLOC}/media-libs/libpng/*.zip . - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip . - haikuporter -y -d -i tiff-3.9.1 - mv ${HPLOC}/media-libs/tiff/*.zip . - haikuporter -y -d -i libart_lgpl-2.3.21 - mv ${HPLOC}/media-libs/libart_lgpl/*.zip . - haikuporter -y -d -i lcms-2.0a - mv ${HPLOC}/media-libs/lcms/*.zip . - haikuporter -y -d -i libogg-1.2.0 - mv ${HPLOC}/media-libs/libogg/*.zip . - haikuporter -y -d -i libvorbis-1.3.1 - mv ${HPLOC}/media-libs/libvorbis/*.zip . - haikuporter -y -d -i libao-1.0.0 - mv ${HPLOC}/media-libs/libao/*.zip . - haikuporter -y -d -i libmodplug-0.8.7 - mv ${HPLOC}/media-libs/libmodplug/*.zip . - haikuporter -y -d -i libmikmod-3.1.11 - mv ${HPLOC}/media-libs/libmikmod/*.zip . - haikuporter -y -d -i vorbis-tools-1.4.0 - mv ${HPLOC}/media-sound/vorbis-tools/*.zip . - haikuporter -y -d -i physfs-2.0.1 - mv ${HPLOC}/dev-games/physfs/*.zip . - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip . - haikuporter -y -d -i libsdl-1.2.14 - mv ${HPLOC}/media-libs/libsdl/*.zip . - haikuporter -y -d -i sdl-gfx-2.0.20 - mv ${HPLOC}/media-libs/sdl-gfx/*.zip . - haikuporter -y -d -i sdl-net-1.2.7 - mv ${HPLOC}/media-libs/sdl-net/*.zip . - haikuporter -y -d -i sdl-ttf-2.0.10 - mv ${HPLOC}/media-libs/sdl-ttf/*.zip . - haikuporter -y -d -i sdl-image-1.2.10 - mv ${HPLOC}/media-libs/sdl-image/*.zip . - haikuporter -y -d -i sge-030809 - mv ${HPLOC}/media-libs/sge/*.zip . - haikuporter -y -d -i smjpeg-0.2.1 - mv ${HPLOC}/media-libs/smjpeg/*.zip . - haikuporter -y -d -i smpeg-0.4.5 - mv ${HPLOC}/media-libs/smpeg/*.zip . - haikuporter -y -d -i sdl-mixer-1.2.11 - mv ${HPLOC}/media-libs/sdl-mixer/*.zip . - haikuporter -y -d -i sdl-sound-1.0.3 - mv ${HPLOC}/media-libs/sdl-sound/*.zip . -## these don't build correctly with gcc4 - if [ -n "$(setgcc | grep '2')" ]; then - haikuporter -y -d -i libmad-0.15.1 - mv ${HPLOC}/media-libs/libmad/*.zip . - haikuporter -y -d -i allegro-4.4.1.1 - mv ${HPLOC}/media-libs/allegro/*.zip . - fi -## these don't build correctly yet -## haikuporter -y -d -i freetype-2.4.2 -## mv ${HPLOC}/media-libs/freetype/*.zip . -## haikuporter -y -d -i fribidi-0.19.2 -## mv ${HPLOC}/dev-libs/fribidi/*.zip . -## haikuporter -y -d -i flac-1.2.1 -## mv ${HPLOC}/media-libs/flac/*.zip . -## haikuporter -y -d -i speex-1.2rc1 -## mv ${HPLOC}/media-libs/speex/*.zip . -## haikuporter -y -d -i jgmod-0.99 -## mv ${HPLOC}/media-libs/jgmod/*.zip . -## haikuporter -y -d -i dumb-0.9.3 -## mv ${HPLOC}/media-libs/dumb/*.zip . -## haikuporter -y -d -i fblend-0.4 -## mv ${HPLOC}/media-libs/fblend/*.zip . -} - -INSTALL() -{ - cd libpak-0.9 - mkdir -p ${DESTDIR} - echo "" > ${DESTDIR}/.opd - for z in *.zip; - do unzip -o $z -d ${DESTDIR} - echo -e "\n" >> ${DESTDIR}/.opd - cat ${DESTDIR}/.OptionalPackageDescription >> ${DESTDIR}/.opd - done - cp ${DESTDIR}/.opd ${DESTDIR}/.OptionalPackageDescription -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.5.recipe b/packs/optionalpackages/optionalpackages-0.5.recipe deleted file mode 100644 index 0614a9e28..000000000 --- a/packs/optionalpackages/optionalpackages-0.5.recipe +++ /dev/null @@ -1,260 +0,0 @@ -DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." -HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" -SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="gcc-2.95.3 - gcc-4.4.4" - -CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD() -{ - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - cd optionalpackages-0.5 - export HAIKUVERSION="r1a3test" -## - -#w = works -#b = currently broken -#3 = 3rd party optional package, probably needs a .bep file - - setgcc gcc2 - -## Group 1 - haikuporter -i readline-6.1 - haikuporter -i libedit-20100424 - haikuporter -y -d -i autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i bison-2.4.1 - mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z bison-2.4.1 - mv ${HPLOC}/sys-devel/bison/*.xz ${HPLOC}/packs/optionalpackages/sources - -#b haikuporter -y -d -i m4-1.4.14 -#b mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -z m4-1.4.14 -#b mv ${HPLOC}/sys-devel/m4/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i jam-2.5 - mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips - - haikuporter -y -d -i mkdepend-1.7 - mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips - - haikuporter -y -d -i make-3.82 - mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z make-3.82 - mv ${HPLOC}/sys-devel/make/*.xz ${HPLOC}/packs/optionalpackages/sources - -## Group 2 - -#b haikuporter -y -c -d -i mercurial-1.6 -#b mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ABI-compliance-checker-1.12 - haikuporter -y -d -i apr-1.4.2 - mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-util-1.3.10 - mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sqlite-3.7.3 - mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d bzr-2.2.0 - mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y bzr-2.2.0 - mv ${HPLOC}/dev-vcs/bzr/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i Beam-1.2alpha -#3 haikuporter -y -d -i bebook_20081026 -#3 haikuporter -y -d -i BeHappy-1.0.6 -#3 haikuporter -y -d -i BePDF-1.1.1b3 -#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - haikuporter -y -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bzip2-1.0.6 - mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i cdrtools-3.00 - mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i clockwerk-78 - mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y clockwerk-78 - mv ${HPLOC}/haiku-apps/clockwerk/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i cmake-2.8.2 - mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i curl-7.21.2 - mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i subversion-1.6.13 - mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i expat-2.0.1 - mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i fastdep-0.16 - mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i friss-0.5pre7 - haikuporter -y -d -i gettext-0.17 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i git-1.7.1 - mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y git-1.7.1 - mv ${HPLOC}/dev-vcs/git/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i groff-1.20.1 - mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 - haikuporter -y -d -i libevent-1.4.13 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i liblayout-1.4.0 - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxml2-2.7.7 - mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxslt-1.1.26 - mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i links - haikuporter -y -d -i man-1.6f - mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y man-1.6f - mv ${HPLOC}/sys-apps/man/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i nano-2.2.5 - mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y nano-2.2.5 - mv ${HPLOC}/app-editors/nano/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i neon-0.29.4 - mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i netsurf-2.6 -#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ocaml-3.11.1 -#3 haikuporter -y -d -i camlp5-5.12 - haikuporter -y -d -i opensound-4.2 - mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssh-5.6p1 - mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i paladin-1.3 - mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libpcre-8.02 - mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i pe-2.4.3-600 - mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d python-2.6.6 - mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i ruby-1.9.1 - mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sed-4.2.1 - mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i tar-1.22 - mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i TimGMSoundFont -#3 haikuporter -y -d -i TrackerNewTemplates -#b haikuporter -y -d -i vim-7.3 -#b mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vision-933 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips - -#b haikuporter -y -d -i vlc-0.8.6d -#b mv ${HPLOC}/media-video/vlc/*.zip ${HPLOC}/packs/optionalpackages/zips - -#3 haikuporter -y -d -i WonderBrush-2.1.2 - haikuporter -y -d -i yasm-1.1.0 - mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips - - setgcc gcc4 - haikuporter -y -d -i libevent-1.4.14b - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -c -d bzr-2.2.0 -#b mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i vision-933 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -c -d -i WebPositive - haikuporter -y -c -d -i transmission-2.01 - mv ${HPLOC}/net-p2p/transmission/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -c -d -i paladin-1.3 -#b mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -c -d -i vim-7.3 - mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -c -d -i pe-2.4.3-600 -#b mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i gettext-0.17 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y gettext-0.17 - mv ${HPLOC}/sys-devel/gettext/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -c -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.xz ${HPLOC}/packs/optionalpackages/sources - -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 - haikuporter -y -d -i clockwerk-78 - mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i clucene-0.9.21 -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - haikuporter -y -d -i xz-utils-4.999.9 - mv ${HPLOC}/app-arch/xz-utils/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y xz-utils-4.999.9 - mv ${HPLOC}/app-arch/xz-utils/*.xz ${HPLOC}/packs/optionalpackages/sources -} - -INSTALL() -{ - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.6-gcc2.recipe b/packs/optionalpackages/optionalpackages-0.6-gcc2.recipe deleted file mode 100644 index aa284f6ce..000000000 --- a/packs/optionalpackages/optionalpackages-0.6-gcc2.recipe +++ /dev/null @@ -1,179 +0,0 @@ -DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." -HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" -SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="gcc-2.95.3 - gcc-4.4.4" - -CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD() -{ - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - cd optionalpackages-0.5 - export HAIKUVERSION="r1a3" -## - -#w = works -#b = currently broken -#3 = 3rd party optional package, probably needs a .bep file - - setgcc gcc2 - -## Group 1 - haikuporter -i readline-6.2 - haikuporter -i libedit-20100424 - haikuporter -y -d -i autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bison-2.4.3 - mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i m4-1.4.16 - mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i jam-2.5 - mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i mkdepend-1.7 - mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i make-3.82 - mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssl-1.0.0d - mv ${HPLOC}/dev-libs/openssl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cmake-2.8.4 - mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i yasm-1.1.0 - mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips - -## Group 2 - - haikuporter -y -d -i sed-4.2.1 - mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d droid-113 - mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d wqy-microhei-0.2.0-beta - mv ${HPLOC}/media-fonts/wqy-microhei/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i mercurial-1.8.3 - mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ABI-compliance-checker-1.12 - haikuporter -y -d -i apr-1.4.2 - mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-util-1.3.10 - mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sqlite-3.7.5 - mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d bzr-2.2.2 - mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i Beam-1.2alpha -#3 haikuporter -y -d -i bebook_20081026 -#3 haikuporter -y -d -i BeHappy-1.0.6 -#3 haikuporter -y -d -i BePDF-1.1.1b3 -#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - haikuporter -y -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bzip2-1.0.6 - mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cdrtools-3.01a01 - mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libpcre-8.12 - mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i clockwerk-78 - mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i curl-7.21.6 - mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i subversion-1.6.15 - mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i expat-2.0.1 - mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i fastdep-0.16 - mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i friss-0.5pre7 - haikuporter -y -d -i gettext-0.18.1.1 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i git-1.7.5 - mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i groff-1.20.1 - mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i liblayout-1.4.0 - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxml2-2.7.8 - mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxslt-1.1.26 - mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i links - haikuporter -y -d -i man-1.6f - mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i nano-2.2.6 - mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i neon-0.29.6 - mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i netsurf-2.6 -#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ocaml-3.11.1 -#3 haikuporter -y -d -i camlp5-5.12 -#b haikuporter -y -d -i opensound-4.2 -#b mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssh-5.8p2 - mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i paladin-1.3 - mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i pe-2.4.3-600 - mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d python-2.7.1 -#b mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ruby-1.9.1 - mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i tar-1.25 - mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i TimGMSoundFont -#3 haikuporter -y -d -i TrackerNewTemplates -#b haikuporter -y -d -i vim-7.3 -#b mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vision-908 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips - -#3 haikuporter -y -d -i WonderBrush-2.1.2 - - -} - -INSTALL() -{ - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.6-gcc4.recipe b/packs/optionalpackages/optionalpackages-0.6-gcc4.recipe deleted file mode 100644 index 3be4faab5..000000000 --- a/packs/optionalpackages/optionalpackages-0.6-gcc4.recipe +++ /dev/null @@ -1,179 +0,0 @@ -DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." -HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" -SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-devel/gcc >= 4.4.4" - -CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD() -{ - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - cd optionalpackages-0.5 - export HAIKUVERSION="r1a3" -## - -#w = works -#b = currently broken -#3 = 3rd party optional package, probably needs a .bep file - - - haikuporter -i readline-6.2 - haikuporter -y -d -i libedit-20100424 - haikuporter -y -d -i autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bison-2.4.3 - mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i m4-1.4.16 - mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i jam-2.5 - mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i mkdepend-1.7 - mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i make-3.82 - mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cmake-2.8.4 - mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxml2-2.7.8 - mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxslt-1.1.26 - mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips - - haikuporter -y -d -i yasm-1.1.0 - mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i xz-utils-5.0.1 - mv ${HPLOC}/app-arch/xz-utils/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssl-1.0.0d - mv ${HPLOC}/dev-libs/openssl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i curl-7.21.6 - mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i neon-0.29.6 - mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i subversion-1.6.15 - mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i git-1.7.5 - mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssh-5.8p2 - mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i mercurial-1.8.3 - mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips - - - haikuporter -y -c -d droid-113 - mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-1.4.2 - mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-util-1.3.10 - mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sqlite-3.7.5 - mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d bzr-2.2.2 - mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bzip2-1.0.6 - mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cdrtools-3.01a01 - mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i expat-2.0.1 - mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i fastdep-0.16 - mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gettext-0.18.1.1 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i groff-1.20.1 - mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i man-1.6f - mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i nano-2.2.6 - mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i paladin-1.3 - mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libpcre-8.12 - mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ruby-1.9.1 - mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sed-4.2.1 - mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vision-908 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vim-7.3 - mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i transmission-2.21 - mv ${HPLOC}/net-p2p/transmission/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i pe-2.4.3-600 - mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i opensound-4.2 -#b mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d python-2.7.1 -#b mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i tar-1.25 - mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i netsurf-2.6 -#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i clockwerk-78 -#b mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips - -#3 haikuporter -y -d -i ABI-compliance-checker-1.12 -#3 haikuporter -y -d -i Beam-1.2alpha -#3 haikuporter -y -d -i bebook_20081026 -#3 haikuporter -y -d -i BeHappy-1.0.6 -#3 haikuporter -y -d -i BePDF-1.1.1b3 -#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre -#3 haikuporter -y -d -i friss-0.5pre7 -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 -#3 haikuporter -y -d -i liblayout-1.4.0 -#3 haikuporter -y -d -i links -#3 haikuporter -y -d -i ocaml-3.11.1 -#3 haikuporter -y -d -i camlp5-5.12 -#3 haikuporter -y -d -i TimGMSoundFont -#3 haikuporter -y -d -i TrackerNewTemplates -#3 haikuporter -y -d -i WonderBrush-2.1.2 -#3 haikuporter -y -c -d -i WebPositive -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 -#3 haikuporter -y -d -i clucene-0.9.21 -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - -} - -INSTALL() -{ - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.6.recipe b/packs/optionalpackages/optionalpackages-0.6.recipe deleted file mode 100644 index 892e22c35..000000000 --- a/packs/optionalpackages/optionalpackages-0.6.recipe +++ /dev/null @@ -1,262 +0,0 @@ -DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." -HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" -SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="gcc-2.95.3 - gcc-4.4.4" - -CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD() -{ - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - cd optionalpackages-0.5 - export HAIKUVERSION="r1a3test" -## - -#w = works -#b = currently broken -#3 = 3rd party optional package, probably needs a .bep file - - setgcc gcc2 - -## Group 1 - haikuporter -i readline-6.1 - haikuporter -i libedit-20100424 - haikuporter -y -d -i autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i bison-2.4.3 - mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z bison-2.4.3 - mv ${HPLOC}/sys-devel/bison/*.xz ${HPLOC}/packs/optionalpackages/sources - -#b haikuporter -y -d -i m4-1.4.15 -#b mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -z m4-1.4.15 -#b mv ${HPLOC}/sys-devel/m4/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d -i jam-2.5 - mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips - - haikuporter -y -d -i mkdepend-1.7 - mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips - - haikuporter -y -d -i make-3.82 - mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -z make-3.82 - mv ${HPLOC}/sys-devel/make/*.xz ${HPLOC}/packs/optionalpackages/sources - -## Group 2 - - haikuporter -y -c -d droid-113 - mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i mercurial-1.7.3 - mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ABI-compliance-checker-1.12 - haikuporter -y -d -i apr-1.4.2 - mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-util-1.3.10 - mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sqlite-3.7.5 - mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d bzr-2.2.2 - mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y bzr-2.2.2 - mv ${HPLOC}/dev-vcs/bzr/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i Beam-1.2alpha -#3 haikuporter -y -d -i bebook_20081026 -#3 haikuporter -y -d -i BeHappy-1.0.6 -#3 haikuporter -y -d -i BePDF-1.1.1b3 -#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - haikuporter -y -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bzip2-1.0.6 - mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i cdrtools-3.00 - mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i clockwerk-78 - mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y clockwerk-78 - mv ${HPLOC}/haiku-apps/clockwerk/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i cmake-2.8.4 - mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i curl-7.21.3 - mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i subversion-1.6.15 - mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i expat-2.0.1 - mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i fastdep-0.16 - mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i friss-0.5pre7 - haikuporter -y -d -i gettext-0.18.1.1 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i git-1.7.3.5 - mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y git-1.7.3.5 - mv ${HPLOC}/dev-vcs/git/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i groff-1.20.1 - mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i liblayout-1.4.0 - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxml2-2.7.8 - mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxslt-1.1.26 - mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i links - haikuporter -y -d -i man-1.6f - mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y man-1.6f - mv ${HPLOC}/sys-apps/man/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i nano-2.2.6 - mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y nano-2.2.6 - mv ${HPLOC}/app-editors/nano/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i neon-0.29.5 - mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i netsurf-2.6 -#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ocaml-3.11.1 -#3 haikuporter -y -d -i camlp5-5.12 - haikuporter -y -d -i opensound-4.2 - mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssh-5.8p1 - mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i paladin-1.3 - mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libpcre-8.12 - mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i pe-2.4.3-600 - mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.xz ${HPLOC}/packs/optionalpackages/sources - - haikuporter -y -d python-2.7.1 - mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -d -i ruby-1.9.1 - mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sed-4.2.1 - mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i tar-1.25 - mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i TimGMSoundFont -#3 haikuporter -y -d -i TrackerNewTemplates -#b haikuporter -y -d -i vim-7.3 -#b mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vision-908 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips - -#b haikuporter -y -d -i vlc-0.8.6d -#b mv ${HPLOC}/media-video/vlc/*.zip ${HPLOC}/packs/optionalpackages/zips - -#3 haikuporter -y -d -i WonderBrush-2.1.2 - haikuporter -y -d -i yasm-1.1.0 - mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips - - setgcc gcc4 - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -c -d bzr-2.2.2 -#b mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i vision-908 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -c -d -i WebPositive - haikuporter -y -c -d -i transmission-2.01 - mv ${HPLOC}/net-p2p/transmission/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -c -d -i paladin-1.3 -#b mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y p7zip-9.13 - mv ${HPLOC}/app-arch/p7zip/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -c -d -i vim-7.3 - mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -c -d -i pe-2.4.3-600 -#b mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i gettext-0.18.1.1 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y gettext-0.18.1.1 - mv ${HPLOC}/sys-devel/gettext/*.xz ${HPLOC}/packs/optionalpackages/sources - haikuporter -y -c -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.xz ${HPLOC}/packs/optionalpackages/sources - -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 - haikuporter -y -d -i clockwerk-78 - mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i clucene-0.9.21 -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - haikuporter -y -d -i xz-utils-4.999.9 - mv ${HPLOC}/app-arch/xz-utils/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -z -y xz-utils-4.999.9 - mv ${HPLOC}/app-arch/xz-utils/*.xz ${HPLOC}/packs/optionalpackages/sources -} - -INSTALL() -{ - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.7-gcc2.recipe b/packs/optionalpackages/optionalpackages-0.7-gcc2.recipe deleted file mode 100644 index 010dae572..000000000 --- a/packs/optionalpackages/optionalpackages-0.7-gcc2.recipe +++ /dev/null @@ -1,184 +0,0 @@ -DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." -HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" -SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="gcc == 2.95.3 - liblayout == 1.4.0 - dev-util/cmake >= 2.8.4" - -CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD() -{ - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - cd optionalpackages-0.5 - export HAIKUVERSION="r1a4" -## - -#w = works -#b = currently broken -#3 = 3rd party optional package, probably needs a .bep file - -## Group 1 - haikuporter -i readline-6.2 - haikuporter -i libedit-20120601-3.0 - haikuporter -y -d -i autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bison-2.4.3 - mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i m4-1.4.16 - mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i jam-2.5 - mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i mkdepend-1.7 - mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i make-3.82 - mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssl-1.0.0j - mv ${HPLOC}/dev-libs/openssl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cmake-2.8.5 - mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i yasm-1.2.0 - mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i freetype-2.4.9 - mv ${HPLOC}/media-libs/freetype/*.zip ${HPLOC}/packs/optionalpackages/zips - -## Group 2 - - haikuporter -y -d -i sed-4.2.1 - mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d droid-113 - mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d wqy-microhei-0.2.0-beta - mv ${HPLOC}/media-fonts/wqy-microhei/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i mercurial-2.2.2 - mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ABI-compliance-checker-1.12 - haikuporter -y -d -i apr-1.4.6 - mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-util-1.4.1 - mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sqlite-3.7.13 - mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d bzr-2.5.1 - mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i beam-1.2alpha - mv ${HPLOC}/haiku-apps/beam/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i bebook_20081026 -#3 haikuporter -y -d -i BeHappy-1.0.6 -#3 haikuporter -y -d -i BePDF-1.1.1b3 -#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - haikuporter -y -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bzip2-1.0.6 - mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cdrtools-3.01a07 - mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libpcre-8.21 - mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i clockwerk-80 - mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i curl-7.26.0 - mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i subversion-1.6.18 - mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i expat-2.0.1 - mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i fastdep-0.16 - mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i friss-29 - mv ${HPLOC}/haiku-apps/friss/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gettext-0.18.1.1 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gitdoc-1.7.10.2 - mv ${HPLOC}/dev-vcs/gitdoc/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i git-1.7.10.2 - mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i groff-1.20.1 - mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i liblayout-1.4.0 - haikuporter -y -d -i libmng-1.0.10 - mv ${HPLOC}/media-libs/libmng/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxml2-2.8.0 - mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxslt-1.1.26 - mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i links - haikuporter -y -d -i man-1.6g - mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i nano-2.2.6 - mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i neon-0.29.6 - mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i netsurf-2.6 -#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i ocaml-3.11.1 -#3 haikuporter -y -d -i camlp5-5.12 -#b haikuporter -y -d -i opensound-4.2 -#b mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssh-6.0p1 - mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i p7zip-9.20.1 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i paladin-1.3 - mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i pe-2.4.3-600 - mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d python-2.7.1 -#b mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ruby-1.9.1 - mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i tar-1.26 - mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i TimGMSoundFont -#3 haikuporter -y -d -i TrackerNewTemplates -#b haikuporter -y -d -i vim-7.3 -#b mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vision-908 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips - -#3 haikuporter -y -d -i WonderBrush-2.1.2 - - -} - -INSTALL() -{ - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" diff --git a/packs/optionalpackages/optionalpackages-0.7-gcc4.recipe b/packs/optionalpackages/optionalpackages-0.7-gcc4.recipe deleted file mode 100644 index 78bca54b0..000000000 --- a/packs/optionalpackages/optionalpackages-0.7-gcc4.recipe +++ /dev/null @@ -1,178 +0,0 @@ -DESCRIPTION="This is the full set of optionalpackages available in Haiku's OptionalPackages file." -HOMEPAGE="http://ports.haiku-files.org/milestone/Haiku%20Optional%20Packages" -SRC_URI="http://ports.haiku-files.org/raw-attachment/milestone/Haiku%20Optional%20Packages/optionalpackages-0.5.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-devel/gcc >= 4.6.2" - -CHECKSUM_MD5="53c19c702388a49a11f72eb6606b2051" -BUILD() -{ - HPLOC=`haikuporter -t` - mkdir -p ../zips - mkdir -p ../sources - cd optionalpackages-0.5 - export HAIKUVERSION="r1a4" -## - -#w = works -#b = currently broken -#3 = 3rd party optional package, probably needs a .bep file - - - haikuporter -i readline-6.2 - haikuporter -y -d -i libedit-20120601-3.0 - haikuporter -y -d -i autoconf-2.68 - mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i automake-1.11.1 - mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libtool-2.4 - mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bison-2.4.3 - mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i m4-1.4.16 - mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i flex-2.5.35 - mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i jam-2.5 - mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i mkdepend-1.7 - mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i make-3.82 - mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cmake-2.8.5 - mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxml2-2.8.0 - mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libxslt-1.1.26 - mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips - - haikuporter -y -d -i yasm-1.2.0 - mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i xz-utils-5.0.1 - mv ${HPLOC}/app-arch/xz-utils/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssl-1.0.0j - mv ${HPLOC}/dev-libs/openssl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i curl-7.26.0 - mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i neon-0.29.6 - mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cvs-1.12.13.1 - mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i subversion-1.6.18 - mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i git-1.7.10.2 - mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i openssh-6.0p1 - mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i mercurial-2.2.2 - mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips - - - haikuporter -y -c -d droid-113 - mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-1.4.6 - mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i apr-util-1.4.1 - mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sqlite-3.7.13 - mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d bzr-2.6b1 - mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i beae-22 - mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i burnitnow-39 - mv ${HPLOC}/haiku-apps/burnitnow/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i bzip2-1.0.6 - mv ${HPLOC}/app-arch/bzip2/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ccache-3.0.1 - mv ${HPLOC}/dev-util/ccache/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i cdrtools-3.01a07 - mv ${HPLOC}/app-cdr/cdrtools/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i texinfo-4.13a - mv ${HPLOC}/sys-apps/texinfo/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i expat-2.0.1 - mv ${HPLOC}/dev-libs/expat/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i fastdep-0.16 - mv ${HPLOC}/dev-util/fastdep/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gettext-0.18.1.1 - mv ${HPLOC}/sys-devel/gettext/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i gperf-3.0.4 - mv ${HPLOC}/dev-util/gperf/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i groff-1.20.1 - mv ${HPLOC}/sys-apps/groff/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libevent-2.0.10 - mv ${HPLOC}/dev-libs/libevent/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libiconv-1.13.1 - mv ${HPLOC}/dev-libs/libiconv/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i man-1.6g - mv ${HPLOC}/sys-apps/man/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i nano-2.2.6 - mv ${HPLOC}/app-editors/nano/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i p7zip-9.20.1 - mv ${HPLOC}/app-arch/p7zip/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i paladin-1.3 - mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i libpcre-8.12 - mv ${HPLOC}/dev-libs/libpcre/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d perl-5.10.1 - mv ${HPLOC}/dev-lang/perl/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i rsync-3.0.7 - mv ${HPLOC}/net-misc/rsync/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i ruby-1.9.1 - mv ${HPLOC}/dev-lang/ruby/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i sed-4.2.1 - mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vision-908 - mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i vim-7.3 - mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i transmission-2.21 - mv ${HPLOC}/net-p2p/transmission/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -c -d -i pe-2.4.3-600 - mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i opensound-4.2 -#b mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d python-2.7.1 -#b mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips - haikuporter -y -d -i tar-1.26 - mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i netsurf-2.6 -#b mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips -#b haikuporter -y -d -i clockwerk-78 -#b mv ${HPLOC}/haiku-apps/clockwerk/*.zip ${HPLOC}/packs/optionalpackages/zips - -#3 haikuporter -y -d -i ABI-compliance-checker-1.12 -#3 haikuporter -y -d -i Beam-1.2alpha -#3 haikuporter -y -d -i bebook_20081026 -#3 haikuporter -y -d -i BeHappy-1.0.6 -#3 haikuporter -y -d -i BePDF-1.1.1b3 -#3 mv ${HPLOC}/haiku-apps/bepdf/*.zip ${HPLOC}/packs/optionalpackages/zips -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre -#3 haikuporter -y -d -i friss-0.5pre7 -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 -#3 haikuporter -y -d -i links -#3 haikuporter -y -d -i ocaml-3.11.1 -#3 haikuporter -y -d -i camlp5-5.12 -#3 haikuporter -y -d -i TimGMSoundFont -#3 haikuporter -y -d -i TrackerNewTemplates -#3 haikuporter -y -d -i WonderBrush-2.1.2 -#3 haikuporter -y -c -d -i WebPositive -#3 haikuporter -y -d -i KeymapSwitcher-1.2.5 -#3 haikuporter -y -d -i clucene-0.9.21 -#3 haikuporter -y -d -i BeZillaBrowser-2.0.0.22pre - -} - -INSTALL() -{ - cd . - echo "Done. Zipped files are in the zips directory." - echo "GPL/LGPL sources are in the source directory." - #No need to install these, - #just put all the zips into the zips directory for uploading - #For GPL/LGPL software also create the patches sources .xz archives -} - -#LICENSE="" -#COPYRIGHT="" From 5af70e5437efaeebeede6d8634b79fa4ab00a731 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 29 Jul 2013 18:42:38 +0200 Subject: [PATCH 342/587] Add meta-port recipe for building a list of ports. --- meta-ports/meta_portsfile/meta_portsfile-1.recipe | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 meta-ports/meta_portsfile/meta_portsfile-1.recipe diff --git a/meta-ports/meta_portsfile/meta_portsfile-1.recipe b/meta-ports/meta_portsfile/meta_portsfile-1.recipe new file mode 100644 index 000000000..0a00238bd --- /dev/null +++ b/meta-ports/meta_portsfile/meta_portsfile-1.recipe @@ -0,0 +1,14 @@ +SUMMARY="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" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES=" + meta_portsfile = $portVersion + " +BUILD_REQUIRES=" + $portsfileAsRequires + " From e00c2d5e19c45d146c3620384a392ca268df343e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 3 Aug 2013 20:08:27 +0200 Subject: [PATCH 343/587] icu: fix typo in devel package provides --- dev-libs/icu/icu-4.8.1.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/icu/icu-4.8.1.1.recipe b/dev-libs/icu/icu-4.8.1.1.recipe index 7b45bbc01..debf0e73a 100644 --- a/dev-libs/icu/icu-4.8.1.1.recipe +++ b/dev-libs/icu/icu-4.8.1.1.recipe @@ -103,7 +103,7 @@ PROVIDES_devel=" devel:libicuio = 48.1.1 compat >= 48 devel:libicule = 48.1.1 compat >= 48 devel:libiculx = 48.1.1 compat >= 48 - devel:libicutest.so = 48.1.1 compat >= 48 + devel:libicutest = 48.1.1 compat >= 48 devel:libicutu = 48.1.1 compat >= 48 devel:libicuuc = 48.1.1 compat >= 48 " From d525fee8e99d226aae2392aa89d0d4e4cc3df47e Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 4 Aug 2013 21:47:43 +0200 Subject: [PATCH 344/587] Fix names of recipe files that were non-parsable --- app-arch/xz_utils/xz-utils-4.999.9.recipe | 37 ------------------- .../{ffsb-6.0-rc2.recipe => ffsb-6.0_rc2} | 0 .../jed/{jed-0.99-19.recipe => jed-0.99_19} | 0 .../joe/{joe-3.8-hg.recipe => joe-3.8_hg} | 0 ....3.2dev-cvs.recipe => qemacs-0.3.2dev_cvs} | 0 ...ym-0.9.11-cvs.recipe => aranym-0.9.11_cvs} | 0 ...utron-0.9-svn.recipe => oricutron-0.9_svn} | 0 ...arpc-0.5.0-cvs.recipe => pearpc-0.5.0_cvs} | 0 ...fish-1.23.1-git.recipe => fish-1.23.1_git} | 0 ...k-tools-0.2.1.recipe => ebook_tools-0.2.1} | 0 ...eract-3.x-svn.recipe => tesseract-3.x_svn} | 0 ...mm-common-0.9.2.recipe => mm_common-0.9.2} | 0 ...redis-2.9.0-git.recipe => redis-2.9.0_git} | 0 ...ls-2012.10.recipe => u_boot_tools-2012.10} | 0 ...asspath-0.98.recipe => gnu_classpath-0.98} | 0 .../{dmd-bin-1.064.recipe => dmd_bin-1.064} | 0 .../lua/{lua-5.1.4-3.recipe => lua-5.1.4_3} | 0 ...i-prolog-6.0.2.recipe => swi_prolog-6.0.2} | 0 ...i-prolog-6.2.0.recipe => swi_prolog-6.2.0} | 0 ...-7.2_alpha6.recipe => boehm_gc-7.2_alpha6} | 0 .../{boehm-gc-7.2d.recipe => boehm_gc-7.2d} | 0 .../json_c/{json-c-0.9.recipe => json_c-0.9} | 0 ...pg-error-1.10.recipe => libgpg_error-1.10} | 0 ...bgpg-error-1.7.recipe => libgpg_error-1.7} | 0 ...tubs-0.3.2.recipe => libpthread_stubs-0.3} | 0 ...tubs-0.3.recipe => libpthread_stubs-0.3.2} | 0 ....1-HEAD.recipe => libwapcaplet-0.1.1_HEAD} | 0 ...edir-1.1.1.recipe => libxdg_basedir-1.1.1} | 0 ...mpfr-3.0.0-7047.recipe => mpfr-3.0.0_7047} | 0 .../{xerces-c-3.1.1.recipe => xerces_c-3.1.1} | 0 ...XML-Parser-2.36.recipe => XML_Parser-2.36} | 0 .../cnf/{cnf-1.0-git.recipe => cnf-1.0_git} | 0 ...chart-1.39-bzr.recipe => pychart-1.39_bzr} | 0 ...core-4.8.x-git.recipe => qtcore-4.8.x_git} | 0 ...3.recipe => abi_compliance_checker-1.98.3} | 0 .../{automoc-4-git.recipe => automoc-4_git} | 0 .../{cmake-2.8-git.recipe => cmake-2.8_git} | 0 .../{gtk-doc-1.15.recipe => gtk_doc-1.15} | 0 ...python2.5.recipe => scons-1.0.1_python2.5} | 0 ...-1.22-fossil.recipe => fossil-1.22_fossil} | 0 ...-1.7.0-rc2.recipe => subversion-1.7.0_rc2} | 0 ....7.xx-svn.recipe => subversion-1.7.xx_svn} | 0 ...dosbox-0.74-svn.recipe => dosbox-0.74_svn} | 0 ...s-0.2-157.recipe => numptyphysics-0.2_157} | 0 ...e-common-2.28.recipe => gnome_common-2.28} | 0 ...knife-999-git.recipe => armyknife-999_git} | 0 ...wser-1.1.1-cvs.recipe => bowser-1.1.1_cvs} | 0 ...burnitnow-2-svn.recipe => burnitnow-2_svn} | 0 ...w-beta5-svn.recipe => burnitnow-beta5_svn} | 0 ...w-beta6-git.recipe => burnitnow-beta6_git} | 0 ....HEAD.recipe => caya_gpl_protocols-0.HEAD} | 0 ...tocols-19.recipe => caya_gpl_protocols-19} | 0 ...tocols-24.recipe => caya_gpl_protocols-24} | 0 ...tocols-35.recipe => caya_gpl_protocols-35} | 0 ...tocols-36.recipe => caya_gpl_protocols-36} | 0 .../{friss-0.7-svn.recipe => friss-0.7_svn} | 0 ...er-1.0-svn.recipe => haikutwitter-1.0_svn} | 0 .../{hare-beta1-git.recipe => hare-beta1_git} | 0 ...open-sum-it-108.recipe => open_sum_it-108} | 0 .../{paladin-1.3-hg.recipe => paladin-1.3_hg} | 0 haiku-apps/pe/pe-2.4.2-597.recipe | 30 --------------- haiku-apps/pe/pe-2.4.3-600.recipe | 28 -------------- ...anager-0-svn.recipe => thememanager-0_svn} | 0 ...es-fonts-1.1.recipe => arabeyes_fonts-1.1} | 0 ...ier-prime-1.0.recipe => courier_prime-1.0} | 0 ...farsi-fonts-0.4.recipe => farsi_fonts-0.4} | 0 ...kacst-fonts-5.0.recipe => kacst_fonts-5.0} | 0 ...ef-font-1.001.recipe => lateef_font-1.001} | 0 ...ecipe => liberation_fonts-1.06.0.20100721} | 0 ...leeq-1.02.recipe => nafees_nastaleeq-1.02} | 0 ...fees-riqa-1.00.recipe => nafees_riqa-1.00} | 0 ...t-1.005.recipe => scheherazade_font-1.005} | 0 ...es-fonts-2.0.recipe => x_series_fonts-2.0} | 0 ...k-6.6.1-10.recipe => imagemagick-6.6.1_10} | 0 ...-0.9.2x-cvs.recipe => tuxpaint-0.9.2x_cvs} | 0 ...gro-4.4.x-svn.recipe => allegro-4.4.x_svn} | 0 ...=> freetype_with_subpixel_rendering-2.4.9} | 0 .../{ftgl-2.1-svn.recipe => ftgl-2.1-svn} | 0 ...ladspa-sdk-1.13.recipe => ladspa_sdk-1.13} | 0 ...-0.0.3-HEAD.recipe => libnsbmp_0.0.3-HEAD} | 0 .../{libsdl-1.2-hg.recipe => libsdl-1.2_hg} | 0 ...libsdl-1.3-gsoc.recipe => libsdl-1.3_gsoc} | 0 .../{libsdl-2.0-hg.recipe => libsdl-2.0_hg} | 0 ....0-hg-cmake.recipe => libsdl-2.0_hg_cmake} | 0 ...vgtiny-0-HEAD.recipe => libsvgtiny-0_HEAD} | 0 ...ebm-0.9.2-git.recipe => libwebm-0.9.2_git} | 0 ...ebp-0.1.2-git.recipe => libwebp-0.1.2_git} | 0 ...openal-1.12-git.recipe => openal-1.12_git} | 0 .../{sdl-gfx-2.0.20.recipe => sdl_gfx-2.0.20} | 0 .../{sdl-gfx-2.0.22.recipe => sdl_gfx-2.0.22} | 0 .../{sdl-gfx-2.0.23.recipe => sdl_gfx-2.0.23} | 0 ...l-image-1.2.10.recipe => sdl_image-1.2.10} | 0 ...l-image-1.2.12.recipe => sdl_image-1.2.12} | 0 ...sdl-image-1.2.6.recipe => sdl_image-1.2.6} | 0 ...sdl-image-1.2.8.recipe => sdl_image-1.2.8} | 0 ...sdl-image-1.2.9.recipe => sdl_image-1.2.9} | 0 ...l-image-1.2-hg.recipe => sdl_image-1.2_hg} | 0 ...l-mixer-1.2.10.recipe => sdl_mixer-1.2.10} | 0 ...l-mixer-1.2.11.recipe => sdl_mixer-1.2.11} | 0 ...l-mixer-1.2.12.recipe => sdl_mixer-1.2.12} | 0 ...sdl-mixer-1.2.9.recipe => sdl_mixer-1.2.9} | 0 ...l-mixer-1.2-hg.recipe => sdl_mixer-1.2_hg} | 0 .../{sdl-net-1.2.7.recipe => sdl_net-1.2.7} | 0 .../{sdl-net-1.2.8.recipe => sdl_net-1.2.8} | 0 .../{sdl-net-1.2-hg.recipe => sdl_net-1.2_hg} | 0 .../{sdl-rtf-0.1.0.recipe => sdl_rtf-0.1.0} | 0 ...sdl-sound-1.0.3.recipe => sdl_sound-1.0.3} | 0 ...l-sound-1.0-hg.recipe => sdl_sound-1.0_hg} | 0 .../{sdl-ttf-2.0.10.recipe => sdl_ttf-2.0.10} | 0 .../{sdl-ttf-2.0.11.recipe => sdl_ttf-2.0.11} | 0 .../{sdl-ttf-2.0.9.recipe => sdl_ttf-2.0.9} | 0 .../{sdl-ttf-2.0-hg.recipe => sdl_ttf-2.0_} | 0 .../{speex-1.2-git.recipe => speex-1.2_git} | 0 ...ffer.recipe => fluidsynth_1.1_midi_buffer} | 0 ...-no-coda-3.13.recipe => gogo_no_coda-3.13} | 0 .../lame/{lame-398-2.recipe => lame-398_2} | 0 ...naspro-0.2.9-hg.recipe => naspro-0.2.9_hg} | 0 .../{ocp-0.1.21-git.recipe => ocp_0.1.21_git} | 0 ...-tools-1.2.0.recipe => vorbis_tools-1.2.0} | 0 ...-tools-1.4.0.recipe => vorbis_tools-1.4.0} | 0 ...eg-0.10.2-vlc.recipe => ffmpeg-0.10.2_vlc} | 0 ...1.5-20101107.recipe => vlc-1.1.5_20101107} | 0 ...dy-irc-0.28b.recipe => rhapsody_irc-0.28b} | 0 ...ub-0.1.2-HEAD.recipe => hubbub-0.1.2_HEAD} | 0 .../{seeks-0.x-git.recipe => seeks-0.x_git} | 0 ...3-fwcutter-012.recipe => b43_fwcutter-012} | 0 .../{dtc-1.3.0-git.recipe => dtc-1.3.0_git} | 0 ...ogs-1.43-git.recipe => e2fsprogs-1.43_git} | 0 ...netsurf-2.7-svn.recipe => netsurf-2.7_svn} | 0 ...-0.19-master.recipe => pixman-0.19_master} | 0 ...e-info-1.0.recipe => shared_mime_info-1.0} | 0 ...17.0-git.recipe => util_macros-1.17.0_git} | 0 ...-macros-1.7.0.recipe => util_macros-1.7.0} | 0 .../{xcb-proto-1.6.recipe => xcb_proto-1.6} | 0 ...to-7.0.23-git.recipe => xproto-7.0.23_git} | 0 135 files changed, 95 deletions(-) delete mode 100644 app-arch/xz_utils/xz-utils-4.999.9.recipe rename app-benchmarks/ffsb/{ffsb-6.0-rc2.recipe => ffsb-6.0_rc2} (100%) rename app-editors/jed/{jed-0.99-19.recipe => jed-0.99_19} (100%) rename app-editors/joe/{joe-3.8-hg.recipe => joe-3.8_hg} (100%) rename app-editors/qemacs/{qemacs-0.3.2dev-cvs.recipe => qemacs-0.3.2dev_cvs} (100%) rename app-emulation/aranym/{aranym-0.9.11-cvs.recipe => aranym-0.9.11_cvs} (100%) rename app-emulation/oricutron/{oricutron-0.9-svn.recipe => oricutron-0.9_svn} (100%) rename app-emulation/pearpc/{pearpc-0.5.0-cvs.recipe => pearpc-0.5.0_cvs} (100%) rename app-shells/fish/{fish-1.23.1-git.recipe => fish-1.23.1_git} (100%) rename app-text/ebook_tools/{ebook-tools-0.2.1.recipe => ebook_tools-0.2.1} (100%) rename app-text/tesseract/{tesseract-3.x-svn.recipe => tesseract-3.x_svn} (100%) rename dev-cpp/mm_common/{mm-common-0.9.2.recipe => mm_common-0.9.2} (100%) rename dev-db/redis/{redis-2.9.0-git.recipe => redis-2.9.0_git} (100%) rename dev-embedded/u_boot_tools/{u-boot-tools-2012.10.recipe => u_boot_tools-2012.10} (100%) rename dev-java/gnu_classpath/{gnu-classpath-0.98.recipe => gnu_classpath-0.98} (100%) rename dev-lang/dmd_bin/{dmd-bin-1.064.recipe => dmd_bin-1.064} (100%) rename dev-lang/lua/{lua-5.1.4-3.recipe => lua-5.1.4_3} (100%) rename dev-lang/swi_prolog/{swi-prolog-6.0.2.recipe => swi_prolog-6.0.2} (100%) rename dev-lang/swi_prolog/{swi-prolog-6.2.0.recipe => swi_prolog-6.2.0} (100%) rename dev-libs/boehm_gc/{boehm-gc-7.2_alpha6.recipe => boehm_gc-7.2_alpha6} (100%) rename dev-libs/boehm_gc/{boehm-gc-7.2d.recipe => boehm_gc-7.2d} (100%) rename dev-libs/json_c/{json-c-0.9.recipe => json_c-0.9} (100%) rename dev-libs/libgpg_error/{libgpg-error-1.10.recipe => libgpg_error-1.10} (100%) rename dev-libs/libgpg_error/{libgpg-error-1.7.recipe => libgpg_error-1.7} (100%) rename dev-libs/libpthread_stubs/{libpthread-stubs-0.3.2.recipe => libpthread_stubs-0.3} (100%) rename dev-libs/libpthread_stubs/{libpthread-stubs-0.3.recipe => libpthread_stubs-0.3.2} (100%) rename dev-libs/libwapcaplet/{libwapcaplet-0.1.1-HEAD.recipe => libwapcaplet-0.1.1_HEAD} (100%) rename dev-libs/libxdg_basedir/{libxdg-basedir-1.1.1.recipe => libxdg_basedir-1.1.1} (100%) rename dev-libs/mpfr/{mpfr-3.0.0-7047.recipe => mpfr-3.0.0_7047} (100%) rename dev-libs/xerces_c/{xerces-c-3.1.1.recipe => xerces_c-3.1.1} (100%) rename dev-perl/XML_Parser/{XML-Parser-2.36.recipe => XML_Parser-2.36} (100%) rename dev-python/cnf/{cnf-1.0-git.recipe => cnf-1.0_git} (100%) rename dev-python/pychart/{pychart-1.39-bzr.recipe => pychart-1.39_bzr} (100%) rename dev-qt/qtcore/{qtcore-4.8.x-git.recipe => qtcore-4.8.x_git} (100%) rename dev-util/abi_compliance_checker/{abi-compliance-checker-1.98.3.recipe => abi_compliance_checker-1.98.3} (100%) rename dev-util/automoc/{automoc-4-git.recipe => automoc-4_git} (100%) rename dev-util/cmake/{cmake-2.8-git.recipe => cmake-2.8_git} (100%) rename dev-util/gtk_doc/{gtk-doc-1.15.recipe => gtk_doc-1.15} (100%) rename dev-util/scons/{scons-1.0.1-python2.5.recipe => scons-1.0.1_python2.5} (100%) rename dev-vcs/fossil/{fossil-1.22-fossil.recipe => fossil-1.22_fossil} (100%) rename dev-vcs/subversion/{subversion-1.7.0-rc2.recipe => subversion-1.7.0_rc2} (100%) rename dev-vcs/subversion/{subversion-1.7.xx-svn.recipe => subversion-1.7.xx_svn} (100%) rename games-emulation/dosbox/{dosbox-0.74-svn.recipe => dosbox-0.74_svn} (100%) rename games-puzzle/numptyphysics/{numptyphysics-0.2-157.recipe => numptyphysics-0.2_157} (100%) rename gnome-base/gnome_common/{gnome-common-2.28.recipe => gnome_common-2.28} (100%) rename haiku-apps/armyknife/{armyknife-999-git.recipe => armyknife-999_git} (100%) rename haiku-apps/bowser/{bowser-1.1.1-cvs.recipe => bowser-1.1.1_cvs} (100%) rename haiku-apps/burnitnow/{burnitnow-2-svn.recipe => burnitnow-2_svn} (100%) rename haiku-apps/burnitnow/{burnitnow-beta5-svn.recipe => burnitnow-beta5_svn} (100%) rename haiku-apps/burnitnow/{burnitnow-beta6-git.recipe => burnitnow-beta6_git} (100%) rename haiku-apps/caya_gpl_protocols/{caya-gpl-protocols-0.HEAD.recipe => caya_gpl_protocols-0.HEAD} (100%) rename haiku-apps/caya_gpl_protocols/{caya-gpl-protocols-19.recipe => caya_gpl_protocols-19} (100%) rename haiku-apps/caya_gpl_protocols/{caya-gpl-protocols-24.recipe => caya_gpl_protocols-24} (100%) rename haiku-apps/caya_gpl_protocols/{caya-gpl-protocols-35.recipe => caya_gpl_protocols-35} (100%) rename haiku-apps/caya_gpl_protocols/{caya-gpl-protocols-36.recipe => caya_gpl_protocols-36} (100%) rename haiku-apps/friss/{friss-0.7-svn.recipe => friss-0.7_svn} (100%) rename haiku-apps/haikutwitter/{haikutwitter-1.0-svn.recipe => haikutwitter-1.0_svn} (100%) rename haiku-apps/hare/{hare-beta1-git.recipe => hare-beta1_git} (100%) rename haiku-apps/open_sum_it/{open-sum-it-108.recipe => open_sum_it-108} (100%) rename haiku-apps/paladin/{paladin-1.3-hg.recipe => paladin-1.3_hg} (100%) delete mode 100644 haiku-apps/pe/pe-2.4.2-597.recipe delete mode 100644 haiku-apps/pe/pe-2.4.3-600.recipe rename haiku-apps/thememanager/{thememanager-0-svn.recipe => thememanager-0_svn} (100%) rename media-fonts/arabeyes_fonts/{arabeyes-fonts-1.1.recipe => arabeyes_fonts-1.1} (100%) rename media-fonts/courier_prime/{courier-prime-1.0.recipe => courier_prime-1.0} (100%) rename media-fonts/farsi_fonts/{farsi-fonts-0.4.recipe => farsi_fonts-0.4} (100%) rename media-fonts/kacst_fonts/{kacst-fonts-5.0.recipe => kacst_fonts-5.0} (100%) rename media-fonts/lateef_font/{lateef-font-1.001.recipe => lateef_font-1.001} (100%) rename media-fonts/liberation_fonts/{liberation-fonts-1.06.0.20100721.recipe => liberation_fonts-1.06.0.20100721} (100%) rename media-fonts/nafees_nastaleeq/{nafees-nastaleeq-1.02.recipe => nafees_nastaleeq-1.02} (100%) rename media-fonts/nafees_riqa/{nafees-riqa-1.00.recipe => nafees_riqa-1.00} (100%) rename media-fonts/scheherazade_font/{scheherazade-font-1.005.recipe => scheherazade_font-1.005} (100%) rename media-fonts/x_series_fonts/{x-series-fonts-2.0.recipe => x_series_fonts-2.0} (100%) rename media-gfx/imagemagick/{imagemagick-6.6.1-10.recipe => imagemagick-6.6.1_10} (100%) rename media-gfx/tuxpaint/{tuxpaint-0.9.2x-cvs.recipe => tuxpaint-0.9.2x_cvs} (100%) rename media-libs/allegro/{allegro-4.4.x-svn.recipe => allegro-4.4.x_svn} (100%) rename media-libs/freetype/{freetype-2.4.9-with-subpixel-rendering-enabled.recipe => freetype_with_subpixel_rendering-2.4.9} (100%) rename media-libs/ftgl/{ftgl-2.1-svn.recipe => ftgl-2.1-svn} (100%) rename media-libs/ladspa_sdk/{ladspa-sdk-1.13.recipe => ladspa_sdk-1.13} (100%) rename media-libs/libnsbmp/{libnsbmp-0.0.3-HEAD.recipe => libnsbmp_0.0.3-HEAD} (100%) rename media-libs/libsdl/{libsdl-1.2-hg.recipe => libsdl-1.2_hg} (100%) rename media-libs/libsdl/{libsdl-1.3-gsoc.recipe => libsdl-1.3_gsoc} (100%) rename media-libs/libsdl/{libsdl-2.0-hg.recipe => libsdl-2.0_hg} (100%) rename media-libs/libsdl/{libsdl-2.0-hg-cmake.recipe => libsdl-2.0_hg_cmake} (100%) rename media-libs/libsvgtiny/{libsvgtiny-0-HEAD.recipe => libsvgtiny-0_HEAD} (100%) rename media-libs/libwebm/{libwebm-0.9.2-git.recipe => libwebm-0.9.2_git} (100%) rename media-libs/libwebp/{libwebp-0.1.2-git.recipe => libwebp-0.1.2_git} (100%) rename media-libs/openal/{openal-1.12-git.recipe => openal-1.12_git} (100%) rename media-libs/sdl_gfx/{sdl-gfx-2.0.20.recipe => sdl_gfx-2.0.20} (100%) rename media-libs/sdl_gfx/{sdl-gfx-2.0.22.recipe => sdl_gfx-2.0.22} (100%) rename media-libs/sdl_gfx/{sdl-gfx-2.0.23.recipe => sdl_gfx-2.0.23} (100%) rename media-libs/sdl_image/{sdl-image-1.2.10.recipe => sdl_image-1.2.10} (100%) rename media-libs/sdl_image/{sdl-image-1.2.12.recipe => sdl_image-1.2.12} (100%) rename media-libs/sdl_image/{sdl-image-1.2.6.recipe => sdl_image-1.2.6} (100%) rename media-libs/sdl_image/{sdl-image-1.2.8.recipe => sdl_image-1.2.8} (100%) rename media-libs/sdl_image/{sdl-image-1.2.9.recipe => sdl_image-1.2.9} (100%) rename media-libs/sdl_image/{sdl-image-1.2-hg.recipe => sdl_image-1.2_hg} (100%) rename media-libs/sdl_mixer/{sdl-mixer-1.2.10.recipe => sdl_mixer-1.2.10} (100%) rename media-libs/sdl_mixer/{sdl-mixer-1.2.11.recipe => sdl_mixer-1.2.11} (100%) rename media-libs/sdl_mixer/{sdl-mixer-1.2.12.recipe => sdl_mixer-1.2.12} (100%) rename media-libs/sdl_mixer/{sdl-mixer-1.2.9.recipe => sdl_mixer-1.2.9} (100%) rename media-libs/sdl_mixer/{sdl-mixer-1.2-hg.recipe => sdl_mixer-1.2_hg} (100%) rename media-libs/sdl_net/{sdl-net-1.2.7.recipe => sdl_net-1.2.7} (100%) rename media-libs/sdl_net/{sdl-net-1.2.8.recipe => sdl_net-1.2.8} (100%) rename media-libs/sdl_net/{sdl-net-1.2-hg.recipe => sdl_net-1.2_hg} (100%) rename media-libs/sdl_rtf/{sdl-rtf-0.1.0.recipe => sdl_rtf-0.1.0} (100%) rename media-libs/sdl_sound/{sdl-sound-1.0.3.recipe => sdl_sound-1.0.3} (100%) rename media-libs/sdl_sound/{sdl-sound-1.0-hg.recipe => sdl_sound-1.0_hg} (100%) rename media-libs/sdl_ttf/{sdl-ttf-2.0.10.recipe => sdl_ttf-2.0.10} (100%) rename media-libs/sdl_ttf/{sdl-ttf-2.0.11.recipe => sdl_ttf-2.0.11} (100%) rename media-libs/sdl_ttf/{sdl-ttf-2.0.9.recipe => sdl_ttf-2.0.9} (100%) rename media-libs/sdl_ttf/{sdl-ttf-2.0-hg.recipe => sdl_ttf-2.0_} (100%) rename media-libs/speex/{speex-1.2-git.recipe => speex-1.2_git} (100%) rename media-sound/fluidsynth/{fluidsynth-1.1-midi-buffer.recipe => fluidsynth_1.1_midi_buffer} (100%) rename media-sound/gogo_no_coda/{gogo-no-coda-3.13.recipe => gogo_no_coda-3.13} (100%) rename media-sound/lame/{lame-398-2.recipe => lame-398_2} (100%) rename media-sound/naspro/{naspro-0.2.9-hg.recipe => naspro-0.2.9_hg} (100%) rename media-sound/ocp/{ocp-0.1.21-git.recipe => ocp_0.1.21_git} (100%) rename media-sound/vorbis_tools/{vorbis-tools-1.2.0.recipe => vorbis_tools-1.2.0} (100%) rename media-sound/vorbis_tools/{vorbis-tools-1.4.0.recipe => vorbis_tools-1.4.0} (100%) rename media-video/ffmpeg/{ffmpeg-0.10.2-vlc.recipe => ffmpeg-0.10.2_vlc} (100%) rename media-video/vlc/{vlc-1.1.5-20101107.recipe => vlc-1.1.5_20101107} (100%) rename net-irc/rhapsody_irc/{rhapsody-irc-0.28b.recipe => rhapsody_irc-0.28b} (100%) rename net-libs/hubbub/{hubbub-0.1.2-HEAD.recipe => hubbub-0.1.2_HEAD} (100%) rename net-p2p/seeks/{seeks-0.x-git.recipe => seeks-0.x_git} (100%) rename net-wireless/b43_fwcutter/{b43-fwcutter-012.recipe => b43_fwcutter-012} (100%) rename sys-apps/dtc/{dtc-1.3.0-git.recipe => dtc-1.3.0_git} (100%) rename sys-fs/e2fsprogs/{e2fsprogs-1.43-git.recipe => e2fsprogs-1.43_git} (100%) rename www-client/netsurf/{netsurf-2.7-svn.recipe => netsurf-2.7_svn} (100%) rename x11-libs/pixman/{pixman-0.19-master.recipe => pixman-0.19_master} (100%) rename x11-misc/shared_mime_info/{shared-mime-info-1.0.recipe => shared_mime_info-1.0} (100%) rename x11-misc/util_macros/{util-macros-1.17.0-git.recipe => util_macros-1.17.0_git} (100%) rename x11-misc/util_macros/{util-macros-1.7.0.recipe => util_macros-1.7.0} (100%) rename x11-proto/xcb_proto/{xcb-proto-1.6.recipe => xcb_proto-1.6} (100%) rename x11-proto/xproto/{xproto-7.0.23-git.recipe => xproto-7.0.23_git} (100%) diff --git a/app-arch/xz_utils/xz-utils-4.999.9.recipe b/app-arch/xz_utils/xz-utils-4.999.9.recipe deleted file mode 100644 index f79763e27..000000000 --- a/app-arch/xz_utils/xz-utils-4.999.9.recipe +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION="XZ Utils is data compression software for working with LZMA compressed files." -HOMEPAGE="http://tukaani.org/xz/" -SRC_URI="http://tukaani.org/xz/xz-4.999.9beta.tar.bz2" -CHECKSUM_MD5="cc4044fcc073b8bcf3164d1d0df82161" -REVISION="1" -STATUS_HAIKU="stable" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -DEPEND="" -BUILD() -{ - cd xz-4.999.9beta - cp -f `finddir B_COMMON_BIN_DIRECTORY`/libtool . - libtoolize -c -f - aclocal -I m4 - autoconf - autoheader - automake -acf --foreign - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd xz-4.999.9beta - make install -} - -TEST() -{ - cd xz-4.999.9beta - make check -} - -LICENSE="GNU LGPL v2.1 - GNU GPL v2 - GNU GPL v3" -COPYRIGHT="2005-2009 Lasse Collin" diff --git a/app-benchmarks/ffsb/ffsb-6.0-rc2.recipe b/app-benchmarks/ffsb/ffsb-6.0_rc2 similarity index 100% rename from app-benchmarks/ffsb/ffsb-6.0-rc2.recipe rename to app-benchmarks/ffsb/ffsb-6.0_rc2 diff --git a/app-editors/jed/jed-0.99-19.recipe b/app-editors/jed/jed-0.99_19 similarity index 100% rename from app-editors/jed/jed-0.99-19.recipe rename to app-editors/jed/jed-0.99_19 diff --git a/app-editors/joe/joe-3.8-hg.recipe b/app-editors/joe/joe-3.8_hg similarity index 100% rename from app-editors/joe/joe-3.8-hg.recipe rename to app-editors/joe/joe-3.8_hg diff --git a/app-editors/qemacs/qemacs-0.3.2dev-cvs.recipe b/app-editors/qemacs/qemacs-0.3.2dev_cvs similarity index 100% rename from app-editors/qemacs/qemacs-0.3.2dev-cvs.recipe rename to app-editors/qemacs/qemacs-0.3.2dev_cvs diff --git a/app-emulation/aranym/aranym-0.9.11-cvs.recipe b/app-emulation/aranym/aranym-0.9.11_cvs similarity index 100% rename from app-emulation/aranym/aranym-0.9.11-cvs.recipe rename to app-emulation/aranym/aranym-0.9.11_cvs diff --git a/app-emulation/oricutron/oricutron-0.9-svn.recipe b/app-emulation/oricutron/oricutron-0.9_svn similarity index 100% rename from app-emulation/oricutron/oricutron-0.9-svn.recipe rename to app-emulation/oricutron/oricutron-0.9_svn diff --git a/app-emulation/pearpc/pearpc-0.5.0-cvs.recipe b/app-emulation/pearpc/pearpc-0.5.0_cvs similarity index 100% rename from app-emulation/pearpc/pearpc-0.5.0-cvs.recipe rename to app-emulation/pearpc/pearpc-0.5.0_cvs diff --git a/app-shells/fish/fish-1.23.1-git.recipe b/app-shells/fish/fish-1.23.1_git similarity index 100% rename from app-shells/fish/fish-1.23.1-git.recipe rename to app-shells/fish/fish-1.23.1_git diff --git a/app-text/ebook_tools/ebook-tools-0.2.1.recipe b/app-text/ebook_tools/ebook_tools-0.2.1 similarity index 100% rename from app-text/ebook_tools/ebook-tools-0.2.1.recipe rename to app-text/ebook_tools/ebook_tools-0.2.1 diff --git a/app-text/tesseract/tesseract-3.x-svn.recipe b/app-text/tesseract/tesseract-3.x_svn similarity index 100% rename from app-text/tesseract/tesseract-3.x-svn.recipe rename to app-text/tesseract/tesseract-3.x_svn diff --git a/dev-cpp/mm_common/mm-common-0.9.2.recipe b/dev-cpp/mm_common/mm_common-0.9.2 similarity index 100% rename from dev-cpp/mm_common/mm-common-0.9.2.recipe rename to dev-cpp/mm_common/mm_common-0.9.2 diff --git a/dev-db/redis/redis-2.9.0-git.recipe b/dev-db/redis/redis-2.9.0_git similarity index 100% rename from dev-db/redis/redis-2.9.0-git.recipe rename to dev-db/redis/redis-2.9.0_git diff --git a/dev-embedded/u_boot_tools/u-boot-tools-2012.10.recipe b/dev-embedded/u_boot_tools/u_boot_tools-2012.10 similarity index 100% rename from dev-embedded/u_boot_tools/u-boot-tools-2012.10.recipe rename to dev-embedded/u_boot_tools/u_boot_tools-2012.10 diff --git a/dev-java/gnu_classpath/gnu-classpath-0.98.recipe b/dev-java/gnu_classpath/gnu_classpath-0.98 similarity index 100% rename from dev-java/gnu_classpath/gnu-classpath-0.98.recipe rename to dev-java/gnu_classpath/gnu_classpath-0.98 diff --git a/dev-lang/dmd_bin/dmd-bin-1.064.recipe b/dev-lang/dmd_bin/dmd_bin-1.064 similarity index 100% rename from dev-lang/dmd_bin/dmd-bin-1.064.recipe rename to dev-lang/dmd_bin/dmd_bin-1.064 diff --git a/dev-lang/lua/lua-5.1.4-3.recipe b/dev-lang/lua/lua-5.1.4_3 similarity index 100% rename from dev-lang/lua/lua-5.1.4-3.recipe rename to dev-lang/lua/lua-5.1.4_3 diff --git a/dev-lang/swi_prolog/swi-prolog-6.0.2.recipe b/dev-lang/swi_prolog/swi_prolog-6.0.2 similarity index 100% rename from dev-lang/swi_prolog/swi-prolog-6.0.2.recipe rename to dev-lang/swi_prolog/swi_prolog-6.0.2 diff --git a/dev-lang/swi_prolog/swi-prolog-6.2.0.recipe b/dev-lang/swi_prolog/swi_prolog-6.2.0 similarity index 100% rename from dev-lang/swi_prolog/swi-prolog-6.2.0.recipe rename to dev-lang/swi_prolog/swi_prolog-6.2.0 diff --git a/dev-libs/boehm_gc/boehm-gc-7.2_alpha6.recipe b/dev-libs/boehm_gc/boehm_gc-7.2_alpha6 similarity index 100% rename from dev-libs/boehm_gc/boehm-gc-7.2_alpha6.recipe rename to dev-libs/boehm_gc/boehm_gc-7.2_alpha6 diff --git a/dev-libs/boehm_gc/boehm-gc-7.2d.recipe b/dev-libs/boehm_gc/boehm_gc-7.2d similarity index 100% rename from dev-libs/boehm_gc/boehm-gc-7.2d.recipe rename to dev-libs/boehm_gc/boehm_gc-7.2d diff --git a/dev-libs/json_c/json-c-0.9.recipe b/dev-libs/json_c/json_c-0.9 similarity index 100% rename from dev-libs/json_c/json-c-0.9.recipe rename to dev-libs/json_c/json_c-0.9 diff --git a/dev-libs/libgpg_error/libgpg-error-1.10.recipe b/dev-libs/libgpg_error/libgpg_error-1.10 similarity index 100% rename from dev-libs/libgpg_error/libgpg-error-1.10.recipe rename to dev-libs/libgpg_error/libgpg_error-1.10 diff --git a/dev-libs/libgpg_error/libgpg-error-1.7.recipe b/dev-libs/libgpg_error/libgpg_error-1.7 similarity index 100% rename from dev-libs/libgpg_error/libgpg-error-1.7.recipe rename to dev-libs/libgpg_error/libgpg_error-1.7 diff --git a/dev-libs/libpthread_stubs/libpthread-stubs-0.3.2.recipe b/dev-libs/libpthread_stubs/libpthread_stubs-0.3 similarity index 100% rename from dev-libs/libpthread_stubs/libpthread-stubs-0.3.2.recipe rename to dev-libs/libpthread_stubs/libpthread_stubs-0.3 diff --git a/dev-libs/libpthread_stubs/libpthread-stubs-0.3.recipe b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2 similarity index 100% rename from dev-libs/libpthread_stubs/libpthread-stubs-0.3.recipe rename to dev-libs/libpthread_stubs/libpthread_stubs-0.3.2 diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD similarity index 100% rename from dev-libs/libwapcaplet/libwapcaplet-0.1.1-HEAD.recipe rename to dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD diff --git a/dev-libs/libxdg_basedir/libxdg-basedir-1.1.1.recipe b/dev-libs/libxdg_basedir/libxdg_basedir-1.1.1 similarity index 100% rename from dev-libs/libxdg_basedir/libxdg-basedir-1.1.1.recipe rename to dev-libs/libxdg_basedir/libxdg_basedir-1.1.1 diff --git a/dev-libs/mpfr/mpfr-3.0.0-7047.recipe b/dev-libs/mpfr/mpfr-3.0.0_7047 similarity index 100% rename from dev-libs/mpfr/mpfr-3.0.0-7047.recipe rename to dev-libs/mpfr/mpfr-3.0.0_7047 diff --git a/dev-libs/xerces_c/xerces-c-3.1.1.recipe b/dev-libs/xerces_c/xerces_c-3.1.1 similarity index 100% rename from dev-libs/xerces_c/xerces-c-3.1.1.recipe rename to dev-libs/xerces_c/xerces_c-3.1.1 diff --git a/dev-perl/XML_Parser/XML-Parser-2.36.recipe b/dev-perl/XML_Parser/XML_Parser-2.36 similarity index 100% rename from dev-perl/XML_Parser/XML-Parser-2.36.recipe rename to dev-perl/XML_Parser/XML_Parser-2.36 diff --git a/dev-python/cnf/cnf-1.0-git.recipe b/dev-python/cnf/cnf-1.0_git similarity index 100% rename from dev-python/cnf/cnf-1.0-git.recipe rename to dev-python/cnf/cnf-1.0_git diff --git a/dev-python/pychart/pychart-1.39-bzr.recipe b/dev-python/pychart/pychart-1.39_bzr similarity index 100% rename from dev-python/pychart/pychart-1.39-bzr.recipe rename to dev-python/pychart/pychart-1.39_bzr diff --git a/dev-qt/qtcore/qtcore-4.8.x-git.recipe b/dev-qt/qtcore/qtcore-4.8.x_git similarity index 100% rename from dev-qt/qtcore/qtcore-4.8.x-git.recipe rename to dev-qt/qtcore/qtcore-4.8.x_git 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 similarity index 100% rename from dev-util/abi_compliance_checker/abi-compliance-checker-1.98.3.recipe rename to dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3 diff --git a/dev-util/automoc/automoc-4-git.recipe b/dev-util/automoc/automoc-4_git similarity index 100% rename from dev-util/automoc/automoc-4-git.recipe rename to dev-util/automoc/automoc-4_git diff --git a/dev-util/cmake/cmake-2.8-git.recipe b/dev-util/cmake/cmake-2.8_git similarity index 100% rename from dev-util/cmake/cmake-2.8-git.recipe rename to dev-util/cmake/cmake-2.8_git diff --git a/dev-util/gtk_doc/gtk-doc-1.15.recipe b/dev-util/gtk_doc/gtk_doc-1.15 similarity index 100% rename from dev-util/gtk_doc/gtk-doc-1.15.recipe rename to dev-util/gtk_doc/gtk_doc-1.15 diff --git a/dev-util/scons/scons-1.0.1-python2.5.recipe b/dev-util/scons/scons-1.0.1_python2.5 similarity index 100% rename from dev-util/scons/scons-1.0.1-python2.5.recipe rename to dev-util/scons/scons-1.0.1_python2.5 diff --git a/dev-vcs/fossil/fossil-1.22-fossil.recipe b/dev-vcs/fossil/fossil-1.22_fossil similarity index 100% rename from dev-vcs/fossil/fossil-1.22-fossil.recipe rename to dev-vcs/fossil/fossil-1.22_fossil diff --git a/dev-vcs/subversion/subversion-1.7.0-rc2.recipe b/dev-vcs/subversion/subversion-1.7.0_rc2 similarity index 100% rename from dev-vcs/subversion/subversion-1.7.0-rc2.recipe rename to dev-vcs/subversion/subversion-1.7.0_rc2 diff --git a/dev-vcs/subversion/subversion-1.7.xx-svn.recipe b/dev-vcs/subversion/subversion-1.7.xx_svn similarity index 100% rename from dev-vcs/subversion/subversion-1.7.xx-svn.recipe rename to dev-vcs/subversion/subversion-1.7.xx_svn diff --git a/games-emulation/dosbox/dosbox-0.74-svn.recipe b/games-emulation/dosbox/dosbox-0.74_svn similarity index 100% rename from games-emulation/dosbox/dosbox-0.74-svn.recipe rename to games-emulation/dosbox/dosbox-0.74_svn diff --git a/games-puzzle/numptyphysics/numptyphysics-0.2-157.recipe b/games-puzzle/numptyphysics/numptyphysics-0.2_157 similarity index 100% rename from games-puzzle/numptyphysics/numptyphysics-0.2-157.recipe rename to games-puzzle/numptyphysics/numptyphysics-0.2_157 diff --git a/gnome-base/gnome_common/gnome-common-2.28.recipe b/gnome-base/gnome_common/gnome_common-2.28 similarity index 100% rename from gnome-base/gnome_common/gnome-common-2.28.recipe rename to gnome-base/gnome_common/gnome_common-2.28 diff --git a/haiku-apps/armyknife/armyknife-999-git.recipe b/haiku-apps/armyknife/armyknife-999_git similarity index 100% rename from haiku-apps/armyknife/armyknife-999-git.recipe rename to haiku-apps/armyknife/armyknife-999_git diff --git a/haiku-apps/bowser/bowser-1.1.1-cvs.recipe b/haiku-apps/bowser/bowser-1.1.1_cvs similarity index 100% rename from haiku-apps/bowser/bowser-1.1.1-cvs.recipe rename to haiku-apps/bowser/bowser-1.1.1_cvs diff --git a/haiku-apps/burnitnow/burnitnow-2-svn.recipe b/haiku-apps/burnitnow/burnitnow-2_svn similarity index 100% rename from haiku-apps/burnitnow/burnitnow-2-svn.recipe rename to haiku-apps/burnitnow/burnitnow-2_svn diff --git a/haiku-apps/burnitnow/burnitnow-beta5-svn.recipe b/haiku-apps/burnitnow/burnitnow-beta5_svn similarity index 100% rename from haiku-apps/burnitnow/burnitnow-beta5-svn.recipe rename to haiku-apps/burnitnow/burnitnow-beta5_svn diff --git a/haiku-apps/burnitnow/burnitnow-beta6-git.recipe b/haiku-apps/burnitnow/burnitnow-beta6_git similarity index 100% rename from haiku-apps/burnitnow/burnitnow-beta6-git.recipe rename to haiku-apps/burnitnow/burnitnow-beta6_git diff --git a/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-0.HEAD.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD similarity index 100% rename from haiku-apps/caya_gpl_protocols/caya-gpl-protocols-0.HEAD.recipe rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD diff --git a/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-19.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19 similarity index 100% rename from haiku-apps/caya_gpl_protocols/caya-gpl-protocols-19.recipe rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19 diff --git a/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-24.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24 similarity index 100% rename from haiku-apps/caya_gpl_protocols/caya-gpl-protocols-24.recipe rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24 diff --git a/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-35.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35 similarity index 100% rename from haiku-apps/caya_gpl_protocols/caya-gpl-protocols-35.recipe rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35 diff --git a/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-36.recipe b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36 similarity index 100% rename from haiku-apps/caya_gpl_protocols/caya-gpl-protocols-36.recipe rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36 diff --git a/haiku-apps/friss/friss-0.7-svn.recipe b/haiku-apps/friss/friss-0.7_svn similarity index 100% rename from haiku-apps/friss/friss-0.7-svn.recipe rename to haiku-apps/friss/friss-0.7_svn diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0-svn.recipe b/haiku-apps/haikutwitter/haikutwitter-1.0_svn similarity index 100% rename from haiku-apps/haikutwitter/haikutwitter-1.0-svn.recipe rename to haiku-apps/haikutwitter/haikutwitter-1.0_svn diff --git a/haiku-apps/hare/hare-beta1-git.recipe b/haiku-apps/hare/hare-beta1_git similarity index 100% rename from haiku-apps/hare/hare-beta1-git.recipe rename to haiku-apps/hare/hare-beta1_git diff --git a/haiku-apps/open_sum_it/open-sum-it-108.recipe b/haiku-apps/open_sum_it/open_sum_it-108 similarity index 100% rename from haiku-apps/open_sum_it/open-sum-it-108.recipe rename to haiku-apps/open_sum_it/open_sum_it-108 diff --git a/haiku-apps/paladin/paladin-1.3-hg.recipe b/haiku-apps/paladin/paladin-1.3_hg similarity index 100% rename from haiku-apps/paladin/paladin-1.3-hg.recipe rename to haiku-apps/paladin/paladin-1.3_hg diff --git a/haiku-apps/pe/pe-2.4.2-597.recipe b/haiku-apps/pe/pe-2.4.2-597.recipe deleted file mode 100644 index 8a9f558da..000000000 --- a/haiku-apps/pe/pe-2.4.2-597.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="Pe - Programmer's Editor" -HOMEPAGE="http://pe-editor.berlios.de/" -SRC_URI="svn+http://svn.berlios.de/svnroot/repos/pe-editor/trunk#597" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libpcre >= 8.00" -#CHECKSUM_MD5="" -BUILD() -{ - cd pe-2.4.2-597 - jam -} - -INSTALL() -{ - cd pe-2.4.2-597/generated - if [ -d distro ];then - mv -f distro Pe - fi - mkdir -p ${DESTDIR}/boot/apps - cp -a Pe ${DESTDIR}/boot/apps - rm -f ${DESTDIR}/boot/apps/Pe/.OptionalPackageDescription - if [ -z ${DESTDIR} ];then - find /boot/apps/Pe -type d -name ".svn" | xargs rm -rf - fi -} -LICENSE="BSD (4-clause) - MIT" -COPYRIGHT="1996-2002 Maarteen Hekkelman - 2003-2009 Team Pe" diff --git a/haiku-apps/pe/pe-2.4.3-600.recipe b/haiku-apps/pe/pe-2.4.3-600.recipe deleted file mode 100644 index a7ea93201..000000000 --- a/haiku-apps/pe/pe-2.4.3-600.recipe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="Pe - Programmer's Editor" -HOMEPAGE="http://pe-editor.berlios.de/" -SRC_URI="svn+http://svn.berlios.de/svnroot/repos/pe-editor/trunk#600" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libpcre >= 8.00" -#CHECKSUM_MD5="" -BUILD() -{ - cd pe-2.4.3-600 - jam -} - -INSTALL() -{ - cd pe-2.4.3-600 - mkdir -p ${DESTDIR}/boot/apps - cp -a generated/distro ${DESTDIR}/boot/apps/Pe - cp -a doc ${DESTDIR}/boot/apps/Pe/Documentation - rm -f ${DESTDIR}/boot/apps/Pe/.OptionalPackageDescription - if [ -z "${DESTDIR}" ];then - find /boot/apps/Pe -type d -name ".svn" | xargs rm -rf - fi -} -LICENSE="BSD (4-clause) - MIT" -COPYRIGHT="1996-2002 Maarteen Hekkelman - 2003-2010 Team Pe" diff --git a/haiku-apps/thememanager/thememanager-0-svn.recipe b/haiku-apps/thememanager/thememanager-0_svn similarity index 100% rename from haiku-apps/thememanager/thememanager-0-svn.recipe rename to haiku-apps/thememanager/thememanager-0_svn diff --git a/media-fonts/arabeyes_fonts/arabeyes-fonts-1.1.recipe b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1 similarity index 100% rename from media-fonts/arabeyes_fonts/arabeyes-fonts-1.1.recipe rename to media-fonts/arabeyes_fonts/arabeyes_fonts-1.1 diff --git a/media-fonts/courier_prime/courier-prime-1.0.recipe b/media-fonts/courier_prime/courier_prime-1.0 similarity index 100% rename from media-fonts/courier_prime/courier-prime-1.0.recipe rename to media-fonts/courier_prime/courier_prime-1.0 diff --git a/media-fonts/farsi_fonts/farsi-fonts-0.4.recipe b/media-fonts/farsi_fonts/farsi_fonts-0.4 similarity index 100% rename from media-fonts/farsi_fonts/farsi-fonts-0.4.recipe rename to media-fonts/farsi_fonts/farsi_fonts-0.4 diff --git a/media-fonts/kacst_fonts/kacst-fonts-5.0.recipe b/media-fonts/kacst_fonts/kacst_fonts-5.0 similarity index 100% rename from media-fonts/kacst_fonts/kacst-fonts-5.0.recipe rename to media-fonts/kacst_fonts/kacst_fonts-5.0 diff --git a/media-fonts/lateef_font/lateef-font-1.001.recipe b/media-fonts/lateef_font/lateef_font-1.001 similarity index 100% rename from media-fonts/lateef_font/lateef-font-1.001.recipe rename to media-fonts/lateef_font/lateef_font-1.001 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 similarity index 100% rename from media-fonts/liberation_fonts/liberation-fonts-1.06.0.20100721.recipe rename to media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721 diff --git a/media-fonts/nafees_nastaleeq/nafees-nastaleeq-1.02.recipe b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02 similarity index 100% rename from media-fonts/nafees_nastaleeq/nafees-nastaleeq-1.02.recipe rename to media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02 diff --git a/media-fonts/nafees_riqa/nafees-riqa-1.00.recipe b/media-fonts/nafees_riqa/nafees_riqa-1.00 similarity index 100% rename from media-fonts/nafees_riqa/nafees-riqa-1.00.recipe rename to media-fonts/nafees_riqa/nafees_riqa-1.00 diff --git a/media-fonts/scheherazade_font/scheherazade-font-1.005.recipe b/media-fonts/scheherazade_font/scheherazade_font-1.005 similarity index 100% rename from media-fonts/scheherazade_font/scheherazade-font-1.005.recipe rename to media-fonts/scheherazade_font/scheherazade_font-1.005 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 similarity index 100% rename from media-fonts/x_series_fonts/x-series-fonts-2.0.recipe rename to media-fonts/x_series_fonts/x_series_fonts-2.0 diff --git a/media-gfx/imagemagick/imagemagick-6.6.1-10.recipe b/media-gfx/imagemagick/imagemagick-6.6.1_10 similarity index 100% rename from media-gfx/imagemagick/imagemagick-6.6.1-10.recipe rename to media-gfx/imagemagick/imagemagick-6.6.1_10 diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs similarity index 100% rename from media-gfx/tuxpaint/tuxpaint-0.9.2x-cvs.recipe rename to media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs diff --git a/media-libs/allegro/allegro-4.4.x-svn.recipe b/media-libs/allegro/allegro-4.4.x_svn similarity index 100% rename from media-libs/allegro/allegro-4.4.x-svn.recipe rename to media-libs/allegro/allegro-4.4.x_svn diff --git a/media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.recipe b/media-libs/freetype/freetype_with_subpixel_rendering-2.4.9 similarity index 100% rename from media-libs/freetype/freetype-2.4.9-with-subpixel-rendering-enabled.recipe rename to media-libs/freetype/freetype_with_subpixel_rendering-2.4.9 diff --git a/media-libs/ftgl/ftgl-2.1-svn.recipe b/media-libs/ftgl/ftgl-2.1-svn similarity index 100% rename from media-libs/ftgl/ftgl-2.1-svn.recipe rename to media-libs/ftgl/ftgl-2.1-svn diff --git a/media-libs/ladspa_sdk/ladspa-sdk-1.13.recipe b/media-libs/ladspa_sdk/ladspa_sdk-1.13 similarity index 100% rename from media-libs/ladspa_sdk/ladspa-sdk-1.13.recipe rename to media-libs/ladspa_sdk/ladspa_sdk-1.13 diff --git a/media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.recipe b/media-libs/libnsbmp/libnsbmp_0.0.3-HEAD similarity index 100% rename from media-libs/libnsbmp/libnsbmp-0.0.3-HEAD.recipe rename to media-libs/libnsbmp/libnsbmp_0.0.3-HEAD diff --git a/media-libs/libsdl/libsdl-1.2-hg.recipe b/media-libs/libsdl/libsdl-1.2_hg similarity index 100% rename from media-libs/libsdl/libsdl-1.2-hg.recipe rename to media-libs/libsdl/libsdl-1.2_hg diff --git a/media-libs/libsdl/libsdl-1.3-gsoc.recipe b/media-libs/libsdl/libsdl-1.3_gsoc similarity index 100% rename from media-libs/libsdl/libsdl-1.3-gsoc.recipe rename to media-libs/libsdl/libsdl-1.3_gsoc diff --git a/media-libs/libsdl/libsdl-2.0-hg.recipe b/media-libs/libsdl/libsdl-2.0_hg similarity index 100% rename from media-libs/libsdl/libsdl-2.0-hg.recipe rename to media-libs/libsdl/libsdl-2.0_hg diff --git a/media-libs/libsdl/libsdl-2.0-hg-cmake.recipe b/media-libs/libsdl/libsdl-2.0_hg_cmake similarity index 100% rename from media-libs/libsdl/libsdl-2.0-hg-cmake.recipe rename to media-libs/libsdl/libsdl-2.0_hg_cmake diff --git a/media-libs/libsvgtiny/libsvgtiny-0-HEAD.recipe b/media-libs/libsvgtiny/libsvgtiny-0_HEAD similarity index 100% rename from media-libs/libsvgtiny/libsvgtiny-0-HEAD.recipe rename to media-libs/libsvgtiny/libsvgtiny-0_HEAD diff --git a/media-libs/libwebm/libwebm-0.9.2-git.recipe b/media-libs/libwebm/libwebm-0.9.2_git similarity index 100% rename from media-libs/libwebm/libwebm-0.9.2-git.recipe rename to media-libs/libwebm/libwebm-0.9.2_git diff --git a/media-libs/libwebp/libwebp-0.1.2-git.recipe b/media-libs/libwebp/libwebp-0.1.2_git similarity index 100% rename from media-libs/libwebp/libwebp-0.1.2-git.recipe rename to media-libs/libwebp/libwebp-0.1.2_git diff --git a/media-libs/openal/openal-1.12-git.recipe b/media-libs/openal/openal-1.12_git similarity index 100% rename from media-libs/openal/openal-1.12-git.recipe rename to media-libs/openal/openal-1.12_git diff --git a/media-libs/sdl_gfx/sdl-gfx-2.0.20.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.20 similarity index 100% rename from media-libs/sdl_gfx/sdl-gfx-2.0.20.recipe rename to media-libs/sdl_gfx/sdl_gfx-2.0.20 diff --git a/media-libs/sdl_gfx/sdl-gfx-2.0.22.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.22 similarity index 100% rename from media-libs/sdl_gfx/sdl-gfx-2.0.22.recipe rename to media-libs/sdl_gfx/sdl_gfx-2.0.22 diff --git a/media-libs/sdl_gfx/sdl-gfx-2.0.23.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.23 similarity index 100% rename from media-libs/sdl_gfx/sdl-gfx-2.0.23.recipe rename to media-libs/sdl_gfx/sdl_gfx-2.0.23 diff --git a/media-libs/sdl_image/sdl-image-1.2.10.recipe b/media-libs/sdl_image/sdl_image-1.2.10 similarity index 100% rename from media-libs/sdl_image/sdl-image-1.2.10.recipe rename to media-libs/sdl_image/sdl_image-1.2.10 diff --git a/media-libs/sdl_image/sdl-image-1.2.12.recipe b/media-libs/sdl_image/sdl_image-1.2.12 similarity index 100% rename from media-libs/sdl_image/sdl-image-1.2.12.recipe rename to media-libs/sdl_image/sdl_image-1.2.12 diff --git a/media-libs/sdl_image/sdl-image-1.2.6.recipe b/media-libs/sdl_image/sdl_image-1.2.6 similarity index 100% rename from media-libs/sdl_image/sdl-image-1.2.6.recipe rename to media-libs/sdl_image/sdl_image-1.2.6 diff --git a/media-libs/sdl_image/sdl-image-1.2.8.recipe b/media-libs/sdl_image/sdl_image-1.2.8 similarity index 100% rename from media-libs/sdl_image/sdl-image-1.2.8.recipe rename to media-libs/sdl_image/sdl_image-1.2.8 diff --git a/media-libs/sdl_image/sdl-image-1.2.9.recipe b/media-libs/sdl_image/sdl_image-1.2.9 similarity index 100% rename from media-libs/sdl_image/sdl-image-1.2.9.recipe rename to media-libs/sdl_image/sdl_image-1.2.9 diff --git a/media-libs/sdl_image/sdl-image-1.2-hg.recipe b/media-libs/sdl_image/sdl_image-1.2_hg similarity index 100% rename from media-libs/sdl_image/sdl-image-1.2-hg.recipe rename to media-libs/sdl_image/sdl_image-1.2_hg diff --git a/media-libs/sdl_mixer/sdl-mixer-1.2.10.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.10 similarity index 100% rename from media-libs/sdl_mixer/sdl-mixer-1.2.10.recipe rename to media-libs/sdl_mixer/sdl_mixer-1.2.10 diff --git a/media-libs/sdl_mixer/sdl-mixer-1.2.11.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.11 similarity index 100% rename from media-libs/sdl_mixer/sdl-mixer-1.2.11.recipe rename to media-libs/sdl_mixer/sdl_mixer-1.2.11 diff --git a/media-libs/sdl_mixer/sdl-mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12 similarity index 100% rename from media-libs/sdl_mixer/sdl-mixer-1.2.12.recipe rename to media-libs/sdl_mixer/sdl_mixer-1.2.12 diff --git a/media-libs/sdl_mixer/sdl-mixer-1.2.9.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.9 similarity index 100% rename from media-libs/sdl_mixer/sdl-mixer-1.2.9.recipe rename to media-libs/sdl_mixer/sdl_mixer-1.2.9 diff --git a/media-libs/sdl_mixer/sdl-mixer-1.2-hg.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2_hg similarity index 100% rename from media-libs/sdl_mixer/sdl-mixer-1.2-hg.recipe rename to media-libs/sdl_mixer/sdl_mixer-1.2_hg diff --git a/media-libs/sdl_net/sdl-net-1.2.7.recipe b/media-libs/sdl_net/sdl_net-1.2.7 similarity index 100% rename from media-libs/sdl_net/sdl-net-1.2.7.recipe rename to media-libs/sdl_net/sdl_net-1.2.7 diff --git a/media-libs/sdl_net/sdl-net-1.2.8.recipe b/media-libs/sdl_net/sdl_net-1.2.8 similarity index 100% rename from media-libs/sdl_net/sdl-net-1.2.8.recipe rename to media-libs/sdl_net/sdl_net-1.2.8 diff --git a/media-libs/sdl_net/sdl-net-1.2-hg.recipe b/media-libs/sdl_net/sdl_net-1.2_hg similarity index 100% rename from media-libs/sdl_net/sdl-net-1.2-hg.recipe rename to media-libs/sdl_net/sdl_net-1.2_hg diff --git a/media-libs/sdl_rtf/sdl-rtf-0.1.0.recipe b/media-libs/sdl_rtf/sdl_rtf-0.1.0 similarity index 100% rename from media-libs/sdl_rtf/sdl-rtf-0.1.0.recipe rename to media-libs/sdl_rtf/sdl_rtf-0.1.0 diff --git a/media-libs/sdl_sound/sdl-sound-1.0.3.recipe b/media-libs/sdl_sound/sdl_sound-1.0.3 similarity index 100% rename from media-libs/sdl_sound/sdl-sound-1.0.3.recipe rename to media-libs/sdl_sound/sdl_sound-1.0.3 diff --git a/media-libs/sdl_sound/sdl-sound-1.0-hg.recipe b/media-libs/sdl_sound/sdl_sound-1.0_hg similarity index 100% rename from media-libs/sdl_sound/sdl-sound-1.0-hg.recipe rename to media-libs/sdl_sound/sdl_sound-1.0_hg diff --git a/media-libs/sdl_ttf/sdl-ttf-2.0.10.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.10 similarity index 100% rename from media-libs/sdl_ttf/sdl-ttf-2.0.10.recipe rename to media-libs/sdl_ttf/sdl_ttf-2.0.10 diff --git a/media-libs/sdl_ttf/sdl-ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11 similarity index 100% rename from media-libs/sdl_ttf/sdl-ttf-2.0.11.recipe rename to media-libs/sdl_ttf/sdl_ttf-2.0.11 diff --git a/media-libs/sdl_ttf/sdl-ttf-2.0.9.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.9 similarity index 100% rename from media-libs/sdl_ttf/sdl-ttf-2.0.9.recipe rename to media-libs/sdl_ttf/sdl_ttf-2.0.9 diff --git a/media-libs/sdl_ttf/sdl-ttf-2.0-hg.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0_ similarity index 100% rename from media-libs/sdl_ttf/sdl-ttf-2.0-hg.recipe rename to media-libs/sdl_ttf/sdl_ttf-2.0_ diff --git a/media-libs/speex/speex-1.2-git.recipe b/media-libs/speex/speex-1.2_git similarity index 100% rename from media-libs/speex/speex-1.2-git.recipe rename to media-libs/speex/speex-1.2_git diff --git a/media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.recipe b/media-sound/fluidsynth/fluidsynth_1.1_midi_buffer similarity index 100% rename from media-sound/fluidsynth/fluidsynth-1.1-midi-buffer.recipe rename to media-sound/fluidsynth/fluidsynth_1.1_midi_buffer 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 similarity index 100% rename from media-sound/gogo_no_coda/gogo-no-coda-3.13.recipe rename to media-sound/gogo_no_coda/gogo_no_coda-3.13 diff --git a/media-sound/lame/lame-398-2.recipe b/media-sound/lame/lame-398_2 similarity index 100% rename from media-sound/lame/lame-398-2.recipe rename to media-sound/lame/lame-398_2 diff --git a/media-sound/naspro/naspro-0.2.9-hg.recipe b/media-sound/naspro/naspro-0.2.9_hg similarity index 100% rename from media-sound/naspro/naspro-0.2.9-hg.recipe rename to media-sound/naspro/naspro-0.2.9_hg diff --git a/media-sound/ocp/ocp-0.1.21-git.recipe b/media-sound/ocp/ocp_0.1.21_git similarity index 100% rename from media-sound/ocp/ocp-0.1.21-git.recipe rename to media-sound/ocp/ocp_0.1.21_git diff --git a/media-sound/vorbis_tools/vorbis-tools-1.2.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.2.0 similarity index 100% rename from media-sound/vorbis_tools/vorbis-tools-1.2.0.recipe rename to media-sound/vorbis_tools/vorbis_tools-1.2.0 diff --git a/media-sound/vorbis_tools/vorbis-tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0 similarity index 100% rename from media-sound/vorbis_tools/vorbis-tools-1.4.0.recipe rename to media-sound/vorbis_tools/vorbis_tools-1.4.0 diff --git a/media-video/ffmpeg/ffmpeg-0.10.2-vlc.recipe b/media-video/ffmpeg/ffmpeg-0.10.2_vlc similarity index 100% rename from media-video/ffmpeg/ffmpeg-0.10.2-vlc.recipe rename to media-video/ffmpeg/ffmpeg-0.10.2_vlc diff --git a/media-video/vlc/vlc-1.1.5-20101107.recipe b/media-video/vlc/vlc-1.1.5_20101107 similarity index 100% rename from media-video/vlc/vlc-1.1.5-20101107.recipe rename to media-video/vlc/vlc-1.1.5_20101107 diff --git a/net-irc/rhapsody_irc/rhapsody-irc-0.28b.recipe b/net-irc/rhapsody_irc/rhapsody_irc-0.28b similarity index 100% rename from net-irc/rhapsody_irc/rhapsody-irc-0.28b.recipe rename to net-irc/rhapsody_irc/rhapsody_irc-0.28b diff --git a/net-libs/hubbub/hubbub-0.1.2-HEAD.recipe b/net-libs/hubbub/hubbub-0.1.2_HEAD similarity index 100% rename from net-libs/hubbub/hubbub-0.1.2-HEAD.recipe rename to net-libs/hubbub/hubbub-0.1.2_HEAD diff --git a/net-p2p/seeks/seeks-0.x-git.recipe b/net-p2p/seeks/seeks-0.x_git similarity index 100% rename from net-p2p/seeks/seeks-0.x-git.recipe rename to net-p2p/seeks/seeks-0.x_git diff --git a/net-wireless/b43_fwcutter/b43-fwcutter-012.recipe b/net-wireless/b43_fwcutter/b43_fwcutter-012 similarity index 100% rename from net-wireless/b43_fwcutter/b43-fwcutter-012.recipe rename to net-wireless/b43_fwcutter/b43_fwcutter-012 diff --git a/sys-apps/dtc/dtc-1.3.0-git.recipe b/sys-apps/dtc/dtc-1.3.0_git similarity index 100% rename from sys-apps/dtc/dtc-1.3.0-git.recipe rename to sys-apps/dtc/dtc-1.3.0_git diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43-git.recipe b/sys-fs/e2fsprogs/e2fsprogs-1.43_git similarity index 100% rename from sys-fs/e2fsprogs/e2fsprogs-1.43-git.recipe rename to sys-fs/e2fsprogs/e2fsprogs-1.43_git diff --git a/www-client/netsurf/netsurf-2.7-svn.recipe b/www-client/netsurf/netsurf-2.7_svn similarity index 100% rename from www-client/netsurf/netsurf-2.7-svn.recipe rename to www-client/netsurf/netsurf-2.7_svn diff --git a/x11-libs/pixman/pixman-0.19-master.recipe b/x11-libs/pixman/pixman-0.19_master similarity index 100% rename from x11-libs/pixman/pixman-0.19-master.recipe rename to x11-libs/pixman/pixman-0.19_master diff --git a/x11-misc/shared_mime_info/shared-mime-info-1.0.recipe b/x11-misc/shared_mime_info/shared_mime_info-1.0 similarity index 100% rename from x11-misc/shared_mime_info/shared-mime-info-1.0.recipe rename to x11-misc/shared_mime_info/shared_mime_info-1.0 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 similarity index 100% rename from x11-misc/util_macros/util-macros-1.17.0-git.recipe rename to x11-misc/util_macros/util_macros-1.17.0_git diff --git a/x11-misc/util_macros/util-macros-1.7.0.recipe b/x11-misc/util_macros/util_macros-1.7.0 similarity index 100% rename from x11-misc/util_macros/util-macros-1.7.0.recipe rename to x11-misc/util_macros/util_macros-1.7.0 diff --git a/x11-proto/xcb_proto/xcb-proto-1.6.recipe b/x11-proto/xcb_proto/xcb_proto-1.6 similarity index 100% rename from x11-proto/xcb_proto/xcb-proto-1.6.recipe rename to x11-proto/xcb_proto/xcb_proto-1.6 diff --git a/x11-proto/xproto/xproto-7.0.23-git.recipe b/x11-proto/xproto/xproto-7.0.23_git similarity index 100% rename from x11-proto/xproto/xproto-7.0.23-git.recipe rename to x11-proto/xproto/xproto-7.0.23_git From 39a646a2897a529d317b11944534090009f59bf6 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 5 Aug 2013 00:14:47 +0200 Subject: [PATCH 345/587] Adjust recipes to separation of buildhost and target packages --- app-arch/bzip2/bzip2-1.0.6.recipe | 6 +++--- app-arch/p7zip/p7zip-9.13.recipe | 6 +++--- app-arch/p7zip/p7zip-9.20.1.recipe | 6 +++--- app-arch/tar/tar-1.26.recipe | 2 +- app-arch/xz_utils/xz_utils-5.0.1.recipe | 6 +++--- app-cdr/cdrtools/cdrtools-3.01~a07.recipe | 6 +++--- app-editors/nano/nano-2.2.6.recipe | 8 ++++---- app-text/asciidoc/asciidoc-8.6.8.recipe | 6 +++--- app-text/htmldoc/htmldoc-1.8.27.recipe | 10 +++++----- app-text/rman/rman-3.2.recipe | 6 +++--- app-text/texi2html/texi2html-1.82.recipe | 6 +++--- dev-db/sqlite/sqlite-3.7.13.recipe | 6 +++--- dev-db/sqlite/sqlite-3.7.16.1.recipe | 10 +++++++--- dev-db/sqlite/sqlite-3.7.5.recipe | 6 +++--- dev-lang/perl/perl-5.10.1.recipe | 2 +- dev-lang/python/python-2.6.8.recipe | 2 +- dev-lang/yasm/yasm-1.1.0.recipe | 6 +++--- dev-lang/yasm/yasm-1.2.0.recipe | 6 +++--- dev-libs/apr/apr-1.4.2.recipe | 6 +++--- dev-libs/apr/apr-1.4.6.recipe | 6 +++--- dev-libs/apr_util/apr_util-1.3.10.recipe | 6 +++--- dev-libs/apr_util/apr_util-1.4.1.recipe | 10 +++++----- dev-libs/expat/expat-2.0.1.recipe | 6 +++--- dev-libs/icu/icu-4.8.1.1.recipe | 7 +++---- dev-libs/libedit/libedit-2012_06_01_3.0.recipe | 8 ++++---- dev-libs/libiconv/libiconv-1.13.1.recipe | 6 +++--- dev-libs/libpcre/libpcre-8.21.recipe | 6 +++--- dev-libs/libxml2/libxml2-2.8.0.recipe | 8 ++++---- dev-libs/openssl/openssl-1.0.0d.recipe | 9 ++++----- dev-libs/openssl/openssl-1.0.0j.recipe | 8 ++++---- dev-util/cmake/cmake-2.8.5.recipe | 6 +++--- dev-util/ctags/ctags-5.8.recipe | 6 +++--- dev-util/pkgconfig/pkgconfig-0.27.1.recipe | 8 ++++---- dev-vcs/cvs/cvs-1.12.13.1.recipe | 2 +- dev-vcs/git/git-1.7.10.2.recipe | 16 ++++++++-------- dev-vcs/mercurial/mercurial-2.2.2.recipe | 5 ++--- dev-vcs/subversion/subversion-1.6.15.recipe | 6 +++--- dev-vcs/subversion/subversion-1.6.18.recipe | 14 +++++++------- .../bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe | 6 +++--- .../keymapswitcher-1.2.7.10.recipe | 8 ++++---- .../keymapswitcher/keymapswitcher-1.2.7.9.recipe | 9 ++++----- haiku-apps/mkdepend/mkdepend-1.7.recipe | 4 ++-- haiku-apps/pe/pe-2.4.3_hg602.recipe | 10 +++++----- haiku-apps/vision/vision-0.9.7.r944.recipe | 6 +++--- haiku-data/be_book/be_book-2008_10_26.recipe | 2 ++ .../ca_root_certificates-2012_12_29.recipe | 2 +- .../timgmsoundfont-2004_01_24.recipe | 2 +- .../wqy_microhei/wqy_microhei-0.2.0~beta.recipe | 6 ++---- media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe | 6 ++++-- media-gfx/graphviz/graphviz-2.26.3.recipe | 7 +++---- media-libs/freetype/freetype-2.4.9.recipe | 8 ++++---- media-libs/jpeg/jpeg-9.recipe | 7 +++---- media-libs/libogg/libogg-1.3.0.recipe | 6 +++--- media-libs/libpng/libpng-1.5.12.recipe | 8 ++++---- media-libs/libtheora/libtheora-1.1.1.recipe | 12 ++++++------ media-libs/libvorbis/libvorbis-1.3.2.recipe | 8 ++++---- media-libs/libvpx/libvpx-1.0.0.recipe | 10 +++++----- media-libs/speex/speex-1.2~rc1.recipe | 8 ++++---- media-video/ffmpeg/ffmpeg-0.10.2.recipe | 14 +++++++------- net-misc/curl/curl-7.26.0.recipe | 10 +++++----- net-misc/neon/neon-0.29.6.recipe | 12 ++++++------ net-misc/openssh/openssh-5.8p2.recipe | 7 +++---- net-misc/openssh/openssh-6.0p1.recipe | 16 ++++++++-------- .../wpa_supplicant/wpa_supplicant-0.7.3.recipe | 6 +++--- .../wpa_supplicant/wpa_supplicant-2.0.recipe | 6 +++--- sys-apps/gawk/gawk-3.1.8.recipe | 4 ++-- sys-apps/grep/grep-2.14.recipe | 10 +++++----- sys-apps/groff/groff-1.20.1.recipe | 6 +++--- sys-apps/man/man-1.6g.recipe | 6 +++--- sys-devel/autoconf/autoconf-2.68.recipe | 4 ++-- sys-devel/autoconf/autoconf-2.69.recipe | 13 +++++++------ sys-devel/automake/automake-1.11.1.recipe | 4 ++-- sys-devel/automake/automake-1.13.1.recipe | 4 ++-- .../binutils/binutils-2.17_2013_04_21.recipe | 2 +- sys-devel/bison/bison-2.4.3.recipe | 6 +++--- sys-devel/flex/flex-2.5.35.recipe | 12 ++++++------ sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe | 6 +++--- sys-devel/gettext/gettext-0.18.1.1.recipe | 10 +++++----- sys-devel/jam/jam-2.5_2012_10_12.recipe | 6 +++--- sys-devel/libtool/libtool-2.4.recipe | 4 ++-- sys-devel/m4/m4-1.4.16.recipe | 2 +- sys-devel/make/make-3.82.recipe | 2 +- sys-libs/glu/glu-9.0.0.recipe | 7 +++---- sys-libs/mesa/mesa-7.8.2.recipe | 6 +++--- sys-libs/ncurses/ncurses-5.9.recipe | 8 ++++---- sys-libs/zlib/zlib-1.2.8.recipe | 7 +++---- 86 files changed, 294 insertions(+), 296 deletions(-) diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe index bb657a062..1186bf2b3 100644 --- a/app-arch/bzip2/bzip2-1.0.6.recipe +++ b/app-arch/bzip2/bzip2-1.0.6.recipe @@ -27,15 +27,15 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:ar cmd:gcc cmd:ld cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/app-arch/p7zip/p7zip-9.13.recipe b/app-arch/p7zip/p7zip-9.13.recipe index 89d854d39..be3ab5200 100644 --- a/app-arch/p7zip/p7zip-9.13.recipe +++ b/app-arch/p7zip/p7zip-9.13.recipe @@ -18,12 +18,12 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make " SOURCE_DIR="p7zip_9.13" diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe index 8b7d6bbaf..4daffb8af 100644 --- a/app-arch/p7zip/p7zip-9.20.1.recipe +++ b/app-arch/p7zip/p7zip-9.20.1.recipe @@ -18,12 +18,12 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make " SOURCE_DIR="p7zip_9.20.1" diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index 831d7a73d..45cb4f7b2 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -27,7 +27,6 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -36,6 +35,7 @@ BUILD_PREREQUIRES=" cmd:gcc cmd:ld cmd:make + cmd:sed " defineDebugInfoPackage tar \ diff --git a/app-arch/xz_utils/xz_utils-5.0.1.recipe b/app-arch/xz_utils/xz_utils-5.0.1.recipe index 1f8a52190..2985e36de 100644 --- a/app-arch/xz_utils/xz_utils-5.0.1.recipe +++ b/app-arch/xz_utils/xz_utils-5.0.1.recipe @@ -42,14 +42,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="xz-5.0.1" diff --git a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe index ab8a61586..bfdafe2e3 100644 --- a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe +++ b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe @@ -52,14 +52,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " GLOBAL_WRITABLE_FILES=" settings/cdrecord keep-old diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe index e57222eb7..a2f233175 100644 --- a/app-editors/nano/nano-2.2.6.recipe +++ b/app-editors/nano/nano-2.2.6.recipe @@ -21,16 +21,16 @@ REQUIRES=" lib:libncurses " BUILD_REQUIRES=" + devel:libncurses + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:autoreconf cmd:gcc cmd:groff cmd:ld cmd:libtoolize cmd:make - devel:libncurses - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/app-text/asciidoc/asciidoc-8.6.8.recipe b/app-text/asciidoc/asciidoc-8.6.8.recipe index 6fa1f00c2..b95ef81bf 100644 --- a/app-text/asciidoc/asciidoc-8.6.8.recipe +++ b/app-text/asciidoc/asciidoc-8.6.8.recipe @@ -21,14 +21,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe index 3286f627c..d3066f507 100644 --- a/app-text/htmldoc/htmldoc-1.8.27.recipe +++ b/app-text/htmldoc/htmldoc-1.8.27.recipe @@ -25,17 +25,17 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - cmd:autoconf - cmd:gcc - cmd:ld - cmd:make - cmd:sed devel:libjpeg devel:libpng devel:libz " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:autoconf + cmd:gcc + cmd:ld + cmd:make + cmd:sed " SOURCE_DIR="$portVersionedName" diff --git a/app-text/rman/rman-3.2.recipe b/app-text/rman/rman-3.2.recipe index 670887803..8eedc8590 100644 --- a/app-text/rman/rman-3.2.recipe +++ b/app-text/rman/rman-3.2.recipe @@ -22,12 +22,12 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:make - cmd:ld " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:make + cmd:ld " BUILD() diff --git a/app-text/texi2html/texi2html-1.82.recipe b/app-text/texi2html/texi2html-1.82.recipe index 4ed8158c8..880766280 100644 --- a/app-text/texi2html/texi2html-1.82.recipe +++ b/app-text/texi2html/texi2html-1.82.recipe @@ -22,6 +22,9 @@ REQUIRES=" cmd:perl " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -29,9 +32,6 @@ BUILD_REQUIRES=" cmd:make cmd:perl " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-db/sqlite/sqlite-3.7.13.recipe b/dev-db/sqlite/sqlite-3.7.13.recipe index 354bcdf4d..7eb639fd8 100644 --- a/dev-db/sqlite/sqlite-3.7.13.recipe +++ b/dev-db/sqlite/sqlite-3.7.13.recipe @@ -25,6 +25,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -33,9 +36,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="sqlite-autoconf-3071300" diff --git a/dev-db/sqlite/sqlite-3.7.16.1.recipe b/dev-db/sqlite/sqlite-3.7.16.1.recipe index 15a40b833..700c17163 100644 --- a/dev-db/sqlite/sqlite-3.7.16.1.recipe +++ b/dev-db/sqlite/sqlite-3.7.16.1.recipe @@ -11,14 +11,18 @@ PROVIDES="sqlite = $portVersion compat >= 3 lib:libsqlite = $portVersion compat >= 3 lib:libsqlite3 = $portVersion compat >= 3" REQUIRES="haiku >= $haikuVersion" -BUILD_REQUIRES="cmd:aclocal +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal cmd:autoconf cmd:automake cmd:gcc cmd:ld cmd:libtoolize - cmd:make" -BUILD_PREREQUIRES="haiku_devel >= $haikuVersion" + cmd:make + " SOURCE_DIR="sqlite-autoconf-3071601" diff --git a/dev-db/sqlite/sqlite-3.7.5.recipe b/dev-db/sqlite/sqlite-3.7.5.recipe index c92372e50..498618e68 100644 --- a/dev-db/sqlite/sqlite-3.7.5.recipe +++ b/dev-db/sqlite/sqlite-3.7.5.recipe @@ -23,6 +23,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -31,9 +34,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="sqlite-autoconf-3070500" diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe index 5358aca53..b55724fca 100644 --- a/dev-lang/perl/perl-5.10.1.recipe +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -70,13 +70,13 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make + cmd:sed " GLOBAL_WRITABLE_FILES=" diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe index f4e72ac9c..0b4739121 100644 --- a/dev-lang/python/python-2.6.8.recipe +++ b/dev-lang/python/python-2.6.8.recipe @@ -38,7 +38,6 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - cmd:nano devel:libbz2 devel:libncurses devel:libssl @@ -55,6 +54,7 @@ BUILD_PREREQUIRES=" cmd:ld cmd:libtoolize cmd:make + cmd:nano " SOURCE_DIR="Python-2.6.8" diff --git a/dev-lang/yasm/yasm-1.1.0.recipe b/dev-lang/yasm/yasm-1.1.0.recipe index 6be4ce273..4ae067250 100644 --- a/dev-lang/yasm/yasm-1.1.0.recipe +++ b/dev-lang/yasm/yasm-1.1.0.recipe @@ -22,14 +22,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe index 2f1ba2c4e..3dec155ef 100644 --- a/dev-lang/yasm/yasm-1.2.0.recipe +++ b/dev-lang/yasm/yasm-1.2.0.recipe @@ -24,14 +24,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/apr/apr-1.4.2.recipe b/dev-libs/apr/apr-1.4.2.recipe index b381a1385..5d1a67757 100644 --- a/dev-libs/apr/apr-1.4.2.recipe +++ b/dev-libs/apr/apr-1.4.2.recipe @@ -16,6 +16,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:gcc @@ -23,9 +26,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe index a0e172c37..23dff7339 100644 --- a/dev-libs/apr/apr-1.4.6.recipe +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -17,6 +17,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:gcc @@ -24,9 +27,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" 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 94928fb6b..d54f98417 100644 --- a/dev-libs/apr_util/apr_util-1.3.10.recipe +++ b/dev-libs/apr_util/apr_util-1.3.10.recipe @@ -19,6 +19,9 @@ REQUIRES=" " BUILD_REQUIRES=" $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:autoheader @@ -27,9 +30,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" 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 4444950fa..94bac4fa2 100644 --- a/dev-libs/apr_util/apr_util-1.4.1.recipe +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -19,8 +19,11 @@ REQUIRES=" lib:libexpat " BUILD_REQUIRES=" - apr_devel >= 1.4.6 - expat_devel >= 2.0 + devel:libapr_1 >= 0.4.6 + devel:libexpat >= 1.5.2 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:autoheader @@ -29,9 +32,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe index 2f84eda12..471e0389b 100644 --- a/dev-libs/expat/expat-2.0.1.recipe +++ b/dev-libs/expat/expat-2.0.1.recipe @@ -20,6 +20,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:gcc @@ -27,9 +30,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/icu/icu-4.8.1.1.recipe b/dev-libs/icu/icu-4.8.1.1.recipe index debf0e73a..0838ab3fb 100644 --- a/dev-libs/icu/icu-4.8.1.1.recipe +++ b/dev-libs/icu/icu-4.8.1.1.recipe @@ -24,15 +24,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="icu" 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 e50e53562..464eb0158 100644 --- a/dev-libs/libedit/libedit-2012_06_01_3.0.recipe +++ b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe @@ -19,6 +19,10 @@ REQUIRES=" lib:libncurses " BUILD_REQUIRES=" + devel:libncurses + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoreconf cmd:gcc @@ -26,10 +30,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make cmd:sed - devel:libncurses - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="libedit-20120601-3.0" diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe index c58dc54e0..c18f6546c 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.recipe +++ b/dev-libs/libiconv/libiconv-1.13.1.recipe @@ -22,6 +22,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:autoheader @@ -30,9 +33,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe index 23c99baa0..007a2ed07 100644 --- a/dev-libs/libpcre/libpcre-8.21.recipe +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -31,6 +31,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -39,9 +42,6 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="pcre-$portVersion" diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe index fa9501ce3..e59ff9df8 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.recipe +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -20,6 +20,10 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -27,10 +31,6 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize cmd:make - devel:libz - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/openssl/openssl-1.0.0d.recipe b/dev-libs/openssl/openssl-1.0.0d.recipe index a00ea6d4d..5bc4a71bd 100644 --- a/dev-libs/openssl/openssl-1.0.0d.recipe +++ b/dev-libs/openssl/openssl-1.0.0d.recipe @@ -39,16 +39,15 @@ REQUIRES=" zlib >= 1.2.3 " BUILD_REQUIRES=" - $REQUIRES + zlib_devel >= 1.2.3 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make cmd:perl >= 5 cmd:sed - zlib_devel >= 1.2.3 - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/dev-libs/openssl/openssl-1.0.0j.recipe b/dev-libs/openssl/openssl-1.0.0j.recipe index aa565941f..829fe215e 100644 --- a/dev-libs/openssl/openssl-1.0.0j.recipe +++ b/dev-libs/openssl/openssl-1.0.0j.recipe @@ -39,15 +39,15 @@ REQUIRES=" lib:libz >= 1.2.3 " BUILD_REQUIRES=" + devel:libz >= 1.2.3 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make cmd:perl >= 5 cmd:sed - devel:libz >= 1.2.3 - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe index f3f111386..b5daf59c6 100644 --- a/dev-util/cmake/cmake-2.8.5.recipe +++ b/dev-util/cmake/cmake-2.8.5.recipe @@ -20,6 +20,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:grep cmd:ld @@ -27,9 +30,6 @@ BUILD_REQUIRES=" cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe index 2713f599f..b526f714f 100644 --- a/dev-util/ctags/ctags-5.8.recipe +++ b/dev-util/ctags/ctags-5.8.recipe @@ -16,14 +16,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe index 74ccd4529..0801a1019 100644 --- a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe +++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe @@ -19,6 +19,10 @@ REQUIRES=" lib:libiconv " BUILD_REQUIRES=" + devel:libiconv + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -27,10 +31,6 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize cmd:make - devel:libiconv - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="pkg-config-0.27.1" diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe index cc339f193..ea07e8410 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.recipe +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -34,7 +34,6 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - cmd:nano devel:libz >= 1.1.4 " BUILD_PREREQUIRES=" @@ -43,6 +42,7 @@ BUILD_PREREQUIRES=" cmd:ld cmd:libtoolize cmd:make + cmd:nano " SOURCE_DIR="$portVersionedName" diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe index 80f222c05..b8c1f2e2b 100644 --- a/dev-vcs/git/git-1.7.10.2.recipe +++ b/dev-vcs/git/git-1.7.10.2.recipe @@ -93,6 +93,14 @@ REQUIRES_svn=" " BUILD_REQUIRES=" + devel:libcurl + devel:libexpat + devel:libssl + devel:libz + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion perl python cmd:gcc @@ -102,14 +110,6 @@ BUILD_REQUIRES=" cmd:nano cmd:sed cmd:tar - devel:libcurl - devel:libexpat - devel:libssl - devel:libz - " - -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " BUILD() diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe index 931df8156..fb3d5d474 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -21,15 +21,14 @@ REQUIRES=" lib:libintl " BUILD_REQUIRES=" - python - cmd:gettext - cmd:nano " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + python cmd:aclocal cmd:autoconf cmd:gcc + cmd:gettext cmd:ld cmd:libtoolize cmd:make diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe index 1b760fcbc..7f65e4efa 100644 --- a/dev-vcs/subversion/subversion-1.6.15.recipe +++ b/dev-vcs/subversion/subversion-1.6.15.recipe @@ -53,6 +53,9 @@ REQUIRES=" " BUILD_REQUIRES=" $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:gcc @@ -60,9 +63,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe index 744cc87af..83d3437ab 100644 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -57,14 +57,7 @@ BUILD_REQUIRES=" expat_devel >= 2.0 libiconv_devel >= 1.13 neon_devel >= 0.29 - python sqlite_devel >= 3.4 - cmd:aclocal - cmd:autoconf - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make devel:libapr_1 >= 0.3 devel:libaprutil_1 >= 0.3 devel:libcrypto @@ -74,6 +67,13 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + python + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make " USER_SETTINGS_FILES=" 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 3280b1c70..dfdf309e4 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 @@ -24,15 +24,15 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:jam cmd:htmldoc cmd:ld cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe index edb544b93..9f79f7359 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe @@ -14,14 +14,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make - cmd:mkdepend " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion makefile_engine + cmd:gcc + cmd:ld + cmd:make + cmd:mkdepend " SOURCE_DIR="$portVersionedName" diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe index a4f9de944..d73ddd84a 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe @@ -14,15 +14,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES - cmd:gcc - cmd:ld - cmd:make - cmd:mkdepend " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion makefile_engine + cmd:gcc + cmd:ld + cmd:make + cmd:mkdepend " SOURCE_DIR="$portVersionedName" diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe index 582e835f2..74bf188c5 100644 --- a/haiku-apps/mkdepend/mkdepend-1.7.recipe +++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe @@ -17,11 +17,11 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:ld " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld " SOURCE_DIR="$portVersionedName" diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe index a41ca3f67..02b7c1e90 100644 --- a/haiku-apps/pe/pe-2.4.3_hg602.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe @@ -27,16 +27,16 @@ REQUIRES=" lib:libpcreposix " BUILD_REQUIRES=" - cmd:bison - cmd:flex - cmd:gcc - cmd:jam - cmd:ld devel:libpcre >= 0.0.1 devel:libpcreposix >= 0.0.1 " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:bison + cmd:flex + cmd:gcc + cmd:jam + cmd:ld " USER_SETTINGS_FILES=" diff --git a/haiku-apps/vision/vision-0.9.7.r944.recipe b/haiku-apps/vision/vision-0.9.7.r944.recipe index 5e4508b79..d8cd6b814 100644 --- a/haiku-apps/vision/vision-0.9.7.r944.recipe +++ b/haiku-apps/vision/vision-0.9.7.r944.recipe @@ -18,12 +18,12 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make " USER_SETTINGS_FILES=" diff --git a/haiku-data/be_book/be_book-2008_10_26.recipe b/haiku-data/be_book/be_book-2008_10_26.recipe index 8dbf954b8..e80c99ba6 100644 --- a/haiku-data/be_book/be_book-2008_10_26.recipe +++ b/haiku-data/be_book/be_book-2008_10_26.recipe @@ -13,6 +13,8 @@ PROVIDES=" be_book = $portVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" coreutils " 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 c61aa3988..68ce3cddf 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 @@ -20,10 +20,10 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - coreutils " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + coreutils " INSTALL() diff --git a/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe index ac8081ae9..3cc3e7d4a 100644 --- a/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe +++ b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe @@ -15,9 +15,9 @@ PROVIDES=" REQUIRES=" " BUILD_REQUIRES=" - cmd:cp " BUILD_PREREQUIRES=" + cmd:cp " BUILD() 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 05855a509..7e945a544 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 @@ -20,10 +20,8 @@ PROVIDES=" wqy_microhei = $portVersion " REQUIRES="" -BUILD_REQUIRES=" - coreutils - " -BUILD_PREREQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" SOURCE_DIR="wqy-microhei" 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 36bcedfe6..07f31932c 100644 --- a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe +++ b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe @@ -16,8 +16,10 @@ PROVIDES=" " REQUIRES="" BUILD_REQUIRES=" - coreutils" -BUILD_PREREQUIRES="" + " +BUILD_PREREQUIRES=" + coreutils + " SOURCE_DIR="wqy-zenhei" diff --git a/media-gfx/graphviz/graphviz-2.26.3.recipe b/media-gfx/graphviz/graphviz-2.26.3.recipe index 6af6fd804..eb05ab454 100644 --- a/media-gfx/graphviz/graphviz-2.26.3.recipe +++ b/media-gfx/graphviz/graphviz-2.26.3.recipe @@ -23,7 +23,9 @@ REQUIRES=" lib:libfreetype " BUILD_REQUIRES=" - $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:autoconf cmd:automake cmd:gcc @@ -31,9 +33,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/media-libs/freetype/freetype-2.4.9.recipe b/media-libs/freetype/freetype-2.4.9.recipe index 19fc8d608..0873b4164 100644 --- a/media-libs/freetype/freetype-2.4.9.recipe +++ b/media-libs/freetype/freetype-2.4.9.recipe @@ -17,6 +17,10 @@ REQUIRES=" lib:libz >= 1 " BUILD_REQUIRES=" + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -24,10 +28,6 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize cmd:make - devel:libz - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/media-libs/jpeg/jpeg-9.recipe b/media-libs/jpeg/jpeg-9.recipe index 208b89733..9138566d4 100644 --- a/media-libs/jpeg/jpeg-9.recipe +++ b/media-libs/jpeg/jpeg-9.recipe @@ -26,7 +26,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -36,9 +38,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/media-libs/libogg/libogg-1.3.0.recipe b/media-libs/libogg/libogg-1.3.0.recipe index a2e931020..ea8def101 100644 --- a/media-libs/libogg/libogg-1.3.0.recipe +++ b/media-libs/libogg/libogg-1.3.0.recipe @@ -24,6 +24,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -32,9 +35,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/media-libs/libpng/libpng-1.5.12.recipe b/media-libs/libpng/libpng-1.5.12.recipe index ec9340345..ed4d6a625 100644 --- a/media-libs/libpng/libpng-1.5.12.recipe +++ b/media-libs/libpng/libpng-1.5.12.recipe @@ -24,6 +24,10 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" + devel:libz >= 1.0.4 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -31,10 +35,6 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize cmd:make - devel:libz >= 1.0.4 - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/media-libs/libtheora/libtheora-1.1.1.recipe b/media-libs/libtheora/libtheora-1.1.1.recipe index 2d6c771de..621e03e32 100644 --- a/media-libs/libtheora/libtheora-1.1.1.recipe +++ b/media-libs/libtheora/libtheora-1.1.1.recipe @@ -25,6 +25,12 @@ REQUIRES=" lib:libogg " BUILD_REQUIRES=" + devel:libogg + " + # Note: The build system also looks for libvorbis and SDL, but that seems + # to be needed only for building the sample player, which we don't need. +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:gcc @@ -32,12 +38,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make cmd:pkg_config - devel:libogg - " - # Note: The build system also looks for libvorbis and SDL, but that seems - # to be needed only for building the sample player, which we don't need. -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/media-libs/libvorbis/libvorbis-1.3.2.recipe b/media-libs/libvorbis/libvorbis-1.3.2.recipe index cf759e7ef..b810914e1 100644 --- a/media-libs/libvorbis/libvorbis-1.3.2.recipe +++ b/media-libs/libvorbis/libvorbis-1.3.2.recipe @@ -23,6 +23,10 @@ REQUIRES=" lib:libogg " BUILD_REQUIRES=" + devel:libogg + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -31,10 +35,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make cmd:pkg_config - devel:libogg - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" diff --git a/media-libs/libvpx/libvpx-1.0.0.recipe b/media-libs/libvpx/libvpx-1.0.0.recipe index e7a33a90a..084c757ab 100644 --- a/media-libs/libvpx/libvpx-1.0.0.recipe +++ b/media-libs/libvpx/libvpx-1.0.0.recipe @@ -27,16 +27,16 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make - cmd:perl - cmd:yasm " # Note: The build system also looks for libvorbis and SDL, but that seems # to be needed only for building the sample player, which we don't need. BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:perl + cmd:yasm " SOURCE_DIR="libvpx-v1.0.0" diff --git a/media-libs/speex/speex-1.2~rc1.recipe b/media-libs/speex/speex-1.2~rc1.recipe index 18bd26502..1b185fec9 100644 --- a/media-libs/speex/speex-1.2~rc1.recipe +++ b/media-libs/speex/speex-1.2~rc1.recipe @@ -30,6 +30,10 @@ REQUIRES=" lib:libogg " BUILD_REQUIRES=" + devel:libogg + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -38,10 +42,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make cmd:pkg_config - devel:libogg - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="speex-1.2rc1" diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.recipe b/media-video/ffmpeg/ffmpeg-0.10.2.recipe index 3a2c1414d..ee4c53b68 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.2.recipe +++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe @@ -41,13 +41,6 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make - cmd:perl - cmd:pkg_config - cmd:texi2html - cmd:yasm devel:libogg devel:libspeex devel:libtheora @@ -57,6 +50,13 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:perl + cmd:pkg_config + cmd:texi2html + cmd:yasm " GLOBAL_WRITABLE_FILES=" diff --git a/net-misc/curl/curl-7.26.0.recipe b/net-misc/curl/curl-7.26.0.recipe index f4b439e7e..ab0c00531 100644 --- a/net-misc/curl/curl-7.26.0.recipe +++ b/net-misc/curl/curl-7.26.0.recipe @@ -21,16 +21,16 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - cmd:autoconf - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make devel:libssl devel:libz " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make " SOURCE_DIR="$portVersionedName" diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe index bac6ecf5b..a9cb4fd70 100644 --- a/net-misc/neon/neon-0.29.6.recipe +++ b/net-misc/neon/neon-0.29.6.recipe @@ -39,12 +39,6 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:libtoolize - cmd:gcc - cmd:ld - cmd:make devel:libncurses devel:libssl >= 1.0.0 devel:libxml2 >= 2.7.8 @@ -52,6 +46,12 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:libtoolize + cmd:gcc + cmd:ld + cmd:make " SOURCE_DIR="$portVersionedName" diff --git a/net-misc/openssh/openssh-5.8p2.recipe b/net-misc/openssh/openssh-5.8p2.recipe index b3b5d972c..c7c14d203 100644 --- a/net-misc/openssh/openssh-5.8p2.recipe +++ b/net-misc/openssh/openssh-5.8p2.recipe @@ -35,8 +35,10 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - $REQUIRES openssl + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -45,9 +47,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index 9d7a5e5aa..1212a8211 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -35,14 +35,6 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make - cmd:pkg_config devel:libcrypto devel:libedit devel:libncurses @@ -51,6 +43,14 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:pkg_config " GLOBAL_WRITABLE_FILES=" 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 f783ff9b3..e6dd12837 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe @@ -21,13 +21,13 @@ REQUIRES=" openssl >= 1.0.0 " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make openssl >= 1.0.0 " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make " SOURCE_DIR="$portVersionedName/wpa_supplicant" diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe index 8694426ba..e72116606 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe @@ -22,13 +22,13 @@ REQUIRES=" lib:libssl " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:make devel:libssl >= 1.0.0 " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make " SOURCE_DIR="$portVersionedName" diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe index ccc6d99ba..17d2ef7ae 100644 --- a/sys-apps/gawk/gawk-3.1.8.recipe +++ b/sys-apps/gawk/gawk-3.1.8.recipe @@ -26,14 +26,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:libtoolize - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:gcc cmd:ld + cmd:libtoolize cmd:make + cmd:sed " SOURCE_DIR="$portVersionedName" diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe index d6f66fa86..c8d88c150 100644 --- a/sys-apps/grep/grep-2.14.recipe +++ b/sys-apps/grep/grep-2.14.recipe @@ -25,6 +25,11 @@ REQUIRES=" lib:libintl " BUILD_REQUIRES=" + devel:libiconv + devel:libintl + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -33,11 +38,6 @@ BUILD_REQUIRES=" cmd:ld cmd:libtoolize cmd:make - devel:libiconv - devel:libintl - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " defineDebugInfoPackage grep \ diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe index 9a3d19e7b..201c3df44 100644 --- a/sys-apps/groff/groff-1.20.1.recipe +++ b/sys-apps/groff/groff-1.20.1.recipe @@ -56,6 +56,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:gcc @@ -64,9 +67,6 @@ BUILD_REQUIRES=" cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe index 242209a13..daf2ca373 100644 --- a/sys-apps/man/man-1.6g.recipe +++ b/sys-apps/man/man-1.6g.recipe @@ -28,6 +28,9 @@ REQUIRES=" cmd:zcat " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:groff cmd:gunzip cmd:bzip2 @@ -37,9 +40,6 @@ BUILD_REQUIRES=" cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " GLOBAL_WRITABLE_FILES=" settings/man.conf keep-old diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index 11cbe49f1..9065d079d 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -35,13 +35,13 @@ REQUIRES=" cmd:sh " BUILD_REQUIRES=" - cmd:automake >= 1.11 - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:automake >= 1.11 cmd:autoreconf >= 2.60 cmd:make + cmd:sed " BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index a81d82031..e8394bf9a 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -11,8 +11,8 @@ LICENSE=" GNU GPL v2 GNU GPL v3 " -SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz" -CHECKSUM_MD5="50f97f4159805e374639a73e2636f22e" +SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz" +CHECKSUM_MD5="82d05e03b93e45f5a39b828dc9c6c29b" REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" @@ -36,14 +36,15 @@ REQUIRES=" cmd:sh " BUILD_REQUIRES=" - cmd:automake >= 1.13.1 - cmd:makeinfo - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:automake >= 1.13.1 cmd:autoreconf >= 2.60 - cmd:make" + cmd:make + cmd:makeinfo + cmd:sed + " BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe index d9c1e9f9e..41723ca7c 100644 --- a/sys-devel/automake/automake-1.11.1.recipe +++ b/sys-devel/automake/automake-1.11.1.recipe @@ -30,13 +30,13 @@ REQUIRES=" cmd:sh " BUILD_REQUIRES=" - cmd:perl >= 5.8 - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:autoconf >= 2.60 cmd:make + cmd:perl >= 5.8 + cmd:sed " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index 4f5136555..ff334cbc8 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -30,14 +30,14 @@ REQUIRES=" cmd:sh " BUILD_REQUIRES=" - cmd:perl >= 5.8 - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:autoconf >= 2.60 cmd:make cmd:makeinfo + cmd:perl >= 5.8 + cmd:sed " SOURCE_DIR="$portVersionedName" 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 104d759b3..a50acb0e1 100644 --- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe +++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe @@ -1,6 +1,6 @@ SUMMARY="The GNU assembler, linker and binary utilities" HOMEPAGE="http://www.gnu.org/software/binutils" -SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#d0613f2026ca25e7f673188291b63fd5d7a51c72" +SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#ab0f66e" REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" LICENSE=" diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe index 4f81f81c6..939ccb9a8 100644 --- a/sys-devel/bison/bison-2.4.3.recipe +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -29,15 +29,15 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:m4 cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index 2d331ffae..4e919bc1c 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -22,17 +22,17 @@ REQUIRES=" cmd:m4 " BUILD_REQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:automake - cmd:libtoolize - cmd:make - cmd:makeinfo " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake cmd:gcc cmd:ld + cmd:libtoolize + cmd:make + cmd:makeinfo " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe b/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe index 3625cb85b..1401edccf 100644 --- a/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe +++ b/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe @@ -7,8 +7,8 @@ LICENSE=" " COPYRIGHT="1988-2000 Free Software Foundation, Inc." SRC_URI=" - git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#d0613f2026ca25e7f673188291b63fd5d7a51c72 - git+git://github.com/haiku/BuildtoolsPM.git#d0613f2026ca25e7f673188291b63fd5d7a51c72 + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#b1ef802 + git+git://github.com/haiku/BuildtoolsPM.git#b1ef802 " REVISION="1" ARCHITECTURES="x86_gcc2 ?x86" @@ -29,9 +29,9 @@ PROVIDES=" REQUIRES=" haiku >= $haikuVersion + binutils " BUILD_REQUIRES=" - binutils " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe index e16d0fcf5..72395afcd 100644 --- a/sys-devel/gettext/gettext-0.18.1.1.recipe +++ b/sys-devel/gettext/gettext-0.18.1.1.recipe @@ -53,6 +53,11 @@ REQUIRES=" lib:libncurses " BUILD_REQUIRES=" + devel:libiconv + devel:libncurses + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -61,11 +66,6 @@ BUILD_REQUIRES=" cmd:libtoolize cmd:make cmd:makeinfo - devel:libiconv - devel:libncurses - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion " SOURCE_DIR="$portVersionedName" 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 dbf3125cf..ef31f6267 100644 --- a/sys-devel/jam/jam-2.5_2012_10_12.recipe +++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe @@ -34,12 +34,12 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:make - cmd:ld " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:make + cmd:ld " SOURCE_DIR="$portVersionedName/jam" diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index 4942c01ff..a35085da5 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -31,11 +31,10 @@ REQUIRES=" cmd:tar " BUILD_REQUIRES=" - cmd:aclocal - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:aclocal cmd:autoconf >= 2.62 cmd:autoheader >= 2.62 cmd:gcc @@ -43,6 +42,7 @@ BUILD_PREREQUIRES=" cmd:make cmd:nm cmd:ranlib + cmd:sed " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe index f62dfc58e..2e748b82f 100644 --- a/sys-devel/m4/m4-1.4.16.recipe +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -32,13 +32,13 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make + cmd:sed " SOURCE_DIR="$portVersionedName" diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index c5c7c990b..d6bb87584 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -25,13 +25,13 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:sed " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:libtoolize + cmd:sed " SOURCE_DIR="$portVersionedName" diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe index 92bd81431..cf3384853 100644 --- a/sys-libs/glu/glu-9.0.0.recipe +++ b/sys-libs/glu/glu-9.0.0.recipe @@ -16,15 +16,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:gcc cmd:ld cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" diff --git a/sys-libs/mesa/mesa-7.8.2.recipe b/sys-libs/mesa/mesa-7.8.2.recipe index bfde9e98c..b9c9ed443 100644 --- a/sys-libs/mesa/mesa-7.8.2.recipe +++ b/sys-libs/mesa/mesa-7.8.2.recipe @@ -25,15 +25,15 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:find cmd:gcc cmd:ld cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="Mesa-$portVersion" diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index f257c3aef..7c2c18f3d 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -36,14 +36,14 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - cmd:gcc - cmd:ld - cmd:libtool - cmd:make " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc cmd:grep + cmd:ld + cmd:libtool + cmd:make cmd:sed " diff --git a/sys-libs/zlib/zlib-1.2.8.recipe b/sys-libs/zlib/zlib-1.2.8.recipe index 84acc04f8..efacef3dd 100644 --- a/sys-libs/zlib/zlib-1.2.8.recipe +++ b/sys-libs/zlib/zlib-1.2.8.recipe @@ -16,7 +16,9 @@ REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - $REQUIRES + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:cmake cmd:gcc cmd:grep @@ -24,9 +26,6 @@ BUILD_REQUIRES=" cmd:make cmd:sed " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - " SOURCE_DIR="$portVersionedName" From 7963b05e16e0cf75471b5e3831d9c02c0bbed4fc Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 6 Aug 2013 11:19:01 +0200 Subject: [PATCH 346/587] Fix compatibility version of gettext_libintl. * additionally: automatic whitespace cleanup --- sys-devel/gettext/gettext-0.18.1.1.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe index 72395afcd..d8ce493aa 100644 --- a/sys-devel/gettext/gettext-0.18.1.1.recipe +++ b/sys-devel/gettext/gettext-0.18.1.1.recipe @@ -1,6 +1,6 @@ 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." -HOMEPAGE="http://www.gnu.org/software/gettext/" +HOMEPAGE="http://www.gnu.org/software/gettext/" LICENSE="GNU GPL v3" COPYRIGHT="1998, 2010 Free Software Foundation, Inc." SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz" @@ -104,7 +104,7 @@ TEST() SUMMARY_libintl="The gettext internationalization library" PROVIDES_libintl=" - gettext_libintl = $portVersion compat >= 1 + gettext_libintl = $portVersion compat >= 0.18.1 lib:libintl = 8.1.1 compat >= 8 " REQUIRES_libintl=" From 560ef0d8c25cd8ebbe0d5969092515f35f988d77 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 6 Aug 2013 20:02:10 +0200 Subject: [PATCH 347/587] git: fix requires * perl -> cmd:perl, python -> cmd:python * cmd:man, cmd:nano, cmd:perl, cmd:python are actually build requires in this case, since the build system will look for them to decide on features. --- dev-vcs/git/git-1.7.10.2.recipe | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe index b8c1f2e2b..59acbc1d9 100644 --- a/dev-vcs/git/git-1.7.10.2.recipe +++ b/dev-vcs/git/git-1.7.10.2.recipe @@ -62,10 +62,10 @@ PROVIDES_svn=" REQUIRES=" haiku >= $haikuVersion - perl - python cmd:man cmd:nano + cmd:perl + cmd:python lib:libcurl lib:libexpat lib:libssl @@ -93,6 +93,10 @@ REQUIRES_svn=" " BUILD_REQUIRES=" + cmd:man + cmd:nano + cmd:perl + cmd:python devel:libcurl devel:libexpat devel:libssl @@ -101,13 +105,9 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion - perl - python cmd:gcc cmd:ld cmd:make - cmd:man - cmd:nano cmd:sed cmd:tar " From d92451676f74de94f9c3f99ce7901716316f872f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 6 Aug 2013 20:02:48 +0200 Subject: [PATCH 348/587] binutils: nicer requires binutils -> cmd:ld, gcc -> cmd:gcc --- sys-devel/binutils/binutils-2.17_2013_04_21.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe index a50acb0e1..6b24bb4ed 100644 --- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe +++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe @@ -37,13 +37,13 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:autoconf - binutils - gcc cmd:flex + cmd:gcc + cmd:ld cmd:make + cmd:makeinfo cmd:sed cmd:tar - texinfo " SOURCE_DIR="$portVersionedName/legacy/binutils" From ce9743f86b893d0f11cfd4b5a586c27f724a8e07 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 6 Aug 2013 20:23:35 +0200 Subject: [PATCH 349/587] apr_util: fix SOURCE_DIR --- dev-libs/apr_util/apr_util-1.4.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 94bac4fa2..79fe24616 100644 --- a/dev-libs/apr_util/apr_util-1.4.1.recipe +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -33,7 +33,7 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="$portVersionedName" +SOURCE_DIR="apr-util-$portVersion" PATCH() { From 7ff69ce0d9b790d740905e7d3ce0a42af4488c0f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 7 Aug 2013 03:14:57 +0200 Subject: [PATCH 350/587] zlib: support secondary architecture x86 build --- sys-libs/zlib/zlib-1.2.8.recipe | 36 +++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/sys-libs/zlib/zlib-1.2.8.recipe b/sys-libs/zlib/zlib-1.2.8.recipe index efacef3dd..fda155eff 100644 --- a/sys-libs/zlib/zlib-1.2.8.recipe +++ b/sys-libs/zlib/zlib-1.2.8.recipe @@ -5,46 +5,52 @@ COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" LICENSE="Zlib" SRC_URI="http://zlib.net/zlib-1.2.8.tar.gz" CHECKSUM_MD5="44d667c142d7cda120332623eab69f40" -REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - zlib = $portVersion compat >= 1 - lib:libz = $portVersion compat >= 1 + zlib$secondaryArchSuffix = $portVersion compat >= 1 + lib:libz$secondaryArchSuffix = $portVersion compat >= 1 " REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:cmake - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:grep - cmd:ld + cmd:ld$secondaryArchSuffix cmd:make cmd:sed " -SOURCE_DIR="$portVersionedName" - PATCH() { + sed -i 's,${CMAKE_INSTALL_PREFIX}/bin',$binDir, CMakeLists.txt sed -i 's,${CMAKE_INSTALL_PREFIX}/include',$includeDir, CMakeLists.txt + sed -i 's,${CMAKE_INSTALL_PREFIX}/lib',$libDir, CMakeLists.txt sed -i 's,${CMAKE_INSTALL_PREFIX}/share/man',$manDir, CMakeLists.txt sed -i 's,${CMAKE_INSTALL_PREFIX}/share/pkgconfig',$developLibDir/pkgconfig, \ - CMakeLists.txt + CMakeLists.txt } BUILD() { - cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix . + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix .. make $jobArgs } INSTALL() { + cd build make install prepareInstalledDevelLibs libz @@ -59,9 +65,9 @@ INSTALL() SUMMARY_devel="The zlib development files" PROVIDES_devel=" - zlib_devel = $portVersion compat >= 1 - devel:libz = $portVersion compat >= 1 + zlib${secondaryArchSuffix}_devel = $portVersion compat >= 1 + devel:libz${secondaryArchSuffix} = $portVersion compat >= 1 " REQUIRES_devel=" - zlib == $portVersion base + zlib${secondaryArchSuffix} == $portVersion base " From 15c590b0e32273b31e56dcaa0aa19045caceafb2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 7 Aug 2013 04:30:42 +0200 Subject: [PATCH 351/587] expat: support secondary architecture build --- dev-libs/expat/expat-2.0.1.recipe | 38 +++++++++++++++++++------------ 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe index 471e0389b..716794bc3 100644 --- a/dev-libs/expat/expat-2.0.1.recipe +++ b/dev-libs/expat/expat-2.0.1.recipe @@ -8,31 +8,35 @@ COPYRIGHT=" LICENSE="MIT" SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz" CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c" -REVISION="6" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="7" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - expat = $portVersion compat >= 2.0 - cmd:xmlwf = $portVersion compat >= 2.0 - lib:libexpat = 1.5.2 compat >= 1 + expat$secondaryArchSuffix = $portVersion compat >= 2.0 + lib:libexpat$secondaryArchSuffix = 1.5.2 compat >= 1 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:xmlwf = $portVersion compat >= 2.0 + " +fi + REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make " -SOURCE_DIR="$portVersionedName" - PATCH() { echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in @@ -53,6 +57,11 @@ INSTALL() { make install + # remove command for secondary architecture + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + fi + # prepare develop/lib prepareInstalledDevelLibs libexpat @@ -63,11 +72,10 @@ INSTALL() # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The expat development files" PROVIDES_devel=" - expat_devel = $portVersion - devel:libexpat = 1.5.2 compat >= 1 + expat${secondaryArchSuffix}_devel = $portVersion + devel:libexpat${secondaryArchSuffix} = 1.5.2 compat >= 1 " REQUIRES_devel=" - expat == $portVersion base + expat${secondaryArchSuffix} == $portVersion base " From 5e50b5c312bd86639f74e201b0ecd19c0e9024b2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 7 Aug 2013 04:37:59 +0200 Subject: [PATCH 352/587] icu: support building for secondary architecture --- dev-libs/icu/icu-4.8.1.1.recipe | 62 +++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/dev-libs/icu/icu-4.8.1.1.recipe b/dev-libs/icu/icu-4.8.1.1.recipe index 0838ab3fb..cefda5c82 100644 --- a/dev-libs/icu/icu-4.8.1.1.recipe +++ b/dev-libs/icu/icu-4.8.1.1.recipe @@ -4,31 +4,32 @@ LICENSE="ICU" COPYRIGHT="1997-2011 IBM Corporation and others." SRC_URI="http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz" CHECKSUM_MD5="ea93970a0275be6b42f56953cd332c17" -REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="4" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="icu-4.8.1.1.patch" PROVIDES=" - icu = $portVersion compat >= 4.8 - lib:libicudata = 48.1.1 compat >= 48 - lib:libicui18n = 48.1.1 compat >= 48 - lib:libicuio = 48.1.1 compat >= 48 - lib:libicule = 48.1.1 compat >= 48 - lib:libiculx = 48.1.1 compat >= 48 - lib:libicutest = 48.1.1 compat >= 48 - lib:libicutu = 48.1.1 compat >= 48 - lib:libicuuc = 48.1.1 compat >= 48 + icu$secondaryArchSuffix = $portVersion compat >= 4.8 + lib:libicudata$secondaryArchSuffix = 48.1.1 compat >= 48 + lib:libicui18n$secondaryArchSuffix = 48.1.1 compat >= 48 + lib:libicuio$secondaryArchSuffix = 48.1.1 compat >= 48 + lib:libicule$secondaryArchSuffix = 48.1.1 compat >= 48 + lib:libiculx$secondaryArchSuffix = 48.1.1 compat >= 48 + lib:libicutest$secondaryArchSuffix = 48.1.1 compat >= 48 + lib:libicutu$secondaryArchSuffix = 48.1.1 compat >= 48 + lib:libicuuc$secondaryArchSuffix = 48.1.1 compat >= 48 " REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:ld + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make cmd:sed " @@ -58,6 +59,15 @@ INSTALL() libicuuc fixPkgconfig + # Rename the data/icu directory when built for the secondary architecture, + # so that it doesn't clash with the primary package's. + if [ -n "$secondaryArchSuffix" ]; then + mv $dataDir/icu $dataDir/icu$secondaryArchSuffix + # TODO: The icu-config, the Makefile.inc, and possibly other files need + # to be adjusted as well. They are probably also not quite correct for + # the primary architecture (lib vs. develop/lib). + fi + # devel package packageEntries devel \ $developDir \ @@ -95,17 +105,17 @@ Here are a few highlights of the services provided by ICU: SUMMARY_devel="The ICU development files" PROVIDES_devel=" - icu_devel = $portVersion - cmd:icu_config = $portVersion compat >= 4.8 - devel:libicudata = 48.1.1 compat >= 48 - devel:libicui18n = 48.1.1 compat >= 48 - devel:libicuio = 48.1.1 compat >= 48 - devel:libicule = 48.1.1 compat >= 48 - devel:libiculx = 48.1.1 compat >= 48 - devel:libicutest = 48.1.1 compat >= 48 - devel:libicutu = 48.1.1 compat >= 48 - devel:libicuuc = 48.1.1 compat >= 48 + icu${secondaryArchSuffix}_devel = $portVersion + cmd:icu_config${secondaryArchSuffix} = $portVersion compat >= 4.8 + devel:libicudata${secondaryArchSuffix} = 48.1.1 compat >= 48 + devel:libicui18n${secondaryArchSuffix} = 48.1.1 compat >= 48 + devel:libicuio${secondaryArchSuffix} = 48.1.1 compat >= 48 + devel:libicule${secondaryArchSuffix} = 48.1.1 compat >= 48 + devel:libiculx${secondaryArchSuffix} = 48.1.1 compat >= 48 + devel:libicutest${secondaryArchSuffix} = 48.1.1 compat >= 48 + devel:libicutu${secondaryArchSuffix} = 48.1.1 compat >= 48 + devel:libicuuc${secondaryArchSuffix} = 48.1.1 compat >= 48 " REQUIRES_devel=" - icu == $portVersion base + icu${secondaryArchSuffix} == $portVersion base " From 0fcc10a3f092094f60fa97aec102bab48acae54c Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 7 Aug 2013 04:47:14 +0200 Subject: [PATCH 353/587] freetype: support building for secondary architecture --- media-libs/freetype/freetype-2.4.9.recipe | 32 +++++++++++------------ 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/media-libs/freetype/freetype-2.4.9.recipe b/media-libs/freetype/freetype-2.4.9.recipe index 0873b4164..f2424b3bf 100644 --- a/media-libs/freetype/freetype-2.4.9.recipe +++ b/media-libs/freetype/freetype-2.4.9.recipe @@ -5,33 +5,32 @@ LICENSE="FreeType" COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2" CHECKSUM_MD5="77a893dae81fd5b896632715ca041179" -REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - freetype = $portVersion - lib:libfreetype = 6.8.1 compat >= 6 + freetype$secondaryArchSuffix = $portVersion + lib:libfreetype$secondaryArchSuffix = 6.8.1 compat >= 6 " REQUIRES=" - haiku >= $haikuVersion - lib:libz >= 1 + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix >= 1 " BUILD_REQUIRES=" - devel:libz + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make " -SOURCE_DIR="$portVersionedName" - BUILD() { ./autogen.sh @@ -55,12 +54,11 @@ INSTALL() # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The freetype development files" PROVIDES_devel=" - freetype_devel = $portVersion - cmd:freetype_config = $portVersion - devel:libfreetype = 6.8.1 compat >= 6 + freetype${secondaryArchSuffix}_devel = $portVersion + cmd:freetype_config${secondaryArchSuffix} = $portVersion + devel:libfreetype${secondaryArchSuffix} = 6.8.1 compat >= 6 " REQUIRES_devel=" - freetype == $portVersion base + freetype${secondaryArchSuffix} == $portVersion base " From 3b477897d325bf11507c8c96d4d32c93dbb23b94 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 7 Aug 2013 05:19:28 +0200 Subject: [PATCH 354/587] libiconv: support building for secondary architecture --- dev-libs/libiconv/libiconv-1.13.1.recipe | 42 +++++++++++++++--------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe index c18f6546c..a4250e772 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.recipe +++ b/dev-libs/libiconv/libiconv-1.13.1.recipe @@ -10,32 +10,37 @@ LICENSE=" COPYRIGHT="2000-2009 Free Software Foundation, Inc." SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz" CHECKSUM_MD5="7ab33ebd26687c744a37264a330bbe9a" -REVISION="5" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="6" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - libiconv = $portVersion compat >= 1.13 - cmd:iconv = 2.5.0 compat >= 2 - lib:libiconv = 2.5.0 compat >= 2 - lib:libcharset = 1.0.0 compat >= 1" + libiconv$secondaryArchSuffix = $portVersion compat >= 1.13 + lib:libiconv$secondaryArchSuffix = 2.5.0 compat >= 2 + lib:libcharset$secondaryArchSuffix = 1.0.0 compat >= 1 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:iconv = 2.5.0 compat >= 2 + " +fi + REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:autoheader - cmd:gcc - cmd:ld + cmd:gcc${secondaryArchSuffix} + cmd:ld${secondaryArchSuffix} cmd:libtoolize cmd:make " -SOURCE_DIR="$portVersionedName" - BUILD() { rm -rf aclocal.m4 @@ -68,6 +73,11 @@ INSTALL() rm $libDir/charset.alias + # remove command for secondary architecture + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + fi + prepareInstalledDevelLibs libiconv libcharset # devel package @@ -188,10 +198,10 @@ DESCRIPTION=" SUMMARY_devel="The libiconv development files" PROVIDES_devel=" - libiconv_devel = $portVersion compat >= 1.13 - devel:libiconv = 2.5.0 compat >= 2 - devel:libcharset = 1.0.0 compat >= 1 + libiconv${secondaryArchSuffix}_devel = $portVersion compat >= 1.13 + devel:libiconv${secondaryArchSuffix} = 2.5.0 compat >= 2 + devel:libcharset${secondaryArchSuffix} = 1.0.0 compat >= 1 " REQUIRES_devel=" - libiconv == $portVersion base + libiconv${secondaryArchSuffix} == $portVersion base " From 35ce9d96c6f38ffa26dffc6ed20ab88989cfeefd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 7 Aug 2013 15:53:35 +0200 Subject: [PATCH 355/587] ncurses: support building for secondary architecture --- sys-libs/ncurses/ncurses-5.9.recipe | 109 +++++++++++++++++----------- 1 file changed, 65 insertions(+), 44 deletions(-) diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index 7c2c18f3d..888464f56 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -4,51 +4,61 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz" CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1" LICENSE="MIT" COPYRIGHT="1998-2011 Free Software Foundation, Inc." -REVISION="8" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="9" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="ncurses-5.9.patchset" PROVIDES=" - ncurses = $portVersion compat >= 5 - cmd:captoinfo = $portVersion compat >= 5 - cmd:clear = $portVersion compat >= 5 - cmd:infocmp = $portVersion compat >= 5 - cmd:infotocap = $portVersion compat >= 5 - cmd:reset = $portVersion compat >= 5 - cmd:tabs = $portVersion compat >= 5 - cmd:tic = $portVersion compat >= 5 - cmd:toe = $portVersion compat >= 5 - cmd:tput = $portVersion compat >= 5 - cmd:tset = $portVersion compat >= 5 - lib:libform = $portVersion compat >= 5 - lib:libformw = $portVersion compat >= 5 - lib:libmenu = $portVersion compat >= 5 - lib:libmenuw = $portVersion compat >= 5 - lib:libncurses = $portVersion compat >= 5 - lib:libncursesw = $portVersion compat >= 5 - lib:libncurses++ = $portVersion compat >= 5 - lib:libncurses++w = $portVersion compat >= 5 - lib:libpanel = $portVersion compat >= 5 - lib:libpanelw = $portVersion compat >= 5 + ncurses$secondaryArchSuffix = $portVersion compat >= 5 + lib:libform$secondaryArchSuffix = $portVersion compat >= 5 + lib:libformw$secondaryArchSuffix = $portVersion compat >= 5 + lib:libmenu$secondaryArchSuffix = $portVersion compat >= 5 + lib:libmenuw$secondaryArchSuffix = $portVersion compat >= 5 + lib:libncurses$secondaryArchSuffix = $portVersion compat >= 5 + lib:libncursesw$secondaryArchSuffix = $portVersion compat >= 5 + lib:libncurses++$secondaryArchSuffix = $portVersion compat >= 5 + lib:libncurses++w$secondaryArchSuffix = $portVersion compat >= 5 + lib:libpanel$secondaryArchSuffix = $portVersion compat >= 5 + lib:libpanelw$secondaryArchSuffix = $portVersion compat >= 5 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:captoinfo = $portVersion compat >= 5 + cmd:clear = $portVersion compat >= 5 + cmd:infocmp = $portVersion compat >= 5 + cmd:infotocap = $portVersion compat >= 5 + cmd:reset = $portVersion compat >= 5 + cmd:tabs = $portVersion compat >= 5 + cmd:tic = $portVersion compat >= 5 + cmd:toe = $portVersion compat >= 5 + cmd:tput = $portVersion compat >= 5 + cmd:tset = $portVersion compat >= 5 + " +fi + REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " +if [ -n "$secondaryArchSuffix" ]; then + REQUIRES="$REQUIRES + ncurses == $portVersion base + " +fi + BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix cmd:grep - cmd:ld + cmd:ld$secondaryArchSuffix cmd:libtool cmd:make cmd:sed " -SOURCE_DIR="$portVersionedName" - doBuild() { if [ $# -lt 1 ]; then @@ -78,6 +88,9 @@ BUILD() # two times, installing in temporary directories from which we copy to the # actual installation directory in INSTALL(). doBuild build-nowidec + # Note: For the secondary architecture we discard the programs later, + # but since building the terminfo DB can't be disabled, we need to build + # the anyway. doBuild build-widec --enable-widec --without-progs } @@ -94,12 +107,21 @@ INSTALL() # fix ncurses[w]5-config fixDevelopLibDirReferences $binDir/ncurses5-config $binDir/ncursesw5-config + # devel package packageEntries devel \ $binDir/ncurses5-config \ $binDir/ncursesw5-config \ $developDir \ $manDir/man3 + + # For the secondary architecture package clean up stuff we don't need, since + # we make it depend on the primary architecture package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $dataDir + rm -rf $documentationDir + 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. @@ -110,22 +132,21 @@ The distribution includes the library and support utilities, including a terminf # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The ncurses development files" PROVIDES_devel=" - ncurses_devel = $portVersion compat >= 5 - cmd:ncurses5_config = $portVersion compat >= 5 - cmd:ncursesw5_config = $portVersion compat >= 5 - devel:libform = $portVersion compat >= 5 - devel:libformw = $portVersion compat >= 5 - devel:libmenu = $portVersion compat >= 5 - devel:libmenuw = $portVersion compat >= 5 - devel:libncurses = $portVersion compat >= 5 - devel:libncursesw = $portVersion compat >= 5 - devel:libncurses++ = $portVersion compat >= 5 - devel:libncurses++w = $portVersion compat >= 5 - devel:libpanel = $portVersion compat >= 5 - devel:libpanelw = $portVersion compat >= 5 + ncurses${secondaryArchSuffix}_devel = $portVersion compat >= 5 + cmd:ncurses5_config${secondaryArchSuffix} = $portVersion compat >= 5 + cmd:ncursesw5_config${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libform${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libformw${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libmenu${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libmenuw${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libncurses${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libncursesw${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libncurses++${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libncurses++w${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libpanel${secondaryArchSuffix} = $portVersion compat >= 5 + devel:libpanelw${secondaryArchSuffix} = $portVersion compat >= 5 " REQUIRES_devel=" - ncurses == $portVersion base + ncurses${secondaryArchSuffix} == $portVersion base " From 4972fbbda2c799de07178a1aef4e7aeb196997c4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 7 Aug 2013 16:09:48 +0200 Subject: [PATCH 356/587] gettext: support building for secondary architecture --- sys-devel/gettext/gettext-0.18.1.1.recipe | 106 +++++++++++----------- 1 file changed, 55 insertions(+), 51 deletions(-) diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe index d8ce493aa..3559826aa 100644 --- a/sys-devel/gettext/gettext-0.18.1.1.recipe +++ b/sys-devel/gettext/gettext-0.18.1.1.recipe @@ -5,71 +5,75 @@ LICENSE="GNU GPL v3" COPYRIGHT="1998, 2010 Free Software Foundation, Inc." SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz" CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89" -REVISION="4" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="5" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="gettext-0.18.1.1.patch" PROVIDES=" - gettext = $portVersion compat >= 0.18.1 - cmd:autopoint = $portVersion compat >= 0 - cmd:envsubst = $portVersion compat >= 0 - cmd:gettext = $portVersion compat >= 0 - cmd:gettext.sh = $portVersion compat >= 0 - cmd:gettextize = $portVersion compat >= 0 - cmd:msgattrib = $portVersion compat >= 0 - cmd:msgcat = $portVersion compat >= 0 - cmd:msgcmp = $portVersion compat >= 0 - cmd:msgcomm = $portVersion compat >= 0 - cmd:msgconv = $portVersion compat >= 0 - cmd:msgen = $portVersion compat >= 0 - cmd:msgexec = $portVersion compat >= 0 - cmd:msgfilter = $portVersion compat >= 0 - cmd:msgfmt = $portVersion compat >= 0 - cmd:msggrep = $portVersion compat >= 0 - cmd:msginit = $portVersion compat >= 0 - cmd:msgmerge = $portVersion compat >= 0 - cmd:msgunfmt = $portVersion compat >= 0 - cmd:msguniq = $portVersion compat >= 0 - cmd:ngettext = $portVersion compat >= 0 - cmd:recode_sr_latin = $portVersion compat >= 0 - cmd:xgettext = $portVersion compat >= 0 - devel:libasprintf = 0.0.0 compat >= 0 - devel:libgettextlib = $portVersion - devel:libgettextlib_0.18.1 = $portVersion - devel:libgettextpo = 0.5.1 compat >= 0 - devel:libgettextsrc = $portVersion - devel:libgettextsrc_0.18.1 = $portVersion - devel:libintl = 8.1.1 compat >= 8 - lib:libasprintf = 0.0.0 compat >= 0 - lib:libgettextlib_0.18.1 = $portVersion - lib:libgettextpo = 0.5.1 compat >= 0 - lib:libgettextsrc_0.18.1 = $portVersion + gettext$secondaryArchSuffix = $portVersion compat >= 0.18.1 + devel:libasprintf$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libgettextlib$secondaryArchSuffix = $portVersion + devel:libgettextlib_0.18.1$secondaryArchSuffix = $portVersion + devel:libgettextpo$secondaryArchSuffix = 0.5.1 compat >= 0 + devel:libgettextsrc$secondaryArchSuffix = $portVersion + devel:libgettextsrc_0.18.1$secondaryArchSuffix = $portVersion + devel:libintl$secondaryArchSuffix = 8.1.1 compat >= 8 + lib:libasprintf$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libgettextlib_0.18.1$secondaryArchSuffix = $portVersion + lib:libgettextpo = 0.5.1$secondaryArchSuffix compat >= 0 + lib:libgettextsrc_0.18.1$secondaryArchSuffix = $portVersion " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:autopoint = $portVersion compat >= 0 + cmd:envsubst = $portVersion compat >= 0 + cmd:gettext = $portVersion compat >= 0 + cmd:gettext.sh = $portVersion compat >= 0 + cmd:gettextize = $portVersion compat >= 0 + cmd:msgattrib = $portVersion compat >= 0 + cmd:msgcat = $portVersion compat >= 0 + cmd:msgcmp = $portVersion compat >= 0 + cmd:msgcomm = $portVersion compat >= 0 + cmd:msgconv = $portVersion compat >= 0 + cmd:msgen = $portVersion compat >= 0 + cmd:msgexec = $portVersion compat >= 0 + cmd:msgfilter = $portVersion compat >= 0 + cmd:msgfmt = $portVersion compat >= 0 + cmd:msggrep = $portVersion compat >= 0 + cmd:msginit = $portVersion compat >= 0 + cmd:msgmerge = $portVersion compat >= 0 + cmd:msgunfmt = $portVersion compat >= 0 + cmd:msguniq = $portVersion compat >= 0 + cmd:ngettext = $portVersion compat >= 0 + cmd:recode_sr_latin = $portVersion compat >= 0 + cmd:xgettext = $portVersion compat >= 0 + " +fi + REQUIRES=" - haiku >= $haikuVersion - gettext_libintl == $portVersion base - lib:libiconv - lib:libncurses + haiku$secondaryArchSuffix >= $haikuVersion + gettext${secondaryArchSuffix}_libintl == $portVersion base + lib:libiconv$secondaryArchSuffix + lib:libncurses$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libiconv - devel:libncurses + devel:libiconv$secondaryArchSuffix + devel:libncurses$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make cmd:makeinfo " -SOURCE_DIR="$portVersionedName" - BUILD() { libtoolize --force --copy --install @@ -104,10 +108,10 @@ TEST() SUMMARY_libintl="The gettext internationalization library" PROVIDES_libintl=" - gettext_libintl = $portVersion compat >= 0.18.1 - lib:libintl = 8.1.1 compat >= 8 + gettext${secondaryArchSuffix}_libintl = $portVersion compat >= 0.18.1 + lib:libintl${secondaryArchSuffix} = 8.1.1 compat >= 8 " REQUIRES_libintl=" - haiku >= $haikuVersion - lib:libiconv + haiku${secondaryArchSuffix} >= $haikuVersion + lib:libiconv${secondaryArchSuffix} " From ebd822f5514a450d774a5fb61471129c6ee4eb4c Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 7 Aug 2013 20:00:48 +0200 Subject: [PATCH 357/587] Robustify build of autoconf by avoiding manpage generation. * touch manpages to avoid (re-)generation during build, which won't work due to help2man not being available --- sys-devel/autoconf/autoconf-2.69.recipe | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index e8394bf9a..0ee7aab9f 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -5,7 +5,7 @@ DESCRIPTION=" because the person building the package is allowed to specify various configuration options. " -HOMEPAGE="http://www.gnu.org/software/autoconf/" +HOMEPAGE="http://www.gnu.org/software/autoconf/" COPYRIGHT="1992-2012 Free Software Foundation, Inc." LICENSE=" GNU GPL v2 @@ -52,6 +52,11 @@ SOURCE_DIR="$portVersionedName" BUILD() { autoreconf + + # make sure that the build system doesn't try to update the manpages, + # as that requires help2man, which isn't available + touch man/*.1 + PERL="perl" M4="m4" SED="sed" \ runConfigure ./configure make $jobArgs From 6cd004f3e4c5861806f5179ce83e1369414bba89 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 7 Aug 2013 22:20:54 +0200 Subject: [PATCH 358/587] Fix build of automake on bootstrap image: * prerequire cmd:gcc and cmd:ld * use bootstrap.sh to bootstrap the build system, otherwise it fails to generate aclocal from aclocal.in (which seems to be related to timestamps, as an otherwise identical source folder [from the tree] works fine) - hohum ... --- sys-devel/automake/automake-1.13.1.recipe | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index ff334cbc8..f8f2c7d90 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -34,6 +34,8 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:autoconf >= 2.60 + cmd:gcc + cmd:ld cmd:make cmd:makeinfo cmd:perl >= 5.8 @@ -44,6 +46,7 @@ SOURCE_DIR="$portVersionedName" BUILD() { + ./bootstrap.sh PERL="/bin/env perl" runConfigure ./configure make $jobArgs } From c50e75ec27831315e69089b2161f428694f2b21d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 8 Aug 2013 04:29:05 +0200 Subject: [PATCH 359/587] cmake: fix finding libraries for secondary architecture Haiku.cmake: * Does now try to determine the secondary architecture from the C or the C++ compiler and set up the library and include search path variables accordingly. It also sets CMAKE_*LIBRARY_ARCHITECTURE. * Remove obsolete */include paths. * Set the same include search paths for C and C++. At least the paths we do consider are the same. --- dev-util/cmake/cmake-2.8.5.recipe | 4 +- ...cmake-2.8.5.patch => cmake-2.8.5.patchset} | 447 ++++++++++-------- 2 files changed, 259 insertions(+), 192 deletions(-) rename dev-util/cmake/patches/{cmake-2.8.5.patch => cmake-2.8.5.patchset} (65%) diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe index b5daf59c6..b1fd066ab 100644 --- a/dev-util/cmake/cmake-2.8.5.recipe +++ b/dev-util/cmake/cmake-2.8.5.recipe @@ -5,10 +5,10 @@ LICENSE="CMake" COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz" CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 ?x86" -PATCHES="cmake-2.8.5.patch" +PATCHES="cmake-2.8.5.patchset" PROVIDES=" cmake = $portVersion compat >= 2.8 diff --git a/dev-util/cmake/patches/cmake-2.8.5.patch b/dev-util/cmake/patches/cmake-2.8.5.patchset similarity index 65% rename from dev-util/cmake/patches/cmake-2.8.5.patch rename to dev-util/cmake/patches/cmake-2.8.5.patchset index ab49e2913..40215e05f 100644 --- a/dev-util/cmake/patches/cmake-2.8.5.patch +++ b/dev-util/cmake/patches/cmake-2.8.5.patchset @@ -1,32 +1,13 @@ -diff -ur orig/cmake-2.8.5/bootstrap cmake-2.8.5/bootstrap ---- orig/cmake-2.8.5/bootstrap 2011-07-08 14:21:43.006815744 +0200 -+++ cmake-2.8.5/bootstrap 2013-04-28 15:17:09.327680000 +0200 -@@ -142,7 +142,9 @@ - cmake_default_prefix="c:/Program Files/CMake" - fi - elif ${cmake_system_haiku}; then -- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` -+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` -+ cmake_man_dir="/documentation/man" -+ cmake_doc_dir="/documentation/packages/cmake-${cmake_version}" - else - cmake_default_prefix="/usr/local" - fi -diff -ur orig/cmake-2.8.5/Modules/CheckForPthreads.c cmake-2.8.5/Modules/CheckForPthreads.c ---- orig/cmake-2.8.5/Modules/CheckForPthreads.c 2011-07-08 14:21:44.015204352 +0200 -+++ cmake-2.8.5/Modules/CheckForPthreads.c 2013-04-28 15:17:09.328204288 +0200 -@@ -16,7 +16,7 @@ - pthread_create(&tid[0], 0, runner, (void*)1); - pthread_create(&tid[1], 0, runner, (void*)2); - --#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no usleep on BeOS 5.) -+#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) - usleep(1); // for strange behavior on single-processor sun - #endif - -diff -ur orig/cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in ---- orig/cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in 2011-07-08 14:21:44.022282240 +0200 -+++ cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in 2013-04-28 15:17:09.328990720 +0200 +From 63b3bcd0d6804a07fe94d9af0fc7a7810fab538d Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sun, 16 Jun 2013 21:42:39 +0200 +Subject: Haiku specific changes + + +diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in +index 4d25de0..f84852a 100644 +--- a/Modules/CMakeFortranCompilerId.F.in ++++ b/Modules/CMakeFortranCompilerId.F.in @@ -74,12 +74,8 @@ PRINT *, 'INFO:platform[IRIX]' #elif defined(__hpux) || defined(__hpux__) @@ -41,9 +22,10 @@ diff -ur orig/cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in cmake-2.8.5/Module #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) PRINT *, 'INFO:platform[BeOS]' #elif defined(__QNX__) || defined(__QNXNTO__) -diff -ur orig/cmake-2.8.5/Modules/CMakePlatformId.h.in cmake-2.8.5/Modules/CMakePlatformId.h.in ---- orig/cmake-2.8.5/Modules/CMakePlatformId.h.in 2011-07-08 14:21:44.023330816 +0200 -+++ cmake-2.8.5/Modules/CMakePlatformId.h.in 2013-04-28 15:17:09.329777152 +0200 +diff --git a/Modules/CMakePlatformId.h.in b/Modules/CMakePlatformId.h.in +index cb3f40a..db98bc3 100644 +--- a/Modules/CMakePlatformId.h.in ++++ b/Modules/CMakePlatformId.h.in @@ -35,11 +35,8 @@ #elif defined(__hpux) || defined(__hpux__) # define PLATFORM_ID "HP-UX" @@ -57,10 +39,24 @@ diff -ur orig/cmake-2.8.5/Modules/CMakePlatformId.h.in cmake-2.8.5/Modules/CMake #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) # define PLATFORM_ID "BeOS" -diff -ur orig/cmake-2.8.5/Modules/FindGLUT.cmake cmake-2.8.5/Modules/FindGLUT.cmake ---- orig/cmake-2.8.5/Modules/FindGLUT.cmake 2011-07-08 14:21:44.038273024 +0200 -+++ cmake-2.8.5/Modules/FindGLUT.cmake 2013-04-28 15:17:09.330301440 +0200 -@@ -46,20 +46,22 @@ +diff --git a/Modules/CheckForPthreads.c b/Modules/CheckForPthreads.c +index d831078..02526fb 100644 +--- a/Modules/CheckForPthreads.c ++++ b/Modules/CheckForPthreads.c +@@ -16,7 +16,7 @@ int main(int ac, char*av[]){ + pthread_create(&tid[0], 0, runner, (void*)1); + pthread_create(&tid[1], 0, runner, (void*)2); + +-#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no usleep on BeOS 5.) ++#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) + usleep(1); // for strange behavior on single-processor sun + #endif + +diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake +index af88997..8c0a733 100644 +--- a/Modules/FindGLUT.cmake ++++ b/Modules/FindGLUT.cmake +@@ -46,20 +46,22 @@ ELSE (WIN32) /usr/openwin/include /opt/graphics/OpenGL/include /opt/graphics/OpenGL/contrib/libglut @@ -92,7 +88,7 @@ diff -ur orig/cmake-2.8.5/Modules/FindGLUT.cmake cmake-2.8.5/Modules/FindGLUT.cm ENDIF (APPLE) ENDIF (WIN32) -@@ -69,12 +71,18 @@ +@@ -69,12 +71,18 @@ IF(GLUT_INCLUDE_DIR) IF(GLUT_glut_LIBRARY) # Is -lXi and -lXmu required on all platforms that have it? # If not, we need some way to figure out what platform we are on. @@ -117,7 +113,7 @@ diff -ur orig/cmake-2.8.5/Modules/FindGLUT.cmake cmake-2.8.5/Modules/FindGLUT.cm SET( GLUT_FOUND "YES" ) #The following deprecated settings are for backwards compatibility with CMake1.4 -@@ -84,9 +92,16 @@ +@@ -84,9 +92,16 @@ IF(GLUT_INCLUDE_DIR) ENDIF(GLUT_glut_LIBRARY) ENDIF(GLUT_INCLUDE_DIR) @@ -140,10 +136,11 @@ diff -ur orig/cmake-2.8.5/Modules/FindGLUT.cmake cmake-2.8.5/Modules/FindGLUT.cm + GLUT_Xi_LIBRARY + ) +ENDIF(BEOS OR HAIKU) -diff -ur orig/cmake-2.8.5/Modules/FindLua51.cmake cmake-2.8.5/Modules/FindLua51.cmake ---- orig/cmake-2.8.5/Modules/FindLua51.cmake 2011-07-08 14:21:44.040632320 +0200 -+++ cmake-2.8.5/Modules/FindLua51.cmake 2013-04-28 15:17:09.330825728 +0200 -@@ -57,13 +57,13 @@ +diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake +index 123fd5d..5047fbd 100644 +--- a/Modules/FindLua51.cmake ++++ b/Modules/FindLua51.cmake +@@ -57,13 +57,13 @@ FIND_LIBRARY(LUA_LIBRARY IF(LUA_LIBRARY) # include the math library for Unix @@ -159,10 +156,11 @@ diff -ur orig/cmake-2.8.5/Modules/FindLua51.cmake cmake-2.8.5/Modules/FindLua51. ENDIF(LUA_LIBRARY) INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -diff -ur orig/cmake-2.8.5/Modules/FindOpenGL.cmake cmake-2.8.5/Modules/FindOpenGL.cmake ---- orig/cmake-2.8.5/Modules/FindOpenGL.cmake 2011-07-08 14:21:44.041418752 +0200 -+++ cmake-2.8.5/Modules/FindOpenGL.cmake 2013-04-28 15:17:09.331612160 +0200 -@@ -80,6 +80,7 @@ +diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake +index 98d8808..1ac4de6 100644 +--- a/Modules/FindOpenGL.cmake ++++ b/Modules/FindOpenGL.cmake +@@ -80,6 +80,7 @@ ELSE (WIN32) /usr/share/doc/NVIDIA_GLX-1.0/include /usr/openwin/share/include /opt/graphics/OpenGL/include /usr/X11R6/include @@ -170,15 +168,21 @@ diff -ur orig/cmake-2.8.5/Modules/FindOpenGL.cmake cmake-2.8.5/Modules/FindOpenG ) FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h -diff -ur orig/cmake-2.8.5/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platform/Haiku.cmake ---- orig/cmake-2.8.5/Modules/Platform/Haiku.cmake 2011-07-08 14:21:44.013107200 +0200 -+++ cmake-2.8.5/Modules/Platform/Haiku.cmake 2013-05-20 17:09:28.999292928 +0200 -@@ -1,20 +1,88 @@ +diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake +index 8277a24..7eb0bd5 100644 +--- a/Modules/Platform/Haiku.cmake ++++ b/Modules/Platform/Haiku.cmake +@@ -1,20 +1,121 @@ -SET(BEOS 1) -+SET(HAIKU 1) -+SET(UNIX 1) ++# process only once ++IF(HAIKU) ++ RETURN() ++ENDIF(HAIKU) -SET(CMAKE_DL_LIBS root be) ++SET(HAIKU 1) ++SET(UNIX 1) ++ +SET(CMAKE_DL_LIBS "") SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") -SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") @@ -188,15 +192,42 @@ diff -ur orig/cmake-2.8.5/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf +SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") +SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") - --INCLUDE(Platform/UnixPaths) --LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) --LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) --LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) --LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) --LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) --LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) --LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) ++ ++# Determine, if the C or C++ compiler is configured for a secondary ++# architecture. If so, that will change the search paths we set below. We check ++# whether the compiler's library search paths contain a ++# "/boot/system/develop/lib//", which we assume to be the secondary ++# architecture specific subdirectory and extract the name of the architecture ++# accordingly. ++SET(HAIKU_COMPILER ${CMAKE_C_COMPILER}) ++IF ("${HAIKU_COMPILER}" STREQUAL "") ++ SET(HAIKU_COMPILER ${CMAKE_CXX_COMPILER}) ++ENDIF ("${HAIKU_COMPILER}" STREQUAL "") ++EXECUTE_PROCESS( ++ COMMAND ${HAIKU_COMPILER} -print-search-dirs ++ COMMAND sed -ne "/^libraries:/!d; s,libraries: =*\\(.*\\):,\\1,; s,:,\\n,gp" ++ COMMAND sed -ne "/\\/boot\\/system\\/develop\\/lib\\/[^\\/]*\\/$/!d; s,.*/\\([^/]*\\)/$,\\1,; p" ++ OUTPUT_VARIABLE CMAKE_HAIKU_SECONDARY_ARCH) ++STRING(STRIP "${CMAKE_HAIKU_SECONDARY_ARCH}" ++ CMAKE_HAIKU_SECONDARY_ARCH) ++ ++IF ("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "") ++ SET(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "") ++ UNSET(CMAKE_HAIKU_SECONDARY_ARCH) ++ELSE ("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "") ++ SET(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "/${CMAKE_HAIKU_SECONDARY_ARCH}") ++ ++ # Override CMAKE_*LIBRARY_ARCHITECTURE. This will cause FIND_LIBRARY to search ++ # the libraries in the correct subdirectory first. It still isn't completely ++ # correct, since the parent directories shouldn't be searched at all. The ++ # primary architecture library might still be found, if there isn't one ++ # installed for the secondary architecture or it is installed in a less ++ # specific location. ++ SET(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) ++ SET(CMAKE_C_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) ++ SET(CMAKE_CXX_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) ++ENDIF ("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "") ++ +LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH + /boot/common/non-packaged + /boot/common @@ -204,27 +235,8 @@ diff -ur orig/cmake-2.8.5/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf + ) + +LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES -+ /boot/common/non-packaged/develop/headers -+ /boot/common/non-packaged/include -+ # TODO: To be removed -+ /boot/common/develop/headers -+ /boot/common/include -+ # TODO: To be removed -+ /boot/common/develop/headers -+ ) -+ -+LIST(APPEND CMAKE_HAIKU_C_INCLUDE_DIRECTORIES -+ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES} -+ /boot/system/develop/headers/3rdparty -+ /boot/system/develop/headers/bsd -+ /boot/system/develop/headers/glibc -+ /boot/system/develop/headers/gnu -+ /boot/system/develop/headers/posix -+ /boot/system/develop/headers -+ ) -+ -+LIST(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES -+ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES} ++ /boot/common/non-packaged/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/common/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} + /boot/system/develop/headers/os + /boot/system/develop/headers/os/app + /boot/system/develop/headers/os/device @@ -254,28 +266,99 @@ diff -ur orig/cmake-2.8.5/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf + /boot/system/develop/headers/glibc + /boot/system/develop/headers/gnu + /boot/system/develop/headers/posix -+ /boot/system/develop/headers ++ /boot/system/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} + ) ++IF (CMAKE_HAIKU_SECONDARY_ARCH) ++ LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES ++ /boot/system/develop/headers ++ ) ++ENDIF (CMAKE_HAIKU_SECONDARY_ARCH) ++ ++LIST(APPEND CMAKE_HAIKU_C_INCLUDE_DIRECTORIES ++ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES} ++ ) ++ ++LIST(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES ++ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES}) + +LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES}) + +LIST(APPEND CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES -+ /boot/common/non-packaged/develop/lib -+ /boot/common/develop/lib -+ /boot/system/develop/lib ++ /boot/common/non-packaged/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/common/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/system/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} + ) + +LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES + ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES} + ) -+ + +-INCLUDE(Platform/UnixPaths) +-LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) +-LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) +-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) +-LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) +-LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) +-LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) +-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) +LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES}) IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH -diff -ur orig/cmake-2.8.5/Source/cmCTest.cxx cmake-2.8.5/Source/cmCTest.cxx ---- orig/cmake-2.8.5/Source/cmCTest.cxx 2011-07-08 14:21:45.012320768 +0200 -+++ cmake-2.8.5/Source/cmCTest.cxx 2013-04-28 15:17:09.334757888 +0200 +diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx +index 7e5b26d..733c521 100644 +--- a/Source/CPack/cmCPackGenerator.cxx ++++ b/Source/CPack/cmCPackGenerator.cxx +@@ -27,7 +27,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + //---------------------------------------------------------------------- +@@ -1206,10 +1207,10 @@ const char* cmCPackGenerator::GetInstallPath() + this->InstallPath += "-"; + this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- this->InstallPath = dir.Path(); ++ this->InstallPath = dir; + } + else + { +diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx +index a04b403..878e8c0 100644 +--- a/Source/CPack/cmCPackGeneratorFactory.cxx ++++ b/Source/CPack/cmCPackGeneratorFactory.cxx +@@ -32,7 +32,7 @@ + #endif + + #if !defined(_WIN32) && !defined(__APPLE__) \ +- && !defined(__QNXNTO__) && !defined(__BEOS__) ++ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) + # include "cmCPackDebGenerator.h" + # include "cmCPackRPMGenerator.h" + #endif +@@ -73,7 +73,7 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory() + cmCPackOSXX11Generator::CreateGenerator); + #endif + #if !defined(_WIN32) && !defined(__APPLE__) \ +- && !defined(__QNXNTO__) && !defined(__BEOS__) ++ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) + this->RegisterGenerator("DEB", "Debian packages", + cmCPackDebGenerator::CreateGenerator); + this->RegisterGenerator("RPM", "RPM packages", +diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx +index 75a564e..83e3c6e 100644 +--- a/Source/cmCTest.cxx ++++ b/Source/cmCTest.cxx @@ -53,14 +53,10 @@ #include #include @@ -292,9 +375,10 @@ diff -ur orig/cmake-2.8.5/Source/cmCTest.cxx cmake-2.8.5/Source/cmCTest.cxx #define DEBUGOUT std::cout << __LINE__ << " "; std::cout #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr -diff -ur orig/cmake-2.8.5/Source/cmExportCommand.cxx cmake-2.8.5/Source/cmExportCommand.cxx ---- orig/cmake-2.8.5/Source/cmExportCommand.cxx 2011-07-08 14:21:45.021757952 +0200 -+++ cmake-2.8.5/Source/cmExportCommand.cxx 2013-04-28 15:17:09.335544320 +0200 +diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx +index cb614d4..1954662 100644 +--- a/Source/cmExportCommand.cxx ++++ b/Source/cmExportCommand.cxx @@ -20,7 +20,8 @@ #include "cmExportBuildFileGenerator.h" @@ -305,7 +389,7 @@ diff -ur orig/cmake-2.8.5/Source/cmExportCommand.cxx cmake-2.8.5/Source/cmExport #endif cmExportCommand::cmExportCommand() -@@ -297,14 +298,15 @@ +@@ -297,14 +298,15 @@ void cmExportCommand::StorePackageRegistryDir(std::string const& package, const char* hash) { #if defined(__HAIKU__) @@ -326,9 +410,10 @@ diff -ur orig/cmake-2.8.5/Source/cmExportCommand.cxx cmake-2.8.5/Source/cmExport #else const char* home = cmSystemTools::GetEnv("HOME"); if(!home) -diff -ur orig/cmake-2.8.5/Source/cmFindPackageCommand.cxx cmake-2.8.5/Source/cmFindPackageCommand.cxx ---- orig/cmake-2.8.5/Source/cmFindPackageCommand.cxx 2011-07-08 14:21:46.025690112 +0200 -+++ cmake-2.8.5/Source/cmFindPackageCommand.cxx 2013-04-28 15:17:09.336855040 +0200 +diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx +index 5f106bc..a2f9823 100644 +--- a/Source/cmFindPackageCommand.cxx ++++ b/Source/cmFindPackageCommand.cxx @@ -19,7 +19,9 @@ #endif @@ -340,7 +425,7 @@ diff -ur orig/cmake-2.8.5/Source/cmFindPackageCommand.cxx cmake-2.8.5/Source/cmF #endif void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, -@@ -1292,12 +1294,13 @@ +@@ -1292,12 +1294,13 @@ void cmFindPackageCommand::AddPrefixesUserRegistry() #if defined(_WIN32) && !defined(__CYGWIN__) this->LoadPackageRegistryWinUser(); #elif defined(__HAIKU__) @@ -359,9 +444,10 @@ diff -ur orig/cmake-2.8.5/Source/cmFindPackageCommand.cxx cmake-2.8.5/Source/cmF } #else if(const char* home = cmSystemTools::GetEnv("HOME")) -diff -ur orig/cmake-2.8.5/Source/cmLocalGenerator.cxx cmake-2.8.5/Source/cmLocalGenerator.cxx ---- orig/cmake-2.8.5/Source/cmLocalGenerator.cxx 2011-07-08 14:21:46.039845888 +0200 -+++ cmake-2.8.5/Source/cmLocalGenerator.cxx 2013-04-28 15:17:09.338427904 +0200 +diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx +index 7da35eb..5867030 100644 +--- a/Source/cmLocalGenerator.cxx ++++ b/Source/cmLocalGenerator.cxx @@ -37,7 +37,8 @@ #include @@ -372,7 +458,7 @@ diff -ur orig/cmake-2.8.5/Source/cmLocalGenerator.cxx cmake-2.8.5/Source/cmLocal #endif cmLocalGenerator::cmLocalGenerator() -@@ -354,12 +355,12 @@ +@@ -354,12 +355,12 @@ void cmLocalGenerator::GenerateInstallRules() prefix = prefix_win32.c_str(); } #elif defined(__HAIKU__) @@ -388,58 +474,11 @@ diff -ur orig/cmake-2.8.5/Source/cmLocalGenerator.cxx cmake-2.8.5/Source/cmLocal } else { -diff -ur orig/cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx ---- orig/cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx 2011-07-08 14:21:47.059244544 +0200 -+++ cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx 2013-04-28 15:17:09.339476480 +0200 -@@ -27,7 +27,8 @@ - #include - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - //---------------------------------------------------------------------- -@@ -1206,10 +1207,10 @@ - this->InstallPath += "-"; - this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); - #elif defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) - { -- this->InstallPath = dir.Path(); -+ this->InstallPath = dir; - } - else - { -diff -ur orig/cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx ---- orig/cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx 2011-07-08 14:21:47.059506688 +0200 -+++ cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx 2013-04-28 15:17:09.340262912 +0200 -@@ -32,7 +32,7 @@ - #endif - - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) - # include "cmCPackDebGenerator.h" - # include "cmCPackRPMGenerator.h" - #endif -@@ -73,7 +73,7 @@ - cmCPackOSXX11Generator::CreateGenerator); - #endif - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) - this->RegisterGenerator("DEB", "Debian packages", - cmCPackDebGenerator::CreateGenerator); - this->RegisterGenerator("RPM", "RPM packages", -diff -ur orig/cmake-2.8.5/Source/kwsys/ProcessUNIX.c cmake-2.8.5/Source/kwsys/ProcessUNIX.c ---- orig/cmake-2.8.5/Source/kwsys/ProcessUNIX.c 2011-07-08 14:21:48.017301504 +0200 -+++ cmake-2.8.5/Source/kwsys/ProcessUNIX.c 2013-04-28 15:17:09.341835776 +0200 -@@ -63,10 +63,6 @@ +diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c +index 9c66a44..6fe4232 100644 +--- a/Source/kwsys/ProcessUNIX.c ++++ b/Source/kwsys/ProcessUNIX.c +@@ -63,10 +63,6 @@ do. #include /* DIR, dirent */ #include /* isspace */ @@ -450,10 +489,11 @@ diff -ur orig/cmake-2.8.5/Source/kwsys/ProcessUNIX.c cmake-2.8.5/Source/kwsys/Pr #if defined(__VMS) # define KWSYSPE_VMS_NONBLOCK , O_NONBLOCK #else -diff -ur orig/cmake-2.8.5/Source/kwsys/SystemTools.cxx cmake-2.8.5/Source/kwsys/SystemTools.cxx ---- orig/cmake-2.8.5/Source/kwsys/SystemTools.cxx 2011-07-08 14:21:48.019398656 +0200 -+++ cmake-2.8.5/Source/kwsys/SystemTools.cxx 2013-04-28 15:17:09.343670784 +0200 -@@ -145,12 +145,7 @@ +diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx +index eefa7f5..8798615 100644 +--- a/Source/kwsys/SystemTools.cxx ++++ b/Source/kwsys/SystemTools.cxx +@@ -145,12 +145,7 @@ public: #define _chdir chdir #endif @@ -467,9 +507,10 @@ diff -ur orig/cmake-2.8.5/Source/kwsys/SystemTools.cxx cmake-2.8.5/Source/kwsys/ #include #include -diff -ur orig/cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx ---- orig/cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx 2011-07-08 14:21:49.020447232 +0200 -+++ cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx 2013-04-28 15:17:09.344719360 +0200 +diff --git a/Source/kwsys/testDynamicLoader.cxx b/Source/kwsys/testDynamicLoader.cxx +index a7adbca..16b89ad 100644 +--- a/Source/kwsys/testDynamicLoader.cxx ++++ b/Source/kwsys/testDynamicLoader.cxx @@ -15,14 +15,10 @@ #include KWSYS_HEADER(ios/iostream) #include KWSYS_HEADER(stl/string) @@ -486,9 +527,10 @@ diff -ur orig/cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx cmake-2.8.5/Source/ // Work-around CMake dependency scanning limitation. This must // duplicate the above list of headers. #if 0 -diff -ur orig/cmake-2.8.5/Source/kwsys/testProcess.c cmake-2.8.5/Source/kwsys/testProcess.c ---- orig/cmake-2.8.5/Source/kwsys/testProcess.c 2011-07-08 14:21:49.020971520 +0200 -+++ cmake-2.8.5/Source/kwsys/testProcess.c 2013-04-28 15:17:09.345767936 +0200 +diff --git a/Source/kwsys/testProcess.c b/Source/kwsys/testProcess.c +index 877002a..17a068c 100644 +--- a/Source/kwsys/testProcess.c ++++ b/Source/kwsys/testProcess.c @@ -32,7 +32,7 @@ # pragma warn -8060 /* possibly incorrect assignment */ #endif @@ -498,10 +540,11 @@ diff -ur orig/cmake-2.8.5/Source/kwsys/testProcess.c cmake-2.8.5/Source/kwsys/te /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ # include static inline void testProcess_usleep(unsigned int msec) -diff -ur orig/cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt ---- orig/cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt 2011-07-08 14:21:50.045350912 +0200 -+++ cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt 2013-04-28 15:17:09.346292224 +0200 -@@ -52,9 +52,9 @@ +diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt +index 281e48a..7d8adb2 100644 +--- a/Tests/Complex/Library/CMakeLists.txt ++++ b/Tests/Complex/Library/CMakeLists.txt +@@ -52,9 +52,9 @@ DEFINE_PROPERTY( FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" ) SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) @@ -513,10 +556,11 @@ diff -ur orig/cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt cmake-2.8.5/Tests GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) IF(${FOO_BAR_VAR} MATCHES "BAR") ELSE(${FOO_BAR_VAR} MATCHES "BAR") -diff -ur orig/cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt ---- orig/cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt 2011-07-08 14:21:50.049807360 +0200 -+++ cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt 2013-04-28 15:17:09.347078656 +0200 -@@ -52,9 +52,9 @@ +diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt +index 281e48a..7d8adb2 100644 +--- a/Tests/ComplexOneConfig/Library/CMakeLists.txt ++++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt +@@ -52,9 +52,9 @@ DEFINE_PROPERTY( FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" ) SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) @@ -528,10 +572,11 @@ diff -ur orig/cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2. GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) IF(${FOO_BAR_VAR} MATCHES "BAR") ELSE(${FOO_BAR_VAR} MATCHES "BAR") -diff -ur orig/cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt ---- orig/cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2011-07-08 14:21:50.054001664 +0200 -+++ cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2013-04-28 15:17:09.347865088 +0200 -@@ -52,9 +52,9 @@ +diff --git a/Tests/ComplexRelativePaths/Library/CMakeLists.txt b/Tests/ComplexRelativePaths/Library/CMakeLists.txt +index 281e48a..7d8adb2 100644 +--- a/Tests/ComplexRelativePaths/Library/CMakeLists.txt ++++ b/Tests/ComplexRelativePaths/Library/CMakeLists.txt +@@ -52,9 +52,9 @@ DEFINE_PROPERTY( FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" ) SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) @@ -543,10 +588,11 @@ diff -ur orig/cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmak GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) IF(${FOO_BAR_VAR} MATCHES "BAR") ELSE(${FOO_BAR_VAR} MATCHES "BAR") -diff -ur orig/cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c ---- orig/cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c 2011-07-08 14:21:54.027262976 +0200 -+++ cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c 2013-04-28 15:17:09.348913664 +0200 -@@ -38,7 +38,7 @@ +diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c +index d74a4f0..c5ba7c2 100644 +--- a/Utilities/cmcurl/CMake/CurlTests.c ++++ b/Utilities/cmcurl/CMake/CurlTests.c +@@ -38,7 +38,7 @@ main () # define PLATFORM_AIX_V3 #endif @@ -555,9 +601,10 @@ diff -ur orig/cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.5/Utiliti #error "O_NONBLOCK does not work on this platform" #endif int socket; -diff -ur orig/cmake-2.8.5/Utilities/cmcurl/select.c cmake-2.8.5/Utilities/cmcurl/select.c ---- orig/cmake-2.8.5/Utilities/cmcurl/select.c 2011-07-08 14:21:55.037486592 +0200 -+++ cmake-2.8.5/Utilities/cmcurl/select.c 2013-04-28 15:17:09.349437952 +0200 +diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/select.c +index 51adbcf..82f9dc2 100644 +--- a/Utilities/cmcurl/select.c ++++ b/Utilities/cmcurl/select.c @@ -39,7 +39,7 @@ #error "We can't compile without select() support!" #endif @@ -567,9 +614,10 @@ diff -ur orig/cmake-2.8.5/Utilities/cmcurl/select.c cmake-2.8.5/Utilities/cmcurl /* BeOS has FD_SET defined in socket.h */ #include #endif -diff -ur orig/cmake-2.8.5/Utilities/cmzlib/zconf.h cmake-2.8.5/Utilities/cmzlib/zconf.h ---- orig/cmake-2.8.5/Utilities/cmzlib/zconf.h 2011-07-08 14:21:58.028311552 +0200 -+++ cmake-2.8.5/Utilities/cmzlib/zconf.h 2013-04-28 15:17:09.350224384 +0200 +diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h +index 6eb52d1..7a3b6fd 100644 +--- a/Utilities/cmzlib/zconf.h ++++ b/Utilities/cmzlib/zconf.h @@ -237,7 +237,7 @@ # endif #endif @@ -579,10 +627,11 @@ diff -ur orig/cmake-2.8.5/Utilities/cmzlib/zconf.h cmake-2.8.5/Utilities/cmzlib/ # ifdef ZLIB_DLL # ifdef ZLIB_INTERNAL # define ZEXPORT __declspec(dllexport) -diff -ur orig/cmake-2.8.5/Utilities/cmzlib/zutil.h cmake-2.8.5/Utilities/cmzlib/zutil.h ---- orig/cmake-2.8.5/Utilities/cmzlib/zutil.h 2011-07-08 14:21:58.029097984 +0200 -+++ cmake-2.8.5/Utilities/cmzlib/zutil.h 2013-04-28 15:17:09.350748672 +0200 -@@ -147,12 +147,6 @@ +diff --git a/Utilities/cmzlib/zutil.h b/Utilities/cmzlib/zutil.h +index 74ef1f8..3053cd8 100644 +--- a/Utilities/cmzlib/zutil.h ++++ b/Utilities/cmzlib/zutil.h +@@ -147,12 +147,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define OS_CODE 0x0f #endif @@ -595,3 +644,21 @@ diff -ur orig/cmake-2.8.5/Utilities/cmzlib/zutil.h cmake-2.8.5/Utilities/cmzlib/ #if defined(_BEOS_) || defined(RISCOS) # define fdopen(fd,mode) NULL /* No fdopen() */ #endif +diff --git a/bootstrap b/bootstrap +index c999888..c573a90 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -142,7 +142,9 @@ if ${cmake_system_mingw}; then + cmake_default_prefix="c:/Program Files/CMake" + fi + elif ${cmake_system_haiku}; then +- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` ++ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` ++ cmake_man_dir="/documentation/man" ++ cmake_doc_dir="/documentation/packages/cmake-${cmake_version}" + else + cmake_default_prefix="/usr/local" + fi +-- +1.7.10.2 + From 1899208464e5b7989e0d1b7a0702ed40464532fa Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 8 Aug 2013 04:46:25 +0200 Subject: [PATCH 360/587] libsolv: support building for secondary architecture --- .../libsolv-0.3.0_haiku_2013_06_16.recipe | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe index 86ca41a69..78dc70612 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe @@ -4,40 +4,46 @@ LICENSE="BSD (3-clause)" COPYRIGHT="2007-2013, Novell Inc." HOMEPAGE="http://github.com/openSUSE/libsolv" SRC_URI="git+git://github.com/weinhold/libsolv.git#ef4a8778ef567224feb35019b711507ae1d6e7c3" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - libsolv = $portVersion - lib:libsolv = $portVersion - lib:libsolvext = $portVersion + libsolv$secondaryArchSuffix = $portVersion + lib:libsolv$secondaryArchSuffix = $portVersion + lib:libsolvext$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku >= $haikuVersion - lib:libexpat - lib:libz + haiku$secondaryArchSuffix >= $haikuVersion + lib:libexpat$secondaryArchSuffix + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libexpat - devel:libz + devel:libexpat$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:cmake - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make cmd:sed " -SOURCE_DIR="$portVersionedName" +PATCH() +{ + sed -i 's,${CMAKE_INSTALL_PREFIX}/bin',$binDir, CMakeLists.txt + sed -i 's,${CMAKE_INSTALL_PREFIX}/include',$includeDir, \ + src/CMakeLists.txt ext/CMakeLists.txt +} BUILD() { rm -rf build mkdir build cd build - cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix .. + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix -DLIB=$relativeLibDir .. make $jobArgs } @@ -49,10 +55,6 @@ INSTALL() # set up the develop directory correctly prepareInstalledDevelLibs libsolv libsolvext - mkdir -p $includeDir - mv $prefix/include/* $includeDir - rmdir $prefix/include - # move cmake files mkdir -p $dataDir mv $prefix/share/cmake $dataDir @@ -69,12 +71,11 @@ INSTALL() # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The libsolv development files" PROVIDES_devel=" - libsolv_devel = $portVersion - devel:libsolv = $portVersion - devel:libsolvext = $portVersion + libsolv${secondaryArchSuffix}_devel = $portVersion + devel:libsolv${secondaryArchSuffix} = $portVersion + devel:libsolvext${secondaryArchSuffix} = $portVersion " REQUIRES_devel=" - libsolv == $portVersion base + libsolv${secondaryArchSuffix} == $portVersion base " From 85cdd2399046b18c3b390d7b1e7b437dde54ece9 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 00:50:41 +0200 Subject: [PATCH 361/587] openssl: support building for secondary architecture --- dev-libs/openssl/openssl-1.0.0j.recipe | 62 +++++++++++++++++--------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/dev-libs/openssl/openssl-1.0.0j.recipe b/dev-libs/openssl/openssl-1.0.0j.recipe index 829fe215e..80b69a15d 100644 --- a/dev-libs/openssl/openssl-1.0.0j.recipe +++ b/dev-libs/openssl/openssl-1.0.0j.recipe @@ -22,43 +22,54 @@ COPYRIGHT=" 1995-1998 Eric Young 1998-2012 The OpenSSL Project. " -REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="openssl-1.0.0j.patch" PROVIDES=" - openssl = $portVersion compat >= 1.0.0 - cmd:c_rehash = $portVersion compat >= 1 - cmd:openssl = $portVersion compat >= 1 - lib:libcrypto = $portVersion compat >= 1.0.0 - lib:libssl = $portVersion compat >= 1.0.0 + openssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 + lib:libcrypto$secondaryArchSuffix = $portVersion compat >= 1.0.0 + lib:libssl$secondaryArchSuffix = $portVersion compat >= 1.0.0 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:c_rehash = $portVersion compat >= 1 + cmd:openssl = $portVersion compat >= 1 + " +fi + REQUIRES=" - haiku >= $haikuVersion - lib:libz >= 1.2.3 + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix >= 1.2.3 " +if [ -n "$secondaryArchSuffix" ]; then + REQUIRES="$REQUIRES + openssl == $portVersion base + " +fi + BUILD_REQUIRES=" - devel:libz >= 1.2.3 + devel:libz$secondaryArchSuffix >= 1.2.3 " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:ld + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc${secondaryArchSuffix} + cmd:ld${secondaryArchSuffix} cmd:make cmd:perl >= 5 cmd:sed " -SOURCE_DIR="$portVersionedName" - - BUILD() { # Fix hardcoded directory for manpages sed -i "s@MANDIR=.*\$@MANDIR=$manDir@g" Make* - ./config --prefix=$prefix zlib shared --openssldir=$dataRootDir/ssl + ./config --prefix=$prefix --libdir=$relativeLibDir \ + --openssldir=$dataRootDir/ssl \ + zlib shared make # multi-job builds don't work correctly } @@ -79,6 +90,14 @@ INSTALL() packageEntries devel \ $developDir \ $manDir/man3 + + # Remove stuff we don't need in the secondary architecture base package, + # since we make it depend on the primary package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $prefix/bin + rm -rf $dataRootDir/ssl + rm -rf $documentationDir + fi } TEST() @@ -89,12 +108,11 @@ TEST() # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The openssl development files" PROVIDES_devel=" - openssl_devel = $portVersion - devel:libcrypto = $portVersion compat >= 1.0.0 - devel:libssl = $portVersion compat >= 1.0.0 + openssl${secondaryArchSuffix}_devel = $portVersion + devel:libcrypto${secondaryArchSuffix} = $portVersion compat >= 1.0.0 + devel:libssl${secondaryArchSuffix} = $portVersion compat >= 1.0.0 " REQUIRES_devel=" - openssl == $portVersion base + openssl${secondaryArchSuffix} == $portVersion base " From e23eb853d7f5cccb1c16f17c89135a8767bbf014 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 01:11:23 +0200 Subject: [PATCH 362/587] jpeg: support building for secondary architecture --- media-libs/jpeg/jpeg-9.recipe | 68 +++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/media-libs/jpeg/jpeg-9.recipe b/media-libs/jpeg/jpeg-9.recipe index 9138566d4..232f6d297 100644 --- a/media-libs/jpeg/jpeg-9.recipe +++ b/media-libs/jpeg/jpeg-9.recipe @@ -13,34 +13,33 @@ LICENSE="JPEG" COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding. All Rights Reserved" SRC_URI="http://www.ijg.org/files/jpegsrc.v9.tar.gz" CHECKSUM_MD5="b397211ddfd506b92cd5e02a22ac924d" -REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="jpeg-9.patchset" PROVIDES=" - jpeg = $portVersion compat >= 9 - lib:libjpeg = $portVersion compat >= 9 + jpeg$secondaryArchSuffix = $portVersion compat >= 9 + lib:libjpeg$secondaryArchSuffix = $portVersion compat >= 9 " REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:grep - cmd:ld + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make " -SOURCE_DIR="$portVersionedName" - BUILD() { aclocal @@ -63,34 +62,43 @@ INSTALL() $developDir # tools package - packageEntries tools \ - $binDir \ - $documentationDir + if [ -z "$secondaryArchSuffix" ]; then + packageEntries tools \ + $binDir \ + $documentationDir + fi + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi } # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The JPEG development files" PROVIDES_devel=" - jpeg_devel = $portVersion compat >= 9 - devel:libjpeg = $portVersion compat >= 9 + jpeg${secondaryArchSuffix}_devel = $portVersion compat >= 9 + devel:libjpeg$secondaryArchSuffix = $portVersion compat >= 9 " REQUIRES_devel=" - jpeg == $portVersion base + jpeg$secondaryArchSuffix == $portVersion base " # ----- tools package ------------------------------------------------------- -SUMMARY_tools="The JPEG tools" -PROVIDES_tools=" - jpeg_tools = $portVersion compat >= 9 - cmd:cjpeg = $portVersion compat >= 9 - cmd:djpeg = $portVersion compat >= 9 - cmd:jpegtran = $portVersion compat >= 9 - cmd:rdjpgcom = $portVersion compat >= 9 - cmd:wrjpgcom = $portVersion compat >= 9 - " -REQUIRES_tools=" - haiku >= $haikuVersion - jpeg == $portVersion base - " +if [ -z "$secondaryArchSuffix" ]; then + SUMMARY_tools="The JPEG tools" + PROVIDES_tools=" + jpeg_tools = $portVersion compat >= 9 + cmd:cjpeg = $portVersion compat >= 9 + cmd:djpeg = $portVersion compat >= 9 + cmd:jpegtran = $portVersion compat >= 9 + cmd:rdjpgcom = $portVersion compat >= 9 + cmd:wrjpgcom = $portVersion compat >= 9 + " + REQUIRES_tools=" + haiku >= $haikuVersion + jpeg == $portVersion base + " +fi From 7cd42ed0fee768e4086837b1b77d576ac1893f72 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 01:11:46 +0200 Subject: [PATCH 363/587] libpng: support building for secondary architecture --- media-libs/libpng/libpng-1.5.12.recipe | 38 ++++++++++++-------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/media-libs/libpng/libpng-1.5.12.recipe b/media-libs/libpng/libpng-1.5.12.recipe index ed4d6a625..cbade86cb 100644 --- a/media-libs/libpng/libpng-1.5.12.recipe +++ b/media-libs/libpng/libpng-1.5.12.recipe @@ -9,36 +9,35 @@ COPYRIGHT=" LICENSE="LibPNG" SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.12.tar.gz?download" CHECKSUM_MD5="8ea7f60347a306c5faf70b977fa80e28" -REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libpng-1.5.12.patchset" PROVIDES=" - libpng = $portVersion compat >= 1.5 - lib:libpng = 15.12.0 compat >= 15 - lib:libpng15 = 15.12.0 compat >= 15 + libpng$secondaryArchSuffix = $portVersion compat >= 1.5 + lib:libpng$secondaryArchSuffix = 15.12.0 compat >= 15 + lib:libpng15$secondaryArchSuffix = 15.12.0 compat >= 15 " REQUIRES=" - haiku >= $haikuVersion - lib:libz + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libz >= 1.0.4 + devel:libz$secondaryArchSuffix >= 1.0.4 " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make " -SOURCE_DIR="$portVersionedName" - BUILD() { aclocal @@ -64,14 +63,13 @@ INSTALL() # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The libpng development files" PROVIDES_devel=" - libpng_devel = $portVersion compat >= 1.5 - cmd:libpng_config = $portVersion compat >= 1.5 - cmd:libpng15_config = $portVersion compat >= 1.5 - devel:libpng = 15.12.0 compat >= 15 - devel:libpng15 = 15.12.0 compat >= 15 + libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.5 + cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.5 + cmd:libpng15_config$secondaryArchSuffix = $portVersion compat >= 1.5 + devel:libpng$secondaryArchSuffix = 15.12.0 compat >= 15 + devel:libpng15$secondaryArchSuffix = 15.12.0 compat >= 15 " REQUIRES_devel=" - libpng == $portVersion base + libpng$secondaryArchSuffix == $portVersion base " From c18e6c7e527ea28110d8f89c0bfe5a3c32729dcb Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 02:00:53 +0200 Subject: [PATCH 364/587] speex: support building for secondary architecture --- media-libs/speex/speex-1.2~rc1.recipe | 47 +++++++++++++++++---------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/media-libs/speex/speex-1.2~rc1.recipe b/media-libs/speex/speex-1.2~rc1.recipe index 1b185fec9..acc6ae59a 100644 --- a/media-libs/speex/speex-1.2~rc1.recipe +++ b/media-libs/speex/speex-1.2~rc1.recipe @@ -13,32 +13,38 @@ COPYRIGHT=" " SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz" CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="speex-1.2~rc1.patchset" PROVIDES=" - speex = $portVersion - cmd:speexdec = $portVersion - cmd:speexenc = $portVersion - lib:libspeex = 1.5.0 compat >= 1 - lib:libspeexdsp = 1.5.0 compat >= 1 + speex$secondaryArchSuffix = $portVersion + lib:libspeex$secondaryArchSuffix = 1.5.0 compat >= 1 + lib:libspeexdsp$secondaryArchSuffix = 1.5.0 compat >= 1 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:speexdec = $portVersion + cmd:speexenc = $portVersion + " +fi + REQUIRES=" - haiku >= $haikuVersion - lib:libogg + haiku$secondaryArchSuffix >= $haikuVersion + lib:libogg$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libogg + devel:libogg$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make cmd:pkg_config @@ -67,16 +73,21 @@ INSTALL() packageEntries devel \ $dataDir/aclocal \ $developDir + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi } # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The speex development files" PROVIDES_devel=" - speex_devel = $portVersion - devel:libspeex = 1.5.0 compat >= 1 - devel:libspeexdsp = 1.5.0 compat >= 1 + speex${secondaryArchSuffix}_devel = $portVersion + devel:libspeex$secondaryArchSuffix = 1.5.0 compat >= 1 + devel:libspeexdsp$secondaryArchSuffix = 1.5.0 compat >= 1 " REQUIRES_devel=" - speex == $portVersion + speex$secondaryArchSuffix == $portVersion " From 021cd79d952b811a4103c0d8d8a09b6fd36e1e63 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 02:01:19 +0200 Subject: [PATCH 365/587] libogg: support building for secondary architecture --- media-libs/libogg/libogg-1.3.0.recipe | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/media-libs/libogg/libogg-1.3.0.recipe b/media-libs/libogg/libogg-1.3.0.recipe index ea8def101..219735204 100644 --- a/media-libs/libogg/libogg-1.3.0.recipe +++ b/media-libs/libogg/libogg-1.3.0.recipe @@ -11,33 +11,32 @@ LICENSE="BSD (3-clause)" COPYRIGHT="1994-2011 Xiph.Org Foundation" SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.gz" CHECKSUM_MD5="0a7eb40b86ac050db3a789ab65fe21c2" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libogg-1.3.0.patchset" PROVIDES=" - libogg = $portVersion - lib:libogg = 0.8.0 compat >= 0 + libogg$secondaryArchSuffix = $portVersion + lib:libogg$secondaryArchSuffix = 0.8.0 compat >= 0 " REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make " -SOURCE_DIR="$portVersionedName" - BUILD() { libtoolize --force --copy --install @@ -63,11 +62,10 @@ INSTALL() # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The libogg development files" PROVIDES_devel=" - libogg_devel = $portVersion - devel:libogg = 0.8.0 compat >= 0 + libogg${secondaryArchSuffix}_devel = $portVersion + devel:libogg$secondaryArchSuffix = 0.8.0 compat >= 0 " REQUIRES_devel=" - libogg == $portVersion + libogg$secondaryArchSuffix == $portVersion " From 236a36fd62181d4c53c2a666e196ef63e7be2931 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 02:01:37 +0200 Subject: [PATCH 366/587] libvorbis: support building for secondary architecture --- media-libs/libvorbis/libvorbis-1.3.2.recipe | 38 ++++++++++----------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/media-libs/libvorbis/libvorbis-1.3.2.recipe b/media-libs/libvorbis/libvorbis-1.3.2.recipe index b810914e1..70b9f959f 100644 --- a/media-libs/libvorbis/libvorbis-1.3.2.recipe +++ b/media-libs/libvorbis/libvorbis-1.3.2.recipe @@ -7,38 +7,37 @@ LICENSE="BSD (3-clause)" COPYRIGHT="1994-2010 Xiph.Org Foundation" SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.gz" CHECKSUM_MD5="c870b9bd5858a0ecb5275c14486d9554" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libvorbis-1.3.2.patchset" PROVIDES=" - libvorbis = $portVersion - lib:libvorbis = 0.4.5 compat >= 0 - lib:libvorbisenc = 2.0.8 compat >= 2 - lib:libvorbisfile = 3.3.4 compat >= 3 + libvorbis$secondaryArchSuffix = $portVersion + lib:libvorbis$secondaryArchSuffix = 0.4.5 compat >= 0 + lib:libvorbisenc$secondaryArchSuffix = 2.0.8 compat >= 2 + lib:libvorbisfile$secondaryArchSuffix = 3.3.4 compat >= 3 " REQUIRES=" - haiku >= $haikuVersion - lib:libogg + haiku$secondaryArchSuffix >= $haikuVersion + lib:libogg$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libogg + devel:libogg$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make cmd:pkg_config " -SOURCE_DIR="$portVersionedName" - BUILD() { libtoolize -fci @@ -66,13 +65,12 @@ INSTALL() # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The libvorbis development files" PROVIDES_devel=" - libvorbis_devel = $portVersion - devel:libvorbis = 0.4.5 compat >= 0 - devel:libvorbisenc = 2.0.8 compat >= 2 - devel:libvorbisfile = 3.3.4 compat >= 3 + libvorbis${secondaryArchSuffix}_devel = $portVersion + devel:libvorbis$secondaryArchSuffix = 0.4.5 compat >= 0 + devel:libvorbisenc$secondaryArchSuffix = 2.0.8 compat >= 2 + devel:libvorbisfile$secondaryArchSuffix = 3.3.4 compat >= 3 " REQUIRES_devel=" - libvorbis == $portVersion + libvorbis$secondaryArchSuffix == $portVersion " From 09bd078c8d4fdadf4f6872489838a4668b23e51b Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 02:01:51 +0200 Subject: [PATCH 367/587] libtheora: support building for secondary architecture --- media-libs/libtheora/libtheora-1.1.1.recipe | 38 ++++++++++----------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/media-libs/libtheora/libtheora-1.1.1.recipe b/media-libs/libtheora/libtheora-1.1.1.recipe index 621e03e32..8886f03f0 100644 --- a/media-libs/libtheora/libtheora-1.1.1.recipe +++ b/media-libs/libtheora/libtheora-1.1.1.recipe @@ -9,39 +9,38 @@ LICENSE="BSD (3-clause)" COPYRIGHT="2002-2009 Xiph.Org Foundation" SRC_URI="http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2" CHECKSUM_MD5="292ab65cedd5021d6b7ddd117e07cd8e" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libtheora-1.1.1.patchset" PROVIDES=" - libtheora = $portVersion - lib:libtheora = 0.3.10 compat >= 0 - lib:libtheoradec = 1.1.4 compat >= 1 - lib:libtheoraenc = 1.1.2 compat >= 1 + libtheora$secondaryArchSuffix = $portVersion + lib:libtheora$secondaryArchSuffix = 0.3.10 compat >= 0 + lib:libtheoradec$secondaryArchSuffix = 1.1.4 compat >= 1 + lib:libtheoraenc$secondaryArchSuffix = 1.1.2 compat >= 1 " REQUIRES=" - haiku >= $haikuVersion - lib:libogg + haiku$secondaryArchSuffix >= $haikuVersion + lib:libogg$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libogg + devel:libogg$secondaryArchSuffix " # Note: The build system also looks for libvorbis and SDL, but that seems # to be needed only for building the sample player, which we don't need. BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make cmd:pkg_config " -SOURCE_DIR="$portVersionedName" - BUILD() { libtoolize --force --copy --install @@ -68,13 +67,12 @@ INSTALL() # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The libtheora development files" PROVIDES_devel=" - libtheora_devel = $portVersion - devel:libtheora = 0.3.10 compat >= 0 - devel:libtheoradec = 1.1.4 compat >= 1 - devel:libtheoraenc = 1.1.2 compat >= 1 + libtheora${secondaryArchSuffix}_devel = $portVersion + devel:libtheora$secondaryArchSuffix = 0.3.10 compat >= 0 + devel:libtheoradec$secondaryArchSuffix = 1.1.4 compat >= 1 + devel:libtheoraenc$secondaryArchSuffix = 1.1.2 compat >= 1 " REQUIRES_devel=" - libtheora == $portVersion + libtheora$secondaryArchSuffix == $portVersion " From 3eb07497a47863b2e95d1e521743a8b9aababad3 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 02:54:15 +0200 Subject: [PATCH 368/587] libvpx: support building for secondary architecture --- media-libs/libvpx/libvpx-1.0.0.recipe | 45 +++++++++++++++++---------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/media-libs/libvpx/libvpx-1.0.0.recipe b/media-libs/libvpx/libvpx-1.0.0.recipe index 084c757ab..874e17cd9 100644 --- a/media-libs/libvpx/libvpx-1.0.0.recipe +++ b/media-libs/libvpx/libvpx-1.0.0.recipe @@ -11,29 +11,35 @@ COPYRIGHT="2009-2012 Google Inc., The Xiph.Org Foundation" SRC_URI="http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2" CHECKSUM_MD5="d987b5140412edd37d2c6b10c29ad484" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libvpx-1.0.0.patchset" PROVIDES=" - libvpx = $portVersion - cmd:vp8_scalable_patterns = $portVersion - cmd:vpxdec = $portVersion compat >= 1 - cmd:vpxenc = $portVersion compat >= 1 - lib:libvpx = $portVersion compat >= 1 + libvpx$secondaryArchSuffix = $portVersion + lib:libvpx$secondaryArchSuffix = $portVersion compat >= 1 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:vp8_scalable_patterns = $portVersion + cmd:vpxdec = $portVersion compat >= 1 + cmd:vpxenc = $portVersion compat >= 1 + " +fi + REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" " # Note: The build system also looks for libvorbis and SDL, but that seems # to be needed only for building the sample player, which we don't need. BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:ld + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make cmd:perl cmd:yasm @@ -46,6 +52,7 @@ BUILD() # not an auto tools configure ./configure \ --prefix="$prefix" \ + --libdir="$libDir" \ --as=yasm \ --enable-pic \ --enable-shared \ @@ -60,20 +67,26 @@ INSTALL() prepareInstalledDevelLibs libvpx fixPkgconfig - mv $prefix/include $includeDir + mkdir -p $includeDir + mv $prefix/include/* $includeDir + rmdir $prefix/include # devel package packageEntries devel \ $developDir + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $prefix/bin + fi } # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The libvpx development files" PROVIDES_devel=" - libvpx_devel = $portVersion - devel:libvpx = $portVersion compat >= 1 + libvpx${secondaryArchSuffix}_devel = $portVersion + devel:libvpx$secondaryArchSuffix = $portVersion compat >= 1 " REQUIRES_devel=" - libvpx == $portVersion + libvpx$secondaryArchSuffix == $portVersion " From 74cb8b4aa75568109406eaf9099eb4830aeba64f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 02:54:52 +0200 Subject: [PATCH 369/587] ffmpeg: support building for secondary architecture --- media-video/ffmpeg/ffmpeg-0.10.2.recipe | 102 +++++++++++++----------- 1 file changed, 57 insertions(+), 45 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.recipe b/media-video/ffmpeg/ffmpeg-0.10.2.recipe index ee4c53b68..6d7c71e7a 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.2.recipe +++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe @@ -11,47 +11,53 @@ COPYRIGHT=" " SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2" CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd" -REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="ffmpeg-0.10.2-gcc2.patch" PROVIDES=" - ffmpeg = $portVersion compat >= 0.10 - cmd:ffmpeg = $portVersion compat >= 0.10 - cmd:ffprobe = $portVersion compat >= 0.10 - cmd:ffserver = $portVersion compat >= 0.10 - lib:libavcodec = 53.61.100 compat >= 53 - lib:libavdevice = 53.4.100 compat >= 53 - lib:libavfilter = 2.61.100 compat >= 2 - lib:libavformat = 53.32.100 compat >= 53 - lib:libavutil = 51.35.100 compat >= 51 - lib:libswresample = 0.6.100 compat >= 0 - lib:libswscale = 2.1.100 compat >= 2 + ffmpeg$secondaryArchSuffix = $portVersion compat >= 0.10 + lib:libavcodec$secondaryArchSuffix = 53.61.100 compat >= 53 + lib:libavdevice$secondaryArchSuffix = 53.4.100 compat >= 53 + lib:libavfilter$secondaryArchSuffix = 2.61.100 compat >= 2 + lib:libavformat$secondaryArchSuffix = 53.32.100 compat >= 53 + lib:libavutil$secondaryArchSuffix = 51.35.100 compat >= 51 + lib:libswresample$secondaryArchSuffix = 0.6.100 compat >= 0 + lib:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:ffmpeg = $portVersion compat >= 0.10 + cmd:ffprobe = $portVersion compat >= 0.10 + cmd:ffserver = $portVersion compat >= 0.10 + " +fi + REQUIRES=" - haiku >= $haikuVersion - lib:libogg - lib:libspeex - lib:libtheoradec - lib:libtheoraenc - lib:libvorbis - lib:libvorbisenc - lib:libvpx - lib:libz + haiku$secondaryArchSuffix >= $haikuVersion + lib:libogg$secondaryArchSuffix + lib:libspeex$secondaryArchSuffix + lib:libtheoradec$secondaryArchSuffix + lib:libtheoraenc$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libvorbisenc$secondaryArchSuffix + lib:libvpx$secondaryArchSuffix + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libogg - devel:libspeex - devel:libtheora - devel:libvorbis - devel:libvpx - devel:libz + devel:libogg$secondaryArchSuffix + devel:libspeex$secondaryArchSuffix + devel:libtheora$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libvpx$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:ld + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make cmd:perl cmd:pkg_config @@ -61,9 +67,7 @@ BUILD_PREREQUIRES=" GLOBAL_WRITABLE_FILES=" settings/ffserver.conf -" - -SOURCE_DIR="$portVersionedName" + " PATCH() { @@ -83,8 +87,11 @@ BUILD() # not an auto tools configure ./configure \ --prefix=$prefix \ - --datadir=$dataDir/ffmpeg \ + --bindir=$binDir \ + --datadir=$dataDir/$portName \ --incdir=$includeDir \ + --libdir=$libDir \ + --shlibdir=$libDir \ --mandir=$manDir \ --disable-debug \ --enable-shared \ @@ -122,21 +129,26 @@ INSTALL() # devel package packageEntries devel \ $developDir + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $prefix/bin + rm -rf $documentationDir + fi } # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The libtheora development files" PROVIDES_devel=" - ffmpeg_devel = $portVersion compat >= 0.10 - devel:libavcodec = 53.61.100 compat >= 53 - devel:libavdevice = 53.4.100 compat >= 53 - devel:libavfilter = 2.61.100 compat >= 2 - devel:libavformat = 53.32.100 compat >= 53 - devel:libavutil = 51.35.100 compat >= 51 - devel:libswresample = 0.6.100 compat >= 0 - devel:libswscale = 2.1.100 compat >= 2 + ffmpeg${secondaryArchSuffix}_devel = $portVersion compat >= 0.10 + devel:libavcodec$secondaryArchSuffix = 53.61.100 compat >= 53 + devel:libavdevice$secondaryArchSuffix = 53.4.100 compat >= 53 + devel:libavfilter$secondaryArchSuffix = 2.61.100 compat >= 2 + devel:libavformat$secondaryArchSuffix = 53.32.100 compat >= 53 + devel:libavutil$secondaryArchSuffix = 51.35.100 compat >= 51 + devel:libswresample$secondaryArchSuffix = 0.6.100 compat >= 0 + devel:libswscale$secondaryArchSuffix = 2.1.100 compat >= 2 " REQUIRES_devel=" - ffmpeg == $portVersion + ffmpeg$secondaryArchSuffix == $portVersion " From 82581c9adb557c35bcbc3f503c8a2df1318ee9d0 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 03:39:07 +0200 Subject: [PATCH 370/587] libxml2: support building for secondary architecture --- dev-libs/libxml2/libxml2-2.8.0.recipe | 46 ++++++++++++++++----------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe index e59ff9df8..0272327e2 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.recipe +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -4,37 +4,41 @@ LICENSE="MIT" COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz" CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093" -REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="4" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libxml2-2.8.0.patch" PROVIDES=" - libxml2 = $portVersion compat >= 2 - cmd:xmlcatalog = $portVersion compat >= 2 - cmd:xmllint = $portVersion compat >= 2 - lib:libxml2 = $portVersion compat >= 2 + libxml2$secondaryArchSuffix = $portVersion compat >= 2 + lib:libxml2$secondaryArchSuffix = $portVersion compat >= 2 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:xmlcatalog = $portVersion compat >= 2 + cmd:xmllint = $portVersion compat >= 2 + " +fi + REQUIRES=" - haiku >= $haikuVersion - lib:libz + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libz + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make " -SOURCE_DIR="$portVersionedName" - PATCH() { # replace hard-coded references to the development documentation dir @@ -74,6 +78,12 @@ INSTALL() $docDir \ $manDir/man1/xml2-config.1 \ $manDir/man3 + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi } TEST() @@ -138,10 +148,10 @@ DESCRIPTION=" # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - libxml2_devel = $portVersion - cmd:xml2_config = $portVersion compat >= 2 - devel:libxml2 = $portVersion compat >= 2 + libxml2${secondaryArchSuffix}_devel = $portVersion + cmd:xml2_config$secondaryArchSuffix = $portVersion compat >= 2 + devel:libxml2$secondaryArchSuffix = $portVersion compat >= 2 " REQUIRES_devel=" - libxml2 == $portVersion base + libxml2$secondaryArchSuffix == $portVersion base " From 5a99c6012a59063af365bf491f026069b1222dc1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 03:39:34 +0200 Subject: [PATCH 371/587] sqlite: support building for secondary architecture --- dev-db/sqlite/sqlite-3.7.13.recipe | 36 ++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dev-db/sqlite/sqlite-3.7.13.recipe b/dev-db/sqlite/sqlite-3.7.13.recipe index 7eb639fd8..ad04e2b99 100644 --- a/dev-db/sqlite/sqlite-3.7.13.recipe +++ b/dev-db/sqlite/sqlite-3.7.13.recipe @@ -11,28 +11,34 @@ SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz" CHECKSUM_MD5="c97df403e8a3d5b67bb408fcd6aabd8e" LICENSE="SQLite" COPYRIGHT="Public Domain" -REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="4" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="sqlite-3.7.13.patch" PROVIDES=" - sqlite = $portVersion compat >= 3 - cmd:sqlite3 = $portVersion compat >= 3 - lib:libsqlite3 = 0.8.6 compat >= 0 + sqlite$secondaryArchSuffix = $portVersion compat >= 3 + lib:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:sqlite3 = $portVersion compat >= 3 + " +fi + REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make " @@ -60,14 +66,20 @@ INSTALL() # devel package packageEntries devel \ $developDir + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi } # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - sqlite_devel = $portVersion - devel:libsqlite3 = 0.8.6 compat >= 0 + sqlite${secondaryArchSuffix}_devel = $portVersion + devel:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0 " REQUIRES_devel=" - sqlite == $portVersion base + sqlite$secondaryArchSuffix == $portVersion base " From e89df4bc25ebf98856f2b21cc7dfdf08d372c616 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 03:39:53 +0200 Subject: [PATCH 372/587] curl: support building for secondary architecture --- net-misc/curl/curl-7.26.0.recipe | 48 +++++++++++++++++++------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/net-misc/curl/curl-7.26.0.recipe b/net-misc/curl/curl-7.26.0.recipe index ab0c00531..147f2a52c 100644 --- a/net-misc/curl/curl-7.26.0.recipe +++ b/net-misc/curl/curl-7.26.0.recipe @@ -4,37 +4,41 @@ COPYRIGHT="1996-2012, Daniel Stenberg, . All rights reserved." LICENSE="Curl" SRC_URI="http://curl.haxx.se/download/curl-7.26.0.tar.bz2" CHECKSUM_MD5="bfa80f01b3d300359cfb4d409b6136a3" -REVISION="4" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="5" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="curl-7.26.0.patch" PROVIDES=" - curl = $portVersion - cmd:curl = $portVersion compat >= 7.16 - lib:libcurl = 4.2.0 compat >= 4 + curl$secondaryArchSuffix = $portVersion + lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:curl = $portVersion compat >= 7.16 + " +fi + REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion ca_root_certificates - lib:libssl - lib:libz + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libssl - devel:libz + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:autoconf - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make " -SOURCE_DIR="$portVersionedName" - BUILD() { certsInstallDir="$portPackageLinksDir/ca_root_certificates" @@ -76,6 +80,12 @@ INSTALL() $binDir/curl-config \ $developDir \ $manDir/man3 + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi } TEST() @@ -96,10 +106,10 @@ DESCRIPTION=" # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - curl_devel = $portVersion - cmd:curl_config = $portVersion compat >= 7.16 - devel:libcurl = 4.2.0 compat >= 4 + curl${secondaryArchSuffix}_devel = $portVersion + cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16 + devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 " REQUIRES_devel=" - curl == $portVersion base + curl$secondaryArchSuffix == $portVersion base " From 8b3e98d3a36c73d2891959256b719a730d2a49fa Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 18:05:03 +0200 Subject: [PATCH 373/587] scons: convert 2.2.0 recipe to an actual recipe --- ...scons-2.2.0.patch => scons-2.2.0.patchset} | 73 +++++++++++++------ dev-util/scons/scons-2.2.0.recipe | 43 +++++++---- 2 files changed, 80 insertions(+), 36 deletions(-) rename dev-util/scons/patches/{scons-2.2.0.patch => scons-2.2.0.patchset} (54%) diff --git a/dev-util/scons/patches/scons-2.2.0.patch b/dev-util/scons/patches/scons-2.2.0.patchset similarity index 54% rename from dev-util/scons/patches/scons-2.2.0.patch rename to dev-util/scons/patches/scons-2.2.0.patchset index 233c252b3..1ecca99d2 100644 --- a/dev-util/scons/patches/scons-2.2.0.patch +++ b/dev-util/scons/patches/scons-2.2.0.patchset @@ -1,7 +1,14 @@ -diff -Naur scons-2.2.0/engine/SCons/Platform/__init__.py scons-2.2.0-haiku/engine/SCons/Platform/__init__.py ---- scons-2.2.0/engine/SCons/Platform/__init__.py 2012-08-05 15:38:31.009961472 +0000 -+++ scons-2.2.0-haiku/engine/SCons/Platform/__init__.py 2012-09-30 13:28:21.978583552 +0000 -@@ -78,6 +78,8 @@ +From 8f1968371d3426d08cba8dafa44eaaa0cb59b13f Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Fri, 9 Aug 2013 17:46:35 +0200 +Subject: Add support for the Haiku platform + + +diff --git a/engine/SCons/Platform/__init__.py b/engine/SCons/Platform/__init__.py +index 2cab3c8..373938d 100644 +--- a/engine/SCons/Platform/__init__.py ++++ b/engine/SCons/Platform/__init__.py +@@ -78,6 +78,8 @@ def platform_default(): return 'aix' elif sys.platform.find('darwin') != -1: return 'darwin' @@ -10,10 +17,12 @@ diff -Naur scons-2.2.0/engine/SCons/Platform/__init__.py scons-2.2.0-haiku/engin else: return 'posix' elif os.name == 'os2': -diff -Naur scons-2.2.0/engine/SCons/Platform/haiku.py scons-2.2.0-haiku/engine/SCons/Platform/haiku.py ---- scons-2.2.0/engine/SCons/Platform/haiku.py 1970-01-01 00:00:00.000000000 +0000 -+++ scons-2.2.0-haiku/engine/SCons/Platform/haiku.py 2012-09-30 13:30:07.109051904 +0000 -@@ -0,0 +1,54 @@ +diff --git a/engine/SCons/Platform/haiku.py b/engine/SCons/Platform/haiku.py +new file mode 100644 +index 0000000..5c802dd +--- /dev/null ++++ b/engine/SCons/Platform/haiku.py +@@ -0,0 +1,69 @@ +"""SCons.Platform.haiku + +Platform-specific initialization for Haiku systems. @@ -48,23 +57,41 @@ diff -Naur scons-2.2.0/engine/SCons/Platform/haiku.py scons-2.2.0-haiku/engine/S + +__revision__ = "" + -+import posix +import commands ++import os ++import posix + -+def findDir( identifier ): -+ return commands.getoutput( 'finddir %s' % identifier ) ++def findDir(identifier): ++ return commands.getoutput('finddir %s' % identifier) + +def generate(env): + posix.generate(env) -+ -+ # path list -+ listPath = [ '.' ] -+ listPath.append( '%s/bin' % findDir( 'B_USER_CONFIG_DIRECTORY' ) ) -+ listPath.append( findDir( 'B_COMMON_BIN_DIRECTORY' ) ) -+ listPath.append( findDir( 'B_SYSTEM_BIN_DIRECTORY' ) ) -+ listPath.append( findDir( 'B_BEOS_BIN_DIRECTORY' ) ) -+ listPath.append( '%s/tools/gnupro/bin' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' ) ) -+ env['ENV']['PATH'] = ':'.join( listPath ) -+ -+ # help the linker find the startfiles -+ env['ENV']['BELIBRARIES'] = ':%s/lib/x86' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' ) ++ ++ # determine, if building for the secondary architecture ++ secondaryArch = os.environ.get('HAIKU_SECONDARY_ARCH') ++ archSubDir = '/' + secondaryArch if secondaryArch else '' ++ ++ # PATH ++ pathDescriptions = [ ++ ('B_USER_NONPACKAGED_BIN_DIRECTORY', None), ++ ('B_USER_CONFIG_DIRECTORY', 'bin'), ++ ('B_COMMON_NONPACKAGED_BIN_DIRECTORY', None), ++ ('B_COMMON_BIN_DIRECTORY', None), ++ ('B_SYSTEM_BIN_DIRECTORY', None) ++ ] ++ ++ paths = [] ++ for pathConstant, subDir in pathDescriptions: ++ path = findDir(pathConstant) ++ if subDir: ++ path += '/' + subDir ++ paths.append(path) ++ ++ if secondaryArch: ++ # prepend the secondary arch subdirectories ++ paths = [path + archSubDir for path in paths] + paths ++ ++ env['ENV']['PATH'] = ':'.join(paths) +-- +1.7.10.2 + diff --git a/dev-util/scons/scons-2.2.0.recipe b/dev-util/scons/scons-2.2.0.recipe index 007f389a7..75e48e55e 100644 --- a/dev-util/scons/scons-2.2.0.recipe +++ b/dev-util/scons/scons-2.2.0.recipe @@ -1,15 +1,36 @@ -DESCRIPTION="Open Source next-generation build tool." +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." HOMEPAGE="http://www.scons.org/" LICENSE="MIT" COPYRIGHT="2001-2012 The SCons Foundation" SRC_URI="http://superb-dca3.dl.sourceforge.net/project/scons/scons/2.2.0/scons-2.2.0.tar.gz" CHECKSUM_MD5="f737f474a02d08156c821bd2d4d4b632" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="dev-lang/python >= 2.5.4" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="scons-2.2.0.patchset" + +PROVIDES=" + scons = $portVersion compat >= 2 + cmd:scons = $portVersion compat >= 2 + cmd:scons_2.2.0 = $portVersion compat >= 2 + cmd:scons_time = $portVersion compat >= 2 + cmd:scons_time_2.2.0 = $portVersion compat >= 2 + cmd:sconsign = $portVersion compat >= 2 + cmd:sconsign_2.2.0 = $portVersion compat >= 2 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:python + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + cmd:python + " + BUILD() { - cd scons-2.2.0 for f in "script/scons script/scons-time script/sconsign"; do sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f done @@ -18,13 +39,9 @@ BUILD() INSTALL() { - if [ ! -z ${DESTDIR} ]; then - options="${options} --root=${DESTDIR}" - fi - options="${options} --prefix=`finddir B_COMMON_DIRECTORY`" - options="${options} --install-data=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`" - options="${options} --symlink-scons" - options="${options} --standard-lib" - cd scons-2.2.0 + options="$options --prefix=$prefix" + options="$options --install-data=$documentationDir" + options="$options --symlink-scons" + options="$options --standard-lib" python setup.py install $options } From 099c1c8b341e881d114d94d60849a32a41d1a814 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 18:05:51 +0200 Subject: [PATCH 374/587] scons: Remove old non-recipes and patches --- .../scons/patches/scons-1.0.1-python2.5.patch | 84 ------------------- dev-util/scons/patches/scons-1.0.1.patch | 84 ------------------- dev-util/scons/patches/scons-2.0.1.patch | 70 ---------------- dev-util/scons/scons-1.0.1.recipe | 24 ------ dev-util/scons/scons-1.0.1_python2.5 | 24 ------ dev-util/scons/scons-2.0.1.recipe | 30 ------- 6 files changed, 316 deletions(-) delete mode 100644 dev-util/scons/patches/scons-1.0.1-python2.5.patch delete mode 100644 dev-util/scons/patches/scons-1.0.1.patch delete mode 100644 dev-util/scons/patches/scons-2.0.1.patch delete mode 100644 dev-util/scons/scons-1.0.1.recipe delete mode 100644 dev-util/scons/scons-1.0.1_python2.5 delete mode 100644 dev-util/scons/scons-2.0.1.recipe diff --git a/dev-util/scons/patches/scons-1.0.1-python2.5.patch b/dev-util/scons/patches/scons-1.0.1-python2.5.patch deleted file mode 100644 index 7f07a486d..000000000 --- a/dev-util/scons/patches/scons-1.0.1-python2.5.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -Naur scons-1.0.1/engine/SCons/Platform/__init__.py scons-1.0.1-haiku-1/engine/SCons/Platform/__init__.py ---- scons-1.0.1/engine/SCons/Platform/__init__.py 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/engine/SCons/Platform/__init__.py 2008-09-28 19:06:30.000000000 +0200 -@@ -76,6 +76,8 @@ - return 'aix' - elif string.find(sys.platform, 'darwin') != -1: - return 'darwin' -+ elif string.find(sys.platform, 'haiku') != -1: -+ return 'haiku' - else: - return 'posix' - elif os.name == 'os2': -diff -Naur scons-1.0.1/engine/SCons/Platform/haiku.py scons-1.0.1-haiku-1/engine/SCons/Platform/haiku.py ---- scons-1.0.1/engine/SCons/Platform/haiku.py 1970-01-01 01:00:00.000000000 +0100 -+++ scons-1.0.1-haiku-1/engine/SCons/Platform/haiku.py 2008-10-05 13:27:12.000000000 +0200 -@@ -0,0 +1,41 @@ -+"""SCons.Platform.haiku -+ -+Platform-specific initialization for Haiku systems. -+ -+There normally shouldn't be any need to import this module directly. It -+will usually be imported through the generic SCons.Platform.Platform() -+selection method. -+""" -+ -+# -+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundation -+# -+# Permission is hereby granted, free of charge, to any person obtaining -+# a copy of this software and associated documentation files (the -+# "Software"), to deal in the Software without restriction, including -+# without limitation the rights to use, copy, modify, merge, publish, -+# distribute, sublicense, and/or sell copies of the Software, and to -+# permit persons to whom the Software is furnished to do so, subject to -+# the following conditions: -+# -+# The above copyright notice and this permission notice shall be included -+# in all copies or substantial portions of the Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+# -+ -+__revision__ = "" -+ -+import posix -+ -+def generate(env): -+ posix.generate(env) -+ env['ENV']['PATH'] = '.:/boot/home/config/bin:/boot/common/bin:/boot/system/bin:/boot/develop/tools/gnupro/bin' -+ # help the linker find the startfiles -+ env['ENV']['BELIBRARIES'] = '/boot/develop/lib/x86' -diff -Naur scons-1.0.1/script/scons scons-1.0.1-haiku-1/script/scons ---- scons-1.0.1/script/scons 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/script/scons 2008-10-05 13:20:42.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - # - # SCons - a Software Constructor - # -diff -Naur scons-1.0.1/script/scons-time scons-1.0.1-haiku-1/script/scons-time ---- scons-1.0.1/script/scons-time 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/script/scons-time 2008-10-05 13:20:49.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/bin/env python - # - # scons-time - run SCons timings and collect statistics - # -diff -Naur scons-1.0.1/script/sconsign scons-1.0.1-haiku-1/script/sconsign ---- scons-1.0.1/script/sconsign 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/script/sconsign 2008-10-05 13:20:59.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - # - # SCons - a Software Constructor - # diff --git a/dev-util/scons/patches/scons-1.0.1.patch b/dev-util/scons/patches/scons-1.0.1.patch deleted file mode 100644 index 7f07a486d..000000000 --- a/dev-util/scons/patches/scons-1.0.1.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -Naur scons-1.0.1/engine/SCons/Platform/__init__.py scons-1.0.1-haiku-1/engine/SCons/Platform/__init__.py ---- scons-1.0.1/engine/SCons/Platform/__init__.py 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/engine/SCons/Platform/__init__.py 2008-09-28 19:06:30.000000000 +0200 -@@ -76,6 +76,8 @@ - return 'aix' - elif string.find(sys.platform, 'darwin') != -1: - return 'darwin' -+ elif string.find(sys.platform, 'haiku') != -1: -+ return 'haiku' - else: - return 'posix' - elif os.name == 'os2': -diff -Naur scons-1.0.1/engine/SCons/Platform/haiku.py scons-1.0.1-haiku-1/engine/SCons/Platform/haiku.py ---- scons-1.0.1/engine/SCons/Platform/haiku.py 1970-01-01 01:00:00.000000000 +0100 -+++ scons-1.0.1-haiku-1/engine/SCons/Platform/haiku.py 2008-10-05 13:27:12.000000000 +0200 -@@ -0,0 +1,41 @@ -+"""SCons.Platform.haiku -+ -+Platform-specific initialization for Haiku systems. -+ -+There normally shouldn't be any need to import this module directly. It -+will usually be imported through the generic SCons.Platform.Platform() -+selection method. -+""" -+ -+# -+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundation -+# -+# Permission is hereby granted, free of charge, to any person obtaining -+# a copy of this software and associated documentation files (the -+# "Software"), to deal in the Software without restriction, including -+# without limitation the rights to use, copy, modify, merge, publish, -+# distribute, sublicense, and/or sell copies of the Software, and to -+# permit persons to whom the Software is furnished to do so, subject to -+# the following conditions: -+# -+# The above copyright notice and this permission notice shall be included -+# in all copies or substantial portions of the Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+# -+ -+__revision__ = "" -+ -+import posix -+ -+def generate(env): -+ posix.generate(env) -+ env['ENV']['PATH'] = '.:/boot/home/config/bin:/boot/common/bin:/boot/system/bin:/boot/develop/tools/gnupro/bin' -+ # help the linker find the startfiles -+ env['ENV']['BELIBRARIES'] = '/boot/develop/lib/x86' -diff -Naur scons-1.0.1/script/scons scons-1.0.1-haiku-1/script/scons ---- scons-1.0.1/script/scons 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/script/scons 2008-10-05 13:20:42.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - # - # SCons - a Software Constructor - # -diff -Naur scons-1.0.1/script/scons-time scons-1.0.1-haiku-1/script/scons-time ---- scons-1.0.1/script/scons-time 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/script/scons-time 2008-10-05 13:20:49.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/bin/env python - # - # scons-time - run SCons timings and collect statistics - # -diff -Naur scons-1.0.1/script/sconsign scons-1.0.1-haiku-1/script/sconsign ---- scons-1.0.1/script/sconsign 2008-09-06 16:34:17.000000000 +0200 -+++ scons-1.0.1-haiku-1/script/sconsign 2008-10-05 13:20:59.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - # - # SCons - a Software Constructor - # diff --git a/dev-util/scons/patches/scons-2.0.1.patch b/dev-util/scons/patches/scons-2.0.1.patch deleted file mode 100644 index 7271f58e4..000000000 --- a/dev-util/scons/patches/scons-2.0.1.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Naur scons-2.0.1/engine/SCons/Platform/__init__.py scons-2.0.1-haiku/engine/SCons/Platform/__init__.py ---- scons-2.0.1/engine/SCons/Platform/__init__.py 2010-08-17 06:02:51.023068672 +0000 -+++ scons-2.0.1-haiku/engine/SCons/Platform/__init__.py 2011-07-26 06:05:15.824967168 +0000 -@@ -78,6 +78,8 @@ - return 'aix' - elif sys.platform.find('darwin') != -1: - return 'darwin' -+ elif sys.platform.find('haiku') != -1: -+ return 'haiku' - else: - return 'posix' - elif os.name == 'os2': -diff -Naur scons-2.0.1/engine/SCons/Platform/haiku.py scons-2.0.1-haiku/engine/SCons/Platform/haiku.py ---- scons-2.0.1/engine/SCons/Platform/haiku.py 1970-01-01 00:00:00.000000000 +0000 -+++ scons-2.0.1-haiku/engine/SCons/Platform/haiku.py 2011-07-26 22:13:19.692584448 +0000 -@@ -0,0 +1,54 @@ -+"""SCons.Platform.haiku -+ -+Platform-specific initialization for Haiku systems. -+ -+There normally shouldn't be any need to import this module directly. It -+will usually be imported through the generic SCons.Platform.Platform() -+selection method. -+""" -+ -+# -+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation -+# -+# Permission is hereby granted, free of charge, to any person obtaining -+# a copy of this software and associated documentation files (the -+# "Software"), to deal in the Software without restriction, including -+# without limitation the rights to use, copy, modify, merge, publish, -+# distribute, sublicense, and/or sell copies of the Software, and to -+# permit persons to whom the Software is furnished to do so, subject to -+# the following conditions: -+# -+# The above copyright notice and this permission notice shall be included -+# in all copies or substantial portions of the Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+# -+ -+__revision__ = "" -+ -+import posix -+import commands -+ -+def findDir( identifier ): -+ return commands.getoutput( 'finddir %s' % identifier ) -+ -+def generate(env): -+ posix.generate(env) -+ -+ # path list -+ listPath = [ '.' ] -+ listPath.append( '%s/bin' % findDir( 'B_USER_CONFIG_DIRECTORY' ) ) -+ listPath.append( findDir( 'B_COMMON_BIN_DIRECTORY' ) ) -+ listPath.append( findDir( 'B_SYSTEM_BIN_DIRECTORY' ) ) -+ listPath.append( findDir( 'B_BEOS_BIN_DIRECTORY' ) ) -+ listPath.append( '%s/tools/gnupro/bin' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' ) ) -+ env['ENV']['PATH'] = ':'.join( listPath ) -+ -+ # help the linker find the startfiles -+ env['ENV']['BELIBRARIES'] = ':%s/lib/x86' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' ) diff --git a/dev-util/scons/scons-1.0.1.recipe b/dev-util/scons/scons-1.0.1.recipe deleted file mode 100644 index 53279673d..000000000 --- a/dev-util/scons/scons-1.0.1.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="Open Source next-generation build tool." -HOMEPAGE="http://www.scons.org/" -LICENSE="MIT" -COPYRIGHT="2001-2008 The SCons Foundation" -SRC_URI="http://ovh.dl.sourceforge.net/sourceforge/scons/scons-1.0.1.tar.gz" -CHECKSUM_MD5="139ef2e108789afe25ee0bdbb138b8c0" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-lang/python >= 2.5.4" -BUILD() -{ - cd scons-1.0.1 - python setup.py build -} - -INSTALL() -{ - cd scons-1.0.1 - if [ ! -z ${DESTDIR} ];then - python setup.py install --root="${DESTDIR}" --prefix="/boot/common" --symlink-scons --standard-lib - else - python setup.py install --prefix="/boot/common" --symlink-scons --standard-lib - fi -} diff --git a/dev-util/scons/scons-1.0.1_python2.5 b/dev-util/scons/scons-1.0.1_python2.5 deleted file mode 100644 index 35267247e..000000000 --- a/dev-util/scons/scons-1.0.1_python2.5 +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="Open Source next-generation build tool." -HOMEPAGE="http://www.scons.org/" -LICENSE="MIT" -COPYRIGHT="2001-2008 The SCons Foundation" -SRC_URI="http://ovh.dl.sourceforge.net/sourceforge/scons/scons-1.0.1.tar.gz" -CHECKSUM_MD5="139ef2e108789afe25ee0bdbb138b8c0" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-lang/python <= 2.5.5" -BUILD() -{ - cd scons-1.0.1 - python2.5 setup.py build -} - -INSTALL() -{ - cd scons-1.0.1 - if [ ! -z ${DESTDIR} ];then - python2.5 setup.py install --root="${DESTDIR}" --prefix="/boot/common" --symlink-scons --standard-lib - else - python2.5 setup.py install --prefix="/boot/common" --symlink-scons --standard-lib - fi -} diff --git a/dev-util/scons/scons-2.0.1.recipe b/dev-util/scons/scons-2.0.1.recipe deleted file mode 100644 index b6c6f8453..000000000 --- a/dev-util/scons/scons-2.0.1.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="Open Source next-generation build tool." -HOMEPAGE="http://www.scons.org/" -LICENSE="MIT" -COPYRIGHT="2001-2010 The SCons Foundation" -SRC_URI="http://ovh.dl.sourceforge.net/sourceforge/scons/scons-2.0.1.tar.gz" -CHECKSUM_MD5="beca648b894cdbf85383fffc79516d18" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="dev-lang/python >= 2.5.4" -BUILD() -{ - cd scons-2.0.1 - for f in "script/scons script/scons-time script/sconsign"; do - sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f - done - python setup.py build -} - -INSTALL() -{ - if [ ! -z ${DESTDIR} ]; then - options="${options} --root=${DESTDIR}" - fi - options="${options} --prefix=`finddir B_COMMON_DIRECTORY`" - options="${options} --install-data=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`" - options="${options} --symlink-scons" - options="${options} --standard-lib" - cd scons-2.0.1 - python setup.py install $options -} From f2c6d0edc032cceeb4bec069b8537943b6d308e1 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 10 Aug 2013 01:31:59 +0200 Subject: [PATCH 375/587] libxml2: build python module as well --- dev-libs/libxml2/libxml2-2.8.0.recipe | 94 ++++++++++--- dev-libs/libxml2/patches/libxml2-2.8.0.patch | 49 ------- .../libxml2/patches/libxml2-2.8.0.patchset | 125 ++++++++++++++++++ 3 files changed, 204 insertions(+), 64 deletions(-) delete mode 100644 dev-libs/libxml2/patches/libxml2-2.8.0.patch create mode 100644 dev-libs/libxml2/patches/libxml2-2.8.0.patchset diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe index 0272327e2..e7a57b02d 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.recipe +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -4,11 +4,17 @@ LICENSE="MIT" COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz" CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="libxml2-2.8.0.patch" +PATCHES="libxml2-2.8.0.patchset" + +# build the python module only for the primary architecture +pythonModuleEnabled=false +if [ -z "$secondaryArchSuffix" ]; then + pythonModuleEnabled=true +fi PROVIDES=" libxml2$secondaryArchSuffix = $portVersion compat >= 2 @@ -28,6 +34,14 @@ REQUIRES=" BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " +if $pythonModuleEnabled; then + BUILD_REQUIRES="$BUILD_REQUIRES + python + " + # Note: We don't use "cmd:python" here to avoid issues with the + # python search path. +fi + BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal @@ -37,6 +51,7 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make + cmd:sed " PATCH() @@ -54,15 +69,39 @@ BUILD() aclocal autoconf automake + + withPython= + if $pythonModuleEnabled; then + # We symlink python's directories into our packaging directory and tell + # configure that it can find python there. This way the correct + # installation directory for the python module is determined. + pythonDir="$portPackageLinksDir/python" + ln -s $pythonDir/bin $pythonDir/develop $pythonDir/lib $prefix + withPython="--with-python=$prefix" + fi + runConfigure ./configure LDFLAGS="-lnetwork" \ --with-html-dir=$docDir/html \ - --with-html-subdir="" + --with-html-subdir="" \ + $withPython make $jobArgs } INSTALL() { - make install + if $pythonModuleEnabled; then + # Unfortunately we can't just remove the in symlinks we created in + # BUILD() and install normally, since then make detects that the + # Python.h is missing and tries to rebuild the module. So we leave + # things as is and use DESTDIR to install the everything in a subdir. + # Then we remove the symlinks and move everything where it belongs. + make DESTDIR=$prefix install + rm -f $prefix/bin $prefix/develop $prefix/lib + mv $prefix/$prefix/* $prefix + rm -r $prefix/packages + else + make install + fi # prepare develop/lib prepareInstalledDevelLibs libxml2 @@ -70,6 +109,13 @@ INSTALL() mv $libDir/xml2Conf.sh $developLibDir/ fixDevelopLibDirReferences $developLibDir/xml2Conf.sh $binDir/xml2-config + # python package + if $pythonModuleEnabled; then + packageEntries python \ + $libDir/python* \ + ${docDir}_python* + fi + # devel package packageEntries devel \ $binDir/xml2-config \ @@ -83,6 +129,9 @@ INSTALL() if [ -n "$secondaryArchSuffix" ]; then rm -rf $binDir rm -rf $documentationDir + else + # left-over since all contents has been moved to other packages + rmdir $(dirname $docDir) fi } @@ -91,6 +140,32 @@ TEST() make tests } +# ----- devel package --------------------------------------------------------- + +PROVIDES_devel=" + libxml2${secondaryArchSuffix}_devel = $portVersion + cmd:xml2_config$secondaryArchSuffix = $portVersion compat >= 2 + devel:libxml2$secondaryArchSuffix = $portVersion compat >= 2 + " +REQUIRES_devel=" + libxml2$secondaryArchSuffix == $portVersion base + " + +# ----- python package ------------------------------------------------------- + +if $pythonModuleEnabled; then + SUMMARY_python="The python module for libxml2" + PROVIDES_python=" + libxml2_python = $portVersion + " + REQUIRES_python=" + libxml2 == $portVersion base + cmd:python + " +fi + +# ----- DESCRIPTION ----------------------------------------------------------- + DESCRIPTION=" Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform), it is free software available @@ -144,14 +219,3 @@ DESCRIPTION=" on but it would be far too early to make any conformance statement about it at the moment. " - -# ----- devel package ------------------------------------------------------- - -PROVIDES_devel=" - libxml2${secondaryArchSuffix}_devel = $portVersion - cmd:xml2_config$secondaryArchSuffix = $portVersion compat >= 2 - devel:libxml2$secondaryArchSuffix = $portVersion compat >= 2 - " -REQUIRES_devel=" - libxml2$secondaryArchSuffix == $portVersion base - " diff --git a/dev-libs/libxml2/patches/libxml2-2.8.0.patch b/dev-libs/libxml2/patches/libxml2-2.8.0.patch deleted file mode 100644 index 146abcb7f..000000000 --- a/dev-libs/libxml2/patches/libxml2-2.8.0.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ur libxml2-2.8.0.orig/configure.in libxml2-2.8.0/configure.in ---- libxml2-2.8.0.orig/configure.in 2012-05-23 10:33:55.027787264 +0200 -+++ libxml2-2.8.0/configure.in 2013-04-26 13:50:43.429391872 +0200 -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. - AC_PREREQ(2.59) - AC_INIT(entities.c) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_CONFIG_MACRO_DIR([m4]) - AC_CANONICAL_HOST - -diff -ur libxml2-2.8.0.orig/Makefile.am libxml2-2.8.0/Makefile.am ---- libxml2-2.8.0.orig/Makefile.am 2012-05-23 10:56:18.030932992 +0200 -+++ libxml2-2.8.0/Makefile.am 2013-04-26 13:50:43.432537600 +0200 -@@ -1208,8 +1208,8 @@ - # - # Install the tests program sources as examples - # --BASE_DIR=$(datadir)/doc --DOC_MODULE=libxml2-$(VERSION) -+BASE_DIR=$(docdir) -+DOC_MODULE= - EXAMPLES_DIR=$(BASE_DIR)/$(DOC_MODULE)/examples - - install-data-local: -diff -ur orig/libxml2-2.8.0/xml2-config.in libxml2-2.8.0/xml2-config.in ---- orig/libxml2-2.8.0/xml2-config.in 2009-07-30 17:24:35.050855936 +0200 -+++ libxml2-2.8.0/xml2-config.in 2013-04-30 18:29:36.158072832 +0200 -@@ -40,8 +40,8 @@ - case "$1" in - --prefix=*) - prefix=$optarg -- includedir=$prefix/include -- libdir=$prefix/lib -+ includedir=$prefix/develop/headers -+ libdir=$prefix/develop/lib - ;; - - --prefix) -@@ -50,7 +50,7 @@ - - --exec-prefix=*) - exec_prefix=$optarg -- libdir=$exec_prefix/lib -+ libdir=$exec_prefix/develop/lib - ;; - - --exec-prefix) diff --git a/dev-libs/libxml2/patches/libxml2-2.8.0.patchset b/dev-libs/libxml2/patches/libxml2-2.8.0.patchset new file mode 100644 index 000000000..d01d3ef3b --- /dev/null +++ b/dev-libs/libxml2/patches/libxml2-2.8.0.patchset @@ -0,0 +1,125 @@ +From 847ae3527f9a7c10bbb81a299c0779bdedaa078b Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Fri, 9 Aug 2013 03:04:24 +0200 +Subject: applying patch libxml2-2.8.0.patch + + +diff --git a/Makefile.am b/Makefile.am +index f82cefa..c4464a6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1208,8 +1208,8 @@ pkgconfig_DATA = libxml-2.0.pc + # + # Install the tests program sources as examples + # +-BASE_DIR=$(datadir)/doc +-DOC_MODULE=libxml2-$(VERSION) ++BASE_DIR=$(docdir) ++DOC_MODULE= + EXAMPLES_DIR=$(BASE_DIR)/$(DOC_MODULE)/examples + + install-data-local: +diff --git a/configure.in b/configure.in +index 0fb4983..a5f86ca 100644 +--- a/configure.in ++++ b/configure.in +@@ -1,7 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + AC_PREREQ(2.59) + AC_INIT(entities.c) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_HOST + +diff --git a/xml2-config.in b/xml2-config.in +index 2989325..162d348 100644 +--- a/xml2-config.in ++++ b/xml2-config.in +@@ -40,8 +40,8 @@ while test $# -gt 0; do + case "$1" in + --prefix=*) + prefix=$optarg +- includedir=$prefix/include +- libdir=$prefix/lib ++ includedir=$prefix/develop/headers ++ libdir=$prefix/develop/lib + ;; + + --prefix) +@@ -50,7 +50,7 @@ while test $# -gt 0; do + + --exec-prefix=*) + exec_prefix=$optarg +- libdir=$exec_prefix/lib ++ libdir=$exec_prefix/develop/lib + ;; + + --exec-prefix) +-- +1.7.10.2 + + +From 6a3fd0a71df7e9f9207cc44dab2abd77822939fa Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Fri, 9 Aug 2013 20:15:20 +0200 +Subject: configure.in: hack to find python directories on Haiku + +configure should really just ask python-config instead of searching +the stuff itself. + +diff --git a/configure.in b/configure.in +index a5f86ca..ade0cf8 100644 +--- a/configure.in ++++ b/configure.in +@@ -766,11 +766,11 @@ if test "$with_python" != "no" ; then + fi + if test "$PYTHON_VERSION" != "" + then +- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \ ++ if test -r $with_python/develop/headers/python$PYTHON_VERSION/Python.h -a \ + -d $with_python/lib/python$PYTHON_VERSION/site-packages + then +- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION +- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages ++ PYTHON_INCLUDES=$with_python/develop/headers/python$PYTHON_VERSION ++ PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages + else + if test -r $prefix/include/python$PYTHON_VERSION/Python.h + then +-- +1.7.10.2 + + +From 76ec01677cdf7b754497320bca5587c423d0bf65 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Fri, 9 Aug 2013 23:00:24 +0200 +Subject: python[/tests]/Makefile.am: $(datadir)/doc -> $(docdir) + + +diff --git a/python/Makefile.am b/python/Makefile.am +index 68d2236..3bad10f 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -9,7 +9,7 @@ INCLUDES = \ + -I$(top_builddir)/include \ + -I$(top_builddir)/$(subdir) + +-docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION) ++docsdir = $(docdir)_python-$(LIBXML_VERSION) + # libxml2class.txt is generated + dist_docs_DATA = TODO + +diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am +index 52c89fc..7549db9 100644 +--- a/python/tests/Makefile.am ++++ b/python/tests/Makefile.am +@@ -1,4 +1,4 @@ +-exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples ++exampledir = $(docdir)_python-$(LIBXML_VERSION)/examples + dist_example_DATA = $(PYTESTS) $(XMLS) + + PYTESTS= \ +-- +1.7.10.2 + From 205dd4645d2b466845ec93790bd5c3ce78ce2c33 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 10 Aug 2013 02:23:55 +0200 Subject: [PATCH 376/587] mesa-9.1.1: convert recipe to an actual recipe --- sys-libs/mesa/mesa-9.1.1.recipe | 118 ++++++++++++++++++++++++++------ 1 file changed, 96 insertions(+), 22 deletions(-) diff --git a/sys-libs/mesa/mesa-9.1.1.recipe b/sys-libs/mesa/mesa-9.1.1.recipe index 9e18d55ac..400a824d9 100644 --- a/sys-libs/mesa/mesa-9.1.1.recipe +++ b/sys-libs/mesa/mesa-9.1.1.recipe @@ -1,29 +1,103 @@ -############################################################### -# THIS IS NOT FOR GENERAL USE! -# This builds a buildpackage for the Haiku build system to link -# the OpenGL kit!! -############################################################### +# NOTE: This recipe doesn't generate packages for general use: +# * mesa_devel: Is a service package for the Haiku build system. It contains the +# Mesa libraries and headers, which are built into the Haiku system package. +# * mesa: Is an empty package which we keep as a dependency for the Haiku system +# package, mainly to keep the copyright info. -DESCRIPTION="Mesa3D is a multi-platform GL implementation" -HOMEPAGE="http://www.freedesktop.org/" +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." +HOMEPAGE="http://www.mesa3d.org/" +COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." +LICENSE="MIT" SRC_URI="ftp://freedesktop.org/pub/mesa/9.1.1/MesaLib-9.1.1.tar.bz2" -REVISION="1" -STATUS_HAIKU="unstable" -DEPEND="scons, llvm >= 3.2" CHECKSUM_MD5="6ea2bdc3b7ecfb4257b39814b4182580" -MESSAGE="This port only builds with gcc4. Not for general use." +REVISION="1" +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 +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + mesa$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + libxml2_python + cmd:bison + cmd:find + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:scons + cmd:sed + " +# TODO: Add LLVM, so llvmpipe can be built! + +SOURCE_DIR="Mesa-$portVersion" + BUILD() { - export DEBUG=0 - echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" - echo "This generates a Mesa3D build package for Haiku... not for general use" - echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" - cd Mesa-9.1.1 - scons debug=$DEBUG - cd .. - sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.1.1 ./Mesa-9.1.1 - echo "There should be a Mesa OptionalBuild package in your home if everything went well!" + if [ -n "$secondaryArchSuffix" ]; then + export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture" + fi + scons $jobArgs build=release } -LICENSE="MIT" -COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." +INSTALL() +{ + mesaBuildDir=build/haiku-$effectiveTargetArchitecture + + mkdir -p $includeDir + cp -r include/* $includeDir + + mkdir -p $developLibDir + cp $(find $mesaBuildDir -name '*\.a') $developLibDir + strip --strip-debug $developLibDir/* + + mesaPrivateHeaders=$includeDir/mesa_private + for header in $(find src -name '*\.h' | sed "s,^src/,,"); do + mkdir -p $mesaPrivateHeaders/$(dirname $header) + cp src/$header $mesaPrivateHeaders/$header + done + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + mesa${secondaryArchSuffix}_devel = $portVersion + devel:libgalahad$secondaryArchSuffix = $portVersion + devel:libgallium$secondaryArchSuffix = $portVersion + devel:libglapi$secondaryArchSuffix = $portVersion + devel:libglsl$secondaryArchSuffix = $portVersion + devel:libi915$secondaryArchSuffix = $portVersion + devel:libi915sw$secondaryArchSuffix = $portVersion + devel:libidentity$secondaryArchSuffix = $portVersion + devel:libmesa$secondaryArchSuffix = $portVersion + devel:librbug$secondaryArchSuffix = $portVersion + devel:libsoftpipe$secondaryArchSuffix = $portVersion + devel:libst_vega$secondaryArchSuffix = $portVersion + devel:libsvga$secondaryArchSuffix = $portVersion + devel:libtrace$secondaryArchSuffix = $portVersion + devel:libws_null$secondaryArchSuffix = $portVersion + devel:libws_wrapper$secondaryArchSuffix = $portVersion + " + +REQUIRES_devel=" + mesa$secondaryArchSuffix == $portVersion base + " From 83df273c2ffc3ccc35dff836956fd05903e37fb0 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 10 Aug 2013 02:24:42 +0200 Subject: [PATCH 377/587] glu: support building for secondary architecture Also adjust the build somewhat: Since a libGL is required, but libGL itself is built (by Haiku's build system) linking against libGLU, we now require the mesa_devel package and build a dummy libGL from its libglapi first. --- sys-libs/glu/glu-9.0.0.recipe | 40 ++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe index cf3384853..c83e4fcec 100644 --- a/sys-libs/glu/glu-9.0.0.recipe +++ b/sys-libs/glu/glu-9.0.0.recipe @@ -5,31 +5,38 @@ 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="1" -ARCHITECTURES="x86_gcc2 !x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - glu = $portVersion - lib:libGLU = 1.3.1 compat >= 1 + glu$secondaryArchSuffix = $portVersion + lib:libGLU$secondaryArchSuffix = 1.3.1 compat >= 1 " REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" + devel:libglapi$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:ld + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make cmd:sed " -SOURCE_DIR="$portVersionedName" - BUILD() { - runConfigure ./configure + # 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 } @@ -40,6 +47,10 @@ INSTALL() prepareInstalledDevelLibs libGLU fixPkgconfig + # Remove the additional LDFLAGS from libGLU.la + sed -i "s,^dependency_libs=.*,dependency_libs=' -lGL'," \ + $developLibDir/libGLU.la + # devel package packageEntries devel \ $developDir @@ -47,11 +58,10 @@ INSTALL() # ----- devel package ------------------------------------------------------- -SUMMARY_devel="The glu development files" PROVIDES_devel=" - glu_devel = $portVersion - devel:libGLU = 1.3.1 compat >= 1 + glu${secondaryArchSuffix}_devel = $portVersion + devel:libGLU$secondaryArchSuffix = 1.3.1 compat >= 1 " REQUIRES_devel=" - glu == $portVersion base + glu$secondaryArchSuffix == $portVersion base " From 8bea1430a768fdff070d6f0be3be34c797bbc4ca Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 10 Aug 2013 07:14:38 +0200 Subject: [PATCH 378/587] gperf: make recipe an actual recipe --- dev-util/gperf/gperf-3.0.4.recipe | 47 +++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/dev-util/gperf/gperf-3.0.4.recipe b/dev-util/gperf/gperf-3.0.4.recipe index 7a197d14c..0e96a667d 100644 --- a/dev-util/gperf/gperf-3.0.4.recipe +++ b/dev-util/gperf/gperf-3.0.4.recipe @@ -1,26 +1,43 @@ -DESCRIPTION="gperf" +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" HOMEPAGE="http://www.gnu.org/software/gperf/" +COPYRIGHT="1989-1998, 2000-2004, 2006-2009 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="c1f1db32fb6598d6a93e6e88796a8632" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="gperf-3.0.4.patch" + +PROVIDES=" + gperf = $portVersion compat >= 3 + cmd:gperf = $portVersion compat >= 3 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + " + BUILD() { - cd gperf-3.0.4 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --docdir=$COMMON_DOCS/doc/gperf \ - --infodir=$COMMON_DOCS/info \ - --mandir=$COMMON_DOCS/man - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd gperf-3.0.4 make install } - -LICENSE="GNU GPL v3" -COPYRIGHT="1989-1998, 2000-2004, 2006-2009 Free Software Foundation, Inc." From 5d1de7c96df7e35018649967028f40af8038bd94 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 10 Aug 2013 07:52:30 +0200 Subject: [PATCH 379/587] Add recipe for haikuwebkit --- .../haikuwebkit-1.1.3_2013_08_09.recipe | 137 ++++++++++++++++++ haiku-libs/haikuwebkit/licenses/WebKit Apple | 21 +++ .../haikuwebkit_x86-1.1.3_2013_08_09.patchset | 112 ++++++++++++++ 3 files changed, 270 insertions(+) create mode 100644 haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe create mode 100644 haiku-libs/haikuwebkit/licenses/WebKit Apple create mode 100644 haiku-libs/haikuwebkit/patches/haikuwebkit_x86-1.1.3_2013_08_09.patchset 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 new file mode 100644 index 000000000..ee382b638 --- /dev/null +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe @@ -0,0 +1,137 @@ +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 + WebKit Apple + MIT + " +SRC_URI="http://www.haiku-files.org/files/haiku-webkit-lastgood-no-tests-2013-08-09.tar.bz2" +CHECKSUM_MD5="a6551b2573612678e9d2d27fda4fae48" +REVISION="1" +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 +SECONDARY_ARCHITECTURES="x86" + +# version info -- usually derived from the git repository +webkitRevision=r115944 +haikuWebkitRevision=de778f7 + +PROVIDES=" + haikuwebkit$secondaryArchSuffix = $portVersion + lib:libjavascriptcore$secondaryArchSuffix = $portVersion + lib:libwebcore$secondaryArchSuffix = $portVersion + lib:libwebkit$secondaryArchSuffix = $portVersion + lib:libwtf$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + icu$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libsqlite3$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + icu${secondaryArchSuffix}_devel + devel:libcurl$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libsqlite3$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:bison + cmd:gcc$secondaryArchSuffix + cmd:gperf + cmd:jam + cmd:ld$secondaryArchSuffix + cmd:m4 + cmd:make + cmd:perl + cmd:python + " + +SOURCE_DIR="haiku-webkit-lastgood" + +BUILD() +{ + export WEBKIT_REVISION=$webkitRevision + export HAIKU_WEBKIT_REVISION=$haikuWebkitRevision + + libxml2Dir=$portPackageLinksDir/devel:libxml2$secondaryArchSuffix + libxml2Includes=$libxml2Dir/$relativeIncludeDir/libxml2 + compileFlags="-sCCFLAGS=-I$libxml2Includes -sC++FLAGS=-I$libxml2Includes" + + cd Source/JavaScriptCore + ./make-generated-sources.sh + NDEBUG=1 jam -q $jobArgs $compileFlags libjavascriptcore.so + + cd ../../Source/WebCore + ./make-generated-sources.sh + NDEBUG=1 jam -q $jobArgs $compileFlags libwebkit.so +} + +INSTALL() +{ + # collect the libraries + local libraries=" + libjavascriptcore + libwebcore + libwebkit + libwtf + " + mkdir -p $libDir + local library + for library in $libraries; do + cp generated/release/${library}.so $libDir + done + + # collect the headers + local headers=" + WebWindow.h + WebViewConstants.h + WebView.h + WebSettings.h + WebPage.h + WebKitInfo.h + WebFrame.h + WebDownload.h + NetworkCookieJar.h + NetworkCookie.h + " + mkdir -p $includeDir + local header + for header in $headers; do + cp Source/WebKit/haiku/API/$header $includeDir + done + + prepareInstalledDevelLibs $libraries + + # 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 + " diff --git a/haiku-libs/haikuwebkit/licenses/WebKit Apple b/haiku-libs/haikuwebkit/licenses/WebKit Apple new file mode 100644 index 000000000..f29b41c3b --- /dev/null +++ b/haiku-libs/haikuwebkit/licenses/WebKit Apple @@ -0,0 +1,21 @@ +Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. 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. + +THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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. diff --git a/haiku-libs/haikuwebkit/patches/haikuwebkit_x86-1.1.3_2013_08_09.patchset b/haiku-libs/haikuwebkit/patches/haikuwebkit_x86-1.1.3_2013_08_09.patchset new file mode 100644 index 000000000..2f56e1b92 --- /dev/null +++ b/haiku-libs/haikuwebkit/patches/haikuwebkit_x86-1.1.3_2013_08_09.patchset @@ -0,0 +1,112 @@ +From 542b92ebe5085880dbcc8903639e2f4f81e6e93d Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sat, 10 Aug 2013 07:01:25 +0200 +Subject: Jamfile: Remove Install rule invocations + +Automatically installing stuff in /boot/home/config isn't desirable. + +diff --git a/Jamfile b/Jamfile +index c2e412f..cff37a3 100644 +--- a/Jamfile ++++ b/Jamfile +@@ -11,25 +11,3 @@ SubInclude TOP Source WebCore ; + SubInclude TOP Source WebKit ; + SubInclude TOP Source WebKit haiku HaikuLauncher ; + SubInclude TOP Tools DumpRenderTree ; +- +-#----------------------------------------------------------------------------- +-# Installation rules +-#----------------------------------------------------------------------------- +- +-Install WTF : +- libwtf.so +-; +- +-Install JavaScriptCore : +- libjavascriptcore.so +- jsc +-; +- +-Install WebCore : +- libwebcore.so +-; +- +-Install WebKit : +- libwebkit.so +- HaikuLauncher +-; +-- +1.7.10.2 + + +From 805441db575c8303ddba5688911b66594fff922d Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Sat, 10 Aug 2013 07:04:09 +0200 +Subject: generate-build-info.sh: make optionally work outside git repo + +If the build variables WEBKIT_REVISION and HAIKU_WEBKIT_REVISION are +set, the script will use the value of those instead of trying to pull +the info from the git repository. + +diff --git a/Tools/haiku/build/MainBuildRules b/Tools/haiku/build/MainBuildRules +index 9304fae..026da44 100644 +--- a/Tools/haiku/build/MainBuildRules ++++ b/Tools/haiku/build/MainBuildRules +@@ -298,5 +298,6 @@ rule CreateBuildInfoFile target + + actions CreateBuildInfoFile + { +- $(TOP)/Tools/haiku/generate-build-info.sh > $(1) ; ++ $(TOP)/Tools/haiku/generate-build-info.sh $(TOP) \ ++ $(WEBKIT_REVISION) $(HAIKU_WEBKIT_REVISION) > $(1) ; + } +diff --git a/Tools/haiku/generate-build-info.sh b/Tools/haiku/generate-build-info.sh +index b870ca4..2bedf4f 100755 +--- a/Tools/haiku/generate-build-info.sh ++++ b/Tools/haiku/generate-build-info.sh +@@ -5,15 +5,24 @@ + # Distributed under the terms of the MIT License. + # + +-CURENT_HASH=`git log --pretty=format:'%h' -n 1` ++# Usage: generate-build-info.sh ++# [ ] + +-MERGE_HASH=`git log --pretty=format:'%H' --date-order --merges -n 1` +-REV_1=`git log $MERGE_HASH^1 -n 1 | perl -nle '/webkit\.org.+trunk@(\d+)/ and print $1'` +-REV_2=`git log $MERGE_HASH^2 -n 1 | perl -nle '/webkit\.org.+trunk@(\d+)/ and print $1'` ++ ++if [ $# -gt 2 ]; then ++ WEBKIT_REVISION=$2 ++ HAIKU_WEBKIT_REVISION=$3 ++else ++ MERGE_HASH=`git log --pretty=format:'%H' --date-order --merges -n 1` ++ REV_1=`git log $MERGE_HASH^1 -n 1 | perl -nle '/webkit\.org.+trunk@(\d+)/ and print $1'` ++ REV_2=`git log $MERGE_HASH^2 -n 1 | perl -nle '/webkit\.org.+trunk@(\d+)/ and print $1'` ++ WEBKIT_REVISION=r$REV_1$REV_2 ++ HAIKU_WEBKIT_REVISION=`git log --pretty=format:'%h' -n 1` ++fi + + HAIKU_WEBKIT_VERSION=1.1 + +-TOP=`git rev-parse --show-toplevel` ++TOP="$1" + WEBKIT_MAJOR=`cat $TOP/Source/WebKit/mac/Configurations/Version.xcconfig | perl -nle '/MAJOR_VERSION = (\d+);/ and print $1'` + WEBKIT_MINOR=`cat $TOP/Source/WebKit/mac/Configurations/Version.xcconfig | perl -nle '/MINOR_VERSION = (\d+);/ and print $1'` + +@@ -23,10 +32,10 @@ echo '/* + #ifndef BuildInfo_h + #define BuildInfo_h + +-#define HAIKU_WEBKIT_REVISION "'$CURENT_HASH'" ++#define HAIKU_WEBKIT_REVISION "'$HAIKU_WEBKIT_REVISION'" + #define HAIKU_WEBKIT_VERSION "'$HAIKU_WEBKIT_VERSION'" + +-#define WEBKIT_REVISION "r'$REV_1$REV_2'" ++#define WEBKIT_REVISION "'$WEBKIT_REVISION'" + #define WEBKIT_MAJOR_VERSION '$WEBKIT_MAJOR' + #define WEBKIT_MINOR_VERSION '$WEBKIT_MINOR' + +-- +1.7.10.2 + From 9d7ff7128603973424416a2fe8711d132ce4f22e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 10 Aug 2013 12:12:53 +0200 Subject: [PATCH 380/587] xz_utils-5.0.4: convert recipe to an actual recipe --- app-arch/xz_utils/xz_utils-5.0.4.recipe | 107 ++++++++++++++++++++---- 1 file changed, 89 insertions(+), 18 deletions(-) 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 987591dd8..00163c4b7 100644 --- a/app-arch/xz_utils/xz_utils-5.0.4.recipe +++ b/app-arch/xz_utils/xz_utils-5.0.4.recipe @@ -1,37 +1,108 @@ -DESCRIPTION="XZ Utils is data compression software for working with LZMA compressed files." +SUMMARY="Free general-purpose data compression software" HOMEPAGE="http://tukaani.org/xz/" SRC_URI="http://tukaani.org/xz/xz-5.0.4.tar.bz2" CHECKSUM_MD5="741cd3a5f64b23b7bac56ec5b2258715" +LICENSE=" + GNU LGPL v2.1 + GNU GPL v2 + GNU GPL v3 + " +COPYRIGHT="2005-2012 Lasse Collin" REVISION="1" -STATUS_HAIKU="stable" -MESSAGE="This port only builds with gcc4." -DEPEND="" +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" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +# On x86_gcc2 we don't want to install the commands in bin//, but in bin/. +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + +PROVIDES=" + xz_utils$secondaryArchSuffix = $portVersion compat >= 5 + cmd:lzcat$commandSuffix = $portVersion compat >= 5 + cmd:lzcmp$commandSuffix = $portVersion compat >= 5 + cmd:lzdiff$commandSuffix = $portVersion compat >= 5 + cmd:lzegrep$commandSuffix = $portVersion compat >= 5 + cmd:lzfgrep$commandSuffix = $portVersion compat >= 5 + cmd:lzgrep$commandSuffix = $portVersion compat >= 5 + cmd:lzless$commandSuffix = $portVersion compat >= 5 + cmd:lzma$commandSuffix = $portVersion compat >= 5 + cmd:lzmadec$commandSuffix = $portVersion compat >= 5 + cmd:lzmainfo$commandSuffix = $portVersion compat >= 5 + cmd:lzmore$commandSuffix = $portVersion compat >= 5 + cmd:unlzma$commandSuffix = $portVersion compat >= 5 + cmd:unxz$commandSuffix = $portVersion compat >= 5 + cmd:xz$commandSuffix = $portVersion compat >= 5 + cmd:xzcat$commandSuffix = $portVersion compat >= 5 + cmd:xzcmp$commandSuffix = $portVersion compat >= 5 + cmd:xzdec$commandSuffix = $portVersion compat >= 5 + cmd:xzdiff$commandSuffix = $portVersion compat >= 5 + cmd:xzegrep$commandSuffix = $portVersion compat >= 5 + cmd:xzfgrep$commandSuffix = $portVersion compat >= 5 + cmd:xzgrep$commandSuffix = $portVersion compat >= 5 + cmd:xzless$commandSuffix = $portVersion compat >= 5 + cmd:xzmore$commandSuffix = $portVersion compat >= 5 + lib:liblzma$secondaryArchSuffix = $portVersion compat >= 5 + devel:liblzma$secondaryArchSuffix = $portVersion compat >= 5 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="xz-$portVersion" + BUILD() { - cd xz-5.0.4 touch po/t-cs.gmo - libtoolize --force --copy --install - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --docdir=$COMMON_DOCS/doc/xz \ - --mandir=$COMMON_DOCS/man \ - --localedir=`finddir B_COMMON_DATA_DIRECTORY`/locale - make + runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir + make $jobArgs } INSTALL() { - cd xz-5.0.4 make install + + expanderRulesDir=$dataDir/expander/rules + mkdir -p $expanderRulesDir + cp "$portDir/sources/xz_utils-expander-rules" "$expanderRulesDir/xz_utils" + + prepareInstalledDevelLibs liblzma } TEST() { - cd xz-5.0.4 make check } -LICENSE="GNU LGPL v2.1 - GNU GPL v2 - GNU GPL v3" -COPYRIGHT="2005-2012 Lasse Collin" +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." From e554a19c517b09b1773a4e5f83b39fbab34c7129 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 11 Aug 2013 18:48:51 +0200 Subject: [PATCH 381/587] binutils/gcc 2: change directory layout * The files are no longer installed in a separate develop/tools subdirectory for binutils and one for gcc. Instead we install directly in develop/tools[/]. This allows gcc to find gas and ld via its built-in search instead of via PATH only. In a hybrid setup this makes a difference, when the gcc that is not the first in PATH is invoked directly (e.g. via absolute path). * Add support for building for the secondary architecture. Not tested yet. --- .../binutils/binutils-2.17_2013_04_21.recipe | 105 +++++++++--------- sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe | 51 ++++----- 2 files changed, 78 insertions(+), 78 deletions(-) diff --git a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe index 6b24bb4ed..b2db590e1 100644 --- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe +++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe @@ -1,45 +1,49 @@ SUMMARY="The GNU assembler, linker and binary utilities" HOMEPAGE="http://www.gnu.org/software/binutils" SRC_URI="git+git://github.com/haiku/BuildtoolsPM.git#ab0f66e" -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="2" LICENSE=" GNU GPL v2 GNU LGPL v2 " COPYRIGHT="1988-2006 Free Software Foundation, Inc." +ARCHITECTURES="x86_gcc2" +if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ] +then + ARCHITECTURES="$ARCHITECTURES x86" +fi +SECONDARY_ARCHITECTURES="x86_gcc2" + PROVIDES=" - binutils = $portVersion compat >= 2.17 - cmd:addr2line = $portVersion compat >= 2.17 - cmd:ar = $portVersion compat >= 2.17 - cmd:as = $portVersion compat >= 2.17 - cmd:c++filt = $portVersion compat >= 2.17 - cmd:gprof = $portVersion compat >= 2.17 - cmd:ld = $portVersion compat >= 2.17 - cmd:nm = $portVersion compat >= 2.17 - cmd:objcopy = $portVersion compat >= 2.17 - cmd:objdump = $portVersion compat >= 2.17 - cmd:ranlib = $portVersion compat >= 2.17 - cmd:readelf = $portVersion compat >= 2.17 - cmd:size = $portVersion compat >= 2.17 - cmd:strings = $portVersion compat >= 2.17 - cmd:strip = $portVersion compat >= 2.17 - devel:libbfd = $portVersion compat >= 2.17 - devel:libopcodes = $portVersion compat >= 2.17 + binutils$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:addr2line$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:ar$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:as$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:c++filt$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:gprof$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:ld$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:nm$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:objcopy$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:objdump$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:ranlib$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:readelf$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:size$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:strings$secondaryArchSuffix = $portVersion compat >= 2.17 + cmd:strip$secondaryArchSuffix = $portVersion compat >= 2.17 " REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:autoconf cmd:flex - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make cmd:makeinfo cmd:sed @@ -50,11 +54,9 @@ SOURCE_DIR="$portVersionedName/legacy/binutils" BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL binutilsDir=$(pwd) -relativeArchInstallDir="develop/tools/${portVersionedName}" -archInstallDir="$prefix/$relativeArchInstallDir" +relativeInstallDir="develop/tools$secondaryArchSubDir" +installDir="$prefix/$relativeInstallDir" binutilsObjectsDir=$binutilsDir/../binutils-obj -relativeBinutilsDocDir=$relativeDocDir-2.17 -binutilsDocDir=$prefix/$relativeBinutilsDocDir BUILD() { @@ -67,12 +69,11 @@ BUILD() # build binutils mkdir -p $binutilsObjectsDir cd $binutilsObjectsDir - CFLAGS="-O2" CXXFLAGS="-O2" "$binutilsDir/configure" \ - --prefix=$prefix --exec-prefix=$archInstallDir \ - --bindir=$binDir --libdir=$libDir \ + CFLAGS="-O2" CXXFLAGS="-O2" runConfigure --omit-dirs "docDir dataRootDir" \ + "$binutilsDir/configure" \ + --exec-prefix=$installDir \ --includedir=$includeDir/binutils \ - --mandir=$manDir \ - --with-htmldir=$relativeBinutilsDocDir \ + --with-htmldir=$relativeDocDir \ --disable-nls --enable-shared=yes make } @@ -85,15 +86,14 @@ INSTALL() make install make install-html - prepareInstalledDevelLibs libbfd libopcodes - rm $libDir/libiberty.a - # libiberty is only needed for building binutils - rmdir $libDir + # Remove the development libraries and headers. Nobody uses those anyway. + rm -r $libDir + rm -r $developDir/headers ### HTML documentation #################################### echo "Organizing HTML documentation..." - cd $binutilsDocDir + cd $docDir mv as.html as ln -sf as/index.html as.html @@ -105,7 +105,10 @@ INSTALL() ln -sf gprof/index.html gprof.html mv ld.html ld ln -sf ld/index.html ld.html - rm standards.html + rm libiberty.html standards.html + + # no info documentation + rm -r $infoDir ### Strip ################################################# @@ -113,31 +116,27 @@ INSTALL() cd $prefix find bin -type f | xargs -r strip --strip-debug - strip --strip-debug lib/*.a - strip --strip-debug $archInstallDir/$archName/bin/* + strip --strip-debug $installDir/$archName/bin/* ### Symlinks ############################################## echo "Creating required symlinks" - # remove duplicate architecture-dependent binaries from $binDir - cd $binDir - rm ar as ld nm objdump ranlib strip - - # make all tools available via default paths if these are - # the system binutils - if [ $targetArchitecture = 'x86_gcc2' ]; then - echo "Symlinking binaries into default path" - mkdir -p $binDir - ln -sfn ../$relativeArchInstallDir/$archName/bin/* . - fi + # There are copies of a subset of the commands below installDir. We + # overwrite those with symlinks to the ones in binDir. + for file in $installDir/i586-pc-haiku/bin/*; do + symlinkRelative -sfn $binDir/$(basename $file) $file + done ### Cleanup ################################################# echo "Cleanup" - cd $prefix - rm -rf info + # delete man pages for commands that we aren't including + cd $manDir + for cmd in dlltool nlmconv windmc windres; do + rm -f man1/$cmd.1 + done } DESCRIPTION=" diff --git a/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe b/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe index 1401edccf..d95b4638f 100644 --- a/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe +++ b/sys-devel/gcc/gcc-2.95.3_2013_05_04.recipe @@ -10,33 +10,38 @@ SRC_URI=" git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#b1ef802 git+git://github.com/haiku/BuildtoolsPM.git#b1ef802 " -REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2" +if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ] +then + ARCHITECTURES="$ARCHITECTURES x86" +fi +SECONDARY_ARCHITECTURES="x86_gcc2" PROVIDES=" gcc = $portVersion compat >= 2.95.3 - cmd:cc - cmd:c++ = $portVersion compat >= 2.95.3 - cmd:c++filt = $portVersion compat >= 2.95.3 - cmd:cpp = $portVersion compat >= 2.95.3 - cmd:g++ = $portVersion compat >= 2.95.3 - cmd:gcc = $portVersion compat >= 2.95.3 - cmd:gcov = 1.5 compat >= 1.5 - cmd:i586_pc_haiku_gcc = $portVersion compat >= 2.95.3 - cmd:protoize = $portVersion compat >= 2.95.3 - cmd:unprotoize = $portVersion compat >= 2.95.3 + cmd:cc$secondaryArchSuffix + cmd:c++$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:c++filt$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:cpp$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:g++$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:gcc$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:gcov$secondaryArchSuffix = 1.5 compat >= 1.5 + cmd:i586_pc_haiku_gcc$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:protoize$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:unprotoize$secondaryArchSuffix = $portVersion compat >= 2.95.3 " REQUIRES=" - haiku >= $haikuVersion - binutils + haiku$secondaryArchSuffix >= $haikuVersion + binutils$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:autoconf - gcc + gcc$secondaryArchSuffix cmd:flex cmd:make cmd:sed @@ -49,10 +54,9 @@ BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL gccDir=$(pwd) gccDate=$(echo $portVersion | sed 's,.*_,,') -relativeGccInstallDir="develop/tools/gcc-2.95.3_${gccDate}" +relativeGccInstallDir="develop/tools$secondaryArchSubDir" gccInstallDir="$prefix/$relativeGccInstallDir" gccObjectsDir=$gccDir/../gcc-obj -gccDocDir=$docDir-2.95.3 BUILD() { @@ -61,7 +65,7 @@ BUILD() # Touch some files generated by bison, so that bison won't run to update # them. Fixes issues with newer bison versions. # And while at it, touch gperf target, too (as gperf may not be installed). - (cd $gccDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + (cd gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ cp/parse.h c-gperf.h) # build gcc @@ -70,10 +74,7 @@ BUILD() CFLAGS="-O2" CXXFLAGS="-O2" "$gccDir/configure" \ --prefix=$gccInstallDir \ --disable-nls --enable-shared=yes --enable-languages=c,c++ - make bootstrap || true - # The above will fail when compiling builtinbuf.cc, but we can ignore - # that since it's trying to build libstdc++.so, which haiku provides - # anyway. + make bootstrap } INSTALL() @@ -88,7 +89,7 @@ INSTALL() ### HTML documentation #################################### - html_base=$gccDocDir + html_base=$docDir if [ ! -d "$html_base" ]; then echo "Building HTML documentation..." mkdir -p $html_base @@ -120,7 +121,7 @@ INSTALL() if [ $targetArchitecture = 'x86_gcc2' ]; then echo "Symlinking binaries into default path" mkdir -p $prefix/bin - cd $prefix/bin + cd $binDir ln -sfn ../$relativeGccInstallDir/bin/* . fi From bc4b3458b2b4c378954f0c55e0230139e27ebe44 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 11 Aug 2013 19:02:06 +0200 Subject: [PATCH 382/587] Add recipes for binutils/gcc 4 The directory layout has changed similarly to that of the gcc 2 couple, i.e. we install in develop/tools[/] instead of separate subdirectories, so gcc finds the matching gas and ld. Only tested the secondary architecture build so far. --- .../binutils-2.23.2_2013_04_09.recipe | 168 ++++++++++++++++++ sys-devel/gcc/gcc-4.7.3_2013_08_03.recipe | 130 ++++++++++++++ 2 files changed, 298 insertions(+) create mode 100644 sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe create mode 100644 sys-devel/gcc/gcc-4.7.3_2013_08_03.recipe 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 new file mode 100644 index 000000000..a1ae7c4e4 --- /dev/null +++ b/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe @@ -0,0 +1,168 @@ +SUMMARY="Assembler, linker and binary tools for target ${targetMachineTriple}" +HOMEPAGE="http://www.gnu.org/software/binutils" + +SRC_URI=" + git+git://github.com/haiku/BuildtoolsPM.git#db2a6d28f6c6a92cfb1c619b0828dfbf6b87ca30" +REVISION="1" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2013 Free Software Foundation, Inc." + +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 +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + binutils$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:addr2line$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ar$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:as$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:c++filt$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:elfedit$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:gprof$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ld$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ld.bfd$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:nm$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:objcopy$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:objdump$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ranlib$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:readelf$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:size$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:strings$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:strip$secondaryArchSuffix = $portVersion compat >= 2.23 + lib:libbfd_2.23.2$secondaryArchSuffix = $portVersion compat >= 2.23 + lib:libopcodes_2.23.2$secondaryArchSuffix = $portVersion compat >= 2.23 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:makeinfo + cmd:sed + cmd:strip + cmd:tar + " + +SOURCE_DIR="binutils-$portVersion/binutils" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +sourceDir=$(pwd) +relativeInstallDir="develop/tools$secondaryArchSubDir" +installDir="$prefix/$relativeInstallDir" +objectsDir=$(pwd)/../${portVersionedName}-obj + +BUILD() +{ + rm -rf $objectsDir + + # Touch all *.info files, as newer texinfos don't like their format + (cd $sourceDir; find . -name \*.info | xargs touch) + + mkdir -p $objectsDir + cd $objectsDir + + CFLAGS=-O2 CXXFLAGS=-O2 runConfigure "$sourceDir/configure" \ + --exec-prefix=$installDir \ + --includedir=$includeDir/binutils \ + --docdir=$docDir \ + --disable-nls --enable-shared=yes + + make $jobArgs +} + +INSTALL() +{ + cd $objectsDir + + make install + make install-html + + # Remove the development libraries and headers. Nobody uses those anyway. + rm $libDir/*.a $libDir/*.la $libDir/libbfd.so $libDir/libopcodes.so + rm -r $developDir/headers + + ### HTML documentation #################################### + + echo "Organizing HTML documentation..." + cd $docDir + + # beautify HTML docs and remove stuff we don't need + mv as.html as + ln -sf as/index.html as.html + mv bfd.html bfd + ln -sf bfd/index.html bfd.html + mv binutils.html binutils + ln -sf binutils/index.html binutils.html + mv gprof.html gprof + ln -sf gprof/index.html gprof.html + mv ld.html ld + ln -sf ld/index.html ld.html + rm libiberty.html standards.html + + # no info documentation + rm -r $infoDir + + ### Strip ################################################# + + echo "Strip debug info" + + strip --strip-debug $binDir/* + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # There are copies of a subset of the commands below installDir. We + # overwrite those with symlinks to the ones in binDir. + for file in $installDir/$effectiveTargetMachineTriple/bin/*; do + symlinkRelative -sfn $binDir/$(basename $file) $file + done + + ### Cleanup ################################################# + + echo "Cleanup" + + # delete man pages for commands that we aren't including + cd $manDir + for cmd in dlltool nlmconv windmc windres; do + rm -f man1/$cmd.1 + done +} + +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. + " diff --git a/sys-devel/gcc/gcc-4.7.3_2013_08_03.recipe b/sys-devel/gcc/gcc-4.7.3_2013_08_03.recipe new file mode 100644 index 000000000..4edcf9112 --- /dev/null +++ b/sys-devel/gcc/gcc-4.7.3_2013_08_03.recipe @@ -0,0 +1,130 @@ +SUMMARY="C/C++ cross-compiler for target ${effectiveTargetMachineTriple}" +DESCRIPTION="Standard compiler for x86 platform." +HOMEPAGE="http://gcc.gnu.org" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2013 Free Software Foundation, Inc." +SRC_URI=" + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#7a87db2a172a406b79540188a23e52491ad3b741 + git+git://github.com/haiku/BuildtoolsPM.git#7a87db2a172a406b79540188a23e52491ad3b741 + " +REVISION="1" +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 +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + gcc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:c++$secondaryArchSuffix = $portVersion compat >= 4 + cmd:cc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:cpp$secondaryArchSuffix = $portVersion compat >= 4 + cmd:g++$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcc_4.7.3$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcov$secondaryArchSuffix = $portVersion compat >= 4 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:makeinfo + cmd:sed + cmd:strip + cmd:tar + " + +SOURCE_DIR="gcc-$portVersion/gcc" + +sourceDir=$(pwd) +relativeInstallDir="develop/tools$secondaryArchSubDir" +installDir="$prefix/$relativeInstallDir" +objectsDir=$(pwd)/../${portVersionedName}-obj + +BUILD() +{ + rm -rf $objectsDir + + # Touch some files generated by bison, so that bison won't run to update + # them. Fixes issues with newer bison versions. + # And while at it, touch gperf target, too (as gperf may not be installed). + (cd $sourceDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + cp/parse.h c-gperf.h) + + mkdir -p $objectsDir + cd $objectsDir + + local additionalConfigureFlags + if [ -n "$secondaryArchSuffix" ]; then + additionalConfigureFlags="\ + --with-hybrid-secondary=${effectiveTargetArchitecture}" + fi + + CFLAGS="-O2 -U_FORTIFY_SOURCE" CXXFLAGS="-O2" "$sourceDir/configure" \ + --prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \ + --docdir=$docDir \ + --disable-nls --enable-shared \ + --enable-languages=c,c++ --enable-lto --enable-frame-pointer \ + --with-pkgversion=$(echo $portVersion | cut -c 7-) \ + $additionalConfigureFlags + + make $jobArgs +} + +INSTALL() +{ + cd $objectsDir + + make install-strip + make install-html + + ### HTML documentation #################################### + + echo "Organizing HTML documentation..." + cd $docDir + for dir in gmp libquadmath mpc mpfr; do + mv ${dir}.html $dir + ln -s $dir/index.html ${dir}.html + done + + ### Strip ################################################# + + echo "Strip debug info" + + cd $installDir + strip --strip-debug bin/* + for f in cc1 cc1plus collect2 lto1; do + strip --strip-debug lib/gcc/$effectiveTargetMachineTriple/*/$f + done + strip --strip-debug lib/*.a + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # make all tools available via default paths + mkdir -p $binDir + for f in c++ cpp g++ gcc gcov; do + symlinkRelative -sfn $installDir/bin/$f $binDir + done + + ### Cleanup ############################################### + + echo "Cleanup" + rm -rf $installDir/info + rm -rf $installDir/share +} From 6a0a9fe10bd5a0d815b23fd688576f174d315f03 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 10:48:12 +0200 Subject: [PATCH 383/587] Update gcc 2 and gcc 4 to current version --- sys-devel/gcc/gcc-2.95.3_2013_08_12.recipe | 159 +++++++++++++++++++++ sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe | 130 +++++++++++++++++ 2 files changed, 289 insertions(+) create mode 100644 sys-devel/gcc/gcc-2.95.3_2013_08_12.recipe create mode 100644 sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe diff --git a/sys-devel/gcc/gcc-2.95.3_2013_08_12.recipe b/sys-devel/gcc/gcc-2.95.3_2013_08_12.recipe new file mode 100644 index 000000000..79349b7c1 --- /dev/null +++ b/sys-devel/gcc/gcc-2.95.3_2013_08_12.recipe @@ -0,0 +1,159 @@ +SUMMARY="C/C++ compiler" +DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5." +HOMEPAGE="http://gcc.gnu.org" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2000 Free Software Foundation, Inc." +SRC_URI=" + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + " +REVISION="1" +ARCHITECTURES="x86_gcc2" +if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ] +then + ARCHITECTURES="$ARCHITECTURES x86" +fi +SECONDARY_ARCHITECTURES="x86_gcc2" + +PROVIDES=" + gcc = $portVersion compat >= 2.95.3 + cmd:cc$secondaryArchSuffix + cmd:c++$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:c++filt$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:cpp$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:g++$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:gcc$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:gcov$secondaryArchSuffix = 1.5 compat >= 1.5 + cmd:i586_pc_haiku_gcc$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:protoize$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:unprotoize$secondaryArchSuffix = $portVersion compat >= 2.95.3 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + binutils$secondaryArchSuffix + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + gcc$secondaryArchSuffix + cmd:flex + cmd:make + cmd:sed + cmd:tar + cmd:makeinfo + " + +SOURCE_DIR="$portVersionedName/legacy/gcc" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +gccDir=$(pwd) +gccDate=$(echo $portVersion | sed 's,.*_,,') +relativeGccInstallDir="develop/tools$secondaryArchSubDir" +gccInstallDir="$prefix/$relativeGccInstallDir" +gccObjectsDir=$gccDir/../gcc-obj + +BUILD() +{ + rm -rf $gccObjectsDir + + # Touch some files generated by bison, so that bison won't run to update + # them. Fixes issues with newer bison versions. + # And while at it, touch gperf target, too (as gperf may not be installed). + (cd gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + cp/parse.h c-gperf.h) + + # build gcc + mkdir -p $gccObjectsDir + cd $gccObjectsDir + CFLAGS="-O2" CXXFLAGS="-O2" "$gccDir/configure" \ + --prefix=$gccInstallDir \ + --disable-nls --enable-shared=yes --enable-languages=c,c++ + make bootstrap +} + +INSTALL() +{ + cd $gccObjectsDir + make install + + rm $gccInstallDir/lib/libiberty.a + # only needed for building gcc + + base=$gccInstallDir + + ### HTML documentation #################################### + + html_base=$docDir + if [ ! -d "$html_base" ]; then + echo "Building HTML documentation..." + mkdir -p $html_base + cd $html_base + + makeinfo --html "$gccDir/gcc/cpp.texi" + makeinfo --html "$gccDir/gcc/gcc.texi" + makeinfo --force --html "$gccDir/libio/iostream.texi" \ + && true + # some errors + + ln -sf cpp/index.html $html_base/cpp.html + ln -sf gcc/index.html $html_base/gcc.html + ln -sf iostream/index.html $html_base/iostream.html + fi + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # convert to absolute links to relative ones + cd $base/bin + ln -sfn g++ c++ + ln -sfn gcc cc + ln -sfn gcc i586-pc-haiku-gcc + + # make all tools available via default paths if this is the system + # compiler + if [ $targetArchitecture = 'x86_gcc2' ]; then + echo "Symlinking binaries into default path" + mkdir -p $prefix/bin + cd $binDir + ln -sfn ../$relativeGccInstallDir/bin/* . + fi + + ### Strip ################################################# + + echo "Strip debug info" + + cd $base + strip --strip-debug bin/* + strip --strip-debug i586-pc-haiku/bin/* + strip --strip-debug lib/gcc-lib/i586-pc-haiku/2.95.3-${gccDate}/* \ + &>/dev/null || true + + ### Cleanup ############################################### + + echo "Cleanup" + + if [ -d $base/man -o -d $base/info -o -d $base/share ]; then + rm -rf $base/man + rm -rf $base/info + rm -rf $base/share + fi + + rm -f $base/lib/gcc-lib/i586-pc-haiku/2.95.3-haiku-$gccDate/include/math.h + + ### C++ includes ########################################## + + echo "Install C++ includes & library" + + rm -rf $base/include/g++ + ln -snf /boot/system/develop/headers/c++/2.95.3 $base/include/g++ + + ln -snf /boot/system/lib/libstdc++.r4.so $base/lib/ + ln -snf /boot/system/lib/libstdc++.so $base/lib/ +} 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 new file mode 100644 index 000000000..b0647b151 --- /dev/null +++ b/sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe @@ -0,0 +1,130 @@ +SUMMARY="C/C++ cross-compiler for target ${effectiveTargetMachineTriple}" +DESCRIPTION="Standard compiler for x86 platform." +HOMEPAGE="http://gcc.gnu.org" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2013 Free Software Foundation, Inc." +SRC_URI=" + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + " +REVISION="1" +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 +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + gcc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:c++$secondaryArchSuffix = $portVersion compat >= 4 + cmd:cc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:cpp$secondaryArchSuffix = $portVersion compat >= 4 + cmd:g++$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcc_4.7.3$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcov$secondaryArchSuffix = $portVersion compat >= 4 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:makeinfo + cmd:sed + cmd:strip + cmd:tar + " + +SOURCE_DIR="gcc-$portVersion/gcc" + +sourceDir=$(pwd) +relativeInstallDir="develop/tools$secondaryArchSubDir" +installDir="$prefix/$relativeInstallDir" +objectsDir=$(pwd)/../${portVersionedName}-obj + +BUILD() +{ + rm -rf $objectsDir + + # Touch some files generated by bison, so that bison won't run to update + # them. Fixes issues with newer bison versions. + # And while at it, touch gperf target, too (as gperf may not be installed). + (cd $sourceDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + cp/parse.h c-gperf.h) + + mkdir -p $objectsDir + cd $objectsDir + + local additionalConfigureFlags + if [ -n "$secondaryArchSuffix" ]; then + additionalConfigureFlags="\ + --with-hybrid-secondary=${effectiveTargetArchitecture}" + fi + + CFLAGS="-O2 -U_FORTIFY_SOURCE" CXXFLAGS="-O2" "$sourceDir/configure" \ + --prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \ + --docdir=$docDir \ + --disable-nls --enable-shared \ + --enable-languages=c,c++ --enable-lto --enable-frame-pointer \ + --with-pkgversion=$(echo $portVersion | cut -c 7-) \ + $additionalConfigureFlags + + make $jobArgs +} + +INSTALL() +{ + cd $objectsDir + + make install-strip + make install-html + + ### HTML documentation #################################### + + echo "Organizing HTML documentation..." + cd $docDir + for dir in gmp libquadmath mpc mpfr; do + mv ${dir}.html $dir + ln -s $dir/index.html ${dir}.html + done + + ### Strip ################################################# + + echo "Strip debug info" + + cd $installDir + strip --strip-debug bin/* + for f in cc1 cc1plus collect2 lto1; do + strip --strip-debug lib/gcc/$effectiveTargetMachineTriple/*/$f + done + strip --strip-debug lib/*.a + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # make all tools available via default paths + mkdir -p $binDir + for f in c++ cpp g++ gcc gcov; do + symlinkRelative -sfn $installDir/bin/$f $binDir + done + + ### Cleanup ############################################### + + echo "Cleanup" + rm -rf $installDir/info + rm -rf $installDir/share +} From dc3d06bbdcb11bdd3f444516db75c54be24d62c4 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 13:54:43 +0200 Subject: [PATCH 384/587] neon: add missing libcrypto dependency --- net-misc/neon/neon-0.29.6.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe index a9cb4fd70..dfe5a49d9 100644 --- a/net-misc/neon/neon-0.29.6.recipe +++ b/net-misc/neon/neon-0.29.6.recipe @@ -22,7 +22,7 @@ LICENSE="GNU LGPL v2" COPYRIGHT="1999-2011 Joe Orton" SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz" CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc" -REVISION="6" +REVISION="7" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="neon-0.29.6.patch" @@ -33,12 +33,14 @@ PROVIDES=" " REQUIRES=" haiku >= $haikuVersion + lib:libcrypto lib:libncurses lib:libssl lib:libxml2 lib:libz " BUILD_REQUIRES=" + devel:libcrypto devel:libncurses devel:libssl >= 1.0.0 devel:libxml2 >= 2.7.8 From 089e141aeb658b02f9fb8b06ea435ac7f1d02475 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 13:55:32 +0200 Subject: [PATCH 385/587] Replace ':' in package link paths by '~' Also add missing libiconv requires for apr_util. --- app-text/texi2html/texi2html-1.82.recipe | 4 ++-- dev-libs/apr_util/apr_util-1.4.1.recipe | 8 +++++--- dev-vcs/subversion/subversion-1.6.18.recipe | 8 ++++---- haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe | 6 +++--- .../haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe | 4 ++-- media-video/ffmpeg/ffmpeg-0.10.2.recipe | 4 ++-- net-misc/openssh/openssh-6.0p1.recipe | 6 +++--- 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app-text/texi2html/texi2html-1.82.recipe b/app-text/texi2html/texi2html-1.82.recipe index 880766280..60e23953b 100644 --- a/app-text/texi2html/texi2html-1.82.recipe +++ b/app-text/texi2html/texi2html-1.82.recipe @@ -9,7 +9,7 @@ COPYRIGHT="1999-2005 Patrice Dumas, Derek Price, Adrian Aichner & others." LICENSE="GNU GPL v2" SRC_URI="http://download.savannah.gnu.org/releases/texi2html/texi2html-1.82.tar.bz2" CHECKSUM_MD5="a8a9193c0ac1bec2f3ca7be40a5a82eb" -REVISION="1" +REVISION="2" ARCHITECTURES="any" PATCHES="texi2html-1.82.patchset" @@ -39,7 +39,7 @@ BUILD() { libtoolize --force --copy --install ./autogen.sh - PERL="$portPackageLinksDir/cmd:perl/bin/perl" runConfigure ./configure + PERL="$portPackageLinksDir/cmd~perl/bin/perl" runConfigure ./configure make $jobArgs } 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 79fe24616..ba725ed9b 100644 --- a/dev-libs/apr_util/apr_util-1.4.1.recipe +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -4,7 +4,7 @@ SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz" LICENSE="Apache v2" COPYRIGHT="2011 The Apache Software Foundation." CHECKSUM_MD5="666a5d56098a9debf998510e304c8095" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="apr_util-1.4.1.patch" @@ -17,10 +17,12 @@ REQUIRES=" haiku >= $haikuVersion lib:libapr_1 lib:libexpat + lib:libiconv " BUILD_REQUIRES=" devel:libapr_1 >= 0.4.6 devel:libexpat >= 1.5.2 + devel:libiconv " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -42,8 +44,8 @@ PATCH() BUILD() { - aprInstallDir=$portPackageLinksDir/apr_devel - expatInstallDir=$portPackageLinksDir/expat_devel + aprInstallDir=$portPackageLinksDir/lib~libapr_1 + expatInstallDir=$portPackageLinksDir/lib~libexpat rm -rf aclocal.m4 mkdir -p m4 diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe index 83d3437ab..8ee1c0d1c 100644 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -12,7 +12,7 @@ LICENSE="Apache-Subversion" COPYRIGHT="2010 The Apache Software Foundation" SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2" CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="subversion-1.6.18.patch" @@ -94,10 +94,10 @@ BUILD() aclocal -I build -I build/ac-macros autoconf runConfigure ./configure \ - --with-apr=$portPackageLinksDir/devel:libapr_1 \ - --with-apr-util=$portPackageLinksDir/devel:libaprutil_1 \ + --with-apr=$portPackageLinksDir/devel~libapr_1 \ + --with-apr-util=$portPackageLinksDir/devel~libaprutil_1 \ --with-neon=$portPackageLinksDir/neon_devel \ - --with-zlib=$portPackageLinksDir/devel:libz \ + --with-zlib=$portPackageLinksDir/devel~libz \ --with-editor=nano \ --disable-nls make $jobArgs diff --git a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe index 7f3142bb4..55915e79e 100644 --- a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe +++ b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe @@ -8,7 +8,7 @@ LICENSE="WonderBrush" COPYRIGHT="2005, Stephan Aßmus und Ingo Weinhold GbR" SRC_URI="http://yellowbites.com/downloads/WonderBrush-2.1.2-x86-gcc2-2013-01-02.zip#noarchive" CHECKSUM_MD5="28e64a56946c9f5aefa40486f35ffc77" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 !x86" DISABLE_SOURCE_PACKAGE=yes @@ -47,9 +47,9 @@ INSTALL() # Hack to make libfreetype and libz available under the name WonderBrush # has been linked against them. - ln -s $portPackageLinksDir/lib:libfreetype/lib/libfreetype.so.6 \ + ln -s $portPackageLinksDir/lib~libfreetype/lib/libfreetype.so.6 \ $wonderbrushDir/lib/libfreetype.so - ln -s $portPackageLinksDir/lib:libz/lib/libz.so.1 \ + ln -s $portPackageLinksDir/lib~libz/lib/libz.so.1 \ $wonderbrushDir/lib/libz.so addAppDeskbarSymlink $wonderbrushDir/WonderBrush 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 ee382b638..1a339405f 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 @@ -10,7 +10,7 @@ LICENSE=" " SRC_URI="http://www.haiku-files.org/files/haiku-webkit-lastgood-no-tests-2013-08-09.tar.bz2" CHECKSUM_MD5="a6551b2573612678e9d2d27fda4fae48" -REVISION="1" +REVISION="2" ARCHITECTURES="x86" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -69,7 +69,7 @@ BUILD() export WEBKIT_REVISION=$webkitRevision export HAIKU_WEBKIT_REVISION=$haikuWebkitRevision - libxml2Dir=$portPackageLinksDir/devel:libxml2$secondaryArchSuffix + libxml2Dir=$portPackageLinksDir/devel~libxml2$secondaryArchSuffix libxml2Includes=$libxml2Dir/$relativeIncludeDir/libxml2 compileFlags="-sCCFLAGS=-I$libxml2Includes -sC++FLAGS=-I$libxml2Includes" diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.recipe b/media-video/ffmpeg/ffmpeg-0.10.2.recipe index 6d7c71e7a..b4c8fc95d 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.2.recipe +++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe @@ -11,7 +11,7 @@ COPYRIGHT=" " SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2" CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -77,7 +77,7 @@ PATCH() doc/ffserver.texi # patch hard-coded paths to perl - sed -i "s,/usr/bin/perl,$portPackageLinksDir/cmd:perl/bin/perl," \ + sed -i "s,/usr/bin/perl,$portPackageLinksDir/cmd~perl/bin/perl," \ Doxyfile \ doc/texi2pod.pl } diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index 1212a8211..a44a5f055 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -4,7 +4,7 @@ LICENSE="OpenSSH" COPYRIGHT="2005-2012 Tatu Ylonen et al." SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz" CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b" -REVISION="6" +REVISION="7" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="openssh-6.0p1.patch" @@ -88,8 +88,8 @@ BUILD() # Note: override sysconfdir and libexecdir since ssh doesn't create # subdirectories as it should. - PATH_PASSWD_PROG=$portPackageLinksDir/cmd:passwd/bin/passwd \ - LOGIN_PROGRAM=$portPackageLinksDir/cmd:login/bin/login \ + PATH_PASSWD_PROG=$portPackageLinksDir/cmd~passwd/bin/passwd \ + LOGIN_PROGRAM=$portPackageLinksDir/cmd~login/bin/login \ runConfigure ./configure \ --sysconfdir=$sysconfDir/ssh \ --libexecdir=$libExecDir/openssh \ From 28faa080b83f0ab34a3f4c364b3cd3b0d1aad5bd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 21:58:26 +0200 Subject: [PATCH 386/587] Add recipe and patches for git 1.8.3.4 The user settings files have moved from $HOME to ~/config/settings/git/. --- dev-vcs/git/git-1.8.3.4.recipe | 231 +++++++++++++++++++++++ dev-vcs/git/patches/git-1.8.3.4.patchset | 78 ++++++++ 2 files changed, 309 insertions(+) create mode 100644 dev-vcs/git/git-1.8.3.4.recipe create mode 100644 dev-vcs/git/patches/git-1.8.3.4.patchset diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe new file mode 100644 index 000000000..31e03ddab --- /dev/null +++ b/dev-vcs/git/git-1.8.3.4.recipe @@ -0,0 +1,231 @@ +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. + " +HOMEPAGE="http://git-scm.com/" +LICENSE="GNU GPL v2" +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" +CHECKSUM_MD5_2="86fd812754d25201fd72c7476045dfec" + +SRC_URI_3="http://git-core.googlecode.com/files/git-htmldocs-1.8.3.4.tar.gz" +CHECKSUM_MD5_3="be01cc4be1b946b053b69d12b422854a" + +REVISION="1" + +ARCHITECTURES="x86_gcc2 ?x86" + + +PROVIDES=" + git = $portVersion compat >= 1.8 + cmd:git = $portVersion compat >= 1.8 + cmd:git_receive_pack = $portVersion compat >= 1.8 + cmd:git_shell = $portVersion compat >= 1.8 + cmd:git_upload_archive = $portVersion compat >= 1.8 + cmd:git_upload_pack = $portVersion compat >= 1.8 + " +PROVIDES_arch=" + git_arch = $portVersion compat >= 1.8 + cmd:git_archimport = $portVersion compat >= 1.8 + " +PROVIDES_cvs=" + git_cvs = $portVersion compat >= 1.8 + cmd:git_cvsserver = $portVersion compat >= 1.8 + " +PROVIDES_daemon=" + git_daemon = $portVersion compat >= 1.8 + cmd:git_daemon = $portVersion compat >= 1.8 + " +PROVIDES_email=" + git_email = $portVersion compat >= 1.8 + cmd:git_send_email = $portVersion compat >= 1.8 + " +PROVIDES_source=" + git_source = $portVersion compat >= 1.8 + " +PROVIDES_svn=" + git_svn = $portVersion compat >= 1.8 + cmd:git_svn = $portVersion compat >= 1.8 + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:man + cmd:nano + cmd:perl + cmd:python + lib:libcurl + lib:libexpat + lib:libiconv + lib:libintl + lib:libpcre + lib:libssl + lib:libz + " +REQUIRES_arch=" + haiku >= $haikuVersion + git == $portVersion base + " +REQUIRES_cvs=" + haiku >= $haikuVersion + git == $portVersion base + " +REQUIRES_daemon=" + haiku >= $haikuVersion + git == $portVersion base + " +REQUIRES_email=" + haiku >= $haikuVersion + git == $portVersion base + " +REQUIRES_svn=" + haiku >= $haikuVersion + git == $portVersion base + " + +BUILD_REQUIRES=" + cmd:man + cmd:nano + cmd:perl + cmd:python + devel:libcurl + devel:libexpat + devel:libiconv + devel:libintl + devel:libpcre + devel:libssl + devel:libz + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoconf + cmd:gcc + cmd:gettext + cmd:ld + cmd:make + cmd:msgfmt + cmd:sed + cmd:tar + " + +makeGit() +{ + make prefix=$prefix \ + bindir_relative=$relativeBinDir \ + mandir=$manDir \ + infodir=$infoDir \ + gitexecdir=$libDir/git-core \ + sharedir=$dataDir \ + template_dir=$dataDir/git-core/templates \ + htmldir=$docDir \ + sysconfdir=$sysconfDir \ + PTHREAD_LIBS= \ + USE_LIBPCRE=YesPlease \ + NO_D_TYPE_IN_DIRENT=YesPlease \ + NO_MEMMEM=YesPlease \ + NO_MKSTEMPS=YesPlease \ + NEEDS_LIBICONV=YesPlease \ + NO_R_TO_GCC_LINKER=YesPlease \ + GNU_ROFF=YesPlease \ + PERL_PATH=$portPackageLinksDir/cmd~perl/bin/perl \ + PYTHON_PATH=$portPackageLinksDir/cmd~python/bin/python \ + NO_TCLTK=YesPlease \ + OBJECT_CREATION_USES_RENAMES=YesPlease \ + NO_CROSS_DIRECTORY_HARDLINKS=YesPlease \ + NO_INSTALL_HARDLINKS=YesPlease \ + HAVE_DEV_TTY=YesPlease \ + DEFAULT_EDITOR=nano \ + BASIC_LDFLAGS="-lnetwork -lbsd" \ + "$@" +} + + +BUILD() +{ + makeGit $jobArgs + makeGit strip +} + +INSTALL() +{ + makeGit install + + # replace copies of git binaries with symlinks + cd $binDir + for program in git*; do + ln -sfn "../lib/git-core/$program" "$program" + done + + # copy manpages + mkdir -p $manDir + cp -rd $sourceDir2/* $manDir/ + + # copy html documentation + htmlDir=$docDir/html + mkdir -p $htmlDir + cp -rd $sourceDir3/*.html $htmlDir/ + rm $htmlDir/git-gui.html + + # copy asciidoc documentation for which there isn't any corresponding html + asciidocDir=$docDir/asciidoc + mkdir -p $asciidocDir + for f in $sourceDir3/*.txt; do + html=$sourceDir3/$(basename $f .txt).html + if ! [ -e $html ]; then + cp -d $f $asciidocDir/ + fi + done + + packageEntries arch \ + documentation/packages/git/html/git-archimport.html \ + documentation/man/man1/git-archimport.1 \ + lib/git-core/git-archimport + + packageEntries cvs \ + bin/git-cvsserver \ + documentation/packages/git/html/git-cvsexportcommit.html \ + documentation/packages/git/html/git-cvsimport.html \ + documentation/packages/git/html/git-cvsserver.html \ + documentation/man/man1/git-cvsexportcommit.1 \ + documentation/man/man1/git-cvsimport.1 \ + documentation/man/man1/git-cvsserver.1 \ + documentation/man/man7/gitcvs-migration.7 \ + lib/git-core/git-cvsexportcommit \ + lib/git-core/git-cvsimport \ + lib/git-core/git-cvsserver + + packageEntries daemon \ + documentation/packages/git/html/git-credential-cache--daemon.html \ + documentation/packages/git/html/git-credential-cache.html \ + documentation/packages/git/html/git-daemon.html \ + documentation/man/man1/git-credential-cache--daemon.1 \ + documentation/man/man1/git-credential-cache.1 \ + documentation/man/man1/git-daemon.1 \ + lib/git-core/git-credential-cache--daemon \ + lib/git-core/git-credential-cache \ + lib/git-core/git-daemon + + packageEntries email \ + documentation/packages/git/html/git-send-email.html \ + documentation/man/man1/git-send-email.1 \ + lib/git-core/git-send-email + + packageEntries svn \ + documentation/packages/git/html/git-svn.html \ + documentation/man/man1/git-svn.1 \ + lib/git-core/git-svn +} diff --git a/dev-vcs/git/patches/git-1.8.3.4.patchset b/dev-vcs/git/patches/git-1.8.3.4.patchset new file mode 100644 index 000000000..696703282 --- /dev/null +++ b/dev-vcs/git/patches/git-1.8.3.4.patchset @@ -0,0 +1,78 @@ +From c35cdc07a85b42e2c90b12dc6b824133ad2b6452 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 13 Aug 2013 08:07:25 +0200 +Subject: git-web--browse.sh: use "open" on Haiku + + +diff --git a/git-web--browse.sh b/git-web--browse.sh +index 1d72ec7..e3f254c 100755 +--- a/git-web--browse.sh ++++ b/git-web--browse.sh +@@ -132,6 +132,10 @@ if test -z "$browser" ; then + if test -x /usr/bin/cygstart; then + browser_candidates="cygstart $browser_candidates" + fi ++ # /boot/system/haiku_loader indicates Haiku ++ if test -f /boot/system/haiku_loader; then ++ browser_candidates="open $browser_candidates" ++ fi + + for i in $browser_candidates; do + init_browser_path $i +-- +1.8.3.4 + + +From 4627da2e350c3bc0dcff780db2c8fdce1aedf52e Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 13 Aug 2013 21:03:59 +0200 +Subject: On Haiku use the user settings directory instead of HOME + + +diff --git a/path.c b/path.c +index 04ff148..8668534 100644 +--- a/path.c ++++ b/path.c +@@ -5,6 +5,11 @@ + #include "strbuf.h" + #include "string-list.h" + ++#ifdef __HAIKU__ ++# include ++# include ++#endif ++ + #ifndef get_st_mode_bits + /* + * The replacement lstat(2) we use on Cygwin is incomplete and +@@ -139,6 +144,19 @@ char *git_path(const char *fmt, ...) + + void home_config_paths(char **global, char **xdg, char *file) + { ++#ifdef __HAIKU__ ++ char settingsPath[B_PATH_NAME_LENGTH]; ++ ++ *xdg = NULL; ++ ++ if (global) { ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, settingsPath, ++ sizeof(settingsPath)) == B_OK) { ++ *global = mkpathdup("%s/git/%s", settingsPath, file); ++ } else ++ *global = NULL; ++ } ++#else + char *xdg_home = getenv("XDG_CONFIG_HOME"); + char *home = getenv("HOME"); + char *to_free = NULL; +@@ -161,6 +179,7 @@ void home_config_paths(char **global, char **xdg, char *file) + *xdg = mkpathdup("%s/git/%s", xdg_home, file); + + free(to_free); ++#endif + } + + char *git_path_submodule(const char *path, const char *fmt, ...) +-- +1.8.3.4 + From ad319a25aae2b9f06a04216c6ec3d6c0a6fa5b50 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 22:02:05 +0200 Subject: [PATCH 387/587] Some work on the llvm 3.0 recipe Isn't finished yet (and therefore disabled), but I won't continue working on it ATM. --- sys-devel/llvm/llvm-3.0.recipe | 110 +++++++++++++++++++++++++++++---- 1 file changed, 99 insertions(+), 11 deletions(-) diff --git a/sys-devel/llvm/llvm-3.0.recipe b/sys-devel/llvm/llvm-3.0.recipe index 229634d29..82bd1fc02 100644 --- a/sys-devel/llvm/llvm-3.0.recipe +++ b/sys-devel/llvm/llvm-3.0.recipe @@ -1,23 +1,111 @@ -DESCRIPTION="LLVM is a collection of modular and reuseable compiler and toolchain technologies." +SUMMARY="collection of modular and reuseable compiler and toolchain technologies" HOMEPAGE="http://www.llvm.org/" +COPYRIGHT="2003-2011 University of Illinois at Urbana-Champaign" +LICENSE="UIUC" SRC_URI="http://llvm.org/releases/3.0/llvm-3.0.tar.gz" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" CHECKSUM_MD5="a8e5f5f1c1adebae7b4a654c376a6005" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +REVISION="1" +#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 +#SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + llvm$secondaryArchSuffix = $portVersion compat >= 3 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion +# cmd:autoconf +# cmd:flex + cmd:groff + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make +# cmd:makeinfo + cmd:perl +# cmd:sed +# cmd:strip +# cmd:tar + " + +#POLICY WARNING: Invalid top-level package entry "docs" +#POLICY WARNING: Invalid top-level package entry "include" +#POLICY WARNING: Invalid top-level package entry "share" +#POLICY WARNING: no matching provides "cmd:bugpoint" for "bin/bugpoint" +#POLICY WARNING: no matching provides "cmd:llc" for "bin/llc" +#POLICY WARNING: no matching provides "cmd:lli" for "bin/lli" +#POLICY WARNING: no matching provides "cmd:llvm_ar" for "bin/llvm-ar" +#POLICY WARNING: no matching provides "cmd:llvm_as" for "bin/llvm-as" +#POLICY WARNING: no matching provides "cmd:llvm_bcanalyzer" for "bin/llvm-bcanalyzer" +#POLICY WARNING: no matching provides "cmd:llvm_config" for "bin/llvm-config" +#POLICY WARNING: no matching provides "cmd:llvm_cov" for "bin/llvm-cov" +#POLICY WARNING: no matching provides "cmd:llvm_diff" for "bin/llvm-diff" +#POLICY WARNING: no matching provides "cmd:llvm_dis" for "bin/llvm-dis" +#POLICY WARNING: no matching provides "cmd:llvm_dwarfdump" for "bin/llvm-dwarfdump" +#POLICY WARNING: no matching provides "cmd:llvm_extract" for "bin/llvm-extract" +#POLICY WARNING: no matching provides "cmd:llvm_ld" for "bin/llvm-ld" +#POLICY WARNING: no matching provides "cmd:llvm_link" for "bin/llvm-link" +#POLICY WARNING: no matching provides "cmd:llvm_mc" for "bin/llvm-mc" +#POLICY WARNING: no matching provides "cmd:llvm_nm" for "bin/llvm-nm" +#POLICY WARNING: no matching provides "cmd:llvm_objdump" for "bin/llvm-objdump" +#POLICY WARNING: no matching provides "cmd:llvm_prof" for "bin/llvm-prof" +#POLICY WARNING: no matching provides "cmd:llvm_ranlib" for "bin/llvm-ranlib" +#POLICY WARNING: no matching provides "cmd:llvm_rtdyld" for "bin/llvm-rtdyld" +#POLICY WARNING: no matching provides "cmd:llvm_size" for "bin/llvm-size" +#POLICY WARNING: no matching provides "cmd:llvm_stub" for "bin/llvm-stub" +#POLICY WARNING: no matching provides "cmd:llvm_tblgen" for "bin/llvm-tblgen" +#POLICY WARNING: no matching provides "cmd:macho_dump" for "bin/macho-dump" +#POLICY WARNING: no matching provides "cmd:opt" for "bin/opt" + +SOURCE_DIR="llvm-$portVersion.src" + BUILD() { - cd llvm-3.0.src - ./configure --enable-optimized --prefix=`finddir B_COMMON_DIRECTORY` - make + runConfigure ./configure --enable-optimized + make $jobArgs } INSTALL() { - cd llvm-3.0.src make install } -LICENSE="UIUC" -COPYRIGHT="2003-2011 University of Illinois at Urbana-Champaign" + +DESCRIPTION="The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. Despite its name, LLVM has little to do with traditional virtual machines, though it does provide helpful libraries that can be used to build them. The name \"LLVM\" itself is not an acronym; it is the full name of the project. + +LLVM began as a research project at the University of Illinois, with the goal of providing a modern, SSA-based compilation strategy capable of supporting both static and dynamic compilation of arbitrary programming languages. Since then, LLVM has grown to be an umbrella project consisting of a number of subprojects, many of which are being used in production by a wide variety of commercial and open source projects as well as being widely used in academic research. Code in the LLVM project is licensed under the \"UIUC\" BSD-Style license. + +The primary sub-projects of LLVM are: + +The LLVM Core libraries provide a modern source- and target-independent optimizer, along with code generation support for many popular CPUs (as well as some less common ones!) These libraries are built around a well specified code representation known as the LLVM intermediate representation (\"LLVM IR\"). The LLVM Core libraries are well documented, and it is particularly easy to invent your own language (or port an existing compiler) to use LLVM as an optimizer and code generator. + +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. The Clang Static Analyzer is a tool that automatically finds bugs in your code, and is a great example of the sort of tool that can be built using the Clang frontend as a library to parse C/C++ code. + +dragonegg integrates the LLVM optimizers and code generator with the GCC parsers. This allows LLVM to compile Ada, Fortran, and other languages supported by the GCC compiler frontends, and access to C features not supported by Clang (such as OpenMP). + +The LLDB project builds on libraries provided by LLVM and Clang to provide a great native debugger. It uses the Clang ASTs and expression parser, LLVM JIT, LLVM disassembler, etc so that it provides an experience that \"just works\". It is also blazing fast and much more memory efficient than GDB at loading symbols. + +The libc++ and libc++ ABI projects provide a standard conformant and high-performance implementation of the C++ Standard Library, including full support for C++11. + +The compiler-rt project provides highly tuned implementations of the low-level code generator support routines like \"__fixunsdfdi\" and other calls generated when a target doesn't have a short sequence of native instructions to implement a core IR operation. + +The vmkit project is an implementation of the Java and .NET Virtual Machines that is built on LLVM technologies. + +The polly project implements a suite of cache-locality optimizations as well as auto-parallelism and vectorization using a polyhedral model. + +The libclc project aims to implement the OpenCL standard library. + +The klee project implements a \"symbolic virtual machine\" which uses a theorem prover to try to evaluate all dynamic paths through a program in an effort to find bugs and to prove properties of functions. A major feature of klee is that it can produce a testcase in the event that it detects a bug. + +The SAFECode project is a memory safety compiler for C/C++ programs. It instruments code with run-time checks to detect memory safety errors (e.g., buffer overflows) at run-time. It can be used to protect software from security attacks and can also be used as a memory safety error debugging tool like Valgrind. + +In addition to official subprojects of LLVM, there are a broad variety of other projects that use components of LLVM for various tasks. Through these external projects you can use LLVM to compile Ruby, Python, Haskell, Java, D, PHP, Pure, Lua, and a number of other languages. A major strength of LLVM is its versatility, flexibility, and reusability, which is why it is being used for such a wide variety of different tasks: everything from doing light-weight JIT compiles of embedded languages like Lua to compiling Fortran code for massive super computers." From d6ae3a80068cb72e8258e7a1b573d062dda3a5ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 14 Aug 2013 12:08:57 +0200 Subject: [PATCH 388/587] Ubuntu Font Family --- media-fonts/ubuntu/ubuntu-0.80.recipe | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 media-fonts/ubuntu/ubuntu-0.80.recipe diff --git a/media-fonts/ubuntu/ubuntu-0.80.recipe b/media-fonts/ubuntu/ubuntu-0.80.recipe new file mode 100644 index 000000000..5a0da9f2c --- /dev/null +++ b/media-fonts/ubuntu/ubuntu-0.80.recipe @@ -0,0 +1,32 @@ +DESCRIPTION="Font family from Ubunu operating system" +HOMEPAGE="http://font.ubuntu.com" +SRC_URI="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd ubuntu-font-family-0.80 +} +INSTALL { + cd ubuntu-font-family-0.80 + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ubuntu + mkdir -p ${FONTDIR} + cp Ubuntu-B.ttf ${FONTDIR} + cp Ubuntu-BI.ttf ${FONTDIR} + cp Ubuntu-C.ttf ${FONTDIR} + cp Ubuntu-L.ttf ${FONTDIR} + cp Ubuntu-LI.ttf ${FONTDIR} + cp Ubuntu-M.ttf ${FONTDIR} + cp Ubuntu-MI.ttf ${FONTDIR} + cp Ubuntu-R.ttf ${FONTDIR} + cp Ubuntu-RI.ttf ${FONTDIR} + cp UbuntuMono-B.ttf ${FONTDIR} + cp UbuntuMono-BI.ttf ${FONTDIR} + cp UbuntuMono-R.ttf ${FONTDIR} + cp UbuntuMono-RI.ttf ${FONTDIR} + cp README.txt ${FONTDIR}/ubuntu-fonts-readme.txt + cp LICENCE.txt ${FONTDIR}/ubuntu-fonts-licence.txt +} + +LICENSE="Artistic" +COPYRIGHT="Canonical Ltd." From d3fff39e6ee25cde971dabb0c9fa6cb74bb9efdb Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 17 Aug 2013 09:38:25 +0200 Subject: [PATCH 389/587] Declare most recipes stable on x86 --- app-arch/bzip2/bzip2-1.0.6.recipe | 2 +- app-arch/p7zip/p7zip-9.20.1.recipe | 2 +- app-arch/tar/tar-1.26.recipe | 2 +- app-cdr/cdrtools/cdrtools-3.01~a07.recipe | 2 +- app-doc/doxygen/doxygen-1.6.3.recipe | 2 +- app-editors/nano/nano-2.2.6.recipe | 2 +- app-text/htmldoc/htmldoc-1.8.27.recipe | 2 +- dev-lang/perl/perl-5.10.1.recipe | 2 +- dev-lang/python/python-2.6.8.recipe | 2 +- dev-lang/yasm/yasm-1.2.0.recipe | 2 +- dev-libs/apr/apr-1.4.6.recipe | 2 +- dev-libs/apr_util/apr_util-1.4.1.recipe | 2 +- dev-libs/libedit/libedit-2012_06_01_3.0.recipe | 2 +- dev-libs/libpcre/libpcre-8.21.recipe | 2 +- dev-util/cmake/cmake-2.8.5.recipe | 2 +- dev-util/ctags/ctags-5.8.recipe | 2 +- dev-util/gperf/gperf-3.0.4.recipe | 2 +- dev-util/pkgconfig/pkgconfig-0.27.1.recipe | 2 +- dev-util/scons/scons-2.2.0.recipe | 2 +- dev-vcs/cvs/cvs-1.12.13.1.recipe | 2 +- dev-vcs/git/git-1.8.3.4.recipe | 2 +- dev-vcs/mercurial/mercurial-2.2.2.recipe | 2 +- dev-vcs/subversion/subversion-1.6.18.recipe | 2 +- haiku-apps/bepdf/bepdf-1.1.1~beta5_2013_04_28.recipe | 2 +- haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe | 2 +- haiku-apps/mkdepend/mkdepend-1.7.recipe | 2 +- haiku-apps/pe/pe-2.4.3_hg602.recipe | 2 +- haiku-apps/vision/vision-0.9.7.r944.recipe | 2 +- net-misc/neon/neon-0.29.6.recipe | 2 +- net-misc/openssh/openssh-6.0p1.recipe | 2 +- net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe | 2 +- sys-apps/gawk/gawk-3.1.8.recipe | 2 +- sys-apps/grep/grep-2.14.recipe | 2 +- sys-apps/groff/groff-1.20.1.recipe | 2 +- sys-apps/man/man-1.6g.recipe | 2 +- sys-apps/sed/sed-4.2.1.recipe | 2 +- sys-apps/texinfo/texinfo-4.13a.recipe | 2 +- sys-devel/autoconf/autoconf-2.69.recipe | 2 +- sys-devel/automake/automake-1.13.1.recipe | 2 +- sys-devel/bison/bison-2.4.3.recipe | 2 +- sys-devel/flex/flex-2.5.35.recipe | 2 +- sys-devel/jam/jam-2.5_2012_10_12.recipe | 2 +- sys-devel/libtool/libtool-2.4.recipe | 2 +- sys-devel/m4/m4-1.4.16.recipe | 2 +- sys-devel/make/make-3.82.recipe | 2 +- sys-libs/readline/readline-6.2.recipe | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-) diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe index 1186bf2b3..0fae76959 100644 --- a/app-arch/bzip2/bzip2-1.0.6.recipe +++ b/app-arch/bzip2/bzip2-1.0.6.recipe @@ -6,7 +6,7 @@ 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="3" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" bzip2 = $portVersion compat >= 1 diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe index 4daffb8af..92e5b91d9 100644 --- a/app-arch/p7zip/p7zip-9.20.1.recipe +++ b/app-arch/p7zip/p7zip-9.20.1.recipe @@ -6,7 +6,7 @@ CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89" LICENSE="GNU LGPL v2.1" COPYRIGHT="1999-2011 7-Zip Igor Pavlov." REVISION="4" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="p7zip-9.20.1.patch" diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index 45cb4f7b2..99dff6c30 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -17,7 +17,7 @@ LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2" CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519" REVISION="6" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" tar = $portVersion compat >= 1 diff --git a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe index bfdafe2e3..e82c1bb6a 100644 --- a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe +++ b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe @@ -25,7 +25,7 @@ LICENSE=" SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a07.tar.bz2" CHECKSUM_MD5="266bae8db7d1e5473555b48c306aa216" REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES='cdrtools-3.01~a07.patch' diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe index 04fecbb0f..5e1ce9305 100644 --- a/app-doc/doxygen/doxygen-1.6.3.recipe +++ b/app-doc/doxygen/doxygen-1.6.3.recipe @@ -12,7 +12,7 @@ LICENSE="GNU GPL v2" SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz" CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87" REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="doxygen-1.6.3.patch" diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe index a2f233175..24cf3f294 100644 --- a/app-editors/nano/nano-2.2.6.recipe +++ b/app-editors/nano/nano-2.2.6.recipe @@ -6,7 +6,7 @@ CHECKSUM_MD5="03233ae480689a008eb98feb1b599807" LICENSE="GNU GPL v3" COPYRIGHT="1999-2010 Free Software Foundation, Inc. " REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="nano-2.2.6.patchset" diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe index d3066f507..935af6b3e 100644 --- a/app-text/htmldoc/htmldoc-1.8.27.recipe +++ b/app-text/htmldoc/htmldoc-1.8.27.recipe @@ -9,7 +9,7 @@ COPYRIGHT="1997-2006 Easy Software Products" SRC_URI="http://www.msweet.org/files/project1/htmldoc-1.8.27-source.tar.bz2" CHECKSUM_MD5="35589e7b8fe9c54e11be87cd5aec4dcc" REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="htmldoc-1.8.27.patchset" diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe index b55724fca..83609ed8e 100644 --- a/dev-lang/perl/perl-5.10.1.recipe +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -21,7 +21,7 @@ LICENSE="GNU GPL v1 SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz" CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" REVISION="5" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" perl = $portVersion compat >= 5 diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe index 0b4739121..19d375342 100644 --- a/dev-lang/python/python-2.6.8.recipe +++ b/dev-lang/python/python-2.6.8.recipe @@ -10,7 +10,7 @@ COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2" CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125" REVISION="4" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="python-2.6.8.patch" diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe index 3dec155ef..b44093f65 100644 --- a/dev-lang/yasm/yasm-1.2.0.recipe +++ b/dev-lang/yasm/yasm-1.2.0.recipe @@ -11,7 +11,7 @@ LICENSE=" " COPYRIGHT="2001-2011 Peter Johnson and other Yasm developers." REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" yasm = $portVersion compat >= 1 diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe index 23dff7339..7310c88a8 100644 --- a/dev-libs/apr/apr-1.4.6.recipe +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2012 The Apache Software Foundation." LICENSE="Apache v2" CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb" REVISION="7" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="apr-1.4.6.patch" 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 ba725ed9b..33bf4b8f5 100644 --- a/dev-libs/apr_util/apr_util-1.4.1.recipe +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -5,7 +5,7 @@ LICENSE="Apache v2" COPYRIGHT="2011 The Apache Software Foundation." CHECKSUM_MD5="666a5d56098a9debf998510e304c8095" REVISION="4" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="apr_util-1.4.1.patch" 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 464eb0158..a14227833 100644 --- a/dev-libs/libedit/libedit-2012_06_01_3.0.recipe +++ b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe @@ -6,7 +6,7 @@ HOMEPAGE="http://www.thrysoee.dk/editline/" SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz" CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="libedit-2012_06_01_3.0.patch" diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe index 007a2ed07..f630dd2bd 100644 --- a/dev-libs/libpcre/libpcre-8.21.recipe +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -16,7 +16,7 @@ COPYRIGHT=" SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2" CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" REVISION="5" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libpcre = $portVersion diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe index b1fd066ab..dfd7ac790 100644 --- a/dev-util/cmake/cmake-2.8.5.recipe +++ b/dev-util/cmake/cmake-2.8.5.recipe @@ -6,7 +6,7 @@ COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz" CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5" REVISION="6" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="cmake-2.8.5.patchset" diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe index b526f714f..da85ba2e9 100644 --- a/dev-util/ctags/ctags-5.8.recipe +++ b/dev-util/ctags/ctags-5.8.recipe @@ -6,7 +6,7 @@ LICENSE="GNU GPL v2" SRC_URI="http://prdownloads.sourceforge.net/ctags/ctags-5.8.tar.gz" CHECKSUM_MD5="c00f82ecdcc357434731913e5b48630d" REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" ctags = $portVersion compat >= 5.8 diff --git a/dev-util/gperf/gperf-3.0.4.recipe b/dev-util/gperf/gperf-3.0.4.recipe index 0e96a667d..64c6a56d3 100644 --- a/dev-util/gperf/gperf-3.0.4.recipe +++ b/dev-util/gperf/gperf-3.0.4.recipe @@ -10,7 +10,7 @@ LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz" CHECKSUM_MD5="c1f1db32fb6598d6a93e6e88796a8632" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="gperf-3.0.4.patch" diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe index 0801a1019..d6ac46106 100644 --- a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe +++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe @@ -6,7 +6,7 @@ COPYRIGHT="1998, 2001-2006 Red Hat Inc." SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz" CHECKSUM_MD5="5392b4e3372879c5bf856173b418d6a2" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="pkgconfig-0.27.1.patchset" diff --git a/dev-util/scons/scons-2.2.0.recipe b/dev-util/scons/scons-2.2.0.recipe index 75e48e55e..a3a232cd9 100644 --- a/dev-util/scons/scons-2.2.0.recipe +++ b/dev-util/scons/scons-2.2.0.recipe @@ -6,7 +6,7 @@ COPYRIGHT="2001-2012 The SCons Foundation" SRC_URI="http://superb-dca3.dl.sourceforge.net/project/scons/scons/2.2.0/scons-2.2.0.tar.gz" CHECKSUM_MD5="f737f474a02d08156c821bd2d4d4b632" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="scons-2.2.0.patchset" diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe index ea07e8410..9dcbefc8f 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.recipe +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -18,7 +18,7 @@ LICENSE="GNU GPL v1 SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2" CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf" REVISION="5" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="cvs-1.12.13.1.patch" diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe index 31e03ddab..10a0c5de3 100644 --- a/dev-vcs/git/git-1.8.3.4.recipe +++ b/dev-vcs/git/git-1.8.3.4.recipe @@ -26,7 +26,7 @@ CHECKSUM_MD5_3="be01cc4be1b946b053b69d12b422854a" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe index fb3d5d474..3ce80e9ee 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -6,7 +6,7 @@ LICENSE="GNU GPL v2" SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz" CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11" REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="mercurial-2.2.2.patch" diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe index 8ee1c0d1c..1d1847c13 100644 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -13,7 +13,7 @@ COPYRIGHT="2010 The Apache Software Foundation" SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2" CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925" REVISION="6" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="subversion-1.6.18.patch" 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 dfdf309e4..7c3e64e4b 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 @@ -14,7 +14,7 @@ COPYRIGHT=" 2000-2010 Michael Pfeiffer" LICENSE="GNU GPL v2" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" bepdf = $portVersion diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe index 9f79f7359..cc94368f6 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe @@ -5,7 +5,7 @@ COPYRIGHT="1999-2003 Stas Maximov" LICENSE="BSD (4-clause)" SRC_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher(haiku)#release_1_2_7_10" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" keymapswitcher = $portVersion compat >= 1.2.7 diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe index 74bf188c5..e856b0f0a 100644 --- a/haiku-apps/mkdepend/mkdepend-1.7.recipe +++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe @@ -7,7 +7,7 @@ COPYRIGHT="1995-2001 Lars Düning. All Rights Reserved" SRC_URI="source/mkdepend-1.7.zip" CHECKSUM_MD5="d4ec4fea9dd9b7292b52d780c8ee3387" REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" mkdepend = $portVersion diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe index 02b7c1e90..4c2f4bc06 100644 --- a/haiku-apps/pe/pe-2.4.3_hg602.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe @@ -11,7 +11,7 @@ COPYRIGHT=" " SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#602" REVISION="4" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="pe-2.4.3_hg602.patch" diff --git a/haiku-apps/vision/vision-0.9.7.r944.recipe b/haiku-apps/vision/vision-0.9.7.r944.recipe index d8cd6b814..3791624ca 100644 --- a/haiku-apps/vision/vision-0.9.7.r944.recipe +++ b/haiku-apps/vision/vision-0.9.7.r944.recipe @@ -5,7 +5,7 @@ SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7#944" LICENSE="MPL v1.1" COPYRIGHT="1999-2010 The Vision Team" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" if [ $targetArchitecture != x86_gcc2 ]; then PATCHES="vision-0.9.7-gcc4.patch" diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe index dfe5a49d9..57b9b6e08 100644 --- a/net-misc/neon/neon-0.29.6.recipe +++ b/net-misc/neon/neon-0.29.6.recipe @@ -23,7 +23,7 @@ COPYRIGHT="1999-2011 Joe Orton" SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz" CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc" REVISION="7" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="neon-0.29.6.patch" diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index a44a5f055..b128a0192 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2005-2012 Tatu Ylonen et al." SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz" CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b" REVISION="7" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="openssh-6.0p1.patch" diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe index e72116606..12fdaf31b 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe @@ -9,7 +9,7 @@ LICENSE=" " COPYRIGHT="2003-2012 Jouni Malinen" REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="wpa_supplicant-2.0.patch" diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe index 17d2ef7ae..0b1fe50e5 100644 --- a/sys-apps/gawk/gawk-3.1.8.recipe +++ b/sys-apps/gawk/gawk-3.1.8.recipe @@ -15,7 +15,7 @@ HOMEPAGE="http://www.gnu.org/software/coreutils" SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-3.1.8.tar.bz2" CHECKSUM_MD5="52b41c6c4418b3226dfb8f82076193bb" REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" gawk = $portVersion compat >= 3 diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe index c8d88c150..a526b0f72 100644 --- a/sys-apps/grep/grep-2.14.recipe +++ b/sys-apps/grep/grep-2.14.recipe @@ -9,7 +9,7 @@ CHECKSUM_MD5="db55b9fc67d8c0895f3c73e94e2aebe3" #SRC_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz" #CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab" REVISION="5" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="grep-2.14-gcc2.patch" diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe index 201c3df44..7166ba58e 100644 --- a/sys-apps/groff/groff-1.20.1.recipe +++ b/sys-apps/groff/groff-1.20.1.recipe @@ -6,7 +6,7 @@ CHECKSUM_MD5="48fa768dd6fdeb7968041dd5ae8e2b02" LICENSE="GNU GPL v3" COPYRIGHT="2003-2009 Free Software Foundation, Inc." REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" groff = $portVersion compat >= 1.20 diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe index daf2ca373..1809240b1 100644 --- a/sys-apps/man/man-1.6g.recipe +++ b/sys-apps/man/man-1.6g.recipe @@ -6,7 +6,7 @@ CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660" LICENSE="GNU GPL v2" COPYRIGHT="1989-2012 Free Software Foundation, Inc." REVISION="2" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="man-1.6g.patch" diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe index 61ea22987..503a9dc89 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -15,7 +15,7 @@ LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz" CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86" REVISION="6" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" sed = $portVersion compat >= 4 diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe index 4d65ccff8..ca7fac936 100644 --- a/sys-apps/texinfo/texinfo-4.13a.recipe +++ b/sys-apps/texinfo/texinfo-4.13a.recipe @@ -6,7 +6,7 @@ LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz" CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb" REVISION="7" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" texinfo = $portVersion compat >= 4.13 diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index 0ee7aab9f..076837328 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -14,7 +14,7 @@ LICENSE=" SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz" CHECKSUM_MD5="82d05e03b93e45f5a39b828dc9c6c29b" REVISION="4" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" autoconf = $portVersion compat >= 2.60 diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index f8f2c7d90..83cb33e6f 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -11,7 +11,7 @@ LICENSE="GNU GPL v2" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz" CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847" REVISION="4" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" automake = $portVersion compat >= 1.13 diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe index 939ccb9a8..d84c01167 100644 --- a/sys-devel/bison/bison-2.4.3.recipe +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -17,7 +17,7 @@ LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz" CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73" REVISION="5" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" bison = $portVersion compat >= 2.4 diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index 4e919bc1c..353397c89 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -9,7 +9,7 @@ LICENSE="Flex" SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download" CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57" REVISION="6" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" flex = $portVersion compat >= 2.5 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 ef31f6267..00d374bcc 100644 --- a/sys-devel/jam/jam-2.5_2012_10_12.recipe +++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe @@ -23,7 +23,7 @@ SRC_URI=" git+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462 " REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" jam = $portVersion diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index a35085da5..f7fde1503 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -9,7 +9,7 @@ LICENSE="GNU GPL v2" SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz" CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" REVISION="8" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES=" 2.4/adjust_config_for_packaging.patch diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe index 2e748b82f..390f3b74d 100644 --- a/sys-devel/m4/m4-1.4.16.recipe +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -22,7 +22,7 @@ LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz" CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" REVISION="5" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" m4 = $portVersion compat >= 1.4 diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index d6bb87584..66237e93c 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -15,7 +15,7 @@ COPYRIGHT="1988-2010 Free Software Foundation, Inc." SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2" CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f" REVISION="5" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" make = $portVersion compat >= 3.82 diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe index ba26d751e..86e896233 100644 --- a/sys-libs/readline/readline-6.2.recipe +++ b/sys-libs/readline/readline-6.2.recipe @@ -8,7 +8,7 @@ LICENSE="GNU GPL v3" SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz" CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c" REVISION="3" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES="readline-6.2.patch" From dee373938d06fbf00ab47d06e536fa4743227e75 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 17 Aug 2013 09:38:54 +0200 Subject: [PATCH 390/587] Add secondary arch support for wonderbrush and old mesa --- .../wonderbrush/wonderbrush-2.1.2.recipe | 21 +++++++----- sys-libs/mesa/mesa-7.8.2.recipe | 33 +++++++++++-------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe index 55915e79e..ecfa7adf1 100644 --- a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe +++ b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe @@ -9,21 +9,26 @@ COPYRIGHT="2005, Stephan Aßmus und Ingo Weinhold GbR" SRC_URI="http://yellowbites.com/downloads/WonderBrush-2.1.2-x86-gcc2-2013-01-02.zip#noarchive" CHECKSUM_MD5="28e64a56946c9f5aefa40486f35ffc77" REVISION="4" -ARCHITECTURES="x86_gcc2 !x86" +ARCHITECTURES="x86_gcc2" +if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ] +then + ARCHITECTURES="$ARCHITECTURES x86" +fi +SECONDARY_ARCHITECTURES="x86_gcc2" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" - wonderbrush = $portVersion compat >= 2 + wonderbrush$secondaryArchSuffix = $portVersion compat >= 2 " REQUIRES=" - haiku >= r1~alpha3_pm-1 - lib:libfreetype >= 6 - lib:libz >= 1 + haiku$secondaryArchSuffix >= r1~alpha3_pm-1 + lib:libfreetype$secondaryArchSuffix >= 6 + lib:libz$secondaryArchSuffix >= 1 " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku + haiku$secondaryArchSuffix coreutils cmd:unzip " @@ -47,9 +52,9 @@ INSTALL() # Hack to make libfreetype and libz available under the name WonderBrush # has been linked against them. - ln -s $portPackageLinksDir/lib~libfreetype/lib/libfreetype.so.6 \ + ln -s $portPackageLinksDir/lib~libfreetype$secondaryArchSuffix/lib/libfreetype.so.6 \ $wonderbrushDir/lib/libfreetype.so - ln -s $portPackageLinksDir/lib~libz/lib/libz.so.1 \ + ln -s $portPackageLinksDir/lib~libz$secondaryArchSuffix/lib/libz.so.1 \ $wonderbrushDir/lib/libz.so addAppDeskbarSymlink $wonderbrushDir/WonderBrush diff --git a/sys-libs/mesa/mesa-7.8.2.recipe b/sys-libs/mesa/mesa-7.8.2.recipe index b9c9ed443..f1a634fe8 100644 --- a/sys-libs/mesa/mesa-7.8.2.recipe +++ b/sys-libs/mesa/mesa-7.8.2.recipe @@ -16,21 +16,26 @@ LICENSE="MIT" SRC_URI="ftp://freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2" CHECKSUM_MD5="6be2d343a0089bfd395ce02aaf8adb57" REVISION="3" -ARCHITECTURES="x86_gcc2 !x86" +ARCHITECTURES="x86_gcc2" +if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ] +then + ARCHITECTURES="$ARCHITECTURES x86" +fi +SECONDARY_ARCHITECTURES="x86_gcc2" PROVIDES=" - mesa = $portVersion + mesa$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:find - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make cmd:sed " @@ -67,14 +72,14 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - mesa_devel = $portVersion - devel:libglapi = $portVersion - devel:libglslcl = $portVersion - devel:libglslpp = $portVersion - devel:libglu = $portVersion - devel:libmesa = $portVersion - devel:libmesagallium = $portVersion + mesa${secondaryArchSuffix}_devel = $portVersion + devel:libglapi$secondaryArchSuffix = $portVersion + devel:libglslcl$secondaryArchSuffix = $portVersion + devel:libglslpp$secondaryArchSuffix = $portVersion + devel:libglu$secondaryArchSuffix = $portVersion + devel:libmesa$secondaryArchSuffix = $portVersion + devel:libmesagallium$secondaryArchSuffix = $portVersion " REQUIRES_devel=" - mesa == $portVersion base + mesa$secondaryArchSuffix == $portVersion base " From 3d8703d1e12c84a9066cf34539fe5798c5514cc3 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 17 Aug 2013 09:39:24 +0200 Subject: [PATCH 391/587] Add recipe for current gcc 2 version --- sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe | 154 +++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe 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 new file mode 100644 index 000000000..b9f78b7f0 --- /dev/null +++ b/sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe @@ -0,0 +1,154 @@ +SUMMARY="C/C++ compiler" +DESCRIPTION="Standard compiler for x86_gcc2 platform, ABI-compatible with BeOS R5." +HOMEPAGE="http://gcc.gnu.org" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2000 Free Software Foundation, Inc." +SRC_URI=" + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + " +REVISION="2" +ARCHITECTURES="x86_gcc2" +if [ $effectiveTargetArchitecture = x86_gcc2 -a $targetArchitecture = x86 ] +then + ARCHITECTURES="$ARCHITECTURES x86" +fi +SECONDARY_ARCHITECTURES="x86_gcc2" + +PROVIDES=" + gcc$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:cc$secondaryArchSuffix + cmd:c++$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:c++filt$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:cpp$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:g++$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:gcc$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:gcov$secondaryArchSuffix = 1.5 compat >= 1.5 + cmd:i586_pc_haiku_gcc$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:protoize$secondaryArchSuffix = $portVersion compat >= 2.95.3 + cmd:unprotoize$secondaryArchSuffix = $portVersion compat >= 2.95.3 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + binutils$secondaryArchSuffix + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + gcc$secondaryArchSuffix + cmd:flex + cmd:make + cmd:sed + cmd:tar + cmd:makeinfo + " + +SOURCE_DIR="$portVersionedName/legacy/gcc" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +gccDir=$(pwd) +relativeGccInstallDir="develop/tools$secondaryArchSubDir" +gccInstallDir="$prefix/$relativeGccInstallDir" +gccObjectsDir=$gccDir/../gcc-obj + +BUILD() +{ + rm -rf $gccObjectsDir + + # Touch some files generated by bison, so that bison won't run to update + # them. Fixes issues with newer bison versions. + # And while at it, touch gperf target, too (as gperf may not be installed). + (cd gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + cp/parse.h c-gperf.h) + + mkdir -p $gccObjectsDir + cd $gccObjectsDir + + local additionalConfigureFlags + if [ -n "$secondaryArchSuffix" ]; then + additionalConfigureFlags="\ + --with-hybrid-secondary=${effectiveTargetArchitecture}" + fi + + CFLAGS="-O2" CXXFLAGS="-O2" "$gccDir/configure" \ + --prefix=$gccInstallDir \ + --disable-nls --enable-shared=yes --enable-languages=c,c++ \ + $additionalConfigureFlags + make bootstrap +} + +INSTALL() +{ + cd $gccObjectsDir + make install + + rm $gccInstallDir/lib/libiberty.a + # only needed for building gcc + + ### HTML documentation #################################### + + local html_base=$docDir + if [ ! -d "$html_base" ]; then + echo "Building HTML documentation..." + mkdir -p $html_base + cd $html_base + + makeinfo --html "$gccDir/gcc/cpp.texi" + makeinfo --html "$gccDir/gcc/gcc.texi" + makeinfo --force --html "$gccDir/libio/iostream.texi" \ + && true + # some errors + + ln -sf cpp/index.html $html_base/cpp.html + ln -sf gcc/index.html $html_base/gcc.html + ln -sf iostream/index.html $html_base/iostream.html + fi + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # convert to absolute links to relative ones + cd $gccInstallDir/bin + ln -sfn g++ c++ + ln -sfn gcc cc + ln -sfn gcc $effectiveTargetMachineTriple-gcc + + # make all tools available via default paths + echo "Symlinking binaries into default path" + mkdir -p $binDir + symlinkRelative -s $installDir/bin/* $binDir + + ### Strip ################################################# + + echo "Strip debug info" + + cd $gccInstallDir + strip --strip-debug bin/* + strip --strip-debug lib/gcc-lib/$effectiveTargetMachineTriple/2.95.3-*/* \ + &>/dev/null || true + + ### Cleanup ############################################### + + echo "Cleanup" + + cd $gccInstallDir + rm -rf info + rm -rf share + rm man/man1/cccp.1 + + ### C++ includes ########################################## + + echo "Install C++ includes & library" + + rm -rf $gccInstallDir/include/g++ + ln -snf /boot/system/develop/headers/c++/2.95.3 $gccInstallDir/include/g++ + + ln -snf /boot/system/lib/libstdc++.r4.so $gccInstallDir/lib/ +} From 9f8ce2d93cd848e4e72ec4fd7d7631fcaff734f7 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 17 Aug 2013 10:48:35 +0200 Subject: [PATCH 392/587] gcc 4: add missing cc symlink --- sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 b0647b151..d713aa937 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 @@ -10,7 +10,7 @@ SRC_URI=" git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c " -REVISION="1" +REVISION="2" ARCHITECTURES="x86" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -116,9 +116,12 @@ INSTALL() echo "Creating required symlinks" + # create missing cc symlink + ln -sf gcc $installDir/bin/cc + # make all tools available via default paths mkdir -p $binDir - for f in c++ cpp g++ gcc gcov; do + for f in c++ cc cpp g++ gcc gcov; do symlinkRelative -sfn $installDir/bin/$f $binDir done From 4f4c9d84cfe75a67cfee6e546df2eba8804fca7e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 18 Aug 2013 11:53:18 -0700 Subject: [PATCH 393/587] Added recipe for curl-7.32.0 --- net-misc/curl/curl-7.32.0.recipe | 115 +++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 net-misc/curl/curl-7.32.0.recipe diff --git a/net-misc/curl/curl-7.32.0.recipe b/net-misc/curl/curl-7.32.0.recipe new file mode 100644 index 000000000..bcaa62d04 --- /dev/null +++ b/net-misc/curl/curl-7.32.0.recipe @@ -0,0 +1,115 @@ +SUMMARY="A commandline-tool and library for downloading data from URLs" +HOMEPAGE="http://curl.haxx.se" +COPYRIGHT="1996-2013, Daniel Stenberg, . All rights reserved." +LICENSE="Curl" +SRC_URI="http://curl.haxx.se/download/curl-7.32.0.tar.bz2" +CHECKSUM_MD5="30d04b0a8c43c6770039d1bf033dfe79" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="" + +PROVIDES=" + curl$secondaryArchSuffix = $portVersion + lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:curl = $portVersion compat >= 7.16 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + ca_root_certificates + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + certsInstallDir="$portPackageLinksDir/ca_root_certificates" + certsDir="$certsInstallDir/$relativeDataRootDir/ssl" + + libtoolize --force --copy --install + autoconf + runConfigure ./configure \ + --enable-ipv6 \ + --with-ca-bundle="$certsDir/CARootCertificates.pem" + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs libcurl + fixPkgconfig + + # fix curl-config + fixDevelopLibDirReferences $binDir/curl-config + sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \ + -e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config + + # install html documentation for curl + mkdir -p "$docDir" + install -c -m 644 "docs/curl.html" "$docDir" + + # install html development documentation for libcurl + mkdir -p "$developDocDir" + for h in docs/libcurl/*.html; do + install -c -m 644 "$h" "$developDocDir" + done + + # devel package + packageEntries devel \ + $binDir/curl-config \ + $developDir \ + $manDir/man3 + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi +} + +TEST() +{ + make check +} + +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. + " + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + curl${secondaryArchSuffix}_devel = $portVersion + cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16 + devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 + " +REQUIRES_devel=" + curl$secondaryArchSuffix == $portVersion base + " From 63b5f5ae87e9c71b75da884c01feee513a7061b2 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 18 Aug 2013 12:13:54 -0700 Subject: [PATCH 394/587] Corrected license for ubuntu fonts --- .../ubuntu/licenses/Ubuntu Font License 1.0 | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 media-fonts/ubuntu/licenses/Ubuntu Font License 1.0 diff --git a/media-fonts/ubuntu/licenses/Ubuntu Font License 1.0 b/media-fonts/ubuntu/licenses/Ubuntu Font License 1.0 new file mode 100644 index 000000000..ae78a8f94 --- /dev/null +++ b/media-fonts/ubuntu/licenses/Ubuntu Font License 1.0 @@ -0,0 +1,96 @@ +------------------------------- +UBUNTU FONT LICENCE Version 1.0 +------------------------------- + +PREAMBLE +This licence allows the licensed fonts to be used, studied, modified and +redistributed freely. The fonts, including any derivative works, can be +bundled, embedded, and redistributed provided the terms of this licence +are met. The fonts and derivatives, however, cannot be released under +any other licence. The requirement for fonts to remain under this +licence does not require any document created using the fonts or their +derivatives to be published under this licence, as long as the primary +purpose of the document is not to be a vehicle for the distribution of +the fonts. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this licence and clearly marked as such. This may +include source files, build scripts and documentation. + +"Original Version" refers to the collection of Font Software components +as received under this licence. + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to +a new environment. + +"Copyright Holder(s)" refers to all individuals and companies who have a +copyright ownership of the Font Software. + +"Substantially Changed" refers to Modified Versions which can be easily +identified as dissimilar to the Font Software by users of the Font +Software comparing the Original Version with the Modified Version. + +To "Propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification and with or without charging +a redistribution fee), making available to the public, and in some +countries other activities as well. + +PERMISSION & CONDITIONS +This licence does not grant any rights under trademark law and all such +rights are reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of the Font Software, to propagate the Font Software, subject to +the below conditions: + +1) Each copy of the Font Software must contain the above copyright +notice and this licence. These can be included either as stand-alone +text files, human-readable headers or in the appropriate machine- +readable metadata fields within text or binary files as long as those +fields can be easily viewed by the user. + +2) The font name complies with the following: +(a) The Original Version must retain its name, unmodified. +(b) Modified Versions which are Substantially Changed must be renamed to +avoid use of the name of the Original Version or similar names entirely. +(c) Modified Versions which are not Substantially Changed must be +renamed to both (i) retain the name of the Original Version and (ii) add +additional naming elements to distinguish the Modified Version from the +Original Version. The name of such Modified Versions must be the name of +the Original Version, with "derivative X" where X represents the name of +the new work, appended to that name. + +3) The name(s) of the Copyright Holder(s) and any contributor to the +Font Software shall not be used to promote, endorse or advertise any +Modified Version, except (i) as required by this licence, (ii) to +acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with +their explicit written permission. + +4) The Font Software, modified or unmodified, in part or in whole, must +be distributed entirely under this licence, and must not be distributed +under any other licence. The requirement for fonts to remain under this +licence does not affect any document created using the Font Software, +except any version of the Font Software extracted from a document +created using the Font Software may only be distributed under this +licence. + +TERMINATION +This licence becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF +COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER +DEALINGS IN THE FONT SOFTWARE. From ba82906ab2979c0cc1ca3a1f4f7bb564cb62a563 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 18 Aug 2013 12:26:24 -0700 Subject: [PATCH 395/587] Renamed ubuntu to ubunto_fonts --- .../licenses/Ubuntu Font License 1.0 | 0 .../ubuntu/licenses/Ubuntu Font License 1.0 | 96 +++++++++++++++++++ .../ubuntu/ubuntu-0.80.recipe | 9 +- .../ubuntu_fonts/ubuntu_fonts-0.80.recipe | 31 ++++++ 4 files changed, 131 insertions(+), 5 deletions(-) rename media-fonts/{ubuntu => ubuntu_fonts}/licenses/Ubuntu Font License 1.0 (100%) create mode 100644 media-fonts/ubuntu_fonts/ubuntu/licenses/Ubuntu Font License 1.0 rename media-fonts/{ => ubuntu_fonts}/ubuntu/ubuntu-0.80.recipe (81%) create mode 100644 media-fonts/ubuntu_fonts/ubuntu_fonts-0.80.recipe diff --git a/media-fonts/ubuntu/licenses/Ubuntu Font License 1.0 b/media-fonts/ubuntu_fonts/licenses/Ubuntu Font License 1.0 similarity index 100% rename from media-fonts/ubuntu/licenses/Ubuntu Font License 1.0 rename to media-fonts/ubuntu_fonts/licenses/Ubuntu Font License 1.0 diff --git a/media-fonts/ubuntu_fonts/ubuntu/licenses/Ubuntu Font License 1.0 b/media-fonts/ubuntu_fonts/ubuntu/licenses/Ubuntu Font License 1.0 new file mode 100644 index 000000000..ae78a8f94 --- /dev/null +++ b/media-fonts/ubuntu_fonts/ubuntu/licenses/Ubuntu Font License 1.0 @@ -0,0 +1,96 @@ +------------------------------- +UBUNTU FONT LICENCE Version 1.0 +------------------------------- + +PREAMBLE +This licence allows the licensed fonts to be used, studied, modified and +redistributed freely. The fonts, including any derivative works, can be +bundled, embedded, and redistributed provided the terms of this licence +are met. The fonts and derivatives, however, cannot be released under +any other licence. The requirement for fonts to remain under this +licence does not require any document created using the fonts or their +derivatives to be published under this licence, as long as the primary +purpose of the document is not to be a vehicle for the distribution of +the fonts. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this licence and clearly marked as such. This may +include source files, build scripts and documentation. + +"Original Version" refers to the collection of Font Software components +as received under this licence. + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to +a new environment. + +"Copyright Holder(s)" refers to all individuals and companies who have a +copyright ownership of the Font Software. + +"Substantially Changed" refers to Modified Versions which can be easily +identified as dissimilar to the Font Software by users of the Font +Software comparing the Original Version with the Modified Version. + +To "Propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification and with or without charging +a redistribution fee), making available to the public, and in some +countries other activities as well. + +PERMISSION & CONDITIONS +This licence does not grant any rights under trademark law and all such +rights are reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of the Font Software, to propagate the Font Software, subject to +the below conditions: + +1) Each copy of the Font Software must contain the above copyright +notice and this licence. These can be included either as stand-alone +text files, human-readable headers or in the appropriate machine- +readable metadata fields within text or binary files as long as those +fields can be easily viewed by the user. + +2) The font name complies with the following: +(a) The Original Version must retain its name, unmodified. +(b) Modified Versions which are Substantially Changed must be renamed to +avoid use of the name of the Original Version or similar names entirely. +(c) Modified Versions which are not Substantially Changed must be +renamed to both (i) retain the name of the Original Version and (ii) add +additional naming elements to distinguish the Modified Version from the +Original Version. The name of such Modified Versions must be the name of +the Original Version, with "derivative X" where X represents the name of +the new work, appended to that name. + +3) The name(s) of the Copyright Holder(s) and any contributor to the +Font Software shall not be used to promote, endorse or advertise any +Modified Version, except (i) as required by this licence, (ii) to +acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with +their explicit written permission. + +4) The Font Software, modified or unmodified, in part or in whole, must +be distributed entirely under this licence, and must not be distributed +under any other licence. The requirement for fonts to remain under this +licence does not affect any document created using the Font Software, +except any version of the Font Software extracted from a document +created using the Font Software may only be distributed under this +licence. + +TERMINATION +This licence becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF +COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER +DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/ubuntu/ubuntu-0.80.recipe b/media-fonts/ubuntu_fonts/ubuntu/ubuntu-0.80.recipe similarity index 81% rename from media-fonts/ubuntu/ubuntu-0.80.recipe rename to media-fonts/ubuntu_fonts/ubuntu/ubuntu-0.80.recipe index 5a0da9f2c..12e23db31 100644 --- a/media-fonts/ubuntu/ubuntu-0.80.recipe +++ b/media-fonts/ubuntu_fonts/ubuntu/ubuntu-0.80.recipe @@ -1,7 +1,7 @@ -DESCRIPTION="Font family from Ubunu operating system" +DESCRIPTION="Font family from Ubuntu operating system" HOMEPAGE="http://font.ubuntu.com" SRC_URI="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" BUILD { @@ -25,8 +25,7 @@ INSTALL { cp UbuntuMono-R.ttf ${FONTDIR} cp UbuntuMono-RI.ttf ${FONTDIR} cp README.txt ${FONTDIR}/ubuntu-fonts-readme.txt - cp LICENCE.txt ${FONTDIR}/ubuntu-fonts-licence.txt } -LICENSE="Artistic" -COPYRIGHT="Canonical Ltd." +LICENSE="Ubunu Fonts License 1.0" +COPYRIGHT="2011 Canonical Ltd." diff --git a/media-fonts/ubuntu_fonts/ubuntu_fonts-0.80.recipe b/media-fonts/ubuntu_fonts/ubuntu_fonts-0.80.recipe new file mode 100644 index 000000000..12e23db31 --- /dev/null +++ b/media-fonts/ubuntu_fonts/ubuntu_fonts-0.80.recipe @@ -0,0 +1,31 @@ +DESCRIPTION="Font family from Ubuntu operating system" +HOMEPAGE="http://font.ubuntu.com" +SRC_URI="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip" +REVISION="2" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd ubuntu-font-family-0.80 +} +INSTALL { + cd ubuntu-font-family-0.80 + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ubuntu + mkdir -p ${FONTDIR} + cp Ubuntu-B.ttf ${FONTDIR} + cp Ubuntu-BI.ttf ${FONTDIR} + cp Ubuntu-C.ttf ${FONTDIR} + cp Ubuntu-L.ttf ${FONTDIR} + cp Ubuntu-LI.ttf ${FONTDIR} + cp Ubuntu-M.ttf ${FONTDIR} + cp Ubuntu-MI.ttf ${FONTDIR} + cp Ubuntu-R.ttf ${FONTDIR} + cp Ubuntu-RI.ttf ${FONTDIR} + cp UbuntuMono-B.ttf ${FONTDIR} + cp UbuntuMono-BI.ttf ${FONTDIR} + cp UbuntuMono-R.ttf ${FONTDIR} + cp UbuntuMono-RI.ttf ${FONTDIR} + cp README.txt ${FONTDIR}/ubuntu-fonts-readme.txt +} + +LICENSE="Ubunu Fonts License 1.0" +COPYRIGHT="2011 Canonical Ltd." From 759b6524d11324541c29e5ea027f2e6e1856655c Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 18 Aug 2013 12:34:21 -0700 Subject: [PATCH 396/587] Deleted stray ubuntu directory --- .../ubuntu/licenses/Ubuntu Font License 1.0 | 96 ------------------- .../ubuntu_fonts/ubuntu/ubuntu-0.80.recipe | 31 ------ 2 files changed, 127 deletions(-) delete mode 100644 media-fonts/ubuntu_fonts/ubuntu/licenses/Ubuntu Font License 1.0 delete mode 100644 media-fonts/ubuntu_fonts/ubuntu/ubuntu-0.80.recipe diff --git a/media-fonts/ubuntu_fonts/ubuntu/licenses/Ubuntu Font License 1.0 b/media-fonts/ubuntu_fonts/ubuntu/licenses/Ubuntu Font License 1.0 deleted file mode 100644 index ae78a8f94..000000000 --- a/media-fonts/ubuntu_fonts/ubuntu/licenses/Ubuntu Font License 1.0 +++ /dev/null @@ -1,96 +0,0 @@ -------------------------------- -UBUNTU FONT LICENCE Version 1.0 -------------------------------- - -PREAMBLE -This licence allows the licensed fonts to be used, studied, modified and -redistributed freely. The fonts, including any derivative works, can be -bundled, embedded, and redistributed provided the terms of this licence -are met. The fonts and derivatives, however, cannot be released under -any other licence. The requirement for fonts to remain under this -licence does not require any document created using the fonts or their -derivatives to be published under this licence, as long as the primary -purpose of the document is not to be a vehicle for the distribution of -the fonts. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this licence and clearly marked as such. This may -include source files, build scripts and documentation. - -"Original Version" refers to the collection of Font Software components -as received under this licence. - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to -a new environment. - -"Copyright Holder(s)" refers to all individuals and companies who have a -copyright ownership of the Font Software. - -"Substantially Changed" refers to Modified Versions which can be easily -identified as dissimilar to the Font Software by users of the Font -Software comparing the Original Version with the Modified Version. - -To "Propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification and with or without charging -a redistribution fee), making available to the public, and in some -countries other activities as well. - -PERMISSION & CONDITIONS -This licence does not grant any rights under trademark law and all such -rights are reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of the Font Software, to propagate the Font Software, subject to -the below conditions: - -1) Each copy of the Font Software must contain the above copyright -notice and this licence. These can be included either as stand-alone -text files, human-readable headers or in the appropriate machine- -readable metadata fields within text or binary files as long as those -fields can be easily viewed by the user. - -2) The font name complies with the following: -(a) The Original Version must retain its name, unmodified. -(b) Modified Versions which are Substantially Changed must be renamed to -avoid use of the name of the Original Version or similar names entirely. -(c) Modified Versions which are not Substantially Changed must be -renamed to both (i) retain the name of the Original Version and (ii) add -additional naming elements to distinguish the Modified Version from the -Original Version. The name of such Modified Versions must be the name of -the Original Version, with "derivative X" where X represents the name of -the new work, appended to that name. - -3) The name(s) of the Copyright Holder(s) and any contributor to the -Font Software shall not be used to promote, endorse or advertise any -Modified Version, except (i) as required by this licence, (ii) to -acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with -their explicit written permission. - -4) The Font Software, modified or unmodified, in part or in whole, must -be distributed entirely under this licence, and must not be distributed -under any other licence. The requirement for fonts to remain under this -licence does not affect any document created using the Font Software, -except any version of the Font Software extracted from a document -created using the Font Software may only be distributed under this -licence. - -TERMINATION -This licence becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF -COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER -DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/ubuntu_fonts/ubuntu/ubuntu-0.80.recipe b/media-fonts/ubuntu_fonts/ubuntu/ubuntu-0.80.recipe deleted file mode 100644 index 12e23db31..000000000 --- a/media-fonts/ubuntu_fonts/ubuntu/ubuntu-0.80.recipe +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="Font family from Ubuntu operating system" -HOMEPAGE="http://font.ubuntu.com" -SRC_URI="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd ubuntu-font-family-0.80 -} -INSTALL { - cd ubuntu-font-family-0.80 - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ubuntu - mkdir -p ${FONTDIR} - cp Ubuntu-B.ttf ${FONTDIR} - cp Ubuntu-BI.ttf ${FONTDIR} - cp Ubuntu-C.ttf ${FONTDIR} - cp Ubuntu-L.ttf ${FONTDIR} - cp Ubuntu-LI.ttf ${FONTDIR} - cp Ubuntu-M.ttf ${FONTDIR} - cp Ubuntu-MI.ttf ${FONTDIR} - cp Ubuntu-R.ttf ${FONTDIR} - cp Ubuntu-RI.ttf ${FONTDIR} - cp UbuntuMono-B.ttf ${FONTDIR} - cp UbuntuMono-BI.ttf ${FONTDIR} - cp UbuntuMono-R.ttf ${FONTDIR} - cp UbuntuMono-RI.ttf ${FONTDIR} - cp README.txt ${FONTDIR}/ubuntu-fonts-readme.txt -} - -LICENSE="Ubunu Fonts License 1.0" -COPYRIGHT="2011 Canonical Ltd." From ca6046a1481fb35ac561dccc9cf0ef6756469830 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 19 Aug 2013 21:36:16 -0700 Subject: [PATCH 397/587] Updated cdrtools to 3.01~a17 --- app-cdr/cdrtools/cdrtools-3.01~a17.recipe | 157 ++++++++++++++++++ .../cdrtools/patches/cdrtools-3.01~a17.patch | 139 ++++++++++++++++ 2 files changed, 296 insertions(+) create mode 100644 app-cdr/cdrtools/cdrtools-3.01~a17.recipe create mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch diff --git a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe new file mode 100644 index 000000000..717317b4a --- /dev/null +++ b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe @@ -0,0 +1,157 @@ +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. + +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 + " +HOMEPAGE="http://cdrecord.berlios.de" +COPYRIGHT=" + 1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs) + 1995-2013 J. Schilling (cdrecord) + " +LICENSE=" + GNU GPL v2 + CDDL v1 + " +SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a17.tar.bz2" +CHECKSUM_MD5="4cef9db0cf15a770c52d65b00bbee2db" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86" + +PATCHES='cdrtools-3.01~a17.patch' + +PROVIDES=" + cdrtools = $portVersion compat >= 3 + cmd:devdump = $portVersion compat >= 3 + cmd:rscsi = $portVersion compat >= 3 + cmd:scgcheck = $portVersion compat >= 3 + cmd:mkisofs = $portVersion compat >= 3 + cmd:btcflash = $portVersion compat >= 3 + cmd:scgskeleton = $portVersion compat >= 3 + cmd:isovfy = $portVersion compat >= 3 + cmd:readcd = $portVersion compat >= 3 + cmd:isodebug = $portVersion compat >= 3 + cmd:cdda2mp3 = $portVersion compat >= 3 + cmd:cdda2ogg = $portVersion compat >= 3 + cmd:cdda2wav = $portVersion compat >= 3 + cmd:mkhybrid = $portVersion compat >= 3 + cmd:cdrecord = $portVersion compat >= 3 + cmd:isodump = $portVersion compat >= 3 + cmd:isoinfo = $portVersion compat >= 3 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +GLOBAL_WRITABLE_FILES=" + settings/cdrecord keep-old + settings/rscsi keep-old + " + +SOURCE_DIR="cdrtools-3.01" + +patchInsdir() +{ + # Usage: patchInsdir ... + oldDir=$1 + newDir=$2 + shift 2 + + sed -i "s,^INSDIR=\s*$oldDir,INSDIR= $newDir," $@ +} + +PATCH() +{ + allMakefiles="$(find . -name Makefile\*) $(find . -name \*.mk)" + + patchInsdir bin $relativeBinDir $allMakefiles + patchInsdir sbin $relativeBinDir $allMakefiles + patchInsdir share/doc $relativeDocDir $allMakefiles + patchInsdir include $relativeIncludeDir $allMakefiles + patchInsdir lib $relativeLibDir $allMakefiles + patchInsdir etc/default settings $allMakefiles + + sed -i "s,/etc/default,$sysconfDir," \ + btcflash/btcflash.1 \ + cdda2wav/cdda2mp3 \ + cdda2wav/cdda2ogg \ + cdda2wav/cdda2*.1 \ + cdrecord/COPYING \ + cdrecord/README.* \ + cdrecord/auinfo.c \ + cdrecord/cdrecord.1 \ + doc/*.man \ + doc/*.ps \ + include/schily/deflts.h \ + libcdrdeflt/cdrdeflt.c \ + libcdrdeflt/cdrdeflt.h \ + mkisofs/diag/isoinfo.8 \ + readcd/readcd.1 \ + rscsi/rscsi.1 \ + rscsi/rscsi.c \ + scgskeleton/scgskeleton.1 +} + +BUILD() +{ + make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \ + RUNPATH="" DEFMANBASE=$relativeDocumentationDir + # not multi-job safe +} + +INSTALL() +{ + make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \ + RUNPATH="" DEFMANBASE=$relativeDocumentationDir install + + # The whole lib folder only contains static libraries (even in several + # subdirectories). + mkdir -p $developLibDir + mv $libDir/* $developLibDir/ + rmdir $libDir + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + cdrtools_devel = $portVersion + devel:libcdrdeflt = $portVersion compat >= 3 + devel:libedc_ecc = $portVersion compat >= 3 + devel:libedc_ecc_dec = $portVersion compat >= 3 + devel:libdeflt = $portVersion compat >= 3 + devel:libfile = $portVersion compat >= 3 + devel:libfind = $portVersion compat >= 3 + devel:libhfs = $portVersion compat >= 3 + devel:libmdigest = $portVersion compat >= 3 + devel:libparanoia = $portVersion compat >= 3 + devel:librscg = $portVersion compat >= 3 + devel:libscg = $portVersion compat >= 3 + devel:libsiconv = $portVersion compat >= 3 + devel:libscgcmd = $portVersion compat >= 3 + devel:libschily = $portVersion compat >= 3 + " +REQUIRES_devel=" + cdrtools == $portVersion + " diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch b/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch new file mode 100644 index 000000000..e11110e03 --- /dev/null +++ b/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch @@ -0,0 +1,139 @@ +diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +--- cdrtools-3.01/DEFAULTS/Defaults.haiku ++++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +@@ -29,16 +29,16 @@ + CWARNOPTS= + + DEFINCDIRS= $(SRCROOT)/include +-LDPATH= -L/opt/schily/lib ++LDPATH= -L$(shell finddir B_COMMON_LIB_DIRECTORY) + #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) +-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib ++RUNPATH= -R$(INS_BASE)/lib + + ########################################################################### + # + # Installation config stuff + # + ########################################################################### +-INS_BASE= /boot/opt/schily ++INS_BASE= $(shell finddir B_COMMON_DIRECTORY) + INS_KBASE= / + INS_RBASE= / + # +diff -urN cdrtools-3.01/RULES/x86_64-haiku-cc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul +--- cdrtools-3.01/RULES/x86_64-haiku-cc.rul 1970-01-01 00:00:00.000000000 +0000 ++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul 2012-12-08 19:24:57.418643968 +0000 +@@ -0,0 +1,54 @@ ++#ident "@(#)bepc-haiku-cc.rul 1.3 09/02/05 " ++########################################################################### ++# Written 1996 by J. Schilling ++########################################################################### ++# ++# Platform dependent MACROS for Haiku, a BeOS like OS ++# ++########################################################################### ++# Copyright (c) J. Schilling ++########################################################################### ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License, Version 1.0 only ++# (the "License"). You may not use this file except in compliance ++# with the License. ++# ++# See the file CDDL.Schily.txt in this distribution for details. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file CDDL.Schily.txt from this distribution. ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/rules.prg ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul ++ ++# ++# XXX Old BeOS needs libroot.so to get [efg]cvt() ++# XXX New BeOS seems to have this in libc and in addition we include ++# XXX strtod.c for floating point conversion on OS without such code. ++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been ++# XXX removed and printing floating numbers will work with old/new BeOS ++# ++#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS ++OSDEFS += ++ ++KDEFINES= -DKERNEL -D_KERNEL ++ ++#CONFFLAGS= i586 ++ ++LIB_PREFIX= lib ++LIB_SUFFIX= .a ++SHL_SUFFIX= .so ++ ++#LIB_SOCKET= -lsocket -lbind ++LIB_SOCKET= -lnetwork ++LIB_MATH= ++LIB_KVM= ++ ++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) ++LDOPTS= $(LIBS_PATH) $(LDPATH) ++ ++LORDER= echo ++TSORT= cat ++ ++LN= /bin/ln -s +diff -urN cdrtools-3.01/RULES/x86_64-haiku-gcc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul +--- cdrtools-3.01/RULES/x86_64-haiku-gcc.rul 1970-01-01 00:00:00.000000000 +0000 ++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul 2012-12-08 19:24:57.421265408 +0000 +@@ -0,0 +1,54 @@ ++#ident "@(#)bepc-haiku-gcc.rul 1.3 09/02/05 " ++########################################################################### ++# Written 1996 by J. Schilling ++########################################################################### ++# ++# Platform dependent MACROS for Haiku, a BeOS like OS ++# ++########################################################################### ++# Copyright (c) J. Schilling ++########################################################################### ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License, Version 1.0 only ++# (the "License"). You may not use this file except in compliance ++# with the License. ++# ++# See the file CDDL.Schily.txt in this distribution for details. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file CDDL.Schily.txt from this distribution. ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/rules.prg ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul ++ ++# ++# XXX Old BeOS needs libroot.so to get [efg]cvt() ++# XXX New BeOS seems to have this in libc and in addition we include ++# XXX strtod.c for floating point conversion on OS without such code. ++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been ++# XXX removed and printing floating numbers will work with old/new BeOS ++# ++#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS ++OSDEFS += ++ ++KDEFINES= -DKERNEL -D_KERNEL ++ ++#CONFFLAGS= i586 ++ ++LIB_PREFIX= lib ++LIB_SUFFIX= .a ++SHL_SUFFIX= .so ++ ++#LIB_SOCKET= -lsocket -lbind ++LIB_SOCKET= -lnetwork ++LIB_MATH= ++LIB_KVM= ++ ++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) ++LDOPTS= $(LIBS_PATH) $(LDPATH) ++ ++LORDER= echo ++TSORT= cat ++ ++LN= /bin/ln -s From debec4ed217e6a93bb88b565b3517459f4f9589f Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 19 Aug 2013 21:44:38 -0700 Subject: [PATCH 398/587] Corrected REVISION entry --- app-cdr/cdrtools/cdrtools-3.01~a17.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe index 717317b4a..5d78afffe 100644 --- a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe +++ b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe @@ -24,7 +24,7 @@ LICENSE=" " SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a17.tar.bz2" CHECKSUM_MD5="4cef9db0cf15a770c52d65b00bbee2db" -REVISION="3" +REVISION="1" ARCHITECTURES="x86_gcc2 x86" PATCHES='cdrtools-3.01~a17.patch' From 7f248457a4138c9d5512b4707aa7722eafb0b384 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 19 Aug 2013 22:02:31 -0700 Subject: [PATCH 399/587] Renamed ubuntu_fonts to ubuntu_font_family --- .../licenses/Ubuntu Font License 1.0 | 0 .../ubuntu_font_family-0.80.recipe} | 34 +++++++++++++------ 2 files changed, 23 insertions(+), 11 deletions(-) rename media-fonts/{ubuntu_fonts => ubuntu_font_family}/licenses/Ubuntu Font License 1.0 (100%) rename media-fonts/{ubuntu_fonts/ubuntu_fonts-0.80.recipe => ubuntu_font_family/ubuntu_font_family-0.80.recipe} (64%) diff --git a/media-fonts/ubuntu_fonts/licenses/Ubuntu Font License 1.0 b/media-fonts/ubuntu_font_family/licenses/Ubuntu Font License 1.0 similarity index 100% rename from media-fonts/ubuntu_fonts/licenses/Ubuntu Font License 1.0 rename to media-fonts/ubuntu_font_family/licenses/Ubuntu Font License 1.0 diff --git a/media-fonts/ubuntu_fonts/ubuntu_fonts-0.80.recipe b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe similarity index 64% rename from media-fonts/ubuntu_fonts/ubuntu_fonts-0.80.recipe rename to media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe index 12e23db31..2596684e8 100644 --- a/media-fonts/ubuntu_fonts/ubuntu_fonts-0.80.recipe +++ b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe @@ -1,15 +1,30 @@ +SUMMARY="Font family from Ubuntu operating system" DESCRIPTION="Font family from Ubuntu operating system" HOMEPAGE="http://font.ubuntu.com" SRC_URI="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd ubuntu-font-family-0.80 +CHECKSUM_MD5="a124c5c6606f4f3b733d3477380e9d2f" +LICENSE="Ubunu Fonts License 1.0" +COPYRIGHT="2011 Canonical Ltd." +REVISION="3" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="ubuntu-font-family = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="ubuntu-font-family-0.80" + +BUILD() +{ + true } -INSTALL { - cd ubuntu-font-family-0.80 - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ubuntu + +INSTALL() +{ + FONTDIR=$fontsDir/ubuntu-font-family mkdir -p ${FONTDIR} cp Ubuntu-B.ttf ${FONTDIR} cp Ubuntu-BI.ttf ${FONTDIR} @@ -26,6 +41,3 @@ INSTALL { cp UbuntuMono-RI.ttf ${FONTDIR} cp README.txt ${FONTDIR}/ubuntu-fonts-readme.txt } - -LICENSE="Ubunu Fonts License 1.0" -COPYRIGHT="2011 Canonical Ltd." From dde250c23409805a0b50ea4bc4a0e4daaf233444 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 19 Aug 2013 23:11:16 -0700 Subject: [PATCH 400/587] ReAdded cdrtools patch to adds support for SATA burners. --- .../cdrtools/patches/cdrtools-3.01~a17.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch b/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch index e11110e03..09df8a6de 100644 --- a/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch +++ b/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch @@ -137,3 +137,34 @@ diff -urN cdrtools-3.01/RULES/x86_64-haiku-gcc.rul cdrtools-3.01-haiku/RULES/x86 +TSORT= cat + +LN= /bin/ln -s +diff -up cdrtools-3.01/libscg/scsi-beos.c.orig cdrtools-3.01/libscg/scsi-beos.c +--- cdrtools-3.01/libscg/scsi-beos.c.orig 2009-06-30 12:34:03.022282240 -0600 ++++ cdrtools-3.01/libscg/scsi-beos.c 2012-07-19 18:25:01.146800640 -0600 +@@ -292,7 +292,11 @@ scgo_havebus(scgp, busno) + char buf[128]; + + if (busno < 8) ++#ifdef __HAIKU__ ++ js_snprintf(buf, sizeof (buf), "/dev/disk/scsi/%d", busno); ++#else + js_snprintf(buf, sizeof (buf), "/dev/bus/scsi/%d", busno); ++#endif + else + #ifdef __HAIKU__ + js_snprintf(buf, sizeof (buf), "/dev/disk/atapi/%d", busno-8); +@@ -320,9 +324,15 @@ scgo_fileno(scgp, busno, tgt, tlun) + return (f->fd); + } + if (busno < 8) { ++#ifdef __HAIKU__ ++ js_snprintf(buf, sizeof (buf), ++ "/dev/disk/scsi/%d/%d/%d/raw", ++ busno, tgt, tlun); ++#else + js_snprintf(buf, sizeof (buf), + "/dev/bus/scsi/%d/%d/%d/raw", + busno, tgt, tlun); ++#endif + } else { + char *tgtstr = (tgt == 0) ? "master" : (tgt == 1) ? "slave" : "dummy"; + js_snprintf(buf, sizeof (buf), From 03dc9fed9be8a4622b4e78aaa68242f83c7921e6 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 15:52:25 +0200 Subject: [PATCH 401/587] doxygen: fix gcc 4 build --- app-doc/doxygen/doxygen-1.6.3.recipe | 4 +- ...gen-1.6.3.patch => doxygen-1.6.3.patchset} | 101 +++++++++++++----- 2 files changed, 75 insertions(+), 30 deletions(-) rename app-doc/doxygen/patches/{doxygen-1.6.3.patch => doxygen-1.6.3.patchset} (53%) diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe index 5e1ce9305..282f45c1e 100644 --- a/app-doc/doxygen/doxygen-1.6.3.recipe +++ b/app-doc/doxygen/doxygen-1.6.3.recipe @@ -11,10 +11,10 @@ COPYRIGHT="1997-2010 Dimitri van Heesch" LICENSE="GNU GPL v2" SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz" CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86" -PATCHES="doxygen-1.6.3.patch" +PATCHES="doxygen-1.6.3.patchset" PROVIDES=" doxygen = $portVersion compat >= 1.6 diff --git a/app-doc/doxygen/patches/doxygen-1.6.3.patch b/app-doc/doxygen/patches/doxygen-1.6.3.patchset similarity index 53% rename from app-doc/doxygen/patches/doxygen-1.6.3.patch rename to app-doc/doxygen/patches/doxygen-1.6.3.patchset index e087c2974..68b9cf3e8 100644 --- a/app-doc/doxygen/patches/doxygen-1.6.3.patch +++ b/app-doc/doxygen/patches/doxygen-1.6.3.patchset @@ -1,6 +1,13 @@ -diff -up doxygen-1.6.3/Makefile.in.orig doxygen-1.6.3/Makefile.in ---- doxygen-1.6.3/Makefile.in.orig 2010-03-18 22:18:10.189005824 -0600 -+++ doxygen-1.6.3/Makefile.in 2010-03-18 22:18:16.079953920 -0600 +From 9612cfcd716d5924547e90229bd6e3cb51c950e9 Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Wed, 21 Aug 2013 12:02:33 +0200 +Subject: add support for Haiku + + +diff --git a/Makefile.in b/Makefile.in +index 781d359..9cd43eb 100644 +--- a/Makefile.in ++++ b/Makefile.in @@ -2,7 +2,7 @@ # cd qtools ; $(MAKE) # cd src ; $(MAKE) @@ -10,9 +17,10 @@ diff -up doxygen-1.6.3/Makefile.in.orig doxygen-1.6.3/Makefile.in clean: FORCE cd examples ; $(MAKE) clean -diff -up doxygen-1.6.3/PLATFORMS.orig doxygen-1.6.3/PLATFORMS ---- doxygen-1.6.3/PLATFORMS.orig 2007-11-24 09:12:35.009437184 -0700 -+++ doxygen-1.6.3/PLATFORMS 2010-03-18 22:17:57.002097152 -0600 +diff --git a/PLATFORMS b/PLATFORMS +index c358a1d..18c4ed5 100644 +--- a/PLATFORMS ++++ b/PLATFORMS @@ -4,6 +4,7 @@ beos-g++ dgux-g++ freebsd-g++ @@ -21,9 +29,10 @@ diff -up doxygen-1.6.3/PLATFORMS.orig doxygen-1.6.3/PLATFORMS hpux-acc hpux-cc hpux-g++ -diff -up doxygen-1.6.3/configure.orig doxygen-1.6.3/configure ---- doxygen-1.6.3/configure.orig 2010-02-20 15:19:31.059244544 -0700 -+++ doxygen-1.6.3/configure 2010-03-18 22:17:57.024903680 -0600 +diff --git a/configure b/configure +index c0db1c6..d631e47 100755 +--- a/configure ++++ b/configure @@ -180,6 +180,9 @@ if test -z "$f_platform"; then f_insttool=/usr/bin/install fi @@ -34,9 +43,10 @@ diff -up doxygen-1.6.3/configure.orig doxygen-1.6.3/configure HP-UX:*) f_platform=hpux-g++ if test "$f_insttool" = NO; then -diff -up doxygen-1.6.3/qtools/qglobal.h.orig doxygen-1.6.3/qtools/qglobal.h ---- doxygen-1.6.3/qtools/qglobal.h.orig 2009-10-25 09:44:29.014680064 -0600 -+++ doxygen-1.6.3/qtools/qglobal.h 2010-03-18 22:17:57.054001664 -0600 +diff --git a/qtools/qglobal.h b/qtools/qglobal.h +index 700cb80..259446d 100644 +--- a/qtools/qglobal.h ++++ b/qtools/qglobal.h @@ -150,6 +150,8 @@ #define _OS_CYGWIN_ #elif defined(__BEOS__) @@ -46,10 +56,11 @@ diff -up doxygen-1.6.3/qtools/qglobal.h.orig doxygen-1.6.3/qtools/qglobal.h #elif defined(__MINT__) #define _OS_MINT_ #else -diff -up doxygen-1.6.3/src/doxygen.pro.in.orig doxygen-1.6.3/src/doxygen.pro.in ---- doxygen-1.6.3/src/doxygen.pro.in.orig 2010-01-01 04:53:11.034078720 -0700 -+++ doxygen-1.6.3/src/doxygen.pro.in 2010-03-18 22:17:57.078381056 -0600 -@@ -19,6 +19,7 @@ CONFIG = console warn_on $extraopt +diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in +index cc93820..c8a8d50 100644 +--- a/src/doxygen.pro.in ++++ b/src/doxygen.pro.in +@@ -19,6 +19,7 @@ CONFIG = console warn_on $extraopts HEADERS = doxygen.h SOURCES = main.cpp unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 @@ -57,27 +68,35 @@ diff -up doxygen-1.6.3/src/doxygen.pro.in.orig doxygen-1.6.3/src/doxygen.pro.in win32:INCLUDEPATH += . win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib -diff -up doxygen-1.6.3/tmake/lib/haiku-g++/app.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/app.t ---- doxygen-1.6.3/tmake/lib/haiku-g++/app.t.orig 2010-03-18 22:17:57.103284736 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/app.t 2010-03-18 22:17:57.105119744 -0600 +diff --git a/tmake/lib/haiku-g++/app.t b/tmake/lib/haiku-g++/app.t +new file mode 100644 +index 0000000..867725e +--- /dev/null ++++ b/tmake/lib/haiku-g++/app.t @@ -0,0 +1,2 @@ +#! Use the common Unix template +#$ IncludeTemplate("../unix/app.t"); -diff -up doxygen-1.6.3/tmake/lib/haiku-g++/lib.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/lib.t ---- doxygen-1.6.3/tmake/lib/haiku-g++/lib.t.orig 2010-03-18 22:17:57.126615552 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/lib.t 2010-03-18 22:17:57.128188416 -0600 +diff --git a/tmake/lib/haiku-g++/lib.t b/tmake/lib/haiku-g++/lib.t +new file mode 100644 +index 0000000..2523b2f +--- /dev/null ++++ b/tmake/lib/haiku-g++/lib.t @@ -0,0 +1,2 @@ +#! Use the common Unix template +#$ IncludeTemplate("../unix/lib.t"); -diff -up doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t.orig doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t ---- doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t.orig 2010-03-18 22:17:57.152043520 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/subdirs.t 2010-03-18 22:17:57.153354240 -0600 +diff --git a/tmake/lib/haiku-g++/subdirs.t b/tmake/lib/haiku-g++/subdirs.t +new file mode 100644 +index 0000000..5e888af +--- /dev/null ++++ b/tmake/lib/haiku-g++/subdirs.t @@ -0,0 +1,2 @@ +#! Use the common Unix template +#$ IncludeTemplate("../unix/subdirs.t"); -diff -up doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf ---- doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig 2010-03-18 22:17:57.175112192 -0600 -+++ doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf 2010-03-18 22:17:57.176685056 -0600 +diff --git a/tmake/lib/haiku-g++/tmake.conf b/tmake/lib/haiku-g++/tmake.conf +new file mode 100644 +index 0000000..23a2738 +--- /dev/null ++++ b/tmake/lib/haiku-g++/tmake.conf @@ -0,0 +1,51 @@ +# +# @@ -130,3 +149,29 @@ diff -up doxygen-1.6.3/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.6.3/tmake/l + +TMAKE_TAR = tar -cf +TMAKE_GZIP = gzip -9f +-- +1.8.3.4 + + +From 2e7199416501ace72e5ab2a548cc07ab25ef910e Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Wed, 21 Aug 2013 12:21:09 +0200 +Subject: qvaluestack.h: fix gcc 4 build + + +diff --git a/qtools/qvaluestack.h b/qtools/qvaluestack.h +index 3fb61fd..7438fcb 100644 +--- a/qtools/qvaluestack.h ++++ b/qtools/qvaluestack.h +@@ -49,7 +49,7 @@ class Q_EXPORT QValueStack : public QValueList + public: + QValueStack() {} + ~QValueStack() {} +- void push( const T& d ) { append(d); } ++ void push( const T& d ) { this->append(d); } + T pop() + { + T elem( this->last() ); +-- +1.8.3.4 + From 8bf85116be600af4e1eb7a1dca94b600f8faef54 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 15:53:52 +0200 Subject: [PATCH 402/587] python: the zlib module wasn't built setup.py: /boot/system/develop/headers wasn't added to the include search paths, so zlib.h wasn't found. --- dev-lang/python/patches/python-2.6.8.patch | 21 +++++++++++++-------- dev-lang/python/python-2.6.8.recipe | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dev-lang/python/patches/python-2.6.8.patch b/dev-lang/python/patches/python-2.6.8.patch index cf46984a2..7e0bb5548 100644 --- a/dev-lang/python/patches/python-2.6.8.patch +++ b/dev-lang/python/patches/python-2.6.8.patch @@ -559,18 +559,23 @@ diff -urN orig/Python-2.6.8/Python/bltinmodule.c Python-2.6.8/Python/bltinmodule diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py --- orig/Python-2.6.8/setup.py 2012-04-10 17:32:11.008388608 +0200 +++ Python-2.6.8/setup.py 2013-05-04 00:18:11.938737664 +0200 -@@ -428,6 +428,10 @@ +@@ -428,6 +428,15 @@ inc_dirs += ['/system/include', '/atheos/autolnk/include'] inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) + if platform == 'haiku1': -+ inc_dirs += ['/boot/common/non-packaged/develop/headers', '/boot/common/develop/headers', '/boot/system/develop/headers/posix', '/boot/system/develop/headers/3rdparty'] -+ lib_dirs += ['/boot/common/non-packaged/develop/lib', '/boot/common/develop/lib', '/boot/system/develop/lib'] ++ inc_dirs += ['/boot/common/non-packaged/develop/headers', ++ '/boot/common/develop/headers', ++ '/boot/system/develop/headers/posix', ++ '/boot/system/develop/headers'] ++ lib_dirs += ['/boot/common/non-packaged/develop/lib', ++ '/boot/common/develop/lib', ++ '/boot/system/develop/lib'] + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) if platform in ['osf1', 'unixware7', 'openunix8']: lib_dirs += ['/usr/ccs/lib'] -@@ -451,7 +455,7 @@ +@@ -451,7 +460,7 @@ # Check for MacOS X, which doesn't need libm.a at all math_libs = ['m'] @@ -579,7 +584,7 @@ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py math_libs = [] # XXX Omitted modules: gl, pure, dl, SGI-specific modules -@@ -694,15 +698,22 @@ +@@ -694,15 +703,22 @@ '/usr/local/ssl/include', '/usr/contrib/ssl/include/' ] @@ -605,7 +610,7 @@ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py ['/usr/local/ssl/lib', '/usr/contrib/ssl/lib/' ] ) -@@ -710,8 +721,8 @@ +@@ -710,8 +726,8 @@ if (ssl_incs is not None and ssl_libs is not None): exts.append( Extension('_ssl', ['_ssl.c'], @@ -616,7 +621,7 @@ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py libraries = ['ssl', 'crypto'], depends = ['socketmodule.h']), ) else: -@@ -746,8 +757,8 @@ +@@ -746,8 +762,8 @@ # The _hashlib module wraps optimized implementations # of hash functions from the OpenSSL library. exts.append( Extension('_hashlib', ['_hashopenssl.c'], @@ -627,7 +632,7 @@ diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py libraries = ['ssl', 'crypto']) ) # these aren't strictly missing since they are unneeded. #missing.extend(['_sha', '_md5']) -@@ -1176,7 +1187,7 @@ +@@ -1176,7 +1192,7 @@ missing.append('resource') # Sun yellow pages. Some systems have the functions in libc. diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe index 19d375342..0ff8bdbc2 100644 --- a/dev-lang/python/python-2.6.8.recipe +++ b/dev-lang/python/python-2.6.8.recipe @@ -9,7 +9,7 @@ LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2" CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 x86" PATCHES="python-2.6.8.patch" From 80cdea23b3a9824a523c0e1c9b2f6009a6a599bd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 15:56:11 +0200 Subject: [PATCH 403/587] pe: fix build on newer Haiku node_ref::operator<() is now provided by , so don't redefine it. --- haiku-apps/pe/patches/pe-2.4.3_hg602.patch | 24 ---- haiku-apps/pe/patches/pe-2.4.3_hg602.patchset | 104 ++++++++++++++++++ haiku-apps/pe/pe-2.4.3_hg602.recipe | 4 +- 3 files changed, 106 insertions(+), 26 deletions(-) delete mode 100644 haiku-apps/pe/patches/pe-2.4.3_hg602.patch create mode 100644 haiku-apps/pe/patches/pe-2.4.3_hg602.patchset diff --git a/haiku-apps/pe/patches/pe-2.4.3_hg602.patch b/haiku-apps/pe/patches/pe-2.4.3_hg602.patch deleted file mode 100644 index eb2e98304..000000000 --- a/haiku-apps/pe/patches/pe-2.4.3_hg602.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r 4bb6aa3dee15 Jamrules ---- pe-2.4.3_hg602/Jamrules Wed Dec 26 21:33:51 2012 +0100 -+++ pe-2.4.3_hg602/Jamrules Sun Apr 28 01:12:55 2013 +0200 -@@ -11,7 +11,7 @@ - # /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus - # gcc 2 platform. This is not entirely correct, but should be good enough - # for the time being. -- local hasLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ; -+ local hasLibStdC++.R4 = [ Glob /boot/system/lib : libstdc++.r4.so ] ; - if ! $(hasLibStdC++.R4) { - IS_GCC_4_PLATFORM = 1 ; - } -diff -r 4bb6aa3dee15 build/BuildSettings ---- pe-2.4.3_hg602/build/BuildSettings Wed Dec 26 21:33:51 2012 +0100 -+++ pe-2.4.3_hg602/build/BuildSettings Sun Apr 28 01:12:55 2013 +0200 -@@ -48,7 +48,7 @@ - CCFLAGS += -isystem /boot/develop/headers/pcre ; - C++FLAGS += -isystem /boot/develop/headers/pcre ; - } else { -- haveHeadersPcre = [ GLOB /boot/common/include : pcre.h ] ; -+ haveHeadersPcre = [ GLOB /boot/common/develop/headers : pcre.h ] ; - if ! $(haveHeadersPcre) { - haveHeadersPcre = [ GLOB /boot/home/config/include : pcre.h ] ; - if ! $(haveHeadersPcre) { diff --git a/haiku-apps/pe/patches/pe-2.4.3_hg602.patchset b/haiku-apps/pe/patches/pe-2.4.3_hg602.patchset new file mode 100644 index 000000000..4173d4e5c --- /dev/null +++ b/haiku-apps/pe/patches/pe-2.4.3_hg602.patchset @@ -0,0 +1,104 @@ +From 38fe29f686b24b11bd946e9cb26975d5b0e540da Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 20 Aug 2013 21:09:09 +0000 +Subject: Fix development library and header paths + + +diff --git a/Jamrules b/Jamrules +index a3c76de..a18dc02 100644 +--- a/Jamrules ++++ b/Jamrules +@@ -11,7 +11,7 @@ if $(OS) = HAIKU { + # /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus + # gcc 2 platform. This is not entirely correct, but should be good enough + # for the time being. +- local hasLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ; ++ local hasLibStdC++.R4 = [ Glob /boot/system/lib : libstdc++.r4.so ] ; + if ! $(hasLibStdC++.R4) { + IS_GCC_4_PLATFORM = 1 ; + } +diff --git a/build/BuildSettings b/build/BuildSettings +index 31b03c4..2b79ca7 100644 +--- a/build/BuildSettings ++++ b/build/BuildSettings +@@ -48,7 +48,7 @@ if $(haveHeadersPcre) { + CCFLAGS += -isystem /boot/develop/headers/pcre ; + C++FLAGS += -isystem /boot/develop/headers/pcre ; + } else { +- haveHeadersPcre = [ GLOB /boot/common/include : pcre.h ] ; ++ haveHeadersPcre = [ GLOB /boot/common/develop/headers : pcre.h ] ; + if ! $(haveHeadersPcre) { + haveHeadersPcre = [ GLOB /boot/home/config/include : pcre.h ] ; + if ! $(haveHeadersPcre) { +-- +1.8.3.4 + + +From 84b46dea0f1addae8e3fc1248a3f58e73a799690 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 20 Aug 2013 21:11:55 +0000 +Subject: MainBuildRules: Use -shared instead of -nostart + + +diff --git a/build/MainBuildRules b/build/MainBuildRules +index 8bd12be..119b081 100644 +--- a/build/MainBuildRules ++++ b/build/MainBuildRules +@@ -64,7 +64,7 @@ rule SharedLibrary + MakeLocate $(lib) : $(LOCATE_MAIN_TARGET) ; + local linkFlags ; + if $(OSPLAT) = X86 { +- linkFlags = -nostart -Xlinker -soname=\"$(lib)\" ++ linkFlags = -shared -Xlinker -soname=\"$(lib)\" + -Xlinker --no-undefined ; + } else { + linkFlags = -xms ; +-- +1.8.3.4 + + +From d1ebe32fb70e71545959bfd6b848f6c1858ea96a Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 20 Aug 2013 21:19:16 +0000 +Subject: node_ref::operator<() is now defined in Haiku + + +diff --git a/Sources/CDocIO.cpp b/Sources/CDocIO.cpp +index 6ad237e..e4f19aa 100644 +--- a/Sources/CDocIO.cpp ++++ b/Sources/CDocIO.cpp +@@ -199,16 +199,6 @@ static bool CopyFile(BEntry& srcEntry, BEntry& dstEntry) + return true; + } + +-#ifndef B_ZETA_VERSION_1_2_0 // maybe even B_ZETA_VERSION_1_1_0 +-bool operator< (const node_ref& left, const node_ref& right) +-{ +- if (left.node < right.node) +- return true; +- else +- return left.device < right.device; +-} +-#endif +- + + // #pragma mark - CDocIO + +diff --git a/Sources/CDocIO.h b/Sources/CDocIO.h +index 1eed6ef..b81280c 100644 +--- a/Sources/CDocIO.h ++++ b/Sources/CDocIO.h +@@ -58,10 +58,6 @@ inline time_t CDocIO::LastSaved() const + return fLastSaved; + } + +-#ifndef B_ZETA_VERSION_1_2_0 // maybe even B_ZETA_VERSION_1_1_0 +-bool operator< (const node_ref& left, const node_ref& right); +-#endif +- + class CLocalDocIO : public CDocIO + { + public: +-- +1.8.3.4 + diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe index 4c2f4bc06..1fd231bfc 100644 --- a/haiku-apps/pe/pe-2.4.3_hg602.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe @@ -10,10 +10,10 @@ COPYRIGHT=" 2003-2012 Team Pe " SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#602" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 x86" -PATCHES="pe-2.4.3_hg602.patch" +PATCHES="pe-2.4.3_hg602.patchset" PROVIDES=" pe = $portVersion From 3a5263d97028b14cd438925c68d8536d9618af36 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 15:59:04 +0200 Subject: [PATCH 404/587] haikuwebkit: rename patch and explicitly set PATCHES The patch wasn't found automatically since the secondary port name differs. That's another reason why PATCHES should always be specified explicitly. --- haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe | 2 ++ ...013_08_09.patchset => haikuwebkit-1.1.3_2013_08_09.patchset} | 0 2 files changed, 2 insertions(+) rename haiku-libs/haikuwebkit/patches/{haikuwebkit_x86-1.1.3_2013_08_09.patchset => haikuwebkit-1.1.3_2013_08_09.patchset} (100%) 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 1a339405f..524e9d3dd 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 @@ -19,6 +19,8 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then fi SECONDARY_ARCHITECTURES="x86" +PATCHES="haikuwebkit-1.1.3_2013_08_09.patchset" + # version info -- usually derived from the git repository webkitRevision=r115944 haikuWebkitRevision=de778f7 diff --git a/haiku-libs/haikuwebkit/patches/haikuwebkit_x86-1.1.3_2013_08_09.patchset b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.1.3_2013_08_09.patchset similarity index 100% rename from haiku-libs/haikuwebkit/patches/haikuwebkit_x86-1.1.3_2013_08_09.patchset rename to haiku-libs/haikuwebkit/patches/haikuwebkit-1.1.3_2013_08_09.patchset From 3033898201a2b1115c26220f0647ff447f4581a0 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 16:02:19 +0200 Subject: [PATCH 405/587] man: don't link against -llocale It doesn't exist anymore on newer Haikus. --- sys-apps/man/man-1.6g.recipe | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe index 1809240b1..f82f92c32 100644 --- a/sys-apps/man/man-1.6g.recipe +++ b/sys-apps/man/man-1.6g.recipe @@ -49,14 +49,13 @@ SOURCE_DIR="$portVersionedName" BUILD() { - LIBS="-L/boot/system/lib -llocale" \ - groff=/packages/$portVersionedName/cmd:groff/bin/groff \ - ./configure -prefix=$prefix \ - -bindir=$binDir \ - -sbindir=$sbinDir \ - -confdir=$sysconfDir \ - -mandir=$manDir - # no autotools configure + groff=/packages/$portVersionedName/cmd:groff/bin/groff \ + ./configure -prefix=$prefix \ + -bindir=$binDir \ + -sbindir=$sbinDir \ + -confdir=$sysconfDir \ + -mandir=$manDir + # no autotools configure make $jobArgs } From e8da29bb1af16360b8a76f03b089dff17aea6915 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 16:03:42 +0200 Subject: [PATCH 406/587] gcc 2: fix recipe * Use current source revision. * Copy and paste error in INSTALL(): installDir was used instead of gccInstallDir. Notsure why the bootstrap recipe and this one use different variable names. * Fix stdc++ library symlink when built for secondary architecture. --- sys-devel/gcc/gcc-2.95.3_2013_08_15.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 b9f78b7f0..2e0d0f70b 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 @@ -7,8 +7,8 @@ LICENSE=" " COPYRIGHT="1988-2000 Free Software Foundation, Inc." SRC_URI=" - git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c - git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#6ff546f23b0259bcd27550aa6ad8aaef89fd1bf6 + git+git://github.com/haiku/BuildtoolsPM.git#6ff546f23b0259bcd27550aa6ad8aaef89fd1bf6 " REVISION="2" ARCHITECTURES="x86_gcc2" @@ -123,7 +123,7 @@ INSTALL() # make all tools available via default paths echo "Symlinking binaries into default path" mkdir -p $binDir - symlinkRelative -s $installDir/bin/* $binDir + symlinkRelative -s $gccInstallDir/bin/* $binDir ### Strip ################################################# @@ -150,5 +150,5 @@ INSTALL() rm -rf $gccInstallDir/include/g++ ln -snf /boot/system/develop/headers/c++/2.95.3 $gccInstallDir/include/g++ - ln -snf /boot/system/lib/libstdc++.r4.so $gccInstallDir/lib/ + ln -snf /boot/system/lib$secondaryArchSubDir/libstdc++.r4.so $gccInstallDir/lib/ } From f37a4d0e22d969c7e3d50e969dc8899732338606 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 16:06:11 +0200 Subject: [PATCH 407/587] mesa-7.8.2: declare PATCHES explicitly --- sys-libs/mesa/mesa-7.8.2.recipe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys-libs/mesa/mesa-7.8.2.recipe b/sys-libs/mesa/mesa-7.8.2.recipe index f1a634fe8..879b1820c 100644 --- a/sys-libs/mesa/mesa-7.8.2.recipe +++ b/sys-libs/mesa/mesa-7.8.2.recipe @@ -23,6 +23,8 @@ then fi SECONDARY_ARCHITECTURES="x86_gcc2" +PATCHES="mesa-7.8.2.patch" + PROVIDES=" mesa$secondaryArchSuffix = $portVersion " From 47074781fb54c3d21b70f04a3137058f4a4a3ab2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 21 Aug 2013 16:06:53 +0200 Subject: [PATCH 408/587] ncurses: fix build issues * We no longer try to install the terminfo DB when we don't need it (and can't build it anyway due to not building tic). * When building the wide-char version of the libraries, build only the libraries, not the programs or any documentation/data. That's already done for the non-wide-char version anyway. --- sys-libs/ncurses/ncurses-5.9.recipe | 66 +++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index 888464f56..cf04be857 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -4,7 +4,7 @@ SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz" CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1" LICENSE="MIT" COPYRIGHT="1998-2011 Free Software Foundation, Inc." -REVISION="9" +REVISION="10" ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -69,6 +69,27 @@ doBuild() targetDir=$(pwd)/$1 shift 1 + # Parse additional arguments. "--libs-only" means we only want the + # libraries, nothing else. "--without-progs" means no programs and no + # terminfo DB (requires tic). + local noData + local libsOnly + local configureArgs + local arg + for arg in $@; do + case "$arg" in + --libs-only) + noData=1 + libsOnly=1 + arg="--without-progs" + ;; + --without-progs) + noData=1 + ;; + esac + configureArgs="$configureArgs $arg" + done + rm -rf $targetDir mkdir $targetDir @@ -77,21 +98,44 @@ doBuild() --with-libtool \ --enable-termcap \ --enable-hard-tabs \ - $@ + $configureArgs make $jobArgs - make install DESTDIR=$targetDir + + if [ -z "$noData" ]; then + # We need LIBRARY_PATH to include the library installation directory, + # since the installation process for the terminfo database will run tic + # and the built-in rpath doesn't consider the DESTDIR we're using. + LIBRARY_PATH="$targetDir/$prefix/lib:$LIBRARY_PATH" \ + make install DESTDIR=$targetDir + else + make install.libs DESTDIR=$targetDir + if [ -z "$libsOnly" ]; then + make install.includes DESTDIR=$targetDir + make install.man DESTDIR=$targetDir + fi + fi + + # clean up for the next build + make clean } BUILD() { # Unfortunately building only works in the source directory. So we build - # two times, installing in temporary directories from which we copy to the - # actual installation directory in INSTALL(). - doBuild build-nowidec - # Note: For the secondary architecture we discard the programs later, - # but since building the terminfo DB can't be disabled, we need to build - # the anyway. - doBuild build-widec --enable-widec --without-progs + # two times -- once without and once with wide-char support -- installing in + # temporary directories from which we copy to the actual installation + # directory in INSTALL(). + + # For the secondary architecture we don't want the programs nor the + # terminfo DB. The main package will depend on the primary package which + # provides all this. + local withoutProgramArgs + if [ -n "$secondaryArchSuffix" ]; then + withoutProgramArgs="--without-progs" + fi + + doBuild build-nowidec $withoutProgramArgs + doBuild build-widec --enable-widec --libs-only } INSTALL() @@ -107,7 +151,6 @@ INSTALL() # fix ncurses[w]5-config fixDevelopLibDirReferences $binDir/ncurses5-config $binDir/ncursesw5-config - # devel package packageEntries devel \ $binDir/ncurses5-config \ @@ -119,7 +162,6 @@ INSTALL() # we make it depend on the primary architecture package. if [ -n "$secondaryArchSuffix" ]; then rm -rf $binDir - rm -rf $dataDir rm -rf $documentationDir fi } From 7b9d4d5f7e33b3e5653c89f433e0c1bb02e9a728 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 21 Aug 2013 08:34:17 -0700 Subject: [PATCH 409/587] Fixed typos in license name and corrected checksum --- media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 2596684e8..3410018ea 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 @@ -2,8 +2,8 @@ SUMMARY="Font family from Ubuntu operating system" DESCRIPTION="Font family from Ubuntu operating system" HOMEPAGE="http://font.ubuntu.com" SRC_URI="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip" -CHECKSUM_MD5="a124c5c6606f4f3b733d3477380e9d2f" -LICENSE="Ubunu Fonts License 1.0" +CHECKSUM_MD5="a1fc70f5a5b1d096ab8310886cddaa1c" +LICENSE="Ubuntu Font License 1.0" COPYRIGHT="2011 Canonical Ltd." REVISION="3" From 37a83cf939faa3f962b7a3c4fdc5285430e23b77 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 21 Aug 2013 20:30:20 -0700 Subject: [PATCH 410/587] Fixed PROVIDES entry for ubuntu-font-family, and it correcrtly builds now --- media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3410018ea..c494c73e1 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 @@ -10,7 +10,7 @@ REVISION="3" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes -PROVIDES="ubuntu-font-family = $portVersion" +PROVIDES="ubuntu_font_family = $portVersion" REQUIRES="" BUILD_REQUIRES="" BUILD_PREREQUIRES="coreutils" From 21d8ae55c75dbd630ff91451d0b5bf3f8350d8fd Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 21 Aug 2013 20:43:48 -0700 Subject: [PATCH 411/587] Marked curl-7.32.0 as unstable for now. --- net-misc/curl/curl-7.32.0.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/curl/curl-7.32.0.recipe b/net-misc/curl/curl-7.32.0.recipe index bcaa62d04..bf40b05b3 100644 --- a/net-misc/curl/curl-7.32.0.recipe +++ b/net-misc/curl/curl-7.32.0.recipe @@ -5,8 +5,8 @@ LICENSE="Curl" SRC_URI="http://curl.haxx.se/download/curl-7.32.0.tar.bz2" CHECKSUM_MD5="30d04b0a8c43c6770039d1bf033dfe79" REVISION="1" -ARCHITECTURES="x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="?x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" PATCHES="" From e52005fe8c5a54ead79d4e5f755edaee94dc3365 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 22 Aug 2013 00:42:17 -0700 Subject: [PATCH 412/587] Fixed droid recipe --- media-fonts/droid/droid-113.recipe | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/media-fonts/droid/droid-113.recipe b/media-fonts/droid/droid-113.recipe index cce5cff0d..f589076c5 100644 --- a/media-fonts/droid/droid-113.recipe +++ b/media-fonts/droid/droid-113.recipe @@ -1,20 +1,32 @@ +SUMMARY="Font family from Google's Android project" DESCRIPTION="Font family from Google's Android project" HOMEPAGE="http://developer.android.com/sdk/RELEASENOTES.html" #SRC_URI="http://android.git.kernel.org/?p=platform/frameworks/base.git;a=snapshot;h=6b8721393400f8e98bb6c29d47b38c79be7ade32;sf=tgz" SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-113.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="4e11069eedc2ceda6b1cec7fd5939039" +LICENSE="Apache v2" +COPYRIGHT="2005-2008 The Android Open Source Project" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="droid = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="base" + + BUILD() { - cd base + true } INSTALL() { - cd base - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/droid + FONTDIR=$fontsDir/droid mkdir -p ${FONTDIR} cp Ahem.ttf ${FONTDIR} cp DroidSans-Bold.ttf ${FONTDIR} @@ -27,6 +39,3 @@ INSTALL() cp DroidSerif-Regular.ttf ${FONTDIR} cp README.txt ${FONTDIR}/droid-fonts-readme.txt } - -LICENSE="Apache v2" -COPYRIGHT="2005-2008 The Android Open Source Project" From f592acf7feb2e63701d5f83193b74fd8566d6593 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 22 Aug 2013 03:28:22 -0700 Subject: [PATCH 413/587] Added droid fonts from android-4.3_r2.2 Addedbetter DESCRIPTION for droid-113 --- media-fonts/droid/droid-113.recipe | 5 ++-- media-fonts/droid/droid-4.3_r2.2.recipe | 32 +++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 media-fonts/droid/droid-4.3_r2.2.recipe diff --git a/media-fonts/droid/droid-113.recipe b/media-fonts/droid/droid-113.recipe index f589076c5..86eb4f9ce 100644 --- a/media-fonts/droid/droid-113.recipe +++ b/media-fonts/droid/droid-113.recipe @@ -1,7 +1,6 @@ SUMMARY="Font family from Google's Android project" -DESCRIPTION="Font family from Google's Android project" -HOMEPAGE="http://developer.android.com/sdk/RELEASENOTES.html" -#SRC_URI="http://android.git.kernel.org/?p=platform/frameworks/base.git;a=snapshot;h=6b8721393400f8e98bb6c29d47b38c79be7ade32;sf=tgz" +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" LICENSE="Apache v2" diff --git a/media-fonts/droid/droid-4.3_r2.2.recipe b/media-fonts/droid/droid-4.3_r2.2.recipe new file mode 100644 index 000000000..1bf34711d --- /dev/null +++ b/media-fonts/droid/droid-4.3_r2.2.recipe @@ -0,0 +1,32 @@ +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" +CHECKSUM_MD5="a91c8129ac25f160ca83e23d77c00862" +LICENSE="Apache v2" +COPYRIGHT="2005-2008 The Android Open Source Project" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="droid = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="fonts" + + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/droid + mkdir -p ${FONTDIR} + cp . ${FONTDIR} -R +} From b141bc9626fc2ffdde8d4a49044cfc5ec4fb3033 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 23 Aug 2013 01:38:50 -0700 Subject: [PATCH 414/587] WIP ed-1.7.0, gets warning could not parse port/version --- sys-apps/ed/ed-1.7-0.recipe | 39 +++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 sys-apps/ed/ed-1.7-0.recipe diff --git a/sys-apps/ed/ed-1.7-0.recipe b/sys-apps/ed/ed-1.7-0.recipe new file mode 100644 index 000000000..cad118eb9 --- /dev/null +++ b/sys-apps/ed/ed-1.7-0.recipe @@ -0,0 +1,39 @@ +SUMMARY="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" +SRC_URI="http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ed/ed-1.7.tar.gz" +CHECKSUM_MD5="0aa4e2428e325203d0d7c3e86c961b1c" +REVISION="1" +ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + ed = $portVersion compat >= 1 + cmd:ed = $portVersion compat >= 1 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:perl + cmd:sed + cmd:texinfo + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + runConfigure ./configure + make +} + +INSTALL() +{ + make install +} From 814174135125d99bf305528b735b7365c7ba1846 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 23 Aug 2013 01:41:24 -0700 Subject: [PATCH 415/587] Remove broken ed-1.4.recipe --- sys-apps/ed/ed-1.4.recipe | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 sys-apps/ed/ed-1.4.recipe diff --git a/sys-apps/ed/ed-1.4.recipe b/sys-apps/ed/ed-1.4.recipe deleted file mode 100644 index ba94d9645..000000000 --- a/sys-apps/ed/ed-1.4.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Your basic line editor" -HOMEPAGE="http://www.gnu.org/sofrware/ed/" -SRC_URI="http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ed/ed-1.4.tar.gz" -CHECKSUM_MD5="da0ddc0e0b0bec2da4b13b0d0d1bce2b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd ed-1.4 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd ed-1.4 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2010 Free Software Foundation, Inc." From 937078e01bc41bc5b30dc7fc40b606dd51e2f8c6 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 23 Aug 2013 01:45:35 -0700 Subject: [PATCH 416/587] Added WIP libmng, it will probably need automake 1.12.x to build --- media-libs/libmng/libmng-1.0.10.recipe | 82 +++++++++++++++++++++----- 1 file changed, 68 insertions(+), 14 deletions(-) diff --git a/media-libs/libmng/libmng-1.0.10.recipe b/media-libs/libmng/libmng-1.0.10.recipe index a720984a3..044b8cf1d 100644 --- a/media-libs/libmng/libmng-1.0.10.recipe +++ b/media-libs/libmng/libmng-1.0.10.recipe @@ -1,34 +1,88 @@ -DESCRIPTION="libmng" +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" HOMEPAGE="http://www.libmng.com" +COPYRIGHT="2000-2007 Gerard Juyn" +LICENSE="LIBMNG" SRC_URI="http://prdownloads.sourceforge.net/libmng/libmng-1.0.10.tar.gz?download" CHECKSUM_MD5="a464ae7d679781beebdf7440d144b7bd" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" + +ARCHITECTURES="?x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + libpng$secondaryArchSuffix = $portVersion compat >= 1.0 + lib:libpng$secondaryArchSuffix = 15.12.0 compat >= 1.0 + lib:libpng15$secondaryArchSuffix = 15.12.0 compat >= 1.0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libz$secondaryArchSuffix >= 1.0.4 + libpng >= 1.5 + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake == 1.12 + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + BUILD() { - cd libmng-1.0.10 cp unmaintained/autogen.sh . - cp makefiles/configure.in . + cp makefiles/configure.in configure.ac cp makefiles/Makefile.am . + libtoolize --force --copy --install aclocal ./autogen.sh + runConfigure ./configure + make $jobArgs + +## libtoolize --force --copy --install +## aclocal +## ./autogen.sh # ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ # LDFLAGS=-L/boot/common/lib \ # CPPFLAGS=-I/boot/common/include - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make +## MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man +## LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` +## ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ +## --libdir=$LIBDIR \ +## --mandir=$MANDIR +## make } INSTALL() { - cd libmng-1.0.10 make install + +# prepareInstalledDevelLibs libmng libmng1 +# fixPkgconfig + + # devel package + packageEntries devel \ + $binDir \ + $developDir \ + $manDir/man3 } -LICENSE="LIBMNG" -COPYRIGHT="2000-2007 Gerard Juyn" + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libmng${secondaryArchSuffix}_devel = $portVersion compat >= 1.0 + cmd:libmng_config$secondaryArchSuffix = $portVersion compat >= 1.0 +# cmd:libmng1_config$secondaryArchSuffix = $portVersion compat >= 1.0 +# devel:libmng$secondaryArchSuffix = 10.0 compat >= 15 +# devel:libmng15$secondaryArchSuffix = 10.0 compat >= 15 + " +REQUIRES_devel=" + libmng$secondaryArchSuffix == $portVersion base + " From 6b1987a9de40632b228679b105d4bd10d3419f58 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 23 Aug 2013 01:47:50 -0700 Subject: [PATCH 417/587] Added a WIP automake-1.12.2, builds but getss marked obsolete --- sys-devel/automake/automake-1.12.2.recipe | 64 +++++++++++++++++------ 1 file changed, 47 insertions(+), 17 deletions(-) diff --git a/sys-devel/automake/automake-1.12.2.recipe b/sys-devel/automake/automake-1.12.2.recipe index f54777222..c91eb34bc 100644 --- a/sys-devel/automake/automake-1.12.2.recipe +++ b/sys-devel/automake/automake-1.12.2.recipe @@ -1,34 +1,64 @@ -DESCRIPTION="automake - Used to generate Makefile.in from Makefile.am" +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. + " HOMEPAGE="http://www.gnu.org/software/automake/" +COPYRIGHT="2012 Free Software Foundation, Inc." +LICENSE="GNU GPL v2" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.12.2.tar.gz" CHECKSUM_MD5="e620cb9e0259159341c0e0d6b712b67a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +REVISION="4" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + automake = $portVersion compat >= 1.12 + cmd:automake = $portVersion compat >= 1.12 + cmd:automake_1.12 = $portVersion compat >= 1.12 + cmd:aclocal = $portVersion compat >= 1.12 + cmd:aclocal_1.12 = $portVersion compat >= 1.12 + " +REQUIRES=" + haiku >= $haikuVersion + cmd:awk + coreutils + diffutils + cmd:m4 >= 1.4 + cmd:perl >= 5.8 + cmd:sh + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoconf >= 2.60 + cmd:gcc + cmd:ld + cmd:make + cmd:makeinfo + cmd:perl >= 5.8 + cmd:sed + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd automake-1.12.2 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_DATA=`finddir B_COMMON_DATA_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=$COMMON_DATA \ - --docdir=$COMMON_DOCS/doc/automake \ - --infodir=$COMMON_DOCS/info \ - --mandir=$COMMON_DOCS/man - make + ./bootstrap.sh + PERL="/bin/env perl" runConfigure ./configure + make $jobArgs } INSTALL() { - cd automake-1.12.2 make install + make install-html } TEST() { - cd automake-1.12.2 make check } -LICENSE="GNU GPL v2" -COPYRIGHT="2012 Free Software Foundation, Inc." From 45eda090bed704c01d3ab9e2205bbf0c21e5de1f Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 23 Aug 2013 16:44:45 +0000 Subject: [PATCH 418/587] Delete armyknife-63, add recipe for armyknife-66 WIP on taglib recipes, Note that taglib-1.8 won't build with gcc2, Thus for a gcc2 built armyknife we may need a taglib-1.7.2 library. Fix filename for ed-1.7, still may need more work, not fully tested yes but it is getting further than previous version. --- haiku-apps/armyknife/armyknife-63.recipe | 20 ---------- haiku-apps/armyknife/armyknife-66.recipe | 38 +++++++++++++++++++ media-libs/taglib/taglib-1.7.2.recipe | 33 ++++++++++------ media-libs/taglib/taglib-1.8.recipe | 33 ++++++++++------ .../ed/{ed-1.7-0.recipe => ed-1.7.recipe} | 3 +- 5 files changed, 83 insertions(+), 44 deletions(-) delete mode 100644 haiku-apps/armyknife/armyknife-63.recipe create mode 100644 haiku-apps/armyknife/armyknife-66.recipe rename sys-apps/ed/{ed-1.7-0.recipe => ed-1.7.recipe} (93%) diff --git a/haiku-apps/armyknife/armyknife-63.recipe b/haiku-apps/armyknife/armyknife-63.recipe deleted file mode 100644 index ba577daaa..000000000 --- a/haiku-apps/armyknife/armyknife-63.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#63" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/taglib >= 1.6.3" -#CHECKSUM_MD5="" -BUILD() -{ - cd armyknife-63 - make -} - -INSTALL() -{ - cd armyknife-63 - make zipfile - mkdir -p ${DESTDIR}/boot/apps - unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps -} diff --git a/haiku-apps/armyknife/armyknife-66.recipe b/haiku-apps/armyknife/armyknife-66.recipe new file mode 100644 index 000000000..471b2c863 --- /dev/null +++ b/haiku-apps/armyknife/armyknife-66.recipe @@ -0,0 +1,38 @@ +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" +SRC_URI="git://github.com:HaikuArchives/ArmyKnife.git" +COPYRIGHT="2000-2001 Jason Burgess" +LICENSE="MIT" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + armyknife = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + taglib >= 1.6 + " +BUILD_PREREQUIRED=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:cmake + cmd:make + " +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + make +} + +INSTALL() +{ + make zipfile + mkdir -p ${DESTDIR}/boot/apps + unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps +} + diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe index a71332c80..16898ab15 100644 --- a/media-libs/taglib/taglib-1.7.2.recipe +++ b/media-libs/taglib/taglib-1.7.2.recipe @@ -1,23 +1,34 @@ +SUMMARY="TabLib Audio Meta-Data Library" DESCRIPTION="TagLib Audio Meta-Data Library" HOMEPAGE="http://github.com/taglib" -SRC_URI="http://github.com/downloads/taglib/taglib/taglib-1.7.2.tar.gz" +SRC_URI="http://taglib.github.io/releases/taglib-1.8.tar.gz" +CHECKSUM_MD5="dcb8bd1b756f2843e18b1fdf3aaeee15" +COPYRIGHT="2002-2012 Scott Wheeler" +LICENSE="GNU LGPL v2 + MPL v1.1 + " REVISION="1" -STATUS_HAIKU="stable" -DEPEND="cmake" -CHECKSUM_MD5="b0a9e797d3833fb933c7c3176de3d720" -BUILD() +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + taglib = $portVersion + " +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + cmd:gcc + cmd:cmake + cmd:make + " +SOURCE_DIR="$portVersionedName" + +BUILD() { - cd taglib-1.7.2 cmake . make } INSTALL() { - cd taglib-1.7.2 make install } - -LICENSE="GNU LGPL v2 - MPL v1.1" -COPYRIGHT="2002-2012 Scott Wheeler" diff --git a/media-libs/taglib/taglib-1.8.recipe b/media-libs/taglib/taglib-1.8.recipe index 7c6b5e78a..6bec8fd82 100644 --- a/media-libs/taglib/taglib-1.8.recipe +++ b/media-libs/taglib/taglib-1.8.recipe @@ -1,23 +1,34 @@ +SUMMARY="TabLib Audio Meta-Data Library" DESCRIPTION="TagLib Audio Meta-Data Library" HOMEPAGE="http://github.com/taglib" -SRC_URI="http://github.com/downloads/taglib/taglib/taglib-1.8.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +SRC_URI="http://taglib.github.io/releases/taglib-1.8.tar.gz" CHECKSUM_MD5="dcb8bd1b756f2843e18b1fdf3aaeee15" -BUILD() +COPYRIGHT="2002-2012 Scott Wheeler" +LICENSE="GNU LGPL v2 + MPL v1.1 + " +REVISION="1" +ARCHITECTURES="x86" + +PROVIDES=" + taglib = $portVersion + " +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + cmd:gcc + cmd:cmake + cmd:make + " +SOURCE_DIR="$portVersionedName" + +BUILD() { - cd taglib-1.8 cmake . make } INSTALL() { - cd taglib-1.8 make install } - -LICENSE="GNU LGPL v2 - MPL v1.1" -COPYRIGHT="2002-2012 Scott Wheeler" diff --git a/sys-apps/ed/ed-1.7-0.recipe b/sys-apps/ed/ed-1.7.recipe similarity index 93% rename from sys-apps/ed/ed-1.7-0.recipe rename to sys-apps/ed/ed-1.7.recipe index cad118eb9..1f6e528df 100644 --- a/sys-apps/ed/ed-1.7-0.recipe +++ b/sys-apps/ed/ed-1.7.recipe @@ -6,7 +6,7 @@ LICENSE="GNU GPL v3" SRC_URI="http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ed/ed-1.7.tar.gz" CHECKSUM_MD5="0aa4e2428e325203d0d7c3e86c961b1c" REVISION="1" -ARCHITECTURES="?x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" ed = $portVersion compat >= 1 @@ -22,7 +22,6 @@ BUILD_REQUIRES=" cmd:make cmd:perl cmd:sed - cmd:texinfo " SOURCE_DIR="$portVersionedName" From ccd6b03f420e1eaff2358eeb5b953ac2c6a85228 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 8 Aug 2013 11:55:30 +0200 Subject: [PATCH 419/587] Fix path to 'env' in help2man script of sed's build system. --- sys-apps/sed/patches/sed-4.2.1.patch | 12 ------- sys-apps/sed/patches/sed-4.2.1.patchset | 42 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 12 deletions(-) delete mode 100644 sys-apps/sed/patches/sed-4.2.1.patch create mode 100644 sys-apps/sed/patches/sed-4.2.1.patchset diff --git a/sys-apps/sed/patches/sed-4.2.1.patch b/sys-apps/sed/patches/sed-4.2.1.patch deleted file mode 100644 index a4b6c52f0..000000000 --- a/sys-apps/sed/patches/sed-4.2.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN sed-4.2.1.orig/lib/regexec.c sed-4.2.1/lib/regexec.c ---- sed-4.2.1.orig/lib/regexec.c 2008-06-04 18:23:17.189401740 +0000 -+++ sed-4.2.1/lib/regexec.c 2008-06-04 18:26:00.994736475 +0000 -@@ -20,6 +20,8 @@ - with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -+#include "stdbool.h" -+ - static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, - Idx n) internal_function; - static void match_ctx_clean (re_match_context_t *mctx) internal_function; diff --git a/sys-apps/sed/patches/sed-4.2.1.patchset b/sys-apps/sed/patches/sed-4.2.1.patchset new file mode 100644 index 000000000..243da1404 --- /dev/null +++ b/sys-apps/sed/patches/sed-4.2.1.patchset @@ -0,0 +1,42 @@ +From 5eb924fdedd1daece9dad63c4f6d65fbfc476c54 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Thu, 8 Aug 2013 11:44:47 +0200 +Subject: applying patch sed-4.2.1.patch + + +diff --git a/lib/regexec.c b/lib/regexec.c +index 4853551..47cccca 100644 +--- a/lib/regexec.c ++++ b/lib/regexec.c +@@ -20,6 +20,8 @@ + with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + ++#include "stdbool.h" ++ + static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, + Idx n) internal_function; + static void match_ctx_clean (re_match_context_t *mctx) internal_function; +-- +1.7.10.2 + + +From b9af23f6ce44497d53c5ea4668096bbadd1c9d62 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Thu, 8 Aug 2013 11:50:12 +0200 +Subject: Fix path to 'env' in help2man + + +diff --git a/build-aux/help2man b/build-aux/help2man +index af57f41..89638a0 100755 +--- a/build-aux/help2man ++++ b/build-aux/help2man +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/bin/env perl + + # Generate a short man page from --help and --version output. + # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software +-- +1.7.10.2 + From bd77099e75f43e02bca1bef570c9c8f145b1c538 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 24 Aug 2013 21:43:58 +0200 Subject: [PATCH 420/587] Declare cdrtools-3.01-a17 as unstable. * this package has been updated without adjusting the repository in HaikuPM which is using it - declaring this unstable such that 3.01-a07 is the active version again --- app-cdr/cdrtools/cdrtools-3.01~a17.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe index 5d78afffe..a4a6c2763 100644 --- a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe +++ b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe @@ -25,7 +25,7 @@ LICENSE=" SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a17.tar.bz2" CHECKSUM_MD5="4cef9db0cf15a770c52d65b00bbee2db" REVISION="1" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="?x86_gcc2 ?x86" PATCHES='cdrtools-3.01~a17.patch' From 3eec7a1b90808ab0b833ad18ec9d4f3de404a7a2 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 24 Aug 2013 21:50:00 +0200 Subject: [PATCH 421/587] Fixing SRC_URI of mesa-7.8.2. * on the server the archive has been moved into an 'older_versions' folder --- sys-libs/mesa/mesa-7.8.2.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/mesa/mesa-7.8.2.recipe b/sys-libs/mesa/mesa-7.8.2.recipe index 879b1820c..121b45e59 100644 --- a/sys-libs/mesa/mesa-7.8.2.recipe +++ b/sys-libs/mesa/mesa-7.8.2.recipe @@ -13,7 +13,7 @@ Mesa ties into several other open-source projects: the Direct Rendering Infrastr HOMEPAGE="http://www.mesa3d.org/" COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." LICENSE="MIT" -SRC_URI="ftp://freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2" +SRC_URI="ftp://freedesktop.org/pub/mesa/older-versions/7.x/7.8.2/MesaLib-7.8.2.tar.bz2" CHECKSUM_MD5="6be2d343a0089bfd395ce02aaf8adb57" REVISION="3" ARCHITECTURES="x86_gcc2" From a50239f369b0a6e20dd2c7464fce0dd833c8b4ea Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 25 Aug 2013 13:15:13 +0200 Subject: [PATCH 422/587] Drop old apr recipes and patches --- dev-libs/apr/apr-1.4.2.recipe | 90 - dev-libs/apr/patches/apr-0.9.x-haiku.diff | 185 -- dev-libs/apr/patches/apr-0.9.x.diff | 2750 -------------------- dev-libs/apr/patches/apr-1.0.1.diff | 2869 --------------------- dev-libs/apr/patches/apr-1.2.x.diff | 23 - dev-libs/apr/patches/apr-1.3.3.patch | 201 -- dev-libs/apr/patches/apr-1.3.8.patch | 219 -- dev-libs/apr/patches/apr-1.3.9.patch | 219 -- dev-libs/apr/patches/apr-1.4.2.patch | 39 - dev-libs/apr/patches/apr-1.4.4.patch | 39 - dev-libs/apr/patches/apr-1.4.5.patch | 50 - 11 files changed, 6684 deletions(-) delete mode 100644 dev-libs/apr/apr-1.4.2.recipe delete mode 100644 dev-libs/apr/patches/apr-0.9.x-haiku.diff delete mode 100644 dev-libs/apr/patches/apr-0.9.x.diff delete mode 100644 dev-libs/apr/patches/apr-1.0.1.diff delete mode 100644 dev-libs/apr/patches/apr-1.2.x.diff delete mode 100644 dev-libs/apr/patches/apr-1.3.3.patch delete mode 100644 dev-libs/apr/patches/apr-1.3.8.patch delete mode 100644 dev-libs/apr/patches/apr-1.3.9.patch delete mode 100644 dev-libs/apr/patches/apr-1.4.2.patch delete mode 100644 dev-libs/apr/patches/apr-1.4.4.patch delete mode 100644 dev-libs/apr/patches/apr-1.4.5.patch diff --git a/dev-libs/apr/apr-1.4.2.recipe b/dev-libs/apr/apr-1.4.2.recipe deleted file mode 100644 index 5d1a67757..000000000 --- a/dev-libs/apr/apr-1.4.2.recipe +++ /dev/null @@ -1,90 +0,0 @@ -SUMMARY="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="http://archive.apache.org/dist/apr/apr-1.4.2.tar.gz" -CHECKSUM_MD5="fc80cb54f158c2674f9eeb47a1f672cd" -LICENSE="Apache v2" -COPYRIGHT="2010 The Apache Software Foundation." -REVISION="5" -ARCHITECTURES="x86_gcc2 ?x86" - -PROVIDES=" - apr = $portVersion compat >= 1 - lib:libapr = $portVersion compat >= 1 - lib:libapr_1 = $portVersion compat >= 1 - " -REQUIRES=" - haiku >= $haikuVersion - " -BUILD_REQUIRES=" - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:aclocal - cmd:autoconf - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make - " - -SOURCE_DIR="$portVersionedName" - -BUILD() -{ - libtoolize --force --copy --install - touch libtool.m4 - aclocal -I build - autoconf - ./configure $configureDirArgs - - # TODO: fix this hack (by finding out why top_builddir seems to be unset)! - ln -sfn $sourceDir/libtool /libtool - - make -} - -INSTALL() -{ - make install - - # prepare develop/lib - prepareInstalledDevelLibs libapr-1 - fixPkgconfig -} - -TEST() -{ - make test -} - - -# ----- source package ------------------------------------------------------- - -PROVIDES_source="apr_source = $portVersion compat = $portVersion" - - -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) - " diff --git a/dev-libs/apr/patches/apr-0.9.x-haiku.diff b/dev-libs/apr/patches/apr-0.9.x-haiku.diff deleted file mode 100644 index daf24508f..000000000 --- a/dev-libs/apr/patches/apr-0.9.x-haiku.diff +++ /dev/null @@ -1,185 +0,0 @@ -diff -urN apr-0.9.17-orig/build/apr_hints.m4 apr-0.9.17/build/apr_hints.m4 ---- apr-0.9.17-orig/build/apr_hints.m4 2006-03-16 09:41:51.000000000 +0000 -+++ apr-0.9.17/build/apr_hints.m4 2008-05-13 22:10:51.000000000 +0000 -@@ -390,6 +390,12 @@ - APR_ADDTO(CPPFLAGS, [-DCYGWIN]) - APR_ADDTO(LIBS, [-lcrypt]) - ;; -+ *-haiku*) -+ APR_ADDTO(LIBS, [-lnetwork]) -+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE]) -+ APR_SETIFNULL(apr_posixsem_is_global, [yes]) -+ APR_SETIFNULL(apr_process_lock_is_global, [yes]) -+ ;; - esac - - fi -diff -urN apr-0.9.17-orig/configure.in apr-0.9.17/configure.in ---- apr-0.9.17-orig/configure.in 2007-11-03 14:18:38.000000000 +0000 -+++ apr-0.9.17/configure.in 2008-05-13 22:10:51.000000000 +0000 -@@ -219,7 +219,7 @@ - dnl otherwise. - - case $host in -- *os390) -+ *os390|*haiku*) - if test "$ac_test_CFLAGS" != set; then - APR_REMOVEFROM(CFLAGS,-g) - fi -@@ -434,6 +434,13 @@ - OSDIR="unix" - eolstr="\\n" - ;; -+ *haiku*) -+ OSDIR="unix" -+ eolstr="\\n" -+ APR_ADDTO(CPPFLAGS,-I/boot/develop/headers/bsd) -+ AC_CHECK_LIB(bsd, getpass) -+ AC_CHECK_LIB(network, socket) -+ ;; - *) - OSDIR="unix" - eolstr="\\n" -@@ -656,6 +663,10 @@ - havemmapzero="0" - havemmapanon="0" - APR_BEGIN_DECISION([anonymous shared memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS_ANON, -+ [BeOS areas])]) - APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmgetanon="1" -@@ -671,10 +682,6 @@ - APR_IFALLYES(header:os2.h, - [haveos2shm="1" - APR_DECIDE(USE_SHMEM_OS2_ANON, [OS/2 DosAllocSharedMem()])]) --APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -- APR_DECIDE(USE_SHMEM_BEOS_ANON, -- [BeOS areas])]) - case $host in - *linux* ) - # Linux has problems with MM_SHMT_MMANON even though it reports -@@ -722,6 +729,9 @@ - havebeosarea="0" - haveos2shm="0" - APR_BEGIN_DECISION([namebased memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:sys/mman.h func:mmap func:munmap, - [havemmaptmp="1" - APR_DECIDE(USE_SHMEM_MMAP_TMP, -@@ -735,9 +745,6 @@ - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmget="1" - APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])]) --APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:os2.h, - [haveos2shm="1" - APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])]) -@@ -1270,7 +1277,7 @@ - ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"' - size_t_fmt='#define APR_SIZE_T_FMT "lu"' - ;; -- *beos*) -+ *beos*|*haiku*) - ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"' - size_t_fmt='#define APR_SIZE_T_FMT "ld"' - ;; -diff -urN apr-0.9.17-orig/test/testoc.c apr-0.9.17/test/testoc.c ---- apr-0.9.17-orig/test/testoc.c 2006-09-20 16:04:09.000000000 +0000 -+++ apr-0.9.17/test/testoc.c 2008-05-13 22:10:51.000000000 +0000 -@@ -78,6 +78,9 @@ - rv = apr_procattr_create(&procattr, p); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - -+ rv = apr_procattr_cmdtype_set(procattr, APR_PROGRAM_ENV); -+ CuAssertIntEquals(tc, APR_SUCCESS, rv); -+ - rv = apr_procattr_io_set(procattr, APR_FULL_BLOCK, APR_NO_PIPE, - APR_NO_PIPE); - CuAssertIntEquals(tc, APR_SUCCESS, rv); -diff -urN apr-0.9.17-orig/test/testpipe.c apr-0.9.17/test/testpipe.c ---- apr-0.9.17-orig/test/testpipe.c 2006-09-20 16:04:09.000000000 +0000 -+++ apr-0.9.17/test/testpipe.c 2008-05-13 22:10:51.000000000 +0000 -@@ -152,6 +152,9 @@ - rv = apr_procattr_create(&procattr, p); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - -+ rv = apr_procattr_cmdtype_set(procattr, APR_PROGRAM_ENV); -+ CuAssertIntEquals(tc, APR_SUCCESS, rv); -+ - rv = apr_procattr_io_set(procattr, APR_CHILD_BLOCK, APR_CHILD_BLOCK, - APR_CHILD_BLOCK); - CuAssertIntEquals(tc, APR_SUCCESS, rv); -diff -urN apr-0.9.17-orig/test/testpoll.c apr-0.9.17/test/testpoll.c ---- apr-0.9.17-orig/test/testpoll.c 2006-09-20 16:04:09.000000000 +0000 -+++ apr-0.9.17/test/testpoll.c 2008-05-13 22:10:51.000000000 +0000 -@@ -197,6 +197,8 @@ - - send_msg(s, sa, 2, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 0, tc); -@@ -212,6 +214,8 @@ - recv_msg(s, 1, p, tc); - send_msg(s, sa, 0, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 1, tc); -@@ -318,6 +322,7 @@ - int num; - - send_msg(s, sa, 0, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - CuAssertIntEquals(tc, 1, num); -@@ -348,6 +353,7 @@ - - send_msg(s, sa, 2, tc); - send_msg(s, sa, 5, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - CuAssertIntEquals(tc, 2, num); -@@ -380,6 +386,7 @@ - int num; - - send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - CuAssertIntEquals(tc, 1, num); -diff -urN apr-0.9.17-orig/test/testproc.c apr-0.9.17/test/testproc.c ---- apr-0.9.17-orig/test/testproc.c 2006-09-20 16:04:09.000000000 +0000 -+++ apr-0.9.17/test/testproc.c 2008-05-13 22:10:51.000000000 +0000 -@@ -53,7 +53,7 @@ - rv = apr_procattr_dir_set(attr, "data"); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - -- rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM); -+ rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM_ENV); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - - args[0] = "proc_child" EXTENSION; -@@ -129,7 +129,7 @@ - CuAssertIntEquals(tc, APR_SUCCESS, rv); - rv = apr_procattr_dir_set(attr, "data"); - CuAssertIntEquals(tc, APR_SUCCESS, rv); -- rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM); -+ rv = apr_procattr_cmdtype_set(attr, APR_PROGRAM_ENV); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - - args[0] = "proc_child"; diff --git a/dev-libs/apr/patches/apr-0.9.x.diff b/dev-libs/apr/patches/apr-0.9.x.diff deleted file mode 100644 index 6bb4257ee..000000000 --- a/dev-libs/apr/patches/apr-0.9.x.diff +++ /dev/null @@ -1,2750 +0,0 @@ -Index: network_io/unix/sockopt.c -=================================================================== ---- network_io/unix/sockopt.c (revision 652904) -+++ network_io/unix/sockopt.c (working copy) -@@ -21,7 +21,7 @@ - static apr_status_t soblock(int sd) - { - /* BeOS uses setsockopt at present for non blocking... */ --#ifndef BEOS -+#if !defined(BEOS) || defined(__HAIKU__) - int fd_flags; - - fd_flags = fcntl(sd, F_GETFL, 0); -@@ -47,7 +47,7 @@ - - static apr_status_t sononblock(int sd) - { --#ifndef BEOS -+#if !defined(BEOS) || defined(__HAIKU__) - int fd_flags; - - fd_flags = fcntl(sd, F_GETFL, 0); -@@ -221,7 +221,7 @@ - * As it can't be turned off we might as well check if they're asking - * for it to be turned on! - */ --#ifdef BEOS -+#if defined(BEOS) && !defined(__HAIKU__) - if (on == 1) - return APR_SUCCESS; - else -Index: network_io/unix/sockaddr.c -=================================================================== ---- network_io/unix/sockaddr.c (revision 652904) -+++ network_io/unix/sockaddr.c (working copy) -@@ -458,7 +458,7 @@ - apr_sockaddr_t *prev_sa; - int curaddr; - #if APR_HAS_THREADS && !defined(GETHOSTBYNAME_IS_THREAD_SAFE) && \ -- defined(HAVE_GETHOSTBYNAME_R) && !defined(BEOS) -+ defined(HAVE_GETHOSTBYNAME_R) && !defined(BEOS) // CHECKME - #ifdef GETHOSTBYNAME_R_HOSTENT_DATA - struct hostent_data hd; - #else -@@ -489,7 +489,7 @@ - } - else { - #if APR_HAS_THREADS && !defined(GETHOSTBYNAME_IS_THREAD_SAFE) && \ -- defined(HAVE_GETHOSTBYNAME_R) && !defined(BEOS) -+ defined(HAVE_GETHOSTBYNAME_R) && !defined(BEOS) // CHECKME - #if defined(GETHOSTBYNAME_R_HOSTENT_DATA) - /* AIX, HP/UX, D/UX et alia */ - gethostbyname_r(hostname, &hs, &hd); -@@ -560,7 +560,7 @@ - - if ((masked = flags & (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK))) { - if (!hostname || -- family != AF_UNSPEC || -+ family != APR_UNSPEC || - masked == (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK)) { - return APR_EINVAL; - } -@@ -656,7 +656,7 @@ - return APR_SUCCESS; - #else - #if APR_HAS_THREADS && !defined(GETHOSTBYADDR_IS_THREAD_SAFE) && \ -- defined(HAVE_GETHOSTBYADDR_R) && !defined(BEOS) -+ defined(HAVE_GETHOSTBYADDR_R) && !defined(BEOS) // CHECKME - #ifdef GETHOSTBYNAME_R_HOSTENT_DATA - struct hostent_data hd; - #else -Index: network_io/unix/sockets.c -=================================================================== ---- network_io/unix/sockets.c (revision 652904) -+++ network_io/unix/sockets.c (working copy) -@@ -21,7 +21,7 @@ - #include "apr_portable.h" - #include "apr_arch_inherit.h" - --#if defined(BEOS) && !defined(BEOS_BONE) -+#if defined(BEOS) && !defined(BEOS_BONE) && !defined(__HAIKU__) - #define close closesocket - #endif - -@@ -47,7 +47,7 @@ - apr_sockaddr_vars_set(sock->local_addr, family, 0); - apr_sockaddr_vars_set(sock->remote_addr, family, 0); - sock->netmask = 0; --#if defined(BEOS) && !defined(BEOS_BONE) -+#if defined(BEOS) && !defined(BEOS_BONE) && !defined(__HAIKU__) - /* BeOS pre-BONE has TCP_NODELAY on by default and it can't be - * switched off! - */ -Index: network_io/beos/sendrecv.c -=================================================================== ---- network_io/beos/sendrecv.c (revision 652904) -+++ network_io/beos/sendrecv.c (working copy) -@@ -15,7 +15,7 @@ - */ - - #include "apr_private.h" --#if BEOS_BONE /* BONE uses the unix code - woohoo */ -+#if BEOS_BONE || defined(__HAIKU__) /* BONE uses the unix code - woohoo */ - #include "../unix/sendrecv.c" - #else - #include "apr_arch_networkio.h" -Index: include/arch/unix/apr_arch_file_io.h -=================================================================== ---- include/arch/unix/apr_arch_file_io.h (revision 652904) -+++ include/arch/unix/apr_arch_file_io.h (working copy) -@@ -68,7 +68,9 @@ - #include - #endif - --#if BEOS_BONE -+#if defined(__HAIKU__) -+# include -+#elif BEOS_BONE - # ifndef BONE7 - /* prior to BONE/7 fd_set & select were defined in sys/socket.h */ - # include -Index: include/apr_errno.h -=================================================================== ---- include/apr_errno.h (revision 652904) -+++ include/apr_errno.h (working copy) -@@ -1155,6 +1155,8 @@ - /** operation would block */ - #if !defined(EWOULDBLOCK) || !defined(EAGAIN) - #define APR_STATUS_IS_EAGAIN(s) ((s) == APR_EAGAIN) -+#elif BEOS -+#define APR_STATUS_IS_EAGAIN(s) ((s) == APR_EAGAIN) - #elif (EWOULDBLOCK == EAGAIN) - #define APR_STATUS_IS_EAGAIN(s) ((s) == APR_EAGAIN) - #else -Index: configure.in -=================================================================== ---- configure.in (revision 652904) -+++ configure.in (working copy) -@@ -219,7 +219,7 @@ - dnl otherwise. - - case $host in -- *os390) -+ *os390|*-haiku*) - if test "$ac_test_CFLAGS" != set; then - APR_REMOVEFROM(CFLAGS,-g) - fi -@@ -403,6 +403,14 @@ - ;; - esac - ;; -+ *haiku*) -+ OSDIR="beos" -+ APR_ADDTO(CPPFLAGS,-DBEOS) -+ enable_threads="system_threads" -+ eolstr="\\n" -+ proc_mutex_is_global=1 -+ file_as_socket="1" -+ ;; - *os390) - OSDIR="os390" - eolstr="\\n" -@@ -1274,7 +1282,7 @@ - ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"' - size_t_fmt='#define APR_SIZE_T_FMT "lu"' - ;; -- *beos*) -+ *beos*|*haiku*) - ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"' - size_t_fmt='#define APR_SIZE_T_FMT "ld"' - ;; -Index: misc/unix/errorcodes.c -=================================================================== ---- misc/unix/errorcodes.c (revision 652904) -+++ misc/unix/errorcodes.c (working copy) -@@ -343,7 +343,7 @@ - * the prototype publically (doh!), so to avoid a build warning - * we add a suitable prototype here. - */ --#if defined(BEOS) -+#if defined(BEOS) && !defined(__HAIKU__) - const char *strerror_r(apr_status_t, char *, apr_size_t); - #endif - -Index: threadproc/beos/proc.c -=================================================================== ---- threadproc/beos/proc.c (revision 652904) -+++ threadproc/beos/proc.c (working copy) -@@ -365,7 +365,12 @@ - } - - APR_DECLARE(apr_status_t) apr_procattr_limit_set(apr_procattr_t *attr, apr_int32_t what, -- void *limit) -+#ifdef APR_HAVE_STRUCT_RLIMIT -+ struct rlimit -+#else -+ void -+#endif -+ *limit) - { - return APR_ENOTIMPL; - } -Index: build/config.guess -=================================================================== ---- build/config.guess (revision 652904) -+++ build/config.guess (working copy) -@@ -1,9 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2004 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. - --timestamp='2002-03-20' -+timestamp='2008-01-08' - - # 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 -@@ -17,17 +18,14 @@ - # - # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. - # - # 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. - --##################################################################### --# This file contains changes for Apache, clearly marked below. --# These changes are hereby donated to the public domain. --##################################################################### - - # Originally written by Per Bothner . - # Please send patches to . Submit a context -@@ -58,8 +56,8 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006, 2007, 2008 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." -@@ -71,11 +69,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -93,30 +91,42 @@ - exit 1 - fi - -+trap 'exit 1' 1 2 15 - --dummy=dummy-$$ --trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 -+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -+# compiler to aid in system detection is discouraged as it requires -+# temporary files to be created and, as you can see below, it is a -+# headache to deal with in a portable fashion. - --# CC_FOR_BUILD -- compiler used by this script. - # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still - # use `HOST_CC' if defined, but it is deprecated. - --set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in -- ,,) echo "int dummy(){}" > $dummy.c ; -+# Portable tmp directory creation inspired by the Autoconf team. -+ -+set_cc_for_build=' -+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -+: ${TMPDIR=/tmp} ; -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || -+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || -+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -+dummy=$tmp/dummy ; -+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -+case $CC_FOR_BUILD,$HOST_CC,$CC in -+ ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do -- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; -- if test $? = 0 ; then -+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; -- rm -f $dummy.c $dummy.o $dummy.rel ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; --esac' -+esac ; set_cc_for_build= ;' - - # This is needed to find uname on a Pyramid OSx when run in the BSD universe. - # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -147,9 +157,11 @@ - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in -+ armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -172,159 +184,128 @@ - ;; - esac - # The OS release -- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ # Debian GNU/NetBSD machines have a different userland, and -+ # thus, need a distinct triplet. However, they do not need -+ # kernel version information, so it can be replaced with a -+ # suitable tag, in the style of linux-gnu. -+ case "${UNAME_VERSION}" in -+ Debian*) -+ release='-gnu' -+ ;; -+ *) -+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ ;; -+ esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" -- exit 0 ;; -- amiga:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- arc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- hp300:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mac68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- macppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvmeppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pmax:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sgi:OpenBSD:*:*) -- echo mipseb-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sun3:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- wgrisc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:OpenBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -+ exit ;; -+ *:ekkoBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -+ exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; -+ macppc:MirBSD:*:*) -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; -+ *:MirBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; - alpha:OSF1:*:*) -- if test $UNAME_RELEASE = "V4.0"; then -+ case $UNAME_RELEASE in -+ *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` -- fi -+ ;; -+ *5.*) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ ;; -+ esac -+ # According to Compaq, /usr/sbin/psrinfo has been available on -+ # OSF/1 and Tru64 systems produced since 1995. I hope that -+ # covers most systems running today. This code pipes the CPU -+ # types through head -n 1, so we only detect the type of CPU 0. -+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` -+ case "$ALPHA_CPU_TYPE" in -+ "EV4 (21064)") -+ UNAME_MACHINE="alpha" ;; -+ "EV4.5 (21064)") -+ UNAME_MACHINE="alpha" ;; -+ "LCA4 (21066/21068)") -+ UNAME_MACHINE="alpha" ;; -+ "EV5 (21164)") -+ UNAME_MACHINE="alphaev5" ;; -+ "EV5.6 (21164A)") -+ UNAME_MACHINE="alphaev56" ;; -+ "EV5.6 (21164PC)") -+ UNAME_MACHINE="alphapca56" ;; -+ "EV5.7 (21164PC)") -+ UNAME_MACHINE="alphapca57" ;; -+ "EV6 (21264)") -+ UNAME_MACHINE="alphaev6" ;; -+ "EV6.7 (21264A)") -+ UNAME_MACHINE="alphaev67" ;; -+ "EV6.8CB (21264C)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.8AL (21264B)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.8CX (21264D)") -+ UNAME_MACHINE="alphaev68" ;; -+ "EV6.9A (21264/EV69A)") -+ UNAME_MACHINE="alphaev69" ;; -+ "EV7 (21364)") -+ UNAME_MACHINE="alphaev7" ;; -+ "EV7.9 (21364A)") -+ UNAME_MACHINE="alphaev79" ;; -+ esac -+ # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. -- cat <$dummy.s -- .data --\$Lformat: -- .byte 37,100,45,37,120,10,0 # "%d-%x\n" -- -- .text -- .globl main -- .align 4 -- .ent main --main: -- .frame \$30,16,\$26,0 -- ldgp \$29,0(\$27) -- .prologue 1 -- .long 0x47e03d80 # implver \$0 -- lda \$2,-1 -- .long 0x47e20c21 # amask \$2,\$1 -- lda \$16,\$Lformat -- mov \$0,\$17 -- not \$1,\$18 -- jsr \$26,printf -- ldgp \$29,0(\$26) -- mov 0,\$16 -- jsr \$26,exit -- .end main --EOF -- eval $set_cc_for_build -- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null -- if test "$?" = 0 ; then -- case `./$dummy` in -- 0-0) -- UNAME_MACHINE="alpha" -- ;; -- 1-0) -- UNAME_MACHINE="alphaev5" -- ;; -- 1-1) -- UNAME_MACHINE="alphaev56" -- ;; -- 1-101) -- UNAME_MACHINE="alphapca56" -- ;; -- 2-303) -- UNAME_MACHINE="alphaev6" -- ;; -- 2-307) -- UNAME_MACHINE="alphaev67" -- ;; -- 2-1307) -- UNAME_MACHINE="alphaev68" -- ;; -- esac -- fi -- rm -f $dummy.s $dummy -- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit 0 ;; -+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ exit ;; - 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 - # of the specific Alpha model? - echo alpha-pc-interix -- exit 0 ;; -+ exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 -- exit 0 ;; -+ exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 -- exit 0;; -+ exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos -- exit 0 ;; -+ exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos -- exit 0 ;; --######################### --# Apache changes --# --# *:OS/390:*:*) --# echo i370-ibm-openedition --# exit 0 ;; -- *:OS390:*:* | *:OS/390:*:*) -- echo s390-ibm-os390 -- exit 0 ;; -- *:OS400:*:* | *:OS/400:*:*) -- echo as400-ibm-os400 -- exit 0 ;; -- *:OS/2:*:*) -- echo "i386-pc-os2_emx" -- exit 0;; --# --# end Apache changes --######################### -+ exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition -- exit 0 ;; -+ exit ;; -+ *:z/VM:*:*) -+ echo s390-ibm-zvmoe -+ exit ;; -+ *:OS400:*:*) -+ echo powerpc-ibm-os400 -+ exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} -- exit 0;; -+ exit ;; -+ arm:riscos:*:*|arm:RISCOS:*:*) -+ echo arm-unknown-riscos -+ exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp -- exit 0;; -+ exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then -@@ -332,25 +313,32 @@ - else - echo pyramid-pyramid-bsd - fi -- exit 0 ;; -+ exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 -- exit 0 ;; -+ exit ;; -+ DRS?6000:unix:4.0:6*) -+ echo sparc-icl-nx6 -+ exit ;; -+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) -+ case `/usr/bin/uname -p` in -+ sparc) echo sparc-icl-nx7; exit ;; -+ esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -- i86pc:SunOS:5.*:*) -+ exit ;; -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) -@@ -359,10 +347,10 @@ - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` -- exit 0 ;; -+ exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 -@@ -374,10 +362,10 @@ - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac -- exit 0 ;; -+ exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor -@@ -388,37 +376,40 @@ - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ m68k:machten:*:*) -+ echo m68k-apple-machten${UNAME_RELEASE} -+ exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 -- exit 0 ;; -+ exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -442,27 +433,33 @@ - exit (-1); - } - EOF -- $CC_FOR_BUILD $dummy.c -o $dummy \ -- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ -- && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -+ $CC_FOR_BUILD -o $dummy $dummy.c && -+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && -+ SYSTEM_NAME=`$dummy $dummyarg` && -+ { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax -- exit 0 ;; -+ exit ;; -+ Motorola:*:4.3:PL8-*) -+ echo powerpc-harris-powermax -+ exit ;; -+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) -+ echo powerpc-harris-powermax -+ exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix -- exit 0 ;; -+ exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 -- exit 0 ;; -+ exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 -- exit 0 ;; -+ exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` -@@ -478,29 +475,29 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 -- exit 0 ;; -+ exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 -- exit 0 ;; -+ exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd -- exit 0 ;; -+ exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` -- exit 0 ;; -+ exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. -- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' -+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix -- exit 0 ;; -+ exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` -@@ -508,7 +505,7 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build -@@ -523,16 +520,19 @@ - exit(0); - } - EOF -- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -- echo rs6000-ibm-aix3.2.5 -+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` -+ then -+ echo "$SYSTEM_NAME" -+ else -+ echo rs6000-ibm-aix3.2.5 -+ fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi -- exit 0 ;; -- *:AIX:*:[45]) -+ exit ;; -+ *:AIX:*:[456]) - 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 -@@ -545,28 +545,28 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix -- exit 0 ;; -+ exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 -- exit 0 ;; -+ exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to -- exit 0 ;; # report: romp-ibm BSD 4.3 -+ exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx -- exit 0 ;; -+ exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 -- exit 0 ;; -+ exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd -- exit 0 ;; -+ exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 -- exit 0 ;; -+ exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in -@@ -622,17 +622,37 @@ - exit (0); - } - EOF -- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy` -- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi -- rm -f $dummy.c $dummy -+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` -+ test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac -+ if [ ${HP_ARCH} = "hppa2.0w" ] -+ then -+ eval $set_cc_for_build -+ -+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating -+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler -+ # generating 64-bit code. GNU and HP use different nomenclature: -+ # -+ # $ CC_FOR_BUILD=cc ./config.guess -+ # => hppa2.0w-hp-hpux11.23 -+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess -+ # => hppa64-hp-hpux11.23 -+ -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep __LP64__ >/dev/null -+ then -+ HP_ARCH="hppa2.0w" -+ else -+ HP_ARCH="hppa64" -+ fi -+ fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -660,134 +680,192 @@ - exit (0); - } - EOF -- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 -- rm -f $dummy.c $dummy -+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 -- exit 0 ;; -+ exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd -- exit 0 ;; -+ exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd -- exit 0 ;; -+ exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix -- exit 0 ;; -+ exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf -- exit 0 ;; -+ exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf -- exit 0 ;; -+ exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi -- exit 0 ;; -+ exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites -- exit 0 ;; -+ exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -- CRAY*T3D:*:*:*) -- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; -+ *:UNICOS/mp:*:*) -+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ 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 0 ;; -+ 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}" -+ exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:FreeBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -- exit 0 ;; -+ case ${UNAME_MACHINE} in -+ pc98) -+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac -+ exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin -- exit 0 ;; -- i*:MINGW*:*) -+ exit ;; -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 -- exit 0 ;; -+ exit ;; -+ i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 -+ exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 -- exit 0 ;; -- x86:Interix*:3*) -- echo i386-pc-interix3 -- exit 0 ;; -+ exit ;; -+ *:Interix*:[3456]*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ EM64T | authenticamd) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; -+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) -+ echo i${UNAME_MACHINE}-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? -- echo i386-pc-interix -- exit 0 ;; -+ echo i586-pc-interix -+ exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin -- exit 0 ;; -+ exit ;; -+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) -+ echo x86_64-unknown-cygwin -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin -- exit 0 ;; -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - *:GNU:*:*) -+ # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -- exit 0 ;; -+ exit ;; -+ *:GNU/*:*:*) -+ # other systems with GNU libc and userland -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix -- exit 0 ;; -+ exit ;; - arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ cris:Linux:*:*) -+ echo cris-axis-linux-gnu -+ exit ;; -+ crisv32:Linux:*:*) -+ echo crisv32-axis-linux-gnu -+ exit ;; -+ frv:Linux:*:*) -+ echo frv-unknown-linux-gnu -+ exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -804,16 +882,45 @@ - #endif - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- rm -f $dummy.c -- test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; -+ mips64:Linux:*:*) -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #undef CPU -+ #undef mips64 -+ #undef mips64el -+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -+ CPU=mips64el -+ #else -+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -+ CPU=mips64 -+ #else -+ CPU= -+ #endif -+ #endif -+EOF -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^CPU/{ -+ s: ::g -+ p -+ }'`" -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ ;; -+ or32:Linux:*:*) -+ echo or32-unknown-linux-gnu -+ exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -827,7 +934,7 @@ - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -- exit 0 ;; -+ exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -@@ -835,22 +942,31 @@ - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac -- exit 0 ;; -+ exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux -- exit 0 ;; -+ exit ;; -+ sh64*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu -+ exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent -@@ -868,15 +984,15 @@ - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit 0 ;; -+ exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit 0 ;; -+ exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit 0 ;; -+ exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build -@@ -893,24 +1009,33 @@ - LIBC=gnulibc1 - # endif - #else -- #ifdef __INTEL_COMPILER -+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- rm -f $dummy.c -- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 -- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 -+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -+ /^LIBC/{ -+ s: ::g -+ p -+ }'`" -+ test x"${LIBC}" != x && { -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit -+ } -+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 -- exit 0 ;; -+ 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... -@@ -918,7 +1043,27 @@ - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} -- exit 0 ;; -+ exit ;; -+ i*86:OS/2:*:*) -+ # If we were able to find `uname', then EMX Unix compatibility -+ # is probably installed. -+ echo ${UNAME_MACHINE}-pc-os2-emx -+ exit ;; -+ i*86:XTS-300:*:STOP) -+ echo ${UNAME_MACHINE}-unknown-stop -+ exit ;; -+ i*86:atheos:*:*) -+ echo ${UNAME_MACHINE}-unknown-atheos -+ exit ;; -+ i*86:syllable:*:*) -+ echo ${UNAME_MACHINE}-pc-syllable -+ exit ;; -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ echo i386-unknown-lynxos${UNAME_RELEASE} -+ exit ;; -+ i*86:*DOS:*:*) -+ echo ${UNAME_MACHINE}-pc-msdosdjgpp -+ exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then -@@ -926,99 +1071,100 @@ - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi -- exit 0 ;; -- i*86:*:5:[78]*) -+ exit ;; -+ i*86:*:5:[678]*) -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then -- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` -- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 -- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ -+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` -+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 -+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 -- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ -+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 -- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ -+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi -- exit 0 ;; -- i*86:*DOS:*:*) -- echo ${UNAME_MACHINE}-pc-msdosdjgpp -- exit 0 ;; -+ 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 i386. - echo i386-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 -- exit 0 ;; -+ exit ;; - paragon:*:*:*) - echo i860-intel-osf1 -- exit 0 ;; -+ exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi -- exit 0 ;; -+ exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv -- exit 0 ;; -- M68*:*:R3V[567]*:*) -- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) -+ exit ;; -+ mc68k:UNIX:SYSTEM5:3.51m) -+ echo m68k-convergent-sysv -+ exit ;; -+ M680?0:D-NIX:5.3:*) -+ echo m68k-diab-dnix -+ exit ;; -+ M68*:*:R3V[5678]*:*) -+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; -+ && { 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 0 ;; -+ && { echo i486-ncr-sysv4; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 -- exit 0 ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -- echo i386-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1026,61 +1172,87 @@ - else - echo ns32k-sni-sysv - fi -- exit 0 ;; -+ exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 -- exit 0 ;; -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 -- exit 0 ;; -+ exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 -- exit 0 ;; -+ exit ;; -+ i*86:VOS:*:*) -+ # From Paul.Green@stratus.com. -+ echo ${UNAME_MACHINE}-stratus-vos -+ exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos -- exit 0 ;; -+ exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 -- exit 0 ;; -+ exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos -- exit 0 ;; -+ exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos -- exit 0 ;; -+ exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos -- exit 0 ;; -+ exit ;; -+ BeMac:Haiku:*:*) -+ echo powerpc-apple-haiku -+ exit ;; -+ BePC:Haiku:*:*) -+ echo i586-pc-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ SX-6:SUPER-UX:*:*) -+ echo sx6-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Darwin:*:*) -- echo `uname -p`-apple-darwin${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -+ case $UNAME_PROCESSOR in -+ unknown) UNAME_PROCESSOR=powerpc ;; -+ esac -+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -+ exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then -@@ -1088,22 +1260,25 @@ - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:QNX:*:4*) - echo i386-pc-qnx -- exit 0 ;; -- NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*) -+ exit ;; -+ NSE-?:NONSTOP_KERNEL:*:*) -+ echo nse-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux -- exit 0 ;; -+ exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv -- exit 0 ;; -+ exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 -@@ -1114,39 +1289,47 @@ - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 -- exit 0 ;; -- i*86:OS/2:*:*) -- # If we were able to find `uname', then EMX Unix compatibility -- # is probably installed. -- echo ${UNAME_MACHINE}-pc-os2-emx -- exit 0 ;; -+ exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 -- exit 0 ;; -+ exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex -- exit 0 ;; -+ exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 -- exit 0 ;; -+ exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 -- exit 0 ;; -+ exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 -- exit 0 ;; -+ exit ;; - *:ITS:*:*) - echo pdp10-unknown-its -- exit 0 ;; -+ exit ;; -+ SEI:*:*:SEIUX) -+ echo mips-sei-seiux${UNAME_RELEASE} -+ exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -- exit 0 ;; -- i*86:XTS-300:*:STOP) -- echo ${UNAME_MACHINE}-unknown-stop -- exit 0 ;; -- i*86:atheos:*:*) -- echo ${UNAME_MACHINE}-unknown-atheos -- exit 0 ;; -+ exit ;; -+ *:*VMS:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ case "${UNAME_MACHINE}" in -+ A*) echo alpha-dec-vms ; exit ;; -+ I*) echo ia64-dec-vms ; exit ;; -+ V*) echo vax-dec-vms ; exit ;; -+ esac ;; -+ *:XENIX:*:SysV) -+ echo i386-pc-xenix -+ exit ;; -+ i*86:skyos:*:*) -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' -+ exit ;; -+ i*86:rdos:*:*) -+ echo ${UNAME_MACHINE}-pc-rdos -+ exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -@@ -1178,7 +1361,7 @@ - #endif - - #if defined (__arm) && defined (__acorn) && defined (__unix) -- printf ("arm-acorn-riscix"); exit (0); -+ printf ("arm-acorn-riscix\n"); exit (0); - #endif - - #if defined (hp300) && !defined (hpux) -@@ -1267,12 +1450,12 @@ - } - EOF - --$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 --rm -f $dummy.c $dummy -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - - # Apollos put the system type in the environment. - --test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } -+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - - # Convex versions that predate uname can use getsysinfo(1) - -@@ -1281,22 +1464,22 @@ - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - c34*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - c38*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - c4*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - esac - fi - -@@ -1307,7 +1490,9 @@ - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- ftp://ftp.gnu.org/pub/gnu/config/ -+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess -+and -+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be -Index: build/config.sub -=================================================================== ---- build/config.sub (revision 652904) -+++ build/config.sub (working copy) -@@ -1,9 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2004 Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -+# Free Software Foundation, Inc. - --timestamp='2002-03-07' -+timestamp='2008-01-16' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,18 +22,14 @@ - # - # 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., 59 Temple Place - Suite 330, --# Boston, MA 02111-1307, USA. -- -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -+# 02110-1301, USA. -+# - # 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. - --##################################################################### --# This file contains changes for Apache, clearly marked below. --# These changes are hereby donated to the public domain. --##################################################################### - - # Please send patches to . Submit a context - # diff and a properly formatted ChangeLog entry. -@@ -75,8 +72,8 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006, 2007, 2008 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." -@@ -88,11 +85,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -104,7 +101,7 @@ - *local*) - # First pass through any local machine types. - echo $1 -- exit 0;; -+ exit ;; - - * ) - break ;; -@@ -123,28 +120,12 @@ - # 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* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; --######################## --# changes for Apache --# -- tpf | os390 | vmcms) -- os=-$maybe_os -- basic_machine=s390; -- ;; -- os400) -- os=-$maybe_os -- basic_machine=as400; -- ;; -- mvs) -- os=-mvs -- basic_machine=i370; -- ;; --# --# end Apache changes --######################## - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -167,7 +148,7 @@ - -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) -+ -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; -@@ -192,6 +173,10 @@ - -hiux*) - os=-hiuxwe2 - ;; -+ -sco6) -+ os=-sco5v6 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -208,6 +193,10 @@ - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -251,31 +240,52 @@ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -+ | am33_2.0 \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | bfin \ - | c4x | clipper \ -- | d10v | d30v | dsp16xx \ -- | fr30 \ -+ | d10v | d30v | dlx | dsp16xx \ -+ | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ -- | m32r | m68000 | m68k | m88k | mcore \ -- | mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ -- | mips64vr4100 | mips64vr4100el | mips64vr4300 \ -- | mips64vr4300el | mips64vr5000 | mips64vr5000el \ -- | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ -- | mipsisa32 | mipsisa64 \ -+ | ip2k | iq2000 \ -+ | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | mcore | mep \ -+ | mips | mipsbe | mipseb | mipsel | mipsle \ -+ | mips16 \ -+ | mips64 | mips64el \ -+ | mips64vr | mips64vrel \ -+ | mips64orion | mips64orionel \ -+ | mips64vr4100 | mips64vr4100el \ -+ | mips64vr4300 | mips64vr4300el \ -+ | mips64vr5000 | mips64vr5000el \ -+ | mips64vr5900 | mips64vr5900el \ -+ | mipsisa32 | mipsisa32el \ -+ | mipsisa32r2 | mipsisa32r2el \ -+ | mipsisa64 | mipsisa64el \ -+ | mipsisa64r2 | mipsisa64r2el \ -+ | mipsisa64sb1 | mipsisa64sb1el \ -+ | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -+ | mt \ -+ | msp430 \ -+ | nios | nios2 \ - | ns16k | ns32k \ -- | openrisc | or32 \ -+ | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | sh | sh[34] | sh[34]eb | shbe | shle | sh64 \ -- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ -- | strongarm \ -- | tahoe | thumb | tic80 | tron \ -+ | score \ -+ | sh | sh[1234] | sh[24]a | 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 \ - | v850 | v850e \ - | we32k \ -- | x86 | xscale | xstormy16 | xtensa \ -+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; -@@ -286,6 +296,9 @@ - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; -+ ms1) -+ basic_machine=mt-unknown -+ ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and -@@ -304,41 +317,66 @@ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -- | arm-* | armbe-* | armle-* | armv*-* \ -- | avr-* \ -- | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c54x-* \ -- | clipper-* | cydra-* \ -- | d10v-* | d30v-* \ -+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -+ | avr-* | avr32-* \ -+ | bfin-* | bs2000-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -+ | clipper-* | craynv-* | cydra-* \ -+ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ -- | f30[01]-* | f700-* | fr30-* | fx80-* \ -+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ -- | m32r-* \ -+ | ip2k-* | iq2000-* \ -+ | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | mcore-* \ -- | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ -- | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ -- | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ -- | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* \ -+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -+ | mips16-* \ -+ | mips64-* | mips64el-* \ -+ | mips64vr-* | mips64vrel-* \ -+ | mips64orion-* | mips64orionel-* \ -+ | mips64vr4100-* | mips64vr4100el-* \ -+ | mips64vr4300-* | mips64vr4300el-* \ -+ | mips64vr5000-* | mips64vr5000el-* \ -+ | mips64vr5900-* | mips64vr5900el-* \ -+ | mipsisa32-* | mipsisa32el-* \ -+ | mipsisa32r2-* | mipsisa32r2el-* \ -+ | mipsisa64-* | mipsisa64el-* \ -+ | mipsisa64r2-* | mipsisa64r2el-* \ -+ | mipsisa64sb1-* | mipsisa64sb1el-* \ -+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -+ | mipstx39-* | mipstx39el-* \ -+ | mmix-* \ -+ | mt-* \ -+ | msp430-* \ -+ | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ -- | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \ -- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -- | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | 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-* \ -+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ -- | xtensa-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-*) - ;; -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown -+ ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) -@@ -355,6 +393,9 @@ - basic_machine=a29k-amd - os=-udi - ;; -+ abacus) -+ basic_machine=abacus-unknown -+ ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout -@@ -406,6 +447,14 @@ - basic_machine=ns32k-sequent - os=-dynix - ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ os=-linux -+ ;; -+ blackfin-*) -+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - c90) - basic_machine=c90-cray - os=-unicos -@@ -434,12 +483,27 @@ - basic_machine=j90-cray - os=-unicos - ;; -+ craynv) -+ basic_machine=craynv-cray -+ os=-unicosmp -+ ;; -+ cr16) -+ basic_machine=cr16-unknown -+ os=-elf -+ ;; - crds | unos) - basic_machine=m68k-crds - ;; -+ crisv32 | crisv32-* | etraxfs*) -+ basic_machine=crisv32-axis -+ ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -+ crx) -+ basic_machine=crx-unknown -+ os=-elf -+ ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; -@@ -462,6 +526,10 @@ - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ djgpp) -+ basic_machine=i586-pc -+ os=-msdosdjgpp -+ ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx -@@ -612,6 +680,14 @@ - basic_machine=m68k-isi - os=-sysv - ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ os=-linux -+ ;; -+ m68knommu-*) -+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - m88k-omron*) - basic_machine=m88k-omron - ;; -@@ -627,6 +703,10 @@ - basic_machine=i386-pc - os=-mingw32 - ;; -+ mingw32ce) -+ basic_machine=arm-unknown -+ os=-mingw32ce -+ ;; - miniframe) - basic_machine=m68000-convergent - ;; -@@ -640,10 +720,6 @@ - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; -- mmix*) -- basic_machine=mmix-knuth -- os=-mmixware -- ;; - monitor) - basic_machine=m68k-rom68k - os=-coff -@@ -656,6 +732,9 @@ - basic_machine=i386-pc - os=-msdos - ;; -+ ms1-*) -+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs -@@ -731,10 +810,13 @@ - basic_machine=hppa1.1-oki - os=-proelf - ;; -- or32 | or32-*) -+ openrisc | openrisc-*) - basic_machine=or32-unknown -- os=-coff - ;; -+ os400) -+ basic_machine=powerpc-ibm -+ os=-os400 -+ ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose -@@ -751,55 +833,75 @@ - basic_machine=i860-intel - os=-osf - ;; -+ parisc) -+ basic_machine=hppa-unknown -+ os=-linux -+ ;; -+ parisc-*) -+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; -- pc532 | pc532-*) -+ pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -+ pc98) -+ basic_machine=i386-pc -+ ;; -+ pc98-*) -+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; -- pentiumpro | p6 | 6x86 | athlon) -+ pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; -- pentiumii | pentium2) -+ pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; -+ pentium4) -+ basic_machine=i786-pc -+ ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -- pentiumii-* | pentium2-*) -+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -+ pentium4-*) -+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown -- ;; -+ ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -- ;; -+ ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown -- ;; -+ ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown -- ;; -+ ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -@@ -810,6 +912,10 @@ - basic_machine=i586-unknown - os=-pw32 - ;; -+ rdos) -+ basic_machine=i386-pc -+ os=-rdos -+ ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff -@@ -830,15 +936,20 @@ - basic_machine=a29k-amd - os=-udi - ;; --######################## --# changes for Apache --# -- as400*) -- basic_machine=as400-ibm -+ sb1) -+ basic_machine=mipsisa64sb1-unknown - ;; --# --# end Apache changes --######################## -+ sb1el) -+ basic_machine=mipsisa64sb1el-unknown -+ ;; -+ sde) -+ basic_machine=mipsisa32-sde -+ os=-elf -+ ;; -+ sei) -+ basic_machine=mips-sei -+ os=-seiux -+ ;; - sequent) - basic_machine=i386-sequent - ;; -@@ -846,6 +957,12 @@ - basic_machine=sh-hitachi - os=-hms - ;; -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; -+ sh64) -+ basic_machine=sh64-unknown -+ ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks -@@ -904,7 +1021,7 @@ - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; -- sv1) -+ sv1) - basic_machine=sv1-cray - os=-unicos - ;; -@@ -912,10 +1029,6 @@ - basic_machine=i386-sequent - os=-dynix - ;; -- t3d) -- basic_machine=alpha-cray -- os=-unicos -- ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos -@@ -928,6 +1041,18 @@ - basic_machine=tic54x-unknown - os=-coff - ;; -+ tic55x | c55x*) -+ basic_machine=tic55x-unknown -+ os=-coff -+ ;; -+ tic6x | c6x*) -+ basic_machine=tic6x-unknown -+ os=-coff -+ ;; -+ tile*) -+ basic_machine=tile-unknown -+ os=-linux-gnu -+ ;; - tx39) - basic_machine=mipstx39-unknown - ;; -@@ -941,6 +1066,10 @@ - tower | tower-32) - basic_machine=m68k-ncr - ;; -+ tpf) -+ basic_machine=s390x-ibm -+ os=-tpf -+ ;; - udi29k) - basic_machine=a29k-amd - os=-udi -@@ -962,8 +1091,8 @@ - os=-vms - ;; - vpp*|vx|vx-*) -- basic_machine=f301-fujitsu -- ;; -+ basic_machine=f301-fujitsu -+ ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks -@@ -984,11 +1113,11 @@ - basic_machine=hppa1.1-winbond - os=-proelf - ;; -- windows32) -- basic_machine=i386-pc -- os=-windows32-msvcrt -+ xbox) -+ basic_machine=i686-pc -+ os=-mingw32 - ;; -- xps | xps100) -+ xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) -@@ -1018,6 +1147,9 @@ - romp) - basic_machine=romp-ibm - ;; -+ mmix) -+ basic_machine=mmix-knuth -+ ;; - rs6000) - basic_machine=rs6000-ibm - ;; -@@ -1034,16 +1166,13 @@ - we32k) - basic_machine=we32k-att - ;; -- sh3 | sh4 | sh3eb | sh4eb) -+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sh64) -- basic_machine=sh64-unknown -- ;; -- sparc | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; -- cydra) -+ cydra) - basic_machine=cydra-cydrome - ;; - orion) -@@ -1058,10 +1187,6 @@ - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; -- c4x*) -- basic_machine=c4x-none -- os=-coff -- ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; -@@ -1106,14 +1231,6 @@ - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; --######################## --# changes for Apache --# -- -os2_emx | -tpf* | -os390* | -vmcms* | -os400* ) -- ;; --# --# end Apache changes --######################## - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. -@@ -1125,18 +1242,23 @@ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ -- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -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* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ -- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ -+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ -- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -dragonfly*) -+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1148,16 +1270,21 @@ - ;; - esac - ;; -+ -nto-qnx*) -+ ;; - -nto*) -- os=-nto-qnx -+ os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ -- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ -+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; -+ -linux-dietlibc) -+ os=-linux-dietlibc -+ ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -@@ -1170,6 +1297,9 @@ - -opened*) - os=-openedition - ;; -+ -os400*) -+ os=-os400 -+ ;; - -wince*) - os=-wince - ;; -@@ -1191,6 +1321,9 @@ - -atheos*) - os=-atheos - ;; -+ -syllable*) -+ os=-syllable -+ ;; - -386bsd) - os=-bsd - ;; -@@ -1201,7 +1334,7 @@ - os=-rtmk-nova - ;; - -ns2 ) -- os=-nextstep2 -+ os=-nextstep2 - ;; - -nsk*) - os=-nsk -@@ -1213,6 +1346,9 @@ - -sinix*) - os=-sysv4 - ;; -+ -tpf*) -+ os=-tpf -+ ;; - -triton*) - os=-sysv3 - ;; -@@ -1240,9 +1376,18 @@ - -xenix) - os=-xenix - ;; -- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -- os=-mint -+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) -+ os=-mint - ;; -+ -aros*) -+ os=-aros -+ ;; -+ -kaos*) -+ os=-kaos -+ ;; -+ -zvmoe) -+ os=-zvmoe -+ ;; - -none) - ;; - *) -@@ -1265,6 +1410,12 @@ - # system, and we'll never get to this point. - - case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1274,11 +1425,14 @@ - arm*-semi) - os=-aout - ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; -- pdp11-*) -+ pdp11-*) - os=-none - ;; - *-dec | vax-*) -@@ -1299,6 +1453,9 @@ - m68*-cisco) - os=-aout - ;; -+ mep-*) -+ os=-elf -+ ;; - mips*-cisco) - os=-elf - ;; -@@ -1317,33 +1474,15 @@ - *-be) - os=-beos - ;; --######################## --# changes for Apache --# --# *-ibm) --# os=-aix --# ;; --# -+ *-haiku) -+ os=-haiku -+ ;; - *-ibm) -- case $basic_machine in -- s390*) -- os=-os390; -- ;; -- i370*) -- os=-mvs; -- ;; -- as400*) -- os=-os400; -- ;; -- *) -- os=-aix -- ;; -- esac -- ;; --# --# end Apache changes --######################## -- -+ os=-aix -+ ;; -+ *-knuth) -+ os=-mmixware -+ ;; - *-wec) - os=-proelf - ;; -@@ -1395,19 +1534,19 @@ - *-next) - os=-nextstep3 - ;; -- *-gould) -+ *-gould) - os=-sysv - ;; -- *-highlevel) -+ *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; -- *-sgi) -+ *-sgi) - os=-irix - ;; -- *-siemens) -+ *-siemens) - os=-sysv4 - ;; - *-masscomp) -@@ -1476,10 +1615,16 @@ - -mvs* | -opened*) - vendor=ibm - ;; -+ -os400*) -+ vendor=ibm -+ ;; - -ptx*) - vendor=sequent - ;; -- -vxsim* | -vxworks*) -+ -tpf*) -+ vendor=ibm -+ ;; -+ -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) -@@ -1503,7 +1648,7 @@ - esac - - echo $basic_machine$os --exit 0 -+exit - - # Local variables: - # eval: (add-hook 'write-file-hooks 'time-stamp) -Index: build/apr_hints.m4 -=================================================================== ---- build/apr_hints.m4 (revision 652904) -+++ build/apr_hints.m4 (working copy) -@@ -358,6 +358,11 @@ - esac - APR_ADDTO(CPPFLAGS, [-DSIGPROCMASK_SETS_THREAD_MASK -DAP_AUTH_DBM_USE_APR]) - ;; -+ *-haiku*) -+ APR_ADDTO(CPPFLAGS, [-DBEOS]) -+ APR_SETIFNULL(apr_process_lock_is_global, [yes]) -+ APR_ADDTO(LIBS, [-lnetwork]) -+ ;; - 4850-*.*) - APR_ADDTO(CPPFLAGS, [-DSVR4 -DMPRAS]) - APR_ADDTO(LIBS, [-lc -L/usr/ucblib -lucb]) -Index: build/apr_network.m4 -=================================================================== ---- build/apr_network.m4 (revision 652904) -+++ build/apr_network.m4 (working copy) -@@ -277,7 +277,7 @@ - } - memset(&sa, 0, sizeof sa); - sa.sin_family = AF_INET; --#ifdef BEOS -+#if defined BEOS && !defined __HAIKU__ - sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - #endif - /* leave port 0 to get ephemeral */ -@@ -307,7 +307,7 @@ - memset(&sa, 0, sizeof sa); - sa.sin_family = AF_INET; - sa.sin_port = listen_port; --#ifdef BEOS -+#if defined BEOS && !defined __HAIKU__ - sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - #endif - /* leave sin_addr all zeros to use loopback */ -@@ -386,7 +386,7 @@ - } - memset(&sa, 0, sizeof sa); - sa.sin_family = AF_INET; --#ifdef BEOS -+#if defined BEOS && !defined __HAIKU__ - sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - #endif - /* leave port 0 to get ephemeral */ -@@ -421,7 +421,7 @@ - memset(&sa, 0, sizeof sa); - sa.sin_family = AF_INET; - sa.sin_port = listen_port; --#ifdef BEOS -+#if defined BEOS && !defined __HAIKU__ - sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - #endif - /* leave sin_addr all zeros to use loopback */ -Index: file_io/unix/readwrite.c -=================================================================== ---- file_io/unix/readwrite.c (revision 652904) -+++ file_io/unix/readwrite.c (working copy) -@@ -21,7 +21,7 @@ - - /* The only case where we don't use wait_for_io_or_timeout is on - * pre-BONE BeOS, so this check should be sufficient and simpler */ --#if !BEOS_R5 -+#if !BEOS_R5 || defined(__HAIKU__) - #define USE_WAIT_FOR_IO - #endif - -Index: support/unix/waitio.c -=================================================================== ---- support/unix/waitio.c (revision 652904) -+++ support/unix/waitio.c (working copy) -@@ -22,7 +22,7 @@ - - /* The only case where we don't use wait_for_io_or_timeout is on - * pre-BONE BeOS, so this check should be sufficient and simpler */ --#if !BEOS_R5 -+#if !BEOS_R5 || defined(__HAIKU__) - #define USE_WAIT_FOR_IO - #endif - diff --git a/dev-libs/apr/patches/apr-1.0.1.diff b/dev-libs/apr/patches/apr-1.0.1.diff deleted file mode 100644 index ba6330540..000000000 --- a/dev-libs/apr/patches/apr-1.0.1.diff +++ /dev/null @@ -1,2869 +0,0 @@ -configure: -CFLAGS="-I/boot/home/develop/flock_server/src/headers -I/boot/home/config/include" CPPFLAGS="-I/boot/home/develop/flock_server/src/headers -I/boot/home/config/include" LDFLAGS="-L/boot/home/config/lib -lflock -liconv -no-undefined" ./configure --prefix=/boot/home/config --with-libtool - -diff -urN apr-1.0.1.orig/build/apr_hints.m4 apr-1.0.1/build/apr_hints.m4 ---- apr-1.0.1.orig/build/apr_hints.m4 2004-11-17 02:07:02.000000000 +0100 -+++ apr-1.0.1/build/apr_hints.m4 2004-12-17 15:19:10.000000000 +0100 -@@ -351,7 +351,6 @@ - *beos*) - APR_ADDTO(CPPFLAGS, [-DBEOS]) - PLATOSVERS=`uname -r` -- APR_SETIFNULL(apr_process_lock_is_global, [yes]) - case $PLATOSVERS in - 5.0.4) - APR_ADDTO(LDFLAGS, [-L/boot/beos/system/lib]) -@@ -362,6 +361,9 @@ - APR_ADDTO(LDFLAGS, [-L/boot/beos/system/lib]) - APR_ADDTO(LIBS, [-lbind -lsocket]) - ;; -+ *) -+ APR_ADDTO(LDFLAGS,-lnet) -+ ;; - esac - APR_ADDTO(CPPFLAGS, [-DSIGPROCMASK_SETS_THREAD_MASK -DAP_AUTH_DBM_USE_APR]) - ;; -diff -urN apr-1.0.1.orig/configure.in apr-1.0.1/configure.in ---- apr-1.0.1.orig/configure.in 2004-11-17 02:07:02.000000000 +0100 -+++ apr-1.0.1/configure.in 2004-12-17 15:19:10.000000000 +0100 -@@ -221,7 +221,7 @@ - dnl otherwise. - - case $host in -- *os390) -+ *os390 | *beos) - if test "$ac_test_CFLAGS" != set; then - APR_REMOVEFROM(CFLAGS,-g) - fi -@@ -232,6 +232,10 @@ - [APR_ADDTO(CFLAGS,-g) - if test "$GCC" = "yes"; then - APR_ADDTO(CFLAGS,-Wall) -+ if test "$host" = "i586-pc-beos"; then -+ APR_REMOVEFROM(CFLAGS, -O2) -+ APR_ADDTO(CFLAGS, -O0) -+ fi - elif test "$AIX_XLC" = "yes"; then - APR_ADDTO(CFLAGS,-qfullpath) - fi -@@ -384,10 +388,9 @@ - APR_CHECK_DEFINE(BONE_VERSION, sys/socket.h) - eolstr="\\n" - osver=`uname -r` -- proc_mutex_is_global=1 - OBJECTS_PLATFORM='$(OBJECTS_beos)' - case $osver in -- 5.0.4) -+ 5.0.4 | 5.1) - file_as_socket="1" - ;; - *) -@@ -715,6 +718,7 @@ - haveshmgetanon="0" - havemmapzero="0" - havemmapanon="0" -+havebeosarea="0" - APR_BEGIN_DECISION([anonymous shared memory allocation method]) - APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl - func:shmget func:shmat func:shmdt func:shmctl, -@@ -732,7 +736,7 @@ - [haveos2shm="1" - APR_DECIDE(USE_SHMEM_OS2_ANON, [OS/2 DosAllocSharedMem()])]) - APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -+ [havebeosarea="1" - APR_DECIDE(USE_SHMEM_BEOS_ANON, - [BeOS areas])]) - case $host in -@@ -779,7 +783,6 @@ - havemmaptmp="0" - havemmapshm="0" - haveshmget="0" --havebeosarea="0" - haveos2shm="0" - APR_BEGIN_DECISION([namebased memory allocation method]) - APR_IFALLYES(header:sys/mman.h func:mmap func:munmap, -@@ -796,7 +799,7 @@ - [haveshmget="1" - APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])]) - APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -+ [havebeosarea="1" - APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:os2.h, - [haveos2shm="1" -@@ -1315,9 +1318,10 @@ - size_t_fmt='#define APR_SIZE_T_FMT "ld"' - ;; - *beos*) -- ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"' -- size_t_fmt='#define APR_SIZE_T_FMT "ld"' -- ;; -+ pid_t_fmt='#define APR_PID_T_FMT "ld"' -+ ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"' -+ size_t_fmt='#define APR_SIZE_T_FMT "ld"' -+ ;; - *apple-darwin*) - ssize_t_fmt='#define APR_SSIZE_T_FMT "d"' - size_t_fmt='#define APR_SIZE_T_FMT "lu"' -@@ -1399,6 +1403,10 @@ - # Original HP-UX: - AC_CHECK_LIB(dld, shl_load, [dsotype=shl; APR_ADDTO(LIBS,-ldld)]) - fi -+ if test "$dsotype" = "any"; then -+ # BeOS: -+ AC_CHECK_LIB(root, load_image, [dsotype=other]) -+ fi - # Normal POSIX: - if test "$dsotype" = "any"; then - AC_CHECK_FUNC(dlopen, [dsotype=dlfcn]) -@@ -1414,10 +1422,6 @@ - [dsotype=any - echo "Weird: dlopen() was found but dlsym() was not found!"])]) - fi -- if test "$dsotype" = "any"; then -- # BeOS: -- AC_CHECK_LIB(root, load_image, [dsotype=other]) -- fi - # Everything else: - if test "$dsotype" = "any"; then - case $host in -@@ -1597,6 +1601,17 @@ - fi - fi - -+# BeOS has no built-in flock(), but there is a third-party flock_server package -+# that adds basic (if not compliant) support. It defines flock() in flock.h. -+case $host in -+ *beos) -+ unset ac_cv_define_LOCK_EX -+ APR_CHECK_DEFINE(LOCK_EX, flock.h) -+ APR_IFALLYES(func:flock define:LOCK_EX, [ -+ APR_ADDTO(CFLAGS, -Dclose=flock_close -Ddup2=flock_dup2)]) -+ ;; -+esac -+ - # See which lock mechanisms we can support on this system. - APR_IFALLYES(header:semaphore.h func:sem_open func:sem_close dnl - func:sem_unlink func:sem_post func:sem_wait, -@@ -1610,7 +1625,16 @@ - func:pthread_mutexattr_setpshared dnl - file:/dev/zero, - hasprocpthreadser="1", hasprocpthreadser="0") --APR_IFALLYES(header:OS.h func:create_sem, hasbeossem="1", hasbeossem="0") -+APR_IFALLYES(header:OS.h func:create_sem, hasbeossemser="1", hasbeossemser="0") -+ -+# BeOS defines F_SETLK, but that doesn't mean, that it really works. -+case $host in -+ *beos*) -+ hasfcntlser="0" -+ ;; -+ *) -+ ;; -+esac - - # See which lock mechanism we'll select by default on this system. - # The last APR_DECIDE to execute sets the default. -@@ -1642,6 +1666,7 @@ - posixser="0" - procpthreadser="0" - fcntlser="0" -+beossemser="0" - case $ac_decision in - USE_FLOCK_SERIALIZE ) - flockser="1" -@@ -1659,7 +1684,7 @@ - procpthreadser="1" - ;; - USE_BEOSSEM ) -- beossem="1" -+ beossemser="1" - ;; - esac - -@@ -1668,12 +1693,14 @@ - AC_SUBST(hasposixser) - AC_SUBST(hasfcntlser) - AC_SUBST(hasprocpthreadser) -+AC_SUBST(hasbeossemser) - AC_SUBST(flockser) - AC_SUBST(sysvser) - AC_SUBST(posixser) - AC_SUBST(fcntlser) - AC_SUBST(procpthreadser) - AC_SUBST(pthreadser) -+AC_SUBST(beossemser) - - AC_MSG_CHECKING(if all interprocess locks affect threads) - if test "x$apr_process_lock_is_global" = "xyes"; then -@@ -1983,6 +2010,9 @@ - if test -d $srcdir/test; then - MAKEFILES="$MAKEFILES test/Makefile test/internal/Makefile" - fi -+if test -d $srcdir/threadproc/beos; then -+ MAKEFILES="$MAKEFILES threadproc/beos/Makefile" -+fi - - # - # BSD/OS (BSDi) needs to use a different include syntax in the Makefiles -diff -urN apr-1.0.1.orig/dso/beos/dso.c apr-1.0.1/dso/beos/dso.c ---- apr-1.0.1.orig/dso/beos/dso.c 2004-03-09 15:40:41.000000000 +0100 -+++ apr-1.0.1/dso/beos/dso.c 2004-12-17 15:19:10.000000000 +0100 -@@ -22,7 +22,7 @@ - { - apr_dso_handle_t *dso = thedso; - -- if (dso->handle > 0 && unload_add_on(dso->handle) < B_NO_ERROR) -+ if (dso->handle >= 0 && unload_add_on(dso->handle) < B_NO_ERROR) - return APR_EINIT; - dso->handle = -1; - -@@ -32,19 +32,16 @@ - APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, - const char *path, apr_pool_t *pool) - { -- image_id newid = -1; -+ apr_dso_handle_t *handle = apr_pcalloc(pool, sizeof(apr_dso_handle_t)); -+ *res_handle = handle; - -- *res_handle = apr_pcalloc(pool, sizeof(*res_handle)); -- -- if((newid = load_add_on(path)) < B_NO_ERROR) { -- (*res_handle)->errormsg = strerror(newid); -+ handle->handle = load_add_on(path); -+ if (handle->handle < B_NO_ERROR) - return APR_EDSOOPEN; -- } -- -- (*res_handle)->pool = pool; -- (*res_handle)->handle = newid; - -- apr_pool_cleanup_register(pool, *res_handle, dso_cleanup, apr_pool_cleanup_null); -+ handle->pool = pool; -+ -+ apr_pool_cleanup_register(pool, handle, dso_cleanup, apr_pool_cleanup_null); - - return APR_SUCCESS; - } -@@ -62,10 +59,9 @@ - if (symname == NULL) - return APR_ESYMNOTFOUND; - -- err = get_image_symbol(handle->handle, symname, B_SYMBOL_TYPE_ANY, -- ressym); -+ err = get_image_symbol(handle->handle, symname, B_SYMBOL_TYPE_ANY, ressym); - -- if(err != B_OK) -+ if (err != B_OK) - return APR_ESYMNOTFOUND; - - return APR_SUCCESS; -diff -urN apr-1.0.1.orig/file_io/unix/flock.c apr-1.0.1/file_io/unix/flock.c ---- apr-1.0.1.orig/file_io/unix/flock.c 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/file_io/unix/flock.c 2004-12-17 15:19:10.000000000 +0100 -@@ -22,11 +22,15 @@ - #include - #endif - -+#if defined(BEOS) && APR_HAS_FLOCK_SERIALIZE -+#include -+#endif -+ - APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type) - { - int rc; - --#if defined(HAVE_FCNTL_H) -+#if APR_HAS_FCNTL_SERIALIZE - { - struct flock l = { 0 }; - int fc; -@@ -56,7 +60,7 @@ - return errno; - } - } --#elif defined(HAVE_SYS_FILE_H) -+#elif APR_HAS_FLOCK_SERIALIZE - { - int ltype; - -@@ -85,7 +89,7 @@ - { - int rc; - --#if defined(HAVE_FCNTL_H) -+#if APR_HAS_FCNTL_SERIALIZE - { - struct flock l = { 0 }; - -@@ -102,7 +106,7 @@ - if (rc == -1) - return errno; - } --#elif defined(HAVE_SYS_FILE_H) -+#elif APR_HAS_FLOCK_SERIALIZE - { - /* keep trying if flock() gets interrupted (by a signal) */ - while ((rc = flock(thefile->filedes, LOCK_UN)) < 0 && errno == EINTR) -diff -urN apr-1.0.1.orig/file_io/unix/pipe.c apr-1.0.1/file_io/unix/pipe.c ---- apr-1.0.1.orig/file_io/unix/pipe.c 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/file_io/unix/pipe.c 2004-12-17 15:19:11.000000000 +0100 -@@ -42,7 +42,7 @@ - fd_flags &= ~O_NONBLOCK; - # elif defined(O_NDELAY) - fd_flags &= ~O_NDELAY; --# elif defined(FNDELAY) -+# elif defined(O_FNDELAY) - fd_flags &= ~O_FNDELAY; - # else - /* XXXX: this breaks things, but an alternative isn't obvious...*/ -@@ -77,7 +77,7 @@ - fd_flags |= O_NONBLOCK; - # elif defined(O_NDELAY) - fd_flags |= O_NDELAY; --# elif defined(FNDELAY) -+# elif defined(O_FNDELAY) - fd_flags |= O_FNDELAY; - # else - /* XXXX: this breaks things, but an alternative isn't obvious...*/ -diff -urN apr-1.0.1.orig/include/apr.h.in apr-1.0.1/include/apr.h.in ---- apr-1.0.1.orig/include/apr.h.in 2004-06-05 13:52:43.000000000 +0200 -+++ apr-1.0.1/include/apr.h.in 2004-12-17 15:19:10.000000000 +0100 -@@ -172,12 +172,14 @@ - #define APR_USE_FCNTL_SERIALIZE @fcntlser@ - #define APR_USE_PROC_PTHREAD_SERIALIZE @procpthreadser@ - #define APR_USE_PTHREAD_SERIALIZE @pthreadser@ -+#define APR_USE_BEOS_SEM_SERIALIZE @beossemser@ - - #define APR_HAS_FLOCK_SERIALIZE @hasflockser@ - #define APR_HAS_SYSVSEM_SERIALIZE @hassysvser@ - #define APR_HAS_POSIXSEM_SERIALIZE @hasposixser@ - #define APR_HAS_FCNTL_SERIALIZE @hasfcntlser@ - #define APR_HAS_PROC_PTHREAD_SERIALIZE @hasprocpthreadser@ -+#define APR_HAS_BEOS_SEM_SERIALIZE @hasbeossemser@ - - #define APR_PROCESS_LOCK_IS_GLOBAL @proclockglobal@ - -diff -urN apr-1.0.1.orig/include/apr_portable.h apr-1.0.1/include/apr_portable.h ---- apr-1.0.1.orig/include/apr_portable.h 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/include/apr_portable.h 2004-12-17 15:19:10.000000000 +0100 -@@ -87,9 +87,24 @@ - #include - #include - -+/** Basic OS process mutex structure. */ - struct apr_os_proc_mutex_t { -- sem_id sem; -- int32 ben; -+#if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE -+ /** Value used for SYS V Semaphore, FCNTL and FLOCK serialization */ -+ int crossproc; -+#endif -+#if APR_HAS_PROC_PTHREAD_SERIALIZE -+ /** Value used for PTHREAD serialization */ -+ pthread_mutex_t *pthread_interproc; -+#endif -+#if APR_HAS_THREADS -+ /* If no threads, no need for thread locks */ -+#if APR_USE_PTHREAD_SERIALIZE -+ /** This value is currently unused within APR and Apache */ -+ pthread_mutex_t *intraproc; -+#endif -+ sem_id beos_sem; -+#endif - }; - - typedef int apr_os_file_t; -@@ -98,7 +113,7 @@ - typedef struct apr_os_proc_mutex_t apr_os_proc_mutex_t; - typedef thread_id apr_os_thread_t; - typedef thread_id apr_os_proc_t; --typedef int apr_os_threadkey_t; -+typedef int32 apr_os_threadkey_t; - typedef struct timeval apr_os_imp_time_t; - typedef struct tm apr_os_exp_time_t; - typedef image_id apr_os_dso_handle_t; ---- apr-1.0.1.orig/include/arch/beos/apr_arch_proc_mutex.h 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/include/arch/beos/apr_arch_proc_mutex.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,35 +0,0 @@ --/* Copyright 2000-2004 The Apache Software Foundation -- * -- * Licensed under the Apache License, Version 2.0 (the "License"); -- * you may not use this file except in compliance with the License. -- * You may obtain a copy of the License at -- * -- * http://www.apache.org/licenses/LICENSE-2.0 -- * -- * Unless required by applicable law or agreed to in writing, software -- * distributed under the License is distributed on an "AS IS" BASIS, -- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- * See the License for the specific language governing permissions and -- * limitations under the License. -- */ -- --#ifndef PROC_MUTEX_H --#define PROC_MUTEX_H -- --#include "apr_pools.h" --#include "apr_proc_mutex.h" --#include "apr_file_io.h" --#include "apr_general.h" --#include "apr_lib.h" --#include "apr_portable.h" -- --struct apr_proc_mutex_t { -- apr_pool_t *pool; -- -- /* Our lock :) */ -- sem_id Lock; -- int32 LockCount; --}; -- --#endif /* PROC_MUTEX_H */ -- -diff -urN apr-1.0.1.orig/include/arch/beos/apr_arch_shm.h apr-1.0.1/include/arch/beos/apr_arch_shm.h ---- apr-1.0.1.orig/include/arch/beos/apr_arch_shm.h 1970-01-01 01:00:00.000000000 +0100 -+++ apr-1.0.1/include/arch/beos/apr_arch_shm.h 2004-12-17 15:19:11.000000000 +0100 -@@ -0,0 +1,35 @@ -+/* Copyright 2000-2004 The Apache Software Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#ifndef SHM_H -+#define SHM_H -+ -+#include -+#include "apr_pools.h" -+#include "apr_general.h" -+#include "apr_lib.h" -+#include "apr_portable.h" -+ -+typedef struct beos_area_handle beos_area_handle; -+ -+struct apr_shm_t { -+ apr_pool_t *pool; -+ beos_area_handle *handle; -+}; -+ -+apr_status_t apr_beos_setup_shmem(); -+apr_status_t apr_beos_shmem_child_init(); -+ -+#endif /* SHM_H */ -diff -urN apr-1.0.1.orig/include/arch/beos/apr_arch_thread_mutex.h apr-1.0.1/include/arch/beos/apr_arch_thread_mutex.h ---- apr-1.0.1.orig/include/arch/beos/apr_arch_thread_mutex.h 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/include/arch/beos/apr_arch_thread_mutex.h 2004-12-17 15:19:11.000000000 +0100 -@@ -37,5 +37,8 @@ - int owner_ref; - }; - -+apr_status_t apr_beos_thread_mutex_init(apr_thread_mutex_t *mutex, -+ unsigned int flags, apr_pool_t *pool); -+ - #endif /* THREAD_MUTEX_H */ - -diff -urN apr-1.0.1.orig/include/arch/beos/apr_arch_threadproc.h apr-1.0.1/include/arch/beos/apr_arch_threadproc.h ---- apr-1.0.1.orig/include/arch/beos/apr_arch_threadproc.h 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/include/arch/beos/apr_arch_threadproc.h 2004-12-17 15:19:11.000000000 +0100 -@@ -44,6 +44,7 @@ - void *data; - apr_thread_start_t func; - apr_status_t exitval; -+ vint32 join_count; - }; - - struct apr_threadattr_t { -@@ -55,21 +56,8 @@ - - struct apr_threadkey_t { - apr_pool_t *pool; -- int32 key; --}; -- --struct beos_private_data { -- const void ** data; -- int count; -- volatile thread_id td; --}; -- --struct beos_key { -- int assigned; -- int count; -- sem_id lock; -- int32 ben_lock; -- void (* destructor) (void *); -+ int32 key; -+ void (*destructor)(void *); - }; - - struct apr_procattr_t { -@@ -87,7 +75,6 @@ - - struct apr_thread_once_t { - sem_id sem; -- int hit; - }; - - #endif /* ! THREAD_PROC_H */ -diff -urN apr-1.0.1.orig/include/arch/unix/apr_arch_proc_mutex.h apr-1.0.1/include/arch/unix/apr_arch_proc_mutex.h ---- apr-1.0.1.orig/include/arch/unix/apr_arch_proc_mutex.h 2004-06-14 10:53:31.000000000 +0200 -+++ apr-1.0.1/include/arch/unix/apr_arch_proc_mutex.h 2004-12-17 15:19:10.000000000 +0100 -@@ -104,6 +104,9 @@ - #if APR_HAS_PROC_PTHREAD_SERIALIZE - pthread_mutex_t *pthread_interproc; - #endif -+#if APR_HAS_BEOS_SEM_SERIALIZE -+ sem_id beos_sem; -+#endif - }; - - void apr_proc_mutex_unix_setup_lock(void); -diff -urN apr-1.0.1.orig/locks/beos/locks_common.c apr-1.0.1/locks/beos/locks_common.c ---- apr-1.0.1.orig/locks/beos/locks_common.c 1970-01-01 01:00:00.000000000 +0100 -+++ apr-1.0.1/locks/beos/locks_common.c 2004-12-17 15:19:11.000000000 +0100 -@@ -0,0 +1,5 @@ -+/* Include "apr_arch_thread_mutex.h" first, so that "apr_arch_global_mutex.h" -+ * won't include the wrong one (the UNIX version). -+ */ -+#include "apr_arch_thread_mutex.h" -+#include "../unix/global_mutex.c" -diff -urN apr-1.0.1.orig/locks/beos/proc_mutex.c apr-1.0.1/locks/beos/proc_mutex.c ---- apr-1.0.1.orig/locks/beos/proc_mutex.c 2004-03-09 15:39:45.000000000 +0100 -+++ apr-1.0.1/locks/beos/proc_mutex.c 2004-12-17 15:19:11.000000000 +0100 -@@ -13,157 +13,68 @@ - * limitations under the License. - */ - --/*Read/Write locking implementation based on the MultiLock code from -- * Stephen Beaulieu -- */ -- - #include "apr_arch_proc_mutex.h" - #include "apr_strings.h" - #include "apr_portable.h" -+#if APR_HAS_FLOCK_SERIALIZE -+#include -+#endif - --static apr_status_t _proc_mutex_cleanup(void * data) --{ -- apr_proc_mutex_t *lock = (apr_proc_mutex_t*)data; -- if (lock->LockCount != 0) { -- /* we're still locked... */ -- while (atomic_add(&lock->LockCount , -1) > 1){ -- /* OK we had more than one person waiting on the lock so -- * the sem is also locked. Release it until we have no more -- * locks left. -- */ -- release_sem (lock->Lock); -- } -- } -- delete_sem(lock->Lock); -- return APR_SUCCESS; --} -- --APR_DECLARE(apr_status_t) apr_proc_mutex_create(apr_proc_mutex_t **mutex, -- const char *fname, -- apr_lockmech_e mech, -- apr_pool_t *pool) --{ -- apr_proc_mutex_t *new; -- apr_status_t stat = APR_SUCCESS; -- -- if (mech != APR_LOCK_DEFAULT) { -- return APR_ENOTIMPL; -- } -- -- new = (apr_proc_mutex_t *)apr_pcalloc(pool, sizeof(apr_proc_mutex_t)); -- if (new == NULL){ -- return APR_ENOMEM; -- } -- -- if ((stat = create_sem(0, "APR_Lock")) < B_NO_ERROR) { -- _proc_mutex_cleanup(new); -- return stat; -- } -- new->LockCount = 0; -- new->Lock = stat; -- new->pool = pool; -- -- apr_pool_cleanup_register(new->pool, (void *)new, _proc_mutex_cleanup, -- apr_pool_cleanup_null); -- -- (*mutex) = new; -- return APR_SUCCESS; --} -+#include - --APR_DECLARE(apr_status_t) apr_proc_mutex_child_init(apr_proc_mutex_t **mutex, -- const char *fname, -- apr_pool_t *pool) -+static apr_status_t proc_mutex_beos_sem_cleanup(void *mutex_) - { -- return APR_SUCCESS; --} -+ apr_proc_mutex_t *mutex = mutex_; - --APR_DECLARE(apr_status_t) apr_proc_mutex_lock(apr_proc_mutex_t *mutex) --{ -- int32 stat; -- -- if (atomic_add(&mutex->LockCount, 1) > 0) { -- if ((stat = acquire_sem(mutex->Lock)) < B_NO_ERROR) { -- atomic_add(&mutex->LockCount, -1); -- return stat; -- } -- } -- return APR_SUCCESS; --} -- --APR_DECLARE(apr_status_t) apr_proc_mutex_trylock(apr_proc_mutex_t *mutex) --{ -- return APR_ENOTIMPL; --} -+ return delete_sem(mutex->beos_sem); -+} - --APR_DECLARE(apr_status_t) apr_proc_mutex_unlock(apr_proc_mutex_t *mutex) -+static apr_status_t proc_mutex_beos_sem_create(apr_proc_mutex_t *new_mutex, -+ const char *fname) - { -- int32 stat; -- -- if (atomic_add(&mutex->LockCount, -1) > 1) { -- if ((stat = release_sem(mutex->Lock)) < B_NO_ERROR) { -- atomic_add(&mutex->LockCount, 1); -- return stat; -- } -- } -- return APR_SUCCESS; --} -+ new_mutex->beos_sem = create_sem(1, "APR_ProcMutex"); -+ if (new_mutex->beos_sem < B_NO_ERROR) -+ return new_mutex->beos_sem; - --APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex) --{ -- apr_status_t stat; -- if ((stat = _proc_mutex_cleanup(mutex)) == APR_SUCCESS) { -- apr_pool_cleanup_kill(mutex->pool, mutex, _proc_mutex_cleanup); -- return APR_SUCCESS; -- } -- return stat; --} -+ apr_pool_cleanup_register(new_mutex->pool, (void *)new_mutex, -+ apr_proc_mutex_cleanup, -+ apr_pool_cleanup_null); - --APR_DECLARE(apr_status_t) apr_proc_mutex_cleanup(void *mutex) --{ -- return _proc_mutex_cleanup(mutex); -+ return APR_SUCCESS; - } - -- --APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex) -+static apr_status_t proc_mutex_beos_sem_acquire(apr_proc_mutex_t *mutex) - { -- return NULL; -+ return acquire_sem(mutex->beos_sem); - } - --APR_DECLARE(const char *) apr_proc_mutex_name(apr_proc_mutex_t *mutex) -+static apr_status_t proc_mutex_beos_sem_tryacquire(apr_proc_mutex_t *mutex) - { -- return "beossem"; -+ return acquire_sem_etc(mutex->beos_sem, 0, B_RELATIVE_TIMEOUT, 0); - } - --APR_DECLARE(const char *) apr_proc_mutex_defname(void) -+static apr_status_t proc_mutex_beos_sem_release(apr_proc_mutex_t *mutex) - { -- return "beossem"; -+ return release_sem(mutex->beos_sem); - } - --APR_POOL_IMPLEMENT_ACCESSOR(proc_mutex) -- --/* Implement OS-specific accessors defined in apr_portable.h */ -- --APR_DECLARE(apr_status_t) apr_os_proc_mutex_get(apr_os_proc_mutex_t *ospmutex, -- apr_proc_mutex_t *pmutex) -+static apr_status_t proc_mutex_beos_sem_child_init(apr_proc_mutex_t **mutex, -+ apr_pool_t *cont, -+ const char *fname) - { -- ospmutex->sem = pmutex->Lock; -- ospmutex->ben = pmutex->LockCount; - return APR_SUCCESS; - } - --APR_DECLARE(apr_status_t) apr_os_proc_mutex_put(apr_proc_mutex_t **pmutex, -- apr_os_proc_mutex_t *ospmutex, -- apr_pool_t *pool) --{ -- if (pool == NULL) { -- return APR_ENOPOOL; -- } -- if ((*pmutex) == NULL) { -- (*pmutex) = (apr_proc_mutex_t *)apr_pcalloc(pool, sizeof(apr_proc_mutex_t)); -- (*pmutex)->pool = pool; -- } -- (*pmutex)->Lock = ospmutex->sem; -- (*pmutex)->LockCount = ospmutex->ben; -- return APR_SUCCESS; --} -+static const apr_proc_mutex_unix_lock_methods_t mutex_beos_sem_methods = -+{ -+ APR_PROCESS_LOCK_MECH_IS_GLOBAL, -+ proc_mutex_beos_sem_create, -+ proc_mutex_beos_sem_acquire, -+ proc_mutex_beos_sem_tryacquire, -+ proc_mutex_beos_sem_release, -+ proc_mutex_beos_sem_cleanup, -+ proc_mutex_beos_sem_child_init, -+ "beossem" -+}; - -+#include "../unix/proc_mutex.c" -diff -urN apr-1.0.1.orig/locks/beos/thread_cond.c apr-1.0.1/locks/beos/thread_cond.c ---- apr-1.0.1.orig/locks/beos/thread_cond.c 2004-02-26 18:03:26.000000000 +0100 -+++ apr-1.0.1/locks/beos/thread_cond.c 2004-12-17 15:19:11.000000000 +0100 -@@ -20,7 +20,6 @@ - - static apr_status_t thread_cond_cleanup(void *data) - { -- struct waiter *w; - apr_thread_cond_t *cond = (apr_thread_cond_t *)data; - - acquire_sem(cond->lock); -diff -urN apr-1.0.1.orig/locks/beos/thread_mutex.c apr-1.0.1/locks/beos/thread_mutex.c ---- apr-1.0.1.orig/locks/beos/thread_mutex.c 2004-02-26 18:03:26.000000000 +0100 -+++ apr-1.0.1/locks/beos/thread_mutex.c 2004-12-17 15:19:11.000000000 +0100 -@@ -26,18 +26,37 @@ - apr_thread_mutex_t *lock = (apr_thread_mutex_t*)data; - if (lock->LockCount != 0) { - /* we're still locked... */ -- while (atomic_add(&lock->LockCount , -1) > 1){ -- /* OK we had more than one person waiting on the lock so -- * the sem is also locked. Release it until we have no more -- * locks left. -- */ -+ while (atomic_add(&lock->LockCount , -1) > 1){ -+ /* OK we had more than one person waiting on the lock so -+ * the sem is also locked. Release it until we have no more -+ * locks left. -+ */ - release_sem (lock->Lock); -- } -+ } - } - delete_sem(lock->Lock); - return APR_SUCCESS; - } - -+/* pool may be NULL. */ -+apr_status_t apr_beos_thread_mutex_init(apr_thread_mutex_t *mutex, -+ unsigned int flags, apr_pool_t *pool) -+{ -+ mutex->Lock = create_sem(0, "APR_Lock"); -+ if (mutex->Lock < 0) -+ return mutex->Lock; -+ -+ mutex->LockCount = 0; -+ mutex->pool = pool; -+ -+ /* Optimal default is APR_THREAD_MUTEX_UNNESTED, -+ * no additional checks required for either flag. -+ */ -+ mutex->nested = flags & APR_THREAD_MUTEX_NESTED; -+ -+ return APR_SUCCESS; -+} -+ - APR_DECLARE(apr_status_t) apr_thread_mutex_create(apr_thread_mutex_t **mutex, - unsigned int flags, - apr_pool_t *pool) -@@ -49,19 +68,10 @@ - if (new_m == NULL){ - return APR_ENOMEM; - } -- -- if ((stat = create_sem(0, "APR_Lock")) < B_NO_ERROR) { -- _thread_mutex_cleanup(new_m); -- return stat; -- } -- new_m->LockCount = 0; -- new_m->Lock = stat; -- new_m->pool = pool; - -- /* Optimal default is APR_THREAD_MUTEX_UNNESTED, -- * no additional checks required for either flag. -- */ -- new_m->nested = flags & APR_THREAD_MUTEX_NESTED; -+ stat = apr_beos_thread_mutex_init(new_m, flags, pool); -+ if (stat != APR_SUCCESS) -+ return stat; - - apr_pool_cleanup_register(new_m->pool, (void *)new_m, _thread_mutex_cleanup, - apr_pool_cleanup_null); -@@ -90,13 +100,13 @@ - return APR_SUCCESS; - } - -- if (atomic_add(&mutex->LockCount, 1) > 0) { -- if ((stat = acquire_sem(mutex->Lock)) < B_NO_ERROR) { -+ if (atomic_add(&mutex->LockCount, 1) > 0) { -+ if ((stat = acquire_sem(mutex->Lock)) < B_NO_ERROR) { - /* Oh dear, acquire_sem failed!! */ -- atomic_add(&mutex->LockCount, -1); -- return stat; -- } -- } -+ atomic_add(&mutex->LockCount, -1); -+ return stat; -+ } -+ } - - mutex->owner = me; - mutex->owner_ref = 1; -@@ -119,7 +129,7 @@ - return APR_SUCCESS; - } - -- if (atomic_add(&mutex->LockCount, -1) > 1) { -+ if (atomic_add(&mutex->LockCount, -1) > 1) { - if ((stat = release_sem(mutex->Lock)) < B_NO_ERROR) { - atomic_add(&mutex->LockCount, 1); - return stat; -diff -urN apr-1.0.1.orig/locks/unix/proc_mutex.c apr-1.0.1/locks/unix/proc_mutex.c ---- apr-1.0.1.orig/locks/unix/proc_mutex.c 2004-06-15 10:21:22.000000000 +0200 -+++ apr-1.0.1/locks/unix/proc_mutex.c 2004-12-17 15:19:11.000000000 +0100 -@@ -717,6 +717,8 @@ - new_mutex->inter_meth = &mutex_proc_pthread_methods; - #elif APR_USE_POSIXSEM_SERIALIZE - new_mutex->inter_meth = &mutex_posixsem_methods; -+#elif APR_USE_BEOS_SEM_SERIALIZE -+ new_mutex->inter_meth = &mutex_beos_sem_methods; - #else - return APR_ENOTIMPL; - #endif -@@ -837,6 +839,9 @@ - #if APR_HAS_PROC_PTHREAD_SERIALIZE - ospmutex->pthread_interproc = pmutex->pthread_interproc; - #endif -+#if APR_HAS_BEOS_SEM_SERIALIZE -+ ospmutex->beos_sem = pmutex->beos_sem; -+#endif - return APR_SUCCESS; - } - -@@ -858,6 +863,9 @@ - #if APR_HAS_PROC_PTHREAD_SERIALIZE - (*pmutex)->pthread_interproc = ospmutex->pthread_interproc; - #endif -+#if APR_HAS_BEOS_SEM_SERIALIZE -+ (*pmutex)->beos_sem = ospmutex->beos_sem; -+#endif - return APR_SUCCESS; - } - -diff -urN apr-1.0.1.orig/misc/unix/start.c apr-1.0.1/misc/unix/start.c ---- apr-1.0.1.orig/misc/unix/start.c 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/misc/unix/start.c 2004-12-17 15:19:11.000000000 +0100 -@@ -22,6 +22,10 @@ - #include "apr_arch_proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */ - #include "apr_arch_internal_time.h" - -+#ifdef BEOS -+#include "apr_arch_shm.h" /* for apr_beos_setup_shmem() */ -+#endif -+ - - APR_DECLARE(apr_status_t) apr_app_initialize(int *argc, - const char * const * *argv, -@@ -51,6 +55,10 @@ - apr_unix_setup_time(); - #endif - -+#ifdef BEOS -+ apr_beos_setup_shmem(); -+#endif -+ - if ((status = apr_pool_initialize()) != APR_SUCCESS) - return status; - ---- apr-1.0.1.orig/network_io/beos/sendrecv.c 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/network_io/beos/sendrecv.c 2004-12-17 15:25:26.000000000 +0100 -@@ -17,9 +17,14 @@ - #if BEOS_BONE /* BONE uses the unix code - woohoo */ - #include "../unix/sendrecv.c" - #else -+#include -+ - #include "apr_arch_networkio.h" - #include "apr_time.h" - -+#define SEND_WAIT APR_USEC_PER_SEC / 100 -+#define RECEIVE_WAIT APR_USEC_PER_SEC / 100 -+ - static apr_status_t wait_for_io_or_timeout(apr_socket_t *sock, int for_read) - { - struct timeval tv, *tvptr; -@@ -37,6 +42,8 @@ - tv.tv_usec = sock->timeout % APR_USEC_PER_SEC; - tvptr = &tv; - } -+ /* This probably only works for read_for. At least according to the -+ * documentation only the read set argument is actually supported. */ - srv = select(sock->socketdes + 1, - for_read ? &fdset : NULL, - for_read ? NULL : &fdset, -@@ -54,38 +61,46 @@ - return APR_SUCCESS; - } - --#define SEND_WAIT APR_USEC_PER_SEC / 10 -+apr_status_t apr_wait_for_io_or_timeout(apr_file_t *f, apr_socket_t *s, -+ int for_read) -+{ -+ /* BeOS net_server select() supports sockets only */ -+ if (!f) -+ return APR_ENOTIMPL; -+ -+ return wait_for_io_or_timeout(s, for_read); -+} - - APR_DECLARE(apr_status_t) apr_socket_send(apr_socket_t *sock, const char *buf, - apr_size_t *len) - { - apr_ssize_t rv; -- -+ - do { - rv = send(sock->socketdes, buf, (*len), 0); - } while (rv == -1 && errno == EINTR); - - if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) { -- apr_int32_t snooze_val = SEND_WAIT; -- apr_int32_t zzz = 0; -- -- do { -- rv = send(sock->socketdes, buf, (*len), 0); -- if (rv == -1 && errno == EWOULDBLOCK){ -- apr_sleep (snooze_val); -- zzz += snooze_val; -- snooze_val += SEND_WAIT; -- /* have we passed our timeout value */ -- if (zzz > (sock->timeout * APR_USEC_PER_SEC)) -- break; -- } -- } while (rv == -1 && (errno == EINTR || errno == EWOULDBLOCK)); -+ bigtime_t now = system_time(); -+ bigtime_t endTime = now + sock->timeout; -+ while (now < endTime) { -+ snooze(RECEIVE_WAIT); -+ -+ do { -+ rv = send(sock->socketdes, buf, (*len), 0); -+ } while (rv == -1 && errno == EINTR); -+ -+ if (rv >= 0 || (rv < 0 && errno != EWOULDBLOCK)) -+ break; -+ -+ now = system_time(); -+ }; - } - if (rv == -1) { - *len = 0; -- return errno; -+ return (errno == EWOULDBLOCK ? APR_TIMEUP : errno); - } -- (*len) = rv; -+ *len = rv; - - return APR_SUCCESS; - } -@@ -100,22 +115,30 @@ - } while (rv == -1 && errno == EINTR); - - if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) { -- apr_status_t arv = wait_for_io_or_timeout(sock, 1); -- if (arv != APR_SUCCESS) { -- *len = 0; -- return arv; -- } -- else { -+ /* bonefish: I don't know why, but in some cases select() seems to -+ * return success, even if there's nothing to read yet. Maybe if the -+ * connection is not yet established? The tests exposed this problem. -+ * Long story short, we have to poll here, too. */ -+ bigtime_t now = system_time(); -+ bigtime_t endTime = now + sock->timeout; -+ while (now < endTime) { -+ snooze(RECEIVE_WAIT); -+ - do { - rv = recv(sock->socketdes, buf, (*len), 0); - } while (rv == -1 && errno == EINTR); -- } -+ -+ if (rv >= 0 || (rv < 0 && errno != EWOULDBLOCK)) -+ break; -+ -+ now = system_time(); -+ }; - } - if (rv == -1) { - (*len) = 0; -- return errno; -+ return (errno == EWOULDBLOCK ? APR_TIMEUP : errno); - } -- (*len) = rv; -+ *len = rv; - if (rv == 0) - return APR_EOF; - return APR_SUCCESS; -@@ -144,23 +167,28 @@ - where->salen); - } while (rv == -1 && errno == EINTR); - -- if (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK) -- && sock->timeout != 0) { -- apr_status_t arv = wait_for_io_or_timeout(sock, 0); -- if (arv != APR_SUCCESS) { -- *len = 0; -- return arv; -- } else { -+ -+ if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) { -+ bigtime_t now = system_time(); -+ bigtime_t endTime = now + sock->timeout; -+ while (now < endTime) { -+ snooze(RECEIVE_WAIT); -+ - do { - rv = sendto(sock->socketdes, buf, (*len), flags, - (const struct sockaddr*)&where->sa, - where->salen); - } while (rv == -1 && errno == EINTR); -- } -+ -+ if (rv >= 0 || (rv < 0 && errno != EWOULDBLOCK)) -+ break; -+ -+ now = system_time(); -+ }; - } - if (rv == -1) { - *len = 0; -- return errno; -+ return (errno == EWOULDBLOCK ? APR_TIMEUP : errno); - } - *len = rv; - return APR_SUCCESS; -@@ -173,38 +201,38 @@ - { - apr_ssize_t rv; - -- if (from == NULL){ -- return APR_ENOMEM; -- /* Not sure if this is correct. Maybe we should just allocate -- the memory?? -- */ -- } -- - do { - rv = recvfrom(sock->socketdes, buf, (*len), flags, - (struct sockaddr*)&from->sa, &from->salen); - } while (rv == -1 && errno == EINTR); - -- if (rv == -1 && (errno == EAGAIN || errno == EWOULDBLOCK) && -- sock->timeout != 0) { -- apr_status_t arv = wait_for_io_or_timeout(sock, 1); -- if (arv != APR_SUCCESS) { -- *len = 0; -- return arv; -- } else { -+ if (rv == -1 && errno == EWOULDBLOCK && sock->timeout > 0) { -+ /* bonefish: I don't know why, but in some cases select() seems to -+ * return success, even if there's nothing to read yet. Maybe if the -+ * connection is not yet established? The tests exposed this problem. -+ * Long story short, we have to poll here, too. */ -+ bigtime_t now = system_time(); -+ bigtime_t endTime = now + sock->timeout; -+ while (now < endTime) { -+ snooze(RECEIVE_WAIT); -+ - do { - rv = recvfrom(sock->socketdes, buf, (*len), flags, - (struct sockaddr*)&from->sa, &from->salen); -- } while (rv == -1 && errno == EINTR); -- } -+ } while (rv == -1 && errno == EINTR); -+ -+ if (rv >= 0 || (rv < 0 && errno != EWOULDBLOCK)) -+ break; -+ -+ now = system_time(); -+ }; - } - if (rv == -1) { - (*len) = 0; -- return errno; -+ return (errno == EWOULDBLOCK ? APR_TIMEUP : errno); - } -- -- (*len) = rv; -- if (rv == 0) -+ *len = rv; -+ if (rv == 0 && sock->type == SOCK_STREAM) - return APR_EOF; - - return APR_SUCCESS; -diff -urN apr-1.0.1.orig/network_io/unix/sockaddr.c apr-1.0.1/network_io/unix/sockaddr.c ---- apr-1.0.1.orig/network_io/unix/sockaddr.c 2004-07-13 11:15:50.000000000 +0200 -+++ apr-1.0.1/network_io/unix/sockaddr.c 2004-12-17 15:19:11.000000000 +0100 -@@ -543,7 +543,7 @@ - - if ((masked = flags & (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK))) { - if (!hostname || -- family != AF_UNSPEC || -+ family != APR_UNSPEC || - masked == (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK)) { - return APR_EINVAL; - } -diff -urN apr-1.0.1.orig/network_io/unix/sockets.c apr-1.0.1/network_io/unix/sockets.c ---- apr-1.0.1.orig/network_io/unix/sockets.c 2004-03-10 21:58:34.000000000 +0100 -+++ apr-1.0.1/network_io/unix/sockets.c 2004-12-17 15:19:11.000000000 +0100 -@@ -20,9 +20,10 @@ - #include "apr_portable.h" - #include "apr_arch_inherit.h" - --#if defined(BEOS) && !defined(BEOS_BONE) -+#ifdef BEOS_R5 -+#undef close - #define close closesocket --#endif -+#endif /* BEOS_R5 */ - - static char generic_inaddr_any[16] = {0}; /* big enough for IPv4 or IPv6 */ - -@@ -92,7 +93,28 @@ - - alloc_socket(new, cont); - -+#ifndef BEOS_R5 - (*new)->socketdes = socket(family, type, protocol); -+#else -+ /* For any reason BeOS R5 has an unconventional protocol numbering, -+ * so we need to translate here. */ -+ switch (protocol) { -+ case 0: -+ (*new)->socketdes = socket(family, type, 0); -+ break; -+ case APR_PROTO_TCP: -+ (*new)->socketdes = socket(family, type, IPPROTO_TCP); -+ break; -+ case APR_PROTO_UDP: -+ (*new)->socketdes = socket(family, type, IPPROTO_UDP); -+ break; -+ case APR_PROTO_SCTP: -+ default: -+ errno = EPROTONOSUPPORT; -+ (*new)->socketdes = -1; -+ break; -+ } -+#endif /* BEOS_R5 */ - - #if APR_HAVE_IPV6 - if ((*new)->socketdes < 0 && ofamily == APR_UNSPEC) { -diff -urN apr-1.0.1.orig/network_io/unix/sockopt.c apr-1.0.1/network_io/unix/sockopt.c ---- apr-1.0.1.orig/network_io/unix/sockopt.c 2004-04-03 19:15:52.000000000 +0200 -+++ apr-1.0.1/network_io/unix/sockopt.c 2004-12-17 15:19:11.000000000 +0100 -@@ -323,6 +323,7 @@ - - apr_status_t apr_socket_atmark(apr_socket_t *sock, int *atmark) - { -+#ifndef BEOS_R5 - int oobmark; - - if (ioctl(sock->socketdes, SIOCATMARK, (void*) &oobmark) < 0) -@@ -331,6 +332,9 @@ - *atmark = (oobmark != 0); - - return APR_SUCCESS; -+#else -+ return APR_ENOTIMPL; -+#endif - } - - -diff -urN apr-1.0.1.orig/shmem/beos/shm.c apr-1.0.1/shmem/beos/shm.c ---- apr-1.0.1.orig/shmem/beos/shm.c 2004-06-29 18:38:16.000000000 +0200 -+++ apr-1.0.1/shmem/beos/shm.c 2004-12-17 15:19:11.000000000 +0100 -@@ -13,25 +13,147 @@ - * limitations under the License. - */ - --#include "apr_general.h" --#include "apr_shm.h" -+#include "apr_arch_shm.h" -+#include "apr_arch_thread_mutex.h" - #include "apr_errno.h" - #include "apr_lib.h" -+#include "apr_general.h" -+#include "apr_portable.h" -+#include "apr_ring.h" -+#include "apr_shm.h" - #include "apr_strings.h" -+ -+#include - #include - #include --#include --#include "apr_portable.h" -+#include -+ -+#include -+ -+static struct apr_thread_mutex_t area_handles_lock; - --struct apr_shm_t { -- apr_pool_t *pool; -- void *memblock; -- void *ptr; -- apr_size_t reqsize; -- apr_size_t avail; -- area_id aid; -+APR_RING_HEAD(area_handle_list, beos_area_handle); -+static struct area_handle_list area_handles; -+ -+struct beos_area_handle { -+ APR_RING_ENTRY(beos_area_handle) link; -+ area_id id; /* area id */ -+ char *name; /* area name */ -+ void *address; /* base address */ -+ apr_size_t size; /* requested size */ -+ char *filename; /* name of the file, associated with the area */ -+ int fd; /* FD of the file, associated with the area */ -+ int use_count; /* how often attached in this process */ - }; - -+typedef struct shmem_file_info { -+ apr_size_t size; /* requested size of the shmem */ -+ char name[B_OS_NAME_LENGTH]; /* area name */ -+} shmem_file_info; -+ -+#define LOCK_AREA_HANDLES() apr_thread_mutex_lock(&area_handles_lock) -+#define UNLOCK_AREA_HANDLES() apr_thread_mutex_unlock(\ -+ &area_handles_lock) -+#define INIT_AREA_HANDLE_LINK(handle) APR_RING_ELEM_INIT(handle, link) -+#define FIRST_AREA_HANDLE() APR_RING_FIRST(&area_handles) -+#define NEXT_AREA_HANDLE(handle) APR_RING_NEXT(handle, link) -+#define AREA_HANDLES_END() APR_RING_SENTINEL(&area_handles, \ -+ beos_area_handle, link) -+#define ADD_AREA_HANDLE(handle) APR_RING_INSERT_TAIL(&area_handles, \ -+ handle, \ -+ beos_area_handle, \ -+ link) -+#define REMOVE_AREA_HANDLE(handle) APR_RING_REMOVE(handle, link) -+ -+/* Initializes the area handle list and the semaphore that protects it. Invoked -+ by apr_initialize(). */ -+apr_status_t apr_beos_setup_shmem() -+{ -+ APR_RING_INIT(&area_handles, beos_area_handle, link); -+ return apr_beos_thread_mutex_init(&area_handles_lock, 0, NULL); -+} -+ -+/* Called directly after fork() in the child process. Sets up the semaphore -+ that protects the area handle list in a child process and repairs the shared -+ memory areas. The problem is that BeOS fork() clones all areas copy on write, -+ which requires us to re-clone the parent's areas. */ -+apr_status_t apr_beos_shmem_child_init() -+{ -+ apr_status_t error; -+ beos_area_handle *handle; -+ -+ /* re-init the lock */ -+ error = apr_beos_thread_mutex_init(&area_handles_lock, 0, NULL); -+ if (error != B_OK) -+ return error; -+ -+ /* now iterate through the area handle list and clone all areas */ -+ for (handle = FIRST_AREA_HANDLE(); -+ handle != AREA_HANDLES_END(); -+ handle = NEXT_AREA_HANDLE(handle)) { -+ /* delete the clone area and clone the original one */ -+ delete_area(area_for(handle->address)); -+ handle->id = clone_area(handle->name, &(handle->address), -+ B_EXACT_ADDRESS, B_READ_AREA | B_WRITE_AREA, -+ handle->id); -+ if (handle->id < 0) -+ return handle->id; -+ } -+ -+ return APR_SUCCESS; -+} -+ -+/* Creates a new area handle from a given valid area_info. */ -+static beos_area_handle *create_area_handle(area_id id, const char *name, -+ void *address, apr_size_t size, -+ const char *filename, int fd, -+ int useCount) -+{ -+ beos_area_handle *handle -+ = (beos_area_handle*)malloc(sizeof(beos_area_handle)); -+ if (!handle) -+ return NULL; -+ -+ INIT_AREA_HANDLE_LINK(handle); -+ handle->id = id; -+ handle->name = strdup(name); -+ handle->address = address; -+ handle->size = size; -+ handle->filename = (filename ? strdup(filename) : NULL); -+ handle->fd = fd; -+ handle->use_count = useCount; -+ -+ if (!handle->name || (filename && !handle->filename)) { -+ free(handle->name); -+ free(handle->filename); -+ free(handle); -+ return NULL; -+ } -+ -+ return handle; -+} -+ -+static apr_status_t shm_cleanup(void *_m) -+{ -+ apr_shm_t *m = (apr_shm_t*)_m; -+ -+ LOCK_AREA_HANDLES(); -+ -+ if (m->handle && --m->handle->use_count == 0) { -+ REMOVE_AREA_HANDLE(m->handle); -+ delete_area(m->handle->id); -+ if (m->handle->fd >= 0) -+ close(m->handle->fd); -+ free(m->handle->name); -+ free(m->handle); -+ } -+ m->handle = NULL; -+ -+ UNLOCK_AREA_HANDLES(); -+ -+ return APR_SUCCESS; -+} -+ - APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m, - apr_size_t reqsize, - const char *filename, -@@ -40,53 +162,102 @@ - apr_size_t pagesize; - area_id newid; - char *addr; -- char shname[B_OS_NAME_LENGTH]; -+ shmem_file_info fileInfo; -+ char *shname = fileInfo.name; -+ int fd = -1; -+ int num = 0; -+ status_t error = B_OK; -+ beos_area_handle *handle = NULL; - - (*m) = (apr_shm_t *)apr_pcalloc(p, sizeof(apr_shm_t)); - /* we MUST allocate in pages, so calculate how big an area we need... */ - pagesize = ((reqsize + B_PAGE_SIZE - 1) / B_PAGE_SIZE) * B_PAGE_SIZE; -- -- if (!filename) { -- int num = 0; -- snprintf(shname, B_OS_NAME_LENGTH, "apr_shmem_%ld", find_thread(NULL)); -- while (find_area(shname) >= 0) -- snprintf(shname, B_OS_NAME_LENGTH, "apr_shmem_%ld_%d", -- find_thread(NULL), num++); -- } -- newid = create_area(filename ? filename : shname, -- (void*)&addr, B_ANY_ADDRESS, -- pagesize, B_LAZY_LOCK, B_READ_AREA|B_WRITE_AREA); - -- if (newid < 0) -- return errno; -+ -+ /* create a unique name for the area */ -+ snprintf(shname, B_OS_NAME_LENGTH, "apr_shmem_%ld", find_thread(NULL)); -+ while (find_area(shname) >= 0) -+ snprintf(shname, B_OS_NAME_LENGTH, "apr_shmem_%ld_%d", -+ find_thread(NULL), num++); -+ -+ LOCK_AREA_HANDLES(); -+ -+ /* if a file name was given, create the file */ -+ if (filename) { -+ fd = open(filename, O_RDWR |O_CREAT | O_TRUNC | O_EXCL, -+ S_IRUSR | S_IWUSR, S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); -+ if (fd < 0) -+ return errno; -+ } -+ -+ /* write the shmem info to the file */ -+ if (fd >= 0) { -+ int len = (shname + strlen(shname)) - (char*)&fileInfo; -+ fileInfo.size = reqsize; -+ if (write(fd, &fileInfo, len) < 0) -+ error = errno; -+ } -+ -+ /* allocate the area */ -+ if (error == B_OK) { -+ newid = create_area(shname, (void*)&addr, B_ANY_ADDRESS, -+ pagesize, B_LAZY_LOCK, B_READ_AREA | B_WRITE_AREA); -+ if (newid < 0) -+ error = newid; -+ } -+ -+ /* allocate an area handle */ -+ if (error == B_OK) { -+ handle = create_area_handle(newid, shname, addr, reqsize, filename, fd, -+ 1); -+ /* add it to the list */ -+ if (handle) -+ ADD_AREA_HANDLE(handle); -+ else -+ error = APR_ENOMEM; -+ } -+ -+ UNLOCK_AREA_HANDLES(); -+ -+ /* cleanup on error */ -+ if (error != B_OK) { -+ if (newid >= 0) -+ delete_area(newid); -+ if (filename) -+ unlink(filename); -+ close(fd); -+ return error; -+ } - - (*m)->pool = p; -- (*m)->aid = newid; -- (*m)->memblock = addr; -- (*m)->ptr = (void*)addr; -- (*m)->avail = pagesize; /* record how big an area we actually created... */ -- (*m)->reqsize = reqsize; -+ (*m)->handle = handle; -+ -+ apr_pool_cleanup_register(p, *m, shm_cleanup, apr_pool_cleanup_null); - - return APR_SUCCESS; - } - - APR_DECLARE(apr_status_t) apr_shm_destroy(apr_shm_t *m) - { -- delete_area(m->aid); -- m->avail = 0; -- m->memblock = NULL; -- return APR_SUCCESS; -+ LOCK_AREA_HANDLES(); -+ -+ if (m->handle && m->handle->filename) { -+ unlink(m->handle->filename); -+ free(m->handle->filename); -+ m->handle->filename = NULL; -+ } -+ -+ UNLOCK_AREA_HANDLES(); -+ -+ return apr_pool_cleanup_run(m->pool, m, shm_cleanup); - } - - APR_DECLARE(apr_status_t) apr_shm_remove(const char *filename, - apr_pool_t *pool) - { -- area_id deleteme = find_area(filename); -- -- if (deleteme == B_NAME_NOT_FOUND) -- return APR_EINVAL; -+ if (unlink(filename) < 0) -+ return errno; - -- delete_area(deleteme); - return APR_SUCCESS; - } - -@@ -94,58 +265,132 @@ - const char *filename, - apr_pool_t *pool) - { -- area_info ai; -- thread_info ti; -- apr_shm_t *new_m; -- area_id deleteme = find_area(filename); -- -- if (deleteme == B_NAME_NOT_FOUND) -+ int fd = -1; -+ shmem_file_info fileInfo; -+ char *areaName = fileInfo.name; -+ int fileInfoLen; -+ int nameLen = 0; -+ beos_area_handle *handle = NULL; -+ area_id id = -1; -+ status_t error = B_OK; -+ -+ /* open the file */ -+ fd = open(filename, O_RDONLY); -+ if (fd < 0) - return APR_EINVAL; - -- new_m = (apr_shm_t*)apr_palloc(pool, sizeof(apr_shm_t*)); -- if (new_m == NULL) -- return APR_ENOMEM; -- new_m->pool = pool; -- -- get_area_info(deleteme, &ai); -- get_thread_info(find_thread(NULL), &ti); -- -- if (ti.team != ai.team) { -- area_id narea; -- -- narea = clone_area(ai.name, &(ai.address), B_CLONE_ADDRESS, -- B_READ_AREA|B_WRITE_AREA, ai.area); -- -- if (narea < B_OK) -- return narea; -- -- get_area_info(narea, &ai); -- new_m->aid = narea; -- new_m->memblock = ai.address; -- new_m->ptr = (void*)ai.address; -- new_m->avail = ai.size; -- new_m->reqsize = ai.size; -+ /* read the file info */ -+ fileInfoLen = read(fd, &fileInfo, sizeof(shmem_file_info) - 1); -+ if (fileInfoLen > 0) { -+ nameLen = (char*)&fileInfo + fileInfoLen - areaName; -+ if (nameLen > 0) { -+ areaName[nameLen] = '\0'; -+ nameLen = strlen(areaName); -+ } -+ } -+ if (nameLen <= 0) -+ error = APR_EINVAL; -+ -+ LOCK_AREA_HANDLES(); -+ -+ /* check, if we already know the area */ -+ if (error == B_OK) { -+ beos_area_handle *itHandle; -+ for (itHandle = FIRST_AREA_HANDLE(); -+ itHandle != AREA_HANDLES_END(); -+ itHandle = NEXT_AREA_HANDLE(itHandle)) { -+ if (strcmp(itHandle->name, areaName) == 0) { -+ /* OK, found */ -+ handle = itHandle; -+ close(fd); -+ fd = -1; -+ break; -+ } -+ } -+ } -+ -+ /* if we don't know the area yet, get it */ -+ if (error == B_OK && !handle) { -+ id = find_area(areaName); -+ if (id < 0) -+ error = APR_EINVAL; -+ } -+ -+ /* if we have no error till now, then there definitely exists an area */ -+ if (error == B_OK) { -+ /* allocate memory for the new shared memory handle */ -+ *m = (apr_shm_t*)apr_palloc(pool, sizeof(apr_shm_t*)); -+ if (!*m) -+ error = APR_ENOMEM; - } - -- (*m) = new_m; -+ /* if we don't know the area yet, we clone it */ -+ if (error == B_OK && !handle) { -+ area_info areaInfo; -+ error = get_area_info(id, &areaInfo); -+ if (error == B_OK && areaInfo.size < fileInfo.size) { -+ /* something's fishy: the actual area size is less than the -+ * shmem region it is supposed to contain */ -+ error = APR_EINVAL; -+ } -+ if (error == B_OK) { -+ void *address; -+ id = clone_area(areaInfo.name, &address, B_ANY_ADDRESS, -+ B_READ_AREA | B_WRITE_AREA, areaInfo.area); -+ if (id >= 0) { -+ /* create the area */ -+ handle = create_area_handle(id, areaName, address, -+ fileInfo.size, filename, fd, 0); -+ /* The size we supply here is actually not the real size -+ * of the shared memory region, but is rounded up to a -+ * page size multiple. We could store the real size in -+ * the file. */ - -- return APR_SUCCESS; -+ /* add it to the list */ -+ if (handle) { -+ ADD_AREA_HANDLE(handle); -+ } -+ else { -+ delete_area(id); -+ error = APR_ENOMEM; -+ } -+ } -+ else -+ error = id; -+ } -+ } -+ -+ /* now we should have a handle -- nothing can go wrong anymore */ -+ if (error == B_OK) { -+ (*m)->pool = pool; -+ (*m)->handle = handle; -+ (*m)->handle->use_count++; -+ apr_pool_cleanup_register(pool, *m, shm_cleanup, apr_pool_cleanup_null); -+ } -+ -+ UNLOCK_AREA_HANDLES(); -+ -+ /* cleanup on error */ -+ if (error != B_OK) { -+ close(fd); -+ } -+ -+ return error; - } - - APR_DECLARE(apr_status_t) apr_shm_detach(apr_shm_t *m) - { -- delete_area(m->aid); -- return APR_SUCCESS; -+ return apr_pool_cleanup_run(m->pool, m, shm_cleanup); - } - - APR_DECLARE(void *) apr_shm_baseaddr_get(const apr_shm_t *m) - { -- return m->memblock; -+ return (m->handle ? m->handle->address : NULL); - } - - APR_DECLARE(apr_size_t) apr_shm_size_get(const apr_shm_t *m) - { -- return m->reqsize; -+ return (m->handle ? m->handle->size : 0); - } - - APR_POOL_IMPLEMENT_ACCESSOR(shm) -diff -urN apr-1.0.1.orig/test/Makefile.in apr-1.0.1/test/Makefile.in ---- apr-1.0.1.orig/test/Makefile.in 2004-11-17 02:07:02.000000000 +0100 -+++ apr-1.0.1/test/Makefile.in 2004-12-17 15:19:11.000000000 +0100 -@@ -72,7 +72,7 @@ - $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -prefer-pic -c $(srcdir)/mod_test.c && touch $@ - - mod_test.la: mod_test.slo $(LOCAL_LIBS) -- $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -avoid-version -module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ -+ $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -avoid-version -module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $(LOCAL_LIBS) $(ALL_LIBS) - - libmod_test.la: mod_test.slo $(LOCAL_LIBS) - $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -avoid-version mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $(LOCAL_LIBS) $(ALL_LIBS) -diff -urN apr-1.0.1.orig/test/testdso.c apr-1.0.1/test/testdso.c ---- apr-1.0.1.orig/test/testdso.c 2004-05-14 16:43:22.000000000 +0200 -+++ apr-1.0.1/test/testdso.c 2004-12-17 15:19:11.000000000 +0100 -@@ -77,9 +77,11 @@ - ABTS_ASSERT(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status); - ABTS_PTR_NOTNULL(tc, func1); - -- function = (void (*)(char *))func1; -- (*function)(teststr); -- ABTS_STR_EQUAL(tc, "Hello - I'm a DSO!\n", teststr); -+ if (status == APR_SUCCESS) { -+ function = (void (*)(char *))func1; -+ (*function)(teststr); -+ ABTS_STR_EQUAL(tc, "Hello - I'm a DSO!\n", teststr); -+ } - - apr_dso_unload(h); - } -@@ -100,9 +102,11 @@ - ABTS_ASSERT(tc, apr_dso_error(h, errstr, 256), APR_SUCCESS == status); - ABTS_PTR_NOTNULL(tc, func1); - -- function = (int (*)(int))func1; -- status = (*function)(5); -- ABTS_INT_EQUAL(tc, 5, status); -+ if (status == APR_SUCCESS) { -+ function = (int (*)(int))func1; -+ status = (*function)(5); -+ ABTS_INT_EQUAL(tc, 5, status); -+ } - - apr_dso_unload(h); - } -diff -urN apr-1.0.1.orig/test/testpipe.c apr-1.0.1/test/testpipe.c ---- apr-1.0.1.orig/test/testpipe.c 2004-05-14 16:43:22.000000000 +0200 -+++ apr-1.0.1/test/testpipe.c 2004-12-17 15:19:11.000000000 +0100 -@@ -23,6 +23,11 @@ - #include "apr_thread_proc.h" - #include "apr_strings.h" - -+/* BeOS doesn't offer non-blocking pipes */ -+#if defined(BEOS) -+# define BLOCKING_PIPE_ONLY -+#endif -+ - static apr_file_t *readp = NULL; - static apr_file_t *writep = NULL; - -@@ -60,6 +65,10 @@ - ABTS_PTR_NOTNULL(tc, readp); - ABTS_PTR_NOTNULL(tc, writep); - -+#ifdef BLOCKING_PIPE_ONLY -+ (void)timeout; -+ ABTS_NOT_IMPL(tc, "no non-blocking pipe support"); -+#else - rv = apr_file_pipe_timeout_get(readp, &timeout); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, -1, timeout); -@@ -70,6 +79,7 @@ - rv = apr_file_pipe_timeout_get(readp, &timeout); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, apr_time_from_sec(1), timeout); -+#endif - } - - static void read_write(abts_case *tc, void *data) -@@ -86,12 +96,16 @@ - ABTS_PTR_NOTNULL(tc, readp); - ABTS_PTR_NOTNULL(tc, writep); - -+#ifdef BLOCKING_PIPE_ONLY -+ ABTS_NOT_IMPL(tc, "no non-blocking pipe support"); -+#else - rv = apr_file_pipe_timeout_set(readp, apr_time_from_sec(1)); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - - rv = apr_file_read(readp, buf, &nbytes); - ABTS_INT_EQUAL(tc, 1, APR_STATUS_IS_TIMEUP(rv)); - ABTS_INT_EQUAL(tc, 0, nbytes); -+#endif - } - - static void read_write_notimeout(abts_case *tc, void *data) -@@ -122,6 +136,9 @@ - - static void test_pipe_writefull(abts_case *tc, void *data) - { -+#ifdef BLOCKING_PIPE_ONLY -+ ABTS_NOT_IMPL(tc, "no non-blocking pipe support"); -+#else - int iterations = 1000; - int i; - int bytes_per_iteration = 8000; -@@ -177,6 +194,7 @@ - apr_proc_wait(&proc, NULL, &why, APR_WAIT) == APR_CHILD_DONE); - - ABTS_ASSERT(tc, "child terminated normally", why == APR_PROC_EXIT); -+#endif - } - - abts_suite *testpipe(abts_suite *suite) -diff -urN apr-1.0.1.orig/test/testpoll.c apr-1.0.1/test/testpoll.c ---- apr-1.0.1.orig/test/testpoll.c 2004-07-06 05:38:06.000000000 +0200 -+++ apr-1.0.1/test/testpoll.c 2004-12-17 15:19:11.000000000 +0100 -@@ -21,6 +21,11 @@ - #include "apr_network_io.h" - #include "apr_poll.h" - -+/* non-BONE BeOS select() only supports the read set */ -+#if defined(BEOS) && !defined(HAVE_BONE_VERSION) -+# define NO_POLLOUT_SUPPORT 1 -+#endif -+ - #define SMALL_NUM_SOCKETS 3 - /* We can't use 64 here, because some platforms *ahem* Solaris *ahem* have - * a default limit of 64 open file descriptors per process. If we use -@@ -425,6 +430,9 @@ - - static void pollset_remove(abts_case *tc, void *data) - { -+#ifdef NO_POLLOUT_SUPPORT -+ ABTS_NOT_IMPL(tc, "no APR_POLLOUT support"); -+#else - apr_status_t rv; - apr_pollset_t *pollset; - const apr_pollfd_t *hot_files; -@@ -497,6 +505,7 @@ - (hot_files[1].client_data == (void *)4)) || - ((hot_files[0].client_data == (void *)4) && - (hot_files[1].client_data == (void *)1))); -+#endif - } - - abts_suite *testpoll(abts_suite *suite) -@@ -527,9 +536,7 @@ - abts_run_test(suite, clear_middle_pollset, NULL); - abts_run_test(suite, send_last_pollset, NULL); - abts_run_test(suite, clear_last_pollset, NULL); -- - abts_run_test(suite, pollset_remove, NULL); -- - abts_run_test(suite, close_all_sockets, NULL); - - return suite; -diff -urN apr-1.0.1.orig/test/testsockopt.c apr-1.0.1/test/testsockopt.c ---- apr-1.0.1.orig/test/testsockopt.c 2004-08-01 00:36:03.000000000 +0200 -+++ apr-1.0.1/test/testsockopt.c 2004-12-17 15:19:11.000000000 +0100 -@@ -19,6 +19,11 @@ - #include "apr_lib.h" - #include "testutil.h" - -+/* non-BONE BeOS versions don't know SO_KEEPALIVE */ -+#if defined(BEOS) && !defined(HAVE_BONE_VERSION) -+# define NO_SO_KEEPALIVE 1 -+#endif -+ - static apr_socket_t *sock = NULL; - - static void create_socket(abts_case *tc, void *data) -@@ -32,6 +37,9 @@ - - static void set_keepalive(abts_case *tc, void *data) - { -+#ifdef NO_SO_KEEPALIVE -+ ABTS_NOT_IMPL(tc, "no SO_KEEPALIVE socket option"); -+#else - apr_status_t rv; - apr_int32_t ck; - -@@ -41,6 +49,7 @@ - rv = apr_socket_opt_get(sock, APR_SO_KEEPALIVE, &ck); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 1, ck); -+#endif - } - - static void set_debug(abts_case *tc, void *data) -@@ -62,6 +71,9 @@ - - static void remove_keepalive(abts_case *tc, void *data) - { -+#ifdef NO_SO_KEEPALIVE -+ ABTS_NOT_IMPL(tc, "no SO_KEEPALIVE socket option"); -+#else - apr_status_t rv; - apr_int32_t ck; - -@@ -75,6 +87,7 @@ - rv = apr_socket_opt_get(sock, APR_SO_KEEPALIVE, &ck); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 0, ck); -+#endif - } - - static void corkable(abts_case *tc, void *data) -diff -urN apr-1.0.1.orig/threadproc/beos/Makefile.in apr-1.0.1/threadproc/beos/Makefile.in ---- apr-1.0.1.orig/threadproc/beos/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ apr-1.0.1/threadproc/beos/Makefile.in 2004-12-17 15:18:45.000000000 +0100 -@@ -0,0 +1,21 @@ -+srcdir = @srcdir@ -+VPATH = @srcdir@ -+ -+TARGETS = \ -+ apr_proc_stub -+ -+# bring in rules.mk for standard functionality -+@INCLUDE_RULES@ -+ -+INCDIR=../../include -+OSDIR=$(INCDIR)/arch/@OSDIR@ -+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ -+INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch -I$(OSDIR) -I$(DEFOSDIR) -+ -+CLEAN_TARGETS = apr_proc_stub /boot/home/config/bin/apr_proc_stub -+ -+apr_proc_stub: -+ $(CC) apr_proc_stub.c \ -+ && cp apr_proc_stub /boot/home/config/bin -+ -+# DO NOT REMOVE -diff -urN apr-1.0.1.orig/threadproc/beos/apr_proc_stub.c apr-1.0.1/threadproc/beos/apr_proc_stub.c ---- apr-1.0.1.orig/threadproc/beos/apr_proc_stub.c 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/threadproc/beos/apr_proc_stub.c 2004-12-17 15:19:11.000000000 +0100 -@@ -13,15 +13,17 @@ - * limitations under the License. - */ - -+#include - #include - #include - #include - #include - - struct pipefd { -- int in; -- int out; -- int err; -+ int in; -+ int out; -+ int err; -+ port_id port; - }; - - int main(int argc, char *argv[]) { -@@ -32,44 +34,65 @@ - * argv[2] = progname to execute - * rest of arguments to be passed to program - */ -- char *progname = argv[2]; -- char *directory = argv[1]; -- struct pipefd *pfd; -- thread_id sender; -- void *buffer; -- char ** newargs; -- int i = 0; -- -- newargs = (char**)malloc(sizeof(char*) * (argc - 1)); -- -- buffer = (void*)malloc(sizeof(struct pipefd)); -- /* this will block until we get the data */ -- receive_data(&sender, buffer, sizeof(struct pipefd)); -- pfd = (struct pipefd*)buffer; -- -- if (pfd->in > STDERR_FILENO) { -- if (dup2(pfd->in, STDIN_FILENO) != STDIN_FILENO) return (-1); -- close (pfd->in); -- } -- if (pfd->out > STDERR_FILENO) { -- if (dup2(pfd->out, STDOUT_FILENO) != STDOUT_FILENO) return (-1); -- close (pfd->out); -- } -- if (pfd->err > STDERR_FILENO) { -- if (dup2(pfd->err, STDERR_FILENO) != STDERR_FILENO) return (-1); -- close (pfd->err); -- } -- -- for (i=3;i<=argc;i++){ -- newargs[i-3] = argv[i]; -- } -- -- /* tell the caller we're OK to start */ -- send_data(sender,1,NULL,0); -- -- if (directory != NULL) -- chdir(directory); -- execve (progname, newargs, environ); -+ char *progname = argv[2]; -+ char *directory = argv[1]; -+ struct pipefd pfd; -+ thread_id sender; -+ char **newargs = argv + 3; -+ int i = 0; -+ status_t error = B_OK; -+ -+ /* this will block until we get the data */ -+ receive_data(&sender, &pfd, sizeof(struct pipefd)); -+ -+ if (argc < 3) -+ error = B_BAD_VALUE; -+ -+ newargs = (char**)malloc(sizeof(char*) * (argc - 1)); -+ for (i=3;i<=argc;i++) { -+ newargs[i-3] = argv[i]; -+ } -+ -+ if (error == B_OK && pfd.in > STDERR_FILENO) { -+ if (dup2(pfd.in, STDIN_FILENO) != STDIN_FILENO) -+ error = errno; -+ close(pfd.in); -+ } -+ if (error == B_OK && pfd.out > STDERR_FILENO) { -+ if (dup2(pfd.out, STDOUT_FILENO) != STDOUT_FILENO) -+ error = errno; -+ close(pfd.out); -+ } -+ if (error == B_OK && pfd.err > STDERR_FILENO) { -+ if (dup2(pfd.err, STDERR_FILENO) != STDERR_FILENO) -+ error = errno; -+ close(pfd.err); -+ } -+ -+ if (error == B_OK && chdir(directory) < 0) -+ error = errno; -+ -+ if (error == B_OK) { -+ /* get our parent's team ID (the port owner) and our team ID */ -+ port_info portInfo; -+ thread_info threadInfo; -+ get_port_info(pfd.port, &portInfo); -+ get_thread_info(find_thread(NULL), &threadInfo); -+ -+ /* transfer the port ownership to us, so the the port will -+ * automatically be deleted, if execv() succeeds */ -+ set_port_owner(pfd.port, threadInfo.team); -+ -+ if (execv(progname, newargs) < 0) -+ error = errno; -+ -+ /* execv() failed; transfer the port ownership back to our parent, -+ * so that we can send the error code to it */ -+ set_port_owner(pfd.port, portInfo.team); -+ } - -- return (-1); -+ /* something went wrong; send our parent the error code */ -+ write_port(pfd.port, 0, &error, sizeof(error)); -+ -+ return (-1); - } -diff -urN apr-1.0.1.orig/threadproc/beos/proc.c apr-1.0.1/threadproc/beos/proc.c ---- apr-1.0.1.orig/threadproc/beos/proc.c 2004-06-29 18:35:57.000000000 +0200 -+++ apr-1.0.1/threadproc/beos/proc.c 2004-12-17 15:19:11.000000000 +0100 -@@ -13,13 +13,22 @@ - * limitations under the License. - */ - -+#include "apr_arch_shm.h" - #include "apr_arch_threadproc.h" -+#include "apr_random.h" -+#include "apr_signal.h" - #include "apr_strings.h" - -+#include -+#include -+ -+#include -+ - struct send_pipe { -- int in; -- int out; -- int err; -+ int in; -+ int out; -+ int err; -+ port_id port; - }; - - APR_DECLARE(apr_status_t) apr_procattr_create(apr_procattr_t **new, apr_pool_t *pool) -@@ -113,18 +122,11 @@ - APR_DECLARE(apr_status_t) apr_procattr_dir_set(apr_procattr_t *attr, - const char *dir) - { -- char * cwd; -- if (dir[0] != '/') { -- cwd = (char*)malloc(sizeof(char) * PATH_MAX); -- getcwd(cwd, PATH_MAX); -- attr->currdir = (char *)apr_pstrcat(attr->pool, cwd, "/", dir, NULL); -- free(cwd); -- } else { -- attr->currdir = (char *)apr_pstrdup(attr->pool, dir); -- } -+ attr->currdir = apr_pstrdup(attr->pool, dir); - if (attr->currdir) { - return APR_SUCCESS; - } -+ - return APR_ENOMEM; - } - -@@ -144,53 +146,53 @@ - APR_DECLARE(apr_status_t) apr_proc_fork(apr_proc_t *proc, apr_pool_t *pool) - { - int pid; -+ port_id port; -+ status_t error = B_OK; -+ status_t childInitError = B_OK; -+ int32 code; -+ -+ /* we create a port through which the child will send us whether its -+ * initialization was successful */ -+ port = create_port(1, "apr_fork"); -+ if (port < 0) -+ return port; - - if ((pid = fork()) < 0) { -+ delete_port(port); - return errno; - } - else if (pid == 0) { -- /* This is really ugly... -- * The semantics of BeOS's fork() are that areas (used for shared -- * memory) get COW'd :-( The only way we can make shared memory -- * work across fork() is therefore to find any areas that have -- * been created and then clone them into our address space. -- * Thankfully only COW'd areas have the lock variable set at -- * anything but 0, so we can use that to find the areas we need to -- * copy. Of course what makes it even worse is that the loop through -- * the area's will go into an infinite loop, eating memory and then -- * eventually segfault unless we know when we reach then end of the -- * "original" areas and stop. Why? Well, we delete the area and then -- * add another to the end of the list... -- */ -- area_info ai; -- int32 cookie = 0; -- area_id highest = 0; -- -- while (get_next_area_info(0, &cookie, &ai) == B_OK) -- if (ai.area > highest) -- highest = ai.area; -- cookie = 0; -- while (get_next_area_info(0, &cookie, &ai) == B_OK) { -- if (ai.area > highest) -- break; -- if (ai.lock > 0) { -- area_id original = find_area(ai.name); -- delete_area(ai.area); -- clone_area(ai.name, &ai.address, B_CLONE_ADDRESS, -- ai.protection, original); -- } -- } -- - proc->pid = pid; -- proc->in = NULL; -+ proc->in = NULL; - proc->out = NULL; - proc->err = NULL; -+ -+ error = apr_beos_shmem_child_init(); -+ write_port(port, 0, &error, sizeof(error)); -+ if (error != B_OK) -+ exit(1); -+ -+ apr_random_after_fork(proc); -+ - return APR_INCHILD; - } - proc->pid = pid; - proc->in = NULL; - proc->out = NULL; - proc->err = NULL; -+ -+ /* get the child initialization status */ -+ do { -+ error = read_port(port, &code, &childInitError, sizeof(childInitError)); -+ } while (error == EINTR); -+ -+ delete_port(port); -+ -+ if (error >= B_OK) -+ error = childInitError; -+ if (error != B_OK) -+ return error; -+ - return APR_INPARENT; - } - -@@ -215,62 +217,234 @@ - return APR_SUCCESS; - } - -+static status_t find_program(const char **resolvedProgramName, -+ const char *programName, apr_procattr_t *attr, -+ const char *const *env, apr_pool_t *pool) -+{ -+ const char *pathVarName = "PATH="; -+ int pathVarNameLen = strlen(pathVarName); -+ const char *paths = NULL; -+ int programNameLen = strlen(programName); -+ int i; -+ -+ /* If the program name is absolute, then there's nothing to do. -+ * If the program name consists of more than one path element, then we -+ * consider it a relative path and don't search in PATH either. */ -+ if (*programName == '/' || strchr(programName, '/')) { -+ *resolvedProgramName = programName; -+ return B_OK; -+ } -+ -+ /* get the PATH environment variable */ -+ for (i = 0; env[i]; i++) { -+ const char *var = env[i]; -+ if (strncmp(var, pathVarName, pathVarNameLen) == 0) { -+ paths = var + pathVarNameLen; -+ break; -+ } -+ } -+ if (!paths) -+ return APR_ENOENT; -+ -+ /* iterate through the paths */ -+ do { -+ const char *pathEnd = strchr(paths, ':'); -+ int pathLen = (pathEnd ? pathEnd - paths : strlen(paths)); -+ -+ /* We skip empty paths and those that would become too long. -+ * The latter is not really correct, but practically irrelevant. */ -+ if (pathLen > 0 -+ && pathLen + 1 + programNameLen < B_PATH_NAME_LENGTH) { -+ /* get the path */ -+ char path[B_PATH_NAME_LENGTH]; -+ struct stat st; -+ memcpy(path, paths, pathLen); -+ path[pathLen] = '\0'; -+ -+ /* get the program path */ -+ strcat(path, "/"); -+ strcat(path, programName); -+ -+ /* stat() the path to be sure, there is a file */ -+ if (stat(path, &st) == 0 && S_ISREG(st.st_mode)) { -+ /* If the path is relative, we make it absolute by -+ * prepending the current working directory, so there -+ * won't be problems when changing the cwd later */ -+ if (*path == '/') { -+ *resolvedProgramName = apr_pstrdup(pool, path); -+ } -+ else { -+ char cwd[B_PATH_NAME_LENGTH]; -+ getcwd(cwd, sizeof(cwd)); -+ *resolvedProgramName = apr_pstrcat(pool, cwd, "/", -+ path, NULL); -+ } -+ return B_OK; -+ } -+ } -+ -+ paths = (pathEnd ? pathEnd + 1 : NULL); -+ } while (paths); -+ -+ /* not found in PATH */ -+ return APR_ENOENT; -+} -+ -+typedef struct char_buffer { -+ char *buffer; -+ int size; -+} char_buffer; -+ -+static void append_char(char_buffer *buffer, char c) -+{ -+ if (buffer->buffer) { -+ *(buffer->buffer) = c; -+ buffer->buffer++; -+ } -+ buffer->size++; -+} -+ -+static void prepare_shell_args(const char *progname, const char * const *args, -+ int argc, char_buffer *buffer) -+{ -+ int i; -+ -+ for (i = 0; i < argc; i++) { -+ const char *arg = args[i]; -+ -+ /* replace the first argument with the program name and separate the -+ * other arguments with a space */ -+ if (i == 0) -+ arg = progname; -+ else -+ append_char(buffer, ' '); -+ -+ if (*arg == '\0') { -+ /* empty arg */ -+ append_char(buffer, '"'); -+ append_char(buffer, '"'); -+ } -+ else { -+ while (*arg) { -+ /* escape special characters */ -+ if (strchr(" ()?*&\"'[]^\\~|;!<>*$", *arg)) -+ append_char(buffer, '\\'); -+ append_char(buffer, *arg); -+ arg++; -+ } -+ } -+ } -+} -+ - APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new, const char *progname, - const char * const *args, - const char * const *env, - apr_procattr_t *attr, - apr_pool_t *pool) - { -- int i=0,nargs=0; -- char **newargs = NULL; -- thread_id newproc, sender; -- struct send_pipe *sp; -- char * dir = NULL; -- -- sp = (struct send_pipe *)apr_palloc(pool, sizeof(struct send_pipe)); -+ int i = 0, nargs = 0; -+ const char **newargs = NULL; -+ thread_id newproc; -+ struct send_pipe sp; -+ const char *shellArgs[4] = { SHELL_PATH, "-c", NULL, NULL }; -+ status_t error; -+ status_t childError; - - new->in = attr->parent_in; - new->err = attr->parent_err; - new->out = attr->parent_out; -- sp->in = attr->child_in ? attr->child_in->filedes : -1; -- sp->out = attr->child_out ? attr->child_out->filedes : -1; -- sp->err = attr->child_err ? attr->child_err->filedes : -1; -+ sp.in = attr->child_in ? attr->child_in->filedes : -1; -+ sp.out = attr->child_out ? attr->child_out->filedes : -1; -+ sp.err = attr->child_err ? attr->child_err->filedes : -1; -+ -+ /* Get the correct environment to use. */ -+ switch (attr->cmdtype) { -+ case APR_SHELLCMD: -+ case APR_PROGRAM: -+ break; -+ case APR_PROGRAM_ENV: -+ case APR_PROGRAM_PATH: -+ case APR_SHELLCMD_ENV: -+ env = (const char *const*)environ; -+ break; -+ } -+ if (!env) -+ env = (const char *const*)environ; -+ -+ /* In case of APR_PROGRAM_PATH we need to find the program ourselves. In -+ * the other cases, the program name shall either be considered a path or -+ * the shell searches for the program. */ -+ if (attr->cmdtype == APR_PROGRAM_PATH) { -+ error = find_program(&progname, progname, attr, env, pool); -+ if (error != B_OK) -+ return error; -+ } -+ -+ /* if the program shall be started via shell, we need to prepare the -+ * arguments */ -+ if (attr->cmdtype == APR_SHELLCMD || attr->cmdtype == APR_SHELLCMD_ENV) { -+ char_buffer charBuffer = { NULL, 0 }; -+ int argc = 0; -+ -+ /* count the arguments */ -+ while (args && args[argc]) { -+ argc++; -+ } -+ if (argc == 0) -+ return APR_EINVAL; -+ -+ /* first we get the length */ -+ prepare_shell_args(progname, args, argc, &charBuffer); - -+ /* allocate the memory and get the args for real */ -+ charBuffer.buffer = (char*)apr_palloc(pool, charBuffer.size + 1); -+ charBuffer.size = 0; -+ shellArgs[2] = charBuffer.buffer; -+ prepare_shell_args(progname, args, argc, &charBuffer); -+ *(charBuffer.buffer) = '\0'; -+ -+ /* replace the program name and the arguments */ -+ progname = shellArgs[0]; -+ args = shellArgs; -+ } -+ -+ /* count the arguments */ - i = 0; - while (args && args[i]) { - i++; - } - -- newargs = (char**)malloc(sizeof(char *) * (i + 4)); -- newargs[0] = strdup("/boot/home/config/bin/apr_proc_stub"); -+ newargs = (const char**)malloc(sizeof(const char *) * (i + 4)); -+ newargs[0] = "/boot/home/config/bin/apr_proc_stub"; - if (attr->currdir == NULL) { -- /* we require the directory , so use a temp. variable */ -- dir = malloc(sizeof(char) * PATH_MAX); -- getcwd(dir, PATH_MAX); -- newargs[1] = strdup(dir); -- free(dir); -- } else { -- newargs[1] = strdup(attr->currdir); -+ newargs[1] = "."; - } -- newargs[2] = strdup(progname); -+ else { -+ newargs[1] = attr->currdir; -+ } -+ newargs[2] = progname; - i=0;nargs = 3; - - while (args && args[i]) { -- newargs[nargs] = strdup(args[i]); -+ newargs[nargs] = args[i]; - i++;nargs++; - } - newargs[nargs] = NULL; - -- /* ### we should be looking at attr->cmdtype in here... */ -- -- newproc = load_image(nargs, (const char**)newargs, (const char**)env); -+ /* create a temporary port, the stub will use to report an error back to -+ * us */ -+ sp.port = create_port(1, "apr_proc_create"); -+ if (sp.port < 0) -+ return sp.port; -+ -+ /* load the stub */ -+ newproc = load_image(nargs, newargs, (const char**)env); - - /* load_image copies the data so now we can free it... */ -- while (--nargs >= 0) -- free (newargs[nargs]); - free(newargs); - - if (newproc < B_NO_ERROR) { -+ delete_port(sp.port); - return errno; - } - -@@ -286,15 +460,25 @@ - apr_file_close(attr->child_err); - } - -- send_data(newproc, 0, (void*)sp, sizeof(struct send_pipe)); -+ send_data(newproc, 0, &sp, sizeof(struct send_pipe)); - new->pid = newproc; - - /* before we go charging on we need the new process to get to a -- * certain point. When it gets there it'll let us know and we -- * can carry on. */ -- receive_data(&sender, (void*)NULL,0); -- -- return APR_SUCCESS; -+ * certain point. The stub will either send us an error code back through -+ * the port or simply delete the port, when everything went fine. */ -+ do { -+ int32 code; -+ error = read_port(sp.port, &code, &childError, sizeof(childError)); -+ } while (error == EINTR); -+ -+ if (error == B_BAD_PORT_ID) -+ return APR_SUCCESS; -+ -+ delete_port(sp.port); -+ -+ if (error >= B_OK) -+ return childError; -+ return error; - } - - APR_DECLARE(apr_status_t) apr_proc_wait_all_procs(apr_proc_t *proc, -@@ -360,10 +544,10 @@ - apr_file_pipe_create(&attr->child_in, &attr->parent_in, attr->pool); - - if (child_in != NULL) -- apr_file_dup(&attr->child_in, child_in, attr->pool); -+ apr_file_dup2(attr->child_in, child_in, attr->pool); - - if (parent_in != NULL) -- apr_file_dup(&attr->parent_in, parent_in, attr->pool); -+ apr_file_dup2(attr->parent_in, parent_in, attr->pool); - - return APR_SUCCESS; - } -@@ -375,10 +559,10 @@ - apr_file_pipe_create(&attr->child_out, &attr->parent_out, attr->pool); - - if (child_out != NULL) -- apr_file_dup(&attr->child_out, child_out, attr->pool); -+ apr_file_dup2(attr->child_out, child_out, attr->pool); - - if (parent_out != NULL) -- apr_file_dup(&attr->parent_out, parent_out, attr->pool); -+ apr_file_dup2(attr->parent_out, parent_out, attr->pool); - - return APR_SUCCESS; - } -@@ -390,10 +574,10 @@ - apr_file_pipe_create(&attr->child_err, &attr->parent_err, attr->pool); - - if (child_err != NULL) -- apr_file_dup(&attr->child_err, child_err, attr->pool); -+ apr_file_dup2(attr->child_err, child_err, attr->pool); - - if (parent_err != NULL) -- apr_file_dup(&attr->parent_err, parent_err, attr->pool); -+ apr_file_dup2(attr->parent_err, parent_err, attr->pool); - - return APR_SUCCESS; - } -diff -urN apr-1.0.1.orig/threadproc/beos/thread.c apr-1.0.1/threadproc/beos/thread.c ---- apr-1.0.1.orig/threadproc/beos/thread.c 2004-06-10 12:57:25.000000000 +0200 -+++ apr-1.0.1/threadproc/beos/thread.c 2004-12-17 15:19:11.000000000 +0100 -@@ -26,27 +26,27 @@ - } - - (*new)->pool = pool; -- (*new)->attr = (int32)B_NORMAL_PRIORITY; -+ (*new)->attr = (int32)B_NORMAL_PRIORITY; - - return APR_SUCCESS; - } - - APR_DECLARE(apr_status_t) apr_threadattr_detach_set(apr_threadattr_t *attr, apr_int32_t on) - { -- if (on == 1){ -- attr->detached = 1; -- } else { -- attr->detached = 0; -- } -+ if (on == 1){ -+ attr->detached = 1; -+ } else { -+ attr->detached = 0; -+ } - return APR_SUCCESS; - } - - APR_DECLARE(apr_status_t) apr_threadattr_detach_get(apr_threadattr_t *attr) - { -- if (attr->detached == 1){ -- return APR_DETACH; -- } -- return APR_NOTDETACH; -+ if (attr->detached == 1){ -+ return APR_DETACH; -+ } -+ return APR_NOTDETACH; - } - - APR_DECLARE(apr_status_t) apr_threadattr_stacksize_set(apr_threadattr_t *attr, -@@ -61,10 +61,11 @@ - return APR_ENOTIMPL; - } - --static void *dummy_worker(void *opaque) -+static int32 dummy_worker(void *opaque) - { - apr_thread_t *thd = (apr_thread_t*)opaque; -- return thd->func(thd, thd->data); -+ thd->func(thd, thd->data); -+ return 0; - } - - APR_DECLARE(apr_status_t) apr_thread_create(apr_thread_t **new, apr_threadattr_t *attr, -@@ -82,23 +83,21 @@ - (*new)->pool = pool; - (*new)->data = data; - (*new)->func = func; -- (*new)->exitval = -1; -+ (*new)->exitval = 0; -+ (*new)->join_count = 0; - - /* First we create the new thread...*/ -- if (attr) -- temp = attr->attr; -- else -- temp = B_NORMAL_PRIORITY; -+ if (attr) -+ temp = attr->attr; -+ else -+ temp = B_NORMAL_PRIORITY; - - stat = apr_pool_create(&(*new)->pool, pool); - if (stat != APR_SUCCESS) { - return stat; - } - -- (*new)->td = spawn_thread((thread_func)dummy_worker, -- "apr thread", -- temp, -- (*new)); -+ (*new)->td = spawn_thread(dummy_worker, "apr thread", temp, (*new)); - - /* Now we try to run it...*/ - if (resume_thread((*new)->td) == B_NO_ERROR) { -@@ -128,7 +127,8 @@ - return APR_SUCCESS; - } - --APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval, apr_thread_t *thd) -+APR_DECLARE(apr_status_t) apr_thread_join(apr_status_t *retval, -+ apr_thread_t *thd) - { - status_t rv = 0, ret; - ret = wait_for_thread(thd->td, &rv); -@@ -137,10 +137,10 @@ - return APR_SUCCESS; - } - else { -- /* if we've missed the thread's death, did we set an exit value prior -- * to it's demise? If we did return that. -+ /* We've missed the thread's death, if noone joined it before us, we -+ * will succeed. - */ -- if (thd->exitval != -1) { -+ if (atomic_add(&thd->join_count, 1) == 0) { - *retval = thd->exitval; - return APR_SUCCESS; - } else -@@ -150,12 +150,27 @@ - - APR_DECLARE(apr_status_t) apr_thread_detach(apr_thread_t *thd) - { -- if (suspend_thread(thd->td) == B_NO_ERROR){ -+ /* -+ if (suspend_thread(thd->td) == B_NO_ERROR){ - return APR_SUCCESS; - } - else { - return errno; - } -+ -+ * bonefish: -+ * The code above is definitely not correct. The OpenGroup specification -+ * of pthread_detach() says: -+ * -+ * "The pthread_detach() function shall indicate to the implementation that -+ * storage for the thread thread can be reclaimed when that thread -+ * terminates. If thread has not terminated, pthread_detach() shall not -+ * cause it to terminate. The effect of multiple pthread_detach() calls -+ * on the same target thread is unspecified." -+ * -+ * I don't really see, what we should do here. -+ */ -+ return APR_SUCCESS; - } - - void apr_thread_yield() -@@ -198,10 +213,8 @@ - { - apr_thread_once_t *control = (apr_thread_once_t *)vcontrol; - -- if (control->sem) { -- release_sem(control->sem); -+ if (control->sem >= 0) - delete_sem(control->sem); -- } - - return APR_SUCCESS; - } -@@ -211,7 +224,6 @@ - { - int rc; - *control = (apr_thread_once_t *)apr_pcalloc(p, sizeof(apr_thread_once_t)); -- (*control)->hit = 0; /* we haven't done it yet... */ - rc = ((*control)->sem = create_sem(1, "thread_once")); - if (rc < 0) - return rc; -@@ -225,10 +237,11 @@ - APR_DECLARE(apr_status_t) apr_thread_once(apr_thread_once_t *control, - void (*func)(void)) - { -- if (!control->hit) { -+ if (control->sem >= 0) { - if (acquire_sem(control->sem) == B_OK) { -- control->hit = 1; - func(); -+ delete_sem(control->sem); -+ control->sem = -1; - } - } - return APR_SUCCESS; -diff -urN apr-1.0.1.orig/threadproc/beos/threadpriv.c apr-1.0.1/threadproc/beos/threadpriv.c ---- apr-1.0.1.orig/threadproc/beos/threadpriv.c 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/threadproc/beos/threadpriv.c 2004-12-17 15:19:11.000000000 +0100 -@@ -14,135 +14,51 @@ - */ - - #include "apr_arch_threadproc.h" -+#include - --static struct beos_key key_table[BEOS_MAX_DATAKEYS]; --static struct beos_private_data *beos_data[BEOS_MAX_DATAKEYS]; --static sem_id lock; -+static void threadkey_cleanup(void *_key) -+{ -+ apr_threadkey_t *key = (apr_threadkey_t *)_key; -+ void* data = tls_get(key->key); -+ -+ if (data && key->destructor) { -+ (*key->destructor)(data); -+ } -+} - - APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key, - void (*dest)(void *), apr_pool_t *pool) - { -- (*key) = (apr_threadkey_t *)apr_palloc(pool, sizeof(apr_threadkey_t)); -+ (*key) = (apr_threadkey_t *)apr_pcalloc(pool, sizeof(apr_threadkey_t)); -+ - if ((*key) == NULL) { - return APR_ENOMEM; - } - -+ (*key)->key = tls_allocate(); - (*key)->pool = pool; -- -- acquire_sem(lock); -- for ((*key)->key=0; (*key)->key < BEOS_MAX_DATAKEYS; (*key)->key++){ -- if (key_table[(*key)->key].assigned == 0){ -- key_table[(*key)->key].assigned = 1; -- key_table[(*key)->key].destructor = dest; -- release_sem(lock); -- return APR_SUCCESS; -- } -- -- } -- release_sem(lock); -- return APR_ENOMEM; -+ (*key)->destructor = dest; -+ -+ on_exit_thread(&threadkey_cleanup, *key); -+ -+ return APR_SUCCESS; - } - - APR_DECLARE(apr_status_t) apr_threadkey_private_get(void **new, apr_threadkey_t *key) - { -- thread_id tid; -- int i, index=0; -- tid = find_thread(NULL); -- for (i=0;idata){ -- /* it's been used */ -- if (beos_data[i]->td == tid){ -- index = i; -- } -- } -- } -- if (index == 0){ -- /* no storage for thread so we can't get anything... */ -- return APR_ENOMEM; -- } -- -- if ((key->key < BEOS_MAX_DATAKEYS) && (key_table)){ -- acquire_sem(key_table[key->key].lock); -- if (key_table[key->key].count){ -- (*new) = (void*)beos_data[index]->data[key->key]; -- } else { -- (*new) = NULL; -- } -- release_sem(key_table[key->key].lock); -- } else { -- (*new) = NULL; -- } -- return APR_SUCCESS; -+ (*new) = tls_get(key->key); -+ return APR_SUCCESS; - } - - APR_DECLARE(apr_status_t) apr_threadkey_private_set(void *priv, apr_threadkey_t *key) - { -- thread_id tid; -- int i,index = 0, ret = 0; -- -- tid = find_thread(NULL); -- for (i=0; i < BEOS_MAX_DATAKEYS; i++){ -- if (beos_data[i]->data){ -- if (beos_data[i]->td == tid){index = i;} -- } -- } -- if (index==0){ -- /* not yet been allocated */ -- for (i=0; i< BEOS_MAX_DATAKEYS; i++){ -- if (! beos_data[i]->data){ -- /* we'll take this one... */ -- index = i; -- beos_data[i]->data = (const void **)malloc(sizeof(void *) * BEOS_MAX_DATAKEYS); -- memset((void *)beos_data[i]->data, 0, sizeof(void *) * BEOS_MAX_DATAKEYS); -- beos_data[i]->count = (int)malloc(sizeof(int)); -- beos_data[i]->td = (thread_id)malloc(sizeof(thread_id)); -- beos_data[i]->td = tid; -- } -- } -- } -- if (index == 0){ -- /* we're out of luck.. */ -- return APR_ENOMEM; -- } -- if ((key->key < BEOS_MAX_DATAKEYS) && (key_table)){ -- acquire_sem(key_table[key->key].lock); -- if (key_table[key->key].count){ -- if (beos_data[index]->data[key->key] == NULL){ -- if (priv != NULL){ -- beos_data[index]->count++; -- key_table[key->key].count++; -- } -- } else { -- if (priv == NULL){ -- beos_data[index]->count--; -- key_table[key->key].count--; -- } -- } -- beos_data[index]->data[key->key] = priv; -- ret = 1; -- } else { -- ret = 0; -- } -- release_sem(key_table[key->key].lock); -- } -- if (ret) -- return APR_SUCCESS; -- return APR_ENOMEM; -+ tls_set(key->key, priv); -+ return APR_SUCCESS; - } - - APR_DECLARE(apr_status_t) apr_threadkey_private_delete(apr_threadkey_t *key) - { -- if (key->key < BEOS_MAX_DATAKEYS){ -- acquire_sem(key_table[key->key].lock); -- if (key_table[key->key].count == 1){ -- key_table[key->key].destructor = NULL; -- key_table[key->key].count = 0; -- } -- release_sem(key_table[key->key].lock); -- } else { -- return APR_ENOMEM; -- } -- return APR_SUCCESS; -+ return APR_ENOTIMPL; - } - - APR_DECLARE(apr_status_t) apr_threadkey_data_get(void **data, const char *key, -diff -urN apr-1.0.1.orig/user/unix/userinfo.c apr-1.0.1/user/unix/userinfo.c ---- apr-1.0.1.orig/user/unix/userinfo.c 2004-02-13 10:38:38.000000000 +0100 -+++ apr-1.0.1/user/unix/userinfo.c 2004-12-17 15:19:11.000000000 +0100 -@@ -31,6 +31,28 @@ - - #define PWBUF_SIZE 512 - -+/* on BeOS R5 (also for BONE systems?) getpwnam() is broken */ -+#ifdef BEOS -+static struct passwd *beos_getpwnam(const char *name) -+{ -+ struct passwd *p; -+ while ((p = getpwent()) != NULL) { -+ if (strcmp(p->pw_name, name) == 0) -+ break; -+ } -+ endpwent(); -+ -+ if (!p) { -+ errno = ENOENT; -+ /* probably not the correct error code, but that doesn't really -+ * matter anyway */ -+ } -+ return p; -+} -+#define getpwnam beos_getpwnam -+#endif -+ -+ - static apr_status_t getpwnam_safe(const char *username, - struct passwd *pw, - char pwbuf[PWBUF_SIZE]) diff --git a/dev-libs/apr/patches/apr-1.2.x.diff b/dev-libs/apr/patches/apr-1.2.x.diff deleted file mode 100644 index faa0ab6ea..000000000 --- a/dev-libs/apr/patches/apr-1.2.x.diff +++ /dev/null @@ -1,23 +0,0 @@ -Index: Makefile.in -=================================================================== ---- Makefile.in (revision 619048) -+++ Makefile.in (working copy) -@@ -18,7 +18,7 @@ - INCDIR=./include - OSDIR=$(top_srcdir)/include/arch/@OSDIR@ - DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ --INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include -+INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include - - # - # Macros for target determination -Index: build/gen-build.py -=================================================================== ---- build/gen-build.py (revision 619048) -+++ build/gen-build.py (working copy) -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/bin/env python - # - # USAGE: gen-build.py TYPE - # diff --git a/dev-libs/apr/patches/apr-1.3.3.patch b/dev-libs/apr/patches/apr-1.3.3.patch deleted file mode 100644 index 9eb5f2c0e..000000000 --- a/dev-libs/apr/patches/apr-1.3.3.patch +++ /dev/null @@ -1,201 +0,0 @@ -diff -urN apr-1.3.3/build/apr_hints.m4 apr-1.3.3-haiku/build/apr_hints.m4 ---- apr-1.3.3/build/apr_hints.m4 2009-04-27 05:57:37.000000000 +0000 -+++ apr-1.3.3-haiku/build/apr_hints.m4 2009-04-28 02:01:57.000000000 +0000 -@@ -35,7 +35,7 @@ - dnl Generally, we force the setting of CC, and add flags - dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS. - dnl --AC_DEFUN(APR_PRELOAD, [ -+AC_DEFUN([APR_PRELOAD], [ - if test "x$apr_preload_done" != "xyes" ; then - - apr_preload_done="yes" -@@ -453,6 +453,12 @@ - APR_SETIFNULL(have_proc_invoked, [1]) - APR_SETIFNULL(apr_cv_use_lfs64, [yes]) - ;; -+ *-haiku*) -+ APR_ADDTO(LIBS, [-lnetwork]) -+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE]) -+ APR_SETIFNULL(apr_posixsem_is_global, [yes]) -+ APR_SETIFNULL(apr_process_lock_is_global, [yes]) -+ ;; - esac - - fi -@@ -463,7 +469,7 @@ - dnl - dnl Allows us to provide a default choice of compiler which - dnl the user can override. --AC_DEFUN(APR_CC_HINTS, [ -+AC_DEFUN([APR_CC_HINTS], [ - case "$host" in - *-apple-aux3*) - APR_SETIFNULL(CC, [gcc]) -diff -urN apr-1.3.3/build/apr_network.m4 apr-1.3.3-haiku/build/apr_network.m4 ---- apr-1.3.3/build/apr_network.m4 2009-04-27 05:57:37.000000000 +0000 -+++ apr-1.3.3-haiku/build/apr_network.m4 2009-04-27 06:00:26.000000000 +0000 -@@ -21,7 +21,7 @@ - dnl - dnl check for type in_addr - dnl --AC_DEFUN(APR_TYPE_IN_ADDR,[ -+AC_DEFUN([APR_TYPE_IN_ADDR],[ - AC_CACHE_CHECK(for type in_addr, ac_cv_type_in_addr,[ - AC_TRY_COMPILE([ - #ifdef HAVE_SYS_TYPES_H -diff -urN apr-1.3.3/build/apr_threads.m4 apr-1.3.3-haiku/build/apr_threads.m4 ---- apr-1.3.3/build/apr_threads.m4 2009-04-27 05:57:37.000000000 +0000 -+++ apr-1.3.3-haiku/build/apr_threads.m4 2009-04-27 05:51:44.000000000 +0000 -@@ -26,7 +26,7 @@ - dnl pthreads is not available. - dnl Turn off warnings if we're using gcc. - dnl --AC_DEFUN(APR_CHECK_PTHREADS_H, [ -+AC_DEFUN([APR_CHECK_PTHREADS_H], [ - if test "$GCC" = "yes"; then - SAVE_FL="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -w" -@@ -41,7 +41,7 @@ - dnl - dnl APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS - dnl --AC_DEFUN(APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS, [ -+AC_DEFUN([APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS], [ - AC_CACHE_CHECK(whether pthread_getspecific takes two arguments, ac_cv_pthread_getspecific_two_args,[ - AC_TRY_COMPILE([ - #include -@@ -65,7 +65,7 @@ - dnl - dnl APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG - dnl --AC_DEFUN(APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG, [ -+AC_DEFUN([APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG], [ - AC_CACHE_CHECK(whether pthread_attr_getdetachstate takes one argument, ac_cv_pthread_attr_getdetachstate_one_arg,[ - AC_TRY_COMPILE([ - #include -@@ -91,7 +91,7 @@ - dnl Try running a program which uses pthreads, executing the - dnl actions-if-success commands on success. - dnl --AC_DEFUN(APR_PTHREADS_TRY_RUN, [ -+AC_DEFUN([APR_PTHREADS_TRY_RUN], [ - AC_TRY_RUN( [ - #include - #include -@@ -182,12 +182,12 @@ - dnl the checks for threading support so that they can restored if the - dnl result is not what the caller wanted. - dnl --AC_DEFUN(APR_PTHREADS_CHECK_SAVE, [ -+AC_DEFUN([APR_PTHREADS_CHECK_SAVE], [ - apr_pthsv_CFLAGS="$CFLAGS" - apr_pthsv_LIBS="$LIBS" - ])dnl - --AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [ -+AC_DEFUN([APR_PTHREADS_CHECK_RESTORE], [ - CFLAGS="$apr_pthsv_CFLAGS" - LIBS="$apr_pthsv_LIBS" - ])dnl -diff -urN apr-1.3.3/configure.in apr-1.3.3-haiku/configure.in ---- apr-1.3.3/configure.in 2009-04-27 05:57:37.000000000 +0000 -+++ apr-1.3.3-haiku/configure.in 2009-04-28 02:02:02.000000000 +0000 -@@ -244,7 +244,7 @@ - dnl otherwise. - - case $host in -- *os390) -+ *os390|*haiku*) - if test "$ac_test_CFLAGS" != set; then - APR_REMOVEFROM(CFLAGS,-g) - fi -@@ -479,6 +479,12 @@ - OSDIR="unix" - eolstr="\\n" - ;; -+ *haiku*) -+ OSDIR="unix" -+ eolstr="\\n" -+ AC_CHECK_LIB(bsd, getpass) -+ AC_CHECK_LIB(network, socket) -+ ;; - *) - OSDIR="unix" - eolstr="\\n" -@@ -833,6 +840,10 @@ - havemmapzero="0" - havemmapanon="0" - APR_BEGIN_DECISION([anonymous shared memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS_ANON, -+ [BeOS areas])]) - APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmgetanon="1" -@@ -904,6 +915,9 @@ - haveos2shm="0" - havewin32shm="0" - APR_BEGIN_DECISION([namebased memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:sys/mman.h func:mmap func:munmap, - [havemmaptmp="1" - APR_DECIDE(USE_SHMEM_MMAP_TMP, -@@ -917,9 +931,6 @@ - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmget="1" - APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])]) --APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:os2.h, - [haveos2shm="1" - APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])]) -diff -urN apr-1.3.3/test/testpoll.c apr-1.3.3-haiku/test/testpoll.c ---- apr-1.3.3/test/testpoll.c 2009-04-27 05:57:37.000000000 +0000 -+++ apr-1.3.3-haiku/test/testpoll.c 2009-04-28 02:02:28.000000000 +0000 -@@ -193,6 +193,8 @@ - recv_msg(s, 2, p, tc); - send_msg(s, sa, 1, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 0, tc); -@@ -207,6 +209,8 @@ - - send_msg(s, sa, 2, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 0, tc); -@@ -381,6 +385,7 @@ - int num; - - send_msg(s, sa, 0, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 1, num); -@@ -411,6 +416,7 @@ - - send_msg(s, sa, 2, tc); - send_msg(s, sa, 5, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 2, num); -@@ -443,6 +449,7 @@ - int num; - - send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 1, num); diff --git a/dev-libs/apr/patches/apr-1.3.8.patch b/dev-libs/apr/patches/apr-1.3.8.patch deleted file mode 100644 index 0b1f41ac2..000000000 --- a/dev-libs/apr/patches/apr-1.3.8.patch +++ /dev/null @@ -1,219 +0,0 @@ -diff -urN apr-1.3.8/build/apr_hints.m4 apr-1.3.8-haiku/build/apr_hints.m4 ---- apr-1.3.8/build/apr_hints.m4 2009-06-02 09:15:46.000000000 -0700 -+++ apr-1.3.8-haiku/build/apr_hints.m4 2009-08-29 21:04:14.000000000 -0700 -@@ -35,7 +35,7 @@ - dnl Generally, we force the setting of CC, and add flags - dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS. - dnl --AC_DEFUN(APR_PRELOAD, [ -+AC_DEFUN([APR_PRELOAD], [ - if test "x$apr_preload_done" != "xyes" ; then - - apr_preload_done="yes" -@@ -454,6 +454,12 @@ - APR_SETIFNULL(have_proc_invoked, [1]) - APR_SETIFNULL(apr_cv_use_lfs64, [yes]) - ;; -+ *-haiku*) -+ APR_ADDTO(LIBS, [-lnetwork]) -+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE]) -+ APR_SETIFNULL(apr_posixsem_is_global, [yes]) -+ APR_SETIFNULL(apr_process_lock_is_global, [yes]) -+ ;; - esac - - fi -@@ -464,7 +470,7 @@ - dnl - dnl Allows us to provide a default choice of compiler which - dnl the user can override. --AC_DEFUN(APR_CC_HINTS, [ -+AC_DEFUN([APR_CC_HINTS], [ - case "$host" in - *-apple-aux3*) - APR_SETIFNULL(CC, [gcc]) -diff -urN apr-1.3.8/build/apr_network.m4 apr-1.3.8-haiku/build/apr_network.m4 ---- apr-1.3.8/build/apr_network.m4 2008-06-16 14:16:13.000000000 -0700 -+++ apr-1.3.8-haiku/build/apr_network.m4 2009-08-29 21:04:14.000000000 -0700 -@@ -21,7 +21,7 @@ - dnl - dnl check for type in_addr - dnl --AC_DEFUN(APR_TYPE_IN_ADDR,[ -+AC_DEFUN([APR_TYPE_IN_ADDR],[ - AC_CACHE_CHECK(for type in_addr, ac_cv_type_in_addr,[ - AC_TRY_COMPILE([ - #ifdef HAVE_SYS_TYPES_H -diff -urN apr-1.3.8/build/apr_threads.m4 apr-1.3.8-haiku/build/apr_threads.m4 ---- apr-1.3.8/build/apr_threads.m4 2006-08-03 03:46:47.000000000 -0700 -+++ apr-1.3.8-haiku/build/apr_threads.m4 2009-08-29 21:04:14.000000000 -0700 -@@ -26,7 +26,7 @@ - dnl pthreads is not available. - dnl Turn off warnings if we're using gcc. - dnl --AC_DEFUN(APR_CHECK_PTHREADS_H, [ -+AC_DEFUN([APR_CHECK_PTHREADS_H], [ - if test "$GCC" = "yes"; then - SAVE_FL="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -w" -@@ -41,7 +41,7 @@ - dnl - dnl APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS - dnl --AC_DEFUN(APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS, [ -+AC_DEFUN([APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS], [ - AC_CACHE_CHECK(whether pthread_getspecific takes two arguments, ac_cv_pthread_getspecific_two_args,[ - AC_TRY_COMPILE([ - #include -@@ -65,7 +65,7 @@ - dnl - dnl APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG - dnl --AC_DEFUN(APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG, [ -+AC_DEFUN([APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG], [ - AC_CACHE_CHECK(whether pthread_attr_getdetachstate takes one argument, ac_cv_pthread_attr_getdetachstate_one_arg,[ - AC_TRY_COMPILE([ - #include -@@ -91,7 +91,7 @@ - dnl Try running a program which uses pthreads, executing the - dnl actions-if-success commands on success. - dnl --AC_DEFUN(APR_PTHREADS_TRY_RUN, [ -+AC_DEFUN([APR_PTHREADS_TRY_RUN], [ - AC_TRY_RUN( [ - #include - #include -@@ -182,12 +182,12 @@ - dnl the checks for threading support so that they can restored if the - dnl result is not what the caller wanted. - dnl --AC_DEFUN(APR_PTHREADS_CHECK_SAVE, [ -+AC_DEFUN([APR_PTHREADS_CHECK_SAVE], [ - apr_pthsv_CFLAGS="$CFLAGS" - apr_pthsv_LIBS="$LIBS" - ])dnl - --AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [ -+AC_DEFUN([APR_PTHREADS_CHECK_RESTORE], [ - CFLAGS="$apr_pthsv_CFLAGS" - LIBS="$apr_pthsv_LIBS" - ])dnl -diff -urN apr-1.3.8/build/gen-build.py apr-1.3.8-haiku/build/gen-build.py ---- apr-1.3.8/build/gen-build.py 2007-02-28 04:44:52.000000000 -0800 -+++ apr-1.3.8-haiku/build/gen-build.py 2009-08-29 20:36:31.000000000 -0700 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/bin/env python - # - # USAGE: gen-build.py TYPE - # -diff -urN apr-1.3.8/configure.in apr-1.3.8-haiku/configure.in ---- apr-1.3.8/configure.in 2009-07-17 16:14:25.000000000 -0700 -+++ apr-1.3.8-haiku/configure.in 2009-08-29 20:48:05.000000000 -0700 -@@ -135,7 +135,7 @@ - AC_PROG_CPP - AC_PROG_AWK - AC_PROG_LN_S --AC_PROG_RANLIB -+AC_PROG_LIBTOOL - AC_PROG_INSTALL - AC_CHECK_PROG(RM, rm, rm) - AC_CHECK_PROG(AS, as, as) -@@ -248,7 +248,7 @@ - dnl otherwise. - - case $host in -- *os390) -+ *os390|*haiku*) - if test "$ac_test_CFLAGS" != set; then - APR_REMOVEFROM(CFLAGS,-g) - fi -@@ -486,6 +486,12 @@ - OSDIR="unix" - eolstr="\\n" - ;; -+ *haiku*) -+ OSDIR="unix" -+ eolstr="\\n" -+ AC_CHECK_LIB(bsd, getpass) -+ AC_CHECK_LIB(network, socket) -+ ;; - *) - OSDIR="unix" - eolstr="\\n" -@@ -962,6 +968,10 @@ - havemmapzero="0" - havemmapanon="0" - APR_BEGIN_DECISION([anonymous shared memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS_ANON, -+ [BeOS areas])]) - APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmgetanon="1" -@@ -1033,6 +1043,9 @@ - haveos2shm="0" - havewin32shm="0" - APR_BEGIN_DECISION([namebased memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:sys/mman.h func:mmap func:munmap, - [havemmaptmp="1" - APR_DECIDE(USE_SHMEM_MMAP_TMP, -@@ -1046,9 +1059,6 @@ - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmget="1" - APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])]) --APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:os2.h, - [haveos2shm="1" - APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])]) -diff -urN apr-1.3.8/test/testpoll.c apr-1.3.8-haiku/test/testpoll.c ---- apr-1.3.8/test/testpoll.c 2008-04-13 04:37:52.000000000 -0700 -+++ apr-1.3.8-haiku/test/testpoll.c 2009-08-29 21:04:14.000000000 -0700 -@@ -193,6 +193,8 @@ - recv_msg(s, 2, p, tc); - send_msg(s, sa, 1, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 0, tc); -@@ -207,6 +209,8 @@ - - send_msg(s, sa, 2, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 0, tc); -@@ -381,6 +385,7 @@ - int num; - - send_msg(s, sa, 0, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 1, num); -@@ -411,6 +416,7 @@ - - send_msg(s, sa, 2, tc); - send_msg(s, sa, 5, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 2, num); -@@ -443,6 +449,7 @@ - int num; - - send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 1, num); diff --git a/dev-libs/apr/patches/apr-1.3.9.patch b/dev-libs/apr/patches/apr-1.3.9.patch deleted file mode 100644 index 41d545de0..000000000 --- a/dev-libs/apr/patches/apr-1.3.9.patch +++ /dev/null @@ -1,219 +0,0 @@ -diff -urN apr-1.3.9/build/apr_hints.m4 apr-1.3.9-haiku/build/apr_hints.m4 ---- apr-1.3.9/build/apr_hints.m4 2009-06-02 09:15:46.000000000 -0700 -+++ apr-1.3.9-haiku/build/apr_hints.m4 2009-08-29 21:04:14.000000000 -0700 -@@ -35,7 +35,7 @@ - dnl Generally, we force the setting of CC, and add flags - dnl to CFLAGS, CPPFLAGS, LIBS and LDFLAGS. - dnl --AC_DEFUN(APR_PRELOAD, [ -+AC_DEFUN([APR_PRELOAD], [ - if test "x$apr_preload_done" != "xyes" ; then - - apr_preload_done="yes" -@@ -454,6 +454,12 @@ - APR_SETIFNULL(have_proc_invoked, [1]) - APR_SETIFNULL(apr_cv_use_lfs64, [yes]) - ;; -+ *-haiku*) -+ APR_ADDTO(LIBS, [-lnetwork]) -+ APR_SETIFNULL(apr_lock_method, [USE_POSIXSEM_SERIALIZE]) -+ APR_SETIFNULL(apr_posixsem_is_global, [yes]) -+ APR_SETIFNULL(apr_process_lock_is_global, [yes]) -+ ;; - esac - - fi -@@ -464,7 +470,7 @@ - dnl - dnl Allows us to provide a default choice of compiler which - dnl the user can override. --AC_DEFUN(APR_CC_HINTS, [ -+AC_DEFUN([APR_CC_HINTS], [ - case "$host" in - *-apple-aux3*) - APR_SETIFNULL(CC, [gcc]) -diff -urN apr-1.3.9/build/apr_network.m4 apr-1.3.9-haiku/build/apr_network.m4 ---- apr-1.3.9/build/apr_network.m4 2008-06-16 14:16:13.000000000 -0700 -+++ apr-1.3.9-haiku/build/apr_network.m4 2009-08-29 21:04:14.000000000 -0700 -@@ -21,7 +21,7 @@ - dnl - dnl check for type in_addr - dnl --AC_DEFUN(APR_TYPE_IN_ADDR,[ -+AC_DEFUN([APR_TYPE_IN_ADDR],[ - AC_CACHE_CHECK(for type in_addr, ac_cv_type_in_addr,[ - AC_TRY_COMPILE([ - #ifdef HAVE_SYS_TYPES_H -diff -urN apr-1.3.9/build/apr_threads.m4 apr-1.3.9-haiku/build/apr_threads.m4 ---- apr-1.3.9/build/apr_threads.m4 2006-08-03 03:46:47.000000000 -0700 -+++ apr-1.3.9-haiku/build/apr_threads.m4 2009-08-29 21:04:14.000000000 -0700 -@@ -26,7 +26,7 @@ - dnl pthreads is not available. - dnl Turn off warnings if we're using gcc. - dnl --AC_DEFUN(APR_CHECK_PTHREADS_H, [ -+AC_DEFUN([APR_CHECK_PTHREADS_H], [ - if test "$GCC" = "yes"; then - SAVE_FL="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -w" -@@ -41,7 +41,7 @@ - dnl - dnl APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS - dnl --AC_DEFUN(APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS, [ -+AC_DEFUN([APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS], [ - AC_CACHE_CHECK(whether pthread_getspecific takes two arguments, ac_cv_pthread_getspecific_two_args,[ - AC_TRY_COMPILE([ - #include -@@ -65,7 +65,7 @@ - dnl - dnl APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG - dnl --AC_DEFUN(APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG, [ -+AC_DEFUN([APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG], [ - AC_CACHE_CHECK(whether pthread_attr_getdetachstate takes one argument, ac_cv_pthread_attr_getdetachstate_one_arg,[ - AC_TRY_COMPILE([ - #include -@@ -91,7 +91,7 @@ - dnl Try running a program which uses pthreads, executing the - dnl actions-if-success commands on success. - dnl --AC_DEFUN(APR_PTHREADS_TRY_RUN, [ -+AC_DEFUN([APR_PTHREADS_TRY_RUN], [ - AC_TRY_RUN( [ - #include - #include -@@ -182,12 +182,12 @@ - dnl the checks for threading support so that they can restored if the - dnl result is not what the caller wanted. - dnl --AC_DEFUN(APR_PTHREADS_CHECK_SAVE, [ -+AC_DEFUN([APR_PTHREADS_CHECK_SAVE], [ - apr_pthsv_CFLAGS="$CFLAGS" - apr_pthsv_LIBS="$LIBS" - ])dnl - --AC_DEFUN(APR_PTHREADS_CHECK_RESTORE, [ -+AC_DEFUN([APR_PTHREADS_CHECK_RESTORE], [ - CFLAGS="$apr_pthsv_CFLAGS" - LIBS="$apr_pthsv_LIBS" - ])dnl -diff -urN apr-1.3.9/build/gen-build.py apr-1.3.9-haiku/build/gen-build.py ---- apr-1.3.9/build/gen-build.py 2007-02-28 04:44:52.000000000 -0800 -+++ apr-1.3.9-haiku/build/gen-build.py 2009-08-29 20:36:31.000000000 -0700 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/bin/env python - # - # USAGE: gen-build.py TYPE - # -diff -urN apr-1.3.9/configure.in apr-1.3.9-haiku/configure.in ---- apr-1.3.9/configure.in 2009-07-17 16:14:25.000000000 -0700 -+++ apr-1.3.9-haiku/configure.in 2009-08-29 20:48:05.000000000 -0700 -@@ -135,7 +135,7 @@ - AC_PROG_CPP - AC_PROG_AWK - AC_PROG_LN_S --AC_PROG_RANLIB -+AC_PROG_LIBTOOL - AC_PROG_INSTALL - AC_CHECK_PROG(RM, rm, rm) - AC_CHECK_PROG(AS, as, as) -@@ -248,7 +248,7 @@ - dnl otherwise. - - case $host in -- *os390) -+ *os390|*haiku*) - if test "$ac_test_CFLAGS" != set; then - APR_REMOVEFROM(CFLAGS,-g) - fi -@@ -486,6 +486,12 @@ - OSDIR="unix" - eolstr="\\n" - ;; -+ *haiku*) -+ OSDIR="unix" -+ eolstr="\\n" -+ AC_CHECK_LIB(bsd, getpass) -+ AC_CHECK_LIB(network, socket) -+ ;; - *) - OSDIR="unix" - eolstr="\\n" -@@ -962,6 +968,10 @@ - havemmapzero="0" - havemmapanon="0" - APR_BEGIN_DECISION([anonymous shared memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS_ANON, -+ [BeOS areas])]) - APR_IFALLYES(header:sys/ipc.h header:sys/shm.h header:sys/file.h dnl - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmgetanon="1" -@@ -1033,6 +1043,9 @@ - haveos2shm="0" - havewin32shm="0" - APR_BEGIN_DECISION([namebased memory allocation method]) -+APR_IFALLYES(header:kernel/OS.h func:create_area, -+ [havebeosshm="1" -+ APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:sys/mman.h func:mmap func:munmap, - [havemmaptmp="1" - APR_DECIDE(USE_SHMEM_MMAP_TMP, -@@ -1046,9 +1059,6 @@ - func:shmget func:shmat func:shmdt func:shmctl, - [haveshmget="1" - APR_DECIDE(USE_SHMEM_SHMGET, [SysV IPC shmget()])]) --APR_IFALLYES(header:kernel/OS.h func:create_area, -- [havebeosshm="1" -- APR_DECIDE(USE_SHMEM_BEOS, [BeOS areas])]) - APR_IFALLYES(header:os2.h, - [haveos2shm="1" - APR_DECIDE(USE_SHMEM_OS2, [OS/2 DosAllocSharedMem()])]) -diff -urN apr-1.3.9/test/testpoll.c apr-1.3.9-haiku/test/testpoll.c ---- apr-1.3.9/test/testpoll.c 2008-04-13 04:37:52.000000000 -0700 -+++ apr-1.3.9-haiku/test/testpoll.c 2009-08-29 21:04:14.000000000 -0700 -@@ -193,6 +193,8 @@ - recv_msg(s, 2, p, tc); - send_msg(s, sa, 1, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 0, tc); -@@ -207,6 +209,8 @@ - - send_msg(s, sa, 2, tc); - -+ apr_sleep(apr_time_make(0, 10000)); -+ - rv = apr_poll(pollarray, SMALL_NUM_SOCKETS, &srv, 2 * APR_USEC_PER_SEC); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - check_sockets(pollarray, s, 0, 0, tc); -@@ -381,6 +385,7 @@ - int num; - - send_msg(s, sa, 0, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 1, num); -@@ -411,6 +416,7 @@ - - send_msg(s, sa, 2, tc); - send_msg(s, sa, 5, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 2, num); -@@ -443,6 +449,7 @@ - int num; - - send_msg(s, sa, LARGE_NUM_SOCKETS - 1, tc); -+ apr_sleep(apr_time_make(0, 10000)); - rv = apr_pollset_poll(pollset, 0, &num, &descs); - ABTS_INT_EQUAL(tc, APR_SUCCESS, rv); - ABTS_INT_EQUAL(tc, 1, num); diff --git a/dev-libs/apr/patches/apr-1.4.2.patch b/dev-libs/apr/patches/apr-1.4.2.patch deleted file mode 100644 index 3a6fcb6ce..000000000 --- a/dev-libs/apr/patches/apr-1.4.2.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urN apr-1.4.2/config.layout apr-1.4.2-haiku/config.layout ---- apr-1.4.2/config.layout 2004-11-24 22:51:51.065798144 +0000 -+++ apr-1.4.2-haiku/config.layout 2011-03-24 11:36:30.742653952 +0000 -@@ -60,6 +60,23 @@ - runtimedir: ${localstatedir}/run - - -+# Haiku Layout making use of finddir -+ -+ prefix: /boot/common -+ exec_prefix: /boot/common -+ bindir: /boot/common/bin -+ sbindir: /boot/common/servers -+ libdir: /boot/common/lib -+ libexecdir: /boot/common/servers -+ mandir: /boot/common/documentation/man -+ sysconfdir: /boot/common/settings -+ datadir: /boot/common/data -+ installbuilddir: /boot/develop/build -+ includedir: /boot/common/include -+ localstatedir: /boot/common/var -+ runtimedir: ${localstatedir}/log -+ -+ - # Mac OS X Server (Rhapsody) - - prefix: /Local/Library/WebServer -diff -urN apr-1.4.2/configure.in apr-1.4.2-haiku/configure.in ---- apr-1.4.2/configure.in 2009-11-16 07:45:28.064225280 +0000 -+++ apr-1.4.2-haiku/configure.in 2011-03-24 14:27:40.000000000 +0000 -@@ -143,7 +143,7 @@ - AC_PROG_CPP - AC_PROG_AWK - AC_PROG_LN_S --AC_PROG_RANLIB -+AC_PROG_LIBTOOL - AC_PROG_INSTALL - AC_CHECK_PROG(RM, rm, rm) - AC_CHECK_PROG(AS, as, as) diff --git a/dev-libs/apr/patches/apr-1.4.4.patch b/dev-libs/apr/patches/apr-1.4.4.patch deleted file mode 100644 index 86f9e8c76..000000000 --- a/dev-libs/apr/patches/apr-1.4.4.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urN apr-1.4.4/config.layout apr-1.4.4-haiku/config.layout ---- apr-1.4.4/config.layout 2004-11-24 22:51:51.065798144 +0000 -+++ apr-1.4.4-haiku/config.layout 2011-03-24 11:36:30.742653952 +0000 -@@ -60,6 +60,23 @@ - runtimedir: ${localstatedir}/run - - -+# Haiku Layout making use of finddir -+ -+ prefix: /boot/common -+ exec_prefix: /boot/common -+ bindir: /boot/common/bin -+ sbindir: /boot/common/servers -+ libdir: /boot/common/lib -+ libexecdir: /boot/common/servers -+ mandir: /boot/common/documentation/man -+ sysconfdir: /boot/common/settings -+ datadir: /boot/common/data -+ installbuilddir: /boot/develop/build -+ includedir: /boot/common/include -+ localstatedir: /boot/common/var -+ runtimedir: ${localstatedir}/log -+ -+ - # Mac OS X Server (Rhapsody) - - prefix: /Local/Library/WebServer -diff -urN apr-1.4.4/configure.in apr-1.4.4-haiku/configure.in ---- apr-1.4.4/configure.in 2009-11-16 07:45:28.064225280 +0000 -+++ apr-1.4.4-haiku/configure.in 2011-03-24 14:27:40.000000000 +0000 -@@ -143,7 +143,7 @@ - AC_PROG_CPP - AC_PROG_AWK - AC_PROG_LN_S --AC_PROG_RANLIB -+AC_PROG_LIBTOOL - AC_PROG_INSTALL - AC_CHECK_PROG(RM, rm, rm) - AC_CHECK_PROG(AS, as, as) diff --git a/dev-libs/apr/patches/apr-1.4.5.patch b/dev-libs/apr/patches/apr-1.4.5.patch deleted file mode 100644 index 1b713b281..000000000 --- a/dev-libs/apr/patches/apr-1.4.5.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -urN apr-1.4.5/config.layout apr-1.4.5-haiku/config.layout ---- apr-1.4.5/config.layout 2004-11-24 22:51:51.056360960 +0000 -+++ apr-1.4.5-haiku/config.layout 2011-07-12 10:34:27.155189248 +0000 -@@ -60,6 +60,23 @@ - runtimedir: ${localstatedir}/run - - -+# Haiku Layout making use of finddir -+ -+ prefix: /boot/common -+ exec_prefix: /boot/common -+ bindir: /boot/common/bin -+ sbindir: /boot/common/servers -+ libdir: /boot/common/lib -+ libexecdir: /boot/common/servers -+ mandir: /boot/common/documentation/man -+ sysconfdir: /boot/common/settings -+ datadir: /boot/common/data -+ installbuilddir: /boot/develop/build -+ includedir: /boot/common/include -+ localstatedir: /boot/common/var -+ runtimedir: ${localstatedir}/log -+ -+ - # Mac OS X Server (Rhapsody) - - prefix: /Local/Library/WebServer -diff -urN apr-1.4.5/configure.in apr-1.4.5-haiku/configure.in ---- apr-1.4.5/configure.in 2011-04-11 12:58:38.043253760 -0700 -+++ apr-1.4.5-haiku/configure.in 2011-08-02 12:49:33.801112064 -0700 -@@ -204,7 +204,7 @@ - AC_PROG_CPP - AC_PROG_AWK - AC_PROG_LN_S --AC_PROG_RANLIB -+AC_PROG_LIBTOOL - AC_PROG_INSTALL - AC_CHECK_PROG(RM, rm, rm) - AC_CHECK_PROG(AS, as, as) -@@ -673,9 +673,9 @@ - ac_cv_func_CreateFileMapping=yes - ;; - *) -+ AC_SEARCH_LIBS(socket, socket network) - AC_SEARCH_LIBS(gethostbyname, nsl) - AC_SEARCH_LIBS(gethostname, nsl) -- AC_SEARCH_LIBS(socket, socket) - AC_SEARCH_LIBS(crypt, crypt ufc) - AC_CHECK_LIB(truerand, main) - AC_SEARCH_LIBS(modf, m) From deb0ac85cf2e3f2fbf9ac11393b489c37ffcabed Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 25 Aug 2013 13:19:55 +0200 Subject: [PATCH 423/587] Drop old bison recipes and patches --- sys-devel/bison/bison-2.4.1.recipe | 28 --------------- sys-devel/bison/bison-2.4.recipe | 22 ------------ sys-devel/bison/patches/bison-2.4.1.patch | 29 --------------- sys-devel/bison/patches/bison-2.4.patch | 43 ----------------------- 4 files changed, 122 deletions(-) delete mode 100644 sys-devel/bison/bison-2.4.1.recipe delete mode 100644 sys-devel/bison/bison-2.4.recipe delete mode 100644 sys-devel/bison/patches/bison-2.4.1.patch delete mode 100644 sys-devel/bison/patches/bison-2.4.patch diff --git a/sys-devel/bison/bison-2.4.1.recipe b/sys-devel/bison/bison-2.4.1.recipe deleted file mode 100644 index ca29bc406..000000000 --- a/sys-devel/bison/bison-2.4.1.recipe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="bison - A yacc-compatible parser generator" -HOMEPAGE="http://www.gnu.org/software/bison/bison.html" -SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.1.tar.gz" -CHECKSUM_MD5="c58aa1da418dc9704070872489e89bf5" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd bison-2.4.1 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-nls - make -} - -INSTALL() -{ - cd bison-2.4.1 - make install -} - -TEST() -{ - cd bison-2.4.1 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2008 Free Software Foundation, Inc." diff --git a/sys-devel/bison/bison-2.4.recipe b/sys-devel/bison/bison-2.4.recipe deleted file mode 100644 index 03195f317..000000000 --- a/sys-devel/bison/bison-2.4.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="bison - A yacc-compatible parser generator" -HOMEPAGE="http://www.gnu.org/software/bison/bison.html" -SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.tar.gz" -CHECKSUM_MD5="2b9b088b46271c7fa902a7e85f503e1e" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd bison-2.4 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-nls - make -} - -INSTALL() -{ - cd bison-2.4 - make install - make check -} -LICENSE="GNU GPL v3" -COPYRIGHT="1992-2008 Free Software Foundation, Inc." diff --git a/sys-devel/bison/patches/bison-2.4.1.patch b/sys-devel/bison/patches/bison-2.4.1.patch deleted file mode 100644 index 2e2966269..000000000 --- a/sys-devel/bison/patches/bison-2.4.1.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -ur bison-2.4.1.orig/src/location.c bison-2.4.1/src/location.c ---- bison-2.4.1.orig/src/location.c 2008-08-17 06:15:28.000000000 +0000 -+++ bison-2.4.1/src/location.c 2008-11-09 15:03:06.000000000 +0000 -@@ -121,11 +121,11 @@ - /* Must search in reverse since the file name field may - * contain `.' or `:'. */ - char *delim = strrchr (loc_str, '.'); -- aver (delim); -+ aver (delim != NULL); - *delim = '\0'; - bound->column = atoi (delim+1); - delim = strrchr (loc_str, ':'); -- aver (delim); -+ aver (delim != NULL); - *delim = '\0'; - bound->line = atoi (delim+1); - bound->file = uniqstr_new (loc_str); -diff -ur bison-2.4.1.orig/src/muscle_tab.c bison-2.4.1/src/muscle_tab.c ---- bison-2.4.1.orig/src/muscle_tab.c 2008-08-17 06:15:28.000000000 +0000 -+++ bison-2.4.1/src/muscle_tab.c 2008-11-09 15:11:17.000000000 +0000 -@@ -336,7 +336,7 @@ - { - location loc; - char const *value = muscle_find_const (key); -- aver (value); -+ aver (value != NULL); - aver (*value == '['); - aver (*++value == '['); - while (*++value) diff --git a/sys-devel/bison/patches/bison-2.4.patch b/sys-devel/bison/patches/bison-2.4.patch deleted file mode 100644 index 7f3e5377c..000000000 --- a/sys-devel/bison/patches/bison-2.4.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -ur bison-2.4.orig/lib/config.charset bison-2.4/lib/config.charset ---- bison-2.4.orig/lib/config.charset 2008-11-02 21:59:28.000000000 +0000 -+++ bison-2.4/lib/config.charset 2008-11-09 14:56:56.000000000 +0000 -@@ -478,8 +478,8 @@ - # space nevertheless. - echo "* UTF-8" - ;; -- beos*) -- # BeOS has a single locale, and it has UTF-8 encoding. -+ beos*|haiku*) -+ # BeOS has a single locale, and it has UTF-8 encoding. Same for Haiku. - echo "* UTF-8" - ;; - msdosdjgpp*) -diff -ur bison-2.4.orig/src/location.c bison-2.4/src/location.c ---- bison-2.4.orig/src/location.c 2008-08-17 06:15:28.000000000 +0000 -+++ bison-2.4/src/location.c 2008-11-09 15:03:06.000000000 +0000 -@@ -121,11 +121,11 @@ - /* Must search in reverse since the file name field may - * contain `.' or `:'. */ - char *delim = strrchr (loc_str, '.'); -- aver (delim); -+ aver (delim != NULL); - *delim = '\0'; - bound->column = atoi (delim+1); - delim = strrchr (loc_str, ':'); -- aver (delim); -+ aver (delim != NULL); - *delim = '\0'; - bound->line = atoi (delim+1); - bound->file = uniqstr_new (loc_str); -diff -ur bison-2.4.orig/src/muscle_tab.c bison-2.4/src/muscle_tab.c ---- bison-2.4.orig/src/muscle_tab.c 2008-08-17 06:15:28.000000000 +0000 -+++ bison-2.4/src/muscle_tab.c 2008-11-09 15:11:17.000000000 +0000 -@@ -336,7 +336,7 @@ - { - location loc; - char const *value = muscle_find_const (key); -- aver (value); -+ aver (value != NULL); - aver (*value == '['); - aver (*++value == '['); - while (*++value) From fb5ef9aa7e1176be8b89b289a366676d64cfddff Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 25 Aug 2013 13:23:24 +0200 Subject: [PATCH 424/587] Drop old make recipes and patches --- sys-devel/make/make-3.81.recipe | 30 -------------------------- sys-devel/make/patches/make-3.81.patch | 12 ----------- 2 files changed, 42 deletions(-) delete mode 100644 sys-devel/make/make-3.81.recipe delete mode 100644 sys-devel/make/patches/make-3.81.patch diff --git a/sys-devel/make/make-3.81.recipe b/sys-devel/make/make-3.81.recipe deleted file mode 100644 index f3efec007..000000000 --- a/sys-devel/make/make-3.81.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="Standard tool to compile source trees." -HOMEPAGE="http://www.gnu.org/software/make/" -SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.81.tar.bz2" -CHECKSUM_MD5="354853e0b2da90c527e35aabb8d6f1e6" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd make-3.81 - libtoolize -fci - prefix=$(finddir B_PACKAGE_LINKS_DIRECTORY)/make-3.81 - ./configure --prefix=$prefix \ - --datadir=$prefix/data \ - --sbindir=$prefix/bin \ - --includedir=$prefix/develop/headers \ - --sysconfdir=$prefix/settings \ - --infodir=$prefix/documentation/info \ - --mandir=$prefix/documentation/man \ - --disable-rpath --with-gnu-ld - make -} - -INSTALL() -{ - cd make-3.81 - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1988-2006 Free Software Foundation, Inc." diff --git a/sys-devel/make/patches/make-3.81.patch b/sys-devel/make/patches/make-3.81.patch deleted file mode 100644 index e8ce9e72a..000000000 --- a/sys-devel/make/patches/make-3.81.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up make-3.81/arscan.c.orig make-3.81/arscan.c ---- make-3.81/arscan.c.orig 2010-04-18 13:33:16.283901952 -0600 -+++ make-3.81/arscan.c 2010-04-18 13:34:10.106168320 -0600 -@@ -231,7 +231,7 @@ ar_scan (char *archive, long int (*funct - #endif - - #ifndef WINDOWS32 --# ifndef __BEOS__ -+# if !defined(__BEOS__) && !defined(__HAIKU__) - # include - # else - /* BeOS 5 doesn't have but has archives in the same format From b1faf2d4a72dacf30b99455ee74f862f29a90eb1 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 25 Aug 2013 13:25:32 +0200 Subject: [PATCH 425/587] Drop old mesa recipes, patches and packaging shell script --- sys-libs/mesa/buildpackage.sh | 79 -------------------------- sys-libs/mesa/mesa-9.0.1.recipe | 26 --------- sys-libs/mesa/mesa-9.0.2.recipe | 29 ---------- sys-libs/mesa/mesa-9.0.recipe | 26 --------- sys-libs/mesa/mesa-9.1.0.recipe | 29 ---------- sys-libs/mesa/patches/mesa-9.0.1.patch | 52 ----------------- sys-libs/mesa/patches/mesa-9.0.2.patch | 25 -------- sys-libs/mesa/patches/mesa-9.0.patch | 42 -------------- 8 files changed, 308 deletions(-) delete mode 100644 sys-libs/mesa/buildpackage.sh delete mode 100644 sys-libs/mesa/mesa-9.0.1.recipe delete mode 100644 sys-libs/mesa/mesa-9.0.2.recipe delete mode 100644 sys-libs/mesa/mesa-9.0.recipe delete mode 100644 sys-libs/mesa/mesa-9.1.0.recipe delete mode 100644 sys-libs/mesa/patches/mesa-9.0.1.patch delete mode 100644 sys-libs/mesa/patches/mesa-9.0.2.patch delete mode 100644 sys-libs/mesa/patches/mesa-9.0.patch diff --git a/sys-libs/mesa/buildpackage.sh b/sys-libs/mesa/buildpackage.sh deleted file mode 100644 index 6fc82c244..000000000 --- a/sys-libs/mesa/buildpackage.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash -# Mesa-O-Matic -# Copyright 2011-2012, Alexander von Gluck IV -# Released under the terms of the MIT license - -# This script creates an optional package containing the -# the headers and binary code needed by the opengl kit -# to link libGL.so - -# This script is run against a *COMPILED* Mesa source tree - -echo " Welcome to Mesa-O-Matic!" -echo "-=-=-=-=-=-=-=-=-=-=-=-=-=" -echo "" - -if [[ $DEBUG -eq 1 ]]; then - echo "Debugging: enabled" -else - echo "Debugging: disabled" -fi - -####################################################################### -# END CONFIG DATA, Dragons below! -####################################################################### - -if [[ $( uname ) != "Haiku" ]]; then - echo "*************************************" - echo " I need to be run on a Haiku system!!" - echo "*************************************" - exit 1 -fi - -if [[ -z $1 ]]; then - echo "" - echo "Usage: $0 " - echo "" - exit 1 -fi - -MESA_VER="$1" -MESA_TOP="$2" -GCC_VER=`gcc -v 2>&1 | tail -1 | awk '{print $3}' | cut -d. -f1` -DATESTAMP=`date +"%Y-%m-%d"` - -echo "Bundling gcc$GCC_VER build of Mesa $MESA_VER..." - -cd $MESA_TOP - -####################################################################### -# Create Mesa optional pacakge -ZIP_HEADERS="" -echo "Collecting Mesa headers..." -for i in $(find . -name "*.h") -do - ZIP_HEADERS="$ZIP_HEADERS $i" -done - -echo "Collecting required Mesa libraries..." -rm -rf lib.haiku -mkdir -p lib.haiku -for i in $( find . -name "*.a" ) -do - cp $i lib.haiku/ -done - -if [[ $DEBUG -eq 0 ]]; then -echo "Stripping debug symbols from Mesa libraries..." -find lib.haiku -exec strip --strip-debug {} \; ; -MESADBG="" -else -MESADBG="dbg" -fi - -echo "Creating Mesa OptionalPackage..." -PLATFORM=$( uname -m ) -ZIP_FILENAME="/boot/home/mesa-${MESA_VER}-x86${MESADBG}-gcc${GCC_VER}-${DATESTAMP}.zip" -zip -r -9 $ZIP_FILENAME $ZIP_HEADERS ./lib.haiku/* - -echo "Great Success! $ZIP_FILENAME created." diff --git a/sys-libs/mesa/mesa-9.0.1.recipe b/sys-libs/mesa/mesa-9.0.1.recipe deleted file mode 100644 index 5568ca758..000000000 --- a/sys-libs/mesa/mesa-9.0.1.recipe +++ /dev/null @@ -1,26 +0,0 @@ -############################################################### -# THIS IS NOT FOR GENERAL USE! -# This builds a buildpackage for the Haiku build system to link -# the OpenGL kit!! -############################################################### - -DESCRIPTION="Mesa3D is a multi-platform GL implementation" -HOMEPAGE="http://www.freedesktop.org/" -SRC_URI="ftp://freedesktop.org/pub/mesa/9.0.1/MesaLib-9.0.1.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="scons" -CHECKSUM_MD5="97d6554c05ea7449398afe3a0ede7018" -MESSAGE="This port only builds with gcc4. Not for general use." -BUILD() -{ - export DEBUG=0 - cd Mesa-9.0.1 - scons debug=$DEBUG - cd .. - sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0.1 ./Mesa-9.0.1 - echo "There should be a Mesa OptionalBuild package in your home if everything went well!" -} - -LICENSE="MIT" -COPYRIGHT="Copyright (C) 1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/mesa-9.0.2.recipe b/sys-libs/mesa/mesa-9.0.2.recipe deleted file mode 100644 index 45fec2387..000000000 --- a/sys-libs/mesa/mesa-9.0.2.recipe +++ /dev/null @@ -1,29 +0,0 @@ -############################################################### -# THIS IS NOT FOR GENERAL USE! -# This builds a buildpackage for the Haiku build system to link -# the OpenGL kit!! -############################################################### - -DESCRIPTION="Mesa3D is a multi-platform GL implementation" -HOMEPAGE="http://www.freedesktop.org/" -SRC_URI="ftp://freedesktop.org/pub/mesa/9.0.2/MesaLib-9.0.2.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="scons, llvm >= 3.2" -CHECKSUM_MD5="dc45d1192203e418163e0017640e1cfc" -MESSAGE="This port only builds with gcc4. Not for general use." -BUILD() -{ - export DEBUG=0 - echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" - echo "This generates a Mesa3D build package for Haiku... not for general use" - echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" - cd Mesa-9.0.2 - scons debug=$DEBUG - cd .. - sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0.2 ./Mesa-9.0.2 - echo "There should be a Mesa OptionalBuild package in your home if everything went well!" -} - -LICENSE="MIT" -COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/mesa-9.0.recipe b/sys-libs/mesa/mesa-9.0.recipe deleted file mode 100644 index 99f182f27..000000000 --- a/sys-libs/mesa/mesa-9.0.recipe +++ /dev/null @@ -1,26 +0,0 @@ -############################################################### -# THIS IS NOT FOR GENERAL USE! -# This builds a buildpackage for the Haiku build system to link -# the OpenGL kit!! -############################################################### - -DESCRIPTION="Mesa3D is a multi-platform GL implementation" -HOMEPAGE="http://www.freedesktop.org/" -SRC_URI="ftp://freedesktop.org/pub/mesa/9.0/MesaLib-9.0.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="scons" -CHECKSUM_MD5="60e557ce407be3732711da484ab3db6c" -MESSAGE="This port only builds with gcc4. Not for general use." -BUILD() -{ - export DEBUG=0 - cd Mesa-9.0 - scons debug=$DEBUG - cd .. - sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.0 ./Mesa-9.0 - echo "There should be a Mesa OptionalBuild package in your home if everything went well!" -} - -LICENSE="MIT" -COPYRIGHT="Copyright (C) 1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/mesa-9.1.0.recipe b/sys-libs/mesa/mesa-9.1.0.recipe deleted file mode 100644 index 812de0624..000000000 --- a/sys-libs/mesa/mesa-9.1.0.recipe +++ /dev/null @@ -1,29 +0,0 @@ -############################################################### -# THIS IS NOT FOR GENERAL USE! -# This builds a buildpackage for the Haiku build system to link -# the OpenGL kit!! -############################################################### - -DESCRIPTION="Mesa3D is a multi-platform GL implementation" -HOMEPAGE="http://www.freedesktop.org/" -SRC_URI="ftp://freedesktop.org/pub/mesa/9.1/MesaLib-9.1.tar.bz2" -REVISION="1" -STATUS_HAIKU="unstable" -DEPEND="scons, llvm >= 3.2" -CHECKSUM_MD5="d3891e02215422e120271d976ff1947e" -MESSAGE="This port only builds with gcc4. Not for general use." -BUILD() -{ - export DEBUG=0 - echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" - echo "This generates a Mesa3D build package for Haiku... not for general use" - echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=" - cd Mesa-9.1 - scons debug=$DEBUG - cd .. - sh $(haikuporter -t)/sys-libs/mesa/buildpackage.sh 9.1.0 ./Mesa-9.1 - echo "There should be a Mesa OptionalBuild package in your home if everything went well!" -} - -LICENSE="MIT" -COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." diff --git a/sys-libs/mesa/patches/mesa-9.0.1.patch b/sys-libs/mesa/patches/mesa-9.0.1.patch deleted file mode 100644 index 457c1ce1b..000000000 --- a/sys-libs/mesa/patches/mesa-9.0.1.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -Naur Mesa-9.0.1/scons/gallium.py Mesa-9.0.1-haiku/scons/gallium.py ---- Mesa-9.0.1/scons/gallium.py 2012-11-09 12:16:31.041680896 -0600 -+++ Mesa-9.0.1-haiku/scons/gallium.py 2012-12-19 16:03:56.564658176 -0600 -@@ -361,8 +361,7 @@ - ccflags += [ - '-mstackrealign', # ensure stack is aligned - '-march=i586', # Haiku target is Pentium -- '-mtune=i686', # use i686 where we can -- '-mmmx' # use mmx math where we can -+ '-mtune=i686' # use i686 where we can - ] - if env['machine'] == 'x86_64': - ccflags += ['-m64'] -diff -Naur Mesa-9.0.1/scons/llvm.py Mesa-9.0.1-haiku/scons/llvm.py ---- Mesa-9.0.1/scons/llvm.py 2012-08-31 18:33:41.041680896 -0500 -+++ Mesa-9.0.1-haiku/scons/llvm.py 2012-12-18 23:05:50.677642240 -0600 -@@ -183,6 +183,9 @@ - if llvm_version >= distutils.version.LooseVersion('3.1'): - components.append('mcjit') - -+ if llvm_version >= distutils.version.LooseVersion('3.2'): -+ env.Append(CXXFLAGS = ('-fno-rtti',)) -+ - env.ParseConfig('llvm-config --libs ' + ' '.join(components)) - env.ParseConfig('llvm-config --ldflags') - except OSError: -diff -Naur Mesa-9.0.1/src/gallium/auxiliary/Makefile Mesa-9.0.1-haiku/src/gallium/auxiliary/Makefile ---- Mesa-9.0.1/src/gallium/auxiliary/Makefile 2012-08-31 18:33:41.050331648 -0500 -+++ Mesa-9.0.1-haiku/src/gallium/auxiliary/Makefile 2012-12-18 23:06:31.179306496 -0600 -@@ -15,6 +15,10 @@ - $(GALLIVM_CPP_SOURCES) - endif - -+# LLVM >= 3.2 requires -fno-rtti -+ifeq ($(shell expr `echo $(LLVM_VERSION) | sed -e 's/\([0-9]\)\.\([0-9]\)/\10\2/g'` \>= 302),1) -+CXXFLAGS += -fno-rtti -+endif - - include ../Makefile.template - -diff -Naur Mesa-9.0.1/src/mesa/SConscript Mesa-9.0.1-haiku/src/mesa/SConscript ---- Mesa-9.0.1/src/mesa/SConscript 2012-11-09 12:16:31.015728640 -0600 -+++ Mesa-9.0.1-haiku/src/mesa/SConscript 2012-12-19 16:32:37.285736960 -0600 -@@ -371,7 +371,7 @@ - # - # Assembly sources - # --if env['gcc'] and env['platform'] not in ('darwin', 'windows'): -+if env['gcc'] and env['platform'] not in ('darwin', 'windows', 'haiku'): - if env['machine'] == 'x86': - env.Append(CPPDEFINES = [ - 'USE_X86_ASM', diff --git a/sys-libs/mesa/patches/mesa-9.0.2.patch b/sys-libs/mesa/patches/mesa-9.0.2.patch deleted file mode 100644 index 541ca854e..000000000 --- a/sys-libs/mesa/patches/mesa-9.0.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur Mesa-9.0.2/scons/llvm.py Mesa-9.0.2-haiku/scons/llvm.py ---- Mesa-9.0.2/scons/llvm.py 2013-01-22 18:09:32.066322432 +0000 -+++ Mesa-9.0.2-haiku/scons/llvm.py 2013-02-17 21:20:51.626262016 +0000 -@@ -183,6 +183,9 @@ - if llvm_version >= distutils.version.LooseVersion('3.1'): - components.append('mcjit') - -+ if llvm_version >= distutils.version.LooseVersion('3.2'): -+ env.Append(CXXFLAGS = ('-fno-rtti',)) -+ - env.ParseConfig('llvm-config --libs ' + ' '.join(components)) - env.ParseConfig('llvm-config --ldflags') - except OSError: -diff -Naur Mesa-9.0.2/src/mesa/SConscript Mesa-9.0.2-haiku/src/mesa/SConscript ---- Mesa-9.0.2/src/mesa/SConscript 2013-01-22 18:09:32.040370176 +0000 -+++ Mesa-9.0.2-haiku/src/mesa/SConscript 2013-02-17 21:20:22.510394368 +0000 -@@ -371,7 +371,7 @@ - # - # Assembly sources - # --if env['gcc'] and env['platform'] not in ('darwin', 'windows'): -+if env['gcc'] and env['platform'] not in ('darwin', 'windows', 'haiku'): - if env['machine'] == 'x86': - env.Append(CPPDEFINES = [ - 'USE_X86_ASM', diff --git a/sys-libs/mesa/patches/mesa-9.0.patch b/sys-libs/mesa/patches/mesa-9.0.patch deleted file mode 100644 index eac5cce5f..000000000 --- a/sys-libs/mesa/patches/mesa-9.0.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur Mesa-9.0/src/mesa/sources.mak Mesa-9.0-haiku/src/mesa/sources.mak ---- Mesa-9.0/src/mesa/sources.mak 2012-08-31 23:36:09.036700160 +0000 -+++ Mesa-9.0-haiku/src/mesa/sources.mak 2012-10-09 13:17:15.991690752 +0000 -@@ -281,7 +281,6 @@ - $(SRCDIR)x86/x86_xform.c \ - $(SRCDIR)x86/3dnow.c \ - $(SRCDIR)x86/sse.c \ -- $(SRCDIR)x86/rtasm/x86sse.c \ - $(SRCDIR)sparc/sparc.c \ - $(SRCDIR)x86-64/x86-64.c - -diff -Naur Mesa-9.0/src/mesa/tnl/t_vertex_sse.c Mesa-9.0-haiku/src/mesa/tnl/t_vertex_sse.c ---- Mesa-9.0/src/mesa/tnl/t_vertex_sse.c 2012-08-31 23:33:41.058458112 +0000 -+++ Mesa-9.0-haiku/src/mesa/tnl/t_vertex_sse.c 2012-10-09 13:20:34.234356736 +0000 -@@ -36,7 +36,7 @@ - - #if defined(USE_SSE_ASM) - --#include "x86/rtasm/x86sse.h" -+#include "rtasm/rtasm_x86sse.h" - #include "x86/common_x86_asm.h" - - -@@ -356,7 +356,7 @@ - struct x86_reg vp0 = x86_make_reg(file_XMM, 1); - struct x86_reg vp1 = x86_make_reg(file_XMM, 2); - struct x86_reg temp2 = x86_make_reg(file_XMM, 3); -- GLubyte *fixup, *label; -+ GLuint fixup, label; - - /* Push a few regs? - */ -@@ -658,7 +658,8 @@ - p.identity = x86_make_reg(file_XMM, 6); - p.chan0 = x86_make_reg(file_XMM, 7); - -- if (!x86_init_func_size(&p.func, MAX_SSE_CODE_SIZE)) { -+ x86_init_func_size(&p.func, MAX_SSE_CODE_SIZE); -+ if (p.func.caps == 0) { - vtx->emit = NULL; - return; - } From 318fe690de6f462b9fb6ae2b81c68025e25ae21f Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 25 Aug 2013 13:27:31 +0200 Subject: [PATCH 426/587] Drop old perl patches --- dev-lang/perl/patches/perl-5.10.0.patch | 659 ------------------------ 1 file changed, 659 deletions(-) delete mode 100644 dev-lang/perl/patches/perl-5.10.0.patch diff --git a/dev-lang/perl/patches/perl-5.10.0.patch b/dev-lang/perl/patches/perl-5.10.0.patch deleted file mode 100644 index 832efc29c..000000000 --- a/dev-lang/perl/patches/perl-5.10.0.patch +++ /dev/null @@ -1,659 +0,0 @@ -diff -urN perl-5.10.0.orig/Configure perl-5.10.0/Configure ---- perl-5.10.0.orig/Configure 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/Configure 2008-10-25 22:26:22.000000000 +0000 -@@ -7864,6 +7864,7 @@ - case "$lddlflags" in - '') case "$osname" in - beos) dflt='-nostart' ;; -+ haiku) dflt='-shared' ;; - hpux) dflt='-b'; - case "$gccversion" in - '') dflt="$dflt +vnocompatwarnings" ;; -@@ -7946,7 +7947,7 @@ - ;; - *) case "$useshrplib" in - '') case "$osname" in -- svr4*|nonstopux|dgux|dynixptx|esix|powerux|beos|cygwin*) -+ svr4*|nonstopux|dgux|dynixptx|esix|powerux|beos|cygwin*|haiku) - dflt=y - also='Building a shared libperl is required for dynamic loading to work on your system.' - ;; -@@ -8109,6 +8110,9 @@ - beos) - # beos doesn't like the default, either. - ;; -+ haiku) -+ # Haiku doesn't like the default, either. -+ ;; - hpux*) - # hpux doesn't like the default, either. - tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\"" -diff -urN perl-5.10.0.orig/MANIFEST perl-5.10.0/MANIFEST ---- perl-5.10.0.orig/MANIFEST 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/MANIFEST 2008-10-28 15:56:53.000000000 +0000 -@@ -664,6 +664,9 @@ - ext/GDBM_File/Makefile.PL GDBM extension makefile writer - ext/GDBM_File/t/gdbm.t See if GDBM_File works - ext/GDBM_File/typemap GDBM extension interface types -+ext/Haiku/Haiku.pm Haiku extension Perl module -+ext/Haiku/Haiku.xs Haiku extension external subroutines -+ext/Haiku/Makefile.PL Haiku extension makefile writer - ext/Hash/Util/Changes Change history of Hash::Util - ext/Hash/Util/FieldHash/Changes Changes for Hash::Util::FieldHash - ext/Hash/Util/FieldHash/FieldHash.xs XS portion -@@ -1272,6 +1275,7 @@ - h2pl/README How to turn .ph files into .pl files - h2pl/tcbreak cbreak test routine using .ph - h2pl/tcbreak2 cbreak test routine using .pl -+haiku/haikuish.h Header for the Haiku port - handy.h Handy definitions - hints/3b1cc Hints for named architecture - hints/3b1.sh Hints for named architecture -@@ -1307,6 +1311,7 @@ - hints/gnuknetbsd.sh Hints for named architecture - hints/gnu.sh Hints for named architecture - hints/greenhills.sh Hints for named architecture -+hints/haiku.sh Hints for named architecture - hints/hpux.sh Hints for named architecture - hints/i386.sh Hints for named architecture - hints/interix.sh Hints for named architecture -@@ -1763,6 +1768,7 @@ - lib/ExtUtils/MM_BeOS.pm MakeMaker methods for BeOS - lib/ExtUtils/MM_Cygwin.pm MakeMaker methods for Cygwin - lib/ExtUtils/MM_DOS.pm MakeMaker methods for DOS -+lib/ExtUtils/MM_Haiku.pm MakeMaker methods for Haiku - lib/ExtUtils/MM_MacOS.pm MakeMaker methods for MacOS - lib/ExtUtils/MM_NW5.pm MakeMaker methods for NetWare - lib/ExtUtils/MM_OS2.pm MakeMaker methods for OS/2 -@@ -3282,6 +3288,7 @@ - README.dos Perl notes for DOS - README.epoc Perl notes for EPOC - README.freebsd Perl notes for FreeBSD -+README.haiku Perl notes for Haiku - README.hpux Perl notes for HP-UX - README.hurd Perl notes for Hurd - README.irix Perl notes for Irix -diff -urN perl-5.10.0.orig/README.haiku perl-5.10.0/README.haiku ---- perl-5.10.0.orig/README.haiku 1970-01-01 00:00:00.000000000 +0000 -+++ perl-5.10.0/README.haiku 2008-10-28 15:33:37.000000000 +0000 -@@ -0,0 +1,64 @@ -+If you read this file _as_is_, just ignore the funny characters you see. -+It is written in the POD format (see pod/perlpod.pod) which is specially -+designed to be readable as is. -+ -+=head1 NAME -+ -+README.haiku - Perl version 5.10+ on Haiku -+ -+=head1 DESCRIPTION -+ -+This file contains instructions how to build Perl for Haiku and lists -+known problems. -+ -+=head1 BUILD AND INSTALL -+ -+The build procedure is completely standard: -+ -+ ./Configure -de -+ make -+ make install -+ -+Make perl executable and create a symlink for libperl: -+ -+ chmod a+x /boot/common/bin/perl -+ cd /boot/common/lib; ln -s perl5/5.10.0/BePC-haiku/CORE/libperl.so . -+ -+Replace C<5.10.0> with your respective version of Perl. -+ -+=head1 KNOWN PROBLEMS -+ -+The following problems are encountered with Haiku revision 28311: -+ -+=over 4 -+ -+=item * -+ -+Perl cannot be compiled with threading support ATM. -+ -+=item * -+ -+The C test fails. More precisely: the subtests -+using datagram sockets fail. Unix datagram sockets aren't implemented in -+Haiku yet. -+ -+=item * -+ -+A subtest of the C test fails. This is due to Haiku -+not implementing C support yet. -+ -+=item * -+ -+The tests C and C -+fail. This is due to bugs in Haiku's network stack implementation. -+ -+=back -+ -+=head1 CONTACT -+ -+For Haiku specific problems contact the HaikuPorts developers: -+http://ports.haiku-files.org/ -+ -+The initial Haiku port was done by Ingo Weinhold . -+ -+Last update: 2008-10-29 -diff -urN perl-5.10.0.orig/ext/Errno/Errno_pm.PL perl-5.10.0/ext/Errno/Errno_pm.PL ---- perl-5.10.0.orig/ext/Errno/Errno_pm.PL 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/ext/Errno/Errno_pm.PL 2008-10-25 20:30:48.000000000 +0000 -@@ -155,7 +155,7 @@ - # we might miss out on compiler-specific ones - $file{"$ENV{GUSI}include:sys:errno.h"} = 1; - -- } elsif ($^O eq 'beos') { -+ } elsif ($^O eq 'beos' || $^O eq 'haiku') { - # hidden in a special place - $file{'/boot/develop/headers/posix/errno.h'} = 1; - -diff -urN perl-5.10.0.orig/ext/Haiku/Haiku.pm perl-5.10.0/ext/Haiku/Haiku.pm ---- perl-5.10.0.orig/ext/Haiku/Haiku.pm 1970-01-01 00:00:00.000000000 +0000 -+++ perl-5.10.0/ext/Haiku/Haiku.pm 2008-10-24 17:09:59.000000000 +0000 -@@ -0,0 +1,54 @@ -+package Haiku; -+ -+BEGIN { -+ use strict; -+ use vars qw|$VERSION $XS_VERSION @ISA @EXPORT @EXPORT_OK|; -+ -+ require Exporter; -+ require DynaLoader; -+ -+ @ISA = qw|Exporter DynaLoader|; -+ $VERSION = '0.34'; -+ $XS_VERSION = $VERSION; -+ $VERSION = eval $VERSION; -+ -+ @EXPORT = qw( -+ ); -+ @EXPORT_OK = qw( -+ ); -+} -+ -+bootstrap Haiku; -+ -+1; -+ -+__END__ -+ -+=head1 NAME -+ -+Haiku - Interfaces to some Haiku API Functions -+ -+=head1 DESCRIPTION -+ -+The Haiku module contains functions to access Haiku APIs. -+ -+=head2 Alphabetical Listing of Haiku Functions -+ -+=over -+ -+=item Haiku::debug_printf(FORMAT,...) -+ -+Similar to printf, but prints to system debug output. -+ -+=item Haiku::debugger(FORMAT,...) -+ -+Drops the program into the debugger. The printf like arguments define the -+debugger message. -+ -+=item Haiku::ktrace_printf(FORMAT,...) -+ -+Similar to printf, but prints to a kernel tracing entry. -+ -+=back -+ -+=cut -diff -urN perl-5.10.0.orig/ext/Haiku/Haiku.xs perl-5.10.0/ext/Haiku/Haiku.xs ---- perl-5.10.0.orig/ext/Haiku/Haiku.xs 1970-01-01 00:00:00.000000000 +0000 -+++ perl-5.10.0/ext/Haiku/Haiku.xs 2008-10-25 20:33:27.000000000 +0000 -@@ -0,0 +1,137 @@ -+#define PERL_NO_GET_CONTEXT -+#include "EXTERN.h" -+#include "perl.h" -+#include "XSUB.h" -+ -+#include -+ -+#include -+ -+static void -+haiku_do_debugger(const char* format,...) -+{ -+ char buffer[1024]; -+ va_list args; -+ va_start(args, format); -+ my_vsnprintf(buffer, sizeof(buffer), format, args); -+ va_end(args); -+ -+ debugger(buffer); -+} -+ -+static void -+haiku_do_debug_printf(pTHX_ register SV *sv, -+ void (*printfFunc)(const char*,...)) -+{ -+ dVAR; -+ -+ if (!sv) -+ return; -+ if (SvTYPE(sv) == SVt_IV && SvIOK(sv)) { -+ assert(!SvGMAGICAL(sv)); -+ if (SvIsUV(sv)) -+ (*printfFunc)("%"UVuf, (UV)SvUVX(sv)); -+ else -+ (*printfFunc)("%"IVdf, (IV)SvIVX(sv)); -+ return; -+ } -+ else { -+ STRLEN len; -+ /* Do this first to trigger any overloading. */ -+ const char *tmps = SvPV_const(sv, len); -+ U8 *tmpbuf = NULL; -+ -+ if (!SvUTF8(sv)) { -+ /* We don't modify the original scalar. */ -+ tmpbuf = bytes_to_utf8((const U8*) tmps, &len); -+ tmps = (char *) tmpbuf; -+ } -+ -+ if (len) -+ (*printfFunc)("%.*s", (int)len, tmps); -+ Safefree(tmpbuf); -+ } -+} -+ -+XS(haiku_debug_printf) -+{ -+ dVAR; -+ dXSARGS; -+ dORIGMARK; -+ SV *sv; -+ -+ if (items < 1) -+ Perl_croak(aTHX_ "usage: Haiku::debug_printf($format,...)"); -+ -+ sv = newSV(0); -+ -+ if (SvTAINTED(MARK[1])) -+ TAINT_PROPER("debug_printf"); -+ do_sprintf(sv, SP - MARK, MARK + 1); -+ -+ haiku_do_debug_printf(sv, &debug_printf); -+ -+ SvREFCNT_dec(sv); -+ SP = ORIGMARK; -+ PUSHs(&PL_sv_yes); -+} -+ -+XS(haiku_ktrace_printf) -+{ -+ dVAR; -+ dXSARGS; -+ dORIGMARK; -+ SV *sv; -+ -+ if (items < 1) -+ Perl_croak(aTHX_ "usage: Haiku::debug_printf($format,...)"); -+ -+ sv = newSV(0); -+ -+ if (SvTAINTED(MARK[1])) -+ TAINT_PROPER("ktrace_printf"); -+ do_sprintf(sv, SP - MARK, MARK + 1); -+ -+ haiku_do_debug_printf(sv, &ktrace_printf); -+ -+ SvREFCNT_dec(sv); -+ SP = ORIGMARK; -+ PUSHs(&PL_sv_yes); -+} -+ -+XS(haiku_debugger) -+{ -+ dVAR; -+ dXSARGS; -+ dORIGMARK; -+ SV *sv; -+ -+ if (items < 1) -+ Perl_croak(aTHX_ "usage: Haiku::debugger($format,...)"); -+ -+ sv = newSV(0); -+ -+ if (SvTAINTED(MARK[1])) -+ TAINT_PROPER("debugger"); -+ do_sprintf(sv, SP - MARK, MARK + 1); -+ -+ haiku_do_debug_printf(sv, &haiku_do_debugger); -+ -+ SvREFCNT_dec(sv); -+ SP = ORIGMARK; -+ PUSHs(&PL_sv_yes); -+} -+ -+MODULE = Haiku PACKAGE = Haiku -+ -+PROTOTYPES: DISABLE -+ -+BOOT: -+{ -+ char *file = __FILE__; -+ -+ newXS("Haiku::debug_printf", haiku_debug_printf, file); -+ newXS("Haiku::ktrace_printf", haiku_ktrace_printf, file); -+ newXS("Haiku::debugger", haiku_debugger, file); -+ XSRETURN_YES; -+} -diff -urN perl-5.10.0.orig/ext/Haiku/Makefile.PL perl-5.10.0/ext/Haiku/Makefile.PL ---- perl-5.10.0.orig/ext/Haiku/Makefile.PL 1970-01-01 00:00:00.000000000 +0000 -+++ perl-5.10.0/ext/Haiku/Makefile.PL 2008-10-24 17:09:59.000000000 +0000 -@@ -0,0 +1,20 @@ -+use 5.006; -+use ExtUtils::MakeMaker; -+ -+unless ($^O eq "haiku") { -+ die "OS unsupported\n"; -+} -+ -+#my @libs; -+#push @libs, '-L/lib/w32api -lole32 -lversion' if $^O eq "cygwin"; -+ -+WriteMakefile( -+ NAME => 'Haiku', -+ VERSION_FROM => 'Haiku.pm', -+# LIBS => \@libs, -+ INSTALLDIRS => ($] >= 5.008004 ? 'perl' : 'site'), -+ NO_META => 1, -+ -+ AUTHOR => 'Ingo Weinhold ', -+ ABSTRACT_FROM => 'Haiku.pm', -+); -diff -urN perl-5.10.0.orig/ext/POSIX/POSIX.xs perl-5.10.0/ext/POSIX/POSIX.xs ---- perl-5.10.0.orig/ext/POSIX/POSIX.xs 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/ext/POSIX/POSIX.xs 2008-10-25 23:00:29.000000000 +0000 -@@ -379,7 +379,7 @@ - * to follow the traditional. However, to make the POSIX - * wait W*() macros to work in BeOS, we need to unbend the - * reality back in place. --jhi */ --#ifdef __BEOS__ -+#if defined(__BEOS__) || defined(__HAIKU__) - # define WMUNGE(x) (((x) & 0xFF00) >> 8 | ((x) & 0x00FF) << 8) - #else - # define WMUNGE(x) (x) -diff -urN perl-5.10.0.orig/ext/Time/HiRes/t/HiRes.t perl-5.10.0/ext/Time/HiRes/t/HiRes.t ---- perl-5.10.0.orig/ext/Time/HiRes/t/HiRes.t 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/ext/Time/HiRes/t/HiRes.t 2008-10-24 17:09:59.000000000 +0000 -@@ -337,7 +337,8 @@ - && defined &Time::HiRes::getitimer - && has_symbol('ITIMER_VIRTUAL') - && $Config{sig_name} =~ m/\bVTALRM\b/ -- && $^O !~ /^(nto)$/) { # nto: QNX 6 has the API but no implementation -+ && $^O !~ /^(nto)$/ # nto: QNX 6 has the API but no implementation -+ && $^O ne 'haiku') { # same for Haiku - for (18..19) { - print "ok $_ # Skip: no virtual interval timers\n"; - } -diff -urN perl-5.10.0.orig/haiku/haikuish.h perl-5.10.0/haiku/haikuish.h ---- perl-5.10.0.orig/haiku/haikuish.h 1970-01-01 00:00:00.000000000 +0000 -+++ perl-5.10.0/haiku/haikuish.h 2008-10-24 17:09:59.000000000 +0000 -@@ -0,0 +1,11 @@ -+#ifndef PERL_HAIKU_HAIKUISH_H -+#define PERL_HAIKU_HAIKUISH_H -+ -+#include "../unixish.h" -+ -+/* We need or else the W* macros aren't defined in perl.h. */ -+ -+#include -+ -+#endif -+ -diff -urN perl-5.10.0.orig/hints/haiku.sh perl-5.10.0/hints/haiku.sh ---- perl-5.10.0.orig/hints/haiku.sh 1970-01-01 00:00:00.000000000 +0000 -+++ perl-5.10.0/hints/haiku.sh 2008-10-28 02:50:53.000000000 +0000 -@@ -0,0 +1,34 @@ -+# Haiku hints file -+# $Id$ -+ -+prefix="/boot/common" -+ -+libpth='/boot/home/config/lib /boot/common/lib /system/lib' -+usrinc='/boot/develop/headers/posix' -+locinc='/boot/home/config/include /boot/common/include /boot/develop/headers' -+ -+libc='/system/lib/libroot.so' -+libs='-lnetwork' -+ -+# Use Haiku's malloc() by default. -+case "$usemymalloc" in -+'') usemymalloc='n' ;; -+esac -+ -+# Haiku generally supports hard links, but the default file system (BFS) -+# doesn't. So better avoid using hard links. -+d_link='undef' -+dont_use_nlink='define' -+ -+# The array syserrlst[] is useless for the most part. -+# Large negative numbers really kind of suck in arrays. -+d_syserrlst='undef' -+ -+# Haiku uses gcc. -+cc="gcc" -+ld='gcc' -+ -+# The runtime loader library path variable is LIBRARY_PATH. -+case "$ldlibpthname" in -+'') ldlibpthname=LIBRARY_PATH ;; -+esac -diff -urN perl-5.10.0.orig/lib/CPANPLUS/Internals/Constants/Report.pm perl-5.10.0/lib/CPANPLUS/Internals/Constants/Report.pm ---- perl-5.10.0.orig/lib/CPANPLUS/Internals/Constants/Report.pm 2007-12-18 10:47:08.000000000 +0000 -+++ perl-5.10.0/lib/CPANPLUS/Internals/Constants/Report.pm 2008-10-24 17:09:59.000000000 +0000 -@@ -29,6 +29,7 @@ - Cygwin => 'cygwin', - Darwin => 'darwin', - EBCDIC => 'os390|os400|posix-bc|vmesa', -+ Haiku => 'haiku', - HPUX => 'hpux', - Linux => 'linux', - MSDOS => 'dos|os2|MSWin32|cygwin', -diff -urN perl-5.10.0.orig/lib/ExtUtils/CBuilder.pm perl-5.10.0/lib/ExtUtils/CBuilder.pm ---- perl-5.10.0.orig/lib/ExtUtils/CBuilder.pm 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/lib/ExtUtils/CBuilder.pm 2008-10-28 02:42:24.000000000 +0000 -@@ -36,6 +36,7 @@ - sunos Unix - cygwin Unix - os2 Unix -+ haiku Unix - - dos Windows - MSWin32 Windows -diff -urN perl-5.10.0.orig/lib/ExtUtils/MM.pm perl-5.10.0/lib/ExtUtils/MM.pm ---- perl-5.10.0.orig/lib/ExtUtils/MM.pm 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/lib/ExtUtils/MM.pm 2008-10-24 17:09:59.000000000 +0000 -@@ -69,6 +69,7 @@ - $Is{VOS} = $^O eq 'vos'; - $Is{QNX} = $^O eq 'qnx'; - $Is{AIX} = $^O eq 'aix'; -+$Is{Haiku} = $^O eq 'haiku'; - - $Is{Unix} = !grep { $_ } values %Is; - -diff -urN perl-5.10.0.orig/lib/ExtUtils/MM_Haiku.pm perl-5.10.0/lib/ExtUtils/MM_Haiku.pm ---- perl-5.10.0.orig/lib/ExtUtils/MM_Haiku.pm 1970-01-01 00:00:00.000000000 +0000 -+++ perl-5.10.0/lib/ExtUtils/MM_Haiku.pm 2008-10-24 17:09:59.000000000 +0000 -@@ -0,0 +1,62 @@ -+package ExtUtils::MM_Haiku; -+ -+use strict; -+ -+=head1 NAME -+ -+ExtUtils::MM_Haiku - methods to override UN*X behaviour in ExtUtils::MakeMaker -+ -+=head1 SYNOPSIS -+ -+ use ExtUtils::MM_Haiku; # Done internally by ExtUtils::MakeMaker if needed -+ -+=head1 DESCRIPTION -+ -+See ExtUtils::MM_Unix for a documentation of the methods provided -+there. This package overrides the implementation of these methods, not -+the semantics. -+ -+=over 4 -+ -+=cut -+ -+use ExtUtils::MakeMaker::Config; -+use File::Spec; -+require ExtUtils::MM_Any; -+require ExtUtils::MM_Unix; -+ -+use vars qw(@ISA $VERSION); -+@ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -+$VERSION = '6.42'; -+ -+ -+=item os_flavor -+ -+Haiku is Haiku. -+ -+=cut -+ -+sub os_flavor { -+ return('Haiku'); -+} -+ -+=item init_linker -+ -+libperl.a equivalent to be linked to dynamic extensions. -+ -+=cut -+ -+sub init_linker { -+ my($self) = shift; -+ -+ $self->{PERL_ARCHIVE} ||= -+ File::Spec->catdir('$(PERL_INC)',$Config{libperl}); -+ $self->{PERL_ARCHIVE_AFTER} ||= ''; -+ $self->{EXPORT_LIST} ||= ''; -+} -+ -+=back -+ -+1; -+__END__ -+ -diff -urN perl-5.10.0.orig/lib/Module/Build.pm perl-5.10.0/lib/Module/Build.pm ---- perl-5.10.0.orig/lib/Module/Build.pm 2007-12-18 10:47:07.000000000 +0000 -+++ perl-5.10.0/lib/Module/Build.pm 2008-10-24 17:09:59.000000000 +0000 -@@ -30,6 +30,7 @@ - dynixptx Unix - freebsd Unix - linux Unix -+ haiku Unix - hpux Unix - irix Unix - darwin Unix -diff -urN perl-5.10.0.orig/perl.h perl-5.10.0/perl.h ---- perl-5.10.0.orig/perl.h 2007-12-18 10:47:08.000000000 +0000 -+++ perl-5.10.0/perl.h 2008-10-25 20:42:31.000000000 +0000 -@@ -1520,15 +1520,15 @@ - # define S_IRWXO (S_IROTH|S_IWOTH|S_IXOTH) - #endif - --/* BeOS 5.0 seems to define S_IREAD and S_IWRITE in -+/* BeOS 5.0 and Haiku R1 seem to define S_IREAD and S_IWRITE in - * which would get included through , but that is 3000 - * lines in the future. --jhi */ - --#if !defined(S_IREAD) && !defined(__BEOS__) -+#if !defined(S_IREAD) && !(defined(__BEOS__) || defined(__HAIKU__)) - # define S_IREAD S_IRUSR - #endif - --#if !defined(S_IWRITE) && !defined(__BEOS__) -+#if !defined(S_IWRITE) && !(defined(__BEOS__) || defined(__HAIKU__)) - # define S_IWRITE S_IWUSR - #endif - -@@ -2551,7 +2551,10 @@ - # define ISHISH "macos classic" - #endif - --#if defined(__BEOS__) -+#if defined(__HAIKU__) -+# include "haiku/haikuish.h" -+# define ISHISH "haiku" -+#elif defined(__BEOS__) - # include "beos/beosish.h" - # define ISHISH "beos" - #endif -@@ -5609,9 +5612,10 @@ - #if O_TEXT != O_BINARY - /* If you have different O_TEXT and O_BINARY and you are a CLRF shop, - * that is, you are somehow DOSish. */ --# if defined(__BEOS__) || defined(__VOS__) || defined(__CYGWIN__) -- /* BeOS has O_TEXT != O_BINARY but O_TEXT and O_BINARY have no effect; -- * BeOS is always UNIXoid (LF), not DOSish (CRLF). */ -+# if defined(__BEOS__) || defined(__HAIKU__) || defined(__VOS__) || \ -+ defined(__CYGWIN__) -+ /* BeOS/Haiku has O_TEXT != O_BINARY but O_TEXT and O_BINARY have no effect; -+ * BeOS/Haiku is always UNIXoid (LF), not DOSish (CRLF). */ - /* VOS has O_TEXT != O_BINARY, and they have effect, - * but VOS always uses LF, never CRLF. */ - /* If you have O_TEXT different from your O_BINARY but you still are -diff -urN perl-5.10.0.orig/pod/perlport.pod perl-5.10.0/pod/perlport.pod ---- perl-5.10.0.orig/pod/perlport.pod 2007-12-18 10:47:08.000000000 +0000 -+++ perl-5.10.0/pod/perlport.pod 2008-10-28 02:37:44.000000000 +0000 -@@ -815,6 +815,7 @@ - dgux dgux AViiON-dgux - DYNIX/ptx dynixptx i386-dynixptx - FreeBSD freebsd freebsd-i386 -+ Haiku haiku BePC-haiku - Linux linux arm-linux - Linux linux i386-linux - Linux linux i586-linux -diff -urN perl-5.10.0.orig/t/io/fs.t perl-5.10.0/t/io/fs.t ---- perl-5.10.0.orig/t/io/fs.t 2007-12-18 10:47:08.000000000 +0000 -+++ perl-5.10.0/t/io/fs.t 2008-10-24 17:09:59.000000000 +0000 -@@ -275,7 +275,7 @@ - is( $atime, 500000001, 'atime' ); - is( $mtime, 500000000 + $delta, 'mtime' ); - } -- elsif ($^O eq 'beos') { -+ elsif ($^O eq 'beos' || $^O eq 'haiku') { - SKIP: { - skip "atime not updated", 1; - } -diff -urN perl-5.10.1/Configure perl-5.10.1-haiku/Configure ---- perl-5.10.1/Configure 2009-08-18 19:03:53.024117248 +0000 -+++ perl-5.10.1-haiku/Configure 2012-09-07 13:57:19.000000000 +0000 -@@ -5139,18 +5139,6 @@ - eval $checkccflag - ;; - esac -- -- # on x86_64 (at least) we require an extra library (libssp) in the -- # link command line. This library is not named, so I infer that it is -- # an implementation detail that may change. Hence the safest approach -- # is to add the flag to the flags passed to the compiler at link time, -- # as that way the compiler can do the right implementation dependant -- # thing. (NWC) -- case "$gccversion" in -- ?*) set stack-protector -fstack-protector -- eval $checkccflag -- ;; -- esac - ;; - esac - From 674ffc538846f2dda090e286aa185bbf0625f457 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 25 Aug 2013 13:28:48 +0200 Subject: [PATCH 427/587] Drop old tar recipes and patches --- app-arch/tar/patches/tar-1.22.patch | 11 -------- app-arch/tar/patches/tar-1.23.patch | 11 -------- app-arch/tar/tar-1.22.recipe | 23 --------------- app-arch/tar/tar-1.23.recipe | 21 -------------- app-arch/tar/tar-1.25.recipe | 44 ----------------------------- 5 files changed, 110 deletions(-) delete mode 100644 app-arch/tar/patches/tar-1.22.patch delete mode 100644 app-arch/tar/patches/tar-1.23.patch delete mode 100644 app-arch/tar/tar-1.22.recipe delete mode 100644 app-arch/tar/tar-1.23.recipe delete mode 100644 app-arch/tar/tar-1.25.recipe diff --git a/app-arch/tar/patches/tar-1.22.patch b/app-arch/tar/patches/tar-1.22.patch deleted file mode 100644 index cf426cb3b..000000000 --- a/app-arch/tar/patches/tar-1.22.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up tar-1.22/lib/string.in.h.orig tar-1.22/lib/string.in.h ---- tar-1.22/lib/string.in.h.orig 2009-12-29 20:13:44.000000000 -0700 -+++ tar-1.22/lib/string.in.h 2009-12-29 20:14:22.000000000 -0700 -@@ -39,6 +39,7 @@ - /* The attribute __pure__ was added in gcc 2.96. */ - # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) - # define __pure__ /* empty */ -+# define restrict __restrict - # endif - #endif - diff --git a/app-arch/tar/patches/tar-1.23.patch b/app-arch/tar/patches/tar-1.23.patch deleted file mode 100644 index d9e7d909d..000000000 --- a/app-arch/tar/patches/tar-1.23.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up tar-1.22/lib/string.in.h.orig tar-1.22/lib/string.in.h ---- tar-1.23/gnu/string.in.h.orig 2009-12-29 20:13:44.000000000 -0700 -+++ tar-1.23/gnu/string.in.h 2009-12-29 20:14:22.000000000 -0700 -@@ -39,6 +39,7 @@ - /* The attribute __pure__ was added in gcc 2.96. */ - # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) - # define __pure__ /* empty */ -+# define restrict __restrict - # endif - #endif - diff --git a/app-arch/tar/tar-1.22.recipe b/app-arch/tar/tar-1.22.recipe deleted file mode 100644 index e719a43bc..000000000 --- a/app-arch/tar/tar-1.22.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="tar saves and restores files from a tape or disk archive." -HOMEPAGE="http://www.gnu.org/software/tar/" -SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.22.tar.bz2" -CHECKSUM_MD5="07fa517027f426bb80f5f5ff91b63585" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd tar-1.22 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --libexecdir=`finddir B_COMMON_BIN_DIRECTORY` - make -} - -INSTALL() -{ - cd tar-1.22 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1990-2010 Free Software Foundation, Inc." diff --git a/app-arch/tar/tar-1.23.recipe b/app-arch/tar/tar-1.23.recipe deleted file mode 100644 index c1942e654..000000000 --- a/app-arch/tar/tar-1.23.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="tar saves and restores files from a tape or disk archive." -HOMEPAGE="http://www.gnu.org/software/tar/" -SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.23.tar.bz2" -CHECKSUM_MD5="41e2ca4b924ec7860e51b43ad06cdb7e" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD() -{ - cd tar-1.23 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd tar-1.23 - make install -} -LICENSE="GNU GPL v3" -COPYRIGHT="1990-2010 Free Software Foundation, Inc." diff --git a/app-arch/tar/tar-1.25.recipe b/app-arch/tar/tar-1.25.recipe deleted file mode 100644 index 1a16cafd0..000000000 --- a/app-arch/tar/tar-1.25.recipe +++ /dev/null @@ -1,44 +0,0 @@ -DESCRIPTION="tar saves and restores files from a tape or disk archive." -HOMEPAGE="http://www.gnu.org/software/tar/" -SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.25.tar.bz2" -CHECKSUM_MD5="6e497f861c77bbba2f7da4e10270995b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/gnulib = 9999" -BUILD() -{ - cd tar-1.25 - if [ ! -e `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999 ] ; then - echo "gnulib not found, so updating it now..." - haikuporter -i gnulib - fi - echo "Copying gnulib to tar work directory..." - cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/fseek* gnu/ - cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/iswblank* gnu/ - cp -a `haikuporter -t`/dev-libs/gnulib/work/gnulib-9999/lib/fcntl* gnu/ - sed -i 's/@GNULIB_NONBLOCKING@/0/' gnu/fcntl* - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --infodir=$COMMON_DOCS/info \ - --libexecdir=`finddir B_COMMON_LIB_DIRECTORY`/exec \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --disable-nls \ - LDFLAGS="-lnetwork" \ - FORCE_UNSAFE_CONFIGURE=1 - make -} - -INSTALL() -{ - cd tar-1.25 - make install -} - -TEST() -{ - cd tar-1.25 - make check -} - -LICENSE="GNU GPL v3" -COPYRIGHT="1990-2010 Free Software Foundation, Inc." From 27d367d4281abaa8d5deea49c6464bfc1d2a470c Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 25 Aug 2013 13:33:05 +0200 Subject: [PATCH 428/587] Add PATCHES where missing in recipes. --- app-arch/tar/tar-1.26.recipe | 2 ++ dev-lang/perl/perl-5.10.1.recipe | 2 ++ sys-apps/sed/sed-4.2.1.recipe | 2 ++ sys-apps/texinfo/texinfo-4.13a.recipe | 2 ++ sys-devel/bison/bison-2.4.3.recipe | 2 ++ sys-devel/flex/flex-2.5.35.recipe | 2 ++ sys-devel/make/make-3.82.recipe | 2 ++ sys-libs/mesa/mesa-9.1.1.recipe | 2 ++ 8 files changed, 16 insertions(+) diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index 99dff6c30..e44d305c6 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -19,6 +19,8 @@ CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519" REVISION="6" ARCHITECTURES="x86_gcc2 x86" +PATCHES="tar-1.26.patch" + PROVIDES=" tar = $portVersion compat >= 1 cmd:tar = $portVersion compat >= 1 diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe index 83609ed8e..53886dfc9 100644 --- a/dev-lang/perl/perl-5.10.1.recipe +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -23,6 +23,8 @@ CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" REVISION="5" ARCHITECTURES="x86_gcc2 x86" +PATCHES="perl-5.10.1.patch" + PROVIDES=" perl = $portVersion compat >= 5 cmd:a2p = $portVersion compat >= 5 diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe index 503a9dc89..d1d6e94cd 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -17,6 +17,8 @@ CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86" REVISION="6" ARCHITECTURES="x86_gcc2 x86" +PATCHES="sed-4.2.1.patchset" + PROVIDES=" sed = $portVersion compat >= 4 cmd:sed = $portVersion compat >= 4 diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe index ca7fac936..2e7122525 100644 --- a/sys-apps/texinfo/texinfo-4.13a.recipe +++ b/sys-apps/texinfo/texinfo-4.13a.recipe @@ -8,6 +8,8 @@ CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb" REVISION="7" ARCHITECTURES="x86_gcc2 x86" +PATCHES="texinfo-4.13a.patch" + PROVIDES=" texinfo = $portVersion compat >= 4.13 cmd:info = $portVersion compat >= 4.13 diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe index d84c01167..f6f13ffa6 100644 --- a/sys-devel/bison/bison-2.4.3.recipe +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -19,6 +19,8 @@ CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73" REVISION="5" ARCHITECTURES="x86_gcc2 x86" +PATCHES="bison-2.4.3.patch" + PROVIDES=" bison = $portVersion compat >= 2.4 cmd:bison = $portVersion compat >= 2.4 diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index 353397c89..cda89b7f3 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -11,6 +11,8 @@ CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57" REVISION="6" ARCHITECTURES="x86_gcc2 x86" +PATCHES="flex-2.5.35.patch" + PROVIDES=" flex = $portVersion compat >= 2.5 cmd:flex = $portVersion compat >= 2.5 diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index 66237e93c..1465ccac9 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -17,6 +17,8 @@ CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f" REVISION="5" ARCHITECTURES="x86_gcc2 x86" +PATCHES="make-3.82.patch" + PROVIDES=" make = $portVersion compat >= 3.82 cmd:make = $portVersion compat >= 3.82 diff --git a/sys-libs/mesa/mesa-9.1.1.recipe b/sys-libs/mesa/mesa-9.1.1.recipe index 400a824d9..ff3ca11bd 100644 --- a/sys-libs/mesa/mesa-9.1.1.recipe +++ b/sys-libs/mesa/mesa-9.1.1.recipe @@ -24,6 +24,8 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then fi SECONDARY_ARCHITECTURES="x86" +PATCHES="mesa-9.1.1.patch" + PROVIDES=" mesa$secondaryArchSuffix = $portVersion " From 06bd201d940d3b642358e397434432eb9667761a Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 24 Aug 2013 11:52:47 -0700 Subject: [PATCH 429/587] Changed gmp-5.1.1.recipe to actually build, may need some further work. WIP version of taglib-1.7.2, but it fails to find cmake? --- dev-libs/gmp/gmp-5.1.1.recipe | 50 +++++++++++++++++++++------ media-libs/taglib/taglib-1.7.2.recipe | 6 ++-- 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe index 7fc727a98..8edc663a3 100644 --- a/dev-libs/gmp/gmp-5.1.1.recipe +++ b/dev-libs/gmp/gmp-5.1.1.recipe @@ -1,33 +1,63 @@ +SUMMARY="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" +LICENSE="GNU GPL v3 + GNU LGPL v3" +COPYRIGHT="1991-2013 Free Software Foundation, Inc." REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="x86 x86_gcc2" +PROVIDES="cmp:gmp = $portVersion compat >= 5.1 + lib:libgmp + lib:libgmp = 10 + lib:libgmp = 10.1.1" +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:libtool + cmd:autoconf + cmd:automake + cmd:make + " + +SOURE_DIR="$portVersionedName" + BUILD() { - cd gmp-5.1.1 libtoolize --force --copy --install aclocal autoconf automake --add-missing - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd gmp-5.1.1 make install + + # prepare devel/lib + prepareInstalledDevelLibs libgmp + + # devel package + packageEntries devel \ + $developDir } TEST() { - cd gmp-5.1.1 make check } -LICENSE="GNU GPL v3 - GNU LGPL v3" -COPYRIGHT="1991-2013 Free Software Foundation, Inc." +# ----- devel package + +PROVIDES_devel=" + libgmp = $portVersion + devel:libgmp = 10.1.1 compat >= 0 + " +REQUIRES_devel=" + libgmp == $portVersion base + " + diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe index 16898ab15..fe9a3cb83 100644 --- a/media-libs/taglib/taglib-1.7.2.recipe +++ b/media-libs/taglib/taglib-1.7.2.recipe @@ -1,14 +1,14 @@ 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.8.tar.gz" -CHECKSUM_MD5="dcb8bd1b756f2843e18b1fdf3aaeee15" +SRC_URI="http://taglib.github.io/releases/taglib-1.7.2.tar.gz" +CHECKSUM_MD5="b0a9e797d3833fb933c7c3176de3d720" COPYRIGHT="2002-2012 Scott Wheeler" LICENSE="GNU LGPL v2 MPL v1.1 " REVISION="1" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES=" taglib = $portVersion From 34823af33c808cbfb2e378a4ecf2585e6f0ad5d3 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 25 Aug 2013 19:25:29 +0200 Subject: [PATCH 430/587] Handle sshd_keymaker.sh via ADDITIONAL_FILES --- net-misc/openssh/{ => additional-files}/sshd_keymaker.sh | 0 net-misc/openssh/openssh-5.8p2.recipe | 4 +++- net-misc/openssh/openssh-6.0p1.recipe | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) rename net-misc/openssh/{ => additional-files}/sshd_keymaker.sh (100%) diff --git a/net-misc/openssh/sshd_keymaker.sh b/net-misc/openssh/additional-files/sshd_keymaker.sh similarity index 100% rename from net-misc/openssh/sshd_keymaker.sh rename to net-misc/openssh/additional-files/sshd_keymaker.sh diff --git a/net-misc/openssh/openssh-5.8p2.recipe b/net-misc/openssh/openssh-5.8p2.recipe index c7c14d203..8b0c28a9f 100644 --- a/net-misc/openssh/openssh-5.8p2.recipe +++ b/net-misc/openssh/openssh-5.8p2.recipe @@ -12,6 +12,8 @@ ARCHITECTURES="x86_gcc2 ?x86" PATCHES="openssh-5.8p2.patch" +ADDITIONAL_FILES="sshd_keymaker.sh" + PROVIDES=" openssh = $portVersion compat >= 5 cmd:scp = $portVersion compat >= 5 @@ -80,7 +82,7 @@ INSTALL() make install-nokeys postInstallDir=$prefix/boot/post_install mkdir -p $postInstallDir - cp -f $portDir/sshd_keymaker.sh $postInstallDir + cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir } TEST() diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index b128a0192..295d66ed5 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -9,6 +9,8 @@ ARCHITECTURES="x86_gcc2 x86" PATCHES="openssh-6.0p1.patch" +ADDITIONAL_FILES="sshd_keymaker.sh" + PROVIDES=" openssh = $portVersion compat >= 5 cmd:scp = $portVersion compat >= 5 @@ -106,7 +108,7 @@ INSTALL() { make install-nokeys mkdir -p $postInstallDir - cp -f $portDir/sshd_keymaker.sh $postInstallDir + cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir } TEST() From e03bc5fed991057c8dc0ba6168aaa0e559289bfa Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 25 Aug 2013 19:31:49 +0200 Subject: [PATCH 431/587] Move dos2unix source files into "sources" folder --- app-text/dos2unix/{ => sources}/DOS2UNIX.C | 0 app-text/dos2unix/{ => sources}/UNIX2DOS.C | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename app-text/dos2unix/{ => sources}/DOS2UNIX.C (100%) rename app-text/dos2unix/{ => sources}/UNIX2DOS.C (100%) diff --git a/app-text/dos2unix/DOS2UNIX.C b/app-text/dos2unix/sources/DOS2UNIX.C similarity index 100% rename from app-text/dos2unix/DOS2UNIX.C rename to app-text/dos2unix/sources/DOS2UNIX.C diff --git a/app-text/dos2unix/UNIX2DOS.C b/app-text/dos2unix/sources/UNIX2DOS.C similarity index 100% rename from app-text/dos2unix/UNIX2DOS.C rename to app-text/dos2unix/sources/UNIX2DOS.C From 096da200da746bcfeb494951a8c4a09c742fbe0d Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 25 Aug 2013 22:29:42 +0200 Subject: [PATCH 432/587] Handle InitialSettings of vision by ADDITIONAL_FILES --- .../vision/{ => additional-files}/InitialSettings | Bin haiku-apps/vision/vision-0.9.7.r944.recipe | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) rename haiku-apps/vision/{ => additional-files}/InitialSettings (100%) diff --git a/haiku-apps/vision/InitialSettings b/haiku-apps/vision/additional-files/InitialSettings similarity index 100% rename from haiku-apps/vision/InitialSettings rename to haiku-apps/vision/additional-files/InitialSettings diff --git a/haiku-apps/vision/vision-0.9.7.r944.recipe b/haiku-apps/vision/vision-0.9.7.r944.recipe index 3791624ca..af2a02268 100644 --- a/haiku-apps/vision/vision-0.9.7.r944.recipe +++ b/haiku-apps/vision/vision-0.9.7.r944.recipe @@ -11,6 +11,8 @@ if [ $targetArchitecture != x86_gcc2 ]; then PATCHES="vision-0.9.7-gcc4.patch" fi +ADDITIONAL_FILES="InitialSettings" + PROVIDES=" vision = $portVersion " @@ -44,7 +46,7 @@ INSTALL() mkdir -p $visionDir cp Vision $visionDir - cp -a $portDir/InitialSettings $visionDir + cp -a $portDir/additional-files/InitialSettings $visionDir cd data cp -a * $visionDir From aec3652b011664a609d7c3d78c2df706f5d1778f Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 25 Aug 2013 23:47:39 +0200 Subject: [PATCH 433/587] Cleanup: fix names of recipe and patch files. * this fixes the wrong recipe names introduced by myself in #d525fee * adjust patch names to match corresponding recipes * additionally: create 'additional-files' folders as hint to some ports that do not have a proper recipe yet --- app-admin/pwgen/pwgen-2.06.sh | 26 - app-arch/fastjar/fastjar-0.97.sh | 38 - app-arch/gzip/gzip-1.3.12.sh | 39 - .../gzip-1.3.12-downstream.patch | 0 .../{ffsb-6.0_rc2 => ffsb-6.0_rc2.recipe} | 0 .../jed/{jed-0.99_19 => jed-0.99_19.recipe} | 0 .../joe/{joe-3.8_hg => joe-3.8_hg.recipe} | 0 ...ev-cvs.patch => qemacs-0.3.2dev_cvs.patch} | 0 ....3.2dev_cvs => qemacs-0.3.2dev_cvs.recipe} | 0 ...ym-0.9.11_cvs => aranym-0.9.11_cvs.recipe} | 0 ...utron-0.9_svn => oricutron-0.9_svn.recipe} | 0 ...arpc-0.5.0_cvs => pearpc-0.5.0_cvs.recipe} | 0 ...fish-1.23.1_git => fish-1.23.1_git.recipe} | 0 ...1.23.1-git.patch => fish-1.23.1_git.patch} | 0 ...k_tools-0.2.1 => ebook_tools-0.2.1.recipe} | 0 ...eract-3.x_svn => tesseract-3.x_svn.recipe} | 0 ...mm_common-0.9.2 => mm_common-0.9.2.recipe} | 0 ...-2.9.0-git.patch => redis-2.9.0_git.patch} | 0 ...redis-2.9.0_git => redis-2.9.0_git.recipe} | 0 ...12.10.patch => u_boot_tools-2012.10.patch} | 0 ...ls-2012.10 => u_boot_tools-2012.10.recipe} | 0 ...asspath-0.98 => gnu_classpath-0.98.recipe} | 0 ...th-0.98.patch => gnu_classpath-0.98.patch} | 0 .../{dmd_bin-1.064 => dmd_bin-1.064.recipe} | 0 ...md-bin-1.064.patch => dmd_bin-1.064.patch} | 0 dev-lang/lua/lua-5.1.4_3 | 23 - dev-lang/lua/patches/lua-5.1.4-3.patch | 276 ------ dev-lang/lua/patches/lua-5.1.4.patch | 212 +++- ...-2.03.01-haiku.diff => nasm-2.03.01.patch} | 0 ...log-6.0.2.patch => swi_prolog-6.0.2.patch} | 0 ...log-6.2.0.patch => swi_prolog-6.2.0.patch} | 0 ...i_prolog-6.0.2 => swi_prolog-6.0.2.recipe} | 0 ...i_prolog-6.2.0 => swi_prolog-6.2.0.recipe} | 0 ...-7.2_alpha6 => boehm_gc-7.2_alpha6.recipe} | 0 .../{boehm_gc-7.2d => boehm_gc-7.2d.recipe} | 0 ...alpha6.patch => boehm_gc-7.2_alpha6.patch} | 0 ...oehm-gc-7.2d.patch => boehm_gc-7.2d.patch} | 0 .../json_c/{json_c-0.9 => json_c-0.9.recipe} | 0 ...pg_error-1.10 => libgpg_error-1.10.recipe} | 0 ...bgpg_error-1.7 => libgpg_error-1.7.recipe} | 0 ...ror-1.10.patch => libgpg_error-1.10.patch} | 0 ...error-1.7.patch => libgpg_error-1.7.patch} | 0 ...tubs-0.3 => libpthread_stubs-0.3.2.recipe} | 0 ...tubs-0.3.2 => libpthread_stubs-0.3.recipe} | 0 ....1_HEAD => libwapcaplet-0.1.1_HEAD.recipe} | 0 ...edir-1.1.1 => libxdg_basedir-1.1.1.recipe} | 0 ...1.1.1.patch => libxdg_basedir-1.1.1.patch} | 0 dev-libs/mpfr/mpfr-3.0.0_7047 | 27 - .../{xerces_c-3.1.1 => xerces_c-3.1.1.recipe} | 0 ...XML_Parser-2.36 => XML_Parser-2.36.recipe} | 0 .../cnf/{cnf-1.0_git => cnf-1.0_git.recipe} | 0 ...chart-1.39_bzr => pychart-1.39_bzr.recipe} | 0 dev-qt/qtcore/qtcore-4.8.x_git | 26 - ...3 => abi_compliance_checker-1.98.3.recipe} | 0 .../{automoc-4_git => automoc-4_git.recipe} | 0 dev-util/cmake/cmake-2.6.4.recipe | 21 - dev-util/cmake/cmake-2.8.0.recipe | 21 - dev-util/cmake/cmake-2.8.1.recipe | 21 - dev-util/cmake/cmake-2.8.2.recipe | 21 - dev-util/cmake/cmake-2.8.3.recipe | 21 - dev-util/cmake/cmake-2.8.4.recipe | 30 - dev-util/cmake/cmake-2.8_git | 36 - dev-util/cmake/patches/cmake-2.6.0-haiku.diff | 300 ------ .../cmake/patches/cmake-2.6.1-haiku-2.diff | 474 --------- dev-util/cmake/patches/cmake-2.6.1-haiku.diff | 449 --------- dev-util/cmake/patches/cmake-2.8-git.patch | 229 ----- dev-util/cmake/patches/cmake-2.8.1.patch | 14 - dev-util/cmake/patches/cmake-2.8.2.patch | 14 - dev-util/cmake/patches/cmake-2.8.3.patch | 116 --- dev-util/cmake/patches/cmake-2.8.4.patch | 116 --- .../{gtk_doc-1.15 => gtk_doc-1.15.recipe} | 0 ...{gtk-doc-1.15.patch => gtk_doc-1.15.patch} | 0 dev-vcs/fossil/fossil-1.22_fossil | 26 - ...-1.7.0_rc2 => subversion-1.7.0_rc2.recipe} | 0 dev-vcs/subversion/subversion-1.7.xx_svn | 30 - ...dosbox-0.74_svn => dosbox-0.74_svn.recipe} | 0 .../dosbox-0.74_svn.patch} | 0 .../{ => patches}/freesci-0.6.4_beos.patch | 0 ...s-0.2_157 => numptyphysics-0.2_157.recipe} | 0 ...e_common-2.28 => gnome_common-2.28.recipe} | 0 haiku-apps/armyknife/armyknife-999_git | 21 - ...wser-1.1.1_cvs => bowser-1.1.1_cvs.recipe} | 0 haiku-apps/burnitnow/burnitnow-2_svn | 26 - ...w-beta5_svn => burnitnow-beta5_svn.recipe} | 0 haiku-apps/burnitnow/burnitnow-beta6_git | 35 - ...a5-svn.patch => burnitnow-beta5_svn.patch} | 0 ....HEAD => caya_gpl_protocols-0.HEAD.recipe} | 0 ...tocols-19 => caya_gpl_protocols-19.recipe} | 0 ...tocols-24 => caya_gpl_protocols-24.recipe} | 0 ...tocols-35 => caya_gpl_protocols-35.recipe} | 0 ...tocols-36 => caya_gpl_protocols-36.recipe} | 0 ....patch => caya_gpl_protocols-0.HEAD.patch} | 0 .../{friss-0.7_svn => friss-0.7_svn.recipe} | 0 haiku-apps/haikutwitter/haikutwitter-1.0_svn | 20 - .../{hare-beta1_git => hare-beta1_git.recipe} | 0 ...open_sum_it-108 => open_sum_it-108.recipe} | 0 .../{paladin-1.3_hg => paladin-1.3_hg.recipe} | 0 ...anager-0_svn => thememanager-0_svn.recipe} | 0 ...es_fonts-1.1 => arabeyes_fonts-1.1.recipe} | 0 ...ier_prime-1.0 => courier_prime-1.0.recipe} | 0 ...farsi_fonts-0.4 => farsi_fonts-0.4.recipe} | 0 ...kacst_fonts-5.0 => kacst_fonts-5.0.recipe} | 0 ...ef_font-1.001 => lateef_font-1.001.recipe} | 0 ...> liberation_fonts-1.06.0.20100721.recipe} | 0 ...leeq-1.02 => nafees_nastaleeq-1.02.recipe} | 0 ...fees_riqa-1.00 => nafees_riqa-1.00.recipe} | 0 ...t-1.005 => scheherazade_font-1.005.recipe} | 0 ...es_fonts-2.0 => x_series_fonts-2.0.recipe} | 0 ...k-6.6.1_10 => imagemagick-6.6.1_10.recipe} | 0 ....0.21.patch => sane_backends-1.0.21.patch} | 0 ...-0.9.2x_cvs => tuxpaint-0.9.2x_cvs.recipe} | 0 ...gro-4.4.x_svn => allegro-4.4.x_svn.recipe} | 0 .../patches/allegro-4.3.10-haiku-1.diff | 736 -------------- .../patches/allegro-4.3.10-haiku-2.diff | 657 ------------- .../patches/allegro-4.3.10-haiku-3.diff | 325 ------ .../patches/allegro-4.3.10-haiku-4.diff | 792 --------------- .../patches/allegro-4.3.10-haiku-5.diff | 792 --------------- .../allegro/patches/allegro-4.3.10-lm.diff | 190 ---- .../patches/allegro-4.3.10plus-haiku.diff | 922 ------------------ ....4.x-svn.patch => allegro-4.4.x_svn.patch} | 0 ...type_with_subpixel_rendering-2.4.9.recipe} | 0 ...4.9_with_subpixel_rendering_enabled.patch} | 0 media-libs/ftgl/ftgl-2.1-svn | 27 - ...ladspa_sdk-1.13 => ladspa_sdk-1.13.recipe} | 0 media-libs/libnsbmp/libnsbmp_0.0.3-HEAD | 21 - .../libsdl/{ => additional-files}/sdl-config | 0 .../{libsdl-1.2_hg => libsdl-1.2_hg.recipe} | 0 ...libsdl-1.3_gsoc => libsdl-1.3_gsoc.recipe} | 0 .../{libsdl-2.0_hg => libsdl-2.0_hg.recipe} | 0 ....0_hg_cmake => libsdl-2.0_hg_cmake.recipe} | 0 ...ibsdl-1.2-hg.patch => libsdl-1.2_hg.patch} | 0 ...vgtiny-0_HEAD => libsvgtiny-0_HEAD.recipe} | 0 ...ebm-0.9.2_git => libwebm-0.9.2_git.recipe} | 0 ...ebp-0.1.2_git => libwebp-0.1.2_git.recipe} | 0 media-libs/openal/openal-1.12_git | 25 - ...-gfx-2.0.20.patch => sdl_gfx-2.0.20.patch} | 0 .../{sdl_gfx-2.0.20 => sdl_gfx-2.0.20.recipe} | 0 .../{sdl_gfx-2.0.22 => sdl_gfx-2.0.22.recipe} | 0 .../{sdl_gfx-2.0.23 => sdl_gfx-2.0.23.recipe} | 0 .../sdl-image.OptionalPackageDescription | 5 - ...l_image-1.2.10 => sdl_image-1.2.10.recipe} | 0 ...l_image-1.2.12 => sdl_image-1.2.12.recipe} | 0 ...sdl_image-1.2.6 => sdl_image-1.2.6.recipe} | 0 ...sdl_image-1.2.8 => sdl_image-1.2.8.recipe} | 0 ...sdl_image-1.2.9 => sdl_image-1.2.9.recipe} | 0 ...l_image-1.2_hg => sdl_image-1.2_hg.recipe} | 0 ...er-1.2.11.patch => sdl_mixer-1.2.11.patch} | 0 ...l_mixer-1.2.10 => sdl_mixer-1.2.10.recipe} | 0 ...l_mixer-1.2.11 => sdl_mixer-1.2.11.recipe} | 0 ...l_mixer-1.2.12 => sdl_mixer-1.2.12.recipe} | 0 ...sdl_mixer-1.2.9 => sdl_mixer-1.2.9.recipe} | 0 ...l_mixer-1.2_hg => sdl_mixer-1.2_hg.recipe} | 0 ...dl-net-1.2.7.patch => sdl_net-1.2.7.patch} | 0 ...dl-net-1.2.8.patch => sdl_net-1.2.8.patch} | 0 .../{sdl_net-1.2.7 => sdl_net-1.2.7.recipe} | 0 .../{sdl_net-1.2.8 => sdl_net-1.2.8.recipe} | 0 .../{sdl_net-1.2_hg => sdl_net-1.2_hg.recipe} | 0 .../{sdl_rtf-0.1.0 => sdl_rtf-0.1.0.recipe} | 0 ...sdl_sound-1.0.3 => sdl_sound-1.0.3.recipe} | 0 ...l_sound-1.0_hg => sdl_sound-1.0_hg.recipe} | 0 .../{sdl_ttf-2.0.10 => sdl_ttf-2.0.10.recipe} | 0 .../{sdl_ttf-2.0.11 => sdl_ttf-2.0.11.recipe} | 0 .../{sdl_ttf-2.0.9 => sdl_ttf-2.0.9.recipe} | 0 .../{sdl_ttf-2.0_ => sdl_ttf-2.0_.recipe} | 0 media-libs/speex/speex-1.2_git | 35 - ...ffer => fluidsynth-1.1_midi_buffer.recipe} | 0 ...patch => fluidsynth-1.1_midi_buffer.patch} | 0 ..._no_coda-3.13 => gogo_no_coda-3.13.recipe} | 0 ...oda-3.13.patch => gogo_no_coda-3.13.patch} | 0 media-sound/lame/lame-398_2 | 25 - media-sound/lame/patches/lame-398-2.patch | 41 - ...naspro-0.2.9_hg => naspro-0.2.9_hg.recipe} | 0 .../{ocp_0.1.21_git => ocp-0.1.21_git.recipe} | 0 ...s-1.2.0.patch => vorbis_tools-1.2.0.patch} | 0 ...s-1.4.0.patch => vorbis_tools-1.4.0.patch} | 0 ..._tools-1.2.0 => vorbis_tools-1.2.0.recipe} | 0 ..._tools-1.4.0 => vorbis_tools-1.4.0.recipe} | 0 media-video/ffmpeg/ffmpeg-0.10.2_vlc | 29 - media-video/ffmpeg/ffmpeg-0.10.recipe | 29 - .../ffmpeg/patches/ffmpeg-0.10-gcc2.patch | 268 ----- .../gnash/{ => additional-files}/gnash.hvif | Bin .../gnash/{ => additional-files}/mime.zip | Bin media-video/gnash/gnash-0.recipe | 2 +- media-video/vlc/patches/vlc-0.8.6i.patch.old | 529 ---------- ...1.5_20101107 => vlc-1.1.5_20101107.recipe} | 0 ...c-0.28b.patch => rhapsody_irc-0.28b.patch} | 0 ...dy_irc-0.28b => rhapsody_irc-0.28b.recipe} | 0 ...ub-0.1.2_HEAD => hubbub-0.1.2_HEAD.recipe} | 0 .../{seeks-0.x_git => seeks-0.x_git.recipe} | 0 ...3_fwcutter-012 => b43_fwcutter-012.recipe} | 0 ...utter-012.patch => b43_fwcutter-012.patch} | 0 .../{dtc-1.3.0_git => dtc-1.3.0_git.recipe} | 0 ...tc-1.3.0-git.patch => dtc-1.3.0_git.patch} | 0 sys-apps/hgrep/hgrep | 10 - sys-apps/lgrep/lgrep | 50 - ...ogs-1.43_git => e2fsprogs-1.43_git.recipe} | 0 ....43-git.patch => e2fsprogs-1.43_git.patch} | 0 ...netsurf-2.7_svn => netsurf-2.7_svn.recipe} | 0 .../libX11/libX11.OptionalPackageDescription | 65 -- ...-master.patch => pixman-0.19_master.patch} | 0 .../patches/pixman-patch-2009-03-06.diff | 10 - ...-0.19_master => pixman-0.19_master.recipe} | 0 ...e_info-1.0 => shared_mime_info-1.0.recipe} | 0 ...17.0_git => util_macros-1.17.0_git.recipe} | 0 ..._macros-1.7.0 => util_macros-1.7.0.recipe} | 0 .../{xcb_proto-1.6 => xcb_proto-1.6.recipe} | 0 ...0.23-git.patch => xproto-7.0.23_git.patch} | 0 ...to-7.0.23_git => xproto-7.0.23_git.recipe} | 0 208 files changed, 199 insertions(+), 8094 deletions(-) delete mode 100755 app-admin/pwgen/pwgen-2.06.sh delete mode 100755 app-arch/fastjar/fastjar-0.97.sh delete mode 100755 app-arch/gzip/gzip-1.3.12.sh rename app-arch/gzip/{ => patches}/gzip-1.3.12-downstream.patch (100%) rename app-benchmarks/ffsb/{ffsb-6.0_rc2 => ffsb-6.0_rc2.recipe} (100%) rename app-editors/jed/{jed-0.99_19 => jed-0.99_19.recipe} (100%) rename app-editors/joe/{joe-3.8_hg => joe-3.8_hg.recipe} (100%) rename app-editors/qemacs/patches/{qemacs-0.3.2dev-cvs.patch => qemacs-0.3.2dev_cvs.patch} (100%) rename app-editors/qemacs/{qemacs-0.3.2dev_cvs => qemacs-0.3.2dev_cvs.recipe} (100%) rename app-emulation/aranym/{aranym-0.9.11_cvs => aranym-0.9.11_cvs.recipe} (100%) rename app-emulation/oricutron/{oricutron-0.9_svn => oricutron-0.9_svn.recipe} (100%) rename app-emulation/pearpc/{pearpc-0.5.0_cvs => pearpc-0.5.0_cvs.recipe} (100%) rename app-shells/fish/{fish-1.23.1_git => fish-1.23.1_git.recipe} (100%) rename app-shells/fish/patches/{fish-1.23.1-git.patch => fish-1.23.1_git.patch} (100%) rename app-text/ebook_tools/{ebook_tools-0.2.1 => ebook_tools-0.2.1.recipe} (100%) rename app-text/tesseract/{tesseract-3.x_svn => tesseract-3.x_svn.recipe} (100%) rename dev-cpp/mm_common/{mm_common-0.9.2 => mm_common-0.9.2.recipe} (100%) rename dev-db/redis/patches/{redis-2.9.0-git.patch => redis-2.9.0_git.patch} (100%) rename dev-db/redis/{redis-2.9.0_git => redis-2.9.0_git.recipe} (100%) rename dev-embedded/u_boot_tools/patches/{u-boot-tools-2012.10.patch => u_boot_tools-2012.10.patch} (100%) rename dev-embedded/u_boot_tools/{u_boot_tools-2012.10 => u_boot_tools-2012.10.recipe} (100%) rename dev-java/gnu_classpath/{gnu_classpath-0.98 => gnu_classpath-0.98.recipe} (100%) rename dev-java/gnu_classpath/patches/{gnu-classpath-0.98.patch => gnu_classpath-0.98.patch} (100%) rename dev-lang/dmd_bin/{dmd_bin-1.064 => dmd_bin-1.064.recipe} (100%) rename dev-lang/dmd_bin/patches/{dmd-bin-1.064.patch => dmd_bin-1.064.patch} (100%) delete mode 100644 dev-lang/lua/lua-5.1.4_3 delete mode 100644 dev-lang/lua/patches/lua-5.1.4-3.patch rename dev-lang/nasm/patches/{nasm-2.03.01-haiku.diff => nasm-2.03.01.patch} (100%) rename dev-lang/swi_prolog/patches/{swi-prolog-6.0.2.patch => swi_prolog-6.0.2.patch} (100%) rename dev-lang/swi_prolog/patches/{swi-prolog-6.2.0.patch => swi_prolog-6.2.0.patch} (100%) rename dev-lang/swi_prolog/{swi_prolog-6.0.2 => swi_prolog-6.0.2.recipe} (100%) rename dev-lang/swi_prolog/{swi_prolog-6.2.0 => swi_prolog-6.2.0.recipe} (100%) rename dev-libs/boehm_gc/{boehm_gc-7.2_alpha6 => boehm_gc-7.2_alpha6.recipe} (100%) rename dev-libs/boehm_gc/{boehm_gc-7.2d => boehm_gc-7.2d.recipe} (100%) rename dev-libs/boehm_gc/patches/{boehm-gc-7.2_alpha6.patch => boehm_gc-7.2_alpha6.patch} (100%) rename dev-libs/boehm_gc/patches/{boehm-gc-7.2d.patch => boehm_gc-7.2d.patch} (100%) rename dev-libs/json_c/{json_c-0.9 => json_c-0.9.recipe} (100%) rename dev-libs/libgpg_error/{libgpg_error-1.10 => libgpg_error-1.10.recipe} (100%) rename dev-libs/libgpg_error/{libgpg_error-1.7 => libgpg_error-1.7.recipe} (100%) rename dev-libs/libgpg_error/patches/{libgpg-error-1.10.patch => libgpg_error-1.10.patch} (100%) rename dev-libs/libgpg_error/patches/{libgpg-error-1.7.patch => libgpg_error-1.7.patch} (100%) rename dev-libs/libpthread_stubs/{libpthread_stubs-0.3 => libpthread_stubs-0.3.2.recipe} (100%) rename dev-libs/libpthread_stubs/{libpthread_stubs-0.3.2 => libpthread_stubs-0.3.recipe} (100%) rename dev-libs/libwapcaplet/{libwapcaplet-0.1.1_HEAD => libwapcaplet-0.1.1_HEAD.recipe} (100%) rename dev-libs/libxdg_basedir/{libxdg_basedir-1.1.1 => libxdg_basedir-1.1.1.recipe} (100%) rename dev-libs/libxdg_basedir/patches/{libxdg-basedir-1.1.1.patch => libxdg_basedir-1.1.1.patch} (100%) delete mode 100644 dev-libs/mpfr/mpfr-3.0.0_7047 rename dev-libs/xerces_c/{xerces_c-3.1.1 => xerces_c-3.1.1.recipe} (100%) rename dev-perl/XML_Parser/{XML_Parser-2.36 => XML_Parser-2.36.recipe} (100%) rename dev-python/cnf/{cnf-1.0_git => cnf-1.0_git.recipe} (100%) rename dev-python/pychart/{pychart-1.39_bzr => pychart-1.39_bzr.recipe} (100%) delete mode 100644 dev-qt/qtcore/qtcore-4.8.x_git rename dev-util/abi_compliance_checker/{abi_compliance_checker-1.98.3 => abi_compliance_checker-1.98.3.recipe} (100%) rename dev-util/automoc/{automoc-4_git => automoc-4_git.recipe} (100%) delete mode 100644 dev-util/cmake/cmake-2.6.4.recipe delete mode 100644 dev-util/cmake/cmake-2.8.0.recipe delete mode 100644 dev-util/cmake/cmake-2.8.1.recipe delete mode 100644 dev-util/cmake/cmake-2.8.2.recipe delete mode 100644 dev-util/cmake/cmake-2.8.3.recipe delete mode 100644 dev-util/cmake/cmake-2.8.4.recipe delete mode 100644 dev-util/cmake/cmake-2.8_git delete mode 100644 dev-util/cmake/patches/cmake-2.6.0-haiku.diff delete mode 100644 dev-util/cmake/patches/cmake-2.6.1-haiku-2.diff delete mode 100644 dev-util/cmake/patches/cmake-2.6.1-haiku.diff delete mode 100644 dev-util/cmake/patches/cmake-2.8-git.patch delete mode 100644 dev-util/cmake/patches/cmake-2.8.1.patch delete mode 100644 dev-util/cmake/patches/cmake-2.8.2.patch delete mode 100644 dev-util/cmake/patches/cmake-2.8.3.patch delete mode 100644 dev-util/cmake/patches/cmake-2.8.4.patch rename dev-util/gtk_doc/{gtk_doc-1.15 => gtk_doc-1.15.recipe} (100%) rename dev-util/gtk_doc/patches/{gtk-doc-1.15.patch => gtk_doc-1.15.patch} (100%) delete mode 100644 dev-vcs/fossil/fossil-1.22_fossil rename dev-vcs/subversion/{subversion-1.7.0_rc2 => subversion-1.7.0_rc2.recipe} (100%) delete mode 100644 dev-vcs/subversion/subversion-1.7.xx_svn rename games-emulation/dosbox/{dosbox-0.74_svn => dosbox-0.74_svn.recipe} (100%) rename games-emulation/dosbox/{dosbox-0.74-svn.patch => patches/dosbox-0.74_svn.patch} (100%) rename games-engines/freesci/{ => patches}/freesci-0.6.4_beos.patch (100%) rename games-puzzle/numptyphysics/{numptyphysics-0.2_157 => numptyphysics-0.2_157.recipe} (100%) rename gnome-base/gnome_common/{gnome_common-2.28 => gnome_common-2.28.recipe} (100%) delete mode 100644 haiku-apps/armyknife/armyknife-999_git rename haiku-apps/bowser/{bowser-1.1.1_cvs => bowser-1.1.1_cvs.recipe} (100%) delete mode 100644 haiku-apps/burnitnow/burnitnow-2_svn rename haiku-apps/burnitnow/{burnitnow-beta5_svn => burnitnow-beta5_svn.recipe} (100%) delete mode 100644 haiku-apps/burnitnow/burnitnow-beta6_git rename haiku-apps/burnitnow/patches/{burnitnow-beta5-svn.patch => burnitnow-beta5_svn.patch} (100%) rename haiku-apps/caya_gpl_protocols/{caya_gpl_protocols-0.HEAD => caya_gpl_protocols-0.HEAD.recipe} (100%) rename haiku-apps/caya_gpl_protocols/{caya_gpl_protocols-19 => caya_gpl_protocols-19.recipe} (100%) rename haiku-apps/caya_gpl_protocols/{caya_gpl_protocols-24 => caya_gpl_protocols-24.recipe} (100%) rename haiku-apps/caya_gpl_protocols/{caya_gpl_protocols-35 => caya_gpl_protocols-35.recipe} (100%) rename haiku-apps/caya_gpl_protocols/{caya_gpl_protocols-36 => caya_gpl_protocols-36.recipe} (100%) rename haiku-apps/caya_gpl_protocols/patches/{caya-gpl-protocols-0.HEAD.patch => caya_gpl_protocols-0.HEAD.patch} (100%) rename haiku-apps/friss/{friss-0.7_svn => friss-0.7_svn.recipe} (100%) delete mode 100644 haiku-apps/haikutwitter/haikutwitter-1.0_svn rename haiku-apps/hare/{hare-beta1_git => hare-beta1_git.recipe} (100%) rename haiku-apps/open_sum_it/{open_sum_it-108 => open_sum_it-108.recipe} (100%) rename haiku-apps/paladin/{paladin-1.3_hg => paladin-1.3_hg.recipe} (100%) rename haiku-apps/thememanager/{thememanager-0_svn => thememanager-0_svn.recipe} (100%) rename media-fonts/arabeyes_fonts/{arabeyes_fonts-1.1 => arabeyes_fonts-1.1.recipe} (100%) rename media-fonts/courier_prime/{courier_prime-1.0 => courier_prime-1.0.recipe} (100%) rename media-fonts/farsi_fonts/{farsi_fonts-0.4 => farsi_fonts-0.4.recipe} (100%) rename media-fonts/kacst_fonts/{kacst_fonts-5.0 => kacst_fonts-5.0.recipe} (100%) rename media-fonts/lateef_font/{lateef_font-1.001 => lateef_font-1.001.recipe} (100%) rename media-fonts/liberation_fonts/{liberation_fonts-1.06.0.20100721 => liberation_fonts-1.06.0.20100721.recipe} (100%) rename media-fonts/nafees_nastaleeq/{nafees_nastaleeq-1.02 => nafees_nastaleeq-1.02.recipe} (100%) rename media-fonts/nafees_riqa/{nafees_riqa-1.00 => nafees_riqa-1.00.recipe} (100%) rename media-fonts/scheherazade_font/{scheherazade_font-1.005 => scheherazade_font-1.005.recipe} (100%) rename media-fonts/x_series_fonts/{x_series_fonts-2.0 => x_series_fonts-2.0.recipe} (100%) rename media-gfx/imagemagick/{imagemagick-6.6.1_10 => imagemagick-6.6.1_10.recipe} (100%) rename media-gfx/sane_backends/patches/{sane-backends-1.0.21.patch => sane_backends-1.0.21.patch} (100%) rename media-gfx/tuxpaint/{tuxpaint-0.9.2x_cvs => tuxpaint-0.9.2x_cvs.recipe} (100%) rename media-libs/allegro/{allegro-4.4.x_svn => allegro-4.4.x_svn.recipe} (100%) delete mode 100644 media-libs/allegro/patches/allegro-4.3.10-haiku-1.diff delete mode 100644 media-libs/allegro/patches/allegro-4.3.10-haiku-2.diff delete mode 100644 media-libs/allegro/patches/allegro-4.3.10-haiku-3.diff delete mode 100644 media-libs/allegro/patches/allegro-4.3.10-haiku-4.diff delete mode 100644 media-libs/allegro/patches/allegro-4.3.10-haiku-5.diff delete mode 100644 media-libs/allegro/patches/allegro-4.3.10-lm.diff delete mode 100644 media-libs/allegro/patches/allegro-4.3.10plus-haiku.diff rename media-libs/allegro/patches/{allegro-4.4.x-svn.patch => allegro-4.4.x_svn.patch} (100%) rename media-libs/freetype/{freetype_with_subpixel_rendering-2.4.9 => freetype_with_subpixel_rendering-2.4.9.recipe} (100%) rename media-libs/freetype/patches/{freetype-2.4.9-with-subpixel-rendering-enabled.patch => freetype-2.4.9_with_subpixel_rendering_enabled.patch} (100%) delete mode 100644 media-libs/ftgl/ftgl-2.1-svn rename media-libs/ladspa_sdk/{ladspa_sdk-1.13 => ladspa_sdk-1.13.recipe} (100%) delete mode 100644 media-libs/libnsbmp/libnsbmp_0.0.3-HEAD rename media-libs/libsdl/{ => additional-files}/sdl-config (100%) rename media-libs/libsdl/{libsdl-1.2_hg => libsdl-1.2_hg.recipe} (100%) rename media-libs/libsdl/{libsdl-1.3_gsoc => libsdl-1.3_gsoc.recipe} (100%) rename media-libs/libsdl/{libsdl-2.0_hg => libsdl-2.0_hg.recipe} (100%) rename media-libs/libsdl/{libsdl-2.0_hg_cmake => libsdl-2.0_hg_cmake.recipe} (100%) rename media-libs/libsdl/patches/{libsdl-1.2-hg.patch => libsdl-1.2_hg.patch} (100%) rename media-libs/libsvgtiny/{libsvgtiny-0_HEAD => libsvgtiny-0_HEAD.recipe} (100%) rename media-libs/libwebm/{libwebm-0.9.2_git => libwebm-0.9.2_git.recipe} (100%) rename media-libs/libwebp/{libwebp-0.1.2_git => libwebp-0.1.2_git.recipe} (100%) delete mode 100644 media-libs/openal/openal-1.12_git rename media-libs/sdl_gfx/patches/{sdl-gfx-2.0.20.patch => sdl_gfx-2.0.20.patch} (100%) rename media-libs/sdl_gfx/{sdl_gfx-2.0.20 => sdl_gfx-2.0.20.recipe} (100%) rename media-libs/sdl_gfx/{sdl_gfx-2.0.22 => sdl_gfx-2.0.22.recipe} (100%) rename media-libs/sdl_gfx/{sdl_gfx-2.0.23 => sdl_gfx-2.0.23.recipe} (100%) delete mode 100644 media-libs/sdl_image/sdl-image.OptionalPackageDescription rename media-libs/sdl_image/{sdl_image-1.2.10 => sdl_image-1.2.10.recipe} (100%) rename media-libs/sdl_image/{sdl_image-1.2.12 => sdl_image-1.2.12.recipe} (100%) rename media-libs/sdl_image/{sdl_image-1.2.6 => sdl_image-1.2.6.recipe} (100%) rename media-libs/sdl_image/{sdl_image-1.2.8 => sdl_image-1.2.8.recipe} (100%) rename media-libs/sdl_image/{sdl_image-1.2.9 => sdl_image-1.2.9.recipe} (100%) rename media-libs/sdl_image/{sdl_image-1.2_hg => sdl_image-1.2_hg.recipe} (100%) rename media-libs/sdl_mixer/patches/{sdl-mixer-1.2.11.patch => sdl_mixer-1.2.11.patch} (100%) rename media-libs/sdl_mixer/{sdl_mixer-1.2.10 => sdl_mixer-1.2.10.recipe} (100%) rename media-libs/sdl_mixer/{sdl_mixer-1.2.11 => sdl_mixer-1.2.11.recipe} (100%) rename media-libs/sdl_mixer/{sdl_mixer-1.2.12 => sdl_mixer-1.2.12.recipe} (100%) rename media-libs/sdl_mixer/{sdl_mixer-1.2.9 => sdl_mixer-1.2.9.recipe} (100%) rename media-libs/sdl_mixer/{sdl_mixer-1.2_hg => sdl_mixer-1.2_hg.recipe} (100%) rename media-libs/sdl_net/patches/{sdl-net-1.2.7.patch => sdl_net-1.2.7.patch} (100%) rename media-libs/sdl_net/patches/{sdl-net-1.2.8.patch => sdl_net-1.2.8.patch} (100%) rename media-libs/sdl_net/{sdl_net-1.2.7 => sdl_net-1.2.7.recipe} (100%) rename media-libs/sdl_net/{sdl_net-1.2.8 => sdl_net-1.2.8.recipe} (100%) rename media-libs/sdl_net/{sdl_net-1.2_hg => sdl_net-1.2_hg.recipe} (100%) rename media-libs/sdl_rtf/{sdl_rtf-0.1.0 => sdl_rtf-0.1.0.recipe} (100%) rename media-libs/sdl_sound/{sdl_sound-1.0.3 => sdl_sound-1.0.3.recipe} (100%) rename media-libs/sdl_sound/{sdl_sound-1.0_hg => sdl_sound-1.0_hg.recipe} (100%) rename media-libs/sdl_ttf/{sdl_ttf-2.0.10 => sdl_ttf-2.0.10.recipe} (100%) rename media-libs/sdl_ttf/{sdl_ttf-2.0.11 => sdl_ttf-2.0.11.recipe} (100%) rename media-libs/sdl_ttf/{sdl_ttf-2.0.9 => sdl_ttf-2.0.9.recipe} (100%) rename media-libs/sdl_ttf/{sdl_ttf-2.0_ => sdl_ttf-2.0_.recipe} (100%) delete mode 100644 media-libs/speex/speex-1.2_git rename media-sound/fluidsynth/{fluidsynth_1.1_midi_buffer => fluidsynth-1.1_midi_buffer.recipe} (100%) rename media-sound/fluidsynth/patches/{fluidsynth-1.1-midi-buffer.patch => fluidsynth-1.1_midi_buffer.patch} (100%) rename media-sound/gogo_no_coda/{gogo_no_coda-3.13 => gogo_no_coda-3.13.recipe} (100%) rename media-sound/gogo_no_coda/patches/{gogo-no-coda-3.13.patch => gogo_no_coda-3.13.patch} (100%) delete mode 100644 media-sound/lame/lame-398_2 delete mode 100644 media-sound/lame/patches/lame-398-2.patch rename media-sound/naspro/{naspro-0.2.9_hg => naspro-0.2.9_hg.recipe} (100%) rename media-sound/ocp/{ocp_0.1.21_git => ocp-0.1.21_git.recipe} (100%) rename media-sound/vorbis_tools/patches/{vorbis-tools-1.2.0.patch => vorbis_tools-1.2.0.patch} (100%) rename media-sound/vorbis_tools/patches/{vorbis-tools-1.4.0.patch => vorbis_tools-1.4.0.patch} (100%) rename media-sound/vorbis_tools/{vorbis_tools-1.2.0 => vorbis_tools-1.2.0.recipe} (100%) rename media-sound/vorbis_tools/{vorbis_tools-1.4.0 => vorbis_tools-1.4.0.recipe} (100%) delete mode 100644 media-video/ffmpeg/ffmpeg-0.10.2_vlc delete mode 100644 media-video/ffmpeg/ffmpeg-0.10.recipe delete mode 100644 media-video/ffmpeg/patches/ffmpeg-0.10-gcc2.patch rename media-video/gnash/{ => additional-files}/gnash.hvif (100%) rename media-video/gnash/{ => additional-files}/mime.zip (100%) delete mode 100644 media-video/vlc/patches/vlc-0.8.6i.patch.old rename media-video/vlc/{vlc-1.1.5_20101107 => vlc-1.1.5_20101107.recipe} (100%) rename net-irc/rhapsody_irc/patches/{rhapsody-irc-0.28b.patch => rhapsody_irc-0.28b.patch} (100%) rename net-irc/rhapsody_irc/{rhapsody_irc-0.28b => rhapsody_irc-0.28b.recipe} (100%) rename net-libs/hubbub/{hubbub-0.1.2_HEAD => hubbub-0.1.2_HEAD.recipe} (100%) rename net-p2p/seeks/{seeks-0.x_git => seeks-0.x_git.recipe} (100%) rename net-wireless/b43_fwcutter/{b43_fwcutter-012 => b43_fwcutter-012.recipe} (100%) rename net-wireless/b43_fwcutter/patches/{b43-fwcutter-012.patch => b43_fwcutter-012.patch} (100%) rename sys-apps/dtc/{dtc-1.3.0_git => dtc-1.3.0_git.recipe} (100%) rename sys-apps/dtc/patches/{dtc-1.3.0-git.patch => dtc-1.3.0_git.patch} (100%) delete mode 100755 sys-apps/hgrep/hgrep delete mode 100755 sys-apps/lgrep/lgrep rename sys-fs/e2fsprogs/{e2fsprogs-1.43_git => e2fsprogs-1.43_git.recipe} (100%) rename sys-fs/e2fsprogs/patches/{e2fsprogs-1.43-git.patch => e2fsprogs-1.43_git.patch} (100%) rename www-client/netsurf/{netsurf-2.7_svn => netsurf-2.7_svn.recipe} (100%) delete mode 100644 x11-libs/libX11/libX11.OptionalPackageDescription rename x11-libs/pixman/patches/{pixman-0.19-master.patch => pixman-0.19_master.patch} (100%) delete mode 100644 x11-libs/pixman/patches/pixman-patch-2009-03-06.diff rename x11-libs/pixman/{pixman-0.19_master => pixman-0.19_master.recipe} (100%) rename x11-misc/shared_mime_info/{shared_mime_info-1.0 => shared_mime_info-1.0.recipe} (100%) rename x11-misc/util_macros/{util_macros-1.17.0_git => util_macros-1.17.0_git.recipe} (100%) rename x11-misc/util_macros/{util_macros-1.7.0 => util_macros-1.7.0.recipe} (100%) rename x11-proto/xcb_proto/{xcb_proto-1.6 => xcb_proto-1.6.recipe} (100%) rename x11-proto/xproto/patches/{xproto-7.0.23-git.patch => xproto-7.0.23_git.patch} (100%) rename x11-proto/xproto/{xproto-7.0.23_git => xproto-7.0.23_git.recipe} (100%) diff --git a/app-admin/pwgen/pwgen-2.06.sh b/app-admin/pwgen/pwgen-2.06.sh deleted file mode 100755 index 030f4ada5..000000000 --- a/app-admin/pwgen/pwgen-2.06.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -PACKAGE="app-admin/pwgen" -VERSION="2.06" -HOMEPAGE="http://sourceforge.net/projects/pwgen/" -URL="http://voxel.dl.sourceforge.net/sourceforge/pwgen/" -FILE="pwgen-2.06.tar.gz" - -PREFIX=--prefix=/boot/common -HAIKUPORTS="http://ports.haiku-files.org/wiki" -CWD=`pwd` - -if [ ! -d ${PACKAGE}/${VERSION} ] ; then - mkdir -p ${PACKAGE}/${VERSION} -fi -if [ ! -e ${FILE} ] ; then - wget ${URL}${FILE} -fi -cd ${PACKAGE}/${VERSION} -tar xvf ${CWD}/${FILE} -cd pwgen-2.06 -configure ${PREFIX} -`make && make install && echo && echo " Installation complete."` || echo " Installation FAILED !" - -echo " For more information, see ${HAIKUPORTS}/${PACKAGE}" -echo \ No newline at end of file diff --git a/app-arch/fastjar/fastjar-0.97.sh b/app-arch/fastjar/fastjar-0.97.sh deleted file mode 100755 index bfa0b84b4..000000000 --- a/app-arch/fastjar/fastjar-0.97.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -HOMEPAGE="https://savannah.nongnu.org/projects/fastjar/" -PACKAGE="app-arch/fastjar/" -VERSION="0.97" -URL="http://mirror.its.uidaho.edu/pub/savannah/fastjar/" -FILE="fastjar-0.97.tar.gz" - -# ------- This should not be edited ------- -PFX=/boot/common/ -HAIKUPORTS="http://ports.haiku-files.org/wiki/" -CWD=`pwd`/ -if [ ! -d ${PACKAGE}${VERSION} ] ; then - mkdir -p ${PACKAGE}${VERSION} -fi -if [ ! -e ${FILE} ] ; then - wget ${URL}${FILE} -fi -cd ${PACKAGE}${VERSION} -if [ ${FILE:(-7)} = "tar.bz2" ] ; then - tar -jxvf ${CWD}${FILE} -elif [ ${FILE:(-7)} = ".tar.gz" ] ; then - tar xvf ${CWD}${FILE} -fi -# ------- Begin Instructions ------- -cd fastjar-0.97 -libtoolize --force --install -aclocal --force -automake --force-missing -autoconf --force -configure --prefix=${PREFIX} -make && make install && echo && echo " Installation complete." || echo " Installation FAILED !" - -echo " For more information, see:" -echo " ${HAIKUPORTS}${PACKAGE}" -echo " ${HOMEPAGE}" -echo - diff --git a/app-arch/gzip/gzip-1.3.12.sh b/app-arch/gzip/gzip-1.3.12.sh deleted file mode 100755 index 13285332d..000000000 --- a/app-arch/gzip/gzip-1.3.12.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -HOMEPAGE="http://www.gnu.org/software/gzip/" -PACKAGE="app-arch/gzip/" -VERSION="1.3.12" -URL="http://ftp.gnu.org/gnu/gzip/" -FILE="gzip-1.3.12.tar.gz" -PATCH_URL="http://ports.haiku-files.org/svn/haikuports/trunk/" -PATCH_FILE="gzip-1.3.12-downstream.patch" - -# ------- This should not be edited ------- -PFX=/boot/common/ -HAIKUPORTS="http://ports.haiku-files.org/wiki/" -CWD=`pwd`/ -if [ ! -d ${PACKAGE}${VERSION} ] ; then - mkdir -p ${PACKAGE}${VERSION} -fi -if [ ! -e ${FILE} ] ; then - wget ${URL}${FILE} -fi -cd ${PACKAGE}${VERSION} -if [ ${FILE:(-7)} = "tar.bz2" ] ; then - tar -jxvf ${CWD}${FILE} -elif [ ${FILE:(-7)} = ".tar.gz" ] ; then - tar xvf ${CWD}${FILE} -fi -# ------- Begin Instructions ------- -cd gzip-1.3.12 -wget ${PATCH_URL}${PACKAGE}/${PATCH_FILE} -patch -p1 -i ${PATCH_FILE} -libtoolize --force --install -configure --prefix=${PFX} -make && make install && echo && echo " Installation complete." || echo " Installation FAILED !" - -echo " For more information, see:" -echo " ${HAIKUPORTS}${PACKAGE}" -echo " ${HOMEPAGE}" -echo - diff --git a/app-arch/gzip/gzip-1.3.12-downstream.patch b/app-arch/gzip/patches/gzip-1.3.12-downstream.patch similarity index 100% rename from app-arch/gzip/gzip-1.3.12-downstream.patch rename to app-arch/gzip/patches/gzip-1.3.12-downstream.patch diff --git a/app-benchmarks/ffsb/ffsb-6.0_rc2 b/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe similarity index 100% rename from app-benchmarks/ffsb/ffsb-6.0_rc2 rename to app-benchmarks/ffsb/ffsb-6.0_rc2.recipe diff --git a/app-editors/jed/jed-0.99_19 b/app-editors/jed/jed-0.99_19.recipe similarity index 100% rename from app-editors/jed/jed-0.99_19 rename to app-editors/jed/jed-0.99_19.recipe diff --git a/app-editors/joe/joe-3.8_hg b/app-editors/joe/joe-3.8_hg.recipe similarity index 100% rename from app-editors/joe/joe-3.8_hg rename to app-editors/joe/joe-3.8_hg.recipe diff --git a/app-editors/qemacs/patches/qemacs-0.3.2dev-cvs.patch b/app-editors/qemacs/patches/qemacs-0.3.2dev_cvs.patch similarity index 100% rename from app-editors/qemacs/patches/qemacs-0.3.2dev-cvs.patch rename to app-editors/qemacs/patches/qemacs-0.3.2dev_cvs.patch diff --git a/app-editors/qemacs/qemacs-0.3.2dev_cvs b/app-editors/qemacs/qemacs-0.3.2dev_cvs.recipe similarity index 100% rename from app-editors/qemacs/qemacs-0.3.2dev_cvs rename to app-editors/qemacs/qemacs-0.3.2dev_cvs.recipe diff --git a/app-emulation/aranym/aranym-0.9.11_cvs b/app-emulation/aranym/aranym-0.9.11_cvs.recipe similarity index 100% rename from app-emulation/aranym/aranym-0.9.11_cvs rename to app-emulation/aranym/aranym-0.9.11_cvs.recipe diff --git a/app-emulation/oricutron/oricutron-0.9_svn b/app-emulation/oricutron/oricutron-0.9_svn.recipe similarity index 100% rename from app-emulation/oricutron/oricutron-0.9_svn rename to app-emulation/oricutron/oricutron-0.9_svn.recipe diff --git a/app-emulation/pearpc/pearpc-0.5.0_cvs b/app-emulation/pearpc/pearpc-0.5.0_cvs.recipe similarity index 100% rename from app-emulation/pearpc/pearpc-0.5.0_cvs rename to app-emulation/pearpc/pearpc-0.5.0_cvs.recipe diff --git a/app-shells/fish/fish-1.23.1_git b/app-shells/fish/fish-1.23.1_git.recipe similarity index 100% rename from app-shells/fish/fish-1.23.1_git rename to app-shells/fish/fish-1.23.1_git.recipe diff --git a/app-shells/fish/patches/fish-1.23.1-git.patch b/app-shells/fish/patches/fish-1.23.1_git.patch similarity index 100% rename from app-shells/fish/patches/fish-1.23.1-git.patch rename to app-shells/fish/patches/fish-1.23.1_git.patch diff --git a/app-text/ebook_tools/ebook_tools-0.2.1 b/app-text/ebook_tools/ebook_tools-0.2.1.recipe similarity index 100% rename from app-text/ebook_tools/ebook_tools-0.2.1 rename to app-text/ebook_tools/ebook_tools-0.2.1.recipe diff --git a/app-text/tesseract/tesseract-3.x_svn b/app-text/tesseract/tesseract-3.x_svn.recipe similarity index 100% rename from app-text/tesseract/tesseract-3.x_svn rename to app-text/tesseract/tesseract-3.x_svn.recipe diff --git a/dev-cpp/mm_common/mm_common-0.9.2 b/dev-cpp/mm_common/mm_common-0.9.2.recipe similarity index 100% rename from dev-cpp/mm_common/mm_common-0.9.2 rename to dev-cpp/mm_common/mm_common-0.9.2.recipe diff --git a/dev-db/redis/patches/redis-2.9.0-git.patch b/dev-db/redis/patches/redis-2.9.0_git.patch similarity index 100% rename from dev-db/redis/patches/redis-2.9.0-git.patch rename to dev-db/redis/patches/redis-2.9.0_git.patch diff --git a/dev-db/redis/redis-2.9.0_git b/dev-db/redis/redis-2.9.0_git.recipe similarity index 100% rename from dev-db/redis/redis-2.9.0_git rename to dev-db/redis/redis-2.9.0_git.recipe diff --git a/dev-embedded/u_boot_tools/patches/u-boot-tools-2012.10.patch b/dev-embedded/u_boot_tools/patches/u_boot_tools-2012.10.patch similarity index 100% rename from dev-embedded/u_boot_tools/patches/u-boot-tools-2012.10.patch rename to dev-embedded/u_boot_tools/patches/u_boot_tools-2012.10.patch diff --git a/dev-embedded/u_boot_tools/u_boot_tools-2012.10 b/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe similarity index 100% rename from dev-embedded/u_boot_tools/u_boot_tools-2012.10 rename to dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe diff --git a/dev-java/gnu_classpath/gnu_classpath-0.98 b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe similarity index 100% rename from dev-java/gnu_classpath/gnu_classpath-0.98 rename to dev-java/gnu_classpath/gnu_classpath-0.98.recipe diff --git a/dev-java/gnu_classpath/patches/gnu-classpath-0.98.patch b/dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch similarity index 100% rename from dev-java/gnu_classpath/patches/gnu-classpath-0.98.patch rename to dev-java/gnu_classpath/patches/gnu_classpath-0.98.patch diff --git a/dev-lang/dmd_bin/dmd_bin-1.064 b/dev-lang/dmd_bin/dmd_bin-1.064.recipe similarity index 100% rename from dev-lang/dmd_bin/dmd_bin-1.064 rename to dev-lang/dmd_bin/dmd_bin-1.064.recipe diff --git a/dev-lang/dmd_bin/patches/dmd-bin-1.064.patch b/dev-lang/dmd_bin/patches/dmd_bin-1.064.patch similarity index 100% rename from dev-lang/dmd_bin/patches/dmd-bin-1.064.patch rename to dev-lang/dmd_bin/patches/dmd_bin-1.064.patch diff --git a/dev-lang/lua/lua-5.1.4_3 b/dev-lang/lua/lua-5.1.4_3 deleted file mode 100644 index 1ac5dddbe..000000000 --- a/dev-lang/lua/lua-5.1.4_3 +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language." -HOMEPAGE="http://www.lua.org" -SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz" -CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="pkgconfig >= 0.25" -BUILD() -{ - cd lua-5.1.4 - make haiku -} - -INSTALL() -{ - cd lua-5.1.4 - make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \ - INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man" - mkdir -p ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig - cp etc/lua.pc ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig/lua.pc -} -LICENSE="MIT" -COPYRIGHT="1994-2009, Lua.org, PUC-Rio" diff --git a/dev-lang/lua/patches/lua-5.1.4-3.patch b/dev-lang/lua/patches/lua-5.1.4-3.patch deleted file mode 100644 index 38b6ddd2a..000000000 --- a/dev-lang/lua/patches/lua-5.1.4-3.patch +++ /dev/null @@ -1,276 +0,0 @@ -diff -urN lua-5.1.4/Makefile lua-5.1.4-haiku/Makefile ---- lua-5.1.4/Makefile 2008-08-12 00:40:48.066322432 +0000 -+++ lua-5.1.4-haiku/Makefile 2011-05-03 22:29:07.568328192 +0000 -@@ -13,11 +13,11 @@ - INSTALL_BIN= $(INSTALL_TOP)/bin - INSTALL_INC= $(INSTALL_TOP)/include - INSTALL_LIB= $(INSTALL_TOP)/lib --INSTALL_MAN= $(INSTALL_TOP)/man/man1 -+INSTALL_MAN= `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1 - # - # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with - # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc). --INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V -+INSTALL_LMOD= `finddir B_COMMON_DATA_DIRECTORY`/lua/$V - INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V - - # How to install. If your install program does not support "-p", then you -@@ -38,12 +38,12 @@ - # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= - - # Convenience platforms targets. --PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris -+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris - - # What to install. - TO_BIN= lua luac - TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp --TO_LIB= liblua.a -+TO_LIB= liblua.a liblua.so - TO_MAN= lua.1 luac.1 - - # Lua version and release. -diff -urN lua-5.1.4/src/Makefile lua-5.1.4-haiku/src/Makefile ---- lua-5.1.4/src/Makefile 2008-01-19 19:37:58.066584576 +0000 -+++ lua-5.1.4-haiku/src/Makefile 2011-05-03 22:08:17.191627264 +0000 -@@ -20,9 +20,10 @@ - - # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= - --PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris -+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ - lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ - lundump.o lvm.o lzio.o -@@ -36,7 +37,7 @@ - LUAC_O= luac.o print.o - - ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) - ALL_A= $(LUA_A) - - default: $(PLAT) -@@ -57,6 +58,9 @@ - $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -o $@ -shared -fPIC $(MYLDFLAGS) $? $(LIBS) -+ - clean: - $(RM) $(ALL_T) $(ALL_O) - -@@ -95,6 +99,9 @@ - generic: - $(MAKE) all MYCFLAGS= - -+haiku: -+ $(MAKE) all MYCFLAGS=-DLUA_USE_HAIKU LIBS= -+ - linux: - $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" - -diff -urN lua-5.1.4/src/lcode.c lua-5.1.4-haiku/src/lcode.c ---- lua-5.1.4/src/lcode.c 2007-12-28 15:32:23.000262144 +0000 -+++ lua-5.1.4-haiku/src/lcode.c 2011-05-03 22:06:13.312999936 +0000 -@@ -1,5 +1,5 @@ - /* --** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $ -+** $Id: lcode.c,v 2.25.1.5 2011/01/31 14:53:16 roberto Exp $ - ** Code generator for Lua - ** See Copyright Notice in lua.h - */ -@@ -544,10 +544,6 @@ - pc = NO_JUMP; /* always true; do nothing */ - break; - } -- case VFALSE: { -- pc = luaK_jump(fs); /* always jump */ -- break; -- } - case VJMP: { - invertjump(fs, e); - pc = e->u.s.info; -@@ -572,10 +568,6 @@ - pc = NO_JUMP; /* always false; do nothing */ - break; - } -- case VTRUE: { -- pc = luaK_jump(fs); /* always jump */ -- break; -- } - case VJMP: { - pc = e->u.s.info; - break; -diff -urN lua-5.1.4/src/ldblib.c lua-5.1.4-haiku/src/ldblib.c ---- lua-5.1.4/src/ldblib.c 2008-01-21 13:11:21.000262144 +0000 -+++ lua-5.1.4-haiku/src/ldblib.c 2011-05-03 22:06:13.322699264 +0000 -@@ -1,5 +1,5 @@ - /* --** $Id: ldblib.c,v 1.104.1.3 2008/01/21 13:11:21 roberto Exp $ -+** $Id: ldblib.c,v 1.104.1.4 2009/08/04 18:50:18 roberto Exp $ - ** Interface from Lua to its debug API - ** See Copyright Notice in lua.h - */ -@@ -45,6 +45,7 @@ - - - static int db_getfenv (lua_State *L) { -+ luaL_checkany(L, 1); - lua_getfenv(L, 1); - return 1; - } -diff -urN lua-5.1.4/src/liolib.c lua-5.1.4-haiku/src/liolib.c ---- lua-5.1.4/src/liolib.c 2008-01-18 17:47:43.001572864 +0000 -+++ lua-5.1.4-haiku/src/liolib.c 2011-05-03 22:06:13.346292224 +0000 -@@ -1,5 +1,5 @@ - /* --** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $ -+** $Id: liolib.c,v 2.73.1.4 2010/05/14 15:33:51 roberto Exp $ - ** Standard I/O (and system) library - ** See Copyright Notice in lua.h - */ -@@ -276,7 +276,10 @@ - lua_pushnumber(L, d); - return 1; - } -- else return 0; /* read fails */ -+ else { -+ lua_pushnil(L); /* "result" to be removed */ -+ return 0; /* read fails */ -+ } - } - - -diff -urN lua-5.1.4/src/llex.c lua-5.1.4-haiku/src/llex.c ---- lua-5.1.4/src/llex.c 2007-12-27 13:02:25.001835008 +0000 -+++ lua-5.1.4-haiku/src/llex.c 2011-05-03 22:06:13.368050176 +0000 -@@ -1,5 +1,5 @@ - /* --** $Id: llex.c,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $ -+** $Id: llex.c,v 2.20.1.2 2009/11/23 14:58:22 roberto Exp $ - ** Lexical Analyzer - ** See Copyright Notice in lua.h - */ -@@ -118,8 +118,10 @@ - lua_State *L = ls->L; - TString *ts = luaS_newlstr(L, str, l); - TValue *o = luaH_setstr(L, ls->fs->h, ts); /* entry for `str' */ -- if (ttisnil(o)) -+ if (ttisnil(o)) { - setbvalue(o, 1); /* make sure `str' will not be collected */ -+ luaC_checkGC(L); -+ } - return ts; - } - -diff -urN lua-5.1.4/src/loadlib.c lua-5.1.4-haiku/src/loadlib.c ---- lua-5.1.4/src/loadlib.c 2008-08-06 13:29:28.002621440 +0000 -+++ lua-5.1.4-haiku/src/loadlib.c 2011-05-03 22:06:13.391380992 +0000 -@@ -1,5 +1,5 @@ - /* --** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $ -+** $Id: loadlib.c,v 1.52.1.4 2009/09/09 13:17:16 roberto Exp $ - ** Dynamic library loader for Lua - ** See Copyright Notice in lua.h - ** -@@ -639,7 +639,7 @@ - lua_pushvalue(L, -1); - lua_replace(L, LUA_ENVIRONINDEX); - /* create `loaders' table */ -- lua_createtable(L, 0, sizeof(loaders)/sizeof(loaders[0]) - 1); -+ lua_createtable(L, sizeof(loaders)/sizeof(loaders[0]) - 1, 0); - /* fill it with pre-defined loaders */ - for (i=0; loaders[i] != NULL; i++) { - lua_pushcfunction(L, loaders[i]); -diff -urN lua-5.1.4/src/lstrlib.c lua-5.1.4-haiku/src/lstrlib.c ---- lua-5.1.4/src/lstrlib.c 2008-07-11 17:27:21.004194304 +0000 -+++ lua-5.1.4-haiku/src/lstrlib.c 2011-05-03 22:06:13.411303936 +0000 -@@ -1,5 +1,5 @@ - /* --** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $ -+** $Id: lstrlib.c,v 1.132.1.5 2010/05/14 15:34:19 roberto Exp $ - ** Standard library for string operations and pattern-matching - ** See Copyright Notice in lua.h - */ -@@ -754,6 +754,7 @@ - - - static int str_format (lua_State *L) { -+ int top = lua_gettop(L); - int arg = 1; - size_t sfl; - const char *strfrmt = luaL_checklstring(L, arg, &sfl); -@@ -768,7 +769,8 @@ - else { /* format item */ - char form[MAX_FORMAT]; /* to store the format (`%...') */ - char buff[MAX_ITEM]; /* to store the formatted item */ -- arg++; -+ if (++arg > top) -+ luaL_argerror(L, arg, "no value"); - strfrmt = scanformat(L, strfrmt, form); - switch (*strfrmt++) { - case 'c': { -diff -urN lua-5.1.4/src/luaconf.h lua-5.1.4-haiku/src/luaconf.h ---- lua-5.1.4/src/luaconf.h 2008-02-11 16:25:08.004980736 +0000 -+++ lua-5.1.4-haiku/src/luaconf.h 2011-05-03 22:08:17.243793920 +0000 -@@ -33,6 +33,13 @@ - #define LUA_WIN - #endif - -+#if defined(LUA_USE_HAIKU) -+#define LUA_USE_MKSTEMP -+#define LUA_USE_ISATTY -+#define LUA_USE_POPEN -+#define LUA_USE_DLOPEN -+#endif -+ - #if defined(LUA_USE_LINUX) - #define LUA_USE_POSIX - #define LUA_USE_DLOPEN /* needs an extra library: -ldl */ -@@ -94,7 +101,11 @@ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" - - #else --#define LUA_ROOT "/usr/local/" -+# if defined(LUA_USE_HAIKU) -+# define LUA_ROOT "/boot/common/" -+# else -+# define LUA_ROOT "/usr/local/" -+# endif - #define LUA_LDIR LUA_ROOT "share/lua/5.1/" - #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" - #define LUA_PATH_DEFAULT \ -diff -urN lua-5.1.4/src/lvm.c lua-5.1.4-haiku/src/lvm.c ---- lua-5.1.4/src/lvm.c 2007-12-28 15:32:23.005242880 +0000 -+++ lua-5.1.4-haiku/src/lvm.c 2011-05-03 22:06:13.432537600 +0000 -@@ -1,5 +1,5 @@ - /* --** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $ -+** $Id: lvm.c,v 2.63.1.4 2009/07/01 21:10:33 roberto Exp $ - ** Lua virtual machine - ** See Copyright Notice in lua.h - */ -@@ -133,6 +133,7 @@ - - void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) { - int loop; -+ TValue temp; - for (loop = 0; loop < MAXTAGLOOP; loop++) { - const TValue *tm; - if (ttistable(t)) { /* `t' is a table? */ -@@ -152,7 +153,9 @@ - callTM(L, tm, t, key, val); - return; - } -- t = tm; /* else repeat with `tm' */ -+ /* else repeat with `tm' */ -+ setobj(L, &temp, tm); /* avoid pointing inside table (may rehash) */ -+ t = &temp; - } - luaG_runerror(L, "loop in settable"); - } diff --git a/dev-lang/lua/patches/lua-5.1.4.patch b/dev-lang/lua/patches/lua-5.1.4.patch index 5a6957180..38b6ddd2a 100644 --- a/dev-lang/lua/patches/lua-5.1.4.patch +++ b/dev-lang/lua/patches/lua-5.1.4.patch @@ -1,7 +1,21 @@ -diff -up lua-5.1.4/Makefile.orig lua-5.1.4/Makefile ---- lua-5.1.4/Makefile.orig 2010-04-27 22:29:15.068419584 -0600 -+++ lua-5.1.4/Makefile 2010-04-27 22:29:20.697303040 -0600 -@@ -38,12 +38,12 @@ RANLIB= ranlib +diff -urN lua-5.1.4/Makefile lua-5.1.4-haiku/Makefile +--- lua-5.1.4/Makefile 2008-08-12 00:40:48.066322432 +0000 ++++ lua-5.1.4-haiku/Makefile 2011-05-03 22:29:07.568328192 +0000 +@@ -13,11 +13,11 @@ + INSTALL_BIN= $(INSTALL_TOP)/bin + INSTALL_INC= $(INSTALL_TOP)/include + INSTALL_LIB= $(INSTALL_TOP)/lib +-INSTALL_MAN= $(INSTALL_TOP)/man/man1 ++INSTALL_MAN= `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man/man1 + # + # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with + # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc). +-INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V ++INSTALL_LMOD= `finddir B_COMMON_DATA_DIRECTORY`/lua/$V + INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V + + # How to install. If your install program does not support "-p", then you +@@ -38,12 +38,12 @@ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= # Convenience platforms targets. @@ -16,10 +30,10 @@ diff -up lua-5.1.4/Makefile.orig lua-5.1.4/Makefile TO_MAN= lua.1 luac.1 # Lua version and release. -diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile ---- lua-5.1.4/src/Makefile.orig 2010-04-27 22:29:26.027787264 -0600 -+++ lua-5.1.4/src/Makefile 2010-04-27 22:29:38.680525824 -0600 -@@ -20,9 +20,10 @@ MYLIBS= +diff -urN lua-5.1.4/src/Makefile lua-5.1.4-haiku/src/Makefile +--- lua-5.1.4/src/Makefile 2008-01-19 19:37:58.066584576 +0000 ++++ lua-5.1.4-haiku/src/Makefile 2011-05-03 22:08:17.191627264 +0000 +@@ -20,9 +20,10 @@ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= @@ -31,7 +45,7 @@ diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ lundump.o lvm.o lzio.o -@@ -36,7 +37,7 @@ LUAC_T= luac +@@ -36,7 +37,7 @@ LUAC_O= luac.o print.o ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) @@ -40,7 +54,7 @@ diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile ALL_A= $(LUA_A) default: $(PLAT) -@@ -57,6 +58,9 @@ $(LUA_T): $(LUA_O) $(LUA_A) +@@ -57,6 +58,9 @@ $(LUAC_T): $(LUAC_O) $(LUA_A) $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) @@ -50,7 +64,7 @@ diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile clean: $(RM) $(ALL_T) $(ALL_O) -@@ -95,6 +99,9 @@ freebsd: +@@ -95,6 +99,9 @@ generic: $(MAKE) all MYCFLAGS= @@ -60,9 +74,150 @@ diff -up lua-5.1.4/src/Makefile.orig lua-5.1.4/src/Makefile linux: $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" -diff -up lua-5.1.4/src/luaconf.h.orig lua-5.1.4/src/luaconf.h ---- lua-5.1.4/src/luaconf.h.orig 2010-04-27 22:29:48.387448832 -0600 -+++ lua-5.1.4/src/luaconf.h 2010-04-27 22:29:58.184025088 -0600 +diff -urN lua-5.1.4/src/lcode.c lua-5.1.4-haiku/src/lcode.c +--- lua-5.1.4/src/lcode.c 2007-12-28 15:32:23.000262144 +0000 ++++ lua-5.1.4-haiku/src/lcode.c 2011-05-03 22:06:13.312999936 +0000 +@@ -1,5 +1,5 @@ + /* +-** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $ ++** $Id: lcode.c,v 2.25.1.5 2011/01/31 14:53:16 roberto Exp $ + ** Code generator for Lua + ** See Copyright Notice in lua.h + */ +@@ -544,10 +544,6 @@ + pc = NO_JUMP; /* always true; do nothing */ + break; + } +- case VFALSE: { +- pc = luaK_jump(fs); /* always jump */ +- break; +- } + case VJMP: { + invertjump(fs, e); + pc = e->u.s.info; +@@ -572,10 +568,6 @@ + pc = NO_JUMP; /* always false; do nothing */ + break; + } +- case VTRUE: { +- pc = luaK_jump(fs); /* always jump */ +- break; +- } + case VJMP: { + pc = e->u.s.info; + break; +diff -urN lua-5.1.4/src/ldblib.c lua-5.1.4-haiku/src/ldblib.c +--- lua-5.1.4/src/ldblib.c 2008-01-21 13:11:21.000262144 +0000 ++++ lua-5.1.4-haiku/src/ldblib.c 2011-05-03 22:06:13.322699264 +0000 +@@ -1,5 +1,5 @@ + /* +-** $Id: ldblib.c,v 1.104.1.3 2008/01/21 13:11:21 roberto Exp $ ++** $Id: ldblib.c,v 1.104.1.4 2009/08/04 18:50:18 roberto Exp $ + ** Interface from Lua to its debug API + ** See Copyright Notice in lua.h + */ +@@ -45,6 +45,7 @@ + + + static int db_getfenv (lua_State *L) { ++ luaL_checkany(L, 1); + lua_getfenv(L, 1); + return 1; + } +diff -urN lua-5.1.4/src/liolib.c lua-5.1.4-haiku/src/liolib.c +--- lua-5.1.4/src/liolib.c 2008-01-18 17:47:43.001572864 +0000 ++++ lua-5.1.4-haiku/src/liolib.c 2011-05-03 22:06:13.346292224 +0000 +@@ -1,5 +1,5 @@ + /* +-** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $ ++** $Id: liolib.c,v 2.73.1.4 2010/05/14 15:33:51 roberto Exp $ + ** Standard I/O (and system) library + ** See Copyright Notice in lua.h + */ +@@ -276,7 +276,10 @@ + lua_pushnumber(L, d); + return 1; + } +- else return 0; /* read fails */ ++ else { ++ lua_pushnil(L); /* "result" to be removed */ ++ return 0; /* read fails */ ++ } + } + + +diff -urN lua-5.1.4/src/llex.c lua-5.1.4-haiku/src/llex.c +--- lua-5.1.4/src/llex.c 2007-12-27 13:02:25.001835008 +0000 ++++ lua-5.1.4-haiku/src/llex.c 2011-05-03 22:06:13.368050176 +0000 +@@ -1,5 +1,5 @@ + /* +-** $Id: llex.c,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $ ++** $Id: llex.c,v 2.20.1.2 2009/11/23 14:58:22 roberto Exp $ + ** Lexical Analyzer + ** See Copyright Notice in lua.h + */ +@@ -118,8 +118,10 @@ + lua_State *L = ls->L; + TString *ts = luaS_newlstr(L, str, l); + TValue *o = luaH_setstr(L, ls->fs->h, ts); /* entry for `str' */ +- if (ttisnil(o)) ++ if (ttisnil(o)) { + setbvalue(o, 1); /* make sure `str' will not be collected */ ++ luaC_checkGC(L); ++ } + return ts; + } + +diff -urN lua-5.1.4/src/loadlib.c lua-5.1.4-haiku/src/loadlib.c +--- lua-5.1.4/src/loadlib.c 2008-08-06 13:29:28.002621440 +0000 ++++ lua-5.1.4-haiku/src/loadlib.c 2011-05-03 22:06:13.391380992 +0000 +@@ -1,5 +1,5 @@ + /* +-** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $ ++** $Id: loadlib.c,v 1.52.1.4 2009/09/09 13:17:16 roberto Exp $ + ** Dynamic library loader for Lua + ** See Copyright Notice in lua.h + ** +@@ -639,7 +639,7 @@ + lua_pushvalue(L, -1); + lua_replace(L, LUA_ENVIRONINDEX); + /* create `loaders' table */ +- lua_createtable(L, 0, sizeof(loaders)/sizeof(loaders[0]) - 1); ++ lua_createtable(L, sizeof(loaders)/sizeof(loaders[0]) - 1, 0); + /* fill it with pre-defined loaders */ + for (i=0; loaders[i] != NULL; i++) { + lua_pushcfunction(L, loaders[i]); +diff -urN lua-5.1.4/src/lstrlib.c lua-5.1.4-haiku/src/lstrlib.c +--- lua-5.1.4/src/lstrlib.c 2008-07-11 17:27:21.004194304 +0000 ++++ lua-5.1.4-haiku/src/lstrlib.c 2011-05-03 22:06:13.411303936 +0000 +@@ -1,5 +1,5 @@ + /* +-** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $ ++** $Id: lstrlib.c,v 1.132.1.5 2010/05/14 15:34:19 roberto Exp $ + ** Standard library for string operations and pattern-matching + ** See Copyright Notice in lua.h + */ +@@ -754,6 +754,7 @@ + + + static int str_format (lua_State *L) { ++ int top = lua_gettop(L); + int arg = 1; + size_t sfl; + const char *strfrmt = luaL_checklstring(L, arg, &sfl); +@@ -768,7 +769,8 @@ + else { /* format item */ + char form[MAX_FORMAT]; /* to store the format (`%...') */ + char buff[MAX_ITEM]; /* to store the formatted item */ +- arg++; ++ if (++arg > top) ++ luaL_argerror(L, arg, "no value"); + strfrmt = scanformat(L, strfrmt, form); + switch (*strfrmt++) { + case 'c': { +diff -urN lua-5.1.4/src/luaconf.h lua-5.1.4-haiku/src/luaconf.h +--- lua-5.1.4/src/luaconf.h 2008-02-11 16:25:08.004980736 +0000 ++++ lua-5.1.4-haiku/src/luaconf.h 2011-05-03 22:08:17.243793920 +0000 @@ -33,6 +33,13 @@ #define LUA_WIN #endif @@ -90,3 +245,32 @@ diff -up lua-5.1.4/src/luaconf.h.orig lua-5.1.4/src/luaconf.h #define LUA_LDIR LUA_ROOT "share/lua/5.1/" #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" #define LUA_PATH_DEFAULT \ +diff -urN lua-5.1.4/src/lvm.c lua-5.1.4-haiku/src/lvm.c +--- lua-5.1.4/src/lvm.c 2007-12-28 15:32:23.005242880 +0000 ++++ lua-5.1.4-haiku/src/lvm.c 2011-05-03 22:06:13.432537600 +0000 +@@ -1,5 +1,5 @@ + /* +-** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $ ++** $Id: lvm.c,v 2.63.1.4 2009/07/01 21:10:33 roberto Exp $ + ** Lua virtual machine + ** See Copyright Notice in lua.h + */ +@@ -133,6 +133,7 @@ + + void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) { + int loop; ++ TValue temp; + for (loop = 0; loop < MAXTAGLOOP; loop++) { + const TValue *tm; + if (ttistable(t)) { /* `t' is a table? */ +@@ -152,7 +153,9 @@ + callTM(L, tm, t, key, val); + return; + } +- t = tm; /* else repeat with `tm' */ ++ /* else repeat with `tm' */ ++ setobj(L, &temp, tm); /* avoid pointing inside table (may rehash) */ ++ t = &temp; + } + luaG_runerror(L, "loop in settable"); + } diff --git a/dev-lang/nasm/patches/nasm-2.03.01-haiku.diff b/dev-lang/nasm/patches/nasm-2.03.01.patch similarity index 100% rename from dev-lang/nasm/patches/nasm-2.03.01-haiku.diff rename to dev-lang/nasm/patches/nasm-2.03.01.patch diff --git a/dev-lang/swi_prolog/patches/swi-prolog-6.0.2.patch b/dev-lang/swi_prolog/patches/swi_prolog-6.0.2.patch similarity index 100% rename from dev-lang/swi_prolog/patches/swi-prolog-6.0.2.patch rename to dev-lang/swi_prolog/patches/swi_prolog-6.0.2.patch diff --git a/dev-lang/swi_prolog/patches/swi-prolog-6.2.0.patch b/dev-lang/swi_prolog/patches/swi_prolog-6.2.0.patch similarity index 100% rename from dev-lang/swi_prolog/patches/swi-prolog-6.2.0.patch rename to dev-lang/swi_prolog/patches/swi_prolog-6.2.0.patch diff --git a/dev-lang/swi_prolog/swi_prolog-6.0.2 b/dev-lang/swi_prolog/swi_prolog-6.0.2.recipe similarity index 100% rename from dev-lang/swi_prolog/swi_prolog-6.0.2 rename to dev-lang/swi_prolog/swi_prolog-6.0.2.recipe diff --git a/dev-lang/swi_prolog/swi_prolog-6.2.0 b/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe similarity index 100% rename from dev-lang/swi_prolog/swi_prolog-6.2.0 rename to dev-lang/swi_prolog/swi_prolog-6.2.0.recipe diff --git a/dev-libs/boehm_gc/boehm_gc-7.2_alpha6 b/dev-libs/boehm_gc/boehm_gc-7.2_alpha6.recipe similarity index 100% rename from dev-libs/boehm_gc/boehm_gc-7.2_alpha6 rename to dev-libs/boehm_gc/boehm_gc-7.2_alpha6.recipe diff --git a/dev-libs/boehm_gc/boehm_gc-7.2d b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe similarity index 100% rename from dev-libs/boehm_gc/boehm_gc-7.2d rename to dev-libs/boehm_gc/boehm_gc-7.2d.recipe diff --git a/dev-libs/boehm_gc/patches/boehm-gc-7.2_alpha6.patch b/dev-libs/boehm_gc/patches/boehm_gc-7.2_alpha6.patch similarity index 100% rename from dev-libs/boehm_gc/patches/boehm-gc-7.2_alpha6.patch rename to dev-libs/boehm_gc/patches/boehm_gc-7.2_alpha6.patch diff --git a/dev-libs/boehm_gc/patches/boehm-gc-7.2d.patch b/dev-libs/boehm_gc/patches/boehm_gc-7.2d.patch similarity index 100% rename from dev-libs/boehm_gc/patches/boehm-gc-7.2d.patch rename to dev-libs/boehm_gc/patches/boehm_gc-7.2d.patch diff --git a/dev-libs/json_c/json_c-0.9 b/dev-libs/json_c/json_c-0.9.recipe similarity index 100% rename from dev-libs/json_c/json_c-0.9 rename to dev-libs/json_c/json_c-0.9.recipe diff --git a/dev-libs/libgpg_error/libgpg_error-1.10 b/dev-libs/libgpg_error/libgpg_error-1.10.recipe similarity index 100% rename from dev-libs/libgpg_error/libgpg_error-1.10 rename to dev-libs/libgpg_error/libgpg_error-1.10.recipe diff --git a/dev-libs/libgpg_error/libgpg_error-1.7 b/dev-libs/libgpg_error/libgpg_error-1.7.recipe similarity index 100% rename from dev-libs/libgpg_error/libgpg_error-1.7 rename to dev-libs/libgpg_error/libgpg_error-1.7.recipe diff --git a/dev-libs/libgpg_error/patches/libgpg-error-1.10.patch b/dev-libs/libgpg_error/patches/libgpg_error-1.10.patch similarity index 100% rename from dev-libs/libgpg_error/patches/libgpg-error-1.10.patch rename to dev-libs/libgpg_error/patches/libgpg_error-1.10.patch diff --git a/dev-libs/libgpg_error/patches/libgpg-error-1.7.patch b/dev-libs/libgpg_error/patches/libgpg_error-1.7.patch similarity index 100% rename from dev-libs/libgpg_error/patches/libgpg-error-1.7.patch rename to dev-libs/libgpg_error/patches/libgpg_error-1.7.patch diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3 b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe similarity index 100% rename from dev-libs/libpthread_stubs/libpthread_stubs-0.3 rename to dev-libs/libpthread_stubs/libpthread_stubs-0.3.2.recipe diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.2 b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe similarity index 100% rename from dev-libs/libpthread_stubs/libpthread_stubs-0.3.2 rename to dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD b/dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD.recipe similarity index 100% rename from dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD rename to dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD.recipe diff --git a/dev-libs/libxdg_basedir/libxdg_basedir-1.1.1 b/dev-libs/libxdg_basedir/libxdg_basedir-1.1.1.recipe similarity index 100% rename from dev-libs/libxdg_basedir/libxdg_basedir-1.1.1 rename to dev-libs/libxdg_basedir/libxdg_basedir-1.1.1.recipe diff --git a/dev-libs/libxdg_basedir/patches/libxdg-basedir-1.1.1.patch b/dev-libs/libxdg_basedir/patches/libxdg_basedir-1.1.1.patch similarity index 100% rename from dev-libs/libxdg_basedir/patches/libxdg-basedir-1.1.1.patch rename to dev-libs/libxdg_basedir/patches/libxdg_basedir-1.1.1.patch diff --git a/dev-libs/mpfr/mpfr-3.0.0_7047 b/dev-libs/mpfr/mpfr-3.0.0_7047 deleted file mode 100644 index c72947f57..000000000 --- a/dev-libs/mpfr/mpfr-3.0.0_7047 +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="library for multiple-precision floating-point computations with exact rounding" -HOMEPAGE="www.mpfr.org" -SRC_URI="svn://scm.gforge.inria.fr/svn/mpfr/branches/3.0#7047" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="dev-libs/gmp = ?.?.?" -#CHECKSUM_MD5="" -BUILD() -{ - cd mpfr-3.0.0-7047 - libtoolize --force --copy --install - aclocal -I m4 - automake --add-missing - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd mpfr-3.0.0-7047 - make install - make check -} - -LICENSE="GNU LGPL v3" -#COPYRIGHT="" diff --git a/dev-libs/xerces_c/xerces_c-3.1.1 b/dev-libs/xerces_c/xerces_c-3.1.1.recipe similarity index 100% rename from dev-libs/xerces_c/xerces_c-3.1.1 rename to dev-libs/xerces_c/xerces_c-3.1.1.recipe diff --git a/dev-perl/XML_Parser/XML_Parser-2.36 b/dev-perl/XML_Parser/XML_Parser-2.36.recipe similarity index 100% rename from dev-perl/XML_Parser/XML_Parser-2.36 rename to dev-perl/XML_Parser/XML_Parser-2.36.recipe diff --git a/dev-python/cnf/cnf-1.0_git b/dev-python/cnf/cnf-1.0_git.recipe similarity index 100% rename from dev-python/cnf/cnf-1.0_git rename to dev-python/cnf/cnf-1.0_git.recipe diff --git a/dev-python/pychart/pychart-1.39_bzr b/dev-python/pychart/pychart-1.39_bzr.recipe similarity index 100% rename from dev-python/pychart/pychart-1.39_bzr rename to dev-python/pychart/pychart-1.39_bzr.recipe diff --git a/dev-qt/qtcore/qtcore-4.8.x_git b/dev-qt/qtcore/qtcore-4.8.x_git deleted file mode 100644 index 5eddfd99a..000000000 --- a/dev-qt/qtcore/qtcore-4.8.x_git +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" -HOMEPAGE="http://qt-haiku.ru" -SRC_URI="git://gitorious.org/+qt-haiku/qt/qt-haiku-port.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -#CHECKSUM_MD5="" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -BUILD() -{ - cd qtcore-4.8.x-git - configure --prefix-install=no -no-pch -no-opengl -no-largefile \ - -fast -nomake examples -nomake demos -release -opensource \ - -confirm-license -no-iconv -phonon -no-phonon-backend \ - -multimedia -no-audio-backend - make -} - -INSTALL() -{ - cd qtcore-4.8.x-git - make install INSTALL_ROOT=${DESTDIR} -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2010 Nokia Corporation and/or its subsidiary(-ies)." diff --git a/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3 b/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe similarity index 100% rename from dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3 rename to dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe diff --git a/dev-util/automoc/automoc-4_git b/dev-util/automoc/automoc-4_git.recipe similarity index 100% rename from dev-util/automoc/automoc-4_git rename to dev-util/automoc/automoc-4_git.recipe diff --git a/dev-util/cmake/cmake-2.6.4.recipe b/dev-util/cmake/cmake-2.6.4.recipe deleted file mode 100644 index e56b75190..000000000 --- a/dev-util/cmake/cmake-2.6.4.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz" -CHECKSUM_MD5="50f387d0436696c4a68b5512a72c9cde" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd cmake-2.6.4 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd cmake-2.6.4 - make install -} -LICENSE="CMake" -COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.0.recipe b/dev-util/cmake/cmake-2.8.0.recipe deleted file mode 100644 index 4c7fdcbbf..000000000 --- a/dev-util/cmake/cmake-2.8.0.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.0.tar.gz" -CHECKSUM_MD5="3b3679b8a6afaedc38a8c15dd7ff4fcf" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd cmake-2.8.0 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd cmake-2.8.0 - make install -} -LICENSE="CMake" -COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.1.recipe b/dev-util/cmake/cmake-2.8.1.recipe deleted file mode 100644 index 80d31865e..000000000 --- a/dev-util/cmake/cmake-2.8.1.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.1.tar.gz" -CHECKSUM_MD5="feadc2e5ebbfed0efc90178583503725" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd cmake-2.8.1 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd cmake-2.8.1 - make install -} -LICENSE="CMake" -COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.2.recipe b/dev-util/cmake/cmake-2.8.2.recipe deleted file mode 100644 index 34695a63f..000000000 --- a/dev-util/cmake/cmake-2.8.2.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.2.tar.gz" -CHECKSUM_MD5="8c967d5264657a798f22ee23976ff0d9" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd cmake-2.8.2 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd cmake-2.8.2 - make install -} -LICENSE="CMake" -COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.3.recipe b/dev-util/cmake/cmake-2.8.3.recipe deleted file mode 100644 index 2b2f007af..000000000 --- a/dev-util/cmake/cmake-2.8.3.recipe +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.3.tar.gz" -CHECKSUM_MD5="a76a44b93acf5e3badda9de111385921" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd cmake-2.8.3 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd cmake-2.8.3 - make install -} -LICENSE="CMake" -COPYRIGHT="2002-2010 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.4.recipe b/dev-util/cmake/cmake-2.8.4.recipe deleted file mode 100644 index 628922d88..000000000 --- a/dev-util/cmake/cmake-2.8.4.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.4.tar.gz" -CHECKSUM_MD5="209b7d1d04b2e00986538d74ba764fcf" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd cmake-2.8.4 - # cmake appends the prefix to mandir and datadir - # so using ../../ to back that part out but for some reason - # the doc was also picking up /boot, so had to back it out 3 times - # this seems to work but might still need some further adjusting -# sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=/data/cmake \ - --docdir=/documentation/doc/CMake \ - --mandir=/documentation/man - make -} - -INSTALL() -{ - cd cmake-2.8.4 - make install -} - -LICENSE="CMake" -COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8_git b/dev-util/cmake/cmake-2.8_git deleted file mode 100644 index 6916936fb..000000000 --- a/dev-util/cmake/cmake-2.8_git +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="git+http://cmake.org/cmake.git" -#CHECKSUM_MD5="" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" -BUILD() -{ - cd cmake-2.8-git - # cmake appends the prefix to mandir and datadir - # so using ../../ to back that part out but for some reason - # the doc was also picking up /boot, so had to back it out 3 times - # this seems to work but might still need some further adjusting -# sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=/data/cmake \ - --docdir=/documentation/doc/CMake \ - --mandir=/documentation/man - make -} - -INSTALL() -{ - cd cmake-2.8-git - make install -} - -TEST() -{ - cd cmake-2.8-git - make test -} - -LICENSE="CMake" -COPYRIGHT="2002-2012 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/patches/cmake-2.6.0-haiku.diff b/dev-util/cmake/patches/cmake-2.6.0-haiku.diff deleted file mode 100644 index c4cd61e23..000000000 --- a/dev-util/cmake/patches/cmake-2.6.0-haiku.diff +++ /dev/null @@ -1,300 +0,0 @@ -diff -ur cmake-2.6.0/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.0-haiku/Modules/CMakeFortranCompilerId.F90.in ---- cmake-2.6.0/Modules/CMakeFortranCompilerId.F90.in 2008-05-05 18:26:04.000000000 +0000 -+++ cmake-2.6.0-haiku/Modules/CMakeFortranCompilerId.F90.in 2008-06-19 11:16:50.000000000 +0000 -@@ -48,6 +48,10 @@ - PRINT *, 'INFO:platform[IRIX]' - #elif defined(__hpux) || defined(__hpux__) - PRINT *, 'INFO:platform[HP-UX]' -+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+ PRINT *, 'INFO:platform[Haiku]' -+! Haiku also defines __BEOS__ so we must -+! put it prior to the check for __BEOS__ - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - PRINT *, 'INFO:platform[BeOS]' - #elif defined(__QNX__) || defined(__QNXNTO__) -diff -ur cmake-2.6.0/Modules/CMakePlatformId.h.in cmake-2.6.0-haiku/Modules/CMakePlatformId.h.in ---- cmake-2.6.0/Modules/CMakePlatformId.h.in 2008-05-05 18:26:04.000000000 +0000 -+++ cmake-2.6.0-haiku/Modules/CMakePlatformId.h.in 2008-06-19 11:16:50.000000000 +0000 -@@ -35,6 +35,11 @@ - #elif defined(__hpux) || defined(__hpux__) - # define PLATFORM_ID "HP-UX" - -+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+# define PLATFORM_ID "Haiku" -+! Haiku also defines __BEOS__ so we must -+! put it prior to the check for __BEOS__ -+ - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - # define PLATFORM_ID "BeOS" - -diff -ur cmake-2.6.0/Modules/CheckForPthreads.c cmake-2.6.0-haiku/Modules/CheckForPthreads.c ---- cmake-2.6.0/Modules/CheckForPthreads.c 2008-05-05 18:26:04.000000000 +0000 -+++ cmake-2.6.0-haiku/Modules/CheckForPthreads.c 2008-06-19 11:16:50.000000000 +0000 -@@ -16,7 +16,7 @@ - pthread_create(&tid[0], 0, runner, (void*)1); - pthread_create(&tid[1], 0, runner, (void*)2); - --#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no usleep on BeOS 5.) - usleep(1); // for strange behavior on single-processor sun - #endif - -Only in cmake-2.6.0-haiku/Modules/Platform: Haiku.cmake -diff -ur cmake-2.6.0/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.0-haiku/Source/CPack/cmCPackGeneratorFactory.cxx ---- cmake-2.6.0/Source/CPack/cmCPackGeneratorFactory.cxx 2008-05-05 18:26:05.000000000 +0000 -+++ cmake-2.6.0-haiku/Source/CPack/cmCPackGeneratorFactory.cxx 2008-06-19 11:16:50.000000000 +0000 -@@ -35,7 +35,7 @@ - #endif - - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) - # include "cmCPackDebGenerator.h" - # include "cmCPackRPMGenerator.h" - #endif -@@ -72,7 +72,8 @@ - cmCPackOSXX11Generator::CreateGenerator); - #endif - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__)\ -+ && !defined(__HAIKU__) - this->RegisterGenerator("DEB", "Debian packages", - cmCPackDebGenerator::CreateGenerator); - this->RegisterGenerator("RPM", "RPM packages", -diff -ur cmake-2.6.0/Source/cmCTest.cxx cmake-2.6.0-haiku/Source/cmCTest.cxx ---- cmake-2.6.0/Source/cmCTest.cxx 2008-05-05 18:26:04.000000000 +0000 -+++ cmake-2.6.0-haiku/Source/cmCTest.cxx 2008-06-19 11:16:50.000000000 +0000 -@@ -49,10 +49,15 @@ - - #include // auto_ptr - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - #include /* disable_debugger() API. */ - #endif - -+#if defined(__HAIKU__) -+#include /* disable_debugger() API. */ -+#endif -+ -+ - #define DEBUGOUT std::cout << __LINE__ << " "; std::cout - #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr - -diff -ur cmake-2.6.0/Source/kwsys/DynamicLoader.cxx cmake-2.6.0-haiku/Source/kwsys/DynamicLoader.cxx ---- cmake-2.6.0/Source/kwsys/DynamicLoader.cxx 2008-05-05 18:26:05.000000000 +0000 -+++ cmake-2.6.0-haiku/Source/kwsys/DynamicLoader.cxx 2008-06-20 14:08:23.000000000 +0000 -@@ -331,7 +331,7 @@ - - // --------------------------------------------------------------- - // 4. Implementation for BeOS --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined(__HAIKU__) - #include // for strerror() - #include - #include -diff -ur cmake-2.6.0/Source/kwsys/ProcessUNIX.c cmake-2.6.0-haiku/Source/kwsys/ProcessUNIX.c ---- cmake-2.6.0/Source/kwsys/ProcessUNIX.c 2008-05-05 18:26:05.000000000 +0000 -+++ cmake-2.6.0-haiku/Source/kwsys/ProcessUNIX.c 2008-06-20 14:06:56.000000000 +0000 -@@ -75,7 +75,7 @@ - typedef int kwsysProcess_ssize_t; - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void kwsysProcess_usleep(unsigned int msec) -diff -ur cmake-2.6.0/Source/kwsys/SystemTools.cxx cmake-2.6.0-haiku/Source/kwsys/SystemTools.cxx ---- cmake-2.6.0/Source/kwsys/SystemTools.cxx 2008-05-05 18:26:05.000000000 +0000 -+++ cmake-2.6.0-haiku/Source/kwsys/SystemTools.cxx 2008-06-19 15:49:33.000000000 +0000 -@@ -131,7 +131,12 @@ - #define _chdir chdir - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#ifdef (__HAIKU__) -+#include -+#include -+#endif -+ -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - #include - #include - -diff -ur cmake-2.6.0/Source/kwsys/testProcess.c cmake-2.6.0-haiku/Source/kwsys/testProcess.c ---- cmake-2.6.0/Source/kwsys/testProcess.c 2008-05-05 18:26:05.000000000 +0000 -+++ cmake-2.6.0-haiku/Source/kwsys/testProcess.c 2008-06-19 11:16:51.000000000 +0000 -@@ -34,7 +34,7 @@ - # pragma warn -8060 /* possibly incorrect assignment */ - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void testProcess_usleep(unsigned int msec) -diff -ur cmake-2.6.0/Tests/Complex/Library/CMakeLists.txt cmake-2.6.0-haiku/Tests/Complex/Library/CMakeLists.txt ---- cmake-2.6.0/Tests/Complex/Library/CMakeLists.txt 2008-05-05 18:26:05.000000000 +0000 -+++ cmake-2.6.0-haiku/Tests/Complex/Library/CMakeLists.txt 2008-06-19 11:16:51.000000000 +0000 -@@ -53,7 +53,9 @@ - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) - IF(NOT BEOS) # No libm on BeOS. -- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ IF(NOT HAIKU) # libm in included in libroot on Haiku -+ SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ ENDIF(NOT HAIKU) - ENDIF(NOT BEOS) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") -diff -ur cmake-2.6.0/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.0-haiku/Utilities/cmcurl/CMake/CurlTests.c ---- cmake-2.6.0/Utilities/cmcurl/CMake/CurlTests.c 2008-05-05 18:26:06.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmcurl/CMake/CurlTests.c 2008-06-19 11:16:51.000000000 +0000 -@@ -38,6 +38,12 @@ - # define PLATFORM_AIX_V3 - #endif - -+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ -+/* many BeOS workarounds are no longer needed in Haiku */ -+#if defined(__HAIKU__) && defined(__BEOS__) -+undef (__BEOS__) -+#endif -+ - #if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) - #error "O_NONBLOCK does not work on this platform" - #endif -diff -ur cmake-2.6.0/Utilities/cmcurl/curl/curl.h cmake-2.6.0-haiku/Utilities/cmcurl/curl/curl.h ---- cmake-2.6.0/Utilities/cmcurl/curl/curl.h 2008-05-05 18:26:06.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmcurl/curl/curl.h 2008-06-19 11:16:51.000000000 +0000 -@@ -1133,7 +1133,7 @@ - } - #endif - --#ifdef __BEOS__ -+#if defined __BEOS__ || defined __HAIKU__ - #include - #endif - -diff -ur cmake-2.6.0/Utilities/cmcurl/if2ip.c cmake-2.6.0-haiku/Utilities/cmcurl/if2ip.c ---- cmake-2.6.0/Utilities/cmcurl/if2ip.c 2008-05-05 18:26:06.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmcurl/if2ip.c 2008-06-19 11:16:51.000000000 +0000 -@@ -39,7 +39,7 @@ - */ - #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \ - !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \ -- !defined(_AMIGASF) && !defined(__minix) -+ !defined(_AMIGASF) && !defined(__minix) && !defined(__HAIKU__) - - #ifdef HAVE_SYS_SOCKET_H - #include -diff -ur cmake-2.6.0/Utilities/cmcurl/select.c cmake-2.6.0-haiku/Utilities/cmcurl/select.c ---- cmake-2.6.0/Utilities/cmcurl/select.c 2008-05-05 18:26:06.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmcurl/select.c 2008-06-19 11:16:51.000000000 +0000 -@@ -39,7 +39,7 @@ - #error "We can't compile without select() support!" - #endif - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - /* BeOS has FD_SET defined in socket.h */ - #include - #endif -diff -ur cmake-2.6.0/Utilities/cmcurl/setup.h cmake-2.6.0-haiku/Utilities/cmcurl/setup.h ---- cmake-2.6.0/Utilities/cmcurl/setup.h 2008-05-05 18:26:06.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmcurl/setup.h 2008-06-19 11:16:51.000000000 +0000 -@@ -264,7 +264,7 @@ - - #else /* MSDOS */ - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - #define sclose(x) closesocket(x) - #else /* __BEOS__ */ - #define sclose(x) close(x) -diff -ur cmake-2.6.0/Utilities/cmtar/libtar.c cmake-2.6.0-haiku/Utilities/cmtar/libtar.c ---- cmake-2.6.0/Utilities/cmtar/libtar.c 2008-05-05 18:26:07.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmtar/libtar.c 2008-06-19 11:16:51.000000000 +0000 -@@ -98,8 +98,8 @@ - { - return -1; - } -- --#if defined(__BEOS__) && !defined(__ZETA__) /* no fchmod on BeOS...do pathname instead. */ -+/* no fchmod on BeOS...do pathname instead. */ -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - if ((oflags & O_CREAT) && chmod(pathname, mode & 07777)) - { - return -1; -diff -ur cmake-2.6.0/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.0-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c ---- cmake-2.6.0/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-05-05 18:26:07.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-06-19 11:16:51.000000000 +0000 -@@ -10,7 +10,7 @@ - - #include "xmlrpc_config.h" - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - /* Some helpful system header has char==bool, then bool.h does int==bool. */ - #define HAVE_BOOL 1 - #endif -diff -ur cmake-2.6.0/Utilities/cmzlib/zconf.h cmake-2.6.0-haiku/Utilities/cmzlib/zconf.h ---- cmake-2.6.0/Utilities/cmzlib/zconf.h 2008-05-05 18:26:07.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmzlib/zconf.h 2008-06-19 11:16:51.000000000 +0000 -@@ -237,7 +237,7 @@ - # endif - #endif - --#if defined (__BEOS__) -+#if defined (__BEOS__) && !defined (__HAIKU__) - # ifdef ZLIB_DLL - # ifdef ZLIB_INTERNAL - # define ZEXPORT __declspec(dllexport) -diff -ur cmake-2.6.0/Utilities/cmzlib/zutil.h cmake-2.6.0-haiku/Utilities/cmzlib/zutil.h ---- cmake-2.6.0/Utilities/cmzlib/zutil.h 2008-05-05 18:26:07.000000000 +0000 -+++ cmake-2.6.0-haiku/Utilities/cmzlib/zutil.h 2008-06-19 11:16:51.000000000 +0000 -@@ -147,7 +147,13 @@ - # define OS_CODE 0x0f - #endif - --#if defined(_BEOS_) || defined(RISCOS) -+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ -+/* many BeOS workarounds are no longer needed in Haiku */ -+#if defined(__HAIKU__) && defined(__BEOS__) -+undef (__BEOS__) -+#endif -+ -+#if defined(_BEOS_) || defined(RISCOS) - # define fdopen(fd,mode) NULL /* No fdopen() */ - #endif - -diff -ur cmake-2.6.0/bootstrap cmake-2.6.0-haiku/bootstrap ---- cmake-2.6.0/bootstrap 2008-05-05 18:26:04.000000000 +0000 -+++ cmake-2.6.0-haiku/bootstrap 2008-06-19 11:16:51.000000000 +0000 -@@ -73,6 +73,13 @@ - cmake_system_beos=false - fi - -+# Determine whether this is Haiku -+if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then -+ cmake_system_haiku=true -+else -+ cmake_system_haiku=false -+fi -+ - # Choose the generator to use for bootstrapping. - if ${cmake_system_mingw}; then - # Bootstrapping from an MSYS prompt. -@@ -603,6 +610,11 @@ - cmake_ld_flags="${LDFLAGS} -lroot -lbe" - fi - -+# Add Haiku toolkits... -+if ${cmake_system_haiku}; then -+ cmake_ld_flags="${LDFLAGS} -lroot -lbe" -+fi -+ - # Test C compiler - cmake_c_compiler= - diff --git a/dev-util/cmake/patches/cmake-2.6.1-haiku-2.diff b/dev-util/cmake/patches/cmake-2.6.1-haiku-2.diff deleted file mode 100644 index 8529c3285..000000000 --- a/dev-util/cmake/patches/cmake-2.6.1-haiku-2.diff +++ /dev/null @@ -1,474 +0,0 @@ -diff -urN cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in ---- cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in 2008-09-12 15:11:49.000000000 +0000 -@@ -50,6 +50,8 @@ - PRINT *, 'INFO:platform[IRIX]' - #elif defined(__hpux) || defined(__hpux__) - PRINT *, 'INFO:platform[HP-UX]' -+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+ PRINT *, 'INFO:platform[Haiku]' - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - PRINT *, 'INFO:platform[BeOS]' - #elif defined(__QNX__) || defined(__QNXNTO__) -diff -urN cmake-2.6.1/Modules/CMakePlatformId.h.in cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in ---- cmake-2.6.1/Modules/CMakePlatformId.h.in 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in 2008-09-12 15:12:47.000000000 +0000 -@@ -35,6 +35,9 @@ - #elif defined(__hpux) || defined(__hpux__) - # define PLATFORM_ID "HP-UX" - -+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+# define PLATFORM_ID "Haiku" -+ - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - # define PLATFORM_ID "BeOS" - -diff -urN cmake-2.6.1/Modules/CheckForPthreads.c cmake-2.6.1-haiku/Modules/CheckForPthreads.c ---- cmake-2.6.1/Modules/CheckForPthreads.c 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CheckForPthreads.c 2008-09-12 15:07:32.000000000 +0000 -@@ -16,7 +16,7 @@ - pthread_create(&tid[0], 0, runner, (void*)1); - pthread_create(&tid[1], 0, runner, (void*)2); - --#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no usleep on BeOS 5.) - usleep(1); // for strange behavior on single-processor sun - #endif - -diff -urN cmake-2.6.1/Modules/Platform/Haiku.cmake cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake ---- cmake-2.6.1/Modules/Platform/Haiku.cmake 1970-01-01 00:00:00.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake 2008-09-12 15:07:32.000000000 +0000 -@@ -0,0 +1,14 @@ -+SET(BEOS 1) -+ -+# GCC is the default compiler on Haiku. -+INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake) -+ -+SET(CMAKE_DL_LIBS root be) -+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") -+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") -+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") -+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,") -+ -+INCLUDE(Platform/UnixPaths) -diff -urN cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx ---- cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx 2008-08-01 15:34:53.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx 2008-09-12 15:07:32.000000000 +0000 -@@ -36,7 +36,7 @@ - #endif - - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) - # include "cmCPackDebGenerator.h" - # include "cmCPackRPMGenerator.h" - #endif -@@ -75,7 +75,8 @@ - cmCPackOSXX11Generator::CreateGenerator); - #endif - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__)\ -+ && !defined(__HAIKU__) - this->RegisterGenerator("DEB", "Debian packages", - cmCPackDebGenerator::CreateGenerator); - this->RegisterGenerator("RPM", "RPM packages", -diff -urN cmake-2.6.1/Source/cmCTest.cxx cmake-2.6.1-haiku/Source/cmCTest.cxx ---- cmake-2.6.1/Source/cmCTest.cxx 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmCTest.cxx 2008-09-12 15:07:32.000000000 +0000 -@@ -49,10 +49,15 @@ - - #include // auto_ptr - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - #include /* disable_debugger() API. */ - #endif - -+#if defined(__HAIKU__) -+#include /* disable_debugger() API. */ -+#endif -+ -+ - #define DEBUGOUT std::cout << __LINE__ << " "; std::cout - #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr - -@@ -607,7 +612,7 @@ - cmSystemTools::PutEnv("DASHBOARD_TEST_FROM_CTEST=" CMake_VERSION); - #if defined(_WIN32) - SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - disable_debugger(1); - #endif - } -diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.cxx cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx ---- cmake-2.6.1/Source/cmDependsJavaLexer.cxx 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx 2008-09-12 15:07:33.000000000 +0000 -@@ -23,7 +23,7 @@ - #include - #include - --#if defined(__BEOS__) -+#if defined(__BEOS__) || defined (__HAIKU__) - #include /* prevents a conflict with a #define later on... */ - #endif - -diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.h cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h ---- cmake-2.6.1/Source/cmDependsJavaLexer.h 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h 2008-09-12 15:07:33.000000000 +0000 -@@ -38,7 +38,7 @@ - #include - #include - --#if defined(__BEOS__) -+#if defined(__BEOS__) || defined(__HAIKU__) - #include /* prevents a conflict with a #define later on... */ - #endif - -diff -urN cmake-2.6.1/Source/cmSystemTools.cxx cmake-2.6.1-haiku/Source/cmSystemTools.cxx ---- cmake-2.6.1/Source/cmSystemTools.cxx 2008-08-01 15:34:53.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmSystemTools.cxx 2008-09-12 15:10:22.000000000 +0000 -@@ -910,7 +910,7 @@ - fflush(stdout); - fflush(stderr); - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - beos_seen_signal = false; - signal(SIGCHLD, beos_popen_workaround); - #endif -@@ -918,7 +918,7 @@ - FILE* cpipe = popen(command, "r"); - if(!cpipe) - { --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - signal(SIGCHLD, SIG_DFL); - #endif - return false; -@@ -931,12 +931,13 @@ - cmSystemTools::Stdout(buffer); - } - output += buffer; -+ buffer[0] = 0; - fgets(buffer, BUFFER_SIZE, cpipe); - } - - retVal = pclose(cpipe); - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - for (int i = 0; (!beos_seen_signal) && (i < 3); i++) - { - ::sleep(1); // signals should interrupt this... -@@ -970,11 +971,13 @@ - error << "SIGFPE"; - break; - #endif -+#ifndef __HAIKU__ - #ifdef SIGBUS - case SIGBUS: - error << "SIGBUS"; - break; - #endif -+#endif - #ifdef SIGSEGV - case SIGSEGV: - error << "SIGSEGV"; -@@ -1696,7 +1699,7 @@ - } - - // no fchmod on BeOS 5...do pathname instead. --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - if ((oflags & O_CREAT) && chmod(pathname, mode)) - { - return -1; -diff -urN cmake-2.6.1/Source/kwsys/DynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx ---- cmake-2.6.1/Source/kwsys/DynamicLoader.cxx 2008-08-01 15:34:54.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx 2008-09-12 15:07:33.000000000 +0000 -@@ -335,11 +335,21 @@ - #endif //_WIN32 - - // --------------------------------------------------------------- --// 4. Implementation for BeOS --#ifdef __BEOS__ -+// 4. Implementation for BeOS / Haiku -+#if defined __BEOS__ || defined(__HAIKU__) -+ - #include // for strerror() -+ -+#ifdef __BEOS__ - #include - #include -+#endif -+ -+#ifdef __HAIKU__ -+#include -+#include -+#endif -+ - #define DYNAMICLOADER_DEFINED 1 - - namespace KWSYS_NAMESPACE -diff -urN cmake-2.6.1/Source/kwsys/ProcessUNIX.c cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c ---- cmake-2.6.1/Source/kwsys/ProcessUNIX.c 2008-08-01 15:34:54.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c 2008-09-12 15:07:33.000000000 +0000 -@@ -75,7 +75,7 @@ - typedef int kwsysProcess_ssize_t; - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void kwsysProcess_usleep(unsigned int msec) -diff -urN cmake-2.6.1/Source/kwsys/SystemTools.cxx cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx ---- cmake-2.6.1/Source/kwsys/SystemTools.cxx 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx 2008-09-12 15:07:33.000000000 +0000 -@@ -131,7 +131,12 @@ - #define _chdir chdir - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__HAIKU__) -+#include -+#include -+#endif -+ -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - #include - #include - -diff -urN cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx ---- cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx 2008-09-12 15:07:33.000000000 +0000 -@@ -17,10 +17,14 @@ - #include KWSYS_HEADER(ios/iostream) - #include KWSYS_HEADER(stl/string) - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - #include /* disable_debugger() API. */ - #endif - -+#if defined(__HAIKU__) -+#include /* disable_debugger() API. */ -+#endif -+ - // Work-around CMake dependency scanning limitation. This must - // duplicate the above list of headers. - #if 0 -diff -urN cmake-2.6.1/Source/kwsys/testProcess.c cmake-2.6.1-haiku/Source/kwsys/testProcess.c ---- cmake-2.6.1/Source/kwsys/testProcess.c 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/testProcess.c 2008-09-12 15:07:33.000000000 +0000 -@@ -34,7 +34,7 @@ - # pragma warn -8060 /* possibly incorrect assignment */ - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void testProcess_usleep(unsigned int msec) -diff -urN cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt ---- cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt 2008-09-12 15:07:33.000000000 +0000 -@@ -53,7 +53,9 @@ - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) - IF(NOT BEOS) # No libm on BeOS. -- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ IF(NOT HAIKU) # libm in included in libroot on Haiku -+ SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ ENDIF(NOT HAIKU) - ENDIF(NOT BEOS) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") -diff -urN cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt ---- cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt 2008-08-01 15:34:56.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt 2008-09-12 15:07:33.000000000 +0000 -@@ -53,7 +53,9 @@ - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) - IF(NOT BEOS) # No libm on BeOS. -+ IF(NOT HAIKU) # No limb on Haiku. - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ ENDIF(NOT HAIKU) - ENDIF(NOT BEOS) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") -diff -urN cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt ---- cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2008-08-01 15:34:56.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2008-09-12 15:07:33.000000000 +0000 -@@ -53,7 +53,9 @@ - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) - IF(NOT BEOS) # No libm on BeOS. -+ IF(NOT HAIKU) # No libm on Haiku. - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ ENDIF(NOT HAIKU) - ENDIF(NOT BEOS) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") -diff -urN cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c ---- cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c 2008-09-12 15:07:34.000000000 +0000 -@@ -38,7 +38,7 @@ - # define PLATFORM_AIX_V3 - #endif - --#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) -+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) - #error "O_NONBLOCK does not work on this platform" - #endif - int socket; -diff -urN cmake-2.6.1/Utilities/cmcurl/CMakeLists.txt cmake-2.6.1-haiku/Utilities/cmcurl/CMakeLists.txt ---- cmake-2.6.1/Utilities/cmcurl/CMakeLists.txt 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/CMakeLists.txt 2008-09-12 15:07:34.000000000 +0000 -@@ -165,6 +165,8 @@ - CHECK_LIBRARY_EXISTS_CONCAT("bnetapi" closesocket HAVE_LIBBNETAPI) - ENDIF(BEOS) - -+CHECK_LIBRARY_EXISTS_CONCAT("network" recv HAVE_LIBNETWORK) -+ - IF(NOT NOT_NEED_LIBNSL) - CHECK_LIBRARY_EXISTS_CONCAT("nsl" gethostbyname HAVE_LIBNSL) - ENDIF(NOT NOT_NEED_LIBNSL) -diff -urN cmake-2.6.1/Utilities/cmcurl/curl/curl.h cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h ---- cmake-2.6.1/Utilities/cmcurl/curl/curl.h 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h 2008-09-12 15:07:34.000000000 +0000 -@@ -1133,7 +1133,7 @@ - } - #endif - --#ifdef __BEOS__ -+#if defined __BEOS__ || defined __HAIKU__ - #include - #endif - -diff -urN cmake-2.6.1/Utilities/cmcurl/if2ip.c cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c ---- cmake-2.6.1/Utilities/cmcurl/if2ip.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c 2008-09-12 15:07:34.000000000 +0000 -@@ -39,7 +39,7 @@ - */ - #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \ - !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \ -- !defined(_AMIGASF) && !defined(__minix) -+ !defined(_AMIGASF) && !defined(__minix) && !defined(__HAIKU__) - - #ifdef HAVE_SYS_SOCKET_H - #include -diff -urN cmake-2.6.1/Utilities/cmcurl/select.c cmake-2.6.1-haiku/Utilities/cmcurl/select.c ---- cmake-2.6.1/Utilities/cmcurl/select.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/select.c 2008-09-12 15:07:34.000000000 +0000 -@@ -39,7 +39,7 @@ - #error "We can't compile without select() support!" - #endif - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - /* BeOS has FD_SET defined in socket.h */ - #include - #endif -diff -urN cmake-2.6.1/Utilities/cmcurl/setup.h cmake-2.6.1-haiku/Utilities/cmcurl/setup.h ---- cmake-2.6.1/Utilities/cmcurl/setup.h 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/setup.h 2008-09-12 15:07:34.000000000 +0000 -@@ -264,7 +264,7 @@ - - #else /* MSDOS */ - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - #define sclose(x) closesocket(x) - #else /* __BEOS__ */ - #define sclose(x) close(x) -diff -urN cmake-2.6.1/Utilities/cmtar/libtar.c cmake-2.6.1-haiku/Utilities/cmtar/libtar.c ---- cmake-2.6.1/Utilities/cmtar/libtar.c 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmtar/libtar.c 2008-09-12 15:07:34.000000000 +0000 -@@ -98,8 +98,8 @@ - { - return -1; - } -- --#if defined(__BEOS__) && !defined(__ZETA__) /* no fchmod on BeOS...do pathname instead. */ -+/* no fchmod on BeOS...do pathname instead. */ -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - if ((oflags & O_CREAT) && chmod(pathname, mode & 07777)) - { - return -1; -diff -urN cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c ---- cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-09-12 15:07:34.000000000 +0000 -@@ -10,7 +10,7 @@ - - #include "xmlrpc_config.h" - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - /* Some helpful system header has char==bool, then bool.h does int==bool. */ - #define HAVE_BOOL 1 - #endif -diff -urN cmake-2.6.1/Utilities/cmzlib/zconf.h cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h ---- cmake-2.6.1/Utilities/cmzlib/zconf.h 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h 2008-09-12 15:07:34.000000000 +0000 -@@ -237,7 +237,7 @@ - # endif - #endif - --#if defined (__BEOS__) - -+#if defined (__BEOS__) && !defined (__HAIKU__) - # ifdef ZLIB_DLL - # ifdef ZLIB_INTERNAL - # define ZEXPORT __declspec(dllexport) -diff -urN cmake-2.6.1/Utilities/cmzlib/zutil.h cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h ---- cmake-2.6.1/Utilities/cmzlib/zutil.h 2008-08-01 15:34:59.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h 2008-09-12 15:07:34.000000000 +0000 -@@ -147,7 +147,13 @@ - # define OS_CODE 0x0f - #endif - --#if defined(_BEOS_) || defined(RISCOS) -+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ -+/* many BeOS workarounds are no longer needed in Haiku */ -+#if defined(__HAIKU__) && defined(__BEOS__) -+#undef __BEOS__ -+#endif -+ -+#if defined(_BEOS_) || defined(RISCOS) - # define fdopen(fd,mode) NULL /* No fdopen() */ - #endif - -diff -urN cmake-2.6.1/bootstrap cmake-2.6.1-haiku/bootstrap ---- cmake-2.6.1/bootstrap 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/bootstrap 2008-09-12 15:07:34.000000000 +0000 -@@ -73,6 +73,13 @@ - cmake_system_beos=false - fi - -+# Determine whether this is Haiku -+if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then -+ cmake_system_haiku=true -+else -+ cmake_system_haiku=false -+fi -+ - # Choose the generator to use for bootstrapping. - if ${cmake_system_mingw}; then - # Bootstrapping from an MSYS prompt. -@@ -603,6 +610,11 @@ - cmake_ld_flags="${LDFLAGS} -lroot -lbe" - fi - -+# Add Haiku toolkits... -+if ${cmake_system_haiku}; then -+ cmake_ld_flags="${LDFLAGS} -lroot -lbe" -+fi -+ - # Test C compiler - cmake_c_compiler= - diff --git a/dev-util/cmake/patches/cmake-2.6.1-haiku.diff b/dev-util/cmake/patches/cmake-2.6.1-haiku.diff deleted file mode 100644 index 1ce790b13..000000000 --- a/dev-util/cmake/patches/cmake-2.6.1-haiku.diff +++ /dev/null @@ -1,449 +0,0 @@ -diff -urN cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in ---- cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in 2008-08-20 13:49:06.000000000 +0000 -@@ -50,6 +50,10 @@ - PRINT *, 'INFO:platform[IRIX]' - #elif defined(__hpux) || defined(__hpux__) - PRINT *, 'INFO:platform[HP-UX]' -+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+ PRINT *, 'INFO:platform[Haiku]' -+! Haiku also defines __BEOS__ so we must -+! put it prior to the check for __BEOS__ - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - PRINT *, 'INFO:platform[BeOS]' - #elif defined(__QNX__) || defined(__QNXNTO__) -diff -urN cmake-2.6.1/Modules/CMakePlatformId.h.in cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in ---- cmake-2.6.1/Modules/CMakePlatformId.h.in 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in 2008-08-20 13:49:06.000000000 +0000 -@@ -35,6 +35,11 @@ - #elif defined(__hpux) || defined(__hpux__) - # define PLATFORM_ID "HP-UX" - -+#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+# define PLATFORM_ID "Haiku" -+! Haiku also defines __BEOS__ so we must -+! put it prior to the check for __BEOS__ -+ - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - # define PLATFORM_ID "BeOS" - -diff -urN cmake-2.6.1/Modules/CheckForPthreads.c cmake-2.6.1-haiku/Modules/CheckForPthreads.c ---- cmake-2.6.1/Modules/CheckForPthreads.c 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CheckForPthreads.c 2008-08-20 13:49:06.000000000 +0000 -@@ -16,7 +16,7 @@ - pthread_create(&tid[0], 0, runner, (void*)1); - pthread_create(&tid[1], 0, runner, (void*)2); - --#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no usleep on BeOS 5.) - usleep(1); // for strange behavior on single-processor sun - #endif - -diff -urN cmake-2.6.1/Modules/Platform/Haiku.cmake cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake ---- cmake-2.6.1/Modules/Platform/Haiku.cmake 1970-01-01 00:00:00.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake 2008-08-20 13:49:06.000000000 +0000 -@@ -0,0 +1,14 @@ -+SET(BEOS 1) -+ -+# GCC is the default compiler on Haiku. -+INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake) -+ -+SET(CMAKE_DL_LIBS root be) -+SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") -+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") -+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") -+SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -+SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -+SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,") -+ -+INCLUDE(Platform/UnixPaths) -diff -urN cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx ---- cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx 2008-08-01 15:34:53.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx 2008-08-20 13:49:06.000000000 +0000 -@@ -36,7 +36,7 @@ - #endif - - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) - # include "cmCPackDebGenerator.h" - # include "cmCPackRPMGenerator.h" - #endif -@@ -75,7 +75,8 @@ - cmCPackOSXX11Generator::CreateGenerator); - #endif - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__)\ -+ && !defined(__HAIKU__) - this->RegisterGenerator("DEB", "Debian packages", - cmCPackDebGenerator::CreateGenerator); - this->RegisterGenerator("RPM", "RPM packages", -diff -urN cmake-2.6.1/Source/cmCTest.cxx cmake-2.6.1-haiku/Source/cmCTest.cxx ---- cmake-2.6.1/Source/cmCTest.cxx 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmCTest.cxx 2008-08-20 13:49:06.000000000 +0000 -@@ -49,10 +49,15 @@ - - #include // auto_ptr - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - #include /* disable_debugger() API. */ - #endif - -+#if defined(__HAIKU__) -+#include /* disable_debugger() API. */ -+#endif -+ -+ - #define DEBUGOUT std::cout << __LINE__ << " "; std::cout - #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr - -@@ -607,7 +612,7 @@ - cmSystemTools::PutEnv("DASHBOARD_TEST_FROM_CTEST=" CMake_VERSION); - #if defined(_WIN32) - SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - disable_debugger(1); - #endif - } -diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.cxx cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx ---- cmake-2.6.1/Source/cmDependsJavaLexer.cxx 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx 2008-08-20 13:49:06.000000000 +0000 -@@ -23,7 +23,7 @@ - #include - #include - --#if defined(__BEOS__) -+#if defined(__BEOS__) || defined (__HAIKU__) - #include /* prevents a conflict with a #define later on... */ - #endif - -diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.h cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h ---- cmake-2.6.1/Source/cmDependsJavaLexer.h 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h 2008-08-20 13:49:06.000000000 +0000 -@@ -38,7 +38,7 @@ - #include - #include - --#if defined(__BEOS__) -+#if defined(__BEOS__) || defined(__HAIKU__) - #include /* prevents a conflict with a #define later on... */ - #endif - -diff -urN cmake-2.6.1/Source/cmSystemTools.cxx cmake-2.6.1-haiku/Source/cmSystemTools.cxx ---- cmake-2.6.1/Source/cmSystemTools.cxx 2008-08-01 15:34:53.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmSystemTools.cxx 2008-08-20 13:49:06.000000000 +0000 -@@ -970,11 +970,13 @@ - error << "SIGFPE"; - break; - #endif -+#ifndef __HAIKU__ - #ifdef SIGBUS - case SIGBUS: - error << "SIGBUS"; - break; - #endif -+#endif - #ifdef SIGSEGV - case SIGSEGV: - error << "SIGSEGV"; -@@ -1696,7 +1698,7 @@ - } - - // no fchmod on BeOS 5...do pathname instead. --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - if ((oflags & O_CREAT) && chmod(pathname, mode)) - { - return -1; -diff -urN cmake-2.6.1/Source/kwsys/DynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx ---- cmake-2.6.1/Source/kwsys/DynamicLoader.cxx 2008-08-01 15:34:54.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx 2008-08-20 13:49:06.000000000 +0000 -@@ -335,11 +335,21 @@ - #endif //_WIN32 - - // --------------------------------------------------------------- --// 4. Implementation for BeOS --#ifdef __BEOS__ -+// 4. Implementation for BeOS / Haiku -+#if defined __BEOS__ || defined(__HAIKU__) -+ - #include // for strerror() -+ -+#ifdef __BEOS__ - #include - #include -+#endif -+ -+#ifdef __HAIKU__ -+#include -+#include -+#endif -+ - #define DYNAMICLOADER_DEFINED 1 - - namespace KWSYS_NAMESPACE -diff -urN cmake-2.6.1/Source/kwsys/ProcessUNIX.c cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c ---- cmake-2.6.1/Source/kwsys/ProcessUNIX.c 2008-08-01 15:34:54.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c 2008-08-20 13:49:06.000000000 +0000 -@@ -75,7 +75,7 @@ - typedef int kwsysProcess_ssize_t; - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void kwsysProcess_usleep(unsigned int msec) -@@ -2534,6 +2534,7 @@ - } - - /* If this is the first process, enable the signal handler. */ -+#ifndef __HAIKU__ - if(newProcesses.Count == 1) - { - /* Install our handler for SIGCHLD. Repeat call until it is not -@@ -2554,6 +2555,7 @@ - &kwsysProcessesOldSigChldAction) < 0) && - (errno == EINTR)); - } -+#endif - } - - return 1; - -diff -urN cmake-2.6.1/Source/kwsys/SystemTools.cxx cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx ---- cmake-2.6.1/Source/kwsys/SystemTools.cxx 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx 2008-08-20 13:49:06.000000000 +0000 -@@ -131,7 +131,12 @@ - #define _chdir chdir - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__HAIKU__) -+#include -+#include -+#endif -+ -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - #include - #include - -diff -urN cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx ---- cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx 2008-08-20 13:49:06.000000000 +0000 -@@ -17,10 +17,14 @@ - #include KWSYS_HEADER(ios/iostream) - #include KWSYS_HEADER(stl/string) - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - #include /* disable_debugger() API. */ - #endif - -+#if defined(__HAIKU__) -+#include /* disable_debugger() API. */ -+#endif -+ - // Work-around CMake dependency scanning limitation. This must - // duplicate the above list of headers. - #if 0 -diff -urN cmake-2.6.1/Source/kwsys/testProcess.c cmake-2.6.1-haiku/Source/kwsys/testProcess.c ---- cmake-2.6.1/Source/kwsys/testProcess.c 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/testProcess.c 2008-08-20 13:49:06.000000000 +0000 -@@ -34,7 +34,7 @@ - # pragma warn -8060 /* possibly incorrect assignment */ - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void testProcess_usleep(unsigned int msec) -diff -urN cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt ---- cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt 2008-08-20 13:49:06.000000000 +0000 -@@ -53,7 +53,9 @@ - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) - IF(NOT BEOS) # No libm on BeOS. -- SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ IF(NOT HAIKU) # libm in included in libroot on Haiku -+ SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ ENDIF(NOT HAIKU) - ENDIF(NOT BEOS) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") -diff -urN cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt ---- cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt 2008-08-01 15:34:56.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt 2008-08-20 13:49:06.000000000 +0000 -@@ -53,7 +53,9 @@ - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) - IF(NOT BEOS) # No libm on BeOS. -+ IF(NOT HAIKU) # No limb on Haiku. - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ ENDIF(NOT HAIKU) - ENDIF(NOT BEOS) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") -diff -urN cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt ---- cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2008-08-01 15:34:56.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2008-08-20 13:49:07.000000000 +0000 -@@ -53,7 +53,9 @@ - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) - IF(NOT BEOS) # No libm on BeOS. -+ IF(NOT HAIKU) # No libm on Haiku. - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") -+ ENDIF(NOT HAIKU) - ENDIF(NOT BEOS) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") -diff -urN cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c ---- cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c 2008-08-20 13:49:07.000000000 +0000 -@@ -38,7 +38,7 @@ - # define PLATFORM_AIX_V3 - #endif - --#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) -+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) - #error "O_NONBLOCK does not work on this platform" - #endif - int socket; -diff -urN cmake-2.6.1/Utilities/cmcurl/curl/curl.h cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h ---- cmake-2.6.1/Utilities/cmcurl/curl/curl.h 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h 2008-08-20 13:49:07.000000000 +0000 -@@ -1133,7 +1133,7 @@ - } - #endif - --#ifdef __BEOS__ -+#if defined __BEOS__ || defined __HAIKU__ - #include - #endif - -diff -urN cmake-2.6.1/Utilities/cmcurl/if2ip.c cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c ---- cmake-2.6.1/Utilities/cmcurl/if2ip.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c 2008-08-20 13:49:07.000000000 +0000 -@@ -39,7 +39,7 @@ - */ - #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \ - !defined(__riscos__) && !defined(__INTERIX) && !defined(NETWARE) && \ -- !defined(_AMIGASF) && !defined(__minix) -+ !defined(_AMIGASF) && !defined(__minix) && !defined(__HAIKU__) - - #ifdef HAVE_SYS_SOCKET_H - #include -diff -urN cmake-2.6.1/Utilities/cmcurl/select.c cmake-2.6.1-haiku/Utilities/cmcurl/select.c ---- cmake-2.6.1/Utilities/cmcurl/select.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/select.c 2008-08-20 13:49:07.000000000 +0000 -@@ -39,7 +39,7 @@ - #error "We can't compile without select() support!" - #endif - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - /* BeOS has FD_SET defined in socket.h */ - #include - #endif -diff -urN cmake-2.6.1/Utilities/cmcurl/setup.h cmake-2.6.1-haiku/Utilities/cmcurl/setup.h ---- cmake-2.6.1/Utilities/cmcurl/setup.h 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/setup.h 2008-08-20 13:49:07.000000000 +0000 -@@ -264,7 +264,7 @@ - - #else /* MSDOS */ - --#ifdef __BEOS__ -+#if defined __BEOS__ && !defined __HAIKU__ - #define sclose(x) closesocket(x) - #else /* __BEOS__ */ - #define sclose(x) close(x) -diff -urN cmake-2.6.1/Utilities/cmtar/libtar.c cmake-2.6.1-haiku/Utilities/cmtar/libtar.c ---- cmake-2.6.1/Utilities/cmtar/libtar.c 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmtar/libtar.c 2008-08-20 13:49:07.000000000 +0000 -@@ -98,8 +98,8 @@ - { - return -1; - } -- --#if defined(__BEOS__) && !defined(__ZETA__) /* no fchmod on BeOS...do pathname instead. */ -+/* no fchmod on BeOS...do pathname instead. */ -+#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) - if ((oflags & O_CREAT) && chmod(pathname, mode & 07777)) - { - return -1; -diff -urN cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c ---- cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-08-20 13:49:07.000000000 +0000 -@@ -10,7 +10,7 @@ - - #include "xmlrpc_config.h" - --#if defined(__BEOS__) -+#if defined(__BEOS__) && !defined(__HAIKU__) - /* Some helpful system header has char==bool, then bool.h does int==bool. */ - #define HAVE_BOOL 1 - #endif -diff -urN cmake-2.6.1/Utilities/cmzlib/zconf.h cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h ---- cmake-2.6.1/Utilities/cmzlib/zconf.h 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h 2008-08-20 13:49:07.000000000 +0000 -@@ -237,7 +237,7 @@ - # endif - #endif - --#if defined (__BEOS__) -+#if defined (__BEOS__) && !defined (__HAIKU__) - # ifdef ZLIB_DLL - # ifdef ZLIB_INTERNAL - # define ZEXPORT __declspec(dllexport) -diff -urN cmake-2.6.1/Utilities/cmzlib/zutil.h cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h ---- cmake-2.6.1/Utilities/cmzlib/zutil.h 2008-08-01 15:34:59.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h 2008-08-20 13:49:07.000000000 +0000 -@@ -147,7 +147,13 @@ - # define OS_CODE 0x0f - #endif - --#if defined(_BEOS_) || defined(RISCOS) -+/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ -+/* many BeOS workarounds are no longer needed in Haiku */ -+#if defined(__HAIKU__) && defined(__BEOS__) -+undef (__BEOS__) -+#endif -+ -+#if defined(_BEOS_) || defined(RISCOS) - # define fdopen(fd,mode) NULL /* No fdopen() */ - #endif - -diff -urN cmake-2.6.1/bootstrap cmake-2.6.1-haiku/bootstrap ---- cmake-2.6.1/bootstrap 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/bootstrap 2008-08-20 13:49:07.000000000 +0000 -@@ -73,6 +73,13 @@ - cmake_system_beos=false - fi - -+# Determine whether this is Haiku -+if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then -+ cmake_system_haiku=true -+else -+ cmake_system_haiku=false -+fi -+ - # Choose the generator to use for bootstrapping. - if ${cmake_system_mingw}; then - # Bootstrapping from an MSYS prompt. -@@ -603,6 +610,11 @@ - cmake_ld_flags="${LDFLAGS} -lroot -lbe" - fi - -+# Add Haiku toolkits... -+if ${cmake_system_haiku}; then -+ cmake_ld_flags="${LDFLAGS} -lroot -lbe" -+fi -+ - # Test C compiler - cmake_c_compiler= - diff --git a/dev-util/cmake/patches/cmake-2.8-git.patch b/dev-util/cmake/patches/cmake-2.8-git.patch deleted file mode 100644 index cf4523c08..000000000 --- a/dev-util/cmake/patches/cmake-2.8-git.patch +++ /dev/null @@ -1,229 +0,0 @@ -diff -urN cmake-2.8-git-orig/Modules/Platform/Haiku.cmake cmake-2.8-git/Modules/Platform/Haiku.cmake ---- cmake-2.8-git-orig/Modules/Platform/Haiku.cmake 2012-12-03 12:11:47.804519936 -0800 -+++ cmake-2.8-git/Modules/Platform/Haiku.cmake 2012-12-03 12:02:17.652738560 -0800 -@@ -1,20 +1,25 @@ -+set(HAIKU 1) -+set(UNIX 1) -+ -+set(CMAKE_DL_LIBS "") --set(BEOS 1) -- --set(CMAKE_DL_LIBS root be) --set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC") --set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE") - set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") -+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") --set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") - set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") - set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -+set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") - set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -+set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") -+ -+list(APPEND CMAKE_SYSTEM_PREFIX_PATH -+ /boot/common/non-packaged -+ /boot/common -+ /boot/system -+ ) -+list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -+ /boot/common/non-packaged/lib -+ /boot/common/lib -+ /boot/develop/lib/x86 -+ ) -- --include(Platform/UnixPaths) --list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) --list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) --list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) --list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) --list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) - -diff -urN cmake-2.8-git-orig/Source/cmExportCommand.cxx cmake-2.8-git/Source/cmExportCommand.cxx ---- cmake-2.8-git-orig/Source/cmExportCommand.cxx 2012-11-27 05:26:33.039059456 -0800 -+++ cmake-2.8-git/Source/cmExportCommand.cxx 2012-12-03 12:02:17.665059328 -0800 -@@ -20,7 +20,8 @@ - #include "cmExportBuildFileGenerator.h" - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - cmExportCommand::cmExportCommand() -@@ -305,14 +306,15 @@ - const char* hash) - { - #if defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) != -+ B_OK) - { - return; - } -- dir.Append("cmake/packages"); -- dir.Append(package.c_str()); -- std::string fname = dir.Path(); -+ std::string fname = dir; -+ fname += "/cmake/packages/"; -+ fname += package; - #else - const char* home = cmSystemTools::GetEnv("HOME"); - if(!home) -diff -urN cmake-2.8-git-orig/Source/cmFindPackageCommand.cxx cmake-2.8-git/Source/cmFindPackageCommand.cxx ---- cmake-2.8-git-orig/Source/cmFindPackageCommand.cxx 2012-11-27 05:26:33.059768832 -0800 -+++ cmake-2.8-git/Source/cmFindPackageCommand.cxx 2012-12-03 12:02:17.666107904 -0800 -@@ -19,7 +19,9 @@ - #endif - - #if defined(__HAIKU__) --#include -+#include -+#include -+#include - #endif - - void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, -@@ -1583,12 +1585,13 @@ - #if defined(_WIN32) && !defined(__CYGWIN__) - this->LoadPackageRegistryWinUser(); - #elif defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == -+ B_OK) - { -- dir.Append("cmake/packages"); -- dir.Append(this->Name.c_str()); -- this->LoadPackageRegistryDir(dir.Path()); -+ strlcat(dir, "/cmake/packages/", sizeof(dir)); -+ strlcat(dir, this->Name.c_str(), sizeof(dir)); -+ this->LoadPackageRegistryDir(dir); - } - #else - if(const char* home = cmSystemTools::GetEnv("HOME")) -diff -urN cmake-2.8-git-orig/Source/cmLocalGenerator.cxx cmake-2.8-git/Source/cmLocalGenerator.cxx ---- cmake-2.8-git-orig/Source/cmLocalGenerator.cxx 2012-11-27 05:26:33.035389440 -0800 -+++ cmake-2.8-git/Source/cmLocalGenerator.cxx 2012-12-03 12:02:17.672399360 -0800 -@@ -37,7 +37,8 @@ - #include - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - cmLocalGenerator::cmLocalGenerator() -@@ -354,12 +355,12 @@ - prefix = prefix_win32.c_str(); - } - #elif defined(__HAIKU__) -+ char dir[B_PATH_NAME_LENGTH]; - if (!prefix) - { -- BPath dir; -- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) -+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) - { -- prefix = dir.Path(); -+ prefix = dir; - } - else - { -diff -urN cmake-2.8-git-orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8-git/Source/CPack/cmCPackGenerator.cxx ---- cmake-2.8-git-orig/Source/CPack/cmCPackGenerator.cxx 2012-11-27 05:26:32.015466496 -0800 -+++ cmake-2.8-git/Source/CPack/cmCPackGenerator.cxx 2012-12-03 12:02:17.677904384 -0800 -@@ -27,7 +27,8 @@ - #include - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - //---------------------------------------------------------------------- -@@ -1265,10 +1266,10 @@ - this->InstallPath += "-"; - this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); - #elif defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) - { -- this->InstallPath = dir.Path(); -+ this->InstallPath = dir; - } - else - { -diff -urN cmake-2.8-git-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8-git/Tests/ComplexOneConfig/Library/CMakeLists.txt ---- cmake-2.8-git-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-11-27 05:26:34.013369344 -0800 -+++ cmake-2.8-git/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-12-03 12:02:42.181665792 -0800 -@@ -51,7 +51,7 @@ - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" - ) - set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) --if(NOT BEOS AND NOT WIN32) # No libm on BeOS. -+if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. - set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") - endif() - get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) -diff -urN cmake-2.8-git-orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8-git/Utilities/cmcurl/CMake/CurlTests.c ---- cmake-2.8-git-orig/Utilities/cmcurl/CMake/CurlTests.c 2012-11-27 05:26:34.045350912 -0800 -+++ cmake-2.8-git/Utilities/cmcurl/CMake/CurlTests.c 2012-12-03 12:02:42.189005824 -0800 -@@ -38,7 +38,7 @@ - # define PLATFORM_AIX_V3 - #endif - --#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) -+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) - #error "O_NONBLOCK does not work on this platform" - #endif - int socket; -diff -urN cmake-2.8-git-orig/Utilities/cmcurl/select.c cmake-2.8-git/Utilities/cmcurl/select.c ---- cmake-2.8-git-orig/Utilities/cmcurl/select.c 2012-11-27 05:26:34.055312384 -0800 -+++ cmake-2.8-git/Utilities/cmcurl/select.c 2012-12-03 12:02:42.189792256 -0800 -@@ -39,7 +39,7 @@ - #error "We can't compile without select() support!" - #endif - --#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) - /* BeOS has FD_SET defined in socket.h */ - #include - #endif -diff -urN cmake-2.8-git-orig/Utilities/cmzlib/zconf.h cmake-2.8-git/Utilities/cmzlib/zconf.h ---- cmake-2.8-git-orig/Utilities/cmzlib/zconf.h 2012-11-27 05:26:34.022020096 -0800 -+++ cmake-2.8-git/Utilities/cmzlib/zconf.h 2012-12-03 12:02:42.190578688 -0800 -@@ -237,7 +237,7 @@ - # endif - #endif - --#if defined (__BEOS__) && !defined (__HAIKU__) -+#if defined (__BEOS__) - # ifdef ZLIB_DLL - # ifdef ZLIB_INTERNAL - # define ZEXPORT __declspec(dllexport) -diff -urN cmake-2.8-git-orig/Utilities/cmzlib/zutil.h cmake-2.8-git/Utilities/cmzlib/zutil.h ---- cmake-2.8-git-orig/Utilities/cmzlib/zutil.h 2012-11-27 05:26:34.022806528 -0800 -+++ cmake-2.8-git/Utilities/cmzlib/zutil.h 2012-12-03 12:02:42.195559424 -0800 -@@ -147,12 +147,6 @@ - # define OS_CODE 0x0f - #endif - --/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ --/* many BeOS workarounds are no longer needed in Haiku */ --#if defined(__HAIKU__) && defined(__BEOS__) --#undef __BEOS__ --#endif -- - #if defined(_BEOS_) || defined(RISCOS) - # define fdopen(fd,mode) NULL /* No fdopen() */ - #endif diff --git a/dev-util/cmake/patches/cmake-2.8.1.patch b/dev-util/cmake/patches/cmake-2.8.1.patch deleted file mode 100644 index 2f5f11180..000000000 --- a/dev-util/cmake/patches/cmake-2.8.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN cmake-2.8.1/bootstrap cmake-2.8.1-haiku/bootstrap ---- cmake-2.8.1/bootstrap 2010-04-06 14:45:29.040370176 +0000 -+++ cmake-2.8.1-haiku/bootstrap 2010-08-31 05:39:55.518520832 +0000 -@@ -132,7 +132,9 @@ - cmake_default_prefix="c:/Program Files/CMake" - fi - elif ${cmake_system_haiku}; then -- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` -+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` -+ cmake_man_dir="/documentation/man" -+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" - else - cmake_default_prefix="/usr/local" - fi diff --git a/dev-util/cmake/patches/cmake-2.8.2.patch b/dev-util/cmake/patches/cmake-2.8.2.patch deleted file mode 100644 index 9384e05a9..000000000 --- a/dev-util/cmake/patches/cmake-2.8.2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN cmake-2.8.2/bootstrap cmake-2.8.2-haiku/bootstrap ---- cmake-2.8.2/bootstrap 2010-04-06 14:45:29.040370176 +0000 -+++ cmake-2.8.2-haiku/bootstrap 2010-08-31 05:39:55.518520832 +0000 -@@ -132,7 +132,9 @@ - cmake_default_prefix="c:/Program Files/CMake" - fi - elif ${cmake_system_haiku}; then -- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` -+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` -+ cmake_man_dir="/documentation/man" -+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" - else - cmake_default_prefix="/usr/local" - fi diff --git a/dev-util/cmake/patches/cmake-2.8.3.patch b/dev-util/cmake/patches/cmake-2.8.3.patch deleted file mode 100644 index 68f6a1303..000000000 --- a/dev-util/cmake/patches/cmake-2.8.3.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -urN cmake-2.8.3/Modules/FindGLUT.cmake cmake-2.8.3-haiku/Modules/FindGLUT.cmake ---- cmake-2.8.3/Modules/FindGLUT.cmake 2010-11-03 19:58:27.020971520 +0000 -+++ cmake-2.8.3-haiku/Modules/FindGLUT.cmake 2011-01-29 10:22:22.032505856 +0000 -@@ -46,12 +46,15 @@ - /usr/openwin/include - /opt/graphics/OpenGL/include - /opt/graphics/OpenGL/contrib/libglut -+ /boot/develop/headers/os/opengl - ) - - FIND_LIBRARY( GLUT_glut_LIBRARY glut - /usr/openwin/lib -+ /boot/develop/lib/x86/  - ) -- -+ -+ IF(NOT BEOS) - FIND_LIBRARY( GLUT_Xi_LIBRARY Xi - /usr/openwin/lib - ) -@@ -59,6 +62,7 @@ - FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu - /usr/openwin/lib - ) -+ ENDIF(NOT BEOS) - - ENDIF (APPLE) - -@@ -69,12 +73,18 @@ - IF(GLUT_glut_LIBRARY) - # Is -lXi and -lXmu required on all platforms that have it? - # If not, we need some way to figure out what platform we are on. -+ IF(BEOS) -+ SET( GLUT_LIBRARIES -+ ${GLUT_glut_LIBRARY} -+ ) -+ ELSE(BEOS) - SET( GLUT_LIBRARIES - ${GLUT_glut_LIBRARY} - ${GLUT_Xmu_LIBRARY} - ${GLUT_Xi_LIBRARY} - ${GLUT_cocoa_LIBRARY} - ) -+ ENDIF(BEOS) - SET( GLUT_FOUND "YES" ) - - #The following deprecated settings are for backwards compatibility with CMake1.4 -@@ -84,9 +94,16 @@ - ENDIF(GLUT_glut_LIBRARY) - ENDIF(GLUT_INCLUDE_DIR) - -+IF(BEOS) -+MARK_AS_ADVANCED( -+ GLUT_INCLUDE_DIR -+ GLUT_glut_LIBRARY -+ ) -+ELSE(BEOS) - MARK_AS_ADVANCED( - GLUT_INCLUDE_DIR - GLUT_glut_LIBRARY - GLUT_Xmu_LIBRARY - GLUT_Xi_LIBRARY - ) -+ENDIF(BEOS) -diff -urN cmake-2.8.3/Modules/FindLua51.cmake cmake-2.8.3-haiku/Modules/FindLua51.cmake ---- cmake-2.8.3/Modules/FindLua51.cmake 2010-11-03 19:58:27.023330816 +0000 -+++ cmake-2.8.3-haiku/Modules/FindLua51.cmake 2011-01-29 10:22:22.035127296 +0000 -@@ -57,13 +57,13 @@ - - IF(LUA_LIBRARY) - # include the math library for Unix -- IF(UNIX AND NOT APPLE) -+ IF(UNIX AND NOT APPLE AND NOT BEOS) - FIND_LIBRARY(LUA_MATH_LIBRARY m) - SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") - # For Windows and Mac, don't need to explicitly include the math library - ELSE(UNIX AND NOT APPLE) - SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries") -- ENDIF(UNIX AND NOT APPLE) -+ ENDIF(UNIX AND NOT APPLE AND NOT BEOS) - ENDIF(LUA_LIBRARY) - - INCLUDE("${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake") -diff -urN cmake-2.8.3/Modules/FindOpenGL.cmake cmake-2.8.3-haiku/Modules/FindOpenGL.cmake ---- cmake-2.8.3/Modules/FindOpenGL.cmake 2010-11-03 19:58:27.024117248 +0000 -+++ cmake-2.8.3-haiku/Modules/FindOpenGL.cmake 2011-01-29 10:22:22.035913728 +0000 -@@ -80,6 +80,7 @@ - /usr/share/doc/NVIDIA_GLX-1.0/include - /usr/openwin/share/include - /opt/graphics/OpenGL/include /usr/X11R6/include -+ /boot/develop/headers/os/opengl - ) - - FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h -@@ -94,6 +95,7 @@ - /usr/openwin/lib - /usr/shlib /usr/X11R6/lib - ${HPUX_IA_OPENGL_LIB_PATH} -+ /boot/develop/lib/x86/ - ) - - # On Unix OpenGL most certainly always requires X11. -diff -urN cmake-2.8.3/bootstrap cmake-2.8.3-haiku/bootstrap ---- cmake-2.8.3/bootstrap 2010-11-03 19:58:26.058720256 +0000 -+++ cmake-2.8.3-haiku/bootstrap 2011-01-29 10:22:22.031981568 +0000 -@@ -137,7 +137,9 @@ - cmake_default_prefix="c:/Program Files/CMake" - fi - elif ${cmake_system_haiku}; then -- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` -+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` -+ cmake_man_dir="/documentation/man" -+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" - else - cmake_default_prefix="/usr/local" - fi diff --git a/dev-util/cmake/patches/cmake-2.8.4.patch b/dev-util/cmake/patches/cmake-2.8.4.patch deleted file mode 100644 index 910b48e92..000000000 --- a/dev-util/cmake/patches/cmake-2.8.4.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -urN cmake-2.8.4/Modules/FindGLUT.cmake cmake-2.8.4-haiku/Modules/FindGLUT.cmake ---- cmake-2.8.4/Modules/FindGLUT.cmake 2011-02-15 17:47:27.017301504 +0000 -+++ cmake-2.8.4-haiku/Modules/FindGLUT.cmake 2011-04-26 07:50:24.890241024 +0000 -@@ -46,12 +46,14 @@ - /usr/openwin/include - /opt/graphics/OpenGL/include - /opt/graphics/OpenGL/contrib/libglut -+ /boot/develop/headers/os/opengl - ) - - FIND_LIBRARY( GLUT_glut_LIBRARY glut - /usr/openwin/lib -+ /boot/develop/lib/x86/ - ) -- -+ IF(NOT BEOS) - FIND_LIBRARY( GLUT_Xi_LIBRARY Xi - /usr/openwin/lib - ) -@@ -59,7 +61,7 @@ - FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu - /usr/openwin/lib - ) -- -+ ENDIF(NOT BEOS) - ENDIF (APPLE) - - ENDIF (WIN32) -@@ -69,12 +71,18 @@ - IF(GLUT_glut_LIBRARY) - # Is -lXi and -lXmu required on all platforms that have it? - # If not, we need some way to figure out what platform we are on. -+ IF(BEOS) -+ SET( GLUT_LIBRARIES -+ ${GLUT_glut_LIBRARY} -+ ) -+ ELSE(BEOS) - SET( GLUT_LIBRARIES - ${GLUT_glut_LIBRARY} - ${GLUT_Xmu_LIBRARY} - ${GLUT_Xi_LIBRARY} - ${GLUT_cocoa_LIBRARY} - ) -+ ENDIF(BEOS) - SET( GLUT_FOUND "YES" ) - - #The following deprecated settings are for backwards compatibility with CMake1.4 -@@ -84,9 +92,16 @@ - ENDIF(GLUT_glut_LIBRARY) - ENDIF(GLUT_INCLUDE_DIR) - -+IF(BEOS) -+MARK_AS_ADVANCED( -+ GLUT_INCLUDE_DIR -+ GLUT_glut_LIBRARY -+ ) -+ELSE(BEOS) - MARK_AS_ADVANCED( - GLUT_INCLUDE_DIR - GLUT_glut_LIBRARY - GLUT_Xmu_LIBRARY - GLUT_Xi_LIBRARY - ) -+ENDIF(BEOS) -diff -urN cmake-2.8.4/Modules/FindLua51.cmake cmake-2.8.4-haiku/Modules/FindLua51.cmake ---- cmake-2.8.4/Modules/FindLua51.cmake 2011-02-15 17:47:27.019660800 +0000 -+++ cmake-2.8.4-haiku/Modules/FindLua51.cmake 2011-04-26 07:50:24.944504832 +0000 -@@ -57,13 +57,13 @@ - - IF(LUA_LIBRARY) - # include the math library for Unix -- IF(UNIX AND NOT APPLE) -+ IF(UNIX AND NOT APPLE AND NOT BEOS) - FIND_LIBRARY(LUA_MATH_LIBRARY m) - SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") - # For Windows and Mac, don't need to explicitly include the math library - ELSE(UNIX AND NOT APPLE) - SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries") -- ENDIF(UNIX AND NOT APPLE) -+ ENDIF(UNIX AND NOT APPLE AND NOT BEOS) - ENDIF(LUA_LIBRARY) - - INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -diff -urN cmake-2.8.4/Modules/FindOpenGL.cmake cmake-2.8.4-haiku/Modules/FindOpenGL.cmake ---- cmake-2.8.4/Modules/FindOpenGL.cmake 2011-02-15 17:47:27.020447232 +0000 -+++ cmake-2.8.4-haiku/Modules/FindOpenGL.cmake 2011-04-26 07:50:25.026214400 +0000 -@@ -80,6 +80,7 @@ - /usr/share/doc/NVIDIA_GLX-1.0/include - /usr/openwin/share/include - /opt/graphics/OpenGL/include /usr/X11R6/include -+ /boot/develop/headers/os/opengl - ) - - FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h -@@ -94,6 +95,7 @@ - /usr/openwin/lib - /usr/shlib /usr/X11R6/lib - ${HPUX_IA_OPENGL_LIB_PATH} -+ /boot/develop/lib/x86/ - ) - - # On Unix OpenGL most certainly always requires X11. -diff -urN cmake-2.8.4/bootstrap cmake-2.8.4-haiku/bootstrap ---- cmake-2.8.4/bootstrap 2011-02-15 17:47:26.054001664 +0000 -+++ cmake-2.8.4-haiku/bootstrap 2011-04-26 07:50:25.222035968 +0000 -@@ -142,7 +142,9 @@ - cmake_default_prefix="c:/Program Files/CMake" - fi - elif ${cmake_system_haiku}; then -- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` -+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` -+ cmake_man_dir="/documentation/man" -+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" - else - cmake_default_prefix="/usr/local" - fi diff --git a/dev-util/gtk_doc/gtk_doc-1.15 b/dev-util/gtk_doc/gtk_doc-1.15.recipe similarity index 100% rename from dev-util/gtk_doc/gtk_doc-1.15 rename to dev-util/gtk_doc/gtk_doc-1.15.recipe diff --git a/dev-util/gtk_doc/patches/gtk-doc-1.15.patch b/dev-util/gtk_doc/patches/gtk_doc-1.15.patch similarity index 100% rename from dev-util/gtk_doc/patches/gtk-doc-1.15.patch rename to dev-util/gtk_doc/patches/gtk_doc-1.15.patch diff --git a/dev-vcs/fossil/fossil-1.22_fossil b/dev-vcs/fossil/fossil-1.22_fossil deleted file mode 100644 index fbf764793..000000000 --- a/dev-vcs/fossil/fossil-1.22_fossil +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="Simple, high-reliability, distributed software configuration management" -HOMEPAGE="http://www.fossil-scm.org/" -SRC_URI="fossil+http://www.fossil-scm.org/" -#CHECKSUM_MD5="" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="" - -BUILD() -{ - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - make install -} - -TEST() -{ - make test -} - -LICENSE="BSD (2-clause)" -COPYRIGHT="2007 D. Richard Hipp" diff --git a/dev-vcs/subversion/subversion-1.7.0_rc2 b/dev-vcs/subversion/subversion-1.7.0_rc2.recipe similarity index 100% rename from dev-vcs/subversion/subversion-1.7.0_rc2 rename to dev-vcs/subversion/subversion-1.7.0_rc2.recipe diff --git a/dev-vcs/subversion/subversion-1.7.xx_svn b/dev-vcs/subversion/subversion-1.7.xx_svn deleted file mode 100644 index 3a6829236..000000000 --- a/dev-vcs/subversion/subversion-1.7.xx_svn +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" -SRC_URI="svn+http://svn.apache.org/repos/asf/subversion/trunk" -#CHECKSUM_MD5="" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd subversion-1.7.xx-svn - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=/boot/common \ - --with-editor=nano \ - --with-zlib=/boot/common - make -} - -INSTALL() -{ - cd subversion-1.7.xx-svn - make install -} -LICENSE="Apache-Subversion" -COPYRIGHT="2010 The Apache Software Foundation" diff --git a/games-emulation/dosbox/dosbox-0.74_svn b/games-emulation/dosbox/dosbox-0.74_svn.recipe similarity index 100% rename from games-emulation/dosbox/dosbox-0.74_svn rename to games-emulation/dosbox/dosbox-0.74_svn.recipe diff --git a/games-emulation/dosbox/dosbox-0.74-svn.patch b/games-emulation/dosbox/patches/dosbox-0.74_svn.patch similarity index 100% rename from games-emulation/dosbox/dosbox-0.74-svn.patch rename to games-emulation/dosbox/patches/dosbox-0.74_svn.patch diff --git a/games-engines/freesci/freesci-0.6.4_beos.patch b/games-engines/freesci/patches/freesci-0.6.4_beos.patch similarity index 100% rename from games-engines/freesci/freesci-0.6.4_beos.patch rename to games-engines/freesci/patches/freesci-0.6.4_beos.patch diff --git a/games-puzzle/numptyphysics/numptyphysics-0.2_157 b/games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe similarity index 100% rename from games-puzzle/numptyphysics/numptyphysics-0.2_157 rename to games-puzzle/numptyphysics/numptyphysics-0.2_157.recipe diff --git a/gnome-base/gnome_common/gnome_common-2.28 b/gnome-base/gnome_common/gnome_common-2.28.recipe similarity index 100% rename from gnome-base/gnome_common/gnome_common-2.28 rename to gnome-base/gnome_common/gnome_common-2.28.recipe diff --git a/haiku-apps/armyknife/armyknife-999_git b/haiku-apps/armyknife/armyknife-999_git deleted file mode 100644 index cd2190074..000000000 --- a/haiku-apps/armyknife/armyknife-999_git +++ /dev/null @@ -1,21 +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="git+https://github.com/scottmc/ArmyKnife.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/taglib >= 1.6.3" -#CHECKSUM_MD5="" -BUILD() -{ - cd armyknife-999-git - make -} - -INSTALL() -{ - cd armyknife-999-git - make zipfile - mkdir -p ${DESTDIR}/boot/apps - unzip release/ArmyKnife-*.zip -d ${DESTDIR}/boot/apps -} - diff --git a/haiku-apps/bowser/bowser-1.1.1_cvs b/haiku-apps/bowser/bowser-1.1.1_cvs.recipe similarity index 100% rename from haiku-apps/bowser/bowser-1.1.1_cvs rename to haiku-apps/bowser/bowser-1.1.1_cvs.recipe diff --git a/haiku-apps/burnitnow/burnitnow-2_svn b/haiku-apps/burnitnow/burnitnow-2_svn deleted file mode 100644 index 85423e314..000000000 --- a/haiku-apps/burnitnow/burnitnow-2_svn +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" -HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" -SRC_URI="svn+http://svn.osdrawer.net/burnitnow/trunk" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/cmake >= 2.8.0 - app-cdr/cdrtools > 3.00" -#CHECKSUM_MD5="" -BUILD() -{ - cd burnitnow-2-svn - cmake . - make -} - -INSTALL() -{ - cd burnitnow-2-svn - mkdir -p ${DESTDIR}/boot/apps/BurnItNow - cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow - if [ -z ${DESTDIR} ];then - find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf - fi -} -LICENSE="MIT" -COPYRIGHT="Copyright 2010-2011 BurnItNow Team" diff --git a/haiku-apps/burnitnow/burnitnow-beta5_svn b/haiku-apps/burnitnow/burnitnow-beta5_svn.recipe similarity index 100% rename from haiku-apps/burnitnow/burnitnow-beta5_svn rename to haiku-apps/burnitnow/burnitnow-beta5_svn.recipe diff --git a/haiku-apps/burnitnow/burnitnow-beta6_git b/haiku-apps/burnitnow/burnitnow-beta6_git deleted file mode 100644 index 9a3fe6948..000000000 --- a/haiku-apps/burnitnow/burnitnow-beta6_git +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" -HOMEPAGE="http://github.com/scottmc/burnitnow" -SRC_URI="git://github.com/scottmc/BurnItNow.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="app-cdr/cdrtools > 3.00" -#CHECKSUM_MD5="" - -BUILD() -{ - cd burnitnow-beta6-git/legacy - cmake . - make -} - -INSTALL() -{ - cd burnitnow-beta6-git/legacy - BURNITNOWDIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/BurnItNow - mkdir -p ${BURNITNOWDIR}/Docs - cp -a BurnItNow ${BURNITNOWDIR} - cp -a LICENSE ${BURNITNOWDIR}/LICENSE - cp -a TODO ${BURNITNOWDIR}/TODO - cp -a README ${BURNITNOWDIR}/README - cp -a AUTHORS ${BURNITNOWDIR}/AUTHORS - cp -a Changes ${BURNITNOWDIR}/Changes - cp -a Docs ${BURNITNOWDIR}/ - if [ -z ${DESTDIR} ];then - find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf - fi -} - -LICENSE="MIT" -COPYRIGHT="2000-2002 Johan Nilsson - 2010-2013 BurnItNow Maintainers" diff --git a/haiku-apps/burnitnow/patches/burnitnow-beta5-svn.patch b/haiku-apps/burnitnow/patches/burnitnow-beta5_svn.patch similarity index 100% rename from haiku-apps/burnitnow/patches/burnitnow-beta5-svn.patch rename to haiku-apps/burnitnow/patches/burnitnow-beta5_svn.patch diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe similarity index 100% rename from haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-0.HEAD.recipe diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19 b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe similarity index 100% rename from haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19 rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-19.recipe diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24 b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe similarity index 100% rename from haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24 rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-24.recipe diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35 b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe similarity index 100% rename from haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35 rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-35.recipe diff --git a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36 b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe similarity index 100% rename from haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36 rename to haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe diff --git a/haiku-apps/caya_gpl_protocols/patches/caya-gpl-protocols-0.HEAD.patch b/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch similarity index 100% rename from haiku-apps/caya_gpl_protocols/patches/caya-gpl-protocols-0.HEAD.patch rename to haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch diff --git a/haiku-apps/friss/friss-0.7_svn b/haiku-apps/friss/friss-0.7_svn.recipe similarity index 100% rename from haiku-apps/friss/friss-0.7_svn rename to haiku-apps/friss/friss-0.7_svn.recipe diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0_svn b/haiku-apps/haikutwitter/haikutwitter-1.0_svn deleted file mode 100644 index 0696c3811..000000000 --- a/haiku-apps/haikutwitter/haikutwitter-1.0_svn +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="Twitter client for Haiku OS" -HOMEPAGE="http://code.google.com/p/haikutwitter/" -SRC_URI="svn+http://haikutwitter.googlecode.com/svn/trunk/HaikuTwitter" -REVISION="1" -STATUS_HAIKUE="broken" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -DEPEND="net-misc/curl >= 7.26.0" -BUILD() -{ - cd haikutwitter-1.0-svn - make -} - -INSTALL() -{ - cd haikutwitter-1.0-svn - make install -} -LICENSE="MIT" -COPYRIGHT="2010-2012 Martin Hebnes Pedersen" diff --git a/haiku-apps/hare/hare-beta1_git b/haiku-apps/hare/hare-beta1_git.recipe similarity index 100% rename from haiku-apps/hare/hare-beta1_git rename to haiku-apps/hare/hare-beta1_git.recipe diff --git a/haiku-apps/open_sum_it/open_sum_it-108 b/haiku-apps/open_sum_it/open_sum_it-108.recipe similarity index 100% rename from haiku-apps/open_sum_it/open_sum_it-108 rename to haiku-apps/open_sum_it/open_sum_it-108.recipe diff --git a/haiku-apps/paladin/paladin-1.3_hg b/haiku-apps/paladin/paladin-1.3_hg.recipe similarity index 100% rename from haiku-apps/paladin/paladin-1.3_hg rename to haiku-apps/paladin/paladin-1.3_hg.recipe diff --git a/haiku-apps/thememanager/thememanager-0_svn b/haiku-apps/thememanager/thememanager-0_svn.recipe similarity index 100% rename from haiku-apps/thememanager/thememanager-0_svn rename to haiku-apps/thememanager/thememanager-0_svn.recipe diff --git a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1 b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe similarity index 100% rename from media-fonts/arabeyes_fonts/arabeyes_fonts-1.1 rename to media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe diff --git a/media-fonts/courier_prime/courier_prime-1.0 b/media-fonts/courier_prime/courier_prime-1.0.recipe similarity index 100% rename from media-fonts/courier_prime/courier_prime-1.0 rename to media-fonts/courier_prime/courier_prime-1.0.recipe diff --git a/media-fonts/farsi_fonts/farsi_fonts-0.4 b/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe similarity index 100% rename from media-fonts/farsi_fonts/farsi_fonts-0.4 rename to media-fonts/farsi_fonts/farsi_fonts-0.4.recipe diff --git a/media-fonts/kacst_fonts/kacst_fonts-5.0 b/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe similarity index 100% rename from media-fonts/kacst_fonts/kacst_fonts-5.0 rename to media-fonts/kacst_fonts/kacst_fonts-5.0.recipe diff --git a/media-fonts/lateef_font/lateef_font-1.001 b/media-fonts/lateef_font/lateef_font-1.001.recipe similarity index 100% rename from media-fonts/lateef_font/lateef_font-1.001 rename to media-fonts/lateef_font/lateef_font-1.001.recipe diff --git a/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721 b/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe similarity index 100% rename from media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721 rename to media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe diff --git a/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02 b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe similarity index 100% rename from media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02 rename to media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe diff --git a/media-fonts/nafees_riqa/nafees_riqa-1.00 b/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe similarity index 100% rename from media-fonts/nafees_riqa/nafees_riqa-1.00 rename to media-fonts/nafees_riqa/nafees_riqa-1.00.recipe diff --git a/media-fonts/scheherazade_font/scheherazade_font-1.005 b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe similarity index 100% rename from media-fonts/scheherazade_font/scheherazade_font-1.005 rename to media-fonts/scheherazade_font/scheherazade_font-1.005.recipe diff --git a/media-fonts/x_series_fonts/x_series_fonts-2.0 b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe similarity index 100% rename from media-fonts/x_series_fonts/x_series_fonts-2.0 rename to media-fonts/x_series_fonts/x_series_fonts-2.0.recipe diff --git a/media-gfx/imagemagick/imagemagick-6.6.1_10 b/media-gfx/imagemagick/imagemagick-6.6.1_10.recipe similarity index 100% rename from media-gfx/imagemagick/imagemagick-6.6.1_10 rename to media-gfx/imagemagick/imagemagick-6.6.1_10.recipe diff --git a/media-gfx/sane_backends/patches/sane-backends-1.0.21.patch b/media-gfx/sane_backends/patches/sane_backends-1.0.21.patch similarity index 100% rename from media-gfx/sane_backends/patches/sane-backends-1.0.21.patch rename to media-gfx/sane_backends/patches/sane_backends-1.0.21.patch diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs b/media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe similarity index 100% rename from media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs rename to media-gfx/tuxpaint/tuxpaint-0.9.2x_cvs.recipe diff --git a/media-libs/allegro/allegro-4.4.x_svn b/media-libs/allegro/allegro-4.4.x_svn.recipe similarity index 100% rename from media-libs/allegro/allegro-4.4.x_svn rename to media-libs/allegro/allegro-4.4.x_svn.recipe diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-1.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-1.diff deleted file mode 100644 index 8c1ce789b..000000000 --- a/media-libs/allegro/patches/allegro-4.3.10-haiku-1.diff +++ /dev/null @@ -1,736 +0,0 @@ -diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku/fix.sh ---- allegro-4.3.10/fix.sh 2008-01-01 13:59:18.000000000 -0800 -+++ allegro-4.3.10-haiku/fix.sh 2008-08-23 17:29:03.000000000 -0700 -@@ -9,7 +9,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod|--utom|--mtou]" - echo -- echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix" -+ echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix" - echo "mac, macosx, macosx-universal and watcom." - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format," -@@ -140,6 +140,7 @@ - "bcc32" ) proc_fix "Windows (BCC32)" "makefile.bcc" "ALLEGRO_BCC32";; - "beos" ) proc_fix "BeOS" "makefile.be" "ALLEGRO_BEOS";; - "djgpp" ) proc_fix "DOS (djgpp)" "makefile.dj" "ALLEGRO_DJGPP";; -+ "haiku" ) proc_fix "Haiku" "makefile.haiku" "ALLEGRO_HAIKU";; - "mingw" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - "mingw32" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - # The 'msvc' target is undocumented in the help message, but is used -diff -urN allegro-4.3.10/include/allegro/internal/alconfig.h allegro-4.3.10-haiku/include/allegro/internal/alconfig.h ---- allegro-4.3.10/include/allegro/internal/alconfig.h 2007-06-24 01:13:22.000000000 -0700 -+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h 2008-08-25 22:04:47.000000000 -0700 -@@ -48,6 +48,8 @@ - #include "allegro/platform/albcc32.h" - #elif defined ALLEGRO_MSVC - #include "allegro/platform/almsvc.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "allegro/platform/alhakcfg.h" - #elif defined ALLEGRO_BEOS - #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10/include/allegro/platform/ainthaiku.h allegro-4.3.10-haiku/include/allegro/platform/ainthaiku.h ---- allegro-4.3.10/include/allegro/platform/ainthaiku.h 1969-12-31 16:00:00.000000000 -0800 -+++ allegro-4.3.10-haiku/include/allegro/platform/ainthaiku.h 2006-03-18 07:05:34.000000000 -0800 -@@ -0,0 +1,151 @@ -+/* ______ ___ ___ -+ * /\ _ \ /\_ \ /\_ \ -+ * \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___ -+ * \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\ -+ * \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \ -+ * \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/ -+ * \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/ -+ * /\____/ -+ * \_/__/ -+ * -+ * Definitions for internal use by the BeOS configuration. -+ * -+ * By Jason Wilkins. -+ * -+ * See readme.txt for copyright information. -+ */ -+ -+ -+#include "bealleg.h" -+ -+#ifdef __cplusplus -+extern status_t ignore_result; -+ -+extern volatile int32 focus_count; -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#define WND_TITLE_SIZE 128 -+ -+AL_ARRAY(char, wnd_title); -+ -+int be_key_init(void); -+void be_key_exit(void); -+void be_key_set_leds(int leds); -+void be_key_set_rate(int delay, int repeat); -+void be_key_wait_for_input(void); -+void be_key_stop_waiting_for_input(void); -+void be_key_suspend(void); -+void be_key_resume(void); -+ -+int be_sys_init(void); -+void be_sys_exit(void); -+void _be_sys_get_executable_name(char *output, int size); -+void be_sys_get_executable_name(char *output, int size); -+int be_sys_find_resource(char *dest, AL_CONST char *resource, int size); -+void be_sys_set_window_title(AL_CONST char *name); -+int be_sys_set_close_button_callback(void (*proc)(void)); -+void be_sys_message(AL_CONST char *msg); -+int be_sys_set_display_switch_mode(int mode); -+int be_sys_desktop_color_depth(void); -+int be_sys_get_desktop_resolution(int *width, int *height); -+void be_sys_get_gfx_safe_mode(int *driver, struct GFX_MODE *mode); -+void be_sys_yield_timeslice(void); -+void *be_sys_create_mutex(void); -+void be_sys_destroy_mutex(void *handle); -+void be_sys_lock_mutex(void *handle); -+void be_sys_unlock_mutex(void *handle); -+void be_sys_suspend(void); -+void be_sys_resume(void); -+void be_main_suspend(void); -+void be_main_resume(void); -+ -+struct BITMAP *be_gfx_bwindowscreen_accel_init(int w, int h, int v_w, int v_h, int color_depth); -+struct BITMAP *be_gfx_bwindowscreen_init(int w, int h, int v_w, int v_h, int color_depth); -+void be_gfx_bwindowscreen_exit(struct BITMAP *b); -+void be_gfx_bwindowscreen_acquire(struct BITMAP *b); -+void be_gfx_bwindowscreen_release(struct BITMAP *b); -+void be_gfx_bwindowscreen_set_palette(AL_CONST struct RGB *p, int from, int to, int vsync); -+int be_gfx_bwindowscreen_scroll(int x, int y); -+int be_gfx_bwindowscreen_request_scroll(int x, int y); -+int be_gfx_bwindowscreen_poll_scroll(void); -+int be_gfx_bwindowscreen_request_video_bitmap(struct BITMAP *bitmap); -+void be_gfx_vsync(void); -+struct GFX_MODE_LIST *be_gfx_bwindowscreen_fetch_mode_list(void); -+void be_gfx_bwindowscreen_accelerate(int color_depth); -+#ifdef ALLEGRO_NO_ASM -+uintptr_t be_gfx_bwindowscreen_read_write_bank(BITMAP *bmp, int lyne); -+void be_gfx_bwindowscreen_unwrite_bank(BITMAP *bmp); -+#else -+uintptr_t _be_gfx_bwindowscreen_read_write_bank_asm(BITMAP *bmp, int lyne); -+void _be_gfx_bwindowscreen_unwrite_bank_asm(BITMAP *bmp); -+#endif -+ -+struct BITMAP *be_gfx_bdirectwindow_init(int w, int h, int v_w, int v_h, int color_depth); -+void be_gfx_bdirectwindow_exit(struct BITMAP *b); -+void be_gfx_bdirectwindow_acquire(struct BITMAP *bmp); -+void be_gfx_bdirectwindow_release(struct BITMAP *bmp); -+void be_gfx_bdirectwindow_set_palette(AL_CONST struct RGB *p, int from, int to, int vsync); -+ -+struct BITMAP *be_gfx_bwindow_init(int w, int h, int v_w, int v_h, int color_depth); -+void be_gfx_bwindow_exit(struct BITMAP *b); -+void be_gfx_bwindow_acquire(struct BITMAP *bmp); -+void be_gfx_bwindow_release(struct BITMAP *bmp); -+void be_gfx_bwindow_set_palette(AL_CONST struct RGB *p, int from, int to, int vsync); -+ -+#ifdef ALLEGRO_NO_ASM -+void _be_gfx_bwindow_unwrite_bank(BITMAP *bmp); -+uintptr_t _be_gfx_bwindow_read_write_bank(BITMAP *bmp, int lyne); -+#else -+void _be_gfx_bwindow_unwrite_bank_asm(BITMAP *bmp); -+uintptr_t _be_gfx_bwindow_read_write_bank_asm(BITMAP *bmp, int lyne); -+#endif -+ -+struct BITMAP *be_gfx_overlay_init(int w, int h, int v_w, int v_h, int color_depth); -+void be_gfx_overlay_exit(struct BITMAP *b); -+ -+int be_time_init(void); -+void be_time_exit(void); -+void be_time_rest(unsigned int tyme, AL_METHOD(void, callback, (void))); -+void be_time_suspend(void); -+void be_time_resume(void); -+ -+int be_mouse_init(void); -+void be_mouse_exit(void); -+void be_mouse_position(int x, int y); -+void be_mouse_set_range(int x1, int y_1, int x2, int y2); -+void be_mouse_set_speed(int xspeed, int yspeed); -+void be_mouse_get_mickeys(int *mickeyx, int *mickeyy); -+ -+int be_joy_init(void); -+void be_joy_exit(void); -+int be_joy_poll(void); -+ -+int be_sound_detect(int input); -+int be_sound_init(int input, int voices); -+void be_sound_exit(int input); -+void *be_sound_lock_voice(int voice, int start, int end); -+void be_sound_unlock_voice(int voice); -+int be_sound_buffer_size(void); -+int be_sound_set_mixer_volume(int volume); -+int be_sound_get_mixer_volume(void); -+void be_sound_suspend(void); -+void be_sound_resume(void); -+ -+int be_midi_detect(int input); -+int be_midi_init(int input, int voices); -+void be_midi_exit(int input); -+int be_midi_set_mixer_volume(int volume); -+int be_midi_get_mixer_volume(void); -+void be_midi_key_on(int inst, int note, int bend, int vol, int pan); -+void be_midi_key_off(int voice); -+void be_midi_set_volume(int voice, int vol); -+void be_midi_set_pitch(int voice, int note, int bend); -+void be_midi_set_pan(int voice, int pan); -+ -+#ifdef __cplusplus -+} -+#endif -diff -urN allegro-4.3.10/include/allegro/platform/alhaiku.h allegro-4.3.10-haiku/include/allegro/platform/alhaiku.h ---- allegro-4.3.10/include/allegro/platform/alhaiku.h 1969-12-31 16:00:00.000000000 -0800 -+++ allegro-4.3.10-haiku/include/allegro/platform/alhaiku.h 2002-10-01 11:05:12.000000000 -0700 -@@ -0,0 +1,76 @@ -+/* ______ ___ ___ -+ * /\ _ \ /\_ \ /\_ \ -+ * \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___ -+ * \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\ -+ * \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \ -+ * \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/ -+ * \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/ -+ * /\____/ -+ * \_/__/ -+ * -+ * BeOS specific definitions header file. -+ * -+ * By Jason Wilkins. -+ * -+ * See readme.txt for copyright information. -+ */ -+ -+ -+/* system driver */ -+#define SYSTEM_BEOS AL_ID('B','S','Y','S') -+AL_VAR(SYSTEM_DRIVER, system_beos); -+ -+/* timer driver */ -+#define TIMER_BEOS AL_ID('B','T','I','M') -+AL_VAR(TIMER_DRIVER, timer_beos); -+ -+/* keyboard driver */ -+#define KEYBOARD_BEOS AL_ID('B','K','E','Y') -+AL_VAR(KEYBOARD_DRIVER, keyboard_beos); -+ -+/* mouse driver */ -+#define MOUSE_BEOS AL_ID('B','M','O','U') -+AL_VAR(MOUSE_DRIVER, mouse_beos); -+ -+/* joystick driver */ -+#define JOYSTICK_BEOS AL_ID('B','J','O','Y') -+AL_VAR(JOYSTICK_DRIVER, joystick_beos); -+ -+/* graphics drivers */ -+#define GFX_BWINDOWSCREEN_ACCEL AL_ID('B','W','S','A') -+#define GFX_BWINDOWSCREEN AL_ID('B','W','S',' ') -+AL_VAR(GFX_DRIVER, gfx_beos_bwindowscreen_accel); -+AL_VAR(GFX_DRIVER, gfx_beos_bwindowscreen); -+ -+#define GFX_BDIRECTWINDOW AL_ID('B','D','W','N') -+#define GFX_BWINDOW AL_ID('B','W','N',' ') -+AL_VAR(GFX_DRIVER, gfx_beos_bdirectwindow); -+AL_VAR(GFX_DRIVER, gfx_beos_bwindow); -+ -+#define GFX_BWINDOW_OVERLAY AL_ID('B','O','V','L') -+AL_VAR(GFX_DRIVER, gfx_beos_overlay); -+ -+/* digi drivers */ -+#define DIGI_BEOS AL_ID('B','D','I','G') -+AL_VAR(DIGI_DRIVER, digi_beos); -+ -+/* midi drivers */ -+#define MIDI_BEOS AL_ID('B','M','I','D') -+AL_VAR(MIDI_DRIVER, midi_beos); -+ -+#define GFX_DRIVER_BEOS \ -+ { GFX_BWINDOWSCREEN_ACCEL, &gfx_beos_bwindowscreen_accel, TRUE }, \ -+ { GFX_BWINDOWSCREEN, &gfx_beos_bwindowscreen, TRUE }, \ -+ { GFX_BDIRECTWINDOW, &gfx_beos_bdirectwindow, TRUE }, \ -+ { GFX_BWINDOW, &gfx_beos_bwindow, TRUE }, \ -+ { GFX_BWINDOW_OVERLAY, &gfx_beos_overlay, TRUE }, -+ -+#define DIGI_DRIVER_BEOS \ -+ { DIGI_BEOS, &digi_beos, TRUE }, -+ -+#define MIDI_DRIVER_BEOS \ -+ { MIDI_BEOS, &midi_beos, TRUE }, -+ -+#define JOYSTICK_DRIVER_BEOS \ -+ { JOYSTICK_BEOS, &joystick_beos, TRUE }, -+ -diff -urN allegro-4.3.10/include/allegro/platform/alhakcfg.h allegro-4.3.10-haiku/include/allegro/platform/alhakcfg.h ---- allegro-4.3.10/include/allegro/platform/alhakcfg.h 1969-12-31 16:00:00.000000000 -0800 -+++ allegro-4.3.10-haiku/include/allegro/platform/alhakcfg.h 2008-08-25 22:07:11.000000000 -0700 -@@ -0,0 +1,43 @@ -+/* ______ ___ ___ -+ * /\ _ \ /\_ \ /\_ \ -+ * \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___ -+ * \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\ -+ * \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \ -+ * \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/ -+ * \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/ -+ * /\____/ -+ * \_/__/ -+ * -+ * Configuration defines for use with BeOS. -+ * -+ * By Jason Wilkins. -+ * -+ * See readme.txt for copyright information. -+ */ -+ -+ -+#include -+#include -+ -+/* provide implementations of missing functions */ -+#define ALLEGRO_NO_STRICMP -+#define ALLEGRO_NO_STRLWR -+#define ALLEGRO_NO_STRUPR -+ -+/* a static auto config */ -+#define ALLEGRO_HAVE_DIRENT_H 1 -+#define ALLEGRO_HAVE_INTTYPES_H 1 /* TODO: check this */ -+#define ALLEGRO_HAVE_STDINT_H 1 /* TODO: check this */ -+#define ALLEGRO_HAVE_SYS_TIME_H 1 -+ -+/* describe this platform */ -+#define ALLEGRO_PLATFORM_STR "Haiku" -+#define ALLEGRO_LITTLE_ENDIAN -+#define ALLEGRO_CONSOLE_OK -+#define ALLEGRO_USE_CONSTRUCTOR -+#define ALLEGRO_MULTITHREADED -+ -+/* arrange for other headers to be included later on */ -+#define ALLEGRO_EXTRA_HEADER "allegro/platform/alhaiku.h" -+#define ALLEGRO_INTERNAL_HEADER "allegro/platform/ainthaiku.h" -+#define ALLEGRO_ASMCAPA_HEADER "obj/beos/asmcapa.h" -diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all ---- allegro-4.3.10/makefile.all 2008-01-14 03:55:28.000000000 -0800 -+++ allegro-4.3.10-haiku/makefile.all 2008-08-23 17:44:44.000000000 -0700 -@@ -8,7 +8,7 @@ - # DEBUGMODE=2 selects a build intended to debug Allegro itself. - # PROFILEMODE=1 selects a profiling build. - # WARNMODE=1 selects strict compiler warnings. --# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS). -+# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS, Haiku). - # STATICRUNTIME=1 link to a static C runtime library (/MT) (MSVC) - # TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards - # compatibility with older processors (GCC-based platforms). -@@ -132,7 +132,7 @@ - # XXX this is duplicated in makefile.in - DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \ - readme makedoc datafile grabber dat dat2c dat2s license addons targets --DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom -+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom - DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES))) - - DOCS = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES)))) -diff -urN allegro-4.3.10/makefile.haiku allegro-4.3.10-haiku/makefile.haiku ---- allegro-4.3.10/makefile.haiku 1969-12-31 16:00:00.000000000 -0800 -+++ allegro-4.3.10-haiku/makefile.haiku 2008-08-25 21:19:47.000000000 -0700 -@@ -0,0 +1,315 @@ -+# -+# Rules for building the Allegro library with Haiku. This file is included -+# by the primary makefile, and should not be used directly. -+# -+# The "depend" target uses sed. -+# -+# See makefile.all for a list of the available targets. -+ -+ -+ -+# -------- define some variables that the primary makefile will use -------- -+ -+PLATFORM = Haiku -+CC = gcc -+EXE = -+OBJ = .o -+HTML = html -+ -+PLATFORM_DIR = obj/beos -+ -+UNIX_TOOLS = 1 -+ -+ifdef STATICLINK -+ -+# -------- link as a static library -------- -+OBJ_DIR = obj/beos/$(VERSION) -+LIB_NAME = lib/beos/lib$(VERSION).a -+ -+else -+ -+# -------- link as a DLL -------- -+OBJ_DIR = obj/beos/$(VERSION) -+LIB_NAME = lib/beos/lib$(VERSION)-$(shared_version).so -+ -+endif # STATICLINK -+ -+# -------- give a sensible default target for make without any args -------- -+ -+.PHONY: _default -+ -+_default: default -+ -+ -+# -------- decide what compiler options to use -------- -+ -+ifdef WARNMODE -+WFLAGS = -Wall -W -Wstrict-prototypes -Wno-unused -Wno-multichar -Wno-ctor-dtor-privacy -Werror -+else -+WFLAGS = -Wall -Wno-unused -Wno-multichar -Wno-ctor-dtor-privacy -+endif -+ -+ifdef TARGET_ARCH_COMPAT -+ TARGET_ARCH = $(GCC_MTUNE)=$(TARGET_ARCH_COMPAT) -+else -+ ifdef TARGET_ARCH_EXCL -+ TARGET_ARCH = -march=$(TARGET_ARCH_EXCL) -+ else -+ TARGET_ARCH = $(GCC_MTUNE)=i586 -+ endif -+endif -+ -+ifndef TARGET_OPTS -+ TARGET_OPTS = -O6 -funroll-loops -ffast-math -+endif -+ -+OFLAGS = $(TARGET_ARCH) $(TARGET_OPTS) -+ -+CFLAGS = -DALLEGRO_LIB_BUILD -+ -+ -+ -+ifdef DEBUGMODE -+ -+# -------- debugging build -------- -+CFLAGS += -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -g -O0 -+SFLAGS = -DDEBUGMODE=$(DEBUGMODE) $(WFLAGS) -+LFLAGS = -g -+ -+else -+ifdef PROFILEMODE -+ -+# -------- profiling build -------- -+CFLAGS += $(WFLAGS) $(OFLAGS) -pg -+SFLAGS = $(WFLAGS) -+LFLAGS = -pg -+ -+else -+ -+# -------- optimised build -------- -+CFLAGS += $(WFLAGS) $(OFLAGS) -fomit-frame-pointer -+SFLAGS = $(WFLAGS) -+ -+ifndef SYMBOLMODE -+LFLAGS = -s -+else -+LFLAGS = -+endif -+ -+endif -+endif -+ -+ -+# -------- list which platform specific objects to include -------- -+ -+VPATH = src/haiku src/misc src/unix tools/haiku -+ -+ifdef ALLEGRO_USE_C -+ -+# ------ build a C-only version ------ -+ -+VPATH += src/c -+MY_OBJECTS = $(C_OBJECTS) cmiscs -+CFLAGS += -+ -+else -+ -+# ------ build the normal asm version ------ -+ -+VPATH += src/i386 -+MY_OBJECTS = $(I386_OBJECTS) -+ -+endif # ALLEGRO_USE_C -+ -+OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_HAIKU_FILES))) -+ -+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork -+ -+PROGRAMS = bfixicon -+ -+bfixicon: tools/haiku/bfixicon -+ -+DISTCLEAN_FILES += tools/haiku/bfixicon -+ -+ -+ -+# -------- rules for installing and removing the library files -------- -+ -+INSTALLDIR = /boot/develop -+LIBDIR = lib/x86 -+INCDIR = headers -+ -+SHARED_LIBDIR = /boot/common/lib -+ -+ -+ifdef STATICLINK -+ -+$(INSTALLDIR)/$(LIBDIR)/lib$(VERSION).a: $(LIB_NAME) -+ cp $< $@ -+ -+else -+ -+$(SHARED_LIBDIR)/lib$(VERSION)-$(shared_version).so: $(LIB_NAME) -+ cp $< $@ -+ -+endif -+ -+ -+/bin/allegro-config: -+ifdef STATICLINK -+ sed -e "s/@LINK_WITH_STATIC_LIBS@/yes/" misc/allegro-config.in >temp -+else -+ sed -e "s/@LINK_WITH_STATIC_LIBS@/no/" misc/allegro-config.in >temp -+endif -+ sed -e "s/@prefix@/\/boot\/develop/" temp > temp2 -+ sed -e "s/@LIB_TO_LINK@/$(VERSION)/" temp2 > temp -+ sed -e "s/@LDFLAGS@//" temp > temp2 -+ sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp -+ sed -e "s/include/headers/" temp >temp2 -+ sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp -+ sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config -+ rm -f temp temp2 -+ chmod a+x /bin/allegro-config -+ -+ -+HEADERS = $(INSTALLDIR)/$(INCDIR)/bealleg.h \ -+ $(INSTALLDIR)/$(INCDIR)/allegro/platform/aintbeos.h \ -+ $(INSTALLDIR)/$(INCDIR)/allegro/platform/al386gcc.h \ -+ $(INSTALLDIR)/$(INCDIR)/allegro/platform/albecfg.h \ -+ $(INSTALLDIR)/$(INCDIR)/allegro/platform/alplatf.h \ -+ $(INSTALLDIR)/$(INCDIR)/allegro/platform/astdint.h \ -+ $(INSTALLDIR)/$(INCDIR)/allegro/platform/albeos.h -+ -+ifdef STATICLINK -+ INSTALL_FILES = $(INSTALLDIR)/$(LIBDIR)/lib$(VERSION).a -+else -+ INSTALL_FILES = $(SHARED_LIBDIR)/lib$(VERSION)-$(shared_version).so -+endif -+ -+INSTALL_FILES += $(HEADERS) /bin/allegro-config -+ -+ -+install: generic-install -+ @echo The $(DESCRIPTION) $(PLATFORM) library has been installed. -+ -+UNINSTALL_FILES = $(INSTALLDIR)/$(LIBDIR)/liballeg.a \ -+ $(INSTALLDIR)/$(LIBDIR)/liballd.a \ -+ $(INSTALLDIR)/$(LIBDIR)/liballp.a \ -+ $(SHARED_LIBDIR)/liballeg-$(shared_version).so \ -+ $(SHARED_LIBDIR)/liballd-$(shared_version).so \ -+ $(SHARED_LIBDIR)/liballp-$(shared_version).so \ -+ $(HEADERS) \ -+ /bin/allegro-config -+ -+uninstall: generic-uninstall -+ @echo All gone! -+ -+ -+ -+# -------- test capabilities -------- -+ -+TEST_CPP = @echo ...system compiler -+ -+include makefile.tst -+ -+ -+ -+# -------- finally, we get to the fun part... -------- -+ -+ifdef PROFILEMODE -+OTHER_OBJECTS = /boot/develop/lib/x86/i386-mcount.o -+endif -+ -+ifdef STATICLINK -+ -+# -------- link as a static library -------- -+define MAKE_LIB -+ar rs $(LIB_NAME) $(OBJECTS) $(OTHER_OBJECTS) -+endef -+ -+else -+ -+# -------- link as a shared library -------- -+ -+define MAKE_LIB -+$(CC) -nostart $(PFLAGS) -o $(LIB_NAME) $(OBJECTS) $(OTHER_OBJECTS) $(LIBRARIES) -+endef -+ -+endif # STATICLINK -+ -+COMPILE_FLAGS = $(subst src/,-DALLEGRO_SRC ,$(findstring src/, $<))$(CFLAGS) -+ -+$(OBJ_DIR)/%.o: %.c -+ $(CC) $(COMPILE_FLAGS) -I. -I./include -o $@ -c $< -+ -+$(OBJ_DIR)/%.o: %.cpp -+ $(CC) $(COMPILE_FLAGS) -I. -I./include -o $@ -c $< -+ -+$(OBJ_DIR)/%.o: %.s -+ $(CC) $(SFLAGS) -I. -I./include -x assembler-with-cpp -o $@ -c $< -+ -+demos/shooter/shooter: $(OBJECTS_SHOOTER) $(LIB_NAME) -+ $(CC) $(LFLAGS) -o $@ $(OBJECTS_SHOOTER) $(LIB_NAME) $(LIBRARIES) -+ -+demos/skater/skater: $(OBJECTS_SKATER) $(LIB_NAME) -+ $(CC) $(LFLAGS) -o $@ $(OBJECTS_SKATER) $(LIB_NAME) $(LIBRARIES) -+ -+*/%: $(OBJ_DIR)/%.o $(LIB_NAME) -+ $(CC) $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIBRARIES) -+ -+obj/haiku/asmdef.inc: obj/haiku/asmdef -+ obj/haiku/asmdef obj/haiku/asmdef.inc -+ -+obj/haiku/asmdef: src/i386/asmdef.c include/*.h include/allegro/*.h obj/haiku/asmcapa.h -+ $(CC) -O $(WFLAGS) -I. -I./include -o obj/haiku/asmdef src/i386/asmdef.c -+ -+define LINK_WITHOUT_LIB -+ $(CC) $(LFLAGS) -o $@ $^ $(OTHER_OBJECTS) -+endef -+ -+PLUGIN_LIB = lib/haiku/lib$(VERY_SHORT_VERSION)dat.a -+PLUGINS_H = obj/haiku/plugins.h -+PLUGIN_DEPS = $(LIB_NAME) $(PLUGIN_LIB) -+PLUGIN_SCR = scr -+ -+define GENERATE_PLUGINS_H -+cat tools/plugins/*.inc > obj/haiku/plugins.h -+endef -+ -+define MAKE_PLUGIN_LIB -+ar rs $(PLUGIN_LIB) $(PLUGIN_OBJS) -+endef -+ -+define LINK_WITH_PLUGINS -+$(CC) $(LFLAGS) -o $@ $< $(strip $(PLUGIN_LIB) $(addprefix @,$(PLUGIN_SCRIPTS)) $(LIB_NAME)) -+endef -+ -+tools/haiku/%: $(OBJ_DIR)/%.o $(LIB_NAME) -+ $(CC) $(LFLAGS) -o $@ $< $(LIB_NAME) $(LIBRARIES) -+ -+ -+ -+# -------- demo program iconification -------- -+ -+.PHONY: fixdemo -+ -+fixdemo: demos/shooter/shooter demo/demo.dat tools/haiku/bfixicon -+ tools/haiku/bfixicon demos/shooter/shooter -d demos/shooter/demo.dat SHIP3 GAME_PAL -+ -+ -+ -+# -------- generate automatic dependencies -------- -+ -+DEPEND_PARAMS = -MM -MG -I. -I./include -DSCAN_DEPEND -DALLEGRO_HAIKU -+ -+depend: -+ $(CC) $(DEPEND_PARAMS) src/*.c src/haiku/*.c src/i386/*.c src/misc/*.c src/unix/*.c demos/shooter/*.c > _depend.tmp -+ $(CC) $(DEPEND_PARAMS) docs/src/makedoc/*.c examples/*.c setup/*.c tests/*.c tools/*.c tools/plugins/*.c >> _depend.tmp -+ $(CC) $(DEPEND_PARAMS) demos/skater/source/*.c >> _depend.tmp -+ $(CC) $(DEPEND_PARAMS) -x c src/haiku/*.cpp tests/*.cpp tools/haiku/*.cpp >> _depend.tmp -+ $(CC) $(DEPEND_PARAMS) -x assembler-with-cpp src/i386/*.s src/misc/*.s >> _depend.tmp -+ sed -e "s/^[a-zA-Z0-9_\/]*\///" _depend.tmp > _depend2.tmp -+ sed -e "s/^\([a-zA-Z0-9_]*\.o *:\)/obj\/haiku\/alleg\/\1/" _depend2.tmp > obj/haiku/alleg/makefile.dep -+ sed -e "s/^\([a-zA-Z0-9_]*\.o *:\)/obj\/haiku\/alld\/\1/" _depend2.tmp > obj/haiku/alld/makefile.dep -+ sed -e "s/^\([a-zA-Z0-9_]*\.o *:\)/obj\/haiku\/allp\/\1/" _depend2.tmp > obj/haiku/allp/makefile.dep -+ rm _depend.tmp _depend2.tmp -diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku/misc/mkunixdists.sh ---- allegro-4.3.10/misc/mkunixdists.sh 2008-01-10 13:45:48.000000000 -0800 -+++ allegro-4.3.10-haiku/misc/mkunixdists.sh 2008-08-23 20:56:44.000000000 -0700 -@@ -73,9 +73,9 @@ - # Hack'n'slash - echo "Stripping to form end-user distribution" - (cd $dir/$basename && { -- (cd src && rm -rf beos qnx dos mac ppc win) -- (cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -- (cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -+ (cd src && rm -rf beos haiku qnx dos mac ppc win) -+ (cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) -+ (cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) - (cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h) - (cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh) - (cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c) -@@ -91,11 +91,11 @@ - - # jpgalleg addon - (cd addons/jpgalleg && rm -rf examples) -- (cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj) -+ (cd addons/jpgalleg && rm -f makefile.be makefile.haiku makefile.mgw makefile.dj) - (cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt) - (cd addons/jpgalleg/misc && rm -f fixver.sh runner.c) -- (cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc) -- (cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc) -+ (cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc) -+ (cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc) - - # logg addon - (cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat) -diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh ---- allegro-4.3.10/misc/zipup.sh 2008-01-19 04:16:56.000000000 -0800 -+++ allegro-4.3.10-haiku/misc/zipup.sh 2008-08-23 20:53:10.000000000 -0700 -@@ -126,6 +126,14 @@ - make depend UNIX_TOOLS=1 CC=gcc - - -+# generate dependencies for Haiku -+echo "Generating Haiku dependencies..." -+ -+./fix.sh haiku --quick -+ -+make depend UNIX_TOOLS=1 CC=gcc -+ -+ - # generate dependencies for QNX - echo "Generating QNX dependencies..." - -@@ -164,7 +172,7 @@ - for base in abi ahack allegro const faq help mistakes; do - ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx - done --for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do -+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do - ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx - done - -diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c ---- allegro-4.3.10/tools/dat2c.c 2005-04-28 02:53:38.000000000 -0700 -+++ allegro-4.3.10-haiku/tools/dat2c.c 2008-08-23 20:44:06.000000000 -0700 -@@ -342,7 +342,7 @@ - } - - if (dat2c->lformat == lineformat_default) --#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX) -+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX) - dat2c->lformat = lineformat_unix; - #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS) - dat2c->lformat = lineformat_dos; -diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku/tools/datedit.c ---- allegro-4.3.10/tools/datedit.c 2007-10-08 09:23:36.000000000 -0700 -+++ allegro-4.3.10-haiku/tools/datedit.c 2008-08-23 20:42:07.000000000 -0700 -@@ -121,6 +121,8 @@ - #include "obj/dmc/plugins.h" - #elif defined ALLEGRO_BEOS - #include "obj/beos/plugins.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "obj/beos/plugins.h" - #elif defined ALLEGRO_BCC32 - #include "obj/bcc32/plugins.h" - #elif defined ALLEGRO_MPW diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-2.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-2.diff deleted file mode 100644 index 362496b24..000000000 --- a/media-libs/allegro/patches/allegro-4.3.10-haiku-2.diff +++ /dev/null @@ -1,657 +0,0 @@ -diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku/fix.sh ---- allegro-4.3.10/fix.sh 2008-01-01 13:59:18.000000000 -0800 -+++ allegro-4.3.10-haiku/fix.sh 2008-08-26 23:51:47.000000000 -0700 -@@ -9,7 +9,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod|--utom|--mtou]" - echo -- echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix" -+ echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix" - echo "mac, macosx, macosx-universal and watcom." - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format," -@@ -140,6 +140,7 @@ - "bcc32" ) proc_fix "Windows (BCC32)" "makefile.bcc" "ALLEGRO_BCC32";; - "beos" ) proc_fix "BeOS" "makefile.be" "ALLEGRO_BEOS";; - "djgpp" ) proc_fix "DOS (djgpp)" "makefile.dj" "ALLEGRO_DJGPP";; -+ "haiku" ) proc_fix "Haiku" "makefile.be" "ALLEGRO_HAIKU";; - "mingw" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - "mingw32" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - # The 'msvc' target is undocumented in the help message, but is used -diff -urN allegro-4.3.10/include/allegro/internal/aintern.h allegro-4.3.10-haiku/include/allegro/internal/aintern.h ---- allegro-4.3.10/include/allegro/internal/aintern.h 2008-01-05 14:37:14.000000000 -0800 -+++ allegro-4.3.10-haiku/include/allegro/internal/aintern.h 2008-08-26 22:35:46.000000000 -0700 -@@ -189,7 +189,7 @@ - - - #if (defined ALLEGRO_DOS) || (defined ALLEGRO_DJGPP) || (defined ALLEGRO_WATCOM) || \ -- (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - AL_ARRAY(char *, _pckeys_names); - -diff -urN allegro-4.3.10/include/allegro/internal/alconfig.h allegro-4.3.10-haiku/include/allegro/internal/alconfig.h ---- allegro-4.3.10/include/allegro/internal/alconfig.h 2007-06-24 01:13:22.000000000 -0700 -+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h 2008-08-26 22:20:39.000000000 -0700 -@@ -48,6 +48,8 @@ - #include "allegro/platform/albcc32.h" - #elif defined ALLEGRO_MSVC - #include "allegro/platform/almsvc.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_BEOS - #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10/include/allegro/platform/albecfg.h allegro-4.3.10-haiku/include/allegro/platform/albecfg.h ---- allegro-4.3.10/include/allegro/platform/albecfg.h 2007-06-15 19:52:28.000000000 -0700 -+++ allegro-4.3.10-haiku/include/allegro/platform/albecfg.h 2008-08-26 22:24:41.000000000 -0700 -@@ -31,7 +31,12 @@ - #define ALLEGRO_HAVE_SYS_TIME_H 1 - - /* describe this platform */ --#define ALLEGRO_PLATFORM_STR "BeOS" -+#if defined __BEOS__ && !defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "BeOS" -+#endif -+#if defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "Haiku" -+#endif - #define ALLEGRO_LITTLE_ENDIAN - #define ALLEGRO_CONSOLE_OK - #define ALLEGRO_USE_CONSTRUCTOR -diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all ---- allegro-4.3.10/makefile.all 2008-01-14 03:55:28.000000000 -0800 -+++ allegro-4.3.10-haiku/makefile.all 2008-08-23 17:44:44.000000000 -0700 -@@ -8,7 +8,7 @@ - # DEBUGMODE=2 selects a build intended to debug Allegro itself. - # PROFILEMODE=1 selects a profiling build. - # WARNMODE=1 selects strict compiler warnings. --# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS). -+# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS, Haiku). - # STATICRUNTIME=1 link to a static C runtime library (/MT) (MSVC) - # TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards - # compatibility with older processors (GCC-based platforms). -@@ -132,7 +132,7 @@ - # XXX this is duplicated in makefile.in - DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \ - readme makedoc datafile grabber dat dat2c dat2s license addons targets --DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom -+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom - DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES))) - - DOCS = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES)))) -diff -urN allegro-4.3.10/makefile.be allegro-4.3.10-haiku/makefile.be ---- allegro-4.3.10/makefile.be 2008-01-11 03:30:16.000000000 -0800 -+++ allegro-4.3.10-haiku/makefile.be 2008-08-26 22:11:32.000000000 -0700 -@@ -10,7 +10,15 @@ - - # -------- define some variables that the primary makefile will use -------- - -+ -+ifeq ($(OS),BeOS) - PLATFORM = BeOS -+endif -+ -+ifeq ($(OS),Haiku) -+PLATFORM = Haiku -+endif -+ - CC = gcc - EXE = - OBJ = .o -@@ -123,7 +131,13 @@ - - OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_BEOS_FILES))) - -+ifeq ($(OS),BeOS) - LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnet -+endif -+ -+ifeq ($(OS),Haiku) -+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork -+endif - - PROGRAMS = bfixicon - -@@ -167,7 +181,14 @@ - sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp - sed -e "s/include/headers/" temp >temp2 - sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp -+ -+ifeq ($(OS),BeOS) - sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/home\/config\/lib\"/" temp >/bin/allegro-config -+endif -+ifeq ($(OS),Haiku) -+ sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config -+endif -+ - rm -f temp temp2 - chmod a+x /bin/allegro-config - -diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku/misc/mkunixdists.sh ---- allegro-4.3.10/misc/mkunixdists.sh 2008-01-10 13:45:48.000000000 -0800 -+++ allegro-4.3.10-haiku/misc/mkunixdists.sh 2008-08-23 20:56:44.000000000 -0700 -@@ -73,9 +73,9 @@ - # Hack'n'slash - echo "Stripping to form end-user distribution" - (cd $dir/$basename && { -- (cd src && rm -rf beos qnx dos mac ppc win) -- (cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -- (cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -+ (cd src && rm -rf beos haiku qnx dos mac ppc win) -+ (cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) -+ (cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) - (cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h) - (cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh) - (cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c) -@@ -91,11 +91,11 @@ - - # jpgalleg addon - (cd addons/jpgalleg && rm -rf examples) -- (cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj) -+ (cd addons/jpgalleg && rm -f makefile.be makefile.haiku makefile.mgw makefile.dj) - (cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt) - (cd addons/jpgalleg/misc && rm -f fixver.sh runner.c) -- (cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc) -- (cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc) -+ (cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc) -+ (cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc) - - # logg addon - (cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat) -diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh ---- allegro-4.3.10/misc/zipup.sh 2008-01-19 04:16:56.000000000 -0800 -+++ allegro-4.3.10-haiku/misc/zipup.sh 2008-08-23 20:53:10.000000000 -0700 -@@ -126,6 +126,14 @@ - make depend UNIX_TOOLS=1 CC=gcc - - -+# generate dependencies for Haiku -+echo "Generating Haiku dependencies..." -+ -+./fix.sh haiku --quick -+ -+make depend UNIX_TOOLS=1 CC=gcc -+ -+ - # generate dependencies for QNX - echo "Generating QNX dependencies..." - -@@ -164,7 +172,7 @@ - for base in abi ahack allegro const faq help mistakes; do - ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx - done --for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do -+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do - ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx - done - -diff -urN allegro-4.3.10/setup/keyconf.c allegro-4.3.10-haiku/setup/keyconf.c ---- allegro-4.3.10/setup/keyconf.c 2005-04-07 16:37:20.000000000 -0700 -+++ allegro-4.3.10-haiku/setup/keyconf.c 2008-08-26 22:40:30.000000000 -0700 -@@ -25,8 +25,8 @@ - - - /* The code can't link on platforms that don't use src/misc/pckeys.c (everything -- * but DOS, QNX, BEOS). */ --#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ * but DOS, QNX, BEOS, HAIKU). */ -+#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - - char *ascii_name[32] = -diff -urN allegro-4.3.10/src/beos/baccel.cpp allegro-4.3.10-haiku/src/beos/baccel.cpp ---- allegro-4.3.10/src/beos/baccel.cpp 2002-09-01 16:18:56.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/baccel.cpp 2008-08-26 22:44:08.000000000 -0700 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bdispsw.cpp allegro-4.3.10-haiku/src/beos/bdispsw.cpp ---- allegro-4.3.10/src/beos/bdispsw.cpp 2002-04-06 07:18:16.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bdispsw.cpp 2008-08-26 22:44:30.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bdwindow.cpp allegro-4.3.10-haiku/src/beos/bdwindow.cpp ---- allegro-4.3.10/src/beos/bdwindow.cpp 2005-10-27 13:57:00.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/bdwindow.cpp 2008-08-26 22:44:57.000000000 -0700 -@@ -21,7 +21,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bgfx.c allegro-4.3.10-haiku/src/beos/bgfx.c ---- allegro-4.3.10/src/beos/bgfx.c 2004-11-26 08:05:12.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bgfx.c 2008-08-26 22:45:13.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bgfxapi.cpp allegro-4.3.10-haiku/src/beos/bgfxapi.cpp ---- allegro-4.3.10/src/beos/bgfxapi.cpp 2002-12-07 13:12:30.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bgfxapi.cpp 2008-08-26 22:45:26.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bgfxdrv.c allegro-4.3.10-haiku/src/beos/bgfxdrv.c ---- allegro-4.3.10/src/beos/bgfxdrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bgfxdrv.c 2008-08-26 22:45:49.000000000 -0700 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_GFX_DRIVER_LIST - GFX_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bjoy.c allegro-4.3.10-haiku/src/beos/bjoy.c ---- allegro-4.3.10/src/beos/bjoy.c 2001-11-06 09:16:42.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bjoy.c 2008-08-26 22:46:06.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bjoyapi.cpp allegro-4.3.10-haiku/src/beos/bjoyapi.cpp ---- allegro-4.3.10/src/beos/bjoyapi.cpp 2004-07-04 07:44:50.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/bjoyapi.cpp 2008-08-26 22:46:32.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - static BJoystick *be_joy = NULL; - static int32 num_devices, num_axes, num_hats, num_buttons; -diff -urN allegro-4.3.10/src/beos/bjoydrv.c allegro-4.3.10-haiku/src/beos/bjoydrv.c ---- allegro-4.3.10/src/beos/bjoydrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bjoydrv.c 2008-08-26 22:46:46.000000000 -0700 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_JOYSTICK_DRIVER_LIST - JOYSTICK_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bkey.c allegro-4.3.10-haiku/src/beos/bkey.c ---- allegro-4.3.10/src/beos/bkey.c 2004-12-03 12:56:28.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bkey.c 2008-08-26 22:47:00.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bkeyapi.cpp allegro-4.3.10-haiku/src/beos/bkeyapi.cpp ---- allegro-4.3.10/src/beos/bkeyapi.cpp 2005-10-27 13:57:00.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/bkeyapi.cpp 2008-08-26 22:47:20.000000000 -0700 -@@ -22,9 +22,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define KEY_ID_PC101 0 // the docs say it should be 0x83ab, but they lie - -diff -urN allegro-4.3.10/src/beos/bkeydrv.c allegro-4.3.10-haiku/src/beos/bkeydrv.c ---- allegro-4.3.10/src/beos/bkeydrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bkeydrv.c 2008-08-26 22:47:53.000000000 -0700 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _keyboard_driver_list[] = - { -diff -urN allegro-4.3.10/src/beos/bmidi.c allegro-4.3.10-haiku/src/beos/bmidi.c ---- allegro-4.3.10/src/beos/bmidi.c 2006-03-18 07:05:34.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bmidi.c 2008-08-26 22:48:11.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - MIDI_DRIVER midi_beos = - { -diff -urN allegro-4.3.10/src/beos/bmidiapi.cpp allegro-4.3.10-haiku/src/beos/bmidiapi.cpp ---- allegro-4.3.10/src/beos/bmidiapi.cpp 2007-08-09 14:48:38.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/bmidiapi.cpp 2008-08-26 22:48:29.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - BMidiSynth *_be_midisynth = NULL; -diff -urN allegro-4.3.10/src/beos/bmididrv.c allegro-4.3.10-haiku/src/beos/bmididrv.c ---- allegro-4.3.10/src/beos/bmididrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bmididrv.c 2008-08-26 22:48:50.000000000 -0700 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_MIDI_DRIVER_LIST - MIDI_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bmousapi.cpp allegro-4.3.10-haiku/src/beos/bmousapi.cpp ---- allegro-4.3.10/src/beos/bmousapi.cpp 2005-10-27 13:57:00.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/bmousapi.cpp 2008-08-26 22:49:09.000000000 -0700 -@@ -23,9 +23,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define MOUSE_THREAD_NAME "mouse driver" - #define MOUSE_THREAD_PRIORITY 60 -diff -urN allegro-4.3.10/src/beos/bmousdrv.c allegro-4.3.10-haiku/src/beos/bmousdrv.c ---- allegro-4.3.10/src/beos/bmousdrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bmousdrv.c 2008-08-26 22:49:25.000000000 -0700 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bmouse.c allegro-4.3.10-haiku/src/beos/bmouse.c ---- allegro-4.3.10/src/beos/bmouse.c 2004-12-04 05:24:16.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bmouse.c 2008-08-26 22:49:38.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/boverlay.cpp allegro-4.3.10-haiku/src/beos/boverlay.cpp ---- allegro-4.3.10/src/beos/boverlay.cpp 2002-11-15 03:53:40.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/boverlay.cpp 2008-08-26 22:49:53.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bsnd.c allegro-4.3.10-haiku/src/beos/bsnd.c ---- allegro-4.3.10/src/beos/bsnd.c 2006-03-18 07:05:34.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bsnd.c 2008-08-26 22:50:07.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - DIGI_DRIVER digi_beos = - { -diff -urN allegro-4.3.10/src/beos/bsndapi.cpp allegro-4.3.10-haiku/src/beos/bsndapi.cpp ---- allegro-4.3.10/src/beos/bsndapi.cpp 2006-03-18 07:05:34.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bsndapi.cpp 2008-08-26 22:50:22.000000000 -0700 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bsnddrv.c allegro-4.3.10-haiku/src/beos/bsnddrv.c ---- allegro-4.3.10/src/beos/bsnddrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bsnddrv.c 2008-08-26 22:50:52.000000000 -0700 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_DIGI_DRIVER_LIST - DIGI_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bsysapi.cpp allegro-4.3.10-haiku/src/beos/bsysapi.cpp ---- allegro-4.3.10/src/beos/bsysapi.cpp 2005-10-27 13:57:00.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/bsysapi.cpp 2008-08-26 22:51:53.000000000 -0700 -@@ -27,9 +27,9 @@ - #include - #endif - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define SYS_THREAD_PRIORITY B_NORMAL_PRIORITY - #define SYS_THREAD_NAME "system driver" -diff -urN allegro-4.3.10/src/beos/bsysdrv.c allegro-4.3.10-haiku/src/beos/bsysdrv.c ---- allegro-4.3.10/src/beos/bsysdrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bsysdrv.c 2008-08-26 22:52:11.000000000 -0700 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _system_driver_list[] = - { -diff -urN allegro-4.3.10/src/beos/bsystem.c allegro-4.3.10-haiku/src/beos/bsystem.c ---- allegro-4.3.10/src/beos/bsystem.c 2002-12-07 13:10:58.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bsystem.c 2008-08-26 23:39:03.000000000 -0700 -@@ -19,11 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -- -- -+#endif - - SYSTEM_DRIVER system_beos = { - SYSTEM_BEOS, -diff -urN allegro-4.3.10/src/beos/btimeapi.cpp allegro-4.3.10-haiku/src/beos/btimeapi.cpp ---- allegro-4.3.10/src/beos/btimeapi.cpp 2004-07-27 04:33:22.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/btimeapi.cpp 2008-08-26 22:52:45.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/btimedrv.c allegro-4.3.10-haiku/src/beos/btimedrv.c ---- allegro-4.3.10/src/beos/btimedrv.c 2001-11-06 07:30:48.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/btimedrv.c 2008-08-26 22:53:00.000000000 -0700 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _timer_driver_list[] = { - {TIMER_BEOS, &timer_beos, TRUE}, -diff -urN allegro-4.3.10/src/beos/btimer.c allegro-4.3.10-haiku/src/beos/btimer.c ---- allegro-4.3.10/src/beos/btimer.c 2004-08-21 19:57:14.000000000 -0700 -+++ allegro-4.3.10-haiku/src/beos/btimer.c 2008-08-26 22:53:13.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bwindow.cpp allegro-4.3.10-haiku/src/beos/bwindow.cpp ---- allegro-4.3.10/src/beos/bwindow.cpp 2002-11-15 03:53:40.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bwindow.cpp 2008-08-26 22:53:28.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bwscreen.cpp allegro-4.3.10-haiku/src/beos/bwscreen.cpp ---- allegro-4.3.10/src/beos/bwscreen.cpp 2004-11-26 09:27:02.000000000 -0800 -+++ allegro-4.3.10-haiku/src/beos/bwscreen.cpp 2008-08-26 22:53:51.000000000 -0700 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/midi.c allegro-4.3.10-haiku/src/midi.c ---- allegro-4.3.10/src/midi.c 2007-04-12 09:19:54.000000000 -0700 -+++ allegro-4.3.10-haiku/src/midi.c 2008-08-26 22:56:43.000000000 -0700 -@@ -1122,7 +1122,7 @@ - running_status = 0; - - while (p < end) { /* work through data stream */ --#ifdef ALLEGRO_BEOS -+#if defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU - /* Is there a bug in this routine, or in gcc under BeOS/x86? --PW */ - { int i; for (i=1; i; i--); } - #endif -diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c ---- allegro-4.3.10/tools/dat2c.c 2005-04-28 02:53:38.000000000 -0700 -+++ allegro-4.3.10-haiku/tools/dat2c.c 2008-08-23 20:44:06.000000000 -0700 -@@ -342,7 +342,7 @@ - } - - if (dat2c->lformat == lineformat_default) --#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX) -+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX) - dat2c->lformat = lineformat_unix; - #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS) - dat2c->lformat = lineformat_dos; -diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku/tools/datedit.c ---- allegro-4.3.10/tools/datedit.c 2007-10-08 09:23:36.000000000 -0700 -+++ allegro-4.3.10-haiku/tools/datedit.c 2008-08-23 20:42:07.000000000 -0700 -@@ -121,6 +121,8 @@ - #include "obj/dmc/plugins.h" - #elif defined ALLEGRO_BEOS - #include "obj/beos/plugins.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "obj/beos/plugins.h" - #elif defined ALLEGRO_BCC32 - #include "obj/bcc32/plugins.h" - #elif defined ALLEGRO_MPW diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-3.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-3.diff deleted file mode 100644 index abd3aad5f..000000000 --- a/media-libs/allegro/patches/allegro-4.3.10-haiku-3.diff +++ /dev/null @@ -1,325 +0,0 @@ -diff -urN allegro-4.3.10/addons/allegrogl/fix.sh allegro-4.3.10-haiku-fixes/addons/allegrogl/fix.sh ---- allegro-4.3.10/addons/allegrogl/fix.sh 2008-01-01 03:20:16.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/addons/allegrogl/fix.sh 2008-08-31 09:12:54.000000000 -0700 -@@ -18,7 +18,7 @@ - echo "Compilation target adjustment." - echo " Usage: fix [--dtou|--utod|--quick]" - echo "" --echo " is one of: djgpp, mingw32, unix, macosx" -+echo " is one of: djgpp, haiku, mingw32, unix, macosx" - echo "" - echo " --dtou converts from DOS/Win32 format to Unix" - echo " --utod converts from Unix format to DOS/Win32" -@@ -79,6 +79,7 @@ - - case "$1" in - djgpp ) proc_fix "DJGPP" "makefile.dj";; -+ haiku ) proc_fix "Haiku" "makefile.gen";; - mingw ) proc_fix "Mingw32" "makefile.mgw";; - mingw32 ) proc_fix "Mingw32" "makefile.mgw";; - # used only by allegro's zipup.sh in packaging process -diff -urN allegro-4.3.10/addons/loadpng/Makefile.be allegro-4.3.10-haiku-fixes/addons/loadpng/Makefile.be ---- allegro-4.3.10/addons/loadpng/Makefile.be 1969-12-31 16:00:00.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/addons/loadpng/Makefile.be 2008-08-31 09:01:30.000000000 -0700 -@@ -0,0 +1,57 @@ -+## Aux -*- Makefile -*- for BeOS/Haiku -+ -+prefix := `/boot/common/bin/allegro-config --prefix` -+libdir := $(prefix)/lib -+includedir := $(prefix)/include -+DESTDIR := -+ -+EXAMPLECFLAGS := -Wno-deprecated-declarations -I/boot/common/include -+EXAMPLELIBS := -lpng -lz `/boot/common/bin/allegro-config --libs --addon` -L/boot/common/lib -+ -+ -+#-------------------------------------------------- -+# Note: this is for gcc -+# And I don't really think you should use it, but it's up to you -+.PHONY: shared -+ -+SHAREDLIB := libloadpng-$(VERSION).so -+ -+shared: $(SHAREDLIB) -+ -+$(SHAREDLIB): loadpng.c savepng.c regpng.c -+ $(CC) -o $(SHAREDLIB) $(CFLAGS) -fPIC -shared loadpng.c savepng.c regpng.c -+ -+#-------------------------------------------------- -+.PHONY: install install-headers install-shared -+ -+install: $(LIB) install-headers -+ install -d -m 755 $(DESTDIR)$(libdir) -+ install -m 644 $(LIB) $(DESTDIR)$(libdir) -+ @echo - -+ @echo loadpng is now installed. -+ -+install-shared: $(SHAREDLIB) install-headers -+ install -d -m 755 $(DESTDIR)$(libdir) -+ install -m 755 $(SHAREDLIB) $(DESTDIR)$(libdir) -+ -+install-headers: -+ install -d -m 755 $(DESTDIR)$(includedir) -+ install -m 644 loadpng.h $(DESTDIR)$(includedir) -+ -+#-------------------------------------------------- -+.PHONY: uninstall -+ -+uninstall: -+ -rm -f $(DESTDIR)$(includedir)/loadpng.h -+ -rm -f $(DESTDIR)$(libdir)/$(LIB) -+ @echo - -+ @echo loadpng is now uninstalled. -+ -+#-------------------------------------------------- -+.PHONY: clean veryclean -+ -+clean: -+ - rm -f loadpng.o savepng.o regpng.o $(LIB) $(SHAREDLIB) -+ -+veryclean: clean -+ - rm -f $(EXAMPLES) examples/saved.png -diff -urN allegro-4.3.10/addons/loadpng/fix.sh allegro-4.3.10-haiku-fixes/addons/loadpng/fix.sh ---- allegro-4.3.10/addons/loadpng/fix.sh 2007-12-27 17:05:30.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/addons/loadpng/fix.sh 2008-08-31 09:04:07.000000000 -0700 -@@ -8,7 +8,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: djgpp, mingw32, unix" -+ echo "Where platform is one of: beos, djgpp, haiku, mingw32, unix" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -95,7 +95,9 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; - "djgpp" ) proc_fix "DOS (djgpp)" "Makefile.dj";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "unix" ) proc_fix "Unix" "Makefile.unx";; -diff -urN allegro-4.3.10/addons/logg/Makefile.be allegro-4.3.10-haiku-fixes/addons/logg/Makefile.be ---- allegro-4.3.10/addons/logg/Makefile.be 1969-12-31 16:00:00.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/addons/logg/Makefile.be 2008-08-31 08:57:22.000000000 -0700 -@@ -0,0 +1,43 @@ -+PREFIX=`/boot/common/bin/allegro-config --prefix` -+CC=gcc -+FLAGS=-O2 -g0 `/boot/common/bin/allegro-config --cflags --addon` -I/boot/common/include -+LFLAGS=-L. -L/boot/common/lib -llogg -logg -lvorbis -lvorbisfile `/boot/common/bin/allegro-config --libs --addon` -+ -+all: lib play_ogg stream_ogg -+ -+lib: liblogg.a -+ -+liblogg.a: logg.o -+ ar rc $@ $^ -+ ranlib $@ -+ -+logg.o: logg.c logg.h -+ $(CC) $(FLAGS) -c logg.c -+ -+play_ogg: play_ogg.c liblogg.a -+ gcc $(FLAGS) play_ogg.c -o play_ogg $(LFLAGS) -+ -+stream_ogg: stream_ogg.c liblogg.a -+ gcc $(FLAGS) stream_ogg.c -o stream_ogg $(LFLAGS) -+ -+clean: -+ rm -f logg.o -+ -+veryclean: clean -+ rm -f liblogg.a -+ rm -f play_ogg -+ rm -f stream_ogg -+ -+install: -+ cp -f logg.h $(DESTDIR)$(PREFIX)/include -+ cp -f liblogg.a $(DESTDIR)$(PREFIX)/lib -+ @echo - -+ @echo logg is now installed. -+ -+uninstall: -+ rm -f $(DESTDIR)$(PREFIX)/include/logg.h -+ rm -f $(DESTDIR)$(PREFIX)/lib/liblogg.a -+ @echo - -+ @echo logg is now uninstalled. -+ -+examples: play_ogg stream_ogg -diff -urN allegro-4.3.10/addons/logg/fix.sh allegro-4.3.10-haiku-fixes/addons/logg/fix.sh ---- allegro-4.3.10/addons/logg/fix.sh 2007-12-31 11:24:16.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/addons/logg/fix.sh 2008-08-31 09:06:13.000000000 -0700 -@@ -8,7 +8,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: mingw32, unix" -+ echo "Where platform is one of: beos, haiku, mingw32, unix" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -94,6 +94,8 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "unix" ) proc_fix "Unix" "Makefile.unix";; -diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku-fixes/fix.sh ---- allegro-4.3.10/fix.sh 2008-01-01 13:59:18.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/fix.sh 2008-08-26 22:13:03.000000000 -0700 -@@ -9,7 +9,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod|--utom|--mtou]" - echo -- echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix" -+ echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix" - echo "mac, macosx, macosx-universal and watcom." - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format," -@@ -140,6 +140,7 @@ - "bcc32" ) proc_fix "Windows (BCC32)" "makefile.bcc" "ALLEGRO_BCC32";; - "beos" ) proc_fix "BeOS" "makefile.be" "ALLEGRO_BEOS";; - "djgpp" ) proc_fix "DOS (djgpp)" "makefile.dj" "ALLEGRO_DJGPP";; -+ "haiku" ) proc_fix "Haiku" "makefile.be" "ALLEGRO_HAIKU";; - "mingw" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - "mingw32" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - # The 'msvc' target is undocumented in the help message, but is used -diff -urN allegro-4.3.10/include/allegro/platform/alplatf.h allegro-4.3.10-haiku-fixes/include/allegro/platform/alplatf.h ---- allegro-4.3.10/include/allegro/platform/alplatf.h 2008-01-19 16:00:54.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/include/allegro/platform/alplatf.h 2008-08-23 17:23:59.000000000 -0700 -@@ -1,2 +1,2 @@ - /* generated by fix.sh */ --#define ALLEGRO_UNIX -+#define ALLEGRO_BEOS -diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku-fixes/makefile.all ---- allegro-4.3.10/makefile.all 2008-01-14 03:55:28.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/makefile.all 2008-08-23 17:45:06.000000000 -0700 -@@ -8,7 +8,7 @@ - # DEBUGMODE=2 selects a build intended to debug Allegro itself. - # PROFILEMODE=1 selects a profiling build. - # WARNMODE=1 selects strict compiler warnings. --# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS). -+# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS, Haiku). - # STATICRUNTIME=1 link to a static C runtime library (/MT) (MSVC) - # TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards - # compatibility with older processors (GCC-based platforms). -@@ -132,7 +132,7 @@ - # XXX this is duplicated in makefile.in - DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \ - readme makedoc datafile grabber dat dat2c dat2s license addons targets --DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom -+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom - DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES))) - - DOCS = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES)))) - -diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku-fixes/misc/mkunixdists.sh ---- allegro-4.3.10/misc/mkunixdists.sh 2008-01-10 13:45:48.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/misc/mkunixdists.sh 2008-08-23 20:56:44.000000000 -0700 -@@ -73,9 +73,9 @@ - # Hack'n'slash - echo "Stripping to form end-user distribution" - (cd $dir/$basename && { -- (cd src && rm -rf beos qnx dos mac ppc win) -- (cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -- (cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -+ (cd src && rm -rf beos haiku qnx dos mac ppc win) -+ (cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) -+ (cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) - (cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h) - (cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh) - (cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c) -@@ -91,11 +91,11 @@ - - # jpgalleg addon - (cd addons/jpgalleg && rm -rf examples) -- (cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj) -+ (cd addons/jpgalleg && rm -f makefile.be makefile.haiku makefile.mgw makefile.dj) - (cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt) - (cd addons/jpgalleg/misc && rm -f fixver.sh runner.c) -- (cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc) -- (cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc) -+ (cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc) -+ (cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc) - - # logg addon - (cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat) -diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku-fixes/misc/zipup.sh ---- allegro-4.3.10/misc/zipup.sh 2008-01-19 04:16:56.000000000 -0800 -+++ allegro-4.3.10-haiku-fixes/misc/zipup.sh 2008-08-23 20:53:10.000000000 -0700 -@@ -126,6 +126,14 @@ - make depend UNIX_TOOLS=1 CC=gcc - - -+# generate dependencies for Haiku -+echo "Generating Haiku dependencies..." -+ -+./fix.sh haiku --quick -+ -+make depend UNIX_TOOLS=1 CC=gcc -+ -+ - # generate dependencies for QNX - echo "Generating QNX dependencies..." - -@@ -164,7 +172,7 @@ - for base in abi ahack allegro const faq help mistakes; do - ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx - done --for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do -+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do - ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx - done - -diff -urN allegro-4.3.10/src/i386/asmdefs.inc allegro-4.3.10-haiku-fixes/src/i386/asmdefs.inc ---- allegro-4.3.10/src/i386/asmdefs.inc 2007-06-15 19:52:28.000000000 -0700 -+++ allegro-4.3.10-haiku-fixes/src/i386/asmdefs.inc 2008-08-31 09:35:34.000000000 -0700 -@@ -31,6 +31,8 @@ - #include "obj/msvc/asmdef.inc" - #elif defined ALLEGRO_WATCOM - #include "obj/watcom/asmdef.inc" -+#elif defined ALLEGRO_HAIKU -+ #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_BEOS - #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_QNX -diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku-fixes/tools/dat2c.c ---- allegro-4.3.10/tools/dat2c.c 2005-04-28 02:53:38.000000000 -0700 -+++ allegro-4.3.10-haiku-fixes/tools/dat2c.c 2008-08-23 20:44:06.000000000 -0700 -@@ -342,7 +342,7 @@ - } - - if (dat2c->lformat == lineformat_default) --#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX) -+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX) - dat2c->lformat = lineformat_unix; - #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS) - dat2c->lformat = lineformat_dos; -diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku-fixes/tools/datedit.c ---- allegro-4.3.10/tools/datedit.c 2007-10-08 09:23:36.000000000 -0700 -+++ allegro-4.3.10-haiku-fixes/tools/datedit.c 2008-08-23 20:42:07.000000000 -0700 -@@ -121,6 +121,8 @@ - #include "obj/dmc/plugins.h" - #elif defined ALLEGRO_BEOS - #include "obj/beos/plugins.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "obj/beos/plugins.h" - #elif defined ALLEGRO_BCC32 - #include "obj/bcc32/plugins.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10/tools/grabber.c allegro-4.3.10-haiku-fixes/tools/grabber.c ---- allegro-4.3.10/tools/grabber.c 2006-07-24 06:09:26.000000000 -0700 -+++ allegro-4.3.10-haiku-fixes/tools/grabber.c 2008-08-23 20:38:47.000000000 -0700 -@@ -3132,6 +3132,7 @@ - case OSTYPE_QNX: s = "QNX"; break; - case OSTYPE_UNIX: s = "Unix"; break; - case OSTYPE_BEOS: s = "BeOS"; break; -+ case OSTYPE_HAIKU: s = "Haiku"; break; - case OSTYPE_MACOS: s = "MacOS"; break; - case OSTYPE_MACOSX: s = "MacOS X"; break; - default: s = "Unknown"; break; diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-4.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-4.diff deleted file mode 100644 index eb58d7d82..000000000 --- a/media-libs/allegro/patches/allegro-4.3.10-haiku-4.diff +++ /dev/null @@ -1,792 +0,0 @@ -diff -urN allegro-4.3.10/addons/allegrogl/fix.sh allegro-4.3.10-haiku/addons/allegrogl/fix.sh ---- allegro-4.3.10/addons/allegrogl/fix.sh 2008-01-01 11:20:16.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/allegrogl/fix.sh 2008-09-13 20:09:02.000000000 +0000 -@@ -18,7 +18,7 @@ - echo "Compilation target adjustment." - echo " Usage: fix [--dtou|--utod|--quick]" - echo "" --echo " is one of: djgpp, mingw32, unix, macosx" -+echo " is one of: djgpp, haiku, mingw32, unix, macosx" - echo "" - echo " --dtou converts from DOS/Win32 format to Unix" - echo " --utod converts from Unix format to DOS/Win32" -@@ -79,6 +79,7 @@ - - case "$1" in - djgpp ) proc_fix "DJGPP" "makefile.dj";; -+ haiku ) proc_fix "Haiku" "makefile.gen";; - mingw ) proc_fix "Mingw32" "makefile.mgw";; - mingw32 ) proc_fix "Mingw32" "makefile.mgw";; - # used only by allegro's zipup.sh in packaging process -diff -urN allegro-4.3.10/addons/jpgalleg/fix.sh allegro-4.3.10-haiku/addons/jpgalleg/fix.sh ---- allegro-4.3.10/addons/jpgalleg/fix.sh 2008-01-04 19:55:22.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/jpgalleg/fix.sh 2008-09-13 18:13:30.000000000 +0000 -@@ -94,6 +94,7 @@ - "mingw" ) proc_fix "MinGW32" "makefile.mgw";; - "msvc" ) proc_fix "MSVC" "makefile.vc";; - "beos" ) proc_fix "BeOS" "makefile.be";; -+ "haiku" ) proc_fix "Haiku" "makefile.be";; - "unix" ) proc_fix "Unix" "makefile.uni";; - "macosx" ) proc_fix "MacOS X" "makefile.osx";; - "help" ) proc_help;; -diff -urN allegro-4.3.10/addons/loadpng/fix.sh allegro-4.3.10-haiku/addons/loadpng/fix.sh ---- allegro-4.3.10/addons/loadpng/fix.sh 2007-12-28 01:05:30.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/loadpng/fix.sh 2008-09-13 20:09:10.000000000 +0000 -@@ -8,7 +8,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: djgpp, mingw32, unix" -+ echo "Where platform is one of: beos, djgpp, haiku, mingw32, unix" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -95,7 +95,9 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; - "djgpp" ) proc_fix "DOS (djgpp)" "Makefile.dj";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "unix" ) proc_fix "Unix" "Makefile.unx";; -diff -urN allegro-4.3.10/addons/logg/fix.sh allegro-4.3.10-haiku/addons/logg/fix.sh ---- allegro-4.3.10/addons/logg/fix.sh 2007-12-31 19:24:16.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/logg/fix.sh 2008-09-13 20:11:46.000000000 +0000 -@@ -8,7 +8,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: mingw32, unix" -+ echo "Where platform is one of: beos, haiku, mingw32, unix" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -94,6 +94,8 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "unix" ) proc_fix "Unix" "Makefile.unix";; -diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku/fix.sh ---- allegro-4.3.10/fix.sh 2008-01-01 21:59:18.000000000 +0000 -+++ allegro-4.3.10-haiku/fix.sh 2008-09-13 20:11:46.000000000 +0000 -@@ -9,7 +9,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod|--utom|--mtou]" - echo -- echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix" -+ echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix" - echo "mac, macosx, macosx-universal and watcom." - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format," -@@ -140,6 +140,7 @@ - "bcc32" ) proc_fix "Windows (BCC32)" "makefile.bcc" "ALLEGRO_BCC32";; - "beos" ) proc_fix "BeOS" "makefile.be" "ALLEGRO_BEOS";; - "djgpp" ) proc_fix "DOS (djgpp)" "makefile.dj" "ALLEGRO_DJGPP";; -+ "haiku" ) proc_fix "Haiku" "makefile.be" "ALLEGRO_HAIKU";; - "mingw" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - "mingw32" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - # The 'msvc' target is undocumented in the help message, but is used -diff -urN allegro-4.3.10/include/allegro/internal/aintern.h allegro-4.3.10-haiku/include/allegro/internal/aintern.h ---- allegro-4.3.10/include/allegro/internal/aintern.h 2008-01-05 22:37:14.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/internal/aintern.h 2008-09-13 20:11:46.000000000 +0000 -@@ -189,7 +189,7 @@ - - - #if (defined ALLEGRO_DOS) || (defined ALLEGRO_DJGPP) || (defined ALLEGRO_WATCOM) || \ -- (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - AL_ARRAY(char *, _pckeys_names); - -diff -urN allegro-4.3.10/include/allegro/internal/alconfig.h allegro-4.3.10-haiku/include/allegro/internal/alconfig.h ---- allegro-4.3.10/include/allegro/internal/alconfig.h 2007-06-24 08:13:22.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h 2008-09-13 20:11:46.000000000 +0000 -@@ -48,6 +48,8 @@ - #include "allegro/platform/albcc32.h" - #elif defined ALLEGRO_MSVC - #include "allegro/platform/almsvc.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_BEOS - #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10/include/allegro/platform/albecfg.h allegro-4.3.10-haiku/include/allegro/platform/albecfg.h ---- allegro-4.3.10/include/allegro/platform/albecfg.h 2007-06-16 02:52:28.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/platform/albecfg.h 2008-09-13 20:11:46.000000000 +0000 -@@ -31,7 +31,13 @@ - #define ALLEGRO_HAVE_SYS_TIME_H 1 - - /* describe this platform */ --#define ALLEGRO_PLATFORM_STR "BeOS" -+#if defined __BEOS__ && !defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "BeOS" -+#endif -+#if defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "Haiku" -+ #define ALLEGRO_HAVE_LIBPTHREAD 1 -+#endif - #define ALLEGRO_LITTLE_ENDIAN - #define ALLEGRO_CONSOLE_OK - #define ALLEGRO_USE_CONSTRUCTOR -diff -urN allegro-4.3.10/include/allegro/platform/albeos.h allegro-4.3.10-haiku/include/allegro/platform/albeos.h ---- allegro-4.3.10/include/allegro/platform/albeos.h 2002-10-01 18:05:12.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/platform/albeos.h 2008-09-13 20:11:46.000000000 +0000 -@@ -74,3 +74,7 @@ - #define JOYSTICK_DRIVER_BEOS \ - { JOYSTICK_BEOS, &joystick_beos, TRUE }, - -+#if defined __HAIKU__ -+#define TIMERDRV_UNIX_PTHREADS AL_ID('P','T','H','R') -+#endif -+ -diff -urN allegro-4.3.10/include/allegro/platform/alunixac.hin allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin ---- allegro-4.3.10/include/allegro/platform/alunixac.hin 2007-07-15 05:28:14.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin 2008-09-13 20:11:46.000000000 +0000 -@@ -68,7 +68,7 @@ - #undef ALLEGRO_DARWIN - - /* Define if you have the pthread library. */ --#undef ALLEGRO_HAVE_LIBPTHREAD -+/* #undef ALLEGRO_HAVE_LIBPTHREAD */ - - /* Define if constructor attribute is supported. */ - #undef ALLEGRO_USE_CONSTRUCTOR -@@ -159,7 +159,7 @@ - - /* Define as the return type of signal handlers (`int' or `void'). */ - /* TODO: rename this */ --#undef RETSIGTYPE -+/* #undef RETSIGTYPE */ - - /* Define to empty if `const' does not conform to ANSI C. */ - #undef const -diff -urN allegro-4.3.10/include/allegro/system.h allegro-4.3.10-haiku/include/allegro/system.h ---- allegro-4.3.10/include/allegro/system.h 2008-01-02 10:39:24.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/system.h 2008-09-13 20:11:46.000000000 +0000 -@@ -61,6 +61,7 @@ - #define OSTYPE_QNX AL_ID('Q','N','X',' ') - #define OSTYPE_UNIX AL_ID('U','N','I','X') - #define OSTYPE_BEOS AL_ID('B','E','O','S') -+#define OSTYPE_HAIKU AL_ID('H','A','I','K') - #define OSTYPE_MACOS AL_ID('M','A','C',' ') - #define OSTYPE_MACOSX AL_ID('M','A','C','X') - -diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all ---- allegro-4.3.10/makefile.all 2008-01-14 11:55:28.000000000 +0000 -+++ allegro-4.3.10-haiku/makefile.all 2008-09-13 20:11:46.000000000 +0000 -@@ -8,7 +8,7 @@ - # DEBUGMODE=2 selects a build intended to debug Allegro itself. - # PROFILEMODE=1 selects a profiling build. - # WARNMODE=1 selects strict compiler warnings. --# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS). -+# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS, Haiku). - # STATICRUNTIME=1 link to a static C runtime library (/MT) (MSVC) - # TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards - # compatibility with older processors (GCC-based platforms). -@@ -132,7 +132,7 @@ - # XXX this is duplicated in makefile.in - DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \ - readme makedoc datafile grabber dat dat2c dat2s license addons targets --DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom -+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom - DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES))) - - DOCS = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES)))) -diff -urN allegro-4.3.10/makefile.be allegro-4.3.10-haiku/makefile.be ---- allegro-4.3.10/makefile.be 2008-01-11 11:30:16.000000000 +0000 -+++ allegro-4.3.10-haiku/makefile.be 2008-09-13 20:11:46.000000000 +0000 -@@ -10,7 +10,15 @@ - - # -------- define some variables that the primary makefile will use -------- - -+ -+ifeq ($(OS),BeOS) - PLATFORM = BeOS -+endif -+ -+ifeq ($(OS),Haiku) -+PLATFORM = Haiku -+endif -+ - CC = gcc - EXE = - OBJ = .o -@@ -123,7 +131,13 @@ - - OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_BEOS_FILES))) - -+ifeq ($(OS),BeOS) - LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnet -+endif -+ -+ifeq ($(OS),Haiku) -+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork -+endif - - PROGRAMS = bfixicon - -@@ -167,7 +181,14 @@ - sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp - sed -e "s/include/headers/" temp >temp2 - sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp -+ -+ifeq ($(OS),BeOS) - sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/home\/config\/lib\"/" temp >/bin/allegro-config -+endif -+ifeq ($(OS),Haiku) -+ sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config -+endif -+ - rm -f temp temp2 - chmod a+x /bin/allegro-config - -diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku/misc/mkunixdists.sh ---- allegro-4.3.10/misc/mkunixdists.sh 2008-01-10 21:45:48.000000000 +0000 -+++ allegro-4.3.10-haiku/misc/mkunixdists.sh 2008-09-13 20:11:46.000000000 +0000 -@@ -73,9 +73,9 @@ - # Hack'n'slash - echo "Stripping to form end-user distribution" - (cd $dir/$basename && { -- (cd src && rm -rf beos qnx dos mac ppc win) -- (cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -- (cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -+ (cd src && rm -rf beos haiku qnx dos mac ppc win) -+ (cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) -+ (cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) - (cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h) - (cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh) - (cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c) -@@ -94,8 +94,8 @@ - (cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj) - (cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt) - (cd addons/jpgalleg/misc && rm -f fixver.sh runner.c) -- (cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc) -- (cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc) -+ (cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc) -+ (cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc) - - # logg addon - (cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat) -diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh ---- allegro-4.3.10/misc/zipup.sh 2008-01-19 12:16:56.000000000 +0000 -+++ allegro-4.3.10-haiku/misc/zipup.sh 2008-09-13 20:11:46.000000000 +0000 -@@ -125,6 +125,12 @@ - - make depend UNIX_TOOLS=1 CC=gcc - -+# generate dependencies for Haiku -+echo "Generating Haiku dependencies..." -+ -+./fix.sh haiku --quick -+ -+make depend UNIX_TOOLS=1 CC=gcc - - # generate dependencies for QNX - echo "Generating QNX dependencies..." -@@ -164,7 +170,7 @@ - for base in abi ahack allegro const faq help mistakes; do - ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx - done --for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do -+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do - ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx - done - -diff -urN allegro-4.3.10/setup/keyconf.c allegro-4.3.10-haiku/setup/keyconf.c ---- allegro-4.3.10/setup/keyconf.c 2005-04-07 23:37:20.000000000 +0000 -+++ allegro-4.3.10-haiku/setup/keyconf.c 2008-09-13 20:11:46.000000000 +0000 -@@ -25,8 +25,8 @@ - - - /* The code can't link on platforms that don't use src/misc/pckeys.c (everything -- * but DOS, QNX, BEOS). */ --#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ * but DOS, QNX, BEOS, HAIKU). */ -+#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - - char *ascii_name[32] = -diff -urN allegro-4.3.10/src/beos/baccel.cpp allegro-4.3.10-haiku/src/beos/baccel.cpp ---- allegro-4.3.10/src/beos/baccel.cpp 2002-09-01 23:18:56.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/baccel.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bdispsw.cpp allegro-4.3.10-haiku/src/beos/bdispsw.cpp ---- allegro-4.3.10/src/beos/bdispsw.cpp 2002-04-06 15:18:16.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bdispsw.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bdwindow.cpp allegro-4.3.10-haiku/src/beos/bdwindow.cpp ---- allegro-4.3.10/src/beos/bdwindow.cpp 2005-10-27 20:57:00.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bdwindow.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -21,7 +21,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bgfx.c allegro-4.3.10-haiku/src/beos/bgfx.c ---- allegro-4.3.10/src/beos/bgfx.c 2004-11-26 16:05:12.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bgfx.c 2008-09-13 20:11:46.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bgfxapi.cpp allegro-4.3.10-haiku/src/beos/bgfxapi.cpp ---- allegro-4.3.10/src/beos/bgfxapi.cpp 2002-12-07 21:12:30.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bgfxapi.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bgfxdrv.c allegro-4.3.10-haiku/src/beos/bgfxdrv.c ---- allegro-4.3.10/src/beos/bgfxdrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bgfxdrv.c 2008-09-13 20:11:46.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_GFX_DRIVER_LIST - GFX_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bjoy.c allegro-4.3.10-haiku/src/beos/bjoy.c ---- allegro-4.3.10/src/beos/bjoy.c 2001-11-06 17:16:42.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bjoy.c 2008-09-13 20:11:46.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bjoyapi.cpp allegro-4.3.10-haiku/src/beos/bjoyapi.cpp ---- allegro-4.3.10/src/beos/bjoyapi.cpp 2004-07-04 14:44:50.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bjoyapi.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - static BJoystick *be_joy = NULL; - static int32 num_devices, num_axes, num_hats, num_buttons; -diff -urN allegro-4.3.10/src/beos/bjoydrv.c allegro-4.3.10-haiku/src/beos/bjoydrv.c ---- allegro-4.3.10/src/beos/bjoydrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bjoydrv.c 2008-09-13 20:11:46.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_JOYSTICK_DRIVER_LIST - JOYSTICK_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bkey.c allegro-4.3.10-haiku/src/beos/bkey.c ---- allegro-4.3.10/src/beos/bkey.c 2004-12-03 20:56:28.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bkey.c 2008-09-13 20:11:46.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bkeyapi.cpp allegro-4.3.10-haiku/src/beos/bkeyapi.cpp ---- allegro-4.3.10/src/beos/bkeyapi.cpp 2005-10-27 20:57:00.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bkeyapi.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -22,9 +22,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define KEY_ID_PC101 0 // the docs say it should be 0x83ab, but they lie - -diff -urN allegro-4.3.10/src/beos/bkeydrv.c allegro-4.3.10-haiku/src/beos/bkeydrv.c ---- allegro-4.3.10/src/beos/bkeydrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bkeydrv.c 2008-09-13 20:11:46.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _keyboard_driver_list[] = - { -diff -urN allegro-4.3.10/src/beos/bmidi.c allegro-4.3.10-haiku/src/beos/bmidi.c ---- allegro-4.3.10/src/beos/bmidi.c 2006-03-18 15:05:34.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmidi.c 2008-09-13 20:11:46.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - MIDI_DRIVER midi_beos = - { -diff -urN allegro-4.3.10/src/beos/bmidiapi.cpp allegro-4.3.10-haiku/src/beos/bmidiapi.cpp ---- allegro-4.3.10/src/beos/bmidiapi.cpp 2007-08-09 21:48:38.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmidiapi.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - BMidiSynth *_be_midisynth = NULL; -diff -urN allegro-4.3.10/src/beos/bmididrv.c allegro-4.3.10-haiku/src/beos/bmididrv.c ---- allegro-4.3.10/src/beos/bmididrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmididrv.c 2008-09-13 20:11:46.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_MIDI_DRIVER_LIST - MIDI_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bmousapi.cpp allegro-4.3.10-haiku/src/beos/bmousapi.cpp ---- allegro-4.3.10/src/beos/bmousapi.cpp 2005-10-27 20:57:00.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmousapi.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -23,9 +23,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define MOUSE_THREAD_NAME "mouse driver" - #define MOUSE_THREAD_PRIORITY 60 -diff -urN allegro-4.3.10/src/beos/bmousdrv.c allegro-4.3.10-haiku/src/beos/bmousdrv.c ---- allegro-4.3.10/src/beos/bmousdrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmousdrv.c 2008-09-13 20:11:46.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bmouse.c allegro-4.3.10-haiku/src/beos/bmouse.c ---- allegro-4.3.10/src/beos/bmouse.c 2004-12-04 13:24:16.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmouse.c 2008-09-13 20:11:46.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/boverlay.cpp allegro-4.3.10-haiku/src/beos/boverlay.cpp ---- allegro-4.3.10/src/beos/boverlay.cpp 2002-11-15 11:53:40.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/boverlay.cpp 2008-09-13 20:11:46.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bsnd.c allegro-4.3.10-haiku/src/beos/bsnd.c ---- allegro-4.3.10/src/beos/bsnd.c 2006-03-18 15:05:34.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsnd.c 2008-09-13 20:11:47.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - DIGI_DRIVER digi_beos = - { -diff -urN allegro-4.3.10/src/beos/bsndapi.cpp allegro-4.3.10-haiku/src/beos/bsndapi.cpp ---- allegro-4.3.10/src/beos/bsndapi.cpp 2006-03-18 15:05:34.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsndapi.cpp 2008-09-13 20:11:47.000000000 +0000 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bsnddrv.c allegro-4.3.10-haiku/src/beos/bsnddrv.c ---- allegro-4.3.10/src/beos/bsnddrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsnddrv.c 2008-09-13 20:11:47.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_DIGI_DRIVER_LIST - DIGI_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bsysapi.cpp allegro-4.3.10-haiku/src/beos/bsysapi.cpp ---- allegro-4.3.10/src/beos/bsysapi.cpp 2005-10-27 20:57:00.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsysapi.cpp 2008-09-13 20:11:47.000000000 +0000 -@@ -27,9 +27,9 @@ - #include - #endif - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define SYS_THREAD_PRIORITY B_NORMAL_PRIORITY - #define SYS_THREAD_NAME "system driver" -diff -urN allegro-4.3.10/src/beos/bsysdrv.c allegro-4.3.10-haiku/src/beos/bsysdrv.c ---- allegro-4.3.10/src/beos/bsysdrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsysdrv.c 2008-09-13 20:11:47.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _system_driver_list[] = - { -diff -urN allegro-4.3.10/src/beos/bsystem.c allegro-4.3.10-haiku/src/beos/bsystem.c ---- allegro-4.3.10/src/beos/bsystem.c 2002-12-07 21:10:58.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsystem.c 2008-09-13 20:11:47.000000000 +0000 -@@ -19,11 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -- -- -+#endif - - SYSTEM_DRIVER system_beos = { - SYSTEM_BEOS, -diff -urN allegro-4.3.10/src/beos/btimeapi.cpp allegro-4.3.10-haiku/src/beos/btimeapi.cpp ---- allegro-4.3.10/src/beos/btimeapi.cpp 2004-07-27 11:33:22.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/btimeapi.cpp 2008-09-13 20:11:47.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/btimedrv.c allegro-4.3.10-haiku/src/beos/btimedrv.c ---- allegro-4.3.10/src/beos/btimedrv.c 2001-11-06 15:30:48.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/btimedrv.c 2008-09-13 20:11:47.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _timer_driver_list[] = { - {TIMER_BEOS, &timer_beos, TRUE}, -diff -urN allegro-4.3.10/src/beos/btimer.c allegro-4.3.10-haiku/src/beos/btimer.c ---- allegro-4.3.10/src/beos/btimer.c 2004-08-22 02:57:14.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/btimer.c 2008-09-13 20:11:47.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bwindow.cpp allegro-4.3.10-haiku/src/beos/bwindow.cpp ---- allegro-4.3.10/src/beos/bwindow.cpp 2002-11-15 11:53:40.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bwindow.cpp 2008-09-13 20:11:47.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bwscreen.cpp allegro-4.3.10-haiku/src/beos/bwscreen.cpp ---- allegro-4.3.10/src/beos/bwscreen.cpp 2004-11-26 17:27:02.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bwscreen.cpp 2008-09-13 20:11:47.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/i386/asmdefs.inc allegro-4.3.10-haiku/src/i386/asmdefs.inc ---- allegro-4.3.10/src/i386/asmdefs.inc 2007-06-16 02:52:28.000000000 +0000 -+++ allegro-4.3.10-haiku/src/i386/asmdefs.inc 2008-09-13 20:11:47.000000000 +0000 -@@ -31,6 +31,8 @@ - #include "obj/msvc/asmdef.inc" - #elif defined ALLEGRO_WATCOM - #include "obj/watcom/asmdef.inc" -+#elif defined ALLEGRO_HAIKU -+ #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_BEOS - #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_QNX -diff -urN allegro-4.3.10/src/midi.c allegro-4.3.10-haiku/src/midi.c ---- allegro-4.3.10/src/midi.c 2007-04-12 16:19:54.000000000 +0000 -+++ allegro-4.3.10-haiku/src/midi.c 2008-09-13 20:11:47.000000000 +0000 -@@ -1122,7 +1122,7 @@ - running_status = 0; - - while (p < end) { /* work through data stream */ --#ifdef ALLEGRO_BEOS -+#if defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU - /* Is there a bug in this routine, or in gcc under BeOS/x86? --PW */ - { int i; for (i=1; i; i--); } - #endif -diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c ---- allegro-4.3.10/tools/dat2c.c 2005-04-28 09:53:38.000000000 +0000 -+++ allegro-4.3.10-haiku/tools/dat2c.c 2008-09-13 20:11:47.000000000 +0000 -@@ -342,7 +342,7 @@ - } - - if (dat2c->lformat == lineformat_default) --#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX) -+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX) - dat2c->lformat = lineformat_unix; - #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS) - dat2c->lformat = lineformat_dos; -diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku/tools/datedit.c ---- allegro-4.3.10/tools/datedit.c 2007-10-08 16:23:36.000000000 +0000 -+++ allegro-4.3.10-haiku/tools/datedit.c 2008-09-13 20:11:47.000000000 +0000 -@@ -121,6 +121,8 @@ - #include "obj/dmc/plugins.h" - #elif defined ALLEGRO_BEOS - #include "obj/beos/plugins.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "obj/beos/plugins.h" - #elif defined ALLEGRO_BCC32 - #include "obj/bcc32/plugins.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10/tools/grabber.c allegro-4.3.10-haiku/tools/grabber.c ---- allegro-4.3.10/tools/grabber.c 2006-07-24 13:09:26.000000000 +0000 -+++ allegro-4.3.10-haiku/tools/grabber.c 2008-09-13 20:11:48.000000000 +0000 -@@ -3132,6 +3132,7 @@ - case OSTYPE_QNX: s = "QNX"; break; - case OSTYPE_UNIX: s = "Unix"; break; - case OSTYPE_BEOS: s = "BeOS"; break; -+ case OSTYPE_HAIKU: s = "Haiku"; break; - case OSTYPE_MACOS: s = "MacOS"; break; - case OSTYPE_MACOSX: s = "MacOS X"; break; - default: s = "Unknown"; break; diff --git a/media-libs/allegro/patches/allegro-4.3.10-haiku-5.diff b/media-libs/allegro/patches/allegro-4.3.10-haiku-5.diff deleted file mode 100644 index 5b3a25a4f..000000000 --- a/media-libs/allegro/patches/allegro-4.3.10-haiku-5.diff +++ /dev/null @@ -1,792 +0,0 @@ -diff -urN allegro-4.3.10/addons/allegrogl/fix.sh allegro-4.3.10-haiku/addons/allegrogl/fix.sh ---- allegro-4.3.10/addons/allegrogl/fix.sh 2008-10-04 20:41:29.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/allegrogl/fix.sh 2008-10-04 21:07:34.000000000 +0000 -@@ -26,7 +26,7 @@ - echo "Compilation target adjustment." - echo " Usage: fix [--dtou|--utod|--quick]" - echo "" -- echo " is one of: djgpp, mingw32, unix, macosx," -+ echo " is one of: djgpp, haiku, mingw32, unix, macosx," - echo " macosx-universal" - echo "" - echo " --dtou converts from DOS/Win32 format to Unix" -@@ -81,6 +81,7 @@ - - case "$1" in - djgpp ) proc_fix "DJGPP" "makefile.dj";; -+ haiku ) proc_fix "Haiku" "makefile.gen";; - mingw ) proc_fix "Mingw32" "makefile.mgw";; - mingw32 ) proc_fix "Mingw32" "makefile.mgw";; - # used only by allegro's zipup.sh in packaging process -diff -urN allegro-4.3.10/addons/jpgalleg/fix.sh allegro-4.3.10-haiku/addons/jpgalleg/fix.sh ---- allegro-4.3.10/addons/jpgalleg/fix.sh 2008-10-04 20:41:12.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/jpgalleg/fix.sh 2008-10-04 21:01:19.000000000 +0000 -@@ -85,6 +85,7 @@ - "mingw" ) proc_fix "MinGW32" "makefile.mgw";; - "msvc" ) proc_fix "MSVC" "makefile.vc";; - "beos" ) proc_fix "BeOS" "makefile.be";; -+ "haiku" ) proc_fix "Haiku" "makefile.be";; - "unix" ) proc_fix "Unix" "makefile.uni";; - "macosx" ) proc_fix "MacOS X" "makefile.osx";; - "macosx-universal" ) proc_fix_osx_ub ;; -diff -urN allegro-4.3.10/addons/loadpng/fix.sh allegro-4.3.10-haiku/addons/loadpng/fix.sh ---- allegro-4.3.10/addons/loadpng/fix.sh 2008-10-04 20:41:10.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/loadpng/fix.sh 2008-10-04 21:08:47.000000000 +0000 -@@ -8,7 +8,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: djgpp, mingw32, unix, macosx, macosx-universal" -+ echo "Where platform is one of: djgpp, haiku, mingw32, unix, macosx, macosx-universal" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -88,7 +88,9 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; - "djgpp" ) proc_fix "DOS (djgpp)" "Makefile.dj";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "unix" ) proc_fix "Unix" "Makefile.unx";; -diff -urN allegro-4.3.10/addons/logg/fix.sh allegro-4.3.10-haiku/addons/logg/fix.sh ---- allegro-4.3.10/addons/logg/fix.sh 2008-10-04 20:41:29.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/logg/fix.sh 2008-10-04 21:12:47.000000000 +0000 -@@ -8,7 +8,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: mingw32, unix, macosx, macosx-universal" -+ echo "Where platform is one of: beos, haiku, mingw32, unix, macosx, macosx-universal" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -80,6 +80,8 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "unix" ) proc_fix "Unix" "Makefile.unix";; -diff -urN allegro-4.3.10/fix.sh allegro-4.3.10-haiku/fix.sh ---- allegro-4.3.10/fix.sh 2008-10-04 20:41:32.000000000 +0000 -+++ allegro-4.3.10-haiku/fix.sh 2008-10-04 21:01:20.000000000 +0000 -@@ -9,7 +9,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix" -+ echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix" - echo "mac, macosx, macosx-universal and watcom." - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." -@@ -90,6 +90,7 @@ - "bcc32" ) proc_fix "Windows (BCC32)" "makefile.bcc" "ALLEGRO_BCC32";; - "beos" ) proc_fix "BeOS" "makefile.be" "ALLEGRO_BEOS";; - "djgpp" ) proc_fix "DOS (djgpp)" "makefile.dj" "ALLEGRO_DJGPP";; -+ "haiku" ) proc_fix "Haiku" "makefile.be" "ALLEGRO_HAIKU";; - "mingw" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - "mingw32" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - # The 'msvc' target is undocumented in the help message, but is used -diff -urN allegro-4.3.10/include/allegro/internal/aintern.h allegro-4.3.10-haiku/include/allegro/internal/aintern.h ---- allegro-4.3.10/include/allegro/internal/aintern.h 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/internal/aintern.h 2008-10-04 21:01:20.000000000 +0000 -@@ -190,7 +190,7 @@ - - - #if (defined ALLEGRO_DOS) || (defined ALLEGRO_DJGPP) || (defined ALLEGRO_WATCOM) || \ -- (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - AL_ARRAY(char *, _pckeys_names); - -diff -urN allegro-4.3.10/include/allegro/internal/alconfig.h allegro-4.3.10-haiku/include/allegro/internal/alconfig.h ---- allegro-4.3.10/include/allegro/internal/alconfig.h 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/internal/alconfig.h 2008-10-04 21:01:20.000000000 +0000 -@@ -48,6 +48,8 @@ - #include "allegro/platform/albcc32.h" - #elif defined ALLEGRO_MSVC - #include "allegro/platform/almsvc.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_BEOS - #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10/include/allegro/platform/albecfg.h allegro-4.3.10-haiku/include/allegro/platform/albecfg.h ---- allegro-4.3.10/include/allegro/platform/albecfg.h 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/platform/albecfg.h 2008-10-04 21:01:20.000000000 +0000 -@@ -31,7 +31,13 @@ - #define ALLEGRO_HAVE_SYS_TIME_H 1 - - /* describe this platform */ --#define ALLEGRO_PLATFORM_STR "BeOS" -+#if defined __BEOS__ && !defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "BeOS" -+#endif -+#if defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "Haiku" -+ #define ALLEGRO_HAVE_LIBPTHREAD 1 -+#endif - #define ALLEGRO_LITTLE_ENDIAN - #define ALLEGRO_CONSOLE_OK - #define ALLEGRO_USE_CONSTRUCTOR -diff -urN allegro-4.3.10/include/allegro/platform/albeos.h allegro-4.3.10-haiku/include/allegro/platform/albeos.h ---- allegro-4.3.10/include/allegro/platform/albeos.h 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/platform/albeos.h 2008-10-04 21:01:20.000000000 +0000 -@@ -74,3 +74,7 @@ - #define JOYSTICK_DRIVER_BEOS \ - { JOYSTICK_BEOS, &joystick_beos, TRUE }, - -+#if defined __HAIKU__ -+#define TIMERDRV_UNIX_PTHREADS AL_ID('P','T','H','R') -+#endif -+ -diff -urN allegro-4.3.10/include/allegro/platform/alunixac.hin allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin ---- allegro-4.3.10/include/allegro/platform/alunixac.hin 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/platform/alunixac.hin 2008-10-04 21:01:20.000000000 +0000 -@@ -68,7 +68,7 @@ - #undef ALLEGRO_DARWIN - - /* Define if you have the pthread library. */ --#undef ALLEGRO_HAVE_LIBPTHREAD -+/* #undef ALLEGRO_HAVE_LIBPTHREAD */ - - /* Define if constructor attribute is supported. */ - #undef ALLEGRO_USE_CONSTRUCTOR -@@ -159,7 +159,7 @@ - - /* Define as the return type of signal handlers (`int' or `void'). */ - /* TODO: rename this */ --#undef RETSIGTYPE -+/* #undef RETSIGTYPE */ - - /* Define to empty if `const' does not conform to ANSI C. */ - #undef const -diff -urN allegro-4.3.10/include/allegro/system.h allegro-4.3.10-haiku/include/allegro/system.h ---- allegro-4.3.10/include/allegro/system.h 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/include/allegro/system.h 2008-10-04 21:01:20.000000000 +0000 -@@ -61,6 +61,7 @@ - #define OSTYPE_QNX AL_ID('Q','N','X',' ') - #define OSTYPE_UNIX AL_ID('U','N','I','X') - #define OSTYPE_BEOS AL_ID('B','E','O','S') -+#define OSTYPE_HAIKU AL_ID('H','A','I','K') - #define OSTYPE_MACOS AL_ID('M','A','C',' ') - #define OSTYPE_MACOSX AL_ID('M','A','C','X') - -diff -urN allegro-4.3.10/makefile.all allegro-4.3.10-haiku/makefile.all ---- allegro-4.3.10/makefile.all 2008-10-04 20:41:32.000000000 +0000 -+++ allegro-4.3.10-haiku/makefile.all 2008-10-04 21:01:20.000000000 +0000 -@@ -8,7 +8,7 @@ - # DEBUGMODE=2 selects a build intended to debug Allegro itself. - # PROFILEMODE=1 selects a profiling build. - # WARNMODE=1 selects strict compiler warnings. --# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS). -+# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS, Haiku). - # STATICRUNTIME=1 link to a static C runtime library (/MT) (MSVC) - # TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards - # compatibility with older processors (GCC-based platforms). -@@ -132,7 +132,7 @@ - # XXX this is duplicated in makefile.in - DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \ - readme makedoc datafile grabber dat dat2c dat2s license addons targets --DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom -+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom - DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES))) - - DOCS = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES)))) -diff -urN allegro-4.3.10/makefile.be allegro-4.3.10-haiku/makefile.be ---- allegro-4.3.10/makefile.be 2008-10-04 20:41:32.000000000 +0000 -+++ allegro-4.3.10-haiku/makefile.be 2008-10-04 21:01:20.000000000 +0000 -@@ -10,7 +10,15 @@ - - # -------- define some variables that the primary makefile will use -------- - -+ -+ifeq ($(OS),BeOS) - PLATFORM = BeOS -+endif -+ -+ifeq ($(OS),Haiku) -+PLATFORM = Haiku -+endif -+ - CC = gcc - EXE = - OBJ = .o -@@ -123,7 +131,13 @@ - - OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_BEOS_FILES))) - -+ifeq ($(OS),BeOS) - LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnet -+endif -+ -+ifeq ($(OS),Haiku) -+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork -+endif - - PROGRAMS = bfixicon - -@@ -167,7 +181,14 @@ - sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp - sed -e "s/include/headers/" temp >temp2 - sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp -+ -+ifeq ($(OS),BeOS) - sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/home\/config\/lib\"/" temp >/bin/allegro-config -+endif -+ifeq ($(OS),Haiku) -+ sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config -+endif -+ - rm -f temp temp2 - chmod a+x /bin/allegro-config - -diff -urN allegro-4.3.10/misc/mkunixdists.sh allegro-4.3.10-haiku/misc/mkunixdists.sh ---- allegro-4.3.10/misc/mkunixdists.sh 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/misc/mkunixdists.sh 2008-10-04 21:01:20.000000000 +0000 -@@ -73,9 +73,9 @@ - # Hack'n'slash - echo "Stripping to form end-user distribution" - (cd $dir/$basename && { -- (cd src && rm -rf beos qnx dos mac ppc win) -- (cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -- (cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -+ (cd src && rm -rf beos haiku qnx dos mac ppc win) -+ (cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) -+ (cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) - (cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h) - (cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh) - (cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c) -@@ -94,8 +94,8 @@ - (cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj) - (cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt) - (cd addons/jpgalleg/misc && rm -f fixver.sh runner.c) -- (cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc) -- (cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc) -+ (cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc) -+ (cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc) - - # logg addon - (cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat) -diff -urN allegro-4.3.10/misc/zipup.sh allegro-4.3.10-haiku/misc/zipup.sh ---- allegro-4.3.10/misc/zipup.sh 2008-10-04 20:41:30.000000000 +0000 -+++ allegro-4.3.10-haiku/misc/zipup.sh 2008-10-04 21:01:20.000000000 +0000 -@@ -125,6 +125,12 @@ - - make depend UNIX_TOOLS=1 CC=gcc - -+# generate dependencies for Haiku -+echo "Generating Haiku dependencies..." -+ -+./fix.sh haiku --quick -+ -+make depend UNIX_TOOLS=1 CC=gcc - - # generate dependencies for QNX - echo "Generating QNX dependencies..." -@@ -164,7 +170,7 @@ - for base in abi ahack allegro const faq help mistakes; do - ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx - done --for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do -+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do - ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx - done - -diff -urN allegro-4.3.10/setup/keyconf.c allegro-4.3.10-haiku/setup/keyconf.c ---- allegro-4.3.10/setup/keyconf.c 2008-10-04 20:41:31.000000000 +0000 -+++ allegro-4.3.10-haiku/setup/keyconf.c 2008-10-04 21:01:20.000000000 +0000 -@@ -25,8 +25,8 @@ - - - /* The code can't link on platforms that don't use src/misc/pckeys.c (everything -- * but DOS, QNX, BEOS). */ --#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ * but DOS, QNX, BEOS, HAIKU). */ -+#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - - char *ascii_name[32] = -diff -urN allegro-4.3.10/src/beos/baccel.cpp allegro-4.3.10-haiku/src/beos/baccel.cpp ---- allegro-4.3.10/src/beos/baccel.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/baccel.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bdispsw.cpp allegro-4.3.10-haiku/src/beos/bdispsw.cpp ---- allegro-4.3.10/src/beos/bdispsw.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bdispsw.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bdwindow.cpp allegro-4.3.10-haiku/src/beos/bdwindow.cpp ---- allegro-4.3.10/src/beos/bdwindow.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bdwindow.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -21,7 +21,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bgfx.c allegro-4.3.10-haiku/src/beos/bgfx.c ---- allegro-4.3.10/src/beos/bgfx.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bgfx.c 2008-10-04 21:01:20.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bgfxapi.cpp allegro-4.3.10-haiku/src/beos/bgfxapi.cpp ---- allegro-4.3.10/src/beos/bgfxapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bgfxapi.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bgfxdrv.c allegro-4.3.10-haiku/src/beos/bgfxdrv.c ---- allegro-4.3.10/src/beos/bgfxdrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bgfxdrv.c 2008-10-04 21:01:20.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_GFX_DRIVER_LIST - GFX_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bjoy.c allegro-4.3.10-haiku/src/beos/bjoy.c ---- allegro-4.3.10/src/beos/bjoy.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bjoy.c 2008-10-04 21:01:20.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bjoyapi.cpp allegro-4.3.10-haiku/src/beos/bjoyapi.cpp ---- allegro-4.3.10/src/beos/bjoyapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bjoyapi.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - static BJoystick *be_joy = NULL; - static int32 num_devices, num_axes, num_hats, num_buttons; -diff -urN allegro-4.3.10/src/beos/bjoydrv.c allegro-4.3.10-haiku/src/beos/bjoydrv.c ---- allegro-4.3.10/src/beos/bjoydrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bjoydrv.c 2008-10-04 21:01:20.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_JOYSTICK_DRIVER_LIST - JOYSTICK_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bkey.c allegro-4.3.10-haiku/src/beos/bkey.c ---- allegro-4.3.10/src/beos/bkey.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bkey.c 2008-10-04 21:01:20.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bkeyapi.cpp allegro-4.3.10-haiku/src/beos/bkeyapi.cpp ---- allegro-4.3.10/src/beos/bkeyapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bkeyapi.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -22,9 +22,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define KEY_ID_PC101 0 // the docs say it should be 0x83ab, but they lie - -diff -urN allegro-4.3.10/src/beos/bkeydrv.c allegro-4.3.10-haiku/src/beos/bkeydrv.c ---- allegro-4.3.10/src/beos/bkeydrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bkeydrv.c 2008-10-04 21:01:20.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _keyboard_driver_list[] = - { -diff -urN allegro-4.3.10/src/beos/bmidi.c allegro-4.3.10-haiku/src/beos/bmidi.c ---- allegro-4.3.10/src/beos/bmidi.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmidi.c 2008-10-04 21:01:20.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - MIDI_DRIVER midi_beos = - { -diff -urN allegro-4.3.10/src/beos/bmidiapi.cpp allegro-4.3.10-haiku/src/beos/bmidiapi.cpp ---- allegro-4.3.10/src/beos/bmidiapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmidiapi.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - BMidiSynth *_be_midisynth = NULL; -diff -urN allegro-4.3.10/src/beos/bmididrv.c allegro-4.3.10-haiku/src/beos/bmididrv.c ---- allegro-4.3.10/src/beos/bmididrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmididrv.c 2008-10-04 21:01:20.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_MIDI_DRIVER_LIST - MIDI_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bmousapi.cpp allegro-4.3.10-haiku/src/beos/bmousapi.cpp ---- allegro-4.3.10/src/beos/bmousapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmousapi.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -23,9 +23,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define MOUSE_THREAD_NAME "mouse driver" - #define MOUSE_THREAD_PRIORITY 60 -diff -urN allegro-4.3.10/src/beos/bmousdrv.c allegro-4.3.10-haiku/src/beos/bmousdrv.c ---- allegro-4.3.10/src/beos/bmousdrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmousdrv.c 2008-10-04 21:01:20.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/bmouse.c allegro-4.3.10-haiku/src/beos/bmouse.c ---- allegro-4.3.10/src/beos/bmouse.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bmouse.c 2008-10-04 21:01:20.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10/src/beos/boverlay.cpp allegro-4.3.10-haiku/src/beos/boverlay.cpp ---- allegro-4.3.10/src/beos/boverlay.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/boverlay.cpp 2008-10-04 21:01:20.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bsnd.c allegro-4.3.10-haiku/src/beos/bsnd.c ---- allegro-4.3.10/src/beos/bsnd.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsnd.c 2008-10-04 21:01:21.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - DIGI_DRIVER digi_beos = - { -diff -urN allegro-4.3.10/src/beos/bsndapi.cpp allegro-4.3.10-haiku/src/beos/bsndapi.cpp ---- allegro-4.3.10/src/beos/bsndapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsndapi.cpp 2008-10-04 21:01:21.000000000 +0000 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bsnddrv.c allegro-4.3.10-haiku/src/beos/bsnddrv.c ---- allegro-4.3.10/src/beos/bsnddrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsnddrv.c 2008-10-04 21:01:21.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_DIGI_DRIVER_LIST - DIGI_DRIVER_BEOS -diff -urN allegro-4.3.10/src/beos/bsysapi.cpp allegro-4.3.10-haiku/src/beos/bsysapi.cpp ---- allegro-4.3.10/src/beos/bsysapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsysapi.cpp 2008-10-04 21:01:21.000000000 +0000 -@@ -27,9 +27,9 @@ - #include - #endif - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define SYS_THREAD_PRIORITY B_NORMAL_PRIORITY - #define SYS_THREAD_NAME "system driver" -diff -urN allegro-4.3.10/src/beos/bsysdrv.c allegro-4.3.10-haiku/src/beos/bsysdrv.c ---- allegro-4.3.10/src/beos/bsysdrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsysdrv.c 2008-10-04 21:01:21.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _system_driver_list[] = - { -diff -urN allegro-4.3.10/src/beos/bsystem.c allegro-4.3.10-haiku/src/beos/bsystem.c ---- allegro-4.3.10/src/beos/bsystem.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bsystem.c 2008-10-04 21:01:21.000000000 +0000 -@@ -19,11 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -- -- -+#endif - - SYSTEM_DRIVER system_beos = { - SYSTEM_BEOS, -diff -urN allegro-4.3.10/src/beos/btimeapi.cpp allegro-4.3.10-haiku/src/beos/btimeapi.cpp ---- allegro-4.3.10/src/beos/btimeapi.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/btimeapi.cpp 2008-10-04 21:01:21.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/btimedrv.c allegro-4.3.10-haiku/src/beos/btimedrv.c ---- allegro-4.3.10/src/beos/btimedrv.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/btimedrv.c 2008-10-04 21:01:21.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _timer_driver_list[] = { - {TIMER_BEOS, &timer_beos, TRUE}, -diff -urN allegro-4.3.10/src/beos/btimer.c allegro-4.3.10-haiku/src/beos/btimer.c ---- allegro-4.3.10/src/beos/btimer.c 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/btimer.c 2008-10-04 21:01:21.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bwindow.cpp allegro-4.3.10-haiku/src/beos/bwindow.cpp ---- allegro-4.3.10/src/beos/bwindow.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bwindow.cpp 2008-10-04 21:01:21.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/beos/bwscreen.cpp allegro-4.3.10-haiku/src/beos/bwscreen.cpp ---- allegro-4.3.10/src/beos/bwscreen.cpp 2008-10-04 20:40:55.000000000 +0000 -+++ allegro-4.3.10-haiku/src/beos/bwscreen.cpp 2008-10-04 21:01:21.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10/src/i386/asmdefs.inc allegro-4.3.10-haiku/src/i386/asmdefs.inc ---- allegro-4.3.10/src/i386/asmdefs.inc 2008-10-04 20:40:57.000000000 +0000 -+++ allegro-4.3.10-haiku/src/i386/asmdefs.inc 2008-10-04 21:01:21.000000000 +0000 -@@ -31,6 +31,8 @@ - #include "obj/msvc/asmdef.inc" - #elif defined ALLEGRO_WATCOM - #include "obj/watcom/asmdef.inc" -+#elif defined ALLEGRO_HAIKU -+ #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_BEOS - #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_QNX -diff -urN allegro-4.3.10/src/midi.c allegro-4.3.10-haiku/src/midi.c ---- allegro-4.3.10/src/midi.c 2008-10-04 20:41:01.000000000 +0000 -+++ allegro-4.3.10-haiku/src/midi.c 2008-10-04 21:01:21.000000000 +0000 -@@ -1122,7 +1122,7 @@ - running_status = 0; - - while (p < end) { /* work through data stream */ --#ifdef ALLEGRO_BEOS -+#if defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU - /* Is there a bug in this routine, or in gcc under BeOS/x86? --PW */ - { int i; for (i=1; i; i--); } - #endif -diff -urN allegro-4.3.10/tools/dat2c.c allegro-4.3.10-haiku/tools/dat2c.c ---- allegro-4.3.10/tools/dat2c.c 2008-10-04 20:41:07.000000000 +0000 -+++ allegro-4.3.10-haiku/tools/dat2c.c 2008-10-04 21:01:21.000000000 +0000 -@@ -342,7 +342,7 @@ - } - - if (dat2c->lformat == lineformat_default) --#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX) -+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX) - dat2c->lformat = lineformat_unix; - #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS) - dat2c->lformat = lineformat_dos; -diff -urN allegro-4.3.10/tools/datedit.c allegro-4.3.10-haiku/tools/datedit.c ---- allegro-4.3.10/tools/datedit.c 2008-10-04 20:41:07.000000000 +0000 -+++ allegro-4.3.10-haiku/tools/datedit.c 2008-10-04 21:01:21.000000000 +0000 -@@ -121,6 +121,8 @@ - #include "obj/dmc/plugins.h" - #elif defined ALLEGRO_BEOS - #include "obj/beos/plugins.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "obj/beos/plugins.h" - #elif defined ALLEGRO_BCC32 - #include "obj/bcc32/plugins.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10/tools/grabber.c allegro-4.3.10-haiku/tools/grabber.c ---- allegro-4.3.10/tools/grabber.c 2008-10-04 20:41:07.000000000 +0000 -+++ allegro-4.3.10-haiku/tools/grabber.c 2008-10-04 21:01:21.000000000 +0000 -@@ -3132,6 +3132,7 @@ - case OSTYPE_QNX: s = "QNX"; break; - case OSTYPE_UNIX: s = "Unix"; break; - case OSTYPE_BEOS: s = "BeOS"; break; -+ case OSTYPE_HAIKU: s = "Haiku"; break; - case OSTYPE_MACOS: s = "MacOS"; break; - case OSTYPE_MACOSX: s = "MacOS X"; break; - default: s = "Unknown"; break; diff --git a/media-libs/allegro/patches/allegro-4.3.10-lm.diff b/media-libs/allegro/patches/allegro-4.3.10-lm.diff deleted file mode 100644 index a2b22d939..000000000 --- a/media-libs/allegro/patches/allegro-4.3.10-lm.diff +++ /dev/null @@ -1,190 +0,0 @@ -diff -urN allegro-4.3.10/addons/allegrogl/configure allegro-4.3.10-haiku/addons/allegrogl/configure ---- allegro-4.3.10/addons/allegrogl/configure 2008-01-19 23:57:16.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/allegrogl/configure 2008-09-13 19:57:44.000000000 +0000 -@@ -3624,6 +3624,70 @@ - LIBS="-lpthread $LIBS" - fi - -+{ echo "$as_me:$LINENO: checking for cos in -lm" >&5 -+echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6; } -+if test "${ac_cv_lib_m_cos+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lm $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char cos (); -+int -+main () -+{ -+return cos (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_m_cos=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_m_cos=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5 -+echo "${ECHO_T}$ac_cv_lib_m_cos" >&6; } -+if test $ac_cv_lib_m_cos = yes; then -+ LIBS="-lm $LIBS" -+fi - - - if test -n "$agl_build_generic"; then -@@ -4247,7 +4311,7 @@ - if test -n "$x_libraries"; then - LDFLAGS="-L$x_libraries $LDFLAGS" - fi -- LIBS="-lXext -lX11 -lm $LIBS" -+ LIBS="-lXext -lX11 $LIBS" - - - if test -n "$agl_enable_xf86vidmode"; then -diff -urN allegro-4.3.10/addons/allegrogl/configure.in allegro-4.3.10-haiku/addons/allegrogl/configure.in ---- allegro-4.3.10/addons/allegrogl/configure.in 2008-01-01 11:20:16.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/allegrogl/configure.in 2008-09-13 19:56:10.000000000 +0000 -@@ -54,7 +54,7 @@ - dnl Check for pthread support, which GL libs may require (e.g. FreeBSD) - AC_CHECK_HEADER(pthread.h, , dontcare=y) - AC_CHECK_LIB(pthread, pthread_create, LIBS="-lpthread $LIBS") -- -+AC_CHECK_LIB(m, cos, LIBS="-lm $LIBS") - - dnl Build Mesa generic driver - if test -n "$agl_build_generic"; then -@@ -76,7 +76,7 @@ - if test -n "$x_libraries"; then - LDFLAGS="-L$x_libraries $LDFLAGS" - fi -- LIBS="-lXext -lX11 -lm $LIBS" -+ LIBS="-lXext -lX11 $LIBS" - - - dnl Test for VidMode extension - -diff -urN allegro-4.3.10/addons/jpgalleg/makefile.be allegro-4.3.10-haiku/addons/jpgalleg/makefile.be ---- allegro-4.3.10/addons/jpgalleg/makefile.be 2008-01-01 21:59:18.000000000 +0000 -+++ allegro-4.3.10-haiku/addons/jpgalleg/makefile.be 2008-09-13 20:09:02.000000000 +0000 -@@ -38,7 +38,7 @@ - endif - endif - --LIBS = -lm `../../allegro-config --libs --addon` -+LIBS = `../../allegro-config --libs --addon` - LDFLAGS = -L../../lib/$(PLATFORM_PATH) - INSTALL_LIB_PATH = /boot/develop/lib/x86 - INSTALL_HEADER_PATH = /boot/develop/headers -diff -urN allegro-4.3.10/configure allegro-4.3.10-haiku/configure ---- allegro-4.3.10/configure 2008-01-19 23:57:12.000000000 +0000 -+++ allegro-4.3.10-haiku/configure 2008-09-13 19:53:14.000000000 +0000 -@@ -5436,6 +5436,14 @@ - allegro_build_normal_library=yes - _programs="release" - fi -+ -+M_LIBS="-lm" -+case "$host_os" in -+ beos* | haiku*) -+ M_LIBS="" -+ ;; -+esac -+ - if test "X$allegro_build_static_programs" = "Xyes"; then - LIBALLEG=lib/unix/lib$LIB_TO_LINK.a - LINK_LIBALLEG="$LIBALLEG \$(LIBS)" -@@ -5444,7 +5452,7 @@ - _programs="statically linked $_programs" - else - LIBALLEG="lib/unix/lib${LIB_TO_LINK}-\$(shared_version).so lib/unix/lib${LIB_TO_LINK}_unsharable.a" -- LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable -lm" -+ LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable $(M_LIBS)" - LINK_WITH_STATIC_LIBS=no - allegro_shared_libraries=yes - _programs="dynamically linked $_programs" -@@ -11167,7 +11175,7 @@ - - #-----------------------------------------------------------------------------# - --LIBS="-lm $LIBS" -+LIBS="$(M_LIBS) $LIBS" - - case "$allegro_system" in - -diff -urN allegro-4.3.10/configure.in allegro-4.3.10-haiku/configure.in ---- allegro-4.3.10/configure.in 2008-01-03 20:47:10.000000000 +0000 -+++ allegro-4.3.10-haiku/configure.in 2008-09-13 19:52:03.000000000 +0000 -@@ -298,6 +298,15 @@ - allegro_build_normal_library=yes - _programs="release" - fi -+ -+M_LIBS="-lm" -+case "$host_os" in -+ beos* | haiku*) -+ M_LIBS="" -+ ;; -+esac -+ -+ - if test "X$allegro_build_static_programs" = "Xyes"; then - LIBALLEG=lib/unix/lib$LIB_TO_LINK.a - LINK_LIBALLEG="$LIBALLEG \$(LIBS)" -@@ -306,7 +315,7 @@ - _programs="statically linked $_programs" - else - LIBALLEG="lib/unix/lib${LIB_TO_LINK}-\$(shared_version).so lib/unix/lib${LIB_TO_LINK}_unsharable.a" -- LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable -lm" -+ LINK_LIBALLEG="-Llib/unix -l${LIB_TO_LINK}-\$(shared_version) -l${LIB_TO_LINK}_unsharable $(M_LIBS)" - LINK_WITH_STATIC_LIBS=no - allegro_shared_libraries=yes - _programs="dynamically linked $_programs" -@@ -873,7 +882,7 @@ - #-----------------------------------------------------------------------------# - - dnl Additional libraries. --LIBS="-lm $LIBS" -+LIBS="$(M_LIBS) $LIBS" - - case "$allegro_system" in - diff --git a/media-libs/allegro/patches/allegro-4.3.10plus-haiku.diff b/media-libs/allegro/patches/allegro-4.3.10plus-haiku.diff deleted file mode 100644 index d70c44369..000000000 --- a/media-libs/allegro/patches/allegro-4.3.10plus-haiku.diff +++ /dev/null @@ -1,922 +0,0 @@ -diff -urN allegro-4.3.10plus/addons/allegrogl/fix.sh allegro-4.3.10plus-haiku/addons/allegrogl/fix.sh ---- allegro-4.3.10plus/addons/allegrogl/fix.sh 2008-10-15 14:42:13.000000000 +0000 -+++ allegro-4.3.10plus-haiku/addons/allegrogl/fix.sh 2008-10-15 15:04:09.000000000 +0000 -@@ -27,7 +27,7 @@ - echo " Usage: fix [--dtou|--utod|--quick]" - echo "" - echo " is one of: djgpp, mingw32, unix, macosx," -- echo " macosx-universal" -+ echo " macosx-universal, beos, haiku" - echo "" - echo " --dtou converts from DOS/Win32 format to Unix" - echo " --utod converts from Unix format to DOS/Win32" -@@ -81,6 +81,7 @@ - - case "$1" in - djgpp ) proc_fix "DJGPP" "makefile.dj";; -+ haiku ) proc_fix "Haiku" "makefile.gen";; - mingw ) proc_fix "Mingw32" "makefile.mgw";; - mingw32 ) proc_fix "Mingw32" "makefile.mgw";; - # used only by allegro's zipup.sh in packaging process -diff -urN allegro-4.3.10plus/addons/jpgalleg/fix.sh allegro-4.3.10plus-haiku/addons/jpgalleg/fix.sh ---- allegro-4.3.10plus/addons/jpgalleg/fix.sh 2008-10-15 14:40:17.000000000 +0000 -+++ allegro-4.3.10plus-haiku/addons/jpgalleg/fix.sh 2008-10-15 15:01:00.000000000 +0000 -@@ -85,6 +85,7 @@ - "mingw" ) proc_fix "MinGW32" "makefile.mgw";; - "msvc" ) proc_fix "MSVC" "makefile.vc";; - "beos" ) proc_fix "BeOS" "makefile.be";; -+ "haiku" ) proc_fix "Haiku" "makefile.be";; - "unix" ) proc_fix "Unix" "makefile.uni";; - "macosx" ) proc_fix "MacOS X" "makefile.osx";; - "macosx-universal" ) proc_fix_osx_ub ;; -diff -urN allegro-4.3.10plus/addons/loadpng/fix.sh allegro-4.3.10plus-haiku/addons/loadpng/fix.sh ---- allegro-4.3.10plus/addons/loadpng/fix.sh 2008-10-15 14:39:18.000000000 +0000 -+++ allegro-4.3.10plus-haiku/addons/loadpng/fix.sh 2008-10-15 15:04:58.000000000 +0000 -@@ -8,7 +8,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: djgpp, mingw32, unix, macosx, macosx-universal" -+ echo "Where platform is one of: djgpp, mingw32, unix, macosx, macosx-universal, beos, haiku" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -88,7 +88,9 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; - "djgpp" ) proc_fix "DOS (djgpp)" "Makefile.dj";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.mgw";; - "unix" ) proc_fix "Unix" "Makefile.unx";; -diff -urN allegro-4.3.10plus/addons/logg/fix.sh allegro-4.3.10plus-haiku/addons/logg/fix.sh ---- allegro-4.3.10plus/addons/logg/fix.sh 2008-10-15 14:42:14.000000000 +0000 -+++ allegro-4.3.10plus-haiku/addons/logg/fix.sh 2008-10-15 15:07:15.000000000 +0000 -@@ -8,7 +8,8 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: mingw32, unix, macosx, macosx-universal" -+ echo "Where platform is one of: mingw32, unix, macosx, macosx-universal," -+ echo " beos, haiku" - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." - echo "If no parameter is specified --quick is assumed." -@@ -80,6 +81,8 @@ - fi - - case "$1" in -+ "beos" ) proc_fix "BeOS" "Makefile.be";; -+ "haiku" ) proc_fix "Haiku" "Makefile.be";; - "mingw" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "mingw32" ) proc_fix "Windows (MinGW)" "Makefile.migw";; - "unix" ) proc_fix "Unix" "Makefile.unix";; -diff -urN allegro-4.3.10plus/fix.sh allegro-4.3.10plus-haiku/fix.sh ---- allegro-4.3.10plus/fix.sh 2008-10-15 14:44:47.000000000 +0000 -+++ allegro-4.3.10plus-haiku/fix.sh 2008-10-15 15:01:00.000000000 +0000 -@@ -9,7 +9,7 @@ - echo - echo "Usage: $0 [--quick|--dtou|--utod]" - echo -- echo "Where platform is one of: bcc32, beos, djgpp, mingw, qnx, unix" -+ echo "Where platform is one of: bcc32, beos, djgpp, haiku, mingw, qnx, unix" - echo "mac, macosx, macosx-universal and watcom." - echo "The --quick parameter turns off text file conversion, --dtou converts from" - echo "DOS/Win32 format to Unix, --utod converts from Unix to DOS/Win32 format." -@@ -90,6 +90,7 @@ - "bcc32" ) proc_fix "Windows (BCC32)" "makefile.bcc" "ALLEGRO_BCC32";; - "beos" ) proc_fix "BeOS" "makefile.be" "ALLEGRO_BEOS";; - "djgpp" ) proc_fix "DOS (djgpp)" "makefile.dj" "ALLEGRO_DJGPP";; -+ "haiku" ) proc_fix "Haiku" "makefile.be" "ALLEGRO_HAIKU";; - "mingw" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - "mingw32" ) proc_fix "Windows (MinGW)" "makefile.mgw" "ALLEGRO_MINGW32";; - # The 'msvc' target is undocumented in the help message, but is used -diff -urN allegro-4.3.10plus/include/allegro/internal/aintern.h allegro-4.3.10plus-haiku/include/allegro/internal/aintern.h ---- allegro-4.3.10plus/include/allegro/internal/aintern.h 2008-10-15 14:42:48.000000000 +0000 -+++ allegro-4.3.10plus-haiku/include/allegro/internal/aintern.h 2008-10-15 15:01:00.000000000 +0000 -@@ -190,7 +190,7 @@ - - - #if (defined ALLEGRO_DOS) || (defined ALLEGRO_DJGPP) || (defined ALLEGRO_WATCOM) || \ -- (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - AL_ARRAY(char *, _pckeys_names); - -diff -urN allegro-4.3.10plus/include/allegro/internal/alconfig.h allegro-4.3.10plus-haiku/include/allegro/internal/alconfig.h ---- allegro-4.3.10plus/include/allegro/internal/alconfig.h 2008-10-15 14:42:48.000000000 +0000 -+++ allegro-4.3.10plus-haiku/include/allegro/internal/alconfig.h 2008-10-15 15:01:00.000000000 +0000 -@@ -48,6 +48,8 @@ - #include "allegro/platform/albcc32.h" - #elif defined ALLEGRO_MSVC - #include "allegro/platform/almsvc.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_BEOS - #include "allegro/platform/albecfg.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10plus/include/allegro/platform/albecfg.h allegro-4.3.10plus-haiku/include/allegro/platform/albecfg.h ---- allegro-4.3.10plus/include/allegro/platform/albecfg.h 2008-10-15 14:42:46.000000000 +0000 -+++ allegro-4.3.10plus-haiku/include/allegro/platform/albecfg.h 2008-10-15 15:01:00.000000000 +0000 -@@ -31,7 +31,13 @@ - #define ALLEGRO_HAVE_SYS_TIME_H 1 - - /* describe this platform */ --#define ALLEGRO_PLATFORM_STR "BeOS" -+#if defined __BEOS__ && !defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "BeOS" -+#endif -+#if defined __HAIKU__ -+ #define ALLEGRO_PLATFORM_STR "Haiku" -+ #define ALLEGRO_HAVE_LIBPTHREAD 1 -+#endif - #define ALLEGRO_LITTLE_ENDIAN - #define ALLEGRO_CONSOLE_OK - #define ALLEGRO_USE_CONSTRUCTOR -diff -urN allegro-4.3.10plus/include/allegro/platform/albeos.h allegro-4.3.10plus-haiku/include/allegro/platform/albeos.h ---- allegro-4.3.10plus/include/allegro/platform/albeos.h 2008-10-15 14:42:46.000000000 +0000 -+++ allegro-4.3.10plus-haiku/include/allegro/platform/albeos.h 2008-10-15 15:01:00.000000000 +0000 -@@ -74,3 +74,7 @@ - #define JOYSTICK_DRIVER_BEOS \ - { JOYSTICK_BEOS, &joystick_beos, TRUE }, - -+#if defined __HAIKU__ -+#define TIMERDRV_UNIX_PTHREADS AL_ID('P','T','H','R') -+#endif -+ -diff -urN allegro-4.3.10plus/include/allegro/platform/alunixac.hin allegro-4.3.10plus-haiku/include/allegro/platform/alunixac.hin ---- allegro-4.3.10plus/include/allegro/platform/alunixac.hin 2008-10-15 14:42:46.000000000 +0000 -+++ allegro-4.3.10plus-haiku/include/allegro/platform/alunixac.hin 2008-10-15 15:01:00.000000000 +0000 -@@ -68,7 +68,7 @@ - #undef ALLEGRO_DARWIN - - /* Define if you have the pthread library. */ --#undef ALLEGRO_HAVE_LIBPTHREAD -+/* #undef ALLEGRO_HAVE_LIBPTHREAD */ - - /* Define if constructor attribute is supported. */ - #undef ALLEGRO_USE_CONSTRUCTOR -@@ -159,7 +159,7 @@ - - /* Define as the return type of signal handlers (`int' or `void'). */ - /* TODO: rename this */ --#undef RETSIGTYPE -+/* #undef RETSIGTYPE */ - - /* Define to empty if `const' does not conform to ANSI C. */ - #undef const -diff -urN allegro-4.3.10plus/include/allegro/system.h allegro-4.3.10plus-haiku/include/allegro/system.h ---- allegro-4.3.10plus/include/allegro/system.h 2008-10-15 14:42:57.000000000 +0000 -+++ allegro-4.3.10plus-haiku/include/allegro/system.h 2008-10-15 15:01:00.000000000 +0000 -@@ -61,6 +61,7 @@ - #define OSTYPE_QNX AL_ID('Q','N','X',' ') - #define OSTYPE_UNIX AL_ID('U','N','I','X') - #define OSTYPE_BEOS AL_ID('B','E','O','S') -+#define OSTYPE_HAIKU AL_ID('H','A','I','K') - #define OSTYPE_MACOS AL_ID('M','A','C',' ') - #define OSTYPE_MACOSX AL_ID('M','A','C','X') - -diff -urN allegro-4.3.10plus/makefile.all allegro-4.3.10plus-haiku/makefile.all ---- allegro-4.3.10plus/makefile.all 2008-10-15 14:44:47.000000000 +0000 -+++ allegro-4.3.10plus-haiku/makefile.all 2008-10-15 15:01:00.000000000 +0000 -@@ -8,7 +8,7 @@ - # DEBUGMODE=2 selects a build intended to debug Allegro itself. - # PROFILEMODE=1 selects a profiling build. - # WARNMODE=1 selects strict compiler warnings. --# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS). -+# STATICLINK=1 use static linking (MinGW32, MSVC, BeOS, Haiku). - # STATICRUNTIME=1 link to a static C runtime library (/MT) (MSVC) - # TARGET_ARCH_COMPAT optimize for the given processor while preserving backwards - # compatibility with older processors (GCC-based platforms). -@@ -132,7 +132,7 @@ - # XXX this is duplicated in makefile.in - DOCBASEFILES = ahack changes faq mistakes help thanks allegro const abi api packfile \ - readme makedoc datafile grabber dat dat2c dat2s license addons targets --DOCBUILDFILES = bcc32 beos darwin djgpp dmc linux macosx mingw32 msvc qnx unix watcom -+DOCBUILDFILES = bcc32 beos darwin djgpp dmc haiku linux macosx mingw32 msvc qnx unix watcom - DOCTXTBUILDFILES = $(addprefix docs/build/,$(addsuffix .txt,$(DOCBUILDFILES))) - - DOCS = $(addprefix docs/txt/,$(addsuffix .txt,$(filter-out changes thanks readme, $(DOCBASEFILES)))) -diff -urN allegro-4.3.10plus/makefile.be allegro-4.3.10plus-haiku/makefile.be ---- allegro-4.3.10plus/makefile.be 2008-10-15 14:44:47.000000000 +0000 -+++ allegro-4.3.10plus-haiku/makefile.be 2008-10-15 15:01:00.000000000 +0000 -@@ -10,11 +10,20 @@ - - # -------- define some variables that the primary makefile will use -------- - -+OS=$(shell uname -s) -+ -+ifeq ($(OS),BeOS) - PLATFORM = BeOS -+endif -+ -+ifeq ($(OS),Haiku) -+PLATFORM = Haiku -+endif -+ - CC = gcc - EXE = - OBJ = .o --HTML = html -+#HTML = html - - PLATFORM_DIR = obj/beos - -@@ -109,7 +118,7 @@ - # ------ build a C-only version ------ - - VPATH += src/c --MY_OBJECTS = $(C_OBJECTS) cmiscs -+MY_OBJECTS = $(C_OBJECTS) - CFLAGS += -DALLEGRO_NO_ASM - - else -@@ -123,7 +132,13 @@ - - OBJECT_LIST = $(COMMON_OBJECTS) $(MY_OBJECTS) $(basename $(notdir $(ALLEGRO_SRC_BEOS_FILES))) - -+ifeq ($(OS),BeOS) - LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnet -+endif -+ -+ifeq ($(OS),Haiku) -+LIBRARIES = -lbe -lgame -ldevice -lmidi -lmedia -lnetwork -+endif - - PROGRAMS = bfixicon - -@@ -135,11 +150,21 @@ - - # -------- rules for installing and removing the library files -------- - -+ifeq ($(OS),BeOS) - INSTALLDIR = /boot/develop - LIBDIR = lib/x86 - INCDIR = headers - - SHARED_LIBDIR = /boot/home/config/lib -+endif -+ -+ifeq ($(OS),Haiku) -+INSTALLDIR = /boot/common -+LIBDIR = lib -+INCDIR = include -+ -+SHARED_LIBDIR = /boot/common/lib -+endif - - - ifdef STATICLINK -@@ -167,7 +192,14 @@ - sed -e "s/@LIBS@/$(LIBRARIES)/" temp2 > temp - sed -e "s/include/headers/" temp >temp2 - sed -e "s/ -l\$${lib_type}_unsharable//" temp2 >temp -+ -+ifeq ($(OS),BeOS) - sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/home\/config\/lib\"/" temp >/bin/allegro-config -+endif -+ifeq ($(OS),Haiku) -+ sed -e "s/libdirs=-L\$${exec_prefix}\/lib/libdirs=\"-L\$${exec_prefix}\/lib\/x86 -L\/boot\/common\/lib\"/" temp >/bin/allegro-config -+endif -+ - rm -f temp temp2 - chmod a+x /bin/allegro-config - -diff -urN allegro-4.3.10plus/misc/mkunixdists.sh allegro-4.3.10plus-haiku/misc/mkunixdists.sh ---- allegro-4.3.10plus/misc/mkunixdists.sh 2008-10-15 14:43:09.000000000 +0000 -+++ allegro-4.3.10plus-haiku/misc/mkunixdists.sh 2008-10-15 15:01:00.000000000 +0000 -@@ -73,9 +73,9 @@ - # Hack'n'slash - echo "Stripping to form end-user distribution" - (cd $dir/$basename && { -- (cd src && rm -rf beos qnx dos mac ppc win) -- (cd obj && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -- (cd lib && rm -rf bcc32 beos qnx djgpp mingw32 msvc watcom) -+ (cd src && rm -rf beos haiku qnx dos mac ppc win) -+ (cd obj && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) -+ (cd lib && rm -rf bcc32 beos haiku qnx djgpp mingw32 msvc watcom) - (cd include && rm -f bealleg.h qnxalleg.h macalleg.h winalleg.h) - (cd misc && rm -f cmplog.pl dllsyms.lst findtext.sh fixpatch.sh fixver.sh) - (cd misc && rm -f allegro-config-qnx.sh zipup.sh zipwin.sh *.bat *.c) -@@ -94,8 +94,8 @@ - (cd addons/jpgalleg && rm -f makefile.be makefile.mgw makefile.dj) - (cd addons/jpgalleg && rm -f makefile.osx makefile.vc fix.bat readme.txt) - (cd addons/jpgalleg/misc && rm -f fixver.sh runner.c) -- (cd addons/jpgalleg/lib && rm -rf beos djgpp macosx mingw32 msvc) -- (cd addons/jpgalleg/obj && rm -rf beos djgpp macosx mingw32 msvc) -+ (cd addons/jpgalleg/lib && rm -rf beos djgpp haiku macosx mingw32 msvc) -+ (cd addons/jpgalleg/obj && rm -rf beos djgpp haiku macosx mingw32 msvc) - - # logg addon - (cd addons/logg && rm -f Makefile.mingw play_ogg.c stream_ogg.c fix.bat) -diff -urN allegro-4.3.10plus/misc/zipup.sh allegro-4.3.10plus-haiku/misc/zipup.sh ---- allegro-4.3.10plus/misc/zipup.sh 2008-10-15 14:43:09.000000000 +0000 -+++ allegro-4.3.10plus-haiku/misc/zipup.sh 2008-10-15 15:01:00.000000000 +0000 -@@ -125,6 +125,12 @@ - - make depend UNIX_TOOLS=1 CC=gcc - -+# generate dependencies for Haiku -+echo "Generating Haiku dependencies..." -+ -+./fix.sh haiku --quick -+ -+make depend UNIX_TOOLS=1 CC=gcc - - # generate dependencies for QNX - echo "Generating QNX dependencies..." -@@ -164,7 +170,7 @@ - for base in abi ahack allegro const faq help mistakes; do - ./_makedoc.exe -ascii docs/txt/$base.txt docs/src/$base._tx - done --for base in bcc32 beos darwin djgpp linux macosx mingw32 msvc qnx unix watcom; do -+for base in bcc32 beos darwin djgpp haiku linux macosx mingw32 msvc qnx unix watcom; do - ./_makedoc.exe -ascii docs/build/$base.txt docs/src/build/$base._tx - done - -diff -urN allegro-4.3.10plus/setup/keyconf.c allegro-4.3.10plus-haiku/setup/keyconf.c ---- allegro-4.3.10plus/setup/keyconf.c 2008-10-15 14:43:30.000000000 +0000 -+++ allegro-4.3.10plus-haiku/setup/keyconf.c 2008-10-15 15:01:00.000000000 +0000 -@@ -25,8 +25,8 @@ - - - /* The code can't link on platforms that don't use src/misc/pckeys.c (everything -- * but DOS, QNX, BEOS). */ --#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) -+ * but DOS, QNX, BEOS, HAIKU). */ -+#if (defined ALLEGRO_DOS) || (defined ALLEGRO_QNX) || (defined ALLEGRO_BEOS) || (defined ALLEGRO_HAIKU) - - - char *ascii_name[32] = -diff -urN allegro-4.3.10plus/src/beos/baccel.cpp allegro-4.3.10plus-haiku/src/beos/baccel.cpp ---- allegro-4.3.10plus/src/beos/baccel.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/baccel.cpp 2008-10-15 15:01:00.000000000 +0000 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/bdispsw.cpp allegro-4.3.10plus-haiku/src/beos/bdispsw.cpp ---- allegro-4.3.10plus/src/beos/bdispsw.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bdispsw.cpp 2008-10-15 15:01:00.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/bdwindow.cpp allegro-4.3.10plus-haiku/src/beos/bdwindow.cpp ---- allegro-4.3.10plus/src/beos/bdwindow.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bdwindow.cpp 2008-10-15 15:01:00.000000000 +0000 -@@ -21,7 +21,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -@@ -260,8 +260,10 @@ - cmap[i] = BScreen().IndexForColor(((i >> 4) & 0xF0) | (i >> 8), (i & 0xF0) | ((i >> 4) & 0xF), (i & 0xF) | ((i & 0xF) << 4)); - } - } -+#if 0 - TRACE(PREFIX_I "Color conversion mode set: %d->%d\n", - (int)screen_depth, (int)display_depth); -+#endif - } - - if (rects) { -diff -urN allegro-4.3.10plus/src/beos/bgfx.c allegro-4.3.10plus-haiku/src/beos/bgfx.c ---- allegro-4.3.10plus/src/beos/bgfx.c 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bgfx.c 2008-10-15 15:01:00.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10plus/src/beos/bgfxapi.cpp allegro-4.3.10plus-haiku/src/beos/bgfxapi.cpp ---- allegro-4.3.10plus/src/beos/bgfxapi.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bgfxapi.cpp 2008-10-15 15:01:00.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/bgfxdrv.c allegro-4.3.10plus-haiku/src/beos/bgfxdrv.c ---- allegro-4.3.10plus/src/beos/bgfxdrv.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bgfxdrv.c 2008-10-15 15:01:00.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_GFX_DRIVER_LIST - GFX_DRIVER_BEOS -diff -urN allegro-4.3.10plus/src/beos/bjoy.c allegro-4.3.10plus-haiku/src/beos/bjoy.c ---- allegro-4.3.10plus/src/beos/bjoy.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bjoy.c 2008-10-15 15:01:00.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/bjoyapi.cpp allegro-4.3.10plus-haiku/src/beos/bjoyapi.cpp ---- allegro-4.3.10plus/src/beos/bjoyapi.cpp 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bjoyapi.cpp 2008-10-15 15:01:00.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - static BJoystick *be_joy = NULL; - static int32 num_devices, num_axes, num_hats, num_buttons; -@@ -64,12 +64,12 @@ - device_config = get_config_string("joystick", "joystick_device", ""); - - /* Let's try to open selected device */ -- if ((device_config[0] == '\0') || (be_joy->Open(device_config) < 0)) { -+ if ((device_config[0] == '\0') || (be_joy->Open(device_config, true) < 0)) { - /* ok, let's try to open first available device */ - if (be_joy->GetDeviceName(0, device_name) != B_OK) { - goto cleanup; - } -- if (be_joy->Open(device_name) == B_ERROR) { -+ if (be_joy->Open(device_name, true) == B_ERROR) { - goto cleanup; - } - } -diff -urN allegro-4.3.10plus/src/beos/bjoydrv.c allegro-4.3.10plus-haiku/src/beos/bjoydrv.c ---- allegro-4.3.10plus/src/beos/bjoydrv.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bjoydrv.c 2008-10-15 15:01:00.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_JOYSTICK_DRIVER_LIST - JOYSTICK_DRIVER_BEOS -diff -urN allegro-4.3.10plus/src/beos/bkey.c allegro-4.3.10plus-haiku/src/beos/bkey.c ---- allegro-4.3.10plus/src/beos/bkey.c 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bkey.c 2008-10-15 15:01:00.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10plus/src/beos/bkeyapi.cpp allegro-4.3.10plus-haiku/src/beos/bkeyapi.cpp ---- allegro-4.3.10plus/src/beos/bkeyapi.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bkeyapi.cpp 2008-10-15 15:01:00.000000000 +0000 -@@ -22,9 +22,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define KEY_ID_PC101 0 // the docs say it should be 0x83ab, but they lie - -@@ -260,7 +260,9 @@ - key_info_old = key_info_new; - } - -+#if 0 - TRACE(PREFIX_I "keyboard thread exited\n"); -+#endif - - return 0; - } -diff -urN allegro-4.3.10plus/src/beos/bkeydrv.c allegro-4.3.10plus-haiku/src/beos/bkeydrv.c ---- allegro-4.3.10plus/src/beos/bkeydrv.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bkeydrv.c 2008-10-15 15:01:01.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _keyboard_driver_list[] = - { -diff -urN allegro-4.3.10plus/src/beos/bmidi.c allegro-4.3.10plus-haiku/src/beos/bmidi.c ---- allegro-4.3.10plus/src/beos/bmidi.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bmidi.c 2008-10-15 15:01:01.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - MIDI_DRIVER midi_beos = - { -diff -urN allegro-4.3.10plus/src/beos/bmidiapi.cpp allegro-4.3.10plus-haiku/src/beos/bmidiapi.cpp ---- allegro-4.3.10plus/src/beos/bmidiapi.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bmidiapi.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - BMidiSynth *_be_midisynth = NULL; -diff -urN allegro-4.3.10plus/src/beos/bmididrv.c allegro-4.3.10plus-haiku/src/beos/bmididrv.c ---- allegro-4.3.10plus/src/beos/bmididrv.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bmididrv.c 2008-10-15 15:01:01.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_MIDI_DRIVER_LIST - MIDI_DRIVER_BEOS -diff -urN allegro-4.3.10plus/src/beos/bmousapi.cpp allegro-4.3.10plus-haiku/src/beos/bmousapi.cpp ---- allegro-4.3.10plus/src/beos/bmousapi.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bmousapi.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -23,9 +23,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define MOUSE_THREAD_NAME "mouse driver" - #define MOUSE_THREAD_PRIORITY 60 -@@ -78,7 +78,9 @@ - - if (mouse_thread_running == false) { - release_sem(_be_mouse_view_attached); -+#if 0 - TRACE(PREFIX_I "mouse thread exited\n"); -+#endif - - return 0; - } -diff -urN allegro-4.3.10plus/src/beos/bmousdrv.c allegro-4.3.10plus-haiku/src/beos/bmousdrv.c ---- allegro-4.3.10plus/src/beos/bmousdrv.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bmousdrv.c 2008-10-15 15:01:01.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10plus/src/beos/bmouse.c allegro-4.3.10plus-haiku/src/beos/bmouse.c ---- allegro-4.3.10plus/src/beos/bmouse.c 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bmouse.c 2008-10-15 15:01:01.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - - -diff -urN allegro-4.3.10plus/src/beos/boverlay.cpp allegro-4.3.10plus-haiku/src/beos/boverlay.cpp ---- allegro-4.3.10plus/src/beos/boverlay.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/boverlay.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/bsnd.c allegro-4.3.10plus-haiku/src/beos/bsnd.c ---- allegro-4.3.10plus/src/beos/bsnd.c 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bsnd.c 2008-10-15 15:01:01.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - DIGI_DRIVER digi_beos = - { -diff -urN allegro-4.3.10plus/src/beos/bsndapi.cpp allegro-4.3.10plus-haiku/src/beos/bsndapi.cpp ---- allegro-4.3.10plus/src/beos/bsndapi.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bsndapi.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -20,7 +20,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/bsnddrv.c allegro-4.3.10plus-haiku/src/beos/bsnddrv.c ---- allegro-4.3.10plus/src/beos/bsnddrv.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bsnddrv.c 2008-10-15 15:01:01.000000000 +0000 -@@ -19,9 +19,9 @@ - #include "allegro/internal/aintern.h" - - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - BEGIN_DIGI_DRIVER_LIST - DIGI_DRIVER_BEOS -diff -urN allegro-4.3.10plus/src/beos/bsysapi.cpp allegro-4.3.10plus-haiku/src/beos/bsysapi.cpp ---- allegro-4.3.10plus/src/beos/bsysapi.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bsysapi.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -27,9 +27,9 @@ - #include - #endif - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - #define SYS_THREAD_PRIORITY B_NORMAL_PRIORITY - #define SYS_THREAD_NAME "system driver" -@@ -144,7 +144,9 @@ - - _be_allegro_app->Run(); - -+#if 0 - TRACE(PREFIX_I "system thread exited\n"); -+#endif - - return 0; - } -@@ -201,8 +203,6 @@ - uname(&os_name); - os_type = OSTYPE_BEOS; - os_multitasking = TRUE; -- os_version = atoi(strtok(os_name.release, ".")); -- os_revision = atoi(strtok(NULL, ".")); - - chdir(app_path); - -diff -urN allegro-4.3.10plus/src/beos/bsysdrv.c allegro-4.3.10plus-haiku/src/beos/bsysdrv.c ---- allegro-4.3.10plus/src/beos/bsysdrv.c 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bsysdrv.c 2008-10-15 15:01:01.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _system_driver_list[] = - { -diff -urN allegro-4.3.10plus/src/beos/bsystem.c allegro-4.3.10plus-haiku/src/beos/bsystem.c ---- allegro-4.3.10plus/src/beos/bsystem.c 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bsystem.c 2008-10-15 15:01:01.000000000 +0000 -@@ -19,11 +19,9 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -- -- -+#endif - - SYSTEM_DRIVER system_beos = { - SYSTEM_BEOS, -diff -urN allegro-4.3.10plus/src/beos/btimeapi.cpp allegro-4.3.10plus-haiku/src/beos/btimeapi.cpp ---- allegro-4.3.10plus/src/beos/btimeapi.cpp 2008-10-15 14:29:36.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/btimeapi.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/btimedrv.c allegro-4.3.10plus-haiku/src/beos/btimedrv.c ---- allegro-4.3.10plus/src/beos/btimedrv.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/btimedrv.c 2008-10-15 15:01:01.000000000 +0000 -@@ -18,9 +18,9 @@ - #include "allegro.h" - #include "allegro/internal/aintern.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile --#endif -+#endif - - _DRIVER_INFO _timer_driver_list[] = { - {TIMER_BEOS, &timer_beos, TRUE}, -diff -urN allegro-4.3.10plus/src/beos/btimer.c allegro-4.3.10plus-haiku/src/beos/btimer.c ---- allegro-4.3.10plus/src/beos/btimer.c 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/btimer.c 2008-10-15 15:01:01.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -diff -urN allegro-4.3.10plus/src/beos/bwindow.cpp allegro-4.3.10plus-haiku/src/beos/bwindow.cpp ---- allegro-4.3.10plus/src/beos/bwindow.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bwindow.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -@@ -117,7 +117,7 @@ - /* _be_gfx_bwindow_read_write_bank: - * Returns new line and marks it as dirty. - */ --extern "C" unsigned long _be_gfx_bwindow_read_write_bank(BITMAP *bmp, int line) -+extern "C" uintptr_t _be_gfx_bwindow_read_write_bank(BITMAP *bmp, int line) - { - if (!bmp->id & BMP_ID_LOCKED) { - bmp->id |= (BMP_ID_LOCKED | BMP_ID_AUTOLOCK); -diff -urN allegro-4.3.10plus/src/beos/bwscreen.cpp allegro-4.3.10plus-haiku/src/beos/bwscreen.cpp ---- allegro-4.3.10plus/src/beos/bwscreen.cpp 2008-10-15 14:29:35.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/beos/bwscreen.cpp 2008-10-15 15:01:01.000000000 +0000 -@@ -19,7 +19,7 @@ - #include "allegro/internal/aintern.h" - #include "allegro/platform/aintbeos.h" - --#ifndef ALLEGRO_BEOS -+#if !defined ALLEGRO_BEOS && !defined ALLEGRO_HAIKU - #error something is wrong with the makefile - #endif - -@@ -474,7 +474,7 @@ - /* be_gfx_bwindowscreen_read_write_bank: - * Returns new line and synchronizes framebuffer if needed. - */ --extern "C" unsigned long be_gfx_bwindowscreen_read_write_bank(BITMAP *bmp, int line) -+extern "C" uintptr_t be_gfx_bwindowscreen_read_write_bank(BITMAP *bmp, int line) - { - if (!(bmp->id & BMP_ID_LOCKED)) { - _be_sync_func(); -@@ -490,7 +490,7 @@ - */ - extern "C" void be_gfx_bwindowscreen_unwrite_bank(BITMAP *bmp) - { -- if (bmp->id & BMP_AUTOLOCK) { -+ if (bmp->id & BMP_ID_AUTOLOCK) { - bmp->id &= ~(BMP_ID_LOCKED | BMP_ID_AUTOLOCK); - } - } -diff -urN allegro-4.3.10plus/src/i386/asmdefs.inc allegro-4.3.10plus-haiku/src/i386/asmdefs.inc ---- allegro-4.3.10plus/src/i386/asmdefs.inc 2008-10-15 14:31:06.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/i386/asmdefs.inc 2008-10-15 15:01:01.000000000 +0000 -@@ -31,6 +31,8 @@ - #include "obj/msvc/asmdef.inc" - #elif defined ALLEGRO_WATCOM - #include "obj/watcom/asmdef.inc" -+#elif defined ALLEGRO_HAIKU -+ #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_BEOS - #include "obj/beos/asmdef.inc" - #elif defined ALLEGRO_QNX -diff -urN allegro-4.3.10plus/src/midi.c allegro-4.3.10plus-haiku/src/midi.c ---- allegro-4.3.10plus/src/midi.c 2008-10-15 14:33:58.000000000 +0000 -+++ allegro-4.3.10plus-haiku/src/midi.c 2008-10-15 15:01:01.000000000 +0000 -@@ -1122,7 +1122,7 @@ - running_status = 0; - - while (p < end) { /* work through data stream */ --#ifdef ALLEGRO_BEOS -+#if defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU - /* Is there a bug in this routine, or in gcc under BeOS/x86? --PW */ - { int i; for (i=1; i; i--); } - #endif -diff -urN allegro-4.3.10plus/tools/dat2c.c allegro-4.3.10plus-haiku/tools/dat2c.c ---- allegro-4.3.10plus/tools/dat2c.c 2008-10-15 14:36:09.000000000 +0000 -+++ allegro-4.3.10plus-haiku/tools/dat2c.c 2008-10-15 15:01:01.000000000 +0000 -@@ -342,7 +342,7 @@ - } - - if (dat2c->lformat == lineformat_default) --#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_MACOSX) -+#if (defined ALLEGRO_UNIX || defined ALLEGRO_QNX || defined ALLEGRO_BEOS || defined ALLEGRO_HAIKU || defined ALLEGRO_MACOSX) - dat2c->lformat = lineformat_unix; - #elif (defined ALLEGRO_WINDOWS || defined ALLEGRO_DOS) - dat2c->lformat = lineformat_dos; -diff -urN allegro-4.3.10plus/tools/datedit.c allegro-4.3.10plus-haiku/tools/datedit.c ---- allegro-4.3.10plus/tools/datedit.c 2008-10-15 14:36:09.000000000 +0000 -+++ allegro-4.3.10plus-haiku/tools/datedit.c 2008-10-15 15:01:01.000000000 +0000 -@@ -121,6 +121,8 @@ - #include "obj/dmc/plugins.h" - #elif defined ALLEGRO_BEOS - #include "obj/beos/plugins.h" -+ #elif defined ALLEGRO_HAIKU -+ #include "obj/beos/plugins.h" - #elif defined ALLEGRO_BCC32 - #include "obj/bcc32/plugins.h" - #elif defined ALLEGRO_MPW -diff -urN allegro-4.3.10plus/tools/grabber.c allegro-4.3.10plus-haiku/tools/grabber.c ---- allegro-4.3.10plus/tools/grabber.c 2008-10-15 14:36:09.000000000 +0000 -+++ allegro-4.3.10plus-haiku/tools/grabber.c 2008-10-15 15:01:01.000000000 +0000 -@@ -3132,6 +3132,7 @@ - case OSTYPE_QNX: s = "QNX"; break; - case OSTYPE_UNIX: s = "Unix"; break; - case OSTYPE_BEOS: s = "BeOS"; break; -+ case OSTYPE_HAIKU: s = "Haiku"; break; - case OSTYPE_MACOS: s = "MacOS"; break; - case OSTYPE_MACOSX: s = "MacOS X"; break; - default: s = "Unknown"; break; diff --git a/media-libs/allegro/patches/allegro-4.4.x-svn.patch b/media-libs/allegro/patches/allegro-4.4.x_svn.patch similarity index 100% rename from media-libs/allegro/patches/allegro-4.4.x-svn.patch rename to media-libs/allegro/patches/allegro-4.4.x_svn.patch diff --git a/media-libs/freetype/freetype_with_subpixel_rendering-2.4.9 b/media-libs/freetype/freetype_with_subpixel_rendering-2.4.9.recipe similarity index 100% rename from media-libs/freetype/freetype_with_subpixel_rendering-2.4.9 rename to media-libs/freetype/freetype_with_subpixel_rendering-2.4.9.recipe diff --git a/media-libs/freetype/patches/freetype-2.4.9-with-subpixel-rendering-enabled.patch b/media-libs/freetype/patches/freetype-2.4.9_with_subpixel_rendering_enabled.patch similarity index 100% rename from media-libs/freetype/patches/freetype-2.4.9-with-subpixel-rendering-enabled.patch rename to media-libs/freetype/patches/freetype-2.4.9_with_subpixel_rendering_enabled.patch diff --git a/media-libs/ftgl/ftgl-2.1-svn b/media-libs/ftgl/ftgl-2.1-svn deleted file mode 100644 index a2cbd0a4f..000000000 --- a/media-libs/ftgl/ftgl-2.1-svn +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="FTGL is a free cross-platform Open Source C++ library that uses Freetype2 to simplify rendering fonts in OpenGL applications" -HOMEPAGE="http://sourceforge.net/projects/ftgl" -SRC_URI="svn+https://ftgl.svn.sourceforge.net/svnroot/ftgl/trunk" -#CHECKSUM_MD5="" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="pkgconfig >= 0.23" - -BUILD() -{ - cd ftgl-2.1-svn - libtoolize --copy --force --install - aclocal --install -I m4 - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd ftgl-2.1-svn - make install DESTDIR=${DESTDIR} -} - -LICENSE="MIT" -COPYRIGHT="2001-2004 Unicode, Inc. - 2001-2010 Henry Maddocks" diff --git a/media-libs/ladspa_sdk/ladspa_sdk-1.13 b/media-libs/ladspa_sdk/ladspa_sdk-1.13.recipe similarity index 100% rename from media-libs/ladspa_sdk/ladspa_sdk-1.13 rename to media-libs/ladspa_sdk/ladspa_sdk-1.13.recipe diff --git a/media-libs/libnsbmp/libnsbmp_0.0.3-HEAD b/media-libs/libnsbmp/libnsbmp_0.0.3-HEAD deleted file mode 100644 index 23564b564..000000000 --- a/media-libs/libnsbmp/libnsbmp_0.0.3-HEAD +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats" -HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/" -SRC_URI="git://git.netsurf-browser.org/libnsbmp.git" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/buildsystem >= 0" - -BUILD() -{ - cd libnsbmp-0.0.3-HEAD - make PREFIX=/boot/common -} - -INSTALL() -{ - cd libnsbmp-0.0.3-HEAD - make install PREFIX=/boot/common -} - -LICENSE="MIT" -COPYRIGHT="2003 - 2012 The NetSurf Developers" diff --git a/media-libs/libsdl/sdl-config b/media-libs/libsdl/additional-files/sdl-config similarity index 100% rename from media-libs/libsdl/sdl-config rename to media-libs/libsdl/additional-files/sdl-config diff --git a/media-libs/libsdl/libsdl-1.2_hg b/media-libs/libsdl/libsdl-1.2_hg.recipe similarity index 100% rename from media-libs/libsdl/libsdl-1.2_hg rename to media-libs/libsdl/libsdl-1.2_hg.recipe diff --git a/media-libs/libsdl/libsdl-1.3_gsoc b/media-libs/libsdl/libsdl-1.3_gsoc.recipe similarity index 100% rename from media-libs/libsdl/libsdl-1.3_gsoc rename to media-libs/libsdl/libsdl-1.3_gsoc.recipe diff --git a/media-libs/libsdl/libsdl-2.0_hg b/media-libs/libsdl/libsdl-2.0_hg.recipe similarity index 100% rename from media-libs/libsdl/libsdl-2.0_hg rename to media-libs/libsdl/libsdl-2.0_hg.recipe diff --git a/media-libs/libsdl/libsdl-2.0_hg_cmake b/media-libs/libsdl/libsdl-2.0_hg_cmake.recipe similarity index 100% rename from media-libs/libsdl/libsdl-2.0_hg_cmake rename to media-libs/libsdl/libsdl-2.0_hg_cmake.recipe diff --git a/media-libs/libsdl/patches/libsdl-1.2-hg.patch b/media-libs/libsdl/patches/libsdl-1.2_hg.patch similarity index 100% rename from media-libs/libsdl/patches/libsdl-1.2-hg.patch rename to media-libs/libsdl/patches/libsdl-1.2_hg.patch diff --git a/media-libs/libsvgtiny/libsvgtiny-0_HEAD b/media-libs/libsvgtiny/libsvgtiny-0_HEAD.recipe similarity index 100% rename from media-libs/libsvgtiny/libsvgtiny-0_HEAD rename to media-libs/libsvgtiny/libsvgtiny-0_HEAD.recipe diff --git a/media-libs/libwebm/libwebm-0.9.2_git b/media-libs/libwebm/libwebm-0.9.2_git.recipe similarity index 100% rename from media-libs/libwebm/libwebm-0.9.2_git rename to media-libs/libwebm/libwebm-0.9.2_git.recipe diff --git a/media-libs/libwebp/libwebp-0.1.2_git b/media-libs/libwebp/libwebp-0.1.2_git.recipe similarity index 100% rename from media-libs/libwebp/libwebp-0.1.2_git rename to media-libs/libwebp/libwebp-0.1.2_git.recipe diff --git a/media-libs/openal/openal-1.12_git b/media-libs/openal/openal-1.12_git deleted file mode 100644 index fc6f589e0..000000000 --- a/media-libs/openal/openal-1.12_git +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="OpenAL - A software implementation of the OpenAL 3D audio API" -HOMEPAGE="http://kcat.strangesoft.net/openal.html" -SRC_URI="git+git://repo.or.cz/openal-soft.git" -#CHECKSUM_MD5="" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/cmake >= 2.8.0" - -BUILD() -{ - cd openal-1.12-git - cmake . - make -} - -INSTALL() -{ - cd openal-1.12-git - make install -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1999-2000 Loki Software - 2005-2010 OpenAL Soft team" - diff --git a/media-libs/sdl_gfx/patches/sdl-gfx-2.0.20.patch b/media-libs/sdl_gfx/patches/sdl_gfx-2.0.20.patch similarity index 100% rename from media-libs/sdl_gfx/patches/sdl-gfx-2.0.20.patch rename to media-libs/sdl_gfx/patches/sdl_gfx-2.0.20.patch diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.20 b/media-libs/sdl_gfx/sdl_gfx-2.0.20.recipe similarity index 100% rename from media-libs/sdl_gfx/sdl_gfx-2.0.20 rename to media-libs/sdl_gfx/sdl_gfx-2.0.20.recipe diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.22 b/media-libs/sdl_gfx/sdl_gfx-2.0.22.recipe similarity index 100% rename from media-libs/sdl_gfx/sdl_gfx-2.0.22 rename to media-libs/sdl_gfx/sdl_gfx-2.0.22.recipe diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.23 b/media-libs/sdl_gfx/sdl_gfx-2.0.23.recipe similarity index 100% rename from media-libs/sdl_gfx/sdl_gfx-2.0.23 rename to media-libs/sdl_gfx/sdl_gfx-2.0.23.recipe diff --git a/media-libs/sdl_image/sdl-image.OptionalPackageDescription b/media-libs/sdl_image/sdl-image.OptionalPackageDescription deleted file mode 100644 index c0af9ed47..000000000 --- a/media-libs/sdl_image/sdl-image.OptionalPackageDescription +++ /dev/null @@ -1,5 +0,0 @@ -Package: sdl-image -Version: 1.2.10 -Copyright: 1997-2009 Sam Lantinga and Mattias Engdegård -License: GNU LGPL v2.1 -URL: http://www.libsdl.org/projects/SDL_image/ diff --git a/media-libs/sdl_image/sdl_image-1.2.10 b/media-libs/sdl_image/sdl_image-1.2.10.recipe similarity index 100% rename from media-libs/sdl_image/sdl_image-1.2.10 rename to media-libs/sdl_image/sdl_image-1.2.10.recipe diff --git a/media-libs/sdl_image/sdl_image-1.2.12 b/media-libs/sdl_image/sdl_image-1.2.12.recipe similarity index 100% rename from media-libs/sdl_image/sdl_image-1.2.12 rename to media-libs/sdl_image/sdl_image-1.2.12.recipe diff --git a/media-libs/sdl_image/sdl_image-1.2.6 b/media-libs/sdl_image/sdl_image-1.2.6.recipe similarity index 100% rename from media-libs/sdl_image/sdl_image-1.2.6 rename to media-libs/sdl_image/sdl_image-1.2.6.recipe diff --git a/media-libs/sdl_image/sdl_image-1.2.8 b/media-libs/sdl_image/sdl_image-1.2.8.recipe similarity index 100% rename from media-libs/sdl_image/sdl_image-1.2.8 rename to media-libs/sdl_image/sdl_image-1.2.8.recipe diff --git a/media-libs/sdl_image/sdl_image-1.2.9 b/media-libs/sdl_image/sdl_image-1.2.9.recipe similarity index 100% rename from media-libs/sdl_image/sdl_image-1.2.9 rename to media-libs/sdl_image/sdl_image-1.2.9.recipe diff --git a/media-libs/sdl_image/sdl_image-1.2_hg b/media-libs/sdl_image/sdl_image-1.2_hg.recipe similarity index 100% rename from media-libs/sdl_image/sdl_image-1.2_hg rename to media-libs/sdl_image/sdl_image-1.2_hg.recipe diff --git a/media-libs/sdl_mixer/patches/sdl-mixer-1.2.11.patch b/media-libs/sdl_mixer/patches/sdl_mixer-1.2.11.patch similarity index 100% rename from media-libs/sdl_mixer/patches/sdl-mixer-1.2.11.patch rename to media-libs/sdl_mixer/patches/sdl_mixer-1.2.11.patch diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.10 b/media-libs/sdl_mixer/sdl_mixer-1.2.10.recipe similarity index 100% rename from media-libs/sdl_mixer/sdl_mixer-1.2.10 rename to media-libs/sdl_mixer/sdl_mixer-1.2.10.recipe diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.11 b/media-libs/sdl_mixer/sdl_mixer-1.2.11.recipe similarity index 100% rename from media-libs/sdl_mixer/sdl_mixer-1.2.11 rename to media-libs/sdl_mixer/sdl_mixer-1.2.11.recipe diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12 b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe similarity index 100% rename from media-libs/sdl_mixer/sdl_mixer-1.2.12 rename to media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.9 b/media-libs/sdl_mixer/sdl_mixer-1.2.9.recipe similarity index 100% rename from media-libs/sdl_mixer/sdl_mixer-1.2.9 rename to media-libs/sdl_mixer/sdl_mixer-1.2.9.recipe diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2_hg b/media-libs/sdl_mixer/sdl_mixer-1.2_hg.recipe similarity index 100% rename from media-libs/sdl_mixer/sdl_mixer-1.2_hg rename to media-libs/sdl_mixer/sdl_mixer-1.2_hg.recipe diff --git a/media-libs/sdl_net/patches/sdl-net-1.2.7.patch b/media-libs/sdl_net/patches/sdl_net-1.2.7.patch similarity index 100% rename from media-libs/sdl_net/patches/sdl-net-1.2.7.patch rename to media-libs/sdl_net/patches/sdl_net-1.2.7.patch diff --git a/media-libs/sdl_net/patches/sdl-net-1.2.8.patch b/media-libs/sdl_net/patches/sdl_net-1.2.8.patch similarity index 100% rename from media-libs/sdl_net/patches/sdl-net-1.2.8.patch rename to media-libs/sdl_net/patches/sdl_net-1.2.8.patch diff --git a/media-libs/sdl_net/sdl_net-1.2.7 b/media-libs/sdl_net/sdl_net-1.2.7.recipe similarity index 100% rename from media-libs/sdl_net/sdl_net-1.2.7 rename to media-libs/sdl_net/sdl_net-1.2.7.recipe diff --git a/media-libs/sdl_net/sdl_net-1.2.8 b/media-libs/sdl_net/sdl_net-1.2.8.recipe similarity index 100% rename from media-libs/sdl_net/sdl_net-1.2.8 rename to media-libs/sdl_net/sdl_net-1.2.8.recipe diff --git a/media-libs/sdl_net/sdl_net-1.2_hg b/media-libs/sdl_net/sdl_net-1.2_hg.recipe similarity index 100% rename from media-libs/sdl_net/sdl_net-1.2_hg rename to media-libs/sdl_net/sdl_net-1.2_hg.recipe diff --git a/media-libs/sdl_rtf/sdl_rtf-0.1.0 b/media-libs/sdl_rtf/sdl_rtf-0.1.0.recipe similarity index 100% rename from media-libs/sdl_rtf/sdl_rtf-0.1.0 rename to media-libs/sdl_rtf/sdl_rtf-0.1.0.recipe diff --git a/media-libs/sdl_sound/sdl_sound-1.0.3 b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe similarity index 100% rename from media-libs/sdl_sound/sdl_sound-1.0.3 rename to media-libs/sdl_sound/sdl_sound-1.0.3.recipe diff --git a/media-libs/sdl_sound/sdl_sound-1.0_hg b/media-libs/sdl_sound/sdl_sound-1.0_hg.recipe similarity index 100% rename from media-libs/sdl_sound/sdl_sound-1.0_hg rename to media-libs/sdl_sound/sdl_sound-1.0_hg.recipe diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.10 b/media-libs/sdl_ttf/sdl_ttf-2.0.10.recipe similarity index 100% rename from media-libs/sdl_ttf/sdl_ttf-2.0.10 rename to media-libs/sdl_ttf/sdl_ttf-2.0.10.recipe diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11 b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe similarity index 100% rename from media-libs/sdl_ttf/sdl_ttf-2.0.11 rename to media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.9 b/media-libs/sdl_ttf/sdl_ttf-2.0.9.recipe similarity index 100% rename from media-libs/sdl_ttf/sdl_ttf-2.0.9 rename to media-libs/sdl_ttf/sdl_ttf-2.0.9.recipe diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0_ b/media-libs/sdl_ttf/sdl_ttf-2.0_.recipe similarity index 100% rename from media-libs/sdl_ttf/sdl_ttf-2.0_ rename to media-libs/sdl_ttf/sdl_ttf-2.0_.recipe diff --git a/media-libs/speex/speex-1.2_git b/media-libs/speex/speex-1.2_git deleted file mode 100644 index 1cc925689..000000000 --- a/media-libs/speex/speex-1.2_git +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="Speex" -HOMEPAGE="http://www.speex.org" -SRC_URI="git+http://git.xiph.org/speex.git" -#CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="libogg >= 1.2.0" -BUILD() -{ - cd speex-1.2-git - libtoolize --copy --force --install - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - autogen.sh --prefix=`finddir B_COMMON_DIRECTORY` - sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --mandir=$COMMON_DIR/man - make -} - -INSTALL() -{ - cd speex-1.2-git - make install -} -LICENSE="Speex" -COPYRIGHT="2002-2009 Xiph.org Foundation - 2002-2008 Jean-Marc Valin - 2005-2007 Analog Devices Inc. - 2005-2008 Commonwealth Scientific and Industrial Research Organisation (CSIRO) - 1993, 2002, 2006 David Rowe - 2003 EpicGames - 1992-1994 Jutta Degener, Carsten Bormann" diff --git a/media-sound/fluidsynth/fluidsynth_1.1_midi_buffer b/media-sound/fluidsynth/fluidsynth-1.1_midi_buffer.recipe similarity index 100% rename from media-sound/fluidsynth/fluidsynth_1.1_midi_buffer rename to media-sound/fluidsynth/fluidsynth-1.1_midi_buffer.recipe diff --git a/media-sound/fluidsynth/patches/fluidsynth-1.1-midi-buffer.patch b/media-sound/fluidsynth/patches/fluidsynth-1.1_midi_buffer.patch similarity index 100% rename from media-sound/fluidsynth/patches/fluidsynth-1.1-midi-buffer.patch rename to media-sound/fluidsynth/patches/fluidsynth-1.1_midi_buffer.patch diff --git a/media-sound/gogo_no_coda/gogo_no_coda-3.13 b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe similarity index 100% rename from media-sound/gogo_no_coda/gogo_no_coda-3.13 rename to media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe diff --git a/media-sound/gogo_no_coda/patches/gogo-no-coda-3.13.patch b/media-sound/gogo_no_coda/patches/gogo_no_coda-3.13.patch similarity index 100% rename from media-sound/gogo_no_coda/patches/gogo-no-coda-3.13.patch rename to media-sound/gogo_no_coda/patches/gogo_no_coda-3.13.patch diff --git a/media-sound/lame/lame-398_2 b/media-sound/lame/lame-398_2 deleted file mode 100644 index e53af5d43..000000000 --- a/media-sound/lame/lame-398_2 +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="LAME Ain't an MP3 Encoder" -HOMEPAGE="http://lame.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.98.2/lame-398-2.tar.gz" -CHECKSUM_MD5="719dae0ee675d0c16e0e89952930ed35" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="dev-lang/nasm >= 2.03.01" -BUILD() -{ - cd lame-398-2 - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd lame-398-2 - make install -} -LICENSE="GNU LGPL v2" -COPYRIGHT="1998-2008 Mike Cheng et al." diff --git a/media-sound/lame/patches/lame-398-2.patch b/media-sound/lame/patches/lame-398-2.patch deleted file mode 100644 index dc58cb068..000000000 --- a/media-sound/lame/patches/lame-398-2.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -urN lame-398-2/configure.in lame-398-2-haiku/configure.in ---- lame-398-2/configure.in 2008-08-05 14:16:05.000000000 +0000 -+++ lame-398-2-haiku/configure.in 2009-07-18 07:33:31.000000000 +0000 -@@ -343,6 +343,9 @@ - *solaris*) - LIBS="$LIBS -lnsl" - ;; -+ *haiku*) -+ LIBS="$LIBS -lnetwork" -+ ;; - esac - fi - fi -@@ -385,14 +388,13 @@ - - dnl configure use of features - --AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no") -+dnl AM_PATH_GTK(1.2.0, HAVE_GTK="yes", HAVE_GTK="no") - - dnl ElectricFence malloc debugging - AC_MSG_CHECKING(use of ElectricFence malloc debugging) - AC_ARG_ENABLE(efence, - [ --enable-efence Use ElectricFence for malloc debugging], - CONFIG_EFENCE="${enableval}", CONFIG_EFENCE="no") -- - case "${CONFIG_EFENCE}" in - yes) - AC_CHECK_LIB(efence, EF_Print, HAVE_EFENCE="-lefence") -diff -urN lame-398-2/frontend/Makefile.am lame-398-2-haiku/frontend/Makefile.am ---- lame-398-2/frontend/Makefile.am 2006-09-30 09:17:05.000000000 +0000 -+++ lame-398-2-haiku/frontend/Makefile.am 2009-07-18 07:42:04.000000000 +0000 -@@ -60,7 +60,7 @@ - $(top_builddir)/libmp3lame/libmp3lame.la \ - @FRONTEND_LDADD@ - --mp3x_LDADD = $(LDADD) @GTK_LIBS@ -+mp3x_LDADD = $(LDADD) - - CLEANFILES = lclint.txt $(EXTRA_PROGRAMS) - diff --git a/media-sound/naspro/naspro-0.2.9_hg b/media-sound/naspro/naspro-0.2.9_hg.recipe similarity index 100% rename from media-sound/naspro/naspro-0.2.9_hg rename to media-sound/naspro/naspro-0.2.9_hg.recipe diff --git a/media-sound/ocp/ocp_0.1.21_git b/media-sound/ocp/ocp-0.1.21_git.recipe similarity index 100% rename from media-sound/ocp/ocp_0.1.21_git rename to media-sound/ocp/ocp-0.1.21_git.recipe diff --git a/media-sound/vorbis_tools/patches/vorbis-tools-1.2.0.patch b/media-sound/vorbis_tools/patches/vorbis_tools-1.2.0.patch similarity index 100% rename from media-sound/vorbis_tools/patches/vorbis-tools-1.2.0.patch rename to media-sound/vorbis_tools/patches/vorbis_tools-1.2.0.patch diff --git a/media-sound/vorbis_tools/patches/vorbis-tools-1.4.0.patch b/media-sound/vorbis_tools/patches/vorbis_tools-1.4.0.patch similarity index 100% rename from media-sound/vorbis_tools/patches/vorbis-tools-1.4.0.patch rename to media-sound/vorbis_tools/patches/vorbis_tools-1.4.0.patch diff --git a/media-sound/vorbis_tools/vorbis_tools-1.2.0 b/media-sound/vorbis_tools/vorbis_tools-1.2.0.recipe similarity index 100% rename from media-sound/vorbis_tools/vorbis_tools-1.2.0 rename to media-sound/vorbis_tools/vorbis_tools-1.2.0.recipe diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0 b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe similarity index 100% rename from media-sound/vorbis_tools/vorbis_tools-1.4.0 rename to media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe diff --git a/media-video/ffmpeg/ffmpeg-0.10.2_vlc b/media-video/ffmpeg/ffmpeg-0.10.2_vlc deleted file mode 100644 index 75c5d9949..000000000 --- a/media-video/ffmpeg/ffmpeg-0.10.2_vlc +++ /dev/null @@ -1,29 +0,0 @@ -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.10.2.tar.bz2" -CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libogg >= 1.3.0 - media-libs/speex >= 1.2rc1 - media-libs/libtheora >= 1.1.0 - media-libs/libvorbis >= 1.3.2 - media-libs/libvpx >= 1.0.0" -BUILD() -{ - cd ffmpeg-0.10.2 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ - --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx \ - --enable-gpl --datadir=`finddir B_COMMON_DATA_DIRECTORY` - make -} - -INSTALL() -{ - cd ffmpeg-0.10.2 - make install -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2000-2003 Fabrice Bellard - 2003-2012 the FFmpeg developers" diff --git a/media-video/ffmpeg/ffmpeg-0.10.recipe b/media-video/ffmpeg/ffmpeg-0.10.recipe deleted file mode 100644 index 95f5fe931..000000000 --- a/media-video/ffmpeg/ffmpeg-0.10.recipe +++ /dev/null @@ -1,29 +0,0 @@ -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.10.tar.bz2" -CHECKSUM_MD5="dc665cc599a739e3c5262ccdac13d129" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libogg >= 1.3.0 - media-libs/speex >= 1.2rc1 - media-libs/libtheora >= 1.1.0 - media-libs/libvorbis >= 1.3.2 - media-libs/libvpx >= 1.0.0" -BUILD() -{ - cd ffmpeg-0.10 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --disable-debug --enable-shared \ - --enable-libvorbis --enable-libspeex --enable-libtheora --enable-libvpx - make -} - -INSTALL() -{ - cd ffmpeg-0.10 - make install -} - -LICENSE="GNU LGPL v2.1 - GNU GPL v2" -COPYRIGHT="2000-2003 Fabrice Bellard - 2003-2012 the FFmpeg developers" diff --git a/media-video/ffmpeg/patches/ffmpeg-0.10-gcc2.patch b/media-video/ffmpeg/patches/ffmpeg-0.10-gcc2.patch deleted file mode 100644 index 935cd7276..000000000 --- a/media-video/ffmpeg/patches/ffmpeg-0.10-gcc2.patch +++ /dev/null @@ -1,268 +0,0 @@ -diff --git a/cmdutils.c b/cmdutils.c -index 386db3d..f918600 100644 ---- ffmpeg-0.10/cmdutils.c -+++ ffmpeg-0.10/cmdutils.c -@@ -89,7 +89,7 @@ static void log_callback_report(void *ptr, int level, const char *fmt, va_list v - char line[1024]; - static int print_prefix = 1; - -- va_copy(vl2, vl); -+ __va_copy(vl2, vl); - av_log_default_callback(ptr, level, fmt, vl); - av_log_format_line(ptr, level, fmt, vl2, line, sizeof(line), &print_prefix); - va_end(vl2); -diff --git a/ffmpeg.c b/ffmpeg.c -index 463e1f4..245e8b5 100644 ---- ffmpeg-0.10/ffmpeg.c -+++ ffmpeg-0.10/ffmpeg.c -@@ -1247,9 +1247,11 @@ need_realloc: - av_fifo_size(ost->fifo) / (enc->channels * osize); // FIXME wrong - - if (ost->audio_resample) { -+ uint8_t *buftmp2[] = { buftmp }; -+ const uint8_t *buf2[] = { buf }; - buftmp = audio_buf; -- size_out = swr_convert(ost->swr, ( uint8_t*[]){buftmp}, audio_buf_size / (enc->channels * osize), -- (const uint8_t*[]){buf }, size / (dec->channels * isize)); -+ size_out = swr_convert(ost->swr, buftmp2, audio_buf_size / (enc->channels * osize), -+ buf2, size / (dec->channels * isize)); - size_out = size_out * enc->channels * osize; - } else { - buftmp = buf; -diff --git a/ffprobe.c b/ffprobe.c -index ca6133e..43f9d39 100644 ---- ffmpeg-0.10/ffprobe.c -+++ ffmpeg-0.10/ffprobe.c -@@ -293,7 +293,9 @@ static void writer_print_time(WriterContext *wctx, const char *key, - writer_print_string(wctx, key, "N/A", 1); - } else { - double d = ts * av_q2d(*time_base); -- value_string(buf, sizeof(buf), (struct unit_value){.val.d=d, .unit=unit_second_str}); -+ struct unit_value value2 = {.unit=unit_second_str}; -+ value2.val.d = d; -+ value_string(buf, sizeof(buf), value2); - writer_print_string(wctx, key, buf, 0); - } - } -@@ -1249,8 +1251,8 @@ static void writer_register_all(void) - #define print_str_opt(k, v) writer_print_string(w, k, v, 1) - #define print_time(k, v, tb) writer_print_time(w, k, v, tb) - #define print_ts(k, v) writer_print_ts(w, k, v) --#define print_val(k, v, u) writer_print_string(w, k, \ -- value_string(val_str, sizeof(val_str), (struct unit_value){.val.i = v, .unit=u}), 0) -+#define print_val(k, v, u) value2.val.i = v; value2.unit=u; writer_print_string(w, k, \ -+ value_string(val_str, sizeof(val_str), value2), 0); - #define print_section_header(s) writer_print_section_header(w, s) - #define print_section_footer(s) writer_print_section_footer(w, s) - #define show_tags(metadata) writer_show_tags(w, metadata) -@@ -1261,6 +1263,7 @@ static void show_packet(WriterContext *w, AVFormatContext *fmt_ctx, AVPacket *pk - AVStream *st = fmt_ctx->streams[pkt->stream_index]; - struct print_buf pbuf = {.s = NULL}; - const char *s; -+ struct unit_value value2; - - print_section_header("packet"); - s = av_get_media_type_string(st->codec->codec_type); -@@ -1404,6 +1407,7 @@ static void show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_i - const char *s; - AVRational display_aspect_ratio; - struct print_buf pbuf = {.s = NULL}; -+ struct unit_value value2; - - print_section_header("stream"); - -@@ -1516,6 +1520,7 @@ static void show_format(WriterContext *w, AVFormatContext *fmt_ctx) - { - char val_str[128]; - int64_t size = fmt_ctx->pb ? avio_size(fmt_ctx->pb) : -1; -+ struct unit_value value2; - - print_section_header("format"); - print_str("filename", fmt_ctx->filename); -@@ -1524,9 +1529,9 @@ static void show_format(WriterContext *w, AVFormatContext *fmt_ctx) - print_str("format_long_name", fmt_ctx->iformat->long_name); - print_time("start_time", fmt_ctx->start_time, &AV_TIME_BASE_Q); - print_time("duration", fmt_ctx->duration, &AV_TIME_BASE_Q); -- if (size >= 0) print_val ("size", size, unit_byte_str); -+ if (size >= 0) { print_val ("size", size, unit_byte_str); } - else print_str_opt("size", "N/A"); -- if (fmt_ctx->bit_rate > 0) print_val ("bit_rate", fmt_ctx->bit_rate, unit_bit_per_second_str); -+ if (fmt_ctx->bit_rate > 0) { print_val ("bit_rate", fmt_ctx->bit_rate, unit_bit_per_second_str); } - else print_str_opt("bit_rate", "N/A"); - show_tags(fmt_ctx->metadata); - print_section_footer("format"); -diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c -index 55f0286..35d5f1a 100644 ---- ffmpeg-0.10/libavcodec/aacenc.c -+++ ffmpeg-0.10/libavcodec/aacenc.c -@@ -223,8 +223,9 @@ WINDOW_FUNC(eight_short) - const float *pwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128; - const float *in = audio + 448; - float *out = sce->ret; -+ int w; - -- for (int w = 0; w < 8; w++) { -+ for (w = 0; w < 8; w++) { - dsp->vector_fmul (out, in, w ? pwindow : swindow, 128); - out += 128; - in += 128; -@@ -686,11 +687,12 @@ static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s) - - static av_cold int alloc_buffers(AVCodecContext *avctx, AACEncContext *s) - { -+ int ch; - FF_ALLOCZ_OR_GOTO(avctx, s->buffer.samples, 3 * 1024 * s->channels * sizeof(s->buffer.samples[0]), alloc_fail); - FF_ALLOCZ_OR_GOTO(avctx, s->cpe, sizeof(ChannelElement) * s->chan_map[0], alloc_fail); - FF_ALLOCZ_OR_GOTO(avctx, avctx->extradata, 5 + FF_INPUT_BUFFER_PADDING_SIZE, alloc_fail); - -- for(int ch = 0; ch < s->channels; ch++) -+ for(ch = 0; ch < s->channels; ch++) - s->planar_samples[ch] = s->buffer.samples + 3 * 1024 * ch; - - return 0; -diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c -index e73fbfe..3cde56c 100644 ---- ffmpeg-0.10/libavutil/pixdesc.c -+++ ffmpeg-0.10/libavutil/pixdesc.c -@@ -1096,12 +1096,6 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { - .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, - }, -- [PIX_FMT_VDA_VLD] = { -- .name = "vda_vld", -- .log2_chroma_w = 1, -- .log2_chroma_h = 1, -- .flags = PIX_FMT_HWACCEL, -- }, - [PIX_FMT_GRAY8A] = { - .name = "gray8a", - .nb_components = 2, -@@ -1110,16 +1104,6 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { - { 0, 1, 2, 0, 7 }, /* A */ - }, - }, -- [PIX_FMT_GBR24P] = { -- .name = "gbr24p", -- .nb_components= 3, -- .comp = { -- { 1, 0, 1, 0, 7 }, /* B */ -- { 0, 0, 1, 0, 7 }, /* G */ -- { 2, 0, 1, 0, 7 }, /* R */ -- }, -- .flags = PIX_FMT_PLANAR | PIX_FMT_RGB, -- }, - [PIX_FMT_GBRP] = { - .name = "gbrp", - .nb_components = 3, -diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c -index e1ba799..3820056 100644 ---- ffmpeg-0.10/libswscale/swscale_unscaled.c -+++ ffmpeg-0.10/libswscale/swscale_unscaled.c -@@ -370,30 +370,38 @@ static int planarRgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStr - } - - switch (c->dstFormat) { -- case PIX_FMT_BGR24: -- gbr24ptopacked24((const uint8_t* []) {src[1], src[0], src[2]}, (int []) {srcStride[1], srcStride[0], srcStride[2]}, -+ case PIX_FMT_BGR24: { -+ const uint8_t* src2[] = {src[1], src[0], src[2]}; -+ int srcStride2[] = {srcStride[1], srcStride[0], srcStride[2]}; -+ gbr24ptopacked24(src2, srcStride2, - dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, c->srcW); - break; -- -- case PIX_FMT_RGB24: -- gbr24ptopacked24((const uint8_t* []) {src[2], src[0], src[1]}, (int []) {srcStride[2], srcStride[0], srcStride[1]}, -+ } -+ case PIX_FMT_RGB24: { -+ const uint8_t* src2[] = {src[2], src[0], src[1]}; -+ int srcStride2[] = {srcStride[2], srcStride[0], srcStride[1]}; -+ gbr24ptopacked24(src2, srcStride2, - dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, c->srcW); - break; -- -+ } - case PIX_FMT_ARGB: - alpha_first = 1; -- case PIX_FMT_RGBA: -- gbr24ptopacked32((const uint8_t* []) {src[2], src[0], src[1]}, (int []) {srcStride[2], srcStride[0], srcStride[1]}, -+ case PIX_FMT_RGBA: { -+ const uint8_t* src2[] = {src[2], src[0], src[1]}; -+ int srcStride2[] = {srcStride[2], srcStride[0], srcStride[1]}; -+ gbr24ptopacked32(src2, srcStride2, - dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, alpha_first, c->srcW); - break; -- -+ } - case PIX_FMT_ABGR: - alpha_first = 1; -- case PIX_FMT_BGRA: -- gbr24ptopacked32((const uint8_t* []) {src[1], src[0], src[2]}, (int []) {srcStride[1], srcStride[0], srcStride[2]}, -+ case PIX_FMT_BGRA: { -+ const uint8_t* src2[] = {src[1], src[0], src[2]}; -+ int srcStride2[] = {srcStride[1], srcStride[0], srcStride[2]}; -+ gbr24ptopacked32(src2, srcStride2, - dst[0] + srcSliceY * dstStride[0], dstStride[0], srcSliceH, alpha_first, c->srcW); - break; -- -+ } - default: - av_log(c, AV_LOG_ERROR, "unsupported planar RGB conversion %s -> %s\n", - av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat)); -diff --git a/configure b/configure ---- ffmpeg-0.10/configure 2012-01-26 22:15:59.047710208 +0000 -+++ ffmpeg-0.10-haiku/configure 2012-03-28 22:30:34.330563584 +0000 -@@ -1359,7 +1359,6 @@ - - aligned_stack_if_any="ppc x86" - fast_64bit_if_any="alpha ia64 mips64 parisc64 ppc64 sparc64 x86_64" --fast_clz_if_any="alpha armv5te avr32 mips ppc x86" - fast_unaligned_if_any="armv6 ppc x86" - - inline_asm_deps="!tms470" -@@ -1866,7 +1865,7 @@ - CC_O='-o $@' - CXX_O='-o $@' - --host_cflags='-D_ISOC99_SOURCE -O3 -g' -+host_cflags='-D_ISOC99_SOURCE -O2 -g' - host_libs='-lm' - - target_path='$(CURDIR)' -@@ -1948,6 +1947,7 @@ - done - - enable $ARCH_EXT_LIST $ALL_TESTS -+disable sse - - die_unknown(){ - echo "Unknown option \"$1\"." -@@ -2144,7 +2144,7 @@ - CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' - AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' - fi -- speed_cflags='-O3' -+ speed_cflags='-O2' - size_cflags='-Os' - elif $cc --version 2>/dev/null | grep -q Intel; then - cc_type=icc -@@ -2831,10 +2831,6 @@ - struct { int x; } __attribute__((packed)) x; - EOF - --check_cc < - # include --# include -+# include - - #elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) /* pthreads (like Linux & BSD) */ - # include -diff -ur vlc-0.8.6i-original/modules/codec/cinepak.c vlc-0.8.6i/modules/codec/cinepak.c ---- vlc-0.8.6i-original/modules/codec/cinepak.c 2008-07-08 21:59:23.000000000 +0100 -+++ vlc-0.8.6i/modules/codec/cinepak.c 2009-11-08 00:57:55.000000000 +0000 -@@ -279,7 +279,7 @@ - int i_strip, int i_x, int i_y, - int i_x2, int i_y2, uint8_t *p_data ) - { -- uint8_t i_index[4]; -+ uint8_t i_index[4], *p_dst_y, *p_dst_u, *p_dst_v; - int i,j; - - size_t y_max = p_context->i_stride[0] * ( i_y + 5 ) + i_x + 5; -@@ -292,7 +292,7 @@ - if( y_max >= y_siz || u_max >= u_siz || v_max >= v_siz ) - return; - -- uint8_t *p_dst_y, *p_dst_u, *p_dst_v; -+ - #define PIX_SET_Y( x, y, v ) \ - p_dst_y[(x) + (y)* p_context->i_stride[0]] = (v); - -@@ -336,7 +336,7 @@ - int i_strip, int i_x, int i_y, - int i_x2, int i_y2, uint8_t *p_data ) - { -- uint8_t i_index; -+ uint8_t i_index, *p_dst_y, *p_dst_u, *p_dst_v; - int i,j; - - size_t y_max = p_context->i_stride[0] * ( i_y + 5 ) + i_x + 5; -@@ -349,7 +349,6 @@ - if( y_max >= y_siz || u_max >= u_siz || v_max >= v_siz ) - return; - -- uint8_t *p_dst_y, *p_dst_u, *p_dst_v; - #define PIX_SET_Y( x, y, v ) \ - p_dst_y[(x) + (y)* p_context->i_stride[0]] = (v); - -diff -ur vlc-0.8.6i-original/modules/codec/telx.c vlc-0.8.6i/modules/codec/telx.c ---- vlc-0.8.6i-original/modules/codec/telx.c 2008-07-08 21:59:23.000000000 +0100 -+++ vlc-0.8.6i/modules/codec/telx.c 2009-11-08 00:59:26.000000000 +0000 -@@ -450,7 +450,7 @@ - vlc_bool_t b_update = VLC_FALSE; - char psz_text[512], *pt = psz_text; - char psz_line[256]; -- int i, total; -+ int i, total, mpag, row, magazine; - - if( pp_block == NULL || *pp_block == NULL ) return NULL; - p_block = *pp_block; -@@ -473,8 +473,7 @@ - /* continue; */ - /* } */ - -- int mpag = (hamming_8_4( packet[4] ) << 4) | hamming_8_4( packet[5] ); -- int row, magazine; -+ mpag = (hamming_8_4( packet[4] ) << 4) | hamming_8_4( packet[5] ); - if ( mpag < 0 ) - { - /* decode error */ -diff -ur vlc-0.8.6i-original/modules/demux/a52.c vlc-0.8.6i/modules/demux/a52.c ---- vlc-0.8.6i-original/modules/demux/a52.c 2008-07-08 21:59:23.000000000 +0100 -+++ vlc-0.8.6i/modules/demux/a52.c 2009-11-08 01:00:41.000000000 +0000 -@@ -80,7 +80,7 @@ - demux_t *p_demux = (demux_t*)p_this; - demux_sys_t *p_sys; - byte_t *p_peek; -- int i_peek = 0; -+ int i_peek = 0, i_size; - vlc_bool_t b_big_endian = 0; /* Arbitrary initialisation */ - - /* Check if we are dealing with a WAV file */ -@@ -104,7 +104,7 @@ - - /* Some A52 wav files don't begin with a sync code so we do a more - * extensive search */ -- int i_size = stream_Peek( p_demux->s, &p_peek, i_peek + A52_PACKET_SIZE * 2); -+ i_size = stream_Peek( p_demux->s, &p_peek, i_peek + A52_PACKET_SIZE * 2); - i_size -= (PCM_FRAME_SIZE + A52_MAX_HEADER_SIZE); - - while( i_peek < i_size ) -diff -ur vlc-0.8.6i-original/modules/demux/dts.c vlc-0.8.6i/modules/demux/dts.c ---- vlc-0.8.6i-original/modules/demux/dts.c 2008-07-08 21:59:23.000000000 +0100 -+++ vlc-0.8.6i/modules/demux/dts.c 2009-11-08 01:01:49.000000000 +0000 -@@ -74,7 +74,8 @@ - demux_t *p_demux = (demux_t*)p_this; - demux_sys_t *p_sys; - byte_t * p_peek; -- int i_peek = 0; -+ int i_peek = 0, i_size; -+ uint32_t i_len; - - /* Check if we are dealing with a WAV file */ - if( stream_Peek( p_demux->s, &p_peek, 20 ) == 20 && -@@ -94,7 +95,7 @@ - } - - /* Sanity check the wave format header */ -- uint32_t i_len = GetDWLE( p_peek + i_peek - 4 ); -+ i_len = GetDWLE( p_peek + i_peek - 4 ); - if( i_len > DTS_PROBE_SIZE ) - return VLC_EGENERIC; - -@@ -124,7 +125,7 @@ - - /* Some DTS wav files don't begin with a sync code so we do a more - * extensive search */ -- int i_size = stream_Peek( p_demux->s, &p_peek, DTS_PROBE_SIZE ); -+ i_size = stream_Peek( p_demux->s, &p_peek, DTS_PROBE_SIZE ); - i_size -= DTS_MAX_HEADER_SIZE; - - while( i_peek < i_size ) -diff -ur vlc-0.8.6i-original/modules/gui/beos/InterfaceWindow.cpp vlc-0.8.6i/modules/gui/beos/InterfaceWindow.cpp ---- vlc-0.8.6i-original/modules/gui/beos/InterfaceWindow.cpp 2008-07-08 21:59:23.000000000 +0100 -+++ vlc-0.8.6i/modules/gui/beos/InterfaceWindow.cpp 2009-11-08 01:03:41.000000000 +0000 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+//#include - #include - #include - -diff -ur vlc-0.8.6i-original/modules/misc/network/ipv6.c vlc-0.8.6i/modules/misc/network/ipv6.c ---- vlc-0.8.6i-original/modules/misc/network/ipv6.c 2008-07-08 21:59:24.000000000 +0100 -+++ vlc-0.8.6i/modules/misc/network/ipv6.c 2009-11-08 01:12:23.000000000 +0000 -@@ -239,6 +239,7 @@ - return 0; - } - -+#ifndef __HAIKU__ - /* Join the multicast group if the socket is a multicast address */ - if( IN6_IS_ADDR_MULTICAST(&loc.sin6_addr) ) - { -@@ -384,4 +385,5 @@ - p_socket->i_mtu = val.i_int; - - return 0; -+ #endif - } -diff -ur vlc-0.8.6i-original/modules/mux/mpeg/ts.c vlc-0.8.6i/modules/mux/mpeg/ts.c ---- vlc-0.8.6i-original/modules/mux/mpeg/ts.c 2008-07-08 21:59:24.000000000 +0100 -+++ vlc-0.8.6i/modules/mux/mpeg/ts.c 2009-11-08 01:15:10.000000000 +0000 -@@ -1719,27 +1719,30 @@ - static block_t *Add_ADTS( block_t *p_data, es_format_t *p_fmt ) - { - uint8_t *p_extra = p_fmt->p_extra; -+ int i_index, i_profile, i_channels, i_fullness; -+ uint8_t *p_buffer; -+ block_t *p_bak_block, *p_new_block; - - if( !p_data || p_fmt->i_extra < 2 || !p_extra ) - return p_data; /* no data to construct the headers */ - -- int i_index = ( (p_extra[0] << 1) | (p_extra[1] >> 7) ) & 0x0f; -- int i_profile = (p_extra[0] >> 3) - 1; /* i_profile < 4 */ -+ i_index = ( (p_extra[0] << 1) | (p_extra[1] >> 7) ) & 0x0f; -+ i_profile = (p_extra[0] >> 3) - 1; /* i_profile < 4 */ - - if( i_index == 0x0f && p_fmt->i_extra < 5 ) - return p_data; /* not enough data */ - -- int i_channels = (p_extra[i_index == 0x0f ? 4 : 1] >> 3) & 0x0f; -+ i_channels = (p_extra[i_index == 0x0f ? 4 : 1] >> 3) & 0x0f; - - #define ADTS_HEADER_SIZE 7 /* CRC needs 2 more bytes */ - - - /* keep a copy in case block_Realloc() fails */ -- block_t *p_bak_block = block_Duplicate( p_data ); -+ p_bak_block = block_Duplicate( p_data ); - if( !p_bak_block ) /* OOM, block_Realloc() is likely to lose our block */ - return p_data; /* the frame isn't correct but that's the best we have */ - -- block_t *p_new_block = block_Realloc( p_data, ADTS_HEADER_SIZE, -+ p_new_block = block_Realloc( p_data, ADTS_HEADER_SIZE, - p_data->i_buffer ); - if( !p_new_block ) - return p_bak_block; /* OOM, send the (incorrect) original frame */ -@@ -1747,7 +1750,7 @@ - block_Release( p_bak_block ); /* we don't need the copy anymore */ - - -- uint8_t *p_buffer = p_new_block->p_buffer; -+ p_buffer = p_new_block->p_buffer; - - /* fixed header */ - p_buffer[0] = 0xff; -@@ -1757,7 +1760,7 @@ - - /* variable header (starts at last 2 bits of 4th byte) */ - -- int i_fullness = 0x7ff; /* 0x7ff means VBR */ -+ i_fullness = 0x7ff; /* 0x7ff means VBR */ - /* XXX: We should check if it's CBR or VBR, but no known implementation - * do that, and it's a pain to calculate this field */ - -diff -ur vlc-0.8.6i-original/modules/packetizer/h264.c vlc-0.8.6i/modules/packetizer/h264.c ---- vlc-0.8.6i-original/modules/packetizer/h264.c 2008-07-08 21:59:24.000000000 +0100 -+++ vlc-0.8.6i/modules/packetizer/h264.c 2009-11-08 01:21:24.000000000 +0000 -@@ -219,13 +219,14 @@ - i_sps = (*p++)&0x1f; - for( i = 0; i < i_sps; i++ ) - { -+ block_t *p_sps; - uint16_t i_length = GetWBE( p ); p += 2; - if( i_length > - (uint8_t*)p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra - p ) - { - return VLC_EGENERIC; - } -- block_t *p_sps = nal_get_annexeb( p_dec, p, i_length ); -+ p_sps = nal_get_annexeb( p_dec, p, i_length ); - if( !p_sps ) - return VLC_EGENERIC; - p_sys->p_sps = block_Duplicate( p_sps ); -@@ -237,13 +238,14 @@ - i_pps = *p++; - for( i = 0; i < i_pps; i++ ) - { -+ block_t *p_pps; - uint16_t i_length = GetWBE( p ); p += 2; - if( i_length > - (uint8_t*)p_dec->fmt_in.p_extra + p_dec->fmt_in.i_extra - p ) - { - return VLC_EGENERIC; - } -- block_t *p_pps = nal_get_annexeb( p_dec, p, i_length ); -+ p_pps = nal_get_annexeb( p_dec, p, i_length ); - if( !p_pps ) - return VLC_EGENERIC; - p_sys->p_pps = block_Duplicate( p_pps ); -@@ -446,7 +448,7 @@ - - for( p = p_block->p_buffer; p < &p_block->p_buffer[p_block->i_buffer]; ) - { -- block_t *p_pic; -+ block_t *p_pic, *p_part; - int i_size = 0; - int i; - -@@ -462,7 +464,7 @@ - break; - } - -- block_t *p_part = nal_get_annexeb( p_dec, p, i_size ); -+ p_part = nal_get_annexeb( p_dec, p, i_size ); - if( !p_part ) - break; - p_part->i_dts = p_block->i_dts; -diff -ur vlc-0.8.6i-original/modules/packetizer/mpeg4audio.c vlc-0.8.6i/modules/packetizer/mpeg4audio.c ---- vlc-0.8.6i-original/modules/packetizer/mpeg4audio.c 2008-07-08 21:59:24.000000000 +0100 -+++ vlc-0.8.6i/modules/packetizer/mpeg4audio.c 2009-11-08 01:18:22.000000000 +0000 -@@ -332,6 +332,7 @@ - { - int i_profile, i_sample_rate_idx, i_frame_size; - vlc_bool_t b_crc; -+ unsigned short i_raw_blocks_in_frame; - - /* Fixed header between frames */ - //int i_id = ( (p_buf[1] >> 3) & 0x01) ? 2 : 4; /* MPEG-2 or 4 */ -@@ -350,7 +351,7 @@ - i_frame_size = ((p_buf[3] & 0x03) << 11) | (p_buf[4] << 3) | - ((p_buf[5] >> 5) /*& 0x7*/); - //uint16_t buffer_fullness = ((p_buf[5] & 0x1f) << 6) | (p_buf[6] >> 2); -- unsigned short i_raw_blocks_in_frame = p_buf[6] & 0x03; -+ i_raw_blocks_in_frame = p_buf[6] & 0x03; - - if( !*pi_sample_rate || !*pi_channels || !i_frame_size ) - { -@@ -436,15 +437,16 @@ - { - /* TODO compute channels count ? */ - int i_tag = bs_read( s, 4 ); -- if( i_tag != 0x05 ) -- return -1; -- bs_skip( s, 2 + 4 ); // object type + sampling index - int i_num_front = bs_read( s, 4 ); - int i_num_side = bs_read( s, 4 ); - int i_num_back = bs_read( s, 4 ); - int i_num_lfe = bs_read( s, 2 ); - int i_num_assoc_data = bs_read( s, 3 ); - int i_num_valid_cc = bs_read( s, 4 ); -+ int i_comment; -+ if( i_tag != 0x05 ) -+ return -1; -+ bs_skip( s, 2 + 4 ); // object type + sampling index - - if( bs_read1(s) ) - bs_skip( s, 4 ); // mono downmix -@@ -460,19 +462,20 @@ - bs_skip( s, i_num_assoc_data * (4) ); - bs_skip( s, i_num_valid_cc * (5) ); - bs_align( s ); -- int i_comment = bs_read( s, 8 ); -+ i_comment = bs_read( s, 8 ); - bs_skip( s, i_comment * 8 ); - return 0; - } - - static int Mpeg4GASpecificConfig( mpeg4_cfg_t *p_cfg, bs_t *s ) - { -+ int i_extension_flag; - p_cfg->i_frame_length = bs_read1(s) ? 960 : 1024; - - if( bs_read1( s ) ) // depend on core coder - bs_skip( s, 14 ); // core coder delay - -- int i_extension_flag = bs_read1( s ); -+ i_extension_flag = bs_read1( s ); - if( p_cfg->i_channel == 0 ) - { - Mpeg4GAProgramConfigElement( s ); -diff -ur vlc-0.8.6i-original/modules/stream_out/mosaic_bridge.c vlc-0.8.6i/modules/stream_out/mosaic_bridge.c ---- vlc-0.8.6i-original/modules/stream_out/mosaic_bridge.c 2008-07-08 21:59:24.000000000 +0100 -+++ vlc-0.8.6i/modules/stream_out/mosaic_bridge.c 2009-11-08 01:22:30.000000000 +0000 -@@ -339,11 +339,12 @@ - - if ( p_sys->p_decoder != NULL ) - { -+ void *p_owner; - picture_t **pp_ring = p_sys->p_decoder->p_owner->pp_pics; - - if( p_sys->p_decoder->p_module ) - module_Unneed( p_sys->p_decoder, p_sys->p_decoder->p_module ); -- void *p_owner = p_sys->p_decoder->p_owner; -+ p_owner = p_sys->p_decoder->p_owner; - vlc_object_detach( p_sys->p_decoder ); - vlc_object_destroy( p_sys->p_decoder ); - -diff -ur vlc-0.8.6i-original/modules/stream_out/switcher.c vlc-0.8.6i/modules/stream_out/switcher.c ---- vlc-0.8.6i-original/modules/stream_out/switcher.c 2008-07-08 21:59:24.000000000 +0100 -+++ vlc-0.8.6i/modules/stream_out/switcher.c 2009-11-08 01:23:24.000000000 +0000 -@@ -657,8 +657,9 @@ - - if ( i_len > 0 ) - { -+ int i_cmd; - psz_buffer[i_len] = '\0'; -- int i_cmd = strtol( psz_buffer, NULL, 0 ); -+ i_cmd = strtol( psz_buffer, NULL, 0 ); - if ( i_cmd < -1 || i_cmd > p_sys->i_nb_pictures ) - { - msg_Err( p_stream, "got a wrong command (%d)", i_cmd ); -diff -ur vlc-0.8.6i-original/src/extras/libc.c vlc-0.8.6i/src/extras/libc.c ---- vlc-0.8.6i-original/src/extras/libc.c 2008-07-08 22:08:36.000000000 +0100 -+++ vlc-0.8.6i/src/extras/libc.c 2009-11-08 00:44:49.000000000 +0000 -@@ -348,7 +348,7 @@ - /***************************************************************************** - * lldiv: returns quotient and remainder - *****************************************************************************/ --#if defined(SYS_BEOS) \ -+#if defined(SYS_BEOS) & !(defined(__HAIKU__))\ - || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) - lldiv_t vlc_lldiv( long long numer, long long denom ) - { -diff -ur vlc-0.8.6i-original/src/input/input.c vlc-0.8.6i/src/input/input.c ---- vlc-0.8.6i-original/src/input/input.c 2008-07-08 22:08:36.000000000 +0100 -+++ vlc-0.8.6i/src/input/input.c 2009-11-08 00:30:10.000000000 +0000 -@@ -1913,11 +1913,11 @@ - { - vlc_meta_t *tk = p_meta->track[i]; - int j; -+ char *psz_cat; - - if( tk->i_meta > 0 ) - { - msg_Dbg( p_input, " - track[%d]:", i ); -- char *psz_cat; - if( asprintf( &psz_cat, "%s %d", _("Stream"), i ) != -1 ) - { - for( j = 0; j < tk->i_meta; j++ ) -diff -ur vlc-0.8.6i-original/src/misc/beos_specific.cpp vlc-0.8.6i/src/misc/beos_specific.cpp ---- vlc-0.8.6i-original/src/misc/beos_specific.cpp 2008-07-08 22:08:36.000000000 +0100 -+++ vlc-0.8.6i/src/misc/beos_specific.cpp 2009-11-09 18:46:51.000000000 +0000 -@@ -154,7 +154,7 @@ - { - BAlert *alert; - alert = new BAlert( "VLC " PACKAGE_VERSION, -- "VLC " PACKAGE_VERSION " for BeOS\n\n" -+ "VLC " PACKAGE_VERSION " for Haiku\n\n" - "", "OK"); - alert->Go( NULL ); - } -diff -ur vlc-0.8.6i-original/src/misc/threads.c vlc-0.8.6i/src/misc/threads.c ---- vlc-0.8.6i-original/src/misc/threads.c 2008-07-08 22:08:36.000000000 +0100 -+++ vlc-0.8.6i/src/misc/threads.c 2009-11-08 17:02:02.000000000 +0000 -@@ -647,6 +647,7 @@ - int __vlc_thread_set_priority( vlc_object_t *p_this, char * psz_file, - int i_line, int i_priority ) - { -+/* - #if defined( PTH_INIT_IN_PTH_H ) || defined( ST_INIT_IN_ST_H ) - #elif defined( WIN32 ) || defined( UNDER_CE ) - if( !SetThreadPriority(GetCurrentThread(), i_priority) ) -@@ -689,7 +690,7 @@ - } - } - #endif -- -+*/ - return 0; - } - -@@ -790,3 +791,7 @@ - p_this->b_thread = 0; - } - -+ -+ -+ -+ -Only in vlc-0.8.6i-original/src/misc: version.c -diff -ur vlc-0.8.6i-original/src/misc/vlm.c vlc-0.8.6i/src/misc/vlm.c ---- vlc-0.8.6i-original/src/misc/vlm.c 2008-07-08 22:08:36.000000000 +0100 -+++ vlc-0.8.6i/src/misc/vlm.c 2009-11-08 00:42:59.000000000 +0000 -@@ -1368,10 +1368,11 @@ - - vlm_schedule_t *vlm_ScheduleNew( vlm_t *vlm, const char *psz_name ) - { -+ vlm_schedule_t *p_sched; - if( !psz_name ) - return NULL; - -- vlm_schedule_t *p_sched = malloc( sizeof( vlm_schedule_t ) ); -+ p_sched = malloc( sizeof( vlm_schedule_t ) ); - if( !p_sched ) - return NULL; - -diff -ur vlc-0.8.6i-original/src/network/httpd.c vlc-0.8.6i/src/network/httpd.c ---- vlc-0.8.6i-original/src/network/httpd.c 2008-07-08 22:08:36.000000000 +0100 -+++ vlc-0.8.6i/src/network/httpd.c 2009-11-08 00:33:09.000000000 +0000 -@@ -365,7 +365,7 @@ - static int httpd_FileCallBack( httpd_callback_sys_t *p_sys, httpd_client_t *cl, httpd_message_t *answer, httpd_message_t *query ) - { - httpd_file_t *file = (httpd_file_t*)p_sys; -- uint8_t **pp_body, *p_body; -+ uint8_t **pp_body, *p_body, *psz_args; - char *psz_connection = NULL; - int *pi_body, i_body; - -@@ -402,7 +402,7 @@ - /* msg_Warn not supported */ - } - -- uint8_t *psz_args = query->psz_args; -+ psz_args = query->psz_args; - file->pf_fill( file->p_sys, file, psz_args, pp_body, pi_body ); - - if( query->i_type == HTTPD_MSG_HEAD && p_body != NULL ) -@@ -487,6 +487,7 @@ - { - httpd_handler_t *handler = (httpd_handler_t*)p_sys; - char psz_remote_addr[NI_MAXNUMERICHOST]; -+ uint8_t *psz_args; - - if( answer == NULL || query == NULL ) - { -@@ -502,7 +503,7 @@ - if( httpd_ClientIP( cl, psz_remote_addr ) == NULL ) - *psz_remote_addr = '\0'; - -- uint8_t *psz_args = query->psz_args; -+ psz_args = query->psz_args; - handler->pf_fill( handler->p_sys, handler, query->psz_url, psz_args, - query->i_type, query->p_body, query->i_body, - psz_remote_addr, NULL, -diff -ur vlc-0.8.6i-original/src/stream_output/sap.c vlc-0.8.6i/src/stream_output/sap.c ---- vlc-0.8.6i-original/src/stream_output/sap.c 2008-07-08 22:08:36.000000000 +0100 -+++ vlc-0.8.6i/src/stream_output/sap.c 2009-11-08 01:26:17.000000000 +0000 -@@ -287,7 +287,8 @@ - - memcpy( a6->s6_addr + 2, "\x00\x00\x00\x00\x00\x00" - "\x00\x00\x00\x00\x00\x02\x7f\xfe", 14 ); -- if( IN6_IS_ADDR_MULTICAST( a6 ) ) -+ #ifndef __HAIKU__ -+ if( IN6_IS_ADDR_MULTICAST( a6 ) ) - { - /* SSM <=> ff3x::/32 */ - b_ssm = (U32_AT (a6->s6_addr) & 0xfff0ffff) == 0xff300000; -@@ -301,6 +302,7 @@ - - b_ipv6 = VLC_TRUE; - break; -+ #endif - } - #endif - diff --git a/media-video/vlc/vlc-1.1.5_20101107 b/media-video/vlc/vlc-1.1.5_20101107.recipe similarity index 100% rename from media-video/vlc/vlc-1.1.5_20101107 rename to media-video/vlc/vlc-1.1.5_20101107.recipe diff --git a/net-irc/rhapsody_irc/patches/rhapsody-irc-0.28b.patch b/net-irc/rhapsody_irc/patches/rhapsody_irc-0.28b.patch similarity index 100% rename from net-irc/rhapsody_irc/patches/rhapsody-irc-0.28b.patch rename to net-irc/rhapsody_irc/patches/rhapsody_irc-0.28b.patch diff --git a/net-irc/rhapsody_irc/rhapsody_irc-0.28b b/net-irc/rhapsody_irc/rhapsody_irc-0.28b.recipe similarity index 100% rename from net-irc/rhapsody_irc/rhapsody_irc-0.28b rename to net-irc/rhapsody_irc/rhapsody_irc-0.28b.recipe diff --git a/net-libs/hubbub/hubbub-0.1.2_HEAD b/net-libs/hubbub/hubbub-0.1.2_HEAD.recipe similarity index 100% rename from net-libs/hubbub/hubbub-0.1.2_HEAD rename to net-libs/hubbub/hubbub-0.1.2_HEAD.recipe diff --git a/net-p2p/seeks/seeks-0.x_git b/net-p2p/seeks/seeks-0.x_git.recipe similarity index 100% rename from net-p2p/seeks/seeks-0.x_git rename to net-p2p/seeks/seeks-0.x_git.recipe diff --git a/net-wireless/b43_fwcutter/b43_fwcutter-012 b/net-wireless/b43_fwcutter/b43_fwcutter-012.recipe similarity index 100% rename from net-wireless/b43_fwcutter/b43_fwcutter-012 rename to net-wireless/b43_fwcutter/b43_fwcutter-012.recipe diff --git a/net-wireless/b43_fwcutter/patches/b43-fwcutter-012.patch b/net-wireless/b43_fwcutter/patches/b43_fwcutter-012.patch similarity index 100% rename from net-wireless/b43_fwcutter/patches/b43-fwcutter-012.patch rename to net-wireless/b43_fwcutter/patches/b43_fwcutter-012.patch diff --git a/sys-apps/dtc/dtc-1.3.0_git b/sys-apps/dtc/dtc-1.3.0_git.recipe similarity index 100% rename from sys-apps/dtc/dtc-1.3.0_git rename to sys-apps/dtc/dtc-1.3.0_git.recipe diff --git a/sys-apps/dtc/patches/dtc-1.3.0-git.patch b/sys-apps/dtc/patches/dtc-1.3.0_git.patch similarity index 100% rename from sys-apps/dtc/patches/dtc-1.3.0-git.patch rename to sys-apps/dtc/patches/dtc-1.3.0_git.patch diff --git a/sys-apps/hgrep/hgrep b/sys-apps/hgrep/hgrep deleted file mode 100755 index 356dec164..000000000 --- a/sys-apps/hgrep/hgrep +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# -# Copyright 2011, Haiku, Inc. All Rights Reserved. -# Distributed under the terms of the MIT License. -# - -find $(finddir B_COMMON_DEVELOP_DIRECTORY)/headers -type f -print0 | xargs -0 egrep "$@" - -# TODO add other header directories to search? diff --git a/sys-apps/lgrep/lgrep b/sys-apps/lgrep/lgrep deleted file mode 100755 index aa9a00c41..000000000 --- a/sys-apps/lgrep/lgrep +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -# -# Copyright 2011, Haiku, Inc. All Rights Reserved. -# Distributed under the terms of the MIT License. -# - -usage() { - echo `basename $0` \[-V\] \ - echo \- list files containing \ - echo " -V lists also directories searched" - echo "" - echo `basename $0` -h - echo \- Show this help - exit 0 -} - -if [ "$1" == "-V" ]; then - VERBOSE=1 - shift -else - VERBOSE=0 -fi - -if [ "$1" == "-h" ]; then - usage -fi - -if [ "x$1" == "x" ]; then - usage -fi - -LPATH=`echo $LIBRARY_PATH|sed "s|%A/lib:||"` -[ -d ./lib ] && LPATH="./lib:$LPATH" || true -LPATH=`echo $LPATH|sed "s/:/ /g"` -TEMPFILE=/boot/var/tmp/`basename $0`.$PPID -for libdir in `echo $LPATH`; do - if [ "$VERBOSE" == "1" ]; then - echo Searching in \"$libdir\"... - fi - for lib in $libdir/*.so ; do - echo "[ $lib ]" > $TEMPFILE - (nm -D $lib 2>/dev/null)|grep $1 >> $TEMPFILE - LINES=`wc -l $TEMPFILE | awk '{ print $1; }'` - if [ "$LINES" != "1" ]; then - cat $TEMPFILE - fi - done -done -rm -f $TEMPFILE diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43_git b/sys-fs/e2fsprogs/e2fsprogs-1.43_git.recipe similarity index 100% rename from sys-fs/e2fsprogs/e2fsprogs-1.43_git rename to sys-fs/e2fsprogs/e2fsprogs-1.43_git.recipe diff --git a/sys-fs/e2fsprogs/patches/e2fsprogs-1.43-git.patch b/sys-fs/e2fsprogs/patches/e2fsprogs-1.43_git.patch similarity index 100% rename from sys-fs/e2fsprogs/patches/e2fsprogs-1.43-git.patch rename to sys-fs/e2fsprogs/patches/e2fsprogs-1.43_git.patch diff --git a/www-client/netsurf/netsurf-2.7_svn b/www-client/netsurf/netsurf-2.7_svn.recipe similarity index 100% rename from www-client/netsurf/netsurf-2.7_svn rename to www-client/netsurf/netsurf-2.7_svn.recipe diff --git a/x11-libs/libX11/libX11.OptionalPackageDescription b/x11-libs/libX11/libX11.OptionalPackageDescription deleted file mode 100644 index 0c9217176..000000000 --- a/x11-libs/libX11/libX11.OptionalPackageDescription +++ /dev/null @@ -1,65 +0,0 @@ -Package: libx11 -Version: 1.3.3 -Copyright: 2009 X.Org Foundation -License: MIT -URL: http://www.x.org/releases/individual/lib/ - -Package: util-macros -Version: 1.7.0 -Copyright: 2005-2006 Sun Microsystems, Inc. 2009 X.Org Foundation. -License: MIT -URL: http://www.x.org/releases/individual/util/ - -Package: xproto -Version: 7.0.16 -Copyright: 2009 X.Org Foundation -License: MIT -URL: http://xorg.freedesktop.org/releases/individual/proto/ - -Package: inputproto -Version: 2.0 -Copyright: 2009 X.Org Foundation -License: MIT -URL: http://xorg.freedesktop.org/releases/individual/proto/ - -Package: kbproto -Version: 1.0.4 -Copyright: 2009 X.Org Foundation -License: MIT -URL: http://xorg.freedesktop.org/releases/individual/proto/ - -Package: xtrans -Version: 1.2.5 -Copyright: 2009 X.Org Foundation -License: MIT -URL: http://xorg.freedesktop.org/releases/individual/lib/ - -Package: libxcb -Version: 1.6 -Copyright: 2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett. -License: MIT -URL: http://xcb.freedesktop.org - -Package: xcb-proto -Version: 1.6 -Copyright: 2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett. -License: MIT -URL: http://xcb.freedesktop.org - -Package: libxslt -Version: 1.1.24 -Copyright: 2001-2002 Daniel Veillard. -License: MIT -URL: http://xmlsoft.org/XSLT/ - -Package: libptread-stubs -Version: 0.3 -Copyright: 2001-2006 Bart Massey, Jamey Sharp, and Josh Triplett. -License: MIT -URL: http://xcb.freedesktop.org - -Package: libxau -Version: 1.0.5 -Copyright: 2009 X.Org Foundation -License: MIT -URL: http://xorg.freedesktop.org/releases/individual/lib/ diff --git a/x11-libs/pixman/patches/pixman-0.19-master.patch b/x11-libs/pixman/patches/pixman-0.19_master.patch similarity index 100% rename from x11-libs/pixman/patches/pixman-0.19-master.patch rename to x11-libs/pixman/patches/pixman-0.19_master.patch diff --git a/x11-libs/pixman/patches/pixman-patch-2009-03-06.diff b/x11-libs/pixman/patches/pixman-patch-2009-03-06.diff deleted file mode 100644 index a40ebecad..000000000 --- a/x11-libs/pixman/patches/pixman-patch-2009-03-06.diff +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/autogen.sh b/autogen.sh -index 904cd67..354f254 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -9,4 +9,4 @@ cd $srcdir - autoreconf -v --install || exit 1 - cd $ORIGDIR || exit $? - --$srcdir/configure --enable-maintainer-mode "$@" -+$srcdir/configure "$@" diff --git a/x11-libs/pixman/pixman-0.19_master b/x11-libs/pixman/pixman-0.19_master.recipe similarity index 100% rename from x11-libs/pixman/pixman-0.19_master rename to x11-libs/pixman/pixman-0.19_master.recipe diff --git a/x11-misc/shared_mime_info/shared_mime_info-1.0 b/x11-misc/shared_mime_info/shared_mime_info-1.0.recipe similarity index 100% rename from x11-misc/shared_mime_info/shared_mime_info-1.0 rename to x11-misc/shared_mime_info/shared_mime_info-1.0.recipe diff --git a/x11-misc/util_macros/util_macros-1.17.0_git b/x11-misc/util_macros/util_macros-1.17.0_git.recipe similarity index 100% rename from x11-misc/util_macros/util_macros-1.17.0_git rename to x11-misc/util_macros/util_macros-1.17.0_git.recipe diff --git a/x11-misc/util_macros/util_macros-1.7.0 b/x11-misc/util_macros/util_macros-1.7.0.recipe similarity index 100% rename from x11-misc/util_macros/util_macros-1.7.0 rename to x11-misc/util_macros/util_macros-1.7.0.recipe diff --git a/x11-proto/xcb_proto/xcb_proto-1.6 b/x11-proto/xcb_proto/xcb_proto-1.6.recipe similarity index 100% rename from x11-proto/xcb_proto/xcb_proto-1.6 rename to x11-proto/xcb_proto/xcb_proto-1.6.recipe diff --git a/x11-proto/xproto/patches/xproto-7.0.23-git.patch b/x11-proto/xproto/patches/xproto-7.0.23_git.patch similarity index 100% rename from x11-proto/xproto/patches/xproto-7.0.23-git.patch rename to x11-proto/xproto/patches/xproto-7.0.23_git.patch diff --git a/x11-proto/xproto/xproto-7.0.23_git b/x11-proto/xproto/xproto-7.0.23_git.recipe similarity index 100% rename from x11-proto/xproto/xproto-7.0.23_git rename to x11-proto/xproto/xproto-7.0.23_git.recipe From 2ec772818f8a55f340b81bd9d3364caca9b7f5d1 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 24 Aug 2013 16:34:31 -0700 Subject: [PATCH 434/587] Fixed recipe for nasm so that it builds now --- dev-lang/nasm/nasm-2.08.01.recipe | 39 +++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/dev-lang/nasm/nasm-2.08.01.recipe b/dev-lang/nasm/nasm-2.08.01.recipe index b4264decb..6c7a54ba6 100644 --- a/dev-lang/nasm/nasm-2.08.01.recipe +++ b/dev-lang/nasm/nasm-2.08.01.recipe @@ -1,21 +1,40 @@ -DESCRIPTION="nasm assembler" +SUMMARY="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" +LICENSE="BSD (2-clause)" +COPYRIGHT="1996 Simon Tatham and Julian Hall." REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + nasm = $portVersion compat >= 1 + cmd:nasm = $portVersion compat >= 1 + cmd:ndisasm = $portVersion compat >= 1 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES="" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd nasm-2.08.01 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd nasm-2.08.01 - make install INSTALLROOT=${DESTDIR} + make install } -LICENSE="BSD (2-clause)" -COPYRIGHT="1996 Simon Tatham and Julian Hall." From bbff6ba0613be6f5e3018f8e11e0db5e19a790e7 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 24 Aug 2013 18:03:58 -0700 Subject: [PATCH 435/587] WIP version of gogo_no_coda It is bailing out somewhere after getting patched, but I can't tell where since the error message is very cryptic and long. --- .../gogo_no_coda/gogo_no_coda-3.13.recipe | 36 +++++++++++++------ .../patches/gogo_no_coda-3.13.patch | 2 +- 2 files changed, 27 insertions(+), 11 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 21443ce70..b6391eff5 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,23 +1,39 @@ +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." HOMEPAGE="https://github.com/teragonaudio/gogo-no-coda" SRC_URI="https://github.com/teragonaudio/gogo-no-coda/archive/master.zip" -CHECKSUM_MD5="b60ae82f7fc70cbefd2e4003b9e13c8f" +CHECKSUM_MD5="7b3008a0aba2578a2b428ba538452e87" +LICENSE="GNU LGPL v2" +COPYRIGHT="2001-2003 Respective gogo-no-coda creators" REVISION="1" -STATUS_HAIKU="stable" -MESSAGE="This port only builds with gcc2. Use 'setgcc gcc2' before building." -DEPEND="dev-lang/nasm" +ARCHITECTURES="?x86 x86_gcc2" + +PATCHES="gogo-no-coda-3.13.patch" + +PROVIDES=" + gogo_enc = $portVersion compat >= 1 + " +REQUIRES="haiku >= $haikuVersion" + +BUILD_REQUIRES="haiku >= $haikuVersion" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:make + cmd:nasm + " + + +SOURCE_DIR="gogo-no-coda-master" BUILD() { - cd gogo-no-coda-master/linux - make + cd linux + make linux $jobArgs } INSTALL() { - cd gogo-no-coda-master/linux - make install prefix=`finddir B_COMMON_DIRECTORY` + make install $jobArgs } -LICENSE="GNU LGPL v2" -COPYRIGHT="2001-2003 Respective gogo-no-coda creators" diff --git a/media-sound/gogo_no_coda/patches/gogo_no_coda-3.13.patch b/media-sound/gogo_no_coda/patches/gogo_no_coda-3.13.patch index 09dd4e49e..41d4e1716 100644 --- a/media-sound/gogo_no_coda/patches/gogo_no_coda-3.13.patch +++ b/media-sound/gogo_no_coda/patches/gogo_no_coda-3.13.patch @@ -55,7 +55,7 @@ diff -Naur gogo-no-coda-master/linux/Makefile gogo-no-coda-master-haiku/linux/Ma ####################################################### TARGET = gogo -+prefix = ++prefix = +BINDIR = $(prefix)/bin ####################################################### From 722c23d9fd6d10b8b8c6a5332ef1e3aa6de66999 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 26 Aug 2013 10:26:42 +0200 Subject: [PATCH 436/587] Fix PATCHES of gogo_no_coda recipe. --- media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 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 b6391eff5..f61712b9e 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 @@ -8,7 +8,7 @@ COPYRIGHT="2001-2003 Respective gogo-no-coda creators" REVISION="1" ARCHITECTURES="?x86 x86_gcc2" -PATCHES="gogo-no-coda-3.13.patch" +PATCHES="gogo_no_coda-3.13.patch" PROVIDES=" gogo_enc = $portVersion compat >= 1 @@ -29,7 +29,7 @@ SOURCE_DIR="gogo-no-coda-master" BUILD() { cd linux - make linux $jobArgs + make $jobArgs } INSTALL() From 4f74a743c47f78a04ae2fea8a59ab62318e318a3 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 26 Aug 2013 11:25:41 +0200 Subject: [PATCH 437/587] Wrestle gogo_no_coda recipe into a somewhat working state. * the build runs through, but I haven't tested the binary at all --- media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe | 6 +++++- 1 file changed, 5 insertions(+), 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 f61712b9e..f1293900c 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 @@ -19,6 +19,8 @@ BUILD_REQUIRES="haiku >= $haikuVersion" BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld cmd:make cmd:nasm " @@ -34,6 +36,8 @@ BUILD() INSTALL() { - make install $jobArgs + cd linux + mkdir $prefix/bin + make install prefix=$prefix } From 4bee427fb9a7d6e288fc0ba39e74a1d94625f151 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 27 Aug 2013 01:30:09 -0700 Subject: [PATCH 438/587] Mostly working recipe for lame-3.99.5, the additional-files can go away once the libs that the .m4 files come from get proper recipes written. Also the sed hacking can probably be done in a cleaner way, but it works for now. --- media-sound/lame/additional-files/gtk.m4 | 194 +++++ media-sound/lame/additional-files/lib-ld.m4 | 109 +++ media-sound/lame/additional-files/lib-link.m4 | 764 ++++++++++++++++++ .../lame/additional-files/lib-prefix.m4 | 224 +++++ media-sound/lame/lame-3.98.4.recipe | 28 - media-sound/lame/lame-3.99.5.recipe | 95 +++ media-sound/lame/lame-3.99.recipe | 28 - media-sound/lame/patches/lame-3.99.5.patch | 13 + 8 files changed, 1399 insertions(+), 56 deletions(-) create mode 100644 media-sound/lame/additional-files/gtk.m4 create mode 100644 media-sound/lame/additional-files/lib-ld.m4 create mode 100644 media-sound/lame/additional-files/lib-link.m4 create mode 100644 media-sound/lame/additional-files/lib-prefix.m4 delete mode 100644 media-sound/lame/lame-3.98.4.recipe create mode 100644 media-sound/lame/lame-3.99.5.recipe delete mode 100644 media-sound/lame/lame-3.99.recipe create mode 100644 media-sound/lame/patches/lame-3.99.5.patch diff --git a/media-sound/lame/additional-files/gtk.m4 b/media-sound/lame/additional-files/gtk.m4 new file mode 100644 index 000000000..f2dd47219 --- /dev/null +++ b/media-sound/lame/additional-files/gtk.m4 @@ -0,0 +1,194 @@ +# Configure paths for GTK+ +# Owen Taylor 97-11-3 + +dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS +dnl +AC_DEFUN([AM_PATH_GTK], +[dnl +dnl Get the cflags and libraries from the gtk-config script +dnl +AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], + gtk_config_prefix="$withval", gtk_config_prefix="") +AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], + gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") +AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], + , enable_gtktest=yes) + + for module in . $4 + do + case "$module" in + gthread) + gtk_config_args="$gtk_config_args gthread" + ;; + esac + done + + if test x$gtk_config_exec_prefix != x ; then + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config + fi + fi + if test x$gtk_config_prefix != x ; then + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_prefix/bin/gtk-config + fi + fi + + AC_PATH_PROG(GTK_CONFIG, gtk-config, no) + min_gtk_version=ifelse([$1], ,0.99.7,$1) + AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) + no_gtk="" + if test "$GTK_CONFIG" = "no" ; then + no_gtk=yes + else + GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` + GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` + gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_gtktest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$GTK_LIBS $LIBS" +dnl +dnl Now check if the installed GTK is sufficiently new. (Also sanity +dnl checks the results of gtk-config to some extent +dnl + rm -f conf.gtktest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.gtktest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_gtk_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gtk_version"); + exit(1); + } + + if ((gtk_major_version != $gtk_config_major_version) || + (gtk_minor_version != $gtk_config_minor_version) || + (gtk_micro_version != $gtk_config_micro_version)) + { + printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf ("*** was found! If gtk-config was correct, then it is best\n"); + printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); + printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } +#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) + { + printf("*** GTK+ header files (version %d.%d.%d) do not match\n", + GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + } +#endif /* defined (GTK_MAJOR_VERSION) ... */ + else + { + if ((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); + printf("*** correct copy of gtk-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_gtk" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$GTK_CONFIG" = "no" ; then + echo "*** The gtk-config script installed by GTK could not be found" + echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the GTK_CONFIG environment variable to the" + echo "*** full path to gtk-config." + else + if test -f conf.gtktest ; then + : + else + echo "*** Could not run GTK test program, checking why..." + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GTK or finding the wrong" + echo "*** version of GTK. If it is not finding GTK, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" + echo "***" + echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" + echo "*** came with the system with the command" + echo "***" + echo "*** rpm --erase --nodeps gtk gtk-devel" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GTK was incorrectly installed" + echo "*** or that you have moved GTK since it was installed. In the latter case, you" + echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GTK_CFLAGS="" + GTK_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + rm -f conf.gtktest +]) diff --git a/media-sound/lame/additional-files/lib-ld.m4 b/media-sound/lame/additional-files/lib-ld.m4 new file mode 100644 index 000000000..ae003f7c5 --- /dev/null +++ b/media-sound/lame/additional-files/lib-ld.m4 @@ -0,0 +1,109 @@ +# lib-ld.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 1996-2003, 2009-2011 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl Subroutines of libtool.m4, +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision +dnl with libtool.m4. + +dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. +AC_DEFUN([AC_LIB_PROG_LD_GNU], +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +case `$LD -v 2>&1 /dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } +fi +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by GCC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]* | [A-Za-z]:[\\/]*)] + [re_direlt='/[^/][^/]*/\.\./'] + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL([acl_cv_path_LD], +[if test -z "$LD"; then + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + *GNU* | *'with BFD'*) + test "$with_gnu_ld" != no && break ;; + *) + test "$with_gnu_ld" != yes && break ;; + esac + fi + done + IFS="$ac_save_ifs" +else + acl_cv_path_LD="$LD" # Let the user override the test with a path. +fi]) +LD="$acl_cv_path_LD" +if test -n "$LD"; then + AC_MSG_RESULT([$LD]) +else + AC_MSG_RESULT([no]) +fi +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +AC_LIB_PROG_LD_GNU +]) diff --git a/media-sound/lame/additional-files/lib-link.m4 b/media-sound/lame/additional-files/lib-link.m4 new file mode 100644 index 000000000..2f8b7ff38 --- /dev/null +++ b/media-sound/lame/additional-files/lib-link.m4 @@ -0,0 +1,764 @@ +# lib-link.m4 serial 20 (gettext-0.18) +dnl Copyright (C) 2001-2009 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +AC_PREREQ([2.54]) + +dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and +dnl augments the CPPFLAGS variable. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. +AC_DEFUN([AC_LIB_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + ac_cv_lib[]Name[]_libs="$LIB[]NAME" + ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" + ac_cv_lib[]Name[]_cppflags="$INC[]NAME" + ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" + ]) + LIB[]NAME="$ac_cv_lib[]Name[]_libs" + LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" + INC[]NAME="$ac_cv_lib[]Name[]_cppflags" + LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + AC_SUBST([LIB]NAME[_PREFIX]) + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the + dnl results of this search when this library appears as a dependency. + HAVE_LIB[]NAME=yes + popdef([NAME]) + popdef([Name]) +]) + +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message]) +dnl searches for libname and the libraries corresponding to explicit and +dnl implicit dependencies, together with the specified include files and +dnl the ability to compile and link the specified testcode. The missing-message +dnl defaults to 'no' and may contain additional hints for the user. +dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} +dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + + dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, + dnl because if the user has installed lib[]Name and not disabled its use + dnl via --without-lib[]Name-prefix, he wants to use it. + ac_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ + ac_save_LIBS="$LIBS" + LIBS="$LIBS $LIB[]NAME" + AC_TRY_LINK([$3], [$4], + [ac_cv_lib[]Name=yes], + [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) + LIBS="$ac_save_LIBS" + ]) + if test "$ac_cv_lib[]Name" = yes; then + HAVE_LIB[]NAME=yes + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.]) + AC_MSG_CHECKING([how to link with lib[]$1]) + AC_MSG_RESULT([$LIB[]NAME]) + else + HAVE_LIB[]NAME=no + dnl If $LIB[]NAME didn't lead to a usable library, we don't need + dnl $INC[]NAME either. + CPPFLAGS="$ac_save_CPPFLAGS" + LIB[]NAME= + LTLIB[]NAME= + LIB[]NAME[]_PREFIX= + fi + AC_SUBST([HAVE_LIB]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + AC_SUBST([LIB]NAME[_PREFIX]) + popdef([NAME]) + popdef([Name]) +]) + +dnl Determine the platform dependent parameters needed to use rpath: +dnl acl_libext, +dnl acl_shlibext, +dnl acl_hardcode_libdir_flag_spec, +dnl acl_hardcode_libdir_separator, +dnl acl_hardcode_direct, +dnl acl_hardcode_minus_L. +AC_DEFUN([AC_LIB_RPATH], +[ + dnl Tell automake >= 1.10 to complain if config.rpath is missing. + m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) + AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir + AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + ]) + wl="$acl_cv_wl" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" + dnl Determine whether the user wants rpath handling at all. + AC_ARG_ENABLE([rpath], + [ --disable-rpath do not hardcode runtime library paths], + :, enable_rpath=yes) +]) + +dnl AC_LIB_FROMPACKAGE(name, package) +dnl declares that libname comes from the given package. The configure file +dnl will then not have a --with-libname-prefix option but a +dnl --with-package-prefix option. Several libraries can come from the same +dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar +dnl macro call that searches for libname. +AC_DEFUN([AC_LIB_FROMPACKAGE], +[ + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_frompackage_]NAME, [$2]) + popdef([NAME]) + pushdef([PACK],[$2]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_libsinpackage_]PACKUP, + m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) + popdef([PACKUP]) + popdef([PACK]) +]) + +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. +AC_DEFUN([AC_LIB_LINKFLAGS_BODY], +[ + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) + dnl Autoconf >= 2.61 supports dots in --with options. + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_ARG_WITH(P_A_C_K[-prefix], +[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib + --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi + fi + fi +]) + dnl Search the library and its dependencies in $additional_libdir and + dnl $LDFLAGS. Using breadth-first-seach. + LIB[]NAME= + LTLIB[]NAME= + INC[]NAME= + LIB[]NAME[]_PREFIX= + dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been + dnl computed. So it has to be reset here. + HAVE_LIB[]NAME= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='$1 $2' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS + dnl or AC_LIB_HAVE_LINKFLAGS call. + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" + else + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined + dnl that this library doesn't exist. So just drop it. + : + fi + else + dnl Search the library lib$name in $additional_libdir and $LDFLAGS + dnl and the already constructed $LIBNAME/$LTLIBNAME. + found_dir= + found_la= + found_so= + found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi + if test $use_additional = yes; then + dir="$additional_libdir" + dnl The same code as in the loop below: + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + dnl Found the library. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + dnl Linking with a shared library. We attempt to hardcode its + dnl directory into the executable's runpath, unless it's the + dnl standard /usr/lib. + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then + dnl No hardcoding is needed. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + dnl The hardcoding into $LIBNAME is system dependent. + if test "$acl_hardcode_direct" = yes; then + dnl Using DIR/libNAME.so during linking hardcodes DIR into the + dnl resulting binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + dnl Rely on "-L$found_dir". + dnl But don't add it if it's already contained in the LDFLAGS + dnl or the already constructed $LIBNAME + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" + fi + if test "$acl_hardcode_minus_L" != no; then + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH + dnl here, because this doesn't fit in flags passed to the + dnl compiler. So give up. No hardcoding. This affects only + dnl very old systems. + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + dnl Linking with a static library. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" + else + dnl We shouldn't come here, but anyway it's good to have a + dnl fallback. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" + fi + fi + dnl Assume the include files are nearby. + additional_includedir= + case "$found_dir" in + */$acl_libdirstem | */$acl_libdirstem/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + dnl Potentially add $additional_includedir to $INCNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's /usr/local/include and we are using GCC on Linux, + dnl 3. if it's already present in $CPPFLAGS or the already + dnl constructed $INCNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INC[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $INCNAME. + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + dnl Look for dependencies. + if test -n "$found_la"; then + dnl Read the .la file. It defines the variables + dnl dlname, library_names, old_library, dependency_libs, current, + dnl age, revision, installed, dlopen, dlpreopen, libdir. + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + dnl We use only dependency_libs. + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's /usr/local/lib and we are using GCC on Linux, + dnl 3. if it's already present in $LDFLAGS or the already + dnl constructed $LIBNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LIBNAME. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LTLIBNAME. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + dnl Handle this in the next round. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + dnl Handle this in the next round. Throw away the .la's + dnl directory; it is already contained in a preceding -L + dnl option. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + dnl Most likely an immediate library name. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" + ;; + esac + done + fi + else + dnl Didn't find the library; assume it is in the system directories + dnl known to the linker and runtime loader. (All the system + dnl directories known to the linker should also be known to the + dnl runtime loader, otherwise the system is severely misconfigured.) + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$acl_hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user must + dnl pass all path elements in one option. We can arrange that for a + dnl single library, but not when more than one $LIBNAMEs are used. + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + done + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + else + dnl The -rpath options are cumulative. + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + dnl When using libtool, the option that works for both libraries and + dnl executables is -R. The -R options are cumulative. + for found_dir in $ltrpathdirs; do + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" + done + fi + popdef([P_A_C_K]) + popdef([PACKLIBS]) + popdef([PACKUP]) + popdef([PACK]) + popdef([NAME]) +]) + +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, +dnl unless already present in VAR. +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes +dnl contains two or three consecutive elements that belong together. +AC_DEFUN([AC_LIB_APPENDTOVAR], +[ + for element in [$2]; do + haveit= + for x in $[$1]; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + [$1]="${[$1]}${[$1]:+ }$element" + fi + done +]) + +dnl For those cases where a variable contains several -L and -l options +dnl referring to unknown libraries and directories, this macro determines the +dnl necessary additional linker options for the runtime path. +dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) +dnl sets LDADDVAR to linker options needed together with LIBSVALUE. +dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, +dnl otherwise linking without libtool is assumed. +AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], +[ + AC_REQUIRE([AC_LIB_RPATH]) + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + $1= + if test "$enable_rpath" != no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode directories into the resulting + dnl binary. + rpathdirs= + next= + for opt in $2; do + if test -n "$next"; then + dir="$next" + dnl No need to hardcode the standard /usr/lib. + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then + rpathdirs="$rpathdirs $dir" + fi + next= + else + case $opt in + -L) next=yes ;; + -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` + dnl No need to hardcode the standard /usr/lib. + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then + rpathdirs="$rpathdirs $dir" + fi + next= ;; + *) next= ;; + esac + fi + done + if test "X$rpathdirs" != "X"; then + if test -n ""$3""; then + dnl libtool is used for linking. Use -R options. + for dir in $rpathdirs; do + $1="${$1}${$1:+ }-R$dir" + done + else + dnl The linker is used for linking directly. + if test -n "$acl_hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user + dnl must pass all path elements in one option. + alldirs= + for dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + $1="$flag" + else + dnl The -rpath options are cumulative. + for dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + $1="${$1}${$1:+ }$flag" + done + fi + fi + fi + fi + fi + AC_SUBST([$1]) +]) diff --git a/media-sound/lame/additional-files/lib-prefix.m4 b/media-sound/lame/additional-files/lib-prefix.m4 new file mode 100644 index 000000000..4b7ee3358 --- /dev/null +++ b/media-sound/lame/additional-files/lib-prefix.m4 @@ -0,0 +1,224 @@ +# lib-prefix.m4 serial 7 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008-2009 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and +dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't +dnl require excessive bracketing. +ifdef([AC_HELP_STRING], +[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], +[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) + +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed +dnl to access previously installed libraries. The basic assumption is that +dnl a user will want packages to use other packages he previously installed +dnl with the same --prefix option. +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate +dnl libraries, but is otherwise very convenient. +AC_DEFUN([AC_LIB_PREFIX], +[ + AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_LIB_ARG_WITH([lib-prefix], +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib + --without-lib-prefix don't search for libraries in includedir and libdir], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + fi + fi +]) + if test $use_additional = yes; then + dnl Potentially add $additional_includedir to $CPPFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's already present in $CPPFLAGS, + dnl 3. if it's /usr/local/include and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + for x in $CPPFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $CPPFLAGS. + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" + fi + fi + fi + fi + dnl Potentially add $additional_libdir to $LDFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's already present in $LDFLAGS, + dnl 3. if it's /usr/local/lib and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + haveit= + for x in $LDFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LDFLAGS. + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" + fi + fi + fi + fi + fi +]) + +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, +dnl acl_final_exec_prefix, containing the values to which $prefix and +dnl $exec_prefix will expand at the end of the configure script. +AC_DEFUN([AC_LIB_PREPARE_PREFIX], +[ + dnl Unfortunately, prefix and exec_prefix get only finally determined + dnl at the end of configure. + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_save_prefix" +]) + +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the +dnl variables prefix and exec_prefix bound to the values they will have +dnl at the end of the configure script. +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], +[ + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + $1 + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" +]) + +dnl AC_LIB_PREPARE_MULTILIB creates +dnl - a variable acl_libdirstem, containing the basename of the libdir, either +dnl "lib" or "lib64" or "lib/64", +dnl - a variable acl_libdirstem2, as a secondary possible value for +dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or +dnl "lib/amd64". +AC_DEFUN([AC_LIB_PREPARE_MULTILIB], +[ + dnl There is no formal standard regarding lib and lib64. + dnl On glibc systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine + dnl the compiler's default mode by looking at the compiler's library search + dnl path. If at least one of its elements ends in /lib64 or points to a + dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. + dnl Otherwise we use the default, namely "lib". + dnl On Solaris systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. + AC_REQUIRE([AC_CANONICAL_HOST]) + acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl . + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. + AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], + [AC_EGREP_CPP([sixtyfour bits], [ +#ifdef _LP64 +sixtyfour bits +#endif + ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) + ]) + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; + esac + fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" +]) diff --git a/media-sound/lame/lame-3.98.4.recipe b/media-sound/lame/lame-3.98.4.recipe deleted file mode 100644 index 232777e1f..000000000 --- a/media-sound/lame/lame-3.98.4.recipe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="LAME Ain't an MP3 Encoder" -HOMEPAGE="http://lame.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.98.4/lame-3.98.4.tar.gz" -CHECKSUM_MD5="8e9866ad6b570c6c95c8cba48060473f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd lame-3.98.4 - mkdir -p m4 -# configure checks for gtk, but they didn't include the gtk.m4 so we need to. - cp ../../patches/gtk.m4 m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in - libtoolize --force --copy --install - aclocal -I m4 - autoconf --warnings=none - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --without-gtk - make -} - -INSTALL() -{ - cd lame-3.98.4 - make install -} -LICENSE="GNU LGPL v2" -COPYRIGHT="1998-2010 Mike Cheng et al." diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe new file mode 100644 index 000000000..2c21a6b63 --- /dev/null +++ b/media-sound/lame/lame-3.99.5.recipe @@ -0,0 +1,95 @@ +SUMMARY="LAME Ain't an MP3 Encoder" +DESCRIPTION="LAME Ain't an MP3 Encoder" +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" +LICENSE="GNU LGPL v2" +COPYRIGHT="1998-2012 Mike Cheng et al." +REVISION="1" +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + lame = $portVersion compat >= 1 + cmd:lame = $portVersion compat >= 1 + lib:libmp3lame = $portVersion compat >= 0.0.0 + devel:libmp3lame = $portVersion compat >= 1 + " +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc +# cmd:gettext + cmd:ld + cmd:libtoolize + cmd:make + cmd:m4 + cmd:sed + lib:libiconv$secondaryArchSuffic >= 2 + devel:libiconv + " + +PATCHES="lame-3.99.5.patch" +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + mkdir -p m4 +# configure checks for gtk, but they didn't include the gtk.m4 so we need to. + cp $portDir/additional-files/gtk.m4 m4/gtk.m4 + cp `aclocal --print-ac-dir`/iconv.m4 m4/iconv.m4 + cp $portDir/additional-files/lib-link.m4 m4/lib-link.m4 + cp $portDir/additional-files/lib-ld.m4 m4/lib-ld.m4 + cp $portDir/additional-files/lib-prefix.m4 m4/lib-prefix.m4 + + sed -i 's/AM_C_PROTOTYPES//' configure.in + sed -i 's/AUTOMAKE_OPTIONS = foreign $(top_srcdir)\/ansi2knr//' \ + libmp3lame/i386/Makefile.am + sed -i 's/AUTOMAKE_OPTIONS = foreign ansi2knr//' \ + doc/man/Makefile.am + sed -i 's/AUTOMAKE_OPTIONS = foreign ansi2knr//' \ + doc/html/Makefile.am + sed -i 's/HAVE_SNDFILE="yes"/HAVE_SNDFILE="no"/g' configure.in + sed -i 's/PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.2, HAVE_SNDFILE="no", HAVE_SNDFILE="no")/HAVE_SNDFILE="no"/' configure.in + sed -i 's/@SNDFILE_CFLAGS@/-ffast-math/g' frontend/* + sed -i 's/@SNDFILE_LIBS@/-ffast-math/g' frontend/* + + libtoolize --force --copy --install + aclocal -I m4 + automake + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install $jobArgs + + # prepare devel/lib + prepareInstalledDevelLibs libmp3lame + fixPkgconfig + + # devel package + packageEntries devel \ + $binDir/lame \ + $developDir \ + $manDir/man1 +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + lame_devel = $portVersion + cmd:lame = $portVersion compat >= 3 + lib:libmp3lame = $portVersion compat >= 0.0.0 + devel:libmp3lame = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + libmp3lame == $portVersion base + lib:libiconv >= 2 + lib:libroot >= $haikuVersion + " + diff --git a/media-sound/lame/lame-3.99.recipe b/media-sound/lame/lame-3.99.recipe deleted file mode 100644 index 079bb19ce..000000000 --- a/media-sound/lame/lame-3.99.recipe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="LAME Ain't an MP3 Encoder" -HOMEPAGE="http://lame.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.tar.gz" -CHECKSUM_MD5="7abacd1d0a65a63733335786015626db" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd lame-3.99 - mkdir -p m4 -# configure checks for gtk, but they didn't include the gtk.m4 so we need to. - cp ../../patches/gtk.m4 m4 - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.in - libtoolize --force --copy --install - aclocal -I m4 - autoconf --warnings=none - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --without-gtk - make -} - -INSTALL() -{ - cd lame-3.99 - make install -} -LICENSE="GNU LGPL v2" -COPYRIGHT="1998-2011 Mike Cheng et al." diff --git a/media-sound/lame/patches/lame-3.99.5.patch b/media-sound/lame/patches/lame-3.99.5.patch new file mode 100644 index 000000000..9973b6bf2 --- /dev/null +++ b/media-sound/lame/patches/lame-3.99.5.patch @@ -0,0 +1,13 @@ +diff -urN lame-3.99.5/configure.in lame-3.99.5-haiku/configure.in +--- lame-3.99.5/configure.in 2010-06-21 14:16:05.000000000 +0000 ++++ lame-3.99.5-haiku/configure.in 2010-06-21 15:12:31.000000000 +0000 +@@ -343,6 +343,9 @@ + *solaris*) + LIBS="$LIBS -lnsl" + ;; ++ *haiku*) ++ LIBS="$LIBS -lnetwork" ++ ;; + esac + fi + fi From aab5cf528b08d86b28c6f12ca493150b7941a9b7 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 27 Aug 2013 01:55:49 -0700 Subject: [PATCH 439/587] Updated ed recipe to add provides for cmd:red --- sys-apps/ed/ed-1.7.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/sys-apps/ed/ed-1.7.recipe b/sys-apps/ed/ed-1.7.recipe index 1f6e528df..1ce1ffa25 100644 --- a/sys-apps/ed/ed-1.7.recipe +++ b/sys-apps/ed/ed-1.7.recipe @@ -11,6 +11,7 @@ ARCHITECTURES="x86_gcc2 x86" PROVIDES=" ed = $portVersion compat >= 1 cmd:ed = $portVersion compat >= 1 + cmd:red = $portVersion compat >= 1 " REQUIRES=" haiku >= $haikuVersion From 3a0c487fe9aa18280c1920bbe4cbc87051a8298a Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 27 Aug 2013 08:13:54 -0700 Subject: [PATCH 440/587] Updated the description and summary for lame. --- media-sound/lame/lame-3.99.5.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe index 2c21a6b63..1ab59c9c1 100644 --- a/media-sound/lame/lame-3.99.5.recipe +++ b/media-sound/lame/lame-3.99.5.recipe @@ -1,5 +1,6 @@ -SUMMARY="LAME Ain't an MP3 Encoder" -DESCRIPTION="LAME Ain't an MP3 Encoder" +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." + 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" From c007321360bc2d7c677422516327f9a75e9229d0 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 27 Aug 2013 18:54:54 +0200 Subject: [PATCH 441/587] Re-enable source package for ca_root_certificates. * curl depends on the root certificates, so we need to build a source package for those in order to make them available in the bootstrap image --- .../ca_root_certificates/ca_root_certificates-2012_12_29.recipe | 1 - 1 file changed, 1 deletion(-) 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..1fdc82f82 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 @@ -11,7 +11,6 @@ SRC_URI="http://haiku-files.org/files/data/cacert_121229.pem#noarchive" CHECKSUM_MD5="47961e7ef15667c93cd99be01b51f00a" REVISION="1" ARCHITECTURES="any" -DISABLE_SOURCE_PACKAGE=yes PROVIDES=" ca_root_certificates = $portVersion From 065cdb5640efa691889e1954c18ad12362887a93 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 27 Aug 2013 21:13:49 -0700 Subject: [PATCH 442/587] First pass at fastdep. --- dev-util/fastdep/fastdep-0.16.recipe | 54 +++++++++++++++++++--------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/dev-util/fastdep/fastdep-0.16.recipe b/dev-util/fastdep/fastdep-0.16.recipe index dee98f264..9aebf221e 100644 --- a/dev-util/fastdep/fastdep-0.16.recipe +++ b/dev-util/fastdep/fastdep-0.16.recipe @@ -1,22 +1,44 @@ -DESCRIPTION="fastdep is a fast dependency generator for C/C++ files." +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." 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" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="838c08b790a5dfe9a50a4aec7947bc54" -BUILD() -{ - cd fastdep-0.16 - ./configure - make -} -INSTALL() -{ - cd fastdep-0.16 - mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` - cp -f fastdep ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` -} - LICENSE="GNU GPL v2" COPYRIGHT="2003 Bart Vanhauwaert" + +ARCHITECTURES="x86 x86_gcc2" + +PATCHES="fastdep-0.16.patch" + +PROVIDES=" + cmd:fastdep = $portVersion compat >= 0 + " + +REQUIRES=" + lib:libstdc++.r4 + lib:libroot >= $haikuVersion" + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:make + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + mkdir -p $binDir + cp -f fastdep $binDir +} + + From c59bbf6ac0bfdcc9a258db32731fb1777ee3e76c Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 27 Aug 2013 22:10:07 -0700 Subject: [PATCH 443/587] Added recipe for ccache-3.1.9, removed earlier versions. --- dev-util/ccache/ccache-3.0.1.recipe | 23 ------------------ dev-util/ccache/ccache-3.1.4.recipe | 24 ------------------- dev-util/ccache/ccache-3.1.7.recipe | 24 ------------------- dev-util/ccache/ccache-3.1.9.recipe | 37 +++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 71 deletions(-) delete mode 100644 dev-util/ccache/ccache-3.0.1.recipe delete mode 100644 dev-util/ccache/ccache-3.1.4.recipe delete mode 100644 dev-util/ccache/ccache-3.1.7.recipe create mode 100644 dev-util/ccache/ccache-3.1.9.recipe diff --git a/dev-util/ccache/ccache-3.0.1.recipe b/dev-util/ccache/ccache-3.0.1.recipe deleted file mode 100644 index c0b966fdc..000000000 --- a/dev-util/ccache/ccache-3.0.1.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="ccache is a fast compiler cache." -HOMEPAGE="http://ccache.samba.org/" -SRC_URI="http://samba.org/ftp/ccache/ccache-3.0.1.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="223449f7891e5d6a15b25100eca5cca4" -BUILD() -{ - cd ccache-3.0.1 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} -INSTALL() -{ - cd ccache-3.0.1 - make install -} - -LICENSE="GNU GPL v3" -COPYRIGHT="2002-2007 Andrew Tridgell - 2009-2010 Joel Rosdahl" diff --git a/dev-util/ccache/ccache-3.1.4.recipe b/dev-util/ccache/ccache-3.1.4.recipe deleted file mode 100644 index 430dbcedc..000000000 --- a/dev-util/ccache/ccache-3.1.4.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="ccache is a fast compiler cache." -HOMEPAGE="http://ccache.samba.org/" -SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.4.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="676fda8a9a5e02574435c32b22942abd" -BUILD() -{ - cd ccache-3.1.4 - sed -i 's/\-lm//g' Ma* - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} -INSTALL() -{ - cd ccache-3.1.4 - make install -} - -LICENSE="GNU GPL v3" -COPYRIGHT="2002-2007 Andrew Tridgell - 2009-2011 Joel Rosdahl" diff --git a/dev-util/ccache/ccache-3.1.7.recipe b/dev-util/ccache/ccache-3.1.7.recipe deleted file mode 100644 index a999d612c..000000000 --- a/dev-util/ccache/ccache-3.1.7.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="ccache is a fast compiler cache." -HOMEPAGE="http://ccache.samba.org/" -SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.7.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="82257745eac54826527946e9e3d046f4" -BUILD() -{ - cd ccache-3.1.7 - sed -i 's/\-lm//g' Ma* - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - make -} -INSTALL() -{ - cd ccache-3.1.7 - make install -} - -LICENSE="GNU GPL v3" -COPYRIGHT="2002-2007 Andrew Tridgell - 2009-2012 Joel Rosdahl" diff --git a/dev-util/ccache/ccache-3.1.9.recipe b/dev-util/ccache/ccache-3.1.9.recipe new file mode 100644 index 000000000..3ab1af323 --- /dev/null +++ b/dev-util/ccache/ccache-3.1.9.recipe @@ -0,0 +1,37 @@ +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++." +HOMEPAGE="http://ccache.samba.org/" +SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.9.tar.bz2" +REVISION="1" + +LICENSE="GNU GPL v3" +COPYRIGHT="2002-2007 Andrew Tridgell + 2009-2013 Joel Rosdahl" + +CHECKSUM_MD5="65f48376a91d3651d6527ca568858be8" + +ARCHITECTURES="x86 x86_gcc2" +PROVIDES=" + cmd:ccache + " +REQUIRES=" + lib:libroot >= $haikuVersion + lib:libz >= 1 + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:make + " + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install +} From 04be3879c92625e4d5b8278d73b5598afc28c684 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 28 Aug 2013 01:11:13 -0700 Subject: [PATCH 444/587] First pass at libao. TODO: Fix POLICY WARNING: Invalid top-level package entry "include" --- media-libs/libao/libao-1.0.0.recipe | 89 +++++++++++++++++++++-------- 1 file changed, 64 insertions(+), 25 deletions(-) diff --git a/media-libs/libao/libao-1.0.0.recipe b/media-libs/libao/libao-1.0.0.recipe index 83b3ba5f3..c6bab0121 100644 --- a/media-libs/libao/libao-1.0.0.recipe +++ b/media-libs/libao/libao-1.0.0.recipe @@ -1,32 +1,9 @@ -DESCRIPTION="Libao is a cross-platform audio library" +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" HOMEPAGE="http://xiph.org/ao/" SRC_URI="http://downloads.xiph.org/releases/ao/libao-1.0.0.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="08283fbe1f587619053a156254afecec" -BUILD() -{ - cd libao-1.0.0 - libtoolize --force --copy --install - aclocal - autoconf - automake - sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --datarootdir=$COMMON_DOCS \ - --mandir=$COMMON_DOCS/man - make -} -INSTALL() -{ - cd libao-1.0.0 - make install -} LICENSE="GNU GPL v2" COPYRIGHT="1999 Aaron Holtzman 2000 Rik Hemsley @@ -38,4 +15,66 @@ COPYRIGHT="1999 Aaron Holtzman 2008 Alexandre Ratchov 2008-2010 Philipp 'ph3-der-loewe' Schafft 2010 2010 Monty" + +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libao$secondaryArchSuffix = $portVersion + lib:libao$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + + + + +BUILD() +{ +# sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' M* + libtoolize --force --copy --install + aclocal + autoconf + automake + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs libao + fixPkgconfig + + # devel package + packageEntries devel \ + $dataDir \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libao${secondaryArchSuffix}_devel = $portVersion + devel:libao$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + libao$secondaryArchSuffix == $portVersion + " + From 7c86b9a2a5efe2f1a26af5054d8f31df817b80ef Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 28 Aug 2013 03:00:28 -0700 Subject: [PATCH 445/587] Fixed include dir issue --- media-libs/libao/libao-1.0.0.recipe | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/media-libs/libao/libao-1.0.0.recipe b/media-libs/libao/libao-1.0.0.recipe index c6bab0121..11ea615ae 100644 --- a/media-libs/libao/libao-1.0.0.recipe +++ b/media-libs/libao/libao-1.0.0.recipe @@ -60,6 +60,10 @@ INSTALL() make install prepareInstalledDevelLibs libao fixPkgconfig + + # move include dir to correct location + mkdir -p $(dirname $includeDir) + mv $prefix/include $includeDir # devel package packageEntries devel \ From ff70ff4a1e35d83a8027323201fb1591f84fdf82 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 28 Aug 2013 06:52:19 -0700 Subject: [PATCH 446/587] First pass at libmodplug --- media-libs/libmodplug/libmodplug-0.8.7.recipe | 30 ------- .../libmodplug/libmodplug-0.8.8.1.recipe | 31 ------- .../libmodplug/libmodplug-0.8.8.4.recipe | 83 ++++++++++++++++--- 3 files changed, 70 insertions(+), 74 deletions(-) delete mode 100644 media-libs/libmodplug/libmodplug-0.8.7.recipe delete mode 100644 media-libs/libmodplug/libmodplug-0.8.8.1.recipe diff --git a/media-libs/libmodplug/libmodplug-0.8.7.recipe b/media-libs/libmodplug/libmodplug-0.8.7.recipe deleted file mode 100644 index b42df20f2..000000000 --- a/media-libs/libmodplug/libmodplug-0.8.7.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="libmodplug is a lib for playing mod files" -HOMEPAGE="http://modplug-xmms.sourceforge.net" -SRC_URI="http://softlayer.dl.sourceforge.net/project/modplug-xmms/libmodplug/0.8.7/libmodplug-0.8.7.tar.gz" -CHECKSUM_MD5="d2d9ccd8da22412999caed076140f786" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libmodplug-0.8.7 - libtoolize --force --copy --install - aclocal - autoconf - automake - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - --enable-static - make -} - -INSTALL() -{ - cd libmodplug-0.8.7 - make install -} -LICENSE="Public Domain" -#COPYRIGHT="" diff --git a/media-libs/libmodplug/libmodplug-0.8.8.1.recipe b/media-libs/libmodplug/libmodplug-0.8.8.1.recipe deleted file mode 100644 index 001ac0887..000000000 --- a/media-libs/libmodplug/libmodplug-0.8.8.1.recipe +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="libmodplug is a lib for playing mod files" -HOMEPAGE="http://modplug-xmms.sourceforge.net" -SRC_URI="http://softlayer.dl.sourceforge.net/project/modplug-xmms/libmodplug/0.8.8.1/libmodplug-0.8.8.1.tar.gz" -CHECKSUM_MD5="f7fa53a60c650024ff51cca88341776b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libmodplug-0.8.8.1 - libtoolize --force --copy --install - aclocal - autoconf - automake - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - --enable-static - make -} - -INSTALL() -{ - cd libmodplug-0.8.8.1 - make install -} - -#LICENSE="Public Domain" -#COPYRIGHT="" diff --git a/media-libs/libmodplug/libmodplug-0.8.8.4.recipe b/media-libs/libmodplug/libmodplug-0.8.8.4.recipe index 4846cd459..849df8f12 100644 --- a/media-libs/libmodplug/libmodplug-0.8.8.4.recipe +++ b/media-libs/libmodplug/libmodplug-0.8.8.4.recipe @@ -1,31 +1,88 @@ -DESCRIPTION="libmodplug is a lib for playing mod files" +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)" 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" + +LICENSE="Public Domain" +COPYRIGHT="Public Domain" + REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" + +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libmodplug$secondaryArchSuffix = $portVersion + lib:libmodplug$secondaryArchSuffix = 0.8.0 compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + BUILD() { - cd libmodplug-0.8.8.4 libtoolize --force --copy --install aclocal autoconf automake - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ + + runConfigure ./configure \ --enable-static - make + make $jobArgs } INSTALL() { - cd libmodplug-0.8.8.4 make install + prepareInstalledDevelLibs libmodplug + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir } -LICENSE="Public Domain" -#COPYRIGHT="" +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libmodplug${secondaryArchSuffix}_devel = $portVersion + devel:libmodplug$secondaryArchSuffix = 0.8.0 compat >= 0 + " +REQUIRES_devel=" + libmodplug$secondaryArchSuffix == $portVersion + " From dc241fb83046baac2bc1a9a6fae9d17c2159168f Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 28 Aug 2013 09:59:21 -0700 Subject: [PATCH 447/587] Mark as base package --- media-libs/libao/libao-1.0.0.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media-libs/libao/libao-1.0.0.recipe b/media-libs/libao/libao-1.0.0.recipe index 11ea615ae..2ee94f010 100644 --- a/media-libs/libao/libao-1.0.0.recipe +++ b/media-libs/libao/libao-1.0.0.recipe @@ -74,11 +74,11 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - libao${secondaryArchSuffix}_devel = $portVersion - devel:libao$secondaryArchSuffix = 0.0.0 compat >= 0 + libao_devel = $portVersion + devel:libao = 0.0.0 compat >= 0 " REQUIRES_devel=" - libao$secondaryArchSuffix == $portVersion + libao == $portVersion base " From 6e94889851506e766b07d62b3e96b5a795b8f7ae Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 29 Aug 2013 22:41:03 +0200 Subject: [PATCH 448/587] Revert c007321360bc2d7c677422516327f9a75e9229d0. * as Ingo has pointed out, providing a source package for this doesn't make any sense and the special source packages required for the bootstrap image should better be handled as a different kind of package --- .../ca_root_certificates/ca_root_certificates-2012_12_29.recipe | 1 + 1 file changed, 1 insertion(+) 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 1fdc82f82..68ce3cddf 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 @@ -11,6 +11,7 @@ SRC_URI="http://haiku-files.org/files/data/cacert_121229.pem#noarchive" CHECKSUM_MD5="47961e7ef15667c93cd99be01b51f00a" REVISION="1" ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes PROVIDES=" ca_root_certificates = $portVersion From f6b52d51f67c361f1e5458fd72142ca02345b9ce Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 30 Aug 2013 04:42:57 -0700 Subject: [PATCH 449/587] Updated to libevent-2.0.21. This is a WIP, still has some POLICY WARNINGS to fix up. --- dev-libs/libevent/libevent-2.0.21.recipe | 92 +++++++++++++++++++ .../libevent/patches/libevent-2.0.21.patch | 13 +++ 2 files changed, 105 insertions(+) create mode 100644 dev-libs/libevent/libevent-2.0.21.recipe create mode 100644 dev-libs/libevent/patches/libevent-2.0.21.patch diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe new file mode 100644 index 000000000..86dbf3a6d --- /dev/null +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -0,0 +1,92 @@ +SUMMARY="Libevent" +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" +LICENSE="BSD (3-clause)" +COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." + +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86" + +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + cmd:event_rpcgen.py + libevent$secondaryArchSuffix = $portVersion + lib:libevent$secondaryArchSuffix = 2.0.0 compat >= 2 + lib:libevent_2.0 = 5 compat >= 5 + lib:libevent_2.0 = 5.1.9 compat >= 5 + lib:libevent_core_2.0 = 5 compat >= 5 + lib:libevent_core_2.0 = 5.1.9 compat >= 5 + lib:libevent_core + lib:libevent_extra_2.0 = 5 compat >= 5 + lib:libevent_extra_2.0 = 5.1.9 compat >= 5 + lib:libevent_extra + lib:libevent_pthreads_2.0 = 5 compat >= 5 + lib:libevent_pthreads_2.0 = 5.1.9 compat >= 5 + lib:libevent_pthreads + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " +SOURCE_DIR="$portVersionedName-stable" + +PATCH() +{ + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in + sed -i 's/TESTS = $(top_srcdir)/TESTS = {$sourceDir}/g' test/Makefile.am +} + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs libevent + fixPkgconfig + + + ls + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libevent_devel = $portVersion compat >= 2 + devel:libevent = $portVersion compat >= 2 + devel:libevent_core.a = 5 compat >= 5 + devel:libevent_core.la = 5.1.9 compat >= 5 + devel:libevent_extra.a = 5 compat >= 5 + devel:libevent_extra.la = 5.1.9 compat >= 5 + devel:libevent_pthreads.a = 5 compat >= 5 + devel:libevent_pthreads.la = 5.1.9 compat >= 5 + " +REQUIRES_devel=" + libevent == $portVersion base + " diff --git a/dev-libs/libevent/patches/libevent-2.0.21.patch b/dev-libs/libevent/patches/libevent-2.0.21.patch new file mode 100644 index 000000000..92ece1c59 --- /dev/null +++ b/dev-libs/libevent/patches/libevent-2.0.21.patch @@ -0,0 +1,13 @@ +--- configure.in 2012-11-17 22:34:13.040894464 -0800 ++++ haiku/configure.in 2013-08-28 15:07:32.000000000 -0700 +@@ -104,8 +104,8 @@ + AM_CONDITIONAL([BUILD_REGRESS], [test "$enable_libevent_regress" = "yes"]) + + dnl Checks for libraries. +-AC_SEARCH_LIBS([inet_ntoa], [nsl]) +-AC_SEARCH_LIBS([socket], [socket]) ++AC_SEARCH_LIBS([inet_ntoa], [nsl network]) ++AC_SEARCH_LIBS([socket], [socket network]) + AC_SEARCH_LIBS([inet_aton], [resolv]) + AC_SEARCH_LIBS([clock_gettime], [rt]) + AC_SEARCH_LIBS([sendfile], [sendfile]) From 5b15c6bb2d09656a10739c91024e9456b68d7798 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 30 Aug 2013 11:46:32 +0200 Subject: [PATCH 450/587] Add recipe for pe-2.4.3_hg606. * this is the first version of Pe that can be built on x86_64 --- ...t => pe-2.4.3_adjustments_for_pm.patchset} | 0 haiku-apps/pe/pe-2.4.3_hg602.recipe | 10 +-- haiku-apps/pe/pe-2.4.3_hg606.recipe | 66 +++++++++++++++++++ 3 files changed, 71 insertions(+), 5 deletions(-) rename haiku-apps/pe/patches/{pe-2.4.3_hg602.patchset => pe-2.4.3_adjustments_for_pm.patchset} (100%) create mode 100644 haiku-apps/pe/pe-2.4.3_hg606.recipe diff --git a/haiku-apps/pe/patches/pe-2.4.3_hg602.patchset b/haiku-apps/pe/patches/pe-2.4.3_adjustments_for_pm.patchset similarity index 100% rename from haiku-apps/pe/patches/pe-2.4.3_hg602.patchset rename to haiku-apps/pe/patches/pe-2.4.3_adjustments_for_pm.patchset diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe index 1fd231bfc..12c5e075b 100644 --- a/haiku-apps/pe/pe-2.4.3_hg602.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe @@ -1,6 +1,6 @@ -SUMMARY="A programmer's editor" -DESCRIPTION="A programmer's editor" -HOMEPAGE="http://pe-editor.berlios.de/" +SUMMARY="A programmer's editor" +DESCRIPTION="A programmer's editor" +HOMEPAGE="http://pe-editor.berlios.de/" LICENSE=" BSD (4-clause) MIT @@ -13,7 +13,7 @@ SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#602" REVISION="5" ARCHITECTURES="x86_gcc2 x86" -PATCHES="pe-2.4.3_hg602.patchset" +PATCHES="pe-2.4.3_adjustments_for_pm.patchset" PROVIDES=" pe = $portVersion @@ -58,7 +58,7 @@ INSTALL() mkdir -p $appsDir cp -a generated/distro $peDir cp -a doc $peDir/Documentation - + mkdir $binDir ln -sfn $peDir/lpe $binDir diff --git a/haiku-apps/pe/pe-2.4.3_hg606.recipe b/haiku-apps/pe/pe-2.4.3_hg606.recipe new file mode 100644 index 000000000..3b8507d15 --- /dev/null +++ b/haiku-apps/pe/pe-2.4.3_hg606.recipe @@ -0,0 +1,66 @@ +SUMMARY="A programmer's editor" +DESCRIPTION="A programmer's editor" +HOMEPAGE="http://pe-editor.berlios.de/" +LICENSE=" + BSD (4-clause) + MIT + " +COPYRIGHT=" + 1996-2002 Maarteen Hekkelman + 2003-2013 Team Pe + " +SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#606" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="pe-2.4.3_adjustments_for_pm.patchset" + +PROVIDES=" + pe = $portVersion + cmd:Pe = $portVersion compat >= 2 + cmd:lpe = $portVersion compat >= 2 + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libpcre + lib:libpcreposix + " +BUILD_REQUIRES=" + devel:libpcre >= 0.0.1 + devel:libpcreposix >= 0.0.1 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:bison + cmd:flex + cmd:gcc + cmd:jam + cmd:ld + " + +USER_SETTINGS_FILES=" + settings/pe directory + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + jam -q + # multi-job builds don't work reliably +} + +INSTALL() +{ + peDir=$appsDir/Pe + + mkdir -p $appsDir + cp -a generated/distro $peDir + cp -a doc $peDir/Documentation + + mkdir $binDir + ln -sfn $peDir/lpe $binDir + + addAppDeskbarSymlink $peDir/Pe +} From 89d3ae6f21154837f724ada83338c45c6096bfe9 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 30 Aug 2013 23:45:44 +0200 Subject: [PATCH 451/587] Fix build of perl on x86_64: * add x86_64 as supported architecture * determine the correct archname via invocation of miniperl --- dev-lang/perl/perl-5.10.1.recipe | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe index 53886dfc9..586b5b5af 100644 --- a/dev-lang/perl/perl-5.10.1.recipe +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -1,17 +1,17 @@ SUMMARY="Larry Wall's Practical Extraction and Report Language" DESCRIPTION=" - Perl was originally developed by Larry Wall in 1987 as a general-purpose + 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 + 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 + languages' because of its flexibility and power, and possibly also because of its perceived 'ugliness'. " HOMEPAGE="http://www.perl.org/" @@ -20,8 +20,8 @@ LICENSE="GNU GPL v1 Artistic (Perl)" SRC_URI="http://www.cpan.org/src/perl-5.10.1.tar.gz" CHECKSUM_MD5="b9b2fdb957f50ada62d73f43ee75d044" -REVISION="5" -ARCHITECTURES="x86_gcc2 x86" +REVISION="6" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="perl-5.10.1.patch" @@ -115,12 +115,12 @@ BUILD() INSTALL() { - perlArch=BePC-haiku + eval $(./miniperl "-I$relativeLibDir" -V:archname) make install cd "$binDir" chmod a+x perl psed pstruct perlthanks cd "$libDir" - ln -sf perl5/core_perl/5.10.1/$perlArch/CORE/libperl.so . + ln -sf perl5/core_perl/5.10.1/$archname/CORE/libperl.so . # The "site-perl" stuff is automatically created, when necessary, so we can # as well remove it. From 8ec70f6e92eaa9a878984795c3c3db9c7f3a86be Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 31 Aug 2013 14:11:32 +0200 Subject: [PATCH 452/587] Add x86_64 as supported architecture to ports required by Haiku. --- app-arch/bzip2/bzip2-1.0.6.recipe | 4 +- app-arch/p7zip/p7zip-9.20.1.recipe | 2 +- app-arch/tar/tar-1.26.recipe | 22 +++---- app-arch/xz_utils/xz_utils-5.0.4.recipe | 2 +- app-cdr/cdrtools/cdrtools-3.01~a07.recipe | 20 +++--- app-doc/doxygen/doxygen-1.6.3.recipe | 2 +- app-editors/nano/nano-2.2.6.recipe | 2 +- app-text/htmldoc/htmldoc-1.8.27.recipe | 10 +-- dev-db/sqlite/sqlite-3.7.13.recipe | 10 +-- dev-lang/python/python-2.6.8.recipe | 4 +- dev-lang/yasm/yasm-1.2.0.recipe | 2 +- dev-libs/apr/apr-1.4.6.recipe | 32 +++++----- dev-libs/apr_util/apr_util-1.4.1.recipe | 32 +++++----- dev-libs/expat/expat-2.0.1.recipe | 4 +- dev-libs/icu/icu-4.8.1.1.recipe | 4 +- .../libedit/libedit-2012_06_01_3.0.recipe | 6 +- dev-libs/libiconv/libiconv-1.13.1.recipe | 62 +++++++++---------- dev-libs/libpcre/libpcre-8.21.recipe | 12 ++-- .../libsolv-0.3.0_haiku_2013_06_16.recipe | 4 +- dev-libs/libxml2/libxml2-2.8.0.recipe | 48 +++++++------- dev-libs/openssl/openssl-1.0.0j.recipe | 24 +++---- dev-util/cmake/cmake-2.8.5.recipe | 8 +-- dev-util/ctags/ctags-5.8.recipe | 6 +- dev-util/gperf/gperf-3.0.4.recipe | 6 +- dev-util/pkgconfig/pkgconfig-0.27.1.recipe | 6 +- dev-util/scons/scons-2.2.0.recipe | 2 +- dev-vcs/cvs/cvs-1.12.13.1.recipe | 6 +- dev-vcs/git/git-1.8.3.4.recipe | 30 ++++----- dev-vcs/mercurial/mercurial-2.2.2.recipe | 4 +- dev-vcs/subversion/subversion-1.6.18.recipe | 14 ++--- .../keymapswitcher-1.2.7.10.recipe | 4 +- haiku-apps/mkdepend/mkdepend-1.7.recipe | 6 +- haiku-apps/vision/vision-0.9.7.r944.recipe | 8 +-- .../haikuwebkit-1.1.3_2013_08_09.recipe | 2 +- media-libs/freetype/freetype-2.4.9.recipe | 2 +- media-libs/jpeg/jpeg-9.recipe | 2 +- media-libs/libogg/libogg-1.3.0.recipe | 2 +- media-libs/libpng/libpng-1.5.12.recipe | 2 +- media-libs/libtheora/libtheora-1.1.1.recipe | 2 +- media-libs/libvorbis/libvorbis-1.3.2.recipe | 6 +- media-libs/libvpx/libvpx-1.0.0.recipe | 6 +- media-libs/speex/speex-1.2~rc1.recipe | 2 +- media-video/ffmpeg/ffmpeg-0.10.2.recipe | 2 +- net-misc/curl/curl-7.26.0.recipe | 16 ++--- net-misc/neon/neon-0.29.6.recipe | 18 +++--- net-misc/openssh/openssh-6.0p1.recipe | 4 +- .../wpa_supplicant/wpa_supplicant-2.0.recipe | 6 +- sys-apps/grep/grep-2.14.recipe | 2 +- sys-apps/groff/groff-1.20.1.recipe | 2 +- sys-apps/man/man-1.6g.recipe | 4 +- sys-apps/sed/sed-4.2.1.recipe | 22 +++---- sys-apps/texinfo/texinfo-4.13a.recipe | 8 +-- sys-devel/autoconf/autoconf-2.69.recipe | 2 +- sys-devel/automake/automake-1.13.1.recipe | 2 +- .../binutils-2.23.2_2013_04_09.recipe | 6 +- sys-devel/bison/bison-2.4.3.recipe | 18 +++--- sys-devel/flex/flex-2.5.35.recipe | 8 +-- sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe | 15 +++-- sys-devel/gettext/gettext-0.18.1.1.recipe | 2 +- sys-devel/jam/jam-2.5_2012_10_12.recipe | 14 ++--- sys-devel/libtool/libtool-2.4.recipe | 6 +- sys-devel/m4/m4-1.4.16.recipe | 28 ++++----- sys-devel/make/make-3.82.recipe | 16 ++--- sys-libs/glu/glu-9.0.0.recipe | 4 +- sys-libs/mesa/mesa-9.1.1.recipe | 4 +- sys-libs/ncurses/ncurses-5.9.recipe | 4 +- sys-libs/readline/readline-6.2.recipe | 6 +- sys-libs/zlib/zlib-1.2.8.recipe | 4 +- 68 files changed, 331 insertions(+), 326 deletions(-) diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe index 0fae76959..6146ddffe 100644 --- a/app-arch/bzip2/bzip2-1.0.6.recipe +++ b/app-arch/bzip2/bzip2-1.0.6.recipe @@ -6,7 +6,7 @@ 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="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" bzip2 = $portVersion compat >= 1 @@ -64,7 +64,7 @@ INSTALL() mv $prefix/include/* $bzip2IncludeDir rmdir $prefix/include - # prepare development lib links + # prepare development lib links prepareInstalledDevelLibs libbz2 # devel package diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe index 92e5b91d9..4b17b1c39 100644 --- a/app-arch/p7zip/p7zip-9.20.1.recipe +++ b/app-arch/p7zip/p7zip-9.20.1.recipe @@ -6,7 +6,7 @@ CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89" LICENSE="GNU LGPL v2.1" COPYRIGHT="1999-2011 7-Zip Igor Pavlov." REVISION="4" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="p7zip-9.20.1.patch" diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index e44d305c6..4bb2b7dd7 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -1,23 +1,23 @@ -SUMMARY="Saves and restores files to/from a tape or disk archive." +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, + 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 + 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/" + " +HOMEPAGE="http://www.gnu.org/software/tar/" COPYRIGHT="1990-2011 Free Software Foundation, Inc." LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2" CHECKSUM_MD5="2cee42a2ff4f1cd4f9298eeeb2264519" REVISION="6" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="tar-1.26.patch" 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 00163c4b7..a0c2295df 100644 --- a/app-arch/xz_utils/xz_utils-5.0.4.recipe +++ b/app-arch/xz_utils/xz_utils-5.0.4.recipe @@ -9,7 +9,7 @@ LICENSE=" " COPYRIGHT="2005-2012 Lasse Collin" REVISION="1" -ARCHITECTURES="x86" +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. diff --git a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe index e82c1bb6a..34eaf72a4 100644 --- a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe +++ b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe @@ -3,17 +3,17 @@ DESCRIPTION="Cdrtools is a set of command line programs that allows to record CD 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 + 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" +HOMEPAGE="http://cdrecord.berlios.de" COPYRIGHT=" 1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs) 1995-2012 J. Schilling (cdrecord) @@ -25,7 +25,7 @@ LICENSE=" SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a07.tar.bz2" CHECKSUM_MD5="266bae8db7d1e5473555b48c306aa216" REVISION="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES='cdrtools-3.01~a07.patch' diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe index 282f45c1e..cc4ac12bf 100644 --- a/app-doc/doxygen/doxygen-1.6.3.recipe +++ b/app-doc/doxygen/doxygen-1.6.3.recipe @@ -12,7 +12,7 @@ LICENSE="GNU GPL v2" SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz" CHECKSUM_MD5="2d6ea20a9d850d94321cee78bab7bb87" REVISION="4" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="doxygen-1.6.3.patchset" diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe index 24cf3f294..4d099ea3c 100644 --- a/app-editors/nano/nano-2.2.6.recipe +++ b/app-editors/nano/nano-2.2.6.recipe @@ -6,7 +6,7 @@ CHECKSUM_MD5="03233ae480689a008eb98feb1b599807" LICENSE="GNU GPL v3" COPYRIGHT="1999-2010 Free Software Foundation, Inc. " REVISION="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="nano-2.2.6.patchset" diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe index 935af6b3e..f597e02da 100644 --- a/app-text/htmldoc/htmldoc-1.8.27.recipe +++ b/app-text/htmldoc/htmldoc-1.8.27.recipe @@ -1,15 +1,15 @@ -SUMMARY="HTML file processor and converter" +SUMMARY="HTML file processor and converter" DESCRIPTION=" - HTMLDOC converts HTML files and web pages into index HTML, Adobe + 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" + " +HOMEPAGE="http://www.msweet.org/projects.php?Z1" LICENSE="GNU GPL v2" COPYRIGHT="1997-2006 Easy Software Products" SRC_URI="http://www.msweet.org/files/project1/htmldoc-1.8.27-source.tar.bz2" CHECKSUM_MD5="35589e7b8fe9c54e11be87cd5aec4dcc" REVISION="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="htmldoc-1.8.27.patchset" diff --git a/dev-db/sqlite/sqlite-3.7.13.recipe b/dev-db/sqlite/sqlite-3.7.13.recipe index ad04e2b99..91ec55170 100644 --- a/dev-db/sqlite/sqlite-3.7.13.recipe +++ b/dev-db/sqlite/sqlite-3.7.13.recipe @@ -1,9 +1,9 @@ -SUMMARY="An SQL database engine in a C library" +SUMMARY="An SQL database engine in a C library" DESCRIPTION=" - SQLite is a software library that implements a self-contained, + 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. + + 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/" @@ -12,7 +12,7 @@ CHECKSUM_MD5="c97df403e8a3d5b67bb408fcd6aabd8e" LICENSE="SQLite" COPYRIGHT="Public Domain" REVISION="4" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="sqlite-3.7.13.patch" diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe index 0ff8bdbc2..20217cdbe 100644 --- a/dev-lang/python/python-2.6.8.recipe +++ b/dev-lang/python/python-2.6.8.recipe @@ -10,7 +10,7 @@ COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2" CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125" REVISION="5" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="python-2.6.8.patch" @@ -96,6 +96,6 @@ TEST() cd Lib/test rm test_asynchat.py # this one stalls, so skip it for now rm test_multiprocessing.py # this one stalls, so skip it for now - + python regrtest.py } diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe index b44093f65..70e7758f5 100644 --- a/dev-lang/yasm/yasm-1.2.0.recipe +++ b/dev-lang/yasm/yasm-1.2.0.recipe @@ -11,7 +11,7 @@ LICENSE=" " COPYRIGHT="2001-2011 Peter Johnson and other Yasm developers." REVISION="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" yasm = $portVersion compat >= 1 diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe index 7310c88a8..d8b6ed15f 100644 --- a/dev-libs/apr/apr-1.4.6.recipe +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -1,11 +1,11 @@ -SUMMARY="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" +SUMMARY="Apache Portable Runtime Library" +HOMEPAGE="http://apr.apache.org/" SRC_URI="http://www.apache.org/dist/apr/apr-1.4.6.tar.gz" COPYRIGHT="2012 The Apache Software Foundation." LICENSE="Apache v2" CHECKSUM_MD5="76cc4457fbb71eefdafa27dba8f511fb" REVISION="7" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="apr-1.4.6.patch" @@ -38,10 +38,10 @@ BUILD() autoconf runConfigure ./configure \ --with-installbuilddir=$prefix/data/apr - + # TODO: fix this hack (by finding out why top_builddir seems to be unset)! ln -sfn $sourceDir/libtool /libtool - + make $jobArgs } @@ -74,18 +74,18 @@ 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 + 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 + + 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 @@ -96,7 +96,7 @@ DESCRIPTION=" - network I/O - shared memory - thread and Process management - - various data structures (tables, hashes, priority queues, etc) + - 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 33bf4b8f5..49ba1edb0 100644 --- a/dev-libs/apr_util/apr_util-1.4.1.recipe +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -1,11 +1,11 @@ SUMMARY="Apache Portable Runtime Utility Library" -HOMEPAGE="http://apr.apache.org/" +HOMEPAGE="http://apr.apache.org/" SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz" LICENSE="Apache v2" COPYRIGHT="2011 The Apache Software Foundation." CHECKSUM_MD5="666a5d56098a9debf998510e304c8095" REVISION="4" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="apr_util-1.4.1.patch" @@ -59,13 +59,13 @@ BUILD() aclocal --install -I m4 autoconf --force autoheader - touch libtool.m4 + touch libtool.m4 cd ../.. - + # TODO: fix this hack! cp /boot/common/bin/libtool . ln -sfn $sourceDir/libtool /libtool - + runConfigure ./configure \ --with-apr=$aprInstallDir \ --with-expat=$expatInstallDir @@ -93,18 +93,18 @@ 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 + 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 + + 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 @@ -115,7 +115,7 @@ DESCRIPTION=" - network I/O - shared memory - thread and Process management - - various data structures (tables, hashes, priority queues, etc) + - various data structures (tables, hashes, priority queues, etc) " # ----- devel package ------------------------------------------------------- diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe index 716794bc3..551d50b5b 100644 --- a/dev-libs/expat/expat-2.0.1.recipe +++ b/dev-libs/expat/expat-2.0.1.recipe @@ -1,6 +1,6 @@ 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)." -HOMEPAGE="http://expat.sourceforge.net/" +HOMEPAGE="http://expat.sourceforge.net/" COPYRIGHT=" 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper 2001-2006 Expat maintainers. @@ -9,7 +9,7 @@ LICENSE="MIT" SRC_URI="http://iweb.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz" CHECKSUM_MD5="ee8b492592568805593f81f8cdf2a04c" REVISION="7" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" diff --git a/dev-libs/icu/icu-4.8.1.1.recipe b/dev-libs/icu/icu-4.8.1.1.recipe index cefda5c82..a38256bea 100644 --- a/dev-libs/icu/icu-4.8.1.1.recipe +++ b/dev-libs/icu/icu-4.8.1.1.recipe @@ -1,11 +1,11 @@ SUMMARY="International Components for Unicode (ICU)" -HOMEPAGE="http://www.icu-project.org" +HOMEPAGE="http://www.icu-project.org" LICENSE="ICU" COPYRIGHT="1997-2011 IBM Corporation and others." SRC_URI="http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.tgz" CHECKSUM_MD5="ea93970a0275be6b42f56953cd332c17" REVISION="4" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="icu-4.8.1.1.patch" 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 a14227833..a7ebed3d6 100644 --- a/dev-libs/libedit/libedit-2012_06_01_3.0.recipe +++ b/dev-libs/libedit/libedit-2012_06_01_3.0.recipe @@ -1,12 +1,12 @@ -SUMMARY="A BSD licensed replacement for the GNU readline library" +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." LICENSE="BSD (3-clause)" COPYRIGHT="1992-2012 The NetBSD Foundation, Inc." -HOMEPAGE="http://www.thrysoee.dk/editline/" +HOMEPAGE="http://www.thrysoee.dk/editline/" SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz" CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea" REVISION="1" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="libedit-2012_06_01_3.0.patch" diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe index a4250e772..1a1caf534 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.recipe +++ b/dev-libs/libiconv/libiconv-1.13.1.recipe @@ -11,7 +11,7 @@ COPYRIGHT="2000-2009 Free Software Foundation, Inc." SRC_URI="http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz" CHECKSUM_MD5="7ab33ebd26687c744a37264a330bbe9a" REVISION="6" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" @@ -94,42 +94,42 @@ 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 + 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 + 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 + 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 + 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}, + 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, + 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 @@ -156,19 +156,19 @@ DESCRIPTION=" 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 + 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 + 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 + 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 + 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 @@ -182,12 +182,12 @@ DESCRIPTION=" Platform specifics ATARIST, RISCOS-LATIN1 - It can convert from any of these encodings to any other, through Unicode + 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 + 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 diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe index f630dd2bd..2a0093640 100644 --- a/dev-libs/libpcre/libpcre-8.21.recipe +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -1,9 +1,9 @@ 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 + 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. " @@ -16,7 +16,7 @@ COPYRIGHT=" SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2" CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730" REVISION="5" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" libpcre = $portVersion @@ -61,7 +61,7 @@ BUILD() INSTALL() { make install - + # prepare develop/lib prepareInstalledDevelLibs libpcre libpcrecpp libpcreposix fixPkgconfig diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe index 78dc70612..a397968fd 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe @@ -2,10 +2,10 @@ SUMMARY="Library for solving packages and reading repositories" DESCRIPTION="Library for solving packages and reading repositories." LICENSE="BSD (3-clause)" COPYRIGHT="2007-2013, Novell Inc." -HOMEPAGE="http://github.com/openSUSE/libsolv" +HOMEPAGE="http://github.com/openSUSE/libsolv" SRC_URI="git+git://github.com/weinhold/libsolv.git#ef4a8778ef567224feb35019b711507ae1d6e7c3" REVISION="2" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe index e7a57b02d..fed120d18 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.recipe +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -1,11 +1,11 @@ SUMMARY="The XML C parser and toolkit of Gnome" -HOMEPAGE="http://www.xmlsoft.org/" +HOMEPAGE="http://www.xmlsoft.org/" LICENSE="MIT" COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz" CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093" REVISION="5" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libxml2-2.8.0.patchset" @@ -167,16 +167,16 @@ fi # ----- DESCRIPTION ----------------------------------------------------------- DESCRIPTION=" - Libxml2 is the XML C parser and toolkit developed for the Gnome project - (but usable outside of the Gnome platform), it is free software available - under the MIT License. XML itself is a metalanguage to design markup - languages, i.e. text language where semantic and structure are added to - the content using extra "markup" information enclosed between angle - brackets. HTML is the most well-known markup language. Though the library - is written in C a variety of language bindings make it available in other + Libxml2 is the XML C parser and toolkit developed for the Gnome project + (but usable outside of the Gnome platform), it is free software available + under the MIT License. XML itself is a metalanguage to design markup + languages, i.e. text language where semantic and structure are added to + the content using extra "markup" information enclosed between angle + brackets. HTML is the most well-known markup language. Though the library + is written in C a variety of language bindings make it available in other environments. - Libxml2 implements a number of existing standards related to markup + Libxml2 implements a number of existing standards related to markup languages: - the XML standard: http://www.w3.org/TR/REC-xml @@ -187,35 +187,35 @@ DESCRIPTION=" - HTML4 parser: http://www.w3.org/TR/html401/ - XML Pointer Language (XPointer) Version 1.0: http://www.w3.org/TR/xptr - XML Inclusions (XInclude) Version 1.0: http://www.w3.org/TR/xinclude/ - - ISO-8859-x encodings, as well as rfc2044 [UTF-8] and rfc2781 [UTF-16] - Unicode encodings, and more if using iconv support part of SGML Open + - ISO-8859-x encodings, as well as rfc2044 [UTF-8] and rfc2781 [UTF-16] + Unicode encodings, and more if using iconv support part of SGML Open Technical Resolution TR9401:1997 - - XML Catalogs Working Draft 06 August 2001: + - XML Catalogs Working Draft 06 August 2001: http://www.oasis-open.org/committees/entity/spec-2001-08-06.html - - Canonical XML Version 1.0: - http://www.w3.org/TR/xml-c14n and the Exclusive XML Canonicalization + - Canonical XML Version 1.0: + http://www.w3.org/TR/xml-c14n and the Exclusive XML Canonicalization CR draft http://www.w3.org/TR/xml-exc-c14n - - Relax NG, ISO/IEC 19757-2:2003, + - Relax NG, ISO/IEC 19757-2:2003, http://www.oasis-open.org/committees/relax-ng/spec-20011203.html - W3C XML Schemas Part 2: Datatypes REC 02 May 2001 - W3C xml:id Working Draft 7 April 2004 - In most cases libxml2 tries to implement the specifications in a - relatively strictly compliant way. As of release 2.4.16, libxml2 passed + In most cases libxml2 tries to implement the specifications in a + relatively strictly compliant way. As of release 2.4.16, libxml2 passed all 1800+ tests from the OASIS XML Tests Suite. - To some extent libxml2 provides support for the following additional + To some extent libxml2 provides support for the following additional specifications but doesn't claim to implement them completely: - - Document Object Model (DOM) http://www.w3.org/TR/DOM-Level-2-Core/ - the document model, but it doesn't implement the API itself, gdome2 + - Document Object Model (DOM) http://www.w3.org/TR/DOM-Level-2-Core/ + the document model, but it doesn't implement the API itself, gdome2 does this on top of libxml2 - RFC 959 : libxml2 implements a basic FTP client code - RFC 1945 : HTTP/1.0, again a basic HTTP client code - - SAX: a SAX2 like interface and a minimal SAX1 implementation compatible + - SAX: a SAX2 like interface and a minimal SAX1 implementation compatible with early expat versions - A partial implementation of XML Schemas Part 1: Structure is being worked - on but it would be far too early to make any conformance statement about + A partial implementation of XML Schemas Part 1: Structure is being worked + on but it would be far too early to make any conformance statement about it at the moment. " diff --git a/dev-libs/openssl/openssl-1.0.0j.recipe b/dev-libs/openssl/openssl-1.0.0j.recipe index 80b69a15d..51aba46a2 100644 --- a/dev-libs/openssl/openssl-1.0.0j.recipe +++ b/dev-libs/openssl/openssl-1.0.0j.recipe @@ -1,20 +1,20 @@ 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 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 + 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. + 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/" +HOMEPAGE="http://www.openssl.org/" SRC_URI="http://www.openssl.org/source/openssl-1.0.0j.tar.gz" CHECKSUM_MD5="cbe4ac0d8f598680f68a951e04b0996b" LICENSE="OpenSSL" @@ -23,7 +23,7 @@ COPYRIGHT=" 1998-2012 The OpenSSL Project. " REVISION="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="openssl-1.0.0j.patch" @@ -66,7 +66,7 @@ BUILD() { # Fix hardcoded directory for manpages sed -i "s@MANDIR=.*\$@MANDIR=$manDir@g" Make* - + ./config --prefix=$prefix --libdir=$relativeLibDir \ --openssldir=$dataRootDir/ssl \ zlib shared diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe index dfd7ac790..bb36e152c 100644 --- a/dev-util/cmake/cmake-2.8.5.recipe +++ b/dev-util/cmake/cmake-2.8.5.recipe @@ -1,12 +1,12 @@ -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." -HOMEPAGE="http://www.cmake.org" +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." +HOMEPAGE="http://www.cmake.org" LICENSE="CMake" COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz" CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5" REVISION="6" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="cmake-2.8.5.patchset" diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe index da85ba2e9..ada66ce26 100644 --- a/dev-util/ctags/ctags-5.8.recipe +++ b/dev-util/ctags/ctags-5.8.recipe @@ -1,12 +1,12 @@ SUMMARY="Exuberant Ctags creates tags files for code browsing in editors" -DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors." -HOMEPAGE="http://ctags.sourceforge.net/" +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" SRC_URI="http://prdownloads.sourceforge.net/ctags/ctags-5.8.tar.gz" CHECKSUM_MD5="c00f82ecdcc357434731913e5b48630d" REVISION="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" ctags = $portVersion compat >= 5.8 diff --git a/dev-util/gperf/gperf-3.0.4.recipe b/dev-util/gperf/gperf-3.0.4.recipe index 64c6a56d3..de1f99d51 100644 --- a/dev-util/gperf/gperf-3.0.4.recipe +++ b/dev-util/gperf/gperf-3.0.4.recipe @@ -3,14 +3,14 @@ DESCRIPTION="GNU gperf is a perfect hash function generator. For a given list of 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/" +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" SRC_URI="http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz" CHECKSUM_MD5="c1f1db32fb6598d6a93e6e88796a8632" REVISION="1" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="gperf-3.0.4.patch" diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe index d6ac46106..8fa68597d 100644 --- a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe +++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe @@ -1,12 +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." -HOMEPAGE="http://pkg-config.freedesktop.org/wiki/" +HOMEPAGE="http://pkg-config.freedesktop.org/wiki/" LICENSE="GNU GPL v2" COPYRIGHT="1998, 2001-2006 Red Hat Inc." SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.27.1.tar.gz" CHECKSUM_MD5="5392b4e3372879c5bf856173b418d6a2" REVISION="1" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="pkgconfig-0.27.1.patchset" @@ -50,7 +50,7 @@ BUILD() pcPath="/boot/common/non-packaged/$pcPathSubdir" pcPath="$pcPath:/boot/common/$pcPathSubdir" pcPath="$pcPath:/boot/system/$pcPathSubdir" - + runConfigure ./configure \ --with-internal-glib \ --with-pc_path="$pcPath" diff --git a/dev-util/scons/scons-2.2.0.recipe b/dev-util/scons/scons-2.2.0.recipe index a3a232cd9..1059924b6 100644 --- a/dev-util/scons/scons-2.2.0.recipe +++ b/dev-util/scons/scons-2.2.0.recipe @@ -6,7 +6,7 @@ COPYRIGHT="2001-2012 The SCons Foundation" SRC_URI="http://superb-dca3.dl.sourceforge.net/project/scons/scons/2.2.0/scons-2.2.0.tar.gz" CHECKSUM_MD5="f737f474a02d08156c821bd2d4d4b632" REVISION="1" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="scons-2.2.0.patchset" diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe index 9dcbefc8f..2ba8d7a70 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.recipe +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -10,15 +10,15 @@ While CVS stores individual file history in the same format as RCS, it offers th * 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/" + * 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 GNU LGPL v2" SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2" CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf" REVISION="5" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="cvs-1.12.13.1.patch" diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe index 10a0c5de3..2d0f6e0a3 100644 --- a/dev-vcs/git/git-1.8.3.4.recipe +++ b/dev-vcs/git/git-1.8.3.4.recipe @@ -1,15 +1,15 @@ 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 + 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 + 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/" + " +HOMEPAGE="http://git-scm.com/" LICENSE="GNU GPL v2" COPYRIGHT="2005-2012 Git Authors (see git web site for list)" @@ -26,7 +26,7 @@ CHECKSUM_MD5_3="be01cc4be1b946b053b69d12b422854a" REVISION="1" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" @@ -95,7 +95,7 @@ REQUIRES_svn=" haiku >= $haikuVersion git == $portVersion base " - + BUILD_REQUIRES=" cmd:man cmd:nano @@ -166,7 +166,7 @@ INSTALL() # replace copies of git binaries with symlinks cd $binDir - for program in git*; do + for program in git*; do ln -sfn "../lib/git-core/$program" "$program" done @@ -189,12 +189,12 @@ INSTALL() cp -d $f $asciidocDir/ fi done - + packageEntries arch \ documentation/packages/git/html/git-archimport.html \ documentation/man/man1/git-archimport.1 \ lib/git-core/git-archimport - + packageEntries cvs \ bin/git-cvsserver \ documentation/packages/git/html/git-cvsexportcommit.html \ @@ -207,7 +207,7 @@ INSTALL() lib/git-core/git-cvsexportcommit \ lib/git-core/git-cvsimport \ lib/git-core/git-cvsserver - + packageEntries daemon \ documentation/packages/git/html/git-credential-cache--daemon.html \ documentation/packages/git/html/git-credential-cache.html \ @@ -218,12 +218,12 @@ INSTALL() lib/git-core/git-credential-cache--daemon \ lib/git-core/git-credential-cache \ lib/git-core/git-daemon - + packageEntries email \ documentation/packages/git/html/git-send-email.html \ documentation/man/man1/git-send-email.1 \ lib/git-core/git-send-email - + packageEntries svn \ documentation/packages/git/html/git-svn.html \ documentation/man/man1/git-svn.1 \ diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe index 3ce80e9ee..e82fc9db5 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -1,12 +1,12 @@ SUMMARY="Free, distributed source control management tool" DESCRIPTION="Mercurial is a free, distributed source control management tool." -HOMEPAGE="http://mercurial.selenic.com/" +HOMEPAGE="http://mercurial.selenic.com/" COPYRIGHT="2005-2012 Matt Mackall et al." LICENSE="GNU GPL v2" SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz" CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11" REVISION="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="mercurial-2.2.2.patch" diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe index 1d1847c13..310f8886f 100644 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -1,19 +1,19 @@ 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 + 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" +HOMEPAGE="http://subversion.apache.org" LICENSE="Apache-Subversion" COPYRIGHT="2010 The Apache Software Foundation" SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2" CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925" REVISION="6" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="subversion-1.6.18.patch" diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe index cc94368f6..174a7daa3 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe @@ -1,11 +1,11 @@ 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)." -HOMEPAGE="http://www.sf.net/projects/switcher" +HOMEPAGE="http://www.sf.net/projects/switcher" COPYRIGHT="1999-2003 Stas Maximov" LICENSE="BSD (4-clause)" SRC_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher(haiku)#release_1_2_7_10" REVISION="1" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" keymapswitcher = $portVersion compat >= 1.2.7 diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe index e856b0f0a..d79500d01 100644 --- a/haiku-apps/mkdepend/mkdepend-1.7.recipe +++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe @@ -1,13 +1,13 @@ -SUMMARY="MkDepend for BeOS" +SUMMARY="MkDepend for BeOS" 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" +HOMEPAGE="http://www.bearnip.com/lars/be/mkdepend.html" LICENSE="MIT" COPYRIGHT="1995-2001 Lars Düning. All Rights Reserved" #SRC_URI="http://ports.haiku-files.org/export/1051/haikuports/trunk/haiku-apps/mkdepend/source/mkdepend-1.7.zip" SRC_URI="source/mkdepend-1.7.zip" CHECKSUM_MD5="d4ec4fea9dd9b7292b52d780c8ee3387" REVISION="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" mkdepend = $portVersion diff --git a/haiku-apps/vision/vision-0.9.7.r944.recipe b/haiku-apps/vision/vision-0.9.7.r944.recipe index af2a02268..79cdf2ed1 100644 --- a/haiku-apps/vision/vision-0.9.7.r944.recipe +++ b/haiku-apps/vision/vision-0.9.7.r944.recipe @@ -1,11 +1,11 @@ -SUMMARY="IRC client for Haiku" -DESCRIPTION="Vision is an IRC client for Haiku." -HOMEPAGE="http://vision.sourceforge.net/" +SUMMARY="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#944" LICENSE="MPL v1.1" COPYRIGHT="1999-2010 The Vision Team" REVISION="1" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" if [ $targetArchitecture != x86_gcc2 ]; then PATCHES="vision-0.9.7-gcc4.patch" 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 524e9d3dd..6e30ea577 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 @@ -11,7 +11,7 @@ LICENSE=" SRC_URI="http://www.haiku-files.org/files/haiku-webkit-lastgood-no-tests-2013-08-09.tar.bz2" CHECKSUM_MD5="a6551b2573612678e9d2d27fda4fae48" REVISION="2" -ARCHITECTURES="x86" +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. diff --git a/media-libs/freetype/freetype-2.4.9.recipe b/media-libs/freetype/freetype-2.4.9.recipe index f2424b3bf..1f3d233d6 100644 --- a/media-libs/freetype/freetype-2.4.9.recipe +++ b/media-libs/freetype/freetype-2.4.9.recipe @@ -6,7 +6,7 @@ COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2" CHECKSUM_MD5="77a893dae81fd5b896632715ca041179" REVISION="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" diff --git a/media-libs/jpeg/jpeg-9.recipe b/media-libs/jpeg/jpeg-9.recipe index 232f6d297..7f9645aed 100644 --- a/media-libs/jpeg/jpeg-9.recipe +++ b/media-libs/jpeg/jpeg-9.recipe @@ -14,7 +14,7 @@ COPYRIGHT="1991-2013, Thomas G. Lane, Guido Vollbeding. All Rights Reserved" SRC_URI="http://www.ijg.org/files/jpegsrc.v9.tar.gz" CHECKSUM_MD5="b397211ddfd506b92cd5e02a22ac924d" REVISION="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="jpeg-9.patchset" diff --git a/media-libs/libogg/libogg-1.3.0.recipe b/media-libs/libogg/libogg-1.3.0.recipe index 219735204..5cc057bbf 100644 --- a/media-libs/libogg/libogg-1.3.0.recipe +++ b/media-libs/libogg/libogg-1.3.0.recipe @@ -12,7 +12,7 @@ COPYRIGHT="1994-2011 Xiph.Org Foundation" SRC_URI="http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.gz" CHECKSUM_MD5="0a7eb40b86ac050db3a789ab65fe21c2" REVISION="2" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libogg-1.3.0.patchset" diff --git a/media-libs/libpng/libpng-1.5.12.recipe b/media-libs/libpng/libpng-1.5.12.recipe index cbade86cb..15d1b0e83 100644 --- a/media-libs/libpng/libpng-1.5.12.recipe +++ b/media-libs/libpng/libpng-1.5.12.recipe @@ -10,7 +10,7 @@ LICENSE="LibPNG" SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.12.tar.gz?download" CHECKSUM_MD5="8ea7f60347a306c5faf70b977fa80e28" REVISION="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libpng-1.5.12.patchset" diff --git a/media-libs/libtheora/libtheora-1.1.1.recipe b/media-libs/libtheora/libtheora-1.1.1.recipe index 8886f03f0..684117a3e 100644 --- a/media-libs/libtheora/libtheora-1.1.1.recipe +++ b/media-libs/libtheora/libtheora-1.1.1.recipe @@ -10,7 +10,7 @@ COPYRIGHT="2002-2009 Xiph.Org Foundation" SRC_URI="http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2" CHECKSUM_MD5="292ab65cedd5021d6b7ddd117e07cd8e" REVISION="2" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libtheora-1.1.1.patchset" diff --git a/media-libs/libvorbis/libvorbis-1.3.2.recipe b/media-libs/libvorbis/libvorbis-1.3.2.recipe index 70b9f959f..ab7e7da9f 100644 --- a/media-libs/libvorbis/libvorbis-1.3.2.recipe +++ b/media-libs/libvorbis/libvorbis-1.3.2.recipe @@ -1,14 +1,14 @@ 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." -HOMEPAGE="http://www.xiph.org/vorbis/" +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" SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.gz" CHECKSUM_MD5="c870b9bd5858a0ecb5275c14486d9554" REVISION="2" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libvorbis-1.3.2.patchset" diff --git a/media-libs/libvpx/libvpx-1.0.0.recipe b/media-libs/libvpx/libvpx-1.0.0.recipe index 874e17cd9..796faa0ab 100644 --- a/media-libs/libvpx/libvpx-1.0.0.recipe +++ b/media-libs/libvpx/libvpx-1.0.0.recipe @@ -6,13 +6,13 @@ This distribution of the WebM VP8 Codec SDK includes the following support: * WebM VP8 Decoder" HOMEPAGE="http://www.webmproject.org" LICENSE="BSD (3-clause)" -COPYRIGHT="2009-2012 Google Inc., +COPYRIGHT="2009-2012 Google Inc., The Mozilla Foundation and The Xiph.Org Foundation" SRC_URI="http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2" CHECKSUM_MD5="d987b5140412edd37d2c6b10c29ad484" REVISION="2" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libvpx-1.0.0.patchset" @@ -59,7 +59,7 @@ BUILD() --enable-vp8 make $jobArgs } - + INSTALL() { make install diff --git a/media-libs/speex/speex-1.2~rc1.recipe b/media-libs/speex/speex-1.2~rc1.recipe index acc6ae59a..c89e4279e 100644 --- a/media-libs/speex/speex-1.2~rc1.recipe +++ b/media-libs/speex/speex-1.2~rc1.recipe @@ -14,7 +14,7 @@ COPYRIGHT=" SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz" CHECKSUM_MD5="c4438b22c08e5811ff10e2b06ee9b9ae" REVISION="2" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="speex-1.2~rc1.patchset" diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.recipe b/media-video/ffmpeg/ffmpeg-0.10.2.recipe index b4c8fc95d..f26d636b9 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.2.recipe +++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe @@ -12,7 +12,7 @@ COPYRIGHT=" SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2" CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd" REVISION="4" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="ffmpeg-0.10.2-gcc2.patch" diff --git a/net-misc/curl/curl-7.26.0.recipe b/net-misc/curl/curl-7.26.0.recipe index 147f2a52c..f7c24844c 100644 --- a/net-misc/curl/curl-7.26.0.recipe +++ b/net-misc/curl/curl-7.26.0.recipe @@ -5,7 +5,7 @@ LICENSE="Curl" SRC_URI="http://curl.haxx.se/download/curl-7.26.0.tar.bz2" CHECKSUM_MD5="bfa80f01b3d300359cfb4d409b6136a3" REVISION="5" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="curl-7.26.0.patch" @@ -71,7 +71,7 @@ INSTALL() # install html development documentation for libcurl mkdir -p "$developDocDir" - for h in docs/libcurl/*.html; do + for h in docs/libcurl/*.html; do install -c -m 644 "$h" "$developDocDir" done @@ -94,12 +94,12 @@ 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, + 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. " diff --git a/net-misc/neon/neon-0.29.6.recipe b/net-misc/neon/neon-0.29.6.recipe index 57b9b6e08..9c86751fe 100644 --- a/net-misc/neon/neon-0.29.6.recipe +++ b/net-misc/neon/neon-0.29.6.recipe @@ -2,19 +2,19 @@ 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, + - high-level wrappers for common HTTP and WebDAV operations (GET, MOVE, DELETE, etc) - - low-level interface to the HTTP request/response engine, allowing the + - 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 + - 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 + - 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 + - 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 + - WebDAV metadata support; wrappers for PROPFIND and PROPPATCH to simplify property manipulation. " HOMEPAGE="http://www.webdav.org/neon/" @@ -23,7 +23,7 @@ COPYRIGHT="1999-2011 Joe Orton" SRC_URI="http://www.webdav.org/neon/neon-0.29.6.tar.gz" CHECKSUM_MD5="591e0c82e6979e7e615211b386b8f6bc" REVISION="7" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="neon-0.29.6.patch" diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index 295d66ed5..e290a249f 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -1,11 +1,11 @@ SUMMARY="Secure Shell Client and Server (Remote Login Program)" -HOMEPAGE="http://www.openssh.com/" +HOMEPAGE="http://www.openssh.com/" LICENSE="OpenSSH" COPYRIGHT="2005-2012 Tatu Ylonen et al." SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz" CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b" REVISION="7" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="openssh-6.0p1.patch" diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe index 12fdaf31b..e40f8f37e 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe @@ -1,6 +1,6 @@ -SUMMARY="A WPA Supplicant with support for WPA and WPA2" +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/" +HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" SRC_URI="http://hostap.epitest.fi/releases/wpa_supplicant-2.0.tar.gz" CHECKSUM_MD5="3be2ebfdcced52e00eda0afe2889839d" LICENSE=" @@ -9,7 +9,7 @@ LICENSE=" " COPYRIGHT="2003-2012 Jouni Malinen" REVISION="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="wpa_supplicant-2.0.patch" diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe index a526b0f72..07bed6a21 100644 --- a/sys-apps/grep/grep-2.14.recipe +++ b/sys-apps/grep/grep-2.14.recipe @@ -9,7 +9,7 @@ CHECKSUM_MD5="db55b9fc67d8c0895f3c73e94e2aebe3" #SRC_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz" #CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab" REVISION="5" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="grep-2.14-gcc2.patch" diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe index 7166ba58e..bd7da6844 100644 --- a/sys-apps/groff/groff-1.20.1.recipe +++ b/sys-apps/groff/groff-1.20.1.recipe @@ -6,7 +6,7 @@ CHECKSUM_MD5="48fa768dd6fdeb7968041dd5ae8e2b02" LICENSE="GNU GPL v3" COPYRIGHT="2003-2009 Free Software Foundation, Inc." REVISION="2" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" groff = $portVersion compat >= 1.20 diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe index f82f92c32..9301e1365 100644 --- a/sys-apps/man/man-1.6g.recipe +++ b/sys-apps/man/man-1.6g.recipe @@ -1,12 +1,12 @@ SUMMARY="Standard commands to read man pages" DESCRIPTION="Standard commands to read man pages." -HOMEPAGE="http://primates.ximian.com/~flucifredi/man/" +HOMEPAGE="http://primates.ximian.com/~flucifredi/man/" SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz" CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660" LICENSE="GNU GPL v2" COPYRIGHT="1989-2012 Free Software Foundation, Inc." REVISION="2" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="man-1.6g.patch" diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe index d1d6e94cd..7038c8e07 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -1,21 +1,21 @@ -SUMMARY="A stream editor" +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 + 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" + " +HOMEPAGE="http://www.gnu.org/software/sed" COPYRIGHT="1989-2009 Free Software Foundation, Inc." LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz" CHECKSUM_MD5="f0fd4d7da574d4707e442285fd2d3b86" REVISION="6" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="sed-4.2.1.patchset" diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe index 2e7122525..4601c846e 100644 --- a/sys-apps/texinfo/texinfo-4.13a.recipe +++ b/sys-apps/texinfo/texinfo-4.13a.recipe @@ -1,12 +1,12 @@ -SUMMARY="Standard GNU documentation format tool" -DESCRIPTION="Texinfo is the official documentation format of the GNU project." -HOMEPAGE="http://www.gnu.org/software/texinfo/" +SUMMARY="Standard GNU documentation format tool" +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" SRC_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-4.13a.tar.gz" CHECKSUM_MD5="71ba711519209b5fb583fed2b3d86fcb" REVISION="7" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="texinfo-4.13a.patch" diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index 076837328..998d2f445 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -14,7 +14,7 @@ LICENSE=" SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz" CHECKSUM_MD5="82d05e03b93e45f5a39b828dc9c6c29b" REVISION="4" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" autoconf = $portVersion compat >= 2.60 diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index 83cb33e6f..2b271b2b6 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -11,7 +11,7 @@ LICENSE="GNU GPL v2" SRC_URI="http://ftp.gnu.org/gnu/automake/automake-1.13.1.tar.gz" CHECKSUM_MD5="78a0ef8216b0556b44508e7b5b0c0847" REVISION="4" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" automake = $portVersion compat >= 1.13 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 a1ae7c4e4..a606257c2 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 @@ -10,7 +10,7 @@ LICENSE=" " COPYRIGHT="1988-2013 Free Software Foundation, Inc." -ARCHITECTURES="x86" +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. @@ -97,7 +97,7 @@ INSTALL() rm -r $developDir/headers ### HTML documentation #################################### - + echo "Organizing HTML documentation..." cd $docDir @@ -132,7 +132,7 @@ INSTALL() for file in $installDir/$effectiveTargetMachineTriple/bin/*; do symlinkRelative -sfn $binDir/$(basename $file) $file done - + ### Cleanup ################################################# echo "Cleanup" diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe index f6f13ffa6..8691d5460 100644 --- a/sys-devel/bison/bison-2.4.3.recipe +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -1,23 +1,23 @@ -SUMMARY="A yacc-compatible parser generator" +SUMMARY="A yacc-compatible parser generator" DESCRIPTION=" - Bison is a general-purpose parser generator that converts an annotated + 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 + 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 + 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" +HOMEPAGE="http://www.gnu.org/software/bison/bison.html" COPYRIGHT="1992-2010 Free Software Foundation, Inc." LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz" CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73" REVISION="5" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="bison-2.4.3.patch" diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index cda89b7f3..3a5ac50a0 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -1,15 +1,15 @@ -SUMMARY="A tool for generating scanners." +SUMMARY="A tool for generating scanners." DESCRIPTION=" - Flex is a fast lexical analyser generator. It is a tool for generating + 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/" +HOMEPAGE="http://flex.sourceforge.net/" COPYRIGHT="2001-2007 The Flex Project; 1990, 1997 The Regents of the University of California" LICENSE="Flex" SRC_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download" CHECKSUM_MD5="10714e50cea54dc7a227e3eddcd44d57" REVISION="6" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="flex-2.5.35.patch" 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 d713aa937..649557c1b 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 @@ -11,7 +11,7 @@ SRC_URI=" git+git://github.com/haiku/BuildtoolsPM.git#2d0a2c6404ffae1a46eb7e74daab08099b45af2c " REVISION="2" -ARCHITECTURES="x86" +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. @@ -73,6 +73,11 @@ BUILD() additionalConfigureFlags="\ --with-hybrid-secondary=${effectiveTargetArchitecture}" fi + if [ $effectiveTargetArchitecture == x86_64 ]; then + # disable multilib support, as x86_64 by default tries to build the + # 32-bit libraries, too, which fails as no 32-bit libroot is available + additionalConfigureFlags+=" --disable-multilib" + fi CFLAGS="-O2 -U_FORTIFY_SOURCE" CXXFLAGS="-O2" "$sourceDir/configure" \ --prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \ @@ -88,7 +93,7 @@ BUILD() INSTALL() { cd $objectsDir - + make install-strip make install-html @@ -102,7 +107,7 @@ INSTALL() done ### Strip ################################################# - + echo "Strip debug info" cd $installDir @@ -111,7 +116,7 @@ INSTALL() strip --strip-debug lib/gcc/$effectiveTargetMachineTriple/*/$f done strip --strip-debug lib/*.a - + ### Symlinks ############################################## echo "Creating required symlinks" @@ -126,7 +131,7 @@ INSTALL() done ### Cleanup ############################################### - + echo "Cleanup" rm -rf $installDir/info rm -rf $installDir/share diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe index 3559826aa..5b1090fe9 100644 --- a/sys-devel/gettext/gettext-0.18.1.1.recipe +++ b/sys-devel/gettext/gettext-0.18.1.1.recipe @@ -6,7 +6,7 @@ COPYRIGHT="1998, 2010 Free Software Foundation, Inc." SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz" CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89" REVISION="5" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="gettext-0.18.1.1.patch" 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 00d374bcc..23ed78d22 100644 --- a/sys-devel/jam/jam-2.5_2012_10_12.recipe +++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe @@ -1,18 +1,18 @@ 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 + 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. + - 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, + - 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" @@ -23,7 +23,7 @@ SRC_URI=" git+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462 " REVISION="1" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" jam = $portVersion @@ -53,7 +53,7 @@ INSTALL() { mkdir -p "$binDir" cp bin.haikux86/jam "$binDir" - + mkdir -p "$docDir" cp Jam.html Jambase.html Jamfile.html README* "$docDir" } diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index f7fde1503..cec49589f 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -1,15 +1,15 @@ -SUMMARY="A generic library support script" +SUMMARY="A generic library support script" DESCRIPTION=" GNU libtool is a set of shell scripts to automatically configure UNIX architectures to build shared libraries in a generic fashion. " -HOMEPAGE="http://www.gnu.org/software/libtool" +HOMEPAGE="http://www.gnu.org/software/libtool" COPYRIGHT="2004-2010 Free Software Foundation, Inc." LICENSE="GNU GPL v2" SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz" CHECKSUM_MD5="b32b04148ecdd7344abc6fe8bd1bb021" REVISION="8" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES=" 2.4/adjust_config_for_packaging.patch diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe index 390f3b74d..31d1cf934 100644 --- a/sys-devel/m4/m4-1.4.16.recipe +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -1,28 +1,28 @@ -SUMMARY="A macro processor" +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 + 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 + 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/" + " +HOMEPAGE="http://www.gnu.org/software/m4/" COPYRIGHT="2000, 2005-2011 Free Software Foundation, Inc." LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz" CHECKSUM_MD5="a5dfb4f2b7370e9d34293d23fd09b280" REVISION="5" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" m4 = $portVersion compat >= 1.4 diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index 1465ccac9..67c416f55 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -1,21 +1,21 @@ -SUMMARY="Standard tool to compile source trees" +SUMMARY="Standard tool to compile source trees" DESCRIPTION=" - Make is a tool which controls the generation of executables and other + 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 + 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/" +HOMEPAGE="http://www.gnu.org/software/make/" LICENSE="GNU GPL v3" COPYRIGHT="1988-2010 Free Software Foundation, Inc." SRC_URI="http://ftp.gnu.org/pub/gnu/make/make-3.82.tar.bz2" CHECKSUM_MD5="1a11100f3c63fcf5753818e59d63088f" REVISION="5" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="make-3.82.patch" diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe index c83e4fcec..85569360c 100644 --- a/sys-libs/glu/glu-9.0.0.recipe +++ b/sys-libs/glu/glu-9.0.0.recipe @@ -6,7 +6,7 @@ LICENSE="MIT" SRC_URI="ftp://freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.gz" CHECKSUM_MD5="bbc57d4fe3bd3fb095bdbef6fcb977c4" REVISION="2" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" @@ -36,7 +36,7 @@ BUILD() libglLinkFlags="-L$(pwd)" LDFLAGS="$libglLinkFlags" \ - runConfigure ./configure + runConfigure ./configure make $jobArgs } diff --git a/sys-libs/mesa/mesa-9.1.1.recipe b/sys-libs/mesa/mesa-9.1.1.recipe index ff3ca11bd..aea69935d 100644 --- a/sys-libs/mesa/mesa-9.1.1.recipe +++ b/sys-libs/mesa/mesa-9.1.1.recipe @@ -10,13 +10,13 @@ DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification - 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/" +HOMEPAGE="http://www.mesa3d.org/" COPYRIGHT="1999-2012 Brian Paul All Rights Reserved." LICENSE="MIT" SRC_URI="ftp://freedesktop.org/pub/mesa/9.1.1/MesaLib-9.1.1.tar.bz2" CHECKSUM_MD5="6ea2bdc3b7ecfb4257b39814b4182580" REVISION="1" -ARCHITECTURES="x86" +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. diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index cf04be857..677256cdf 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -1,11 +1,11 @@ SUMMARY="New curses library" -HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" +HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" SRC_URI="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz" CHECKSUM_MD5="8cb9c412e5f2d96bc6f459aa8c6282a1" LICENSE="MIT" COPYRIGHT="1998-2011 Free Software Foundation, Inc." REVISION="10" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="ncurses-5.9.patchset" diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe index 86e896233..a261402a2 100644 --- a/sys-libs/readline/readline-6.2.recipe +++ b/sys-libs/readline/readline-6.2.recipe @@ -1,14 +1,14 @@ 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." -HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" +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" SRC_URI="ftp://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz" CHECKSUM_MD5="67948acb2ca081f23359d0256e9a271c" REVISION="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="readline-6.2.patch" diff --git a/sys-libs/zlib/zlib-1.2.8.recipe b/sys-libs/zlib/zlib-1.2.8.recipe index fda155eff..27a19b121 100644 --- a/sys-libs/zlib/zlib-1.2.8.recipe +++ b/sys-libs/zlib/zlib-1.2.8.recipe @@ -1,12 +1,12 @@ 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." -HOMEPAGE="http://www.zlib.net/" +HOMEPAGE="http://www.zlib.net/" COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" LICENSE="Zlib" SRC_URI="http://zlib.net/zlib-1.2.8.tar.gz" CHECKSUM_MD5="44d667c142d7cda120332623eab69f40" REVISION="3" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" From f57f1f5754107f9d1bf3f5ca05a4836dd5749fe4 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 31 Aug 2013 18:54:41 +0200 Subject: [PATCH 453/587] Add --with-sysroot=/ to binutils recipe. * on the bootstrap image, these binutils may be used by a gcc that's passing --sysroot= to ld, so we better configure ld to support that --- sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 a606257c2..3db357b10 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 @@ -3,7 +3,7 @@ HOMEPAGE="http://www.gnu.org/software/binutils" SRC_URI=" git+git://github.com/haiku/BuildtoolsPM.git#db2a6d28f6c6a92cfb1c619b0828dfbf6b87ca30" -REVISION="1" +REVISION="2" LICENSE=" GNU GPL v2 GNU LGPL v2 @@ -80,7 +80,11 @@ BUILD() --exec-prefix=$installDir \ --includedir=$includeDir/binutils \ --docdir=$docDir \ - --disable-nls --enable-shared=yes + --disable-nls --enable-shared=yes \ + --with-sysroot=/ + # Note: The sysroot option is normally superfluous. We have to specify + # it, however, since these binutils may be used by the bootstrap-gcc, + # which passes --sysroot= to ld. make $jobArgs } From 63b8cbe0a377ed07011bcf166770aff7fa21b18c Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 31 Aug 2013 18:55:28 +0200 Subject: [PATCH 454/587] Explicitly set build type for gcc recipe. --- sys-devel/gcc/gcc-4.7.3_2013_08_12.recipe | 1 + 1 file changed, 1 insertion(+) 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 649557c1b..32ce0a89b 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 @@ -80,6 +80,7 @@ BUILD() fi CFLAGS="-O2 -U_FORTIFY_SOURCE" CXXFLAGS="-O2" "$sourceDir/configure" \ + --build=$effectiveTargetMachineTriple \ --prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \ --docdir=$docDir \ --disable-nls --enable-shared \ From ceb0690ff12bfc55d06e4ce47eb2487e192da04b Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 4 Sep 2013 02:12:14 -0700 Subject: [PATCH 455/587] Updated libevent-2.0.21, it builds but still has a couple policy issues to sort out. --- dev-libs/libevent/libevent-2.0.21.recipe | 86 +++++++++++++++--------- 1 file changed, 56 insertions(+), 30 deletions(-) diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index 86dbf3a6d..383df5c7f 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -15,25 +15,31 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" cmd:event_rpcgen.py - libevent$secondaryArchSuffix = $portVersion - lib:libevent$secondaryArchSuffix = 2.0.0 compat >= 2 - lib:libevent_2.0 = 5 compat >= 5 - lib:libevent_2.0 = 5.1.9 compat >= 5 - lib:libevent_core_2.0 = 5 compat >= 5 - lib:libevent_core_2.0 = 5.1.9 compat >= 5 - lib:libevent_core - lib:libevent_extra_2.0 = 5 compat >= 5 - lib:libevent_extra_2.0 = 5.1.9 compat >= 5 - lib:libevent_extra - lib:libevent_pthreads_2.0 = 5 compat >= 5 - lib:libevent_pthreads_2.0 = 5.1.9 compat >= 5 - lib:libevent_pthreads +# 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_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 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libnetwork$secondaryArchSuffix >= $haikuVersion + lib:libssl$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libnetwork >= $haikuVersion " BUILD_REQUIRES=" + devel:libssl$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix + devel:libz " + BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal @@ -46,14 +52,13 @@ BUILD_PREREQUIRES=" " SOURCE_DIR="$portVersionedName-stable" -PATCH() -{ - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in - sed -i 's/TESTS = $(top_srcdir)/TESTS = {$sourceDir}/g' test/Makefile.am -} +PATCHES="libevent-2.0.21.patch" BUILD() { + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in + sed -i 's/TESTS = $(top_srcdir)/TESTS = {$sourceDir}/g' test/Makefile.am + libtoolize --force --copy --install aclocal autoconf @@ -65,11 +70,20 @@ BUILD() INSTALL() { make install - prepareInstalledDevelLibs libevent + prepareInstalledDevelLibs \ + libevent \ + libevent_core \ + libevent_extra \ + libevent_pthreads \ + libevent_openssl + + mv .libs/libevent_core.* \ + .libs/libevent_extra.* \ + .libs/libevent_pthreads.* \ + .libs/libevent_openssl.* \ + $developLibDir fixPkgconfig - - ls # devel package packageEntries devel \ $developDir @@ -78,15 +92,27 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - libevent_devel = $portVersion compat >= 2 - devel:libevent = $portVersion compat >= 2 - devel:libevent_core.a = 5 compat >= 5 - devel:libevent_core.la = 5.1.9 compat >= 5 - devel:libevent_extra.a = 5 compat >= 5 - devel:libevent_extra.la = 5.1.9 compat >= 5 - devel:libevent_pthreads.a = 5 compat >= 5 - devel:libevent_pthreads.la = 5.1.9 compat >= 5 + cmd:event_rpcgen.py + lib:libevent$secondaryArchSuffix = $portVersion + 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 +## 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 + devel:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5 + devel:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5 " + REQUIRES_devel=" - libevent == $portVersion base + libevent$secondaryArchSuffix == $portVersion base + devel:libssl + devel:libcrypto " From b21beb129d4be0e93518158f280ea851a4fe7e09 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 4 Sep 2013 23:22:01 -0700 Subject: [PATCH 456/587] Updated recipe for libpaper-1.1.24 so that it builds now. --- app-text/libpaper/libpaper-1.1.24.recipe | 77 ++++++++++++++++++------ 1 file changed, 58 insertions(+), 19 deletions(-) diff --git a/app-text/libpaper/libpaper-1.1.24.recipe b/app-text/libpaper/libpaper-1.1.24.recipe index 86c0d3792..4401d0adc 100644 --- a/app-text/libpaper/libpaper-1.1.24.recipe +++ b/app-text/libpaper/libpaper-1.1.24.recipe @@ -1,34 +1,73 @@ -DESCRIPTION="Library for handling paper characteristics" +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." 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" + +LICENSE="GNU GPL v2" +COPYRIGHT="1996 Yves Arrouye + 2000 Adrian Bunk" + REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" + +ARCHITECTURES="x86_gcc2 x86" + CHECKSUM_MD5="5bc87d494ba470aba54f6d2d51471834" + +REQUIRES=" + lib:libroot >= $haikuVersion + " + +BUILD_REQUIRES="" + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:ld + cmd:libtool + cmd:aclocal + cmd:autoconf + cmd:make + cmd:sed + " + +PROVIDES=" + cmd:paperconf + cmd:paperconfig + lib:libpaper$secondaryArchSuffix = 1.1.24 compat >= 1 + " + BUILD() { - cd libpaper-1.1.24 - mkdir -p `finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac + echo "AM_PROG_CC_C_O" >> configure.ac libtoolize --force --copy --install aclocal --install -I m4 autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY` - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$COMMON_DOCS/man \ - --sbindir=$COMMON_BIN - make + touch NEWS + touch AUTHORS + automake --add-missing + runConfigure ./configure + make $jobArgs } INSTALL() { - cd libpaper-1.1.24 make install - + prepareInstalledDevelLibs \ + libpaper + + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir } -LICENSE="GNU GPL v2" -COPYRIGHT="1996 Yves Arrouye - 2000 Adrian Bunk" + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + devel:libpaper$secondaryArchSuffix = 1.1.24 compat >= 1 + " + +REQUIRES_devel=" + libpaper$secondaryArchSuffix == $portVersion base + " From 2d75766982a4dc85d79bc44697d0477c2cbb2675 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 4 Sep 2013 23:23:24 -0700 Subject: [PATCH 457/587] Remove old libpaper-1.1.23.recipe --- app-text/libpaper/libpaper-1.1.23.recipe | 26 ------------------------ 1 file changed, 26 deletions(-) delete mode 100644 app-text/libpaper/libpaper-1.1.23.recipe diff --git a/app-text/libpaper/libpaper-1.1.23.recipe b/app-text/libpaper/libpaper-1.1.23.recipe deleted file mode 100644 index 34eeaa7a3..000000000 --- a/app-text/libpaper/libpaper-1.1.23.recipe +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="Library for handling paper characteristics" -HOMEPAGE="http://packages.debian.org/unstable/source/libpaper" -SRC_URI="http://ftp.de.debian.org/debian/pool/main/libp/libpaper/libpaper_1.1.23+nmu2.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="30e58b56c0b891b89e7d8c287be368b8" -BUILD() -{ - cd libpaper-1.1.23+nmu2 - libtoolize --force --copy --install - aclocal -# automake - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libpaper-1.1.23+nmu2 - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1996 Yves Arrouye - 2000 Adrian Bunk" From d96c84a69a85ae908191292628cc4c771a702ea9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 5 Sep 2013 02:18:57 -0700 Subject: [PATCH 458/587] Update summary for libevent --- dev-libs/libevent/libevent-2.0.21.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index 383df5c7f..4e38d3e71 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -1,4 +1,4 @@ -SUMMARY="Libevent" +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." HOMEPAGE="http://www.libevent.org/" From eec0a0885950ab96e15f38d6dc91c8788273b23e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 5 Sep 2013 02:20:25 -0700 Subject: [PATCH 459/587] Update .recipe for libevent=1.4.14b, still not building yet, but getting close. --- dev-libs/libevent/libevent-1.4.14b.recipe | 104 ++++++++++++++++++---- 1 file changed, 89 insertions(+), 15 deletions(-) diff --git a/dev-libs/libevent/libevent-1.4.14b.recipe b/dev-libs/libevent/libevent-1.4.14b.recipe index 91c655a79..d26571f16 100644 --- a/dev-libs/libevent/libevent-1.4.14b.recipe +++ b/dev-libs/libevent/libevent-1.4.14b.recipe @@ -1,27 +1,101 @@ -DESCRIPTION="Libevent" -HOMEPAGE="http://monkey.org/~provos/libevent/" +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." +HOMEPAGE="http://www.libevent.org/" SRC_URI="http://monkey.org/~provos/libevent-1.4.14b-stable.tar.gz" CHECKSUM_MD5="a00e037e4d3f9e4fe9893e8a2d27918c" +LICENSE="BSD (3-clause)" +COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." + REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" + +ARCHITECTURES="?x86_gcc2 ?x86" + +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + cmd:event_rpcgen.py + lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libnetwork$secondaryArchSuffix >= $haikuVersion + lib:libssl$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libnetwork >= $haikuVersion + " +BUILD_REQUIRES=" + devel:libz + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " +SOURCE_DIR="$portVersionedName-stable" + +PATCHES="libevent-1.4.14b.patch" BUILD() { - cd libevent-1.4.14b-stable - autoreconf -vfi - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$COMMON_DOCS - make + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in + sed -i 's/TESTS = $(top_srcdir)/TESTS = {$sourceDir}/g' test/Makefile.am + + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + runConfigure ./configure + make $jobArgs } INSTALL() { - cd libevent-1.4.14b-stable make install + prepareInstalledDevelLibs \ + libevent_1.4 \ + libevent_core_1.4 \ + libevent_extra_1.4 + + mv .libs/libevent.* + .libs/libevent_core.* \ + .libs/libevent_extra.* \ + $developLibDir + + mv .libs/libevent_1.4.* + .libs/libevent_core_1.4.* \ + .libs/libevent_extra_1.4.* \ + $developLibDir + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir } -LICENSE="BSD (3-clause)" -COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + cmd:event_rpcgen.py +# lib:libevent_1.4$secondaryArchSuffix = $portVersion +# lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 +# devel:libevent_1.4$secondaryArchSuffix >= 2.2.0 compat >= 2 + devel:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + devel:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + devel:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2 + devel:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2 + " + +REQUIRES_devel=" + libevent$secondaryArchSuffix == $portVersion base + " From f56f970eba2b6079326ae04a454bf6305f9bbd93 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 5 Sep 2013 02:22:17 -0700 Subject: [PATCH 460/587] Remove old libevent .recipe and .patch files --- dev-libs/libevent/libevent-1.4.11.recipe | 23 ---------------- dev-libs/libevent/libevent-1.4.13.recipe | 23 ---------------- dev-libs/libevent/libevent-2.0.10.recipe | 27 ------------------- .../libevent/patches/libevent-1.4.11.patch | 12 --------- .../libevent/patches/libevent-1.4.13.patch | 12 --------- .../libevent/patches/libevent-2.0.10.patch | 26 ------------------ 6 files changed, 123 deletions(-) delete mode 100644 dev-libs/libevent/libevent-1.4.11.recipe delete mode 100644 dev-libs/libevent/libevent-1.4.13.recipe delete mode 100644 dev-libs/libevent/libevent-2.0.10.recipe delete mode 100644 dev-libs/libevent/patches/libevent-1.4.11.patch delete mode 100644 dev-libs/libevent/patches/libevent-1.4.13.patch delete mode 100644 dev-libs/libevent/patches/libevent-2.0.10.patch diff --git a/dev-libs/libevent/libevent-1.4.11.recipe b/dev-libs/libevent/libevent-1.4.11.recipe deleted file mode 100644 index adcc35f01..000000000 --- a/dev-libs/libevent/libevent-1.4.11.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="Libevent" -HOMEPAGE="http://monkey.org/~provos/libevent/" -SRC_URI="http://monkey.org/~provos/libevent-1.4.11-stable.tar.gz" -CHECKSUM_MD5="3d2dfe659a84441dd27e4587b5ffe0fe" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" - -BUILD() -{ - cd libevent-1.4.11-stable - autoreconf -vfi - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libevent-1.4.11-stable - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." diff --git a/dev-libs/libevent/libevent-1.4.13.recipe b/dev-libs/libevent/libevent-1.4.13.recipe deleted file mode 100644 index e20c33422..000000000 --- a/dev-libs/libevent/libevent-1.4.13.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="Libevent" -HOMEPAGE="http://monkey.org/~provos/libevent/" -SRC_URI="http://monkey.org/~provos/libevent-1.4.13-stable.tar.gz" -CHECKSUM_MD5="0b3ea18c634072d12b3c1ee734263664" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" - -BUILD() -{ - cd libevent-1.4.13-stable - autoreconf -vfi - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libevent-1.4.13-stable - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." diff --git a/dev-libs/libevent/libevent-2.0.10.recipe b/dev-libs/libevent/libevent-2.0.10.recipe deleted file mode 100644 index 3ebdfec99..000000000 --- a/dev-libs/libevent/libevent-2.0.10.recipe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="Libevent" -HOMEPAGE="http://monkey.org/~provos/libevent/" -SRC_URI="http://monkey.org/~provos/libevent-2.0.10-stable.tar.gz" -CHECKSUM_MD5="a37401d26cbbf28185211d582741a3d4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" - -BUILD() -{ - cd libevent-2.0.10-stable - autoreconf -vfi - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$COMMON_DOCS - make -} - -INSTALL() -{ - cd libevent-2.0.10-stable - make install -} -LICENSE="BSD (3-clause)" -COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." diff --git a/dev-libs/libevent/patches/libevent-1.4.11.patch b/dev-libs/libevent/patches/libevent-1.4.11.patch deleted file mode 100644 index 666e9f109..000000000 --- a/dev-libs/libevent/patches/libevent-1.4.11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libevent-1.4.11-stable/configure.in libevent-1.4.11-stable-haiku/configure.in ---- libevent-1.4.11-stable/configure.in 2009-05-24 13:37:49.000000000 +0000 -+++ libevent-1.4.11-stable-haiku/configure.in 2009-05-28 16:55:17.000000000 +0000 -@@ -33,7 +33,7 @@ - AC_SUBST(LIBTOOL_DEPS) - - dnl Checks for libraries. --AC_CHECK_LIB(socket, socket) -+AC_SEARCH_LIBS(socket, socket network) - AC_CHECK_LIB(resolv, inet_aton) - AC_CHECK_LIB(rt, clock_gettime) - AC_CHECK_LIB(nsl, inet_ntoa) diff --git a/dev-libs/libevent/patches/libevent-1.4.13.patch b/dev-libs/libevent/patches/libevent-1.4.13.patch deleted file mode 100644 index 3f01c4701..000000000 --- a/dev-libs/libevent/patches/libevent-1.4.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libevent-1.4.13-stable/configure.in libevent-1.4.13-stable-haiku/configure.in ---- libevent-1.4.13-stable/configure.in 2009-05-24 13:37:49.000000000 +0000 -+++ libevent-1.4.13-stable-haiku/configure.in 2009-05-28 16:55:17.000000000 +0000 -@@ -33,7 +33,7 @@ - AC_SUBST(LIBTOOL_DEPS) - - dnl Checks for libraries. --AC_CHECK_LIB(socket, socket) -+AC_SEARCH_LIBS(socket, socket network) - AC_CHECK_LIB(resolv, inet_aton) - AC_CHECK_LIB(rt, clock_gettime) - AC_CHECK_LIB(nsl, inet_ntoa) diff --git a/dev-libs/libevent/patches/libevent-2.0.10.patch b/dev-libs/libevent/patches/libevent-2.0.10.patch deleted file mode 100644 index bd94c5901..000000000 --- a/dev-libs/libevent/patches/libevent-2.0.10.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur libevent-2.0.10-stable/configure.in libevent-2.0.10-stable-haiku/configure.in ---- libevent-2.0.10-stable/configure.in 2010-12-16 18:38:34.018350080 +0100 -+++ libevent-2.0.10-stable-haiku/configure.in 2011-02-21 23:55:55.070254592 +0100 -@@ -54,8 +54,8 @@ - AC_SUBST(LIBTOOL_DEPS) - - dnl Checks for libraries. --AC_SEARCH_LIBS([inet_ntoa], [nsl]) --AC_SEARCH_LIBS([socket], [socket]) -+AC_SEARCH_LIBS([inet_ntoa], [nsl network]) -+AC_SEARCH_LIBS([socket], [socket network]) - AC_SEARCH_LIBS([inet_aton], [resolv]) - AC_SEARCH_LIBS([clock_gettime], [rt]) - AC_SEARCH_LIBS([sendfile], [sendfile]) -diff -Naur libevent-2.0.10-stable/util-internal.h libevent-2.0.10-stable-haiku/util-internal.h ---- libevent-2.0.10-stable/util-internal.h 2010-12-14 20:07:56.021233664 +0100 -+++ libevent-2.0.10-stable-haiku/util-internal.h 2011-02-22 00:00:14.000000000 +0100 -@@ -173,7 +173,7 @@ - - /* Evaluates to the same boolean value as 'p', and hints to the compiler that - * we expect this value to be false. */ --#ifdef __GNUC__ -+#if __GNUC__ >= 3 - #define EVUTIL_UNLIKELY(p) __builtin_expect(!!(p),0) - #else - #define EVUTIL_UNLIKELY(p) (p) \ No newline at end of file From 4140f231ab1ac0c9ef1554d44c98504d372bc0e0 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 2 Sep 2013 23:28:12 +0200 Subject: [PATCH 461/587] Add missing additional files for a couple of source packages. --- .../{sources => additional-files}/p7zip-expander-rules | 0 app-arch/p7zip/p7zip-9.20.1.recipe | 7 +++++-- .../{sources => additional-files}/xz_utils-expander-rules | 0 app-arch/xz_utils/xz_utils-5.0.4.recipe | 7 +++++-- .../Installing alternative sound fonts | 0 haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe | 7 +++++-- 6 files changed, 15 insertions(+), 6 deletions(-) rename app-arch/p7zip/{sources => additional-files}/p7zip-expander-rules (100%) rename app-arch/xz_utils/{sources => additional-files}/xz_utils-expander-rules (100%) rename haiku-data/timgmsoundfont/{sources => additional-files}/Installing alternative sound fonts (100%) diff --git a/app-arch/p7zip/sources/p7zip-expander-rules b/app-arch/p7zip/additional-files/p7zip-expander-rules similarity index 100% rename from app-arch/p7zip/sources/p7zip-expander-rules rename to app-arch/p7zip/additional-files/p7zip-expander-rules diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe index 4b17b1c39..27974a978 100644 --- a/app-arch/p7zip/p7zip-9.20.1.recipe +++ b/app-arch/p7zip/p7zip-9.20.1.recipe @@ -5,11 +5,13 @@ SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20. CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89" LICENSE="GNU LGPL v2.1" COPYRIGHT="1999-2011 7-Zip Igor Pavlov." -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="p7zip-9.20.1.patch" +ADDITIONAL_FILES="p7zip-expander-rules" + PROVIDES=" p7zip = $portVersion cmd:7za = $portVersion compat >= 9 @@ -41,5 +43,6 @@ INSTALL() expanderRulesDir=$dataDir/expander/rules mkdir -p $expanderRulesDir - cp "$portDir/sources/p7zip-expander-rules" "$expanderRulesDir/p7zip" + cp "$portDir/additional-files/p7zip-expander-rules" \ + "$expanderRulesDir/p7zip" } diff --git a/app-arch/xz_utils/sources/xz_utils-expander-rules b/app-arch/xz_utils/additional-files/xz_utils-expander-rules similarity index 100% rename from app-arch/xz_utils/sources/xz_utils-expander-rules rename to app-arch/xz_utils/additional-files/xz_utils-expander-rules 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 a0c2295df..182e5ca37 100644 --- a/app-arch/xz_utils/xz_utils-5.0.4.recipe +++ b/app-arch/xz_utils/xz_utils-5.0.4.recipe @@ -8,7 +8,7 @@ LICENSE=" GNU GPL v3 " COPYRIGHT="2005-2012 Lasse Collin" -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 @@ -19,6 +19,8 @@ else fi SECONDARY_ARCHITECTURES="x86" +ADDITIONAL_FILES="xz_utils-expander-rules" + # On x86_gcc2 we don't want to install the commands in bin//, but in bin/. commandSuffix=$secondaryArchSuffix commandBinDir=$binDir @@ -83,7 +85,8 @@ INSTALL() expanderRulesDir=$dataDir/expander/rules mkdir -p $expanderRulesDir - cp "$portDir/sources/xz_utils-expander-rules" "$expanderRulesDir/xz_utils" + cp "$portDir/additional-files/xz_utils-expander-rules" \ + "$expanderRulesDir/xz_utils" prepareInstalledDevelLibs liblzma } diff --git a/haiku-data/timgmsoundfont/sources/Installing alternative sound fonts b/haiku-data/timgmsoundfont/additional-files/Installing alternative sound fonts similarity index 100% rename from haiku-data/timgmsoundfont/sources/Installing alternative sound fonts rename to haiku-data/timgmsoundfont/additional-files/Installing alternative sound fonts diff --git a/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe index 3cc3e7d4a..5ab8ee577 100644 --- a/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe +++ b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe @@ -5,10 +5,12 @@ LICENSE="Public Domain" COPYRIGHT="2004 Tim Brechbill" SRC_URI="http://ocmnet.com/saxguru/TimGM6mb.sf2#noarchive" CHECKSUM_MD5="1f569cc40159a6bd9250f816225ae222" -REVISION="3" +REVISION="4" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes +ADDITIONAL_FILES="Installing alternative sound fonts" + PROVIDES=" timgmsoundfont = $portVersion compat >= 0 " @@ -29,7 +31,8 @@ INSTALL() { synthDir=$dataDir/synth mkdir -p $synthDir - cp TimGM6mb.sf2 "$portDir/sources/Installing alternative sound fonts" \ + cp TimGM6mb.sf2 \ + "$portDir/additional-files/Installing alternative sound fonts" \ $synthDir ln -s TimGM6mb.sf2 $synthDir/big_synth.sy # TODO: Since the data directory is read-only, replacing the symlink isn't From 08421602f52ec9d01fbb3e67ffe817b8830d477b Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 7 Sep 2013 15:30:58 +0200 Subject: [PATCH 462/587] Avoid attempts at rebuilding gperf-documentation. --- dev-util/gperf/gperf-3.0.4.recipe | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-util/gperf/gperf-3.0.4.recipe b/dev-util/gperf/gperf-3.0.4.recipe index de1f99d51..309ff1491 100644 --- a/dev-util/gperf/gperf-3.0.4.recipe +++ b/dev-util/gperf/gperf-3.0.4.recipe @@ -33,6 +33,9 @@ BUILD_PREREQUIRES=" BUILD() { + # touch documentation to avoid attempts at rebuilding it (which will fail) + touch doc/*.{pdf,ps} + runConfigure ./configure make $jobArgs } From 2176a9af66d902cb4a687926f50abb6a8c858226 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 7 Sep 2013 14:28:43 -0700 Subject: [PATCH 463/587] Fixed libevent-1.4.14b so that it now builds cleanly, note there is a TODO here still --- dev-libs/libevent/libevent-1.4.14b.recipe | 50 ++++++++++++----------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/dev-libs/libevent/libevent-1.4.14b.recipe b/dev-libs/libevent/libevent-1.4.14b.recipe index d26571f16..3681bbc1a 100644 --- a/dev-libs/libevent/libevent-1.4.14b.recipe +++ b/dev-libs/libevent/libevent-1.4.14b.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." REVISION="1" -ARCHITECTURES="?x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -18,16 +18,14 @@ PROVIDES=" lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - lib:libnetwork$secondaryArchSuffix >= $haikuVersion - lib:libssl$secondaryArchSuffix - lib:libcrypto$secondaryArchSuffix - lib:libnetwork >= $haikuVersion " BUILD_REQUIRES=" - devel:libz " BUILD_PREREQUIRES=" @@ -58,25 +56,27 @@ BUILD() } INSTALL() -{ +{ make install - prepareInstalledDevelLibs \ - libevent_1.4 \ - libevent_core_1.4 \ - libevent_extra_1.4 + +# TODO: replace /packages/libevent-1.4.14b-1/.self/ with an alias + mv /packages/libevent-1.4.14b-1/.self/lib/libevent.a \ + /packages/libevent-1.4.14b-1/.self/lib/libevent.la \ + /packages/libevent-1.4.14b-1/.self/lib/libevent_core.a \ + /packages/libevent-1.4.14b-1/.self/lib/libevent_core.la \ + /packages/libevent-1.4.14b-1/.self/lib/libevent_extra.a \ + /packages/libevent-1.4.14b-1/.self/lib/libevent_extra.la \ + $developDir + + prepareInstalledDevelLibs \ + libevent-1.4 \ + libevent_core-1.4 \ + libevent_extra-1.4 - mv .libs/libevent.* - .libs/libevent_core.* \ - .libs/libevent_extra.* \ - $developLibDir - - mv .libs/libevent_1.4.* - .libs/libevent_core_1.4.* \ - .libs/libevent_extra_1.4.* \ - $developLibDir fixPkgconfig # devel package + packageEntries devel \ $developDir } @@ -84,12 +84,14 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - cmd:event_rpcgen.py -# lib:libevent_1.4$secondaryArchSuffix = $portVersion -# lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 + cmd:event_rpcgen.py + lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 -# devel:libevent_1.4$secondaryArchSuffix >= 2.2.0 compat >= 2 + lib:libevent$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2 + lib:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2 + devel:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 devel:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 devel:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2 devel:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2 From 6135e5d5508d6365cb523b221675350be0128bfb Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 7 Sep 2013 14:29:01 -0700 Subject: [PATCH 464/587] Fixed libevent-2.0.21 so that it now builds cleanly. --- dev-libs/libevent/libevent-2.0.21.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index 4e38d3e71..adde785c0 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -15,8 +15,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" 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$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 @@ -99,8 +99,8 @@ 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$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 devel:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5 From 0ddf5a43e3ae753059cfda252bd33d4e410bd454 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 11 Sep 2013 07:52:02 -0700 Subject: [PATCH 465/587] Added .recipe for fribidi-0.19.5 --- dev-libs/fribidi/fribidi-0.19.5.recipe | 81 ++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 dev-libs/fribidi/fribidi-0.19.5.recipe diff --git a/dev-libs/fribidi/fribidi-0.19.5.recipe b/dev-libs/fribidi/fribidi-0.19.5.recipe new file mode 100644 index 000000000..5413075ab --- /dev/null +++ b/dev-libs/fribidi/fribidi-0.19.5.recipe @@ -0,0 +1,81 @@ +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." +HOMEPAGE="http://fribidi.org/" +SRC_URI="http://fribidi.org/download/fribidi-0.19.5.tar.bz2" +CHECKSUM_MD5="925bafb97afee8a2fc2d0470c072a155" +REVISION="1" + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2004 Sharif FarsiWeb, Inc + 2001,2002 Behdad Esfahbod + 1999,2000 Dov Grobgeld" + +ARCHITECTURES="x86_gcc2 x86" + +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + fribidi$secondaryArchSuffix = $portVersion + cmd:fribidi = 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 + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " +BUILD() +{ + 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 + + + + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs \ + libfribidi + + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +TEST() +{ + make test +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + fribidi${secondaryArchSuffix}_devel = $portVersion + cmd:fribidi$secondaryArchSuffix = $portVersion compat >= 0.19 + lib:libfribidi$secondaryArchSuffix = 0.3.4 compat >= 0 + devel:libfribidi$secondaryArchSuffix = 0.3.4 compat >= 0 + " +REQUIRES_devel=" + fribidi$secondaryArchSuffix == $portVersion base + " From 28fde5273db7120fd5c945118fe85cc2fa036819 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 11 Sep 2013 07:52:37 -0700 Subject: [PATCH 466/587] Remove old .recipe for fribidi --- dev-libs/fribidi/fribidi-0.19.2.recipe | 34 -------------------------- 1 file changed, 34 deletions(-) delete mode 100644 dev-libs/fribidi/fribidi-0.19.2.recipe diff --git a/dev-libs/fribidi/fribidi-0.19.2.recipe b/dev-libs/fribidi/fribidi-0.19.2.recipe deleted file mode 100644 index b1ecc82ef..000000000 --- a/dev-libs/fribidi/fribidi-0.19.2.recipe +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION="fribidi - A free implementation of the unicode bidirectional algorithm" -HOMEPAGE="http://fribidi.org/" -SRC_URI="http://fribidi.org/download/fribidi-0.19.2.tar.gz" -CHECKSUM_MD5="626db17d2d99b43615ad9d12500f568a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd fribidi-0.19.2 - rm -rf aclocal.m4 - mkdir -p m4 - libtoolize --force --copy --install - aclocal --install -I m4 - automake - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$COMMON_DOCS - make -} - -INSTALL() -{ - cd fribidi-0.19.2 - make install -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2004 Sharif FarsiWeb, Inc - 2001,2002 Behdad Esfahbod - 1999,2000 Dov Grobgeld" From 212b2eea7e43ecd040368eb1a27e8dc490db2d5c Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 11 Sep 2013 19:03:59 -0700 Subject: [PATCH 467/587] Removed as suggested by Ingo. --- dev-libs/fribidi/fribidi-0.19.5.recipe | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-libs/fribidi/fribidi-0.19.5.recipe b/dev-libs/fribidi/fribidi-0.19.5.recipe index 5413075ab..7941743c7 100644 --- a/dev-libs/fribidi/fribidi-0.19.5.recipe +++ b/dev-libs/fribidi/fribidi-0.19.5.recipe @@ -15,9 +15,9 @@ ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - fribidi$secondaryArchSuffix = $portVersion + fribidi = $portVersion cmd:fribidi = 0.19.5 compat >= 0.19 - lib:libfribidi$secondaryArchSuffix = 0.3.4 compat >= 0 + lib:libfribidi = 0.3.4 compat >= 0 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion @@ -34,14 +34,15 @@ BUILD_PREREQUIRES=" cmd:libtoolize cmd:make " -BUILD() +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 aclocal autoconf @@ -71,11 +72,10 @@ TEST() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - fribidi${secondaryArchSuffix}_devel = $portVersion + fribidi_devel = $portVersion cmd:fribidi$secondaryArchSuffix = $portVersion compat >= 0.19 - lib:libfribidi$secondaryArchSuffix = 0.3.4 compat >= 0 - devel:libfribidi$secondaryArchSuffix = 0.3.4 compat >= 0 + devel:libfribidi = 0.3.4 compat >= 0 " REQUIRES_devel=" - fribidi$secondaryArchSuffix == $portVersion base + fribidi == $portVersion base " From 8e45246319d493bdf0c1eb4a6b69086c0bfa6689 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 12 Sep 2013 23:28:57 -0700 Subject: [PATCH 468/587] Updated .recipe for gnupg so that it now builds. --- app-crypt/gnupg/gnupg-1.4.11.recipe | 49 +++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/app-crypt/gnupg/gnupg-1.4.11.recipe b/app-crypt/gnupg/gnupg-1.4.11.recipe index 0f1c2ffd5..3847a7401 100644 --- a/app-crypt/gnupg/gnupg-1.4.11.recipe +++ b/app-crypt/gnupg/gnupg-1.4.11.recipe @@ -1,23 +1,54 @@ -DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement." +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." HOMEPAGE="http://www.gnupg.org/" SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.11.tar.bz2" CHECKSUM_MD5="411744e1ef8ce90b87938c4203f001f1" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +LICENSE="GNU GPL v3" +COPYRIGHT="1998-2010 Free Software Foundation, Inc." + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES="gnupg = $portVersion + cmd:gpg = $portVersion compat >= 1.4 + cmd:gpg_zip = $portVersion compat >= 1.4 + cmd:gpgsplit = $portVersion compat >= 1.4 + cmd:gpgv = $portVersion compat >= 1.4 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libz + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +PATCH() +{ +PATCHES="gnupg-1.4.11.patch" +} + BUILD() { - cd gnupg-1.4.11 libtoolize --force --copy --install autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd gnupg-1.4.11 make install } -LICENSE="GNU GPL v3" -COPYRIGHT="1998-2010 Free Software Foundation, Inc." + +TEST() +{ + make check +} + From b3687b220a9c250f0836843a8437bf9e1536293c Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 12 Sep 2013 23:54:59 -0700 Subject: [PATCH 469/587] Cleaned up the fribidi recipe a bit more --- dev-libs/fribidi/fribidi-0.19.5.recipe | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev-libs/fribidi/fribidi-0.19.5.recipe b/dev-libs/fribidi/fribidi-0.19.5.recipe index 7941743c7..4c5324286 100644 --- a/dev-libs/fribidi/fribidi-0.19.5.recipe +++ b/dev-libs/fribidi/fribidi-0.19.5.recipe @@ -12,8 +12,6 @@ COPYRIGHT="2004 Sharif FarsiWeb, Inc ARCHITECTURES="x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" - PROVIDES=" fribidi = $portVersion cmd:fribidi = 0.19.5 compat >= 0.19 From 93dfe2ed82b740358fff8e10896e8a361c68ea76 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 13 Sep 2013 16:44:55 -0700 Subject: [PATCH 470/587] Updated .recipe for libart_lpgl so that it builds now. --- .../libart_lgpl/libart_lgpl-2.3.21.recipe | 59 ++++++++++++++----- 1 file changed, 45 insertions(+), 14 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 5be103f43..83ef89b8e 100644 --- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe +++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe @@ -1,28 +1,59 @@ -DESCRIPTION="Libart is a library for high-performance 2D graphics" +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." 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" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="722471ec8ae084af4293126d06b60880" +REVISION="1" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2001-2010 Mathieu Lacage and Raph Levien" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + libart_lgpl= $portVersion + cmd:libart2_config = $portVersion compat >= 2 + lib:libart_lgpl_2 = 2.3.21 compat >= 2 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoreconf + cmd:libtool + cmd:make + cmd:ld + cmd:gcc + " BUILD() { - cd libart_lgpl-2.3.21 libtoolize --force --copy --install autoreconf -i - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd libart_lgpl-2.3.21 make install + + # prepare devel/lib + prepareInstalledDevelLibs libart_lgpl_2 + + # devel package + packageEntries devel \ + $developDir } -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2001-2010 Mathieu Lacage and Raph Levien" +# ----- devel package + +PROVIDES_devel=" + libart_lgpl_2 = $portVersion + devel:libart_lgpl_2 = 2.3.21 compat >= 2 + " +REQUIRES_devel=" + libart_lgpl_2 == $portVersion base + " From a01e4e248ebb2a05993e3d95b81ae7def807af73 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 13 Sep 2013 19:37:46 -0700 Subject: [PATCH 471/587] Fixed recipe for gnupg so that is correctly applies now --- app-crypt/gnupg/gnupg-1.4.11.recipe | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app-crypt/gnupg/gnupg-1.4.11.recipe b/app-crypt/gnupg/gnupg-1.4.11.recipe index 3847a7401..4455dfae3 100644 --- a/app-crypt/gnupg/gnupg-1.4.11.recipe +++ b/app-crypt/gnupg/gnupg-1.4.11.recipe @@ -29,10 +29,7 @@ BUILD_PREREQUIRES=" cmd:libtoolize cmd:make " -PATCH() -{ PATCHES="gnupg-1.4.11.patch" -} BUILD() { @@ -51,4 +48,3 @@ TEST() { make check } - From 42b99bdf3aa46bceef532a73605d072601aa3133 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 14 Sep 2013 14:00:07 +0200 Subject: [PATCH 472/587] Add recipe for version of Pe that works on x86_64 --- haiku-apps/pe/pe-2.4.3_hg610.recipe | 64 +++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 haiku-apps/pe/pe-2.4.3_hg610.recipe diff --git a/haiku-apps/pe/pe-2.4.3_hg610.recipe b/haiku-apps/pe/pe-2.4.3_hg610.recipe new file mode 100644 index 000000000..cd5e867e4 --- /dev/null +++ b/haiku-apps/pe/pe-2.4.3_hg610.recipe @@ -0,0 +1,64 @@ +SUMMARY="A programmer's editor" +DESCRIPTION="A programmer's editor" +HOMEPAGE="http://pe-editor.berlios.de/" +LICENSE=" + BSD (4-clause) + MIT + " +COPYRIGHT=" + 1996-2002 Maarteen Hekkelman + 2003-2013 Team Pe + " +SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#610" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + pe = $portVersion + cmd:Pe = $portVersion compat >= 2 + cmd:lpe = $portVersion compat >= 2 + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libpcre + lib:libpcreposix + " +BUILD_REQUIRES=" + devel:libpcre >= 0.0.1 + devel:libpcreposix >= 0.0.1 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:bison + cmd:flex + cmd:gcc + cmd:jam + cmd:ld + " + +USER_SETTINGS_FILES=" + settings/pe directory + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + jam -q + # multi-job builds don't work reliably +} + +INSTALL() +{ + peDir=$appsDir/Pe + + mkdir -p $appsDir + cp -a generated/distro $peDir + cp -a doc $peDir/Documentation + + mkdir $binDir + ln -sfn $peDir/lpe $binDir + + addAppDeskbarSymlink $peDir/Pe +} From ae00b0cf5e203c6afa8584e5b0d3d536ef692174 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 14 Sep 2013 16:11:50 -0700 Subject: [PATCH 473/587] Updated .recipe for libsdl-1.2.15 so that it now builds. --- media-libs/libsdl/libsdl-1.2.15.recipe | 91 ++++++++++++++++++++------ 1 file changed, 72 insertions(+), 19 deletions(-) diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index 8b6cae981..905be02c3 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -1,32 +1,75 @@ +SUMMARY="Simple Direct Media Layer" DESCRIPTION="Simple Direct Media Layer" HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz" CHECKSUM_MD5="9d96df8417572a2afb781a7c4c811a85" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1997-2012 Sam Lantinga" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + cmd:sdl_config = portVersion compat >= 1.2 + lib:libSDL = $portVersion compat >= 1.2 + lib:libSDL_1.2 = 0.11.4 compat >= 0.11 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + lib:libpng + lib:libjpeg + lib:libtiff + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtool + cmd:make + " + +SOURCE_DIR="SDL-1.2.15" + +PATCH() +{ + sed -i 's/AM_PATH_ALSA(0.9.0, have_alsa=yes, have_alsa=no)/have_alsa=no/' configure.in + sed -i 's/AM_PATH_ESD(0.2.8, have_esd=yes, have_esd=no)/have_esd=no/' configure.in + echo "AC_CONFIG_MACRO_DIR([acinclude])" >> configure.in + libtoolize --force --copy --install + aclocal -I acinclude + autoconf +} + BUILD() { - cd SDL-1.2.15 - ./autogen.sh - rm aclocal.m4 - echo "AC_CONFIG_MACRO_DIR([acinclude])" >> configure.in - libtoolize -fci - aclocal -I acinclude - ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd SDL-1.2.15 make install + + # devel package + + mkdir -p $developDir/lib + cp build/.libs/libSDL.a $developDir/lib/libSDL.a + cp build/.libs/libSDL.la $developDir/lib/libSDL.la + cp build/.libs/libSDLmain.a $developDir/lib/libSDLmain.a + cp build/.libs/libSDLmain.la $developDir/lib/libSDLmain.la + + prepareInstalledDevelLibs \ + libSDL \ + libSDLmain + + fixPkgconfig + + packageEntries devel \ + $developDir } TEST() @@ -100,5 +143,15 @@ TEST() testlock } -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1997-2012 Sam Lantinga" +# ----- devel package ------------------------ + +PROVIDES_devel=" + cmd:sdl_config = portVersion compat >= 1.2 + devel:libSDL_1.2 = 0.11.4 compat >= 0.11 + devel:libSDL = 0.11.4 compat >= 0.11 + devel:libSDLmain = 0.11.4 compat >= 0.11 + " + +REQUIRES_devel=" + libsdl == $portVersion base + " From 926d43521528a752363cf65385af809114985498 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 15 Sep 2013 23:09:55 +0200 Subject: [PATCH 474/587] Add next version of Pe for x86_64 --- haiku-apps/pe/pe-2.4.3_hg611.recipe | 64 +++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 haiku-apps/pe/pe-2.4.3_hg611.recipe diff --git a/haiku-apps/pe/pe-2.4.3_hg611.recipe b/haiku-apps/pe/pe-2.4.3_hg611.recipe new file mode 100644 index 000000000..a5d30f970 --- /dev/null +++ b/haiku-apps/pe/pe-2.4.3_hg611.recipe @@ -0,0 +1,64 @@ +SUMMARY="A programmer's editor" +DESCRIPTION="A programmer's editor" +HOMEPAGE="http://pe-editor.berlios.de/" +LICENSE=" + BSD (4-clause) + MIT + " +COPYRIGHT=" + 1996-2002 Maarteen Hekkelman + 2003-2013 Team Pe + " +SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#611" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + pe = $portVersion + cmd:Pe = $portVersion compat >= 2 + cmd:lpe = $portVersion compat >= 2 + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libpcre + lib:libpcreposix + " +BUILD_REQUIRES=" + devel:libpcre >= 0.0.1 + devel:libpcreposix >= 0.0.1 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:bison + cmd:flex + cmd:gcc + cmd:jam + cmd:ld + " + +USER_SETTINGS_FILES=" + settings/pe directory + " + +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + jam -q + # multi-job builds don't work reliably +} + +INSTALL() +{ + peDir=$appsDir/Pe + + mkdir -p $appsDir + cp -a generated/distro $peDir + cp -a doc $peDir/Documentation + + mkdir $binDir + ln -sfn $peDir/lpe $binDir + + addAppDeskbarSymlink $peDir/Pe +} From 5b6a9d5f520b599f160b441bc1cc1197b4279f8e Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 16 Sep 2013 22:30:32 +0200 Subject: [PATCH 475/587] Drop unneeded/wrong specification of $haikuVersion. --- haiku-apps/pe/pe-2.4.3_hg611.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/pe/pe-2.4.3_hg611.recipe b/haiku-apps/pe/pe-2.4.3_hg611.recipe index a5d30f970..998ad00e6 100644 --- a/haiku-apps/pe/pe-2.4.3_hg611.recipe +++ b/haiku-apps/pe/pe-2.4.3_hg611.recipe @@ -20,7 +20,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libpcre lib:libpcreposix " @@ -29,7 +29,7 @@ BUILD_REQUIRES=" devel:libpcreposix >= 0.0.1 " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:bison cmd:flex cmd:gcc From 8bd0f648fc18312d93f8cb7f7c68373ba539db12 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 16 Sep 2013 22:31:42 +0200 Subject: [PATCH 476/587] Add TEST function for icu. --- dev-libs/icu/icu-4.8.1.1.recipe | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dev-libs/icu/icu-4.8.1.1.recipe b/dev-libs/icu/icu-4.8.1.1.recipe index a38256bea..e70217151 100644 --- a/dev-libs/icu/icu-4.8.1.1.recipe +++ b/dev-libs/icu/icu-4.8.1.1.recipe @@ -79,6 +79,12 @@ INSTALL() rm -r $binDir } +TEST() +{ + cd source + 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. From b5227643fed9940d488e7de1c1d414573b4ad055 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 16 Sep 2013 23:00:08 +0200 Subject: [PATCH 477/587] Added patch for autoconf that allows testsuite to run. --- sys-devel/autoconf/autoconf-2.69.recipe | 2 + .../autoconf/patches/autoconf-2.69.patchset | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 sys-devel/autoconf/patches/autoconf-2.69.patchset diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index 998d2f445..cae7adb52 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -16,6 +16,8 @@ CHECKSUM_MD5="82d05e03b93e45f5a39b828dc9c6c29b" REVISION="4" ARCHITECTURES="x86_gcc2 x86 x86_64" +PATCHES='autoconf-2.69.patchset' + PROVIDES=" autoconf = $portVersion compat >= 2.60 cmd:autoconf = $portVersion compat >= 2.60 diff --git a/sys-devel/autoconf/patches/autoconf-2.69.patchset b/sys-devel/autoconf/patches/autoconf-2.69.patchset new file mode 100644 index 000000000..7f4291cce --- /dev/null +++ b/sys-devel/autoconf/patches/autoconf-2.69.patchset @@ -0,0 +1,37 @@ +From ccbda3789e69e557a8fa284916613f623aa0d2c5 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Mon, 16 Sep 2013 22:37:49 +0200 +Subject: Bypass checks for autoconf git checkout + +* As part of test preparations, autoconf's build system tries to determine + if it lives in a checkout of the autoconf repository by looking if .git + exists. In our case, .git exists, so the test preparation code tries + to checkout a git submodule, which fails as the .git refers to the + git repository created by haikuporter, not the autoconf repository. + Circumvent this by causing the check for .git to always fail. + +diff --git a/maint.mk b/maint.mk +index 1c7af03..41e4030 100644 +--- a/maint.mk ++++ b/maint.mk +@@ -1294,7 +1294,7 @@ endef + + .PHONY: no-submodule-changes + no-submodule-changes: +- if test -d $(srcdir)/.git; then \ ++ if test -d $(srcdir)/.gitFOOBAR; then \ + diff=$$(cd $(srcdir) && git submodule -q foreach \ + git diff-index --name-only HEAD) \ + || exit 1; \ +@@ -1312,7 +1312,7 @@ submodule-checks ?= no-submodule-changes public-submodule-commit + # cannot be built from a fresh clone. + .PHONY: public-submodule-commit + public-submodule-commit: +- $(AM_V_GEN)if test -d $(srcdir)/.git; then \ ++ $(AM_V_GEN)if test -d $(srcdir)/.gitFOOBAR; then \ + cd $(srcdir) && \ + git submodule --quiet foreach test '$$(git rev-parse $$sha1)' \ + = '$$(git merge-base origin $$sha1)' \ +-- +1.8.3.4 + From 870583f018ce46267f84791fd40f8da3f4d7185a Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 31 Mar 2013 10:58:01 +0000 Subject: [PATCH 478/587] Add fatsort, an utility to sort FAT entries in FAT16/32 filesystems. (cherry picked from commit 0ef6cfc873f7e421d63b81179170eb44d78a78a8) --- sys-fs/fatsort/fatsort-0.9.17.269.bep | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 sys-fs/fatsort/fatsort-0.9.17.269.bep diff --git a/sys-fs/fatsort/fatsort-0.9.17.269.bep b/sys-fs/fatsort/fatsort-0.9.17.269.bep new file mode 100644 index 000000000..699daffaa --- /dev/null +++ b/sys-fs/fatsort/fatsort-0.9.17.269.bep @@ -0,0 +1,20 @@ +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" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + cd fatsort-0.9.17.269 + make CFLAGS="-include /boot/develop/headers/posix/stdint.h" LDFLAGS=-ltextencoding +} + +INSTALL { + cd fatsort-0.9.17.269 + make install MANDIR=/boot/common/documentation/man/man1 SBINDIR=/boot/common/bin +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2004 Boris Leidner" From 45561e67fa69bf545a6ee63fba2edc8a43d16bfb Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 4 Apr 2013 10:07:10 +0000 Subject: [PATCH 479/587] Updated openssh6.2p1 patch to fix #634. (cherry picked from commit d94cb3b1c96cabf8f89bf4376cef3a26a8bd6f93) --- net-misc/openssh/patches/openssh-6.2p1.patch | 37 +++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/net-misc/openssh/patches/openssh-6.2p1.patch b/net-misc/openssh/patches/openssh-6.2p1.patch index 9b07a81f7..e1d32fb91 100644 --- a/net-misc/openssh/patches/openssh-6.2p1.patch +++ b/net-misc/openssh/patches/openssh-6.2p1.patch @@ -1,7 +1,7 @@ diff -urN openssh-6.2p1/configure.ac openssh-6.2p1-haiku/configure.ac ---- openssh-6.2p1/configure.ac -+++ openssh-6.2p1-haiku/configure.ac -@@ -1426,7 +1426,7 @@ +--- openssh-6.2p1/configure.ac 2013-03-20 01:55:15.047972352 +0000 ++++ openssh-6.2p1-haiku/configure.ac 2013-04-04 09:11:04.187957248 +0000 +@@ -1430,7 +1430,7 @@ LIBEDIT=`$PKGCONFIG --libs-only-l libedit` CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" else @@ -9,10 +9,10 @@ diff -urN openssh-6.2p1/configure.ac openssh-6.2p1-haiku/configure.ac + AC_CHECK_LIB(curses, tgetent, [LIBEDIT="-ledit -lcurses"], AC_CHECK_LIB(ncurses, tgetent, [LIBEDIT="-ledit -lncurses"])) fi OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` - AC_CHECK_LIB(edit, el_init, + AC_CHECK_LIB([edit], [el_init], diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h ---- openssh-6.2p1/pathnames.h -+++ openssh-6.2p1-haiku/pathnames.h +--- openssh-6.2p1/pathnames.h 2011-05-29 11:39:38.057409536 +0000 ++++ openssh-6.2p1-haiku/pathnames.h 2013-04-04 09:11:10.076283904 +0000 @@ -12,7 +12,14 @@ * called by a name other than "ssh" or "Secure Shell". */ @@ -29,7 +29,7 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h #ifndef SSHDIR #define SSHDIR ETCDIR "/ssh" -@@ -45,7 +53,7 @@ +@@ -45,7 +52,7 @@ #define _PATH_DH_PRIMES SSHDIR "/primes" #ifndef _PATH_SSH_PROGRAM @@ -38,7 +38,7 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h #endif /* -@@ -58,25 +66,25 @@ +@@ -58,25 +65,25 @@ * The directory in user's home directory in which the files reside. The * directory should be world-readable (though not all files are). */ @@ -71,7 +71,7 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h /* * Configuration file in user's home directory. This file need not be -@@ -84,7 +92,7 @@ +@@ -84,7 +91,7 @@ * particularly secret. If the user's home directory resides on an NFS * volume where root is mapped to nobody, this may need to be world-readable. */ @@ -80,7 +80,7 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h /* * File containing a list of those rsa keys that permit logging in as this -@@ -94,10 +102,10 @@ +@@ -94,10 +101,10 @@ * may need to be world-readable. (This file is read by the daemon which is * running as root.) */ @@ -93,7 +93,7 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h /* * Per-user and system-wide ssh "rc" files. These files are executed with -@@ -105,7 +113,7 @@ +@@ -105,7 +112,7 @@ * passed "proto cookie" as arguments if X11 forwarding with spoofing is in * use. xauth will be run if neither of these exists. */ @@ -102,7 +102,7 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h #define _PATH_SSH_SYSTEM_RC SSHDIR "/sshrc" /* -@@ -149,17 +157,16 @@ +@@ -149,17 +156,16 @@ /* for sftp */ #ifndef _PATH_SFTP_SERVER @@ -123,7 +123,7 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h #endif #ifndef _PATH_LS -@@ -171,11 +178,11 @@ +@@ -171,11 +177,11 @@ # ifdef LOGIN_PROGRAM_FALLBACK # define LOGIN_PROGRAM LOGIN_PROGRAM_FALLBACK # else @@ -137,4 +137,15 @@ diff -urN openssh-6.2p1/pathnames.h openssh-6.2p1-haiku/pathnames.h -#define ASKPASS_PROGRAM "/usr/lib/ssh/ssh-askpass" +#define ASKPASS_PROGRAM HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass" #endif /* ASKPASS_PROGRAM */ +diff -urN openssh-6.2p1/sshd_config openssh-6.2p1-haiku/sshd_config +--- openssh-6.2p1/sshd_config 2013-02-12 00:02:09.066846720 +0000 ++++ openssh-6.2p1-haiku/sshd_config 2013-04-04 09:02:19.284426240 +0000 +@@ -47,7 +47,7 @@ + + # The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 + # but this is overridden so installations will only check .ssh/authorized_keys +-AuthorizedKeysFile .ssh/authorized_keys ++AuthorizedKeysFile config/settings/ssh + + #AuthorizedPrincipalsFile none From 739bda9be26cf4f7bbab73a4bbedec0a175d2e96 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 13 Apr 2013 09:51:22 +0000 Subject: [PATCH 480/587] =?UTF-8?q?Updated=20bep=20for=20openjdk,=20from?= =?UTF-8?q?=20Fr=C3=A9d=C3=A9ric=20Gaillard.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 5875e10c5a71dfa622bb006bc9c34ba830faa19c) Conflicts: dev-lang/openjdk/openjdk-1.7.bep --- dev-lang/openjdk/openjdk-1.7.recipe | 120 +++++++++++++++++++++++----- 1 file changed, 98 insertions(+), 22 deletions(-) diff --git a/dev-lang/openjdk/openjdk-1.7.recipe b/dev-lang/openjdk/openjdk-1.7.recipe index 7ce9e461c..34407108a 100644 --- a/dev-lang/openjdk/openjdk-1.7.recipe +++ b/dev-lang/openjdk/openjdk-1.7.recipe @@ -1,15 +1,14 @@ DESCRIPTION="openjdk" HOMEPAGE="http://openjdk.java.net/" -SRC_URI="http://ports-space.haiku-files.org/dev-lang/j2sdk-july-r2.tar.xz" -REVISION="1" +SRC_URI="http://ports-space.haiku-files.org/source/openjdk/j2sdk-april-2013.tar" +REVISION="2" STATUS_HAIKU="stable" -DEPEND="app-arch/cpio >= 2.10 - media-libs/freetype >= 2.4.6" +DEPEND="app-arch/cpio = 2.10 + media-libs/freetype >= 2.4.9" -CHECKSUM_MD5="28b8630373769e1e897a75bf81f2e1eb" +CHECKSUM_MD5="e38b939c34b04427336245397fa43c9c" -BUILD() -{ +BUILD { OPENJDK_DIR=`haikuporter -t`/dev-lang/openjdk/work # Get and build Apache Ant. @@ -27,21 +26,85 @@ BUILD() cd .. # Clone latest JDK repositories. + if [ "$(ls -A jdk)" ]; then + echo "jdk directory is not empty" + else + hg clone http://hg.openjdk.java.net/haiku/haiku jdk --debug + fi - hg clone http://hg.openjdk.java.net/haiku/haiku jdk --debug - hg clone http://hg.openjdk.java.net/haiku/haiku/corba jdk/corba --debug - hg clone http://hg.openjdk.java.net/haiku/haiku/hotspot jdk/hotspot --debug - hg clone http://hg.openjdk.java.net/haiku/haiku/jaxp jdk/jaxp --debug - hg clone http://hg.openjdk.java.net/haiku/haiku/jaxws jdk/jaxws --debug - hg clone http://hg.openjdk.java.net/haiku/haiku/jdk jdk/jdk --debug - hg clone http://hg.openjdk.java.net/haiku/haiku/langtools jdk/langtools --debug + if [ "$(ls -A jdk/corba)" ]; then + echo "jdk/corba directory is not empty" + else + hg clone http://hg.openjdk.java.net/haiku/haiku/corba jdk/corba --debug + fi + + if [ "$(ls -A jdk/hotspot)" ]; then + echo "jdk/hotspot directory is not empty" + else + hg clone http://hg.openjdk.java.net/haiku/haiku/hotspot jdk/hotspot --debug + fi + + if [ "$(ls -A jdk/jaxp)" ]; then + echo "jdk/jaxp directory is not empty" + else + hg clone http://hg.openjdk.java.net/haiku/haiku/jaxp jdk/jaxp --debug + fi + + if [ "$(ls -A jdk/jaxws)" ]; then + echo "jdk/jaxws directory is not empty" + else + hg clone http://hg.openjdk.java.net/haiku/haiku/jaxws jdk/jaxws --debug + fi + + if [ "$(ls -A jdk/jdk)" ]; then + echo "jdk/jdk directory is not empty" + else + hg clone http://hg.openjdk.java.net/haiku/haiku/jdk jdk/jdk --debug + fi + + if [ "$(ls -A jdk/langtools)" ]; then + echo "jdk/langtools directory is not empty" + else + hg clone http://hg.openjdk.java.net/haiku/haiku/langtools jdk/langtools --debug + fi export ALT_BOOTDIR=${OPENJDK_DIR}/j2sdk-image - export ALT_JDK_IMPORT_PATH=${OPENJDK_DIR}/j2sdk-image + + # don't set ALT_JDK_IMPORT for a full build + # set jdk/README-build.html + # export ALT_JDK_IMPORT_PATH=${OPENJDK_DIR}/j2sdk-image + export ANT=${OPENJDK_DIR}/ant export ALT_OUTPUTDIR=${OPENJDK_DIR}/output + + # set jdk/README-build.html + export LANG=C + + # add $ANT_HOME/bin to PATH + export PATH=$PATH:$ANT_HOME/bin + + # use PATH to search commands rather than explicitly set path for each commands + # so that grep, egrep & readelf are automaticly found + # see Defs-haiku.gmk + export ALT_UNIXCOMMAND_PATH= + + # mandatory GCC4 [requires at least 4.5.3] + setgcc gcc4 + mkdir -p ${ALT_OUTPUTDIR} - export ALLOW_DOWNLOADS=true + + # some sources downloaded while building have moved + # so we have to provide a directory where they have to reside to + export ALT_DROPS_DIR=${OPENJDK_DIR}/drop + mkdir -p ${ALT_DROPS_DIR} + export ALLOW_DOWNLOADS=false + + # grab relocated sources + cd ${ALT_DROPS_DIR} + wget -nc http://ports-space.haiku-files.org/source/openjdk/jaxp145_01.zip + wget -nc http://ports-space.haiku-files.org/source/openjdk/jdk7-jaf-2010_08_19.zip + wget -nc http://ports-space.haiku-files.org/source/openjdk/jdk7-jaxws2_2_4-b03-2011_05_27.zip + cd .. # Deploy certain headers, if they are missing. @@ -66,10 +129,21 @@ BUILD() echo SoundUtils.h was not found. Deployed private file instead. fi - # Build. + # small patch allowing to finish build without errors + # this modification already exists in another dev branch + # if someone fix it in current branch, using sed rathan than patch should not brake + # the whole build + if [ -e jdk/make/Defs-internal.gmk.org ]; + then + echo Defs-internal exists. + else + mv jdk/make/Defs-internal.gmk jdk/make/Defs-internal.gmk.org + fi + cat jdk/make/Defs-internal.gmk.org | sed s/'$(PRINTF) "--'/'$(PRINTF) -- "--'/ >jdk/make/Defs-internal.gmk + # Build. cd jdk - make NO_DOCS=true + make # Cleanup private files, if any were deployed. # I don't really think it would harm anyone if we don't clean them up after compiling. @@ -87,14 +161,16 @@ BUILD() # fi } -INSTALL() -{ +INSTALL { export DESTDIR=`finddir B_COMMON_DIRECTORY` cp -r -f -v output ${DESTDIR}/jdk + echo "you should add this lines to \$HOME/.profile" + echo "export JAVA_HOME=/boot/common/jdk" + echo "export PATH=\$JAVA_HOME/bin:\$PATH" + echo "export LIBRARY_PATH=\$JAVA_HOME/lib/i386/:\$LIBRARY_PATH" } -TEST() -{ +TEST { echo "OpenJDK tests are not yet ported to Haiku." } From adf174fe321a74c37e89ff9165b846158a7dbc61 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 20 Apr 2013 05:58:17 +0000 Subject: [PATCH 481/587] Added script for setting openjdk environment. Updated openjdk bep to correctly build distro zip. (cherry picked from commit 1e2de4b85d4f11ad4454d50cde63a3de21a366c3) --- dev-lang/openjdk/openjdk-1.7.recipe | 19 ++++++++----- dev-lang/openjdk/openjdk_setup_env.sh | 41 +++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 dev-lang/openjdk/openjdk_setup_env.sh diff --git a/dev-lang/openjdk/openjdk-1.7.recipe b/dev-lang/openjdk/openjdk-1.7.recipe index 34407108a..97d23b285 100644 --- a/dev-lang/openjdk/openjdk-1.7.recipe +++ b/dev-lang/openjdk/openjdk-1.7.recipe @@ -1,7 +1,7 @@ DESCRIPTION="openjdk" HOMEPAGE="http://openjdk.java.net/" SRC_URI="http://ports-space.haiku-files.org/source/openjdk/j2sdk-april-2013.tar" -REVISION="2" +REVISION="3" STATUS_HAIKU="stable" DEPEND="app-arch/cpio = 2.10 media-libs/freetype >= 2.4.9" @@ -162,12 +162,17 @@ BUILD { } INSTALL { - export DESTDIR=`finddir B_COMMON_DIRECTORY` - cp -r -f -v output ${DESTDIR}/jdk - echo "you should add this lines to \$HOME/.profile" - echo "export JAVA_HOME=/boot/common/jdk" - echo "export PATH=\$JAVA_HOME/bin:\$PATH" - echo "export LIBRARY_PATH=\$JAVA_HOME/lib/i386/:\$LIBRARY_PATH" + # install + mkdir -p `finddir B_COMMON_DIRECTORY`/jdk + cp -r -f -v output/j2sdk-image/* `finddir B_COMMON_DIRECTORY`/jdk + # setup env + $(haikuporter -t)/dev-lang/openjdk/openjdk_setup_env.sh + + # build distro + mkdir -p ${DESTDIR}`finddir B_COMMON_DIRECTORY`/jdk + cp -r -f -v output/j2sdk-image/* ${DESTDIR}`finddir B_COMMON_DIRECTORY`/jdk + mkdir -p ${DESTDIR}/boot/common/boot/post_install + cp -f $(haikuporter -t)/dev-lang/openjdk/openjdk_setup_env.sh ${DESTDIR}/boot/common/boot/post_install } TEST { diff --git a/dev-lang/openjdk/openjdk_setup_env.sh b/dev-lang/openjdk/openjdk_setup_env.sh new file mode 100644 index 000000000..ef1cd2f39 --- /dev/null +++ b/dev-lang/openjdk/openjdk_setup_env.sh @@ -0,0 +1,41 @@ +#!/bin/sh +_progress () { + notify --type progress --group openJDK \ + --icon /boot/system/kernel_x86 \ + --messageID $0_$$ \ + --title "Set OpenJDK env..." \ + --progress "$1" "$2" >/dev/null +} + +_progress 0.2 ".profile" +cd +if [ -e .profile ]; +then + echo +else + touch .profile +fi + +_progress 0.4 "JAVA_HOME" +grep "export JAVA_HOME=" .profile >/dev/null +if [ $? == 1 ]; +then + echo "export JAVA_HOME=\`finddir B_COMMON_DIRECTORY\`/jdk" >>.profile +fi + +_progress 0.6 "PATH" +grep "export PATH=\$JAVA_HOME/bin:\$PATH" .profile >/dev/null +if [ $? == 1 ]; +then + echo "export PATH=\$JAVA_HOME/bin:\$PATH" >>.profile +fi + +_progress 0.8 "LIBRARY_PATH" +export _SEARCH=$JAVA_HOME/jre/lib/i386 +echo $_SEARCH | grep $LIBRARY_PATH >/dev/null +grep "export LIBRARY_PATH=\$JAVA_HOME/jre/lib/i386:\$LIBRARY_PATH" .profile >/dev/null +if [ $? == 1 ]; +then + echo "export LIBRARY_PATH=\$JAVA_HOME/jre/lib/i386:\$LIBRARY_PATH" >>.profile +fi +_progress 1.0 "done" From e4feb6ceccbd3a26af04404794b36730de8b59da Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sat, 4 May 2013 13:19:27 -0600 Subject: [PATCH 482/587] Add QuickLaunch 0.9.5 contributed by Humdinger Patch file to fix building on gcc4 and small changes to the bep by me. resolves issue #1 (cherry picked from commit c182159bc8006ceef91f343da50534ab738f129d) --- .../patches/quicklaunch-0.9.5.patch | 16 +++++++++ haiku-apps/quicklaunch/quicklaunch-0.9.5.bep | 35 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 haiku-apps/quicklaunch/patches/quicklaunch-0.9.5.patch create mode 100644 haiku-apps/quicklaunch/quicklaunch-0.9.5.bep diff --git a/haiku-apps/quicklaunch/patches/quicklaunch-0.9.5.patch b/haiku-apps/quicklaunch/patches/quicklaunch-0.9.5.patch new file mode 100644 index 000000000..88ff65e4f --- /dev/null +++ b/haiku-apps/quicklaunch/patches/quicklaunch-0.9.5.patch @@ -0,0 +1,16 @@ +diff --git quicklaunch-0.9.5/Makefile quicklaunch-0.9.5/Makefile +index 8c0337c..469546c 100644 +--- quicklaunch-0.9.5/Makefile ++++ quicklaunch-0.9.5/Makefile +@@ -4,9 +4,9 @@ TYPE= APP + SRCS= QuickLaunch.cpp QLFilter.cpp MainWindow.cpp MainListView.cpp MainListItem.cpp SetupWindow.cpp SetupListView.cpp QLSettings.cpp + RSRCS= QuickLaunch.rsrc + ifeq ($(gccver),2) +- LIBS= /boot/develop/lib/x86/libbe.so /boot/system/lib/libstdc++.r4.so /boot/develop/lib/x86/libroot_debug.so /boot/develop/lib/x86/libtracker.so ++ LIBS= be stdc++.r4 tracker + else +- LIBS= /boot/system/lib/gcc4/libbe.so /boot/system/lib/gcc4/libstdc++.so /boot/system/lib/gcc4/libroot_debug.so /boot/system/lib/gcc4/libtracker.so ++ LIBS= be stdc++ tracker + endif + LIBPATHS= + SYSTEM_INCLUDE_PATHS= /boot/develop/headers/be /boot/develop/headers/cpp /boot/develop/headers/posix /boot/home/config/include diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.5.bep b/haiku-apps/quicklaunch/quicklaunch-0.9.5.bep new file mode 100644 index 000000000..27f4b715a --- /dev/null +++ b/haiku-apps/quicklaunch/quicklaunch-0.9.5.bep @@ -0,0 +1,35 @@ +DESCRIPTION="A tool to quickly start any installed application" +HOMEPAGE="https://sourceforge.net/p/quicklaunch-h" +SRC_URI="git://git.code.sf.net/p/quicklaunch-h/code" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + cd quicklaunch-0.9.5 + rc -o QuickLaunch.rsrc QuickLaunch.rdef + make +} + +INSTALL { + cd quicklaunch-0.9.5 + cd objects.x86-gcc`setgcc | tail -c -2`-release + mkdir -p $DESTDIR`finddir B_APPS_DIRECTORY`/QuickLaunch + cp -af QuickLaunch $DESTDIR`finddir B_APPS_DIRECTORY`/QuickLaunch + cd .. + unzip -o ReadMe.zip -d $DESTDIR`finddir B_APPS_DIRECTORY`/QuickLaunch + chmod +x Add\ to\ Deskbar.sh + cp -af Add\ to\ Deskbar.sh $DESTDIR`finddir B_APPS_DIRECTORY`/QuickLaunch + mkdir -p $DESTDIR`finddir B_USER_DESKBAR_DIRECTORY`/Applications + ln -sf `finddir B_APPS_DIRECTORY`/QuickLaunch/QuickLaunch \ + $DESTDIR`finddir B_USER_DESKBAR_DIRECTORY`/Applications + if [-z "$DESTDIR" ] + then + cd `finddir B_APPS_DIRECTORY`/QuickLaunch + desklink --remove=QuickLaunch + desklink "cmd=Remove replicant:desklink --remove=QuickLaunch" QuickLaunch + fi +} + +LICENSE="MIT" +COPYRIGHT="2013 Humdinger" From 1d0e9472ccc1b32c39c75d14a547cca9e2d9ac46 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Sat, 4 May 2013 13:33:54 -0600 Subject: [PATCH 483/587] Add UberTuber 0.9.5 contributed by Humdinger Patch file to fix building on gcc4 and small changes to the bep by me. resolves issue #2 (cherry picked from commit 3cdab7114a65ee570664a3c675d290acfd306bd9) --- .../ubertuber/patches/ubertuber-0.9.5.patch | 16 ++++++++++++ haiku-apps/ubertuber/ubertuber-0.9.5.bep | 25 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 haiku-apps/ubertuber/patches/ubertuber-0.9.5.patch create mode 100644 haiku-apps/ubertuber/ubertuber-0.9.5.bep diff --git a/haiku-apps/ubertuber/patches/ubertuber-0.9.5.patch b/haiku-apps/ubertuber/patches/ubertuber-0.9.5.patch new file mode 100644 index 000000000..1ff2504c2 --- /dev/null +++ b/haiku-apps/ubertuber/patches/ubertuber-0.9.5.patch @@ -0,0 +1,16 @@ +diff --git ubertuber-0.9.5/Makefile ubertuber-0.9.5/Makefile +index b0463ca..7795fd0 100644 +--- ubertuber-0.9.5/Makefile ++++ ubertuber-0.9.5/Makefile +@@ -4,9 +4,9 @@ TYPE= APP + SRCS= App.cpp MainWindow.cpp Settings.cpp + RSRCS= UberTuber.rsrc + ifeq ($(gccver),2) +- LIBS= /boot/develop/lib/x86/libroot.so /boot/develop/lib/x86/libbe.so /boot/develop/lib/x86/libtracker.so ++ LIBS= be tracker stdc++.r4 + else +- LIBS= /boot/develop/lib/gcc4/libroot.so /boot/develop/lib/gcc4/libbe.so /boot/develop/lib/gcc4/libtracker.so ++ LIBS= be tracker stdc++ + endif + LIBPATHS= + SYSTEM_INCLUDE_PATHS= /boot/develop/headers/be /boot/develop/headers/cpp /boot/develop/headers/posix /boot/home/config/include diff --git a/haiku-apps/ubertuber/ubertuber-0.9.5.bep b/haiku-apps/ubertuber/ubertuber-0.9.5.bep new file mode 100644 index 000000000..ea2f5d7f0 --- /dev/null +++ b/haiku-apps/ubertuber/ubertuber-0.9.5.bep @@ -0,0 +1,25 @@ +DESCRIPTION="A tool to play back online videos in MediaPlayer" +HOMEPAGE="https://sourceforge.net/p/ubertuber" +SRC_URI="git://git.code.sf.net/p/ubertuber/code" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" + +BUILD { + cd ubertuber-0.9.5 + rc -o UberTuber.rsrc UberTuber.rdef + make +} + +INSTALL { + cd ubertuber-0.9.5 + cd objects.x86-gcc`setgcc | tail -c -2`-release + mkdir -p $DESTDIR`finddir B_APPS_DIRECTORY`/UberTuber + cp -af UberTuber $DESTDIR`finddir B_APPS_DIRECTORY`/UberTuber + cd .. + cp -af youtube-dl $DESTDIR`finddir B_APPS_DIRECTORY`/UberTuber + unzip -o ReadMe.zip -d $DESTDIR`finddir B_APPS_DIRECTORY`/UberTuber +} + +LICENSE="MIT" +COPYRIGHT="2013 Humdinger" From 41a23e7c462624d86778ac8bd78fdf4866c98611 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sun, 5 May 2013 20:54:26 +0000 Subject: [PATCH 484/587] qemu: Add qemu-0.15.1 port with native GUI and audio backend. Note that this is the last version that builds without dependencies. The next version would be 1.0 and it introduces the glib dependency that I did not manage to get built cleanly. (cherry picked from commit 55e429c1b81a074907d1950c3831c3b178ce259a) --- app-emulation/qemu/qemu-0.15.1.bep | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 app-emulation/qemu/qemu-0.15.1.bep diff --git a/app-emulation/qemu/qemu-0.15.1.bep b/app-emulation/qemu/qemu-0.15.1.bep new file mode 100644 index 000000000..7cf89095b --- /dev/null +++ b/app-emulation/qemu/qemu-0.15.1.bep @@ -0,0 +1,22 @@ +DESCRIPTION="QEMU is a generic and open source machine emulator and virtualizer." +HOMEPAGE="http://wiki.qemu.org/" +SRC_URI="http://github.com/mmlr/qemu-haiku/archive/1b50193d3b850f1e64b76e9a0ee7b007387ac99b.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="489f26907f807bde3c4579e4d11e1195" + +BUILD { + cd qemu-haiku-1b50193d3b850f1e64b76e9a0ee7b007387ac99b + chmod +x configure + ./configure + make +} + +INSTALL { + cd qemu-haiku-1b50193d3b850f1e64b76e9a0ee7b007387ac99b + make install +} + +COPYRIGHT="2003-2008 Fabrice Bellard" +LICENSE="GNU GPL v2" \ No newline at end of file From db225ef593269e7d7f110162cf2efe1866060023 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 7 May 2013 10:25:08 -0600 Subject: [PATCH 485/587] Remove patches from quicklaunch and ubertuber builds Changes have been applied upstream by humdinger resolves issue #3 --- .../quicklaunch/patches/quicklaunch-0.9.5.patch | 16 ---------------- .../ubertuber/patches/ubertuber-0.9.5.patch | 16 ---------------- 2 files changed, 32 deletions(-) delete mode 100644 haiku-apps/quicklaunch/patches/quicklaunch-0.9.5.patch delete mode 100644 haiku-apps/ubertuber/patches/ubertuber-0.9.5.patch diff --git a/haiku-apps/quicklaunch/patches/quicklaunch-0.9.5.patch b/haiku-apps/quicklaunch/patches/quicklaunch-0.9.5.patch deleted file mode 100644 index 88ff65e4f..000000000 --- a/haiku-apps/quicklaunch/patches/quicklaunch-0.9.5.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git quicklaunch-0.9.5/Makefile quicklaunch-0.9.5/Makefile -index 8c0337c..469546c 100644 ---- quicklaunch-0.9.5/Makefile -+++ quicklaunch-0.9.5/Makefile -@@ -4,9 +4,9 @@ TYPE= APP - SRCS= QuickLaunch.cpp QLFilter.cpp MainWindow.cpp MainListView.cpp MainListItem.cpp SetupWindow.cpp SetupListView.cpp QLSettings.cpp - RSRCS= QuickLaunch.rsrc - ifeq ($(gccver),2) -- LIBS= /boot/develop/lib/x86/libbe.so /boot/system/lib/libstdc++.r4.so /boot/develop/lib/x86/libroot_debug.so /boot/develop/lib/x86/libtracker.so -+ LIBS= be stdc++.r4 tracker - else -- LIBS= /boot/system/lib/gcc4/libbe.so /boot/system/lib/gcc4/libstdc++.so /boot/system/lib/gcc4/libroot_debug.so /boot/system/lib/gcc4/libtracker.so -+ LIBS= be stdc++ tracker - endif - LIBPATHS= - SYSTEM_INCLUDE_PATHS= /boot/develop/headers/be /boot/develop/headers/cpp /boot/develop/headers/posix /boot/home/config/include diff --git a/haiku-apps/ubertuber/patches/ubertuber-0.9.5.patch b/haiku-apps/ubertuber/patches/ubertuber-0.9.5.patch deleted file mode 100644 index 1ff2504c2..000000000 --- a/haiku-apps/ubertuber/patches/ubertuber-0.9.5.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git ubertuber-0.9.5/Makefile ubertuber-0.9.5/Makefile -index b0463ca..7795fd0 100644 ---- ubertuber-0.9.5/Makefile -+++ ubertuber-0.9.5/Makefile -@@ -4,9 +4,9 @@ TYPE= APP - SRCS= App.cpp MainWindow.cpp Settings.cpp - RSRCS= UberTuber.rsrc - ifeq ($(gccver),2) -- LIBS= /boot/develop/lib/x86/libroot.so /boot/develop/lib/x86/libbe.so /boot/develop/lib/x86/libtracker.so -+ LIBS= be tracker stdc++.r4 - else -- LIBS= /boot/develop/lib/gcc4/libroot.so /boot/develop/lib/gcc4/libbe.so /boot/develop/lib/gcc4/libtracker.so -+ LIBS= be tracker stdc++ - endif - LIBPATHS= - SYSTEM_INCLUDE_PATHS= /boot/develop/headers/be /boot/develop/headers/cpp /boot/develop/headers/posix /boot/home/config/include From 2bfeb670027462a490cf9f7515cf51cd418275f0 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 4 May 2013 11:11:34 +0200 Subject: [PATCH 486/587] Update NetSurf following 3.0 release * All the packages have changed version * Cleanup the dependencies to avoid repeating transitive ones * libxml is not required anymore (libdom replaces it everywhere) * on the other hand, NetSurf build uses perl html::entities. Added a bep for it. * Also adjusted the licences. While NetSurf is still GPL/MIT+OpenSSL exception, all the other libs are plain MIT, with various copyright holders. (cherry picked from commit 9b6e3c28b0935b6613fbf78d085c6ddddaee2f97) Conflicts: dev-libs/libwapcaplet/libwapcaplet-0.2.0-HEAD.bep dev-util/buildsystem/buildsystem-1.0-HEAD.bep media-libs/libnsbmp/libnsbmp-0.1.0-HEAD.bep media-libs/libsvgtiny/libsvgtiny-0.1.0-HEAD.bep net-libs/libdom/libdom-0.0.1-HEAD.bep www-client/netsurf/netsurf-3.1-HEAD.bep --- dev-libs/libcss/libcss-0.2.0-HEAD.recipe | 19 +++++++++++ .../libparserutils-0.1.2-HEAD.recipe | 19 +++++++++++ .../libwapcaplet/libwapcaplet-0.2.0-HEAD.bep | 19 +++++++++++ dev-perl/HTML-Parser/HTML-Parser-3.70.recipe | 20 ++++++++++++ .../buildsystem/buildsystem-1.0-HEAD.recipe | 18 +++++++++++ .../libnsbmp/libnsbmp-0.1.0-HEAD.recipe | 19 +++++++++++ .../libnsgif/libnsgif-0.1.0-HEAD.recipe | 19 +++++++++++ .../libsvgtiny/libsvgtiny-0.1.0-HEAD.recipe | 20 ++++++++++++ net-libs/hubbub/hubbub-0.2.0-HEAD.recipe | 19 +++++++++++ net-libs/libdom/libdom-0.0.1-HEAD.recipe | 19 +++++++++++ www-client/netsurf/netsurf-3.1-HEAD.recipe | 32 +++++++++++++++++++ 11 files changed, 223 insertions(+) create mode 100644 dev-libs/libcss/libcss-0.2.0-HEAD.recipe create mode 100644 dev-libs/libparserutils/libparserutils-0.1.2-HEAD.recipe create mode 100644 dev-libs/libwapcaplet/libwapcaplet-0.2.0-HEAD.bep create mode 100644 dev-perl/HTML-Parser/HTML-Parser-3.70.recipe create mode 100644 dev-util/buildsystem/buildsystem-1.0-HEAD.recipe create mode 100644 media-libs/libnsbmp/libnsbmp-0.1.0-HEAD.recipe create mode 100644 media-libs/libnsgif/libnsgif-0.1.0-HEAD.recipe create mode 100644 media-libs/libsvgtiny/libsvgtiny-0.1.0-HEAD.recipe create mode 100644 net-libs/hubbub/hubbub-0.2.0-HEAD.recipe create mode 100644 net-libs/libdom/libdom-0.0.1-HEAD.recipe create mode 100644 www-client/netsurf/netsurf-3.1-HEAD.recipe diff --git a/dev-libs/libcss/libcss-0.2.0-HEAD.recipe b/dev-libs/libcss/libcss-0.2.0-HEAD.recipe new file mode 100644 index 000000000..bf8c96cf7 --- /dev/null +++ b/dev-libs/libcss/libcss-0.2.0-HEAD.recipe @@ -0,0 +1,19 @@ +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" +STATUS_HAIKU="stable" +DEPEND="dev-libs/libparserutils >= 0.1.1" + +BUILD { + cd libcss-0.2.0-HEAD + make PREFIX=/boot/common +} + +INSTALL { + cd libcss-0.2.0-HEAD + make install PREFIX=/boot/common +} + +LICENSE="MIT" +COPYRIGHT="2007 - 2013 J-M Bell" diff --git a/dev-libs/libparserutils/libparserutils-0.1.2-HEAD.recipe b/dev-libs/libparserutils/libparserutils-0.1.2-HEAD.recipe new file mode 100644 index 000000000..cfe926525 --- /dev/null +++ b/dev-libs/libparserutils/libparserutils-0.1.2-HEAD.recipe @@ -0,0 +1,19 @@ +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" +STATUS_HAIKU="stable" +DEPEND="dev-util/buildsystem >= 0.0.1" + +BUILD { + cd libparserutils-0.1.2-HEAD + make PREFIX=/boot/common +} + +INSTALL { + cd libparserutils-0.1.2-HEAD + make install PREFIX=/boot/common +} + +LICENSE="MIT" +COPYRIGHT="2007 - 2013 J-M Bell" diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0-HEAD.bep b/dev-libs/libwapcaplet/libwapcaplet-0.2.0-HEAD.bep new file mode 100644 index 000000000..1f91e617d --- /dev/null +++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.0-HEAD.bep @@ -0,0 +1,19 @@ +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" +STATUS_HAIKU="stable" +DEPEND="dev-util/buildsystem >= 0" + +BUILD { + cd libwapcaplet-0.2.0-HEAD + make PREFIX=/boot/common +} + +INSTALL { + cd libwapcaplet-0.2.0-HEAD + make install PREFIX=/boot/common +} + +LICENSE="MIT" +COPYRIGHT="2009 - 2012 The NetSurf Browser project" diff --git a/dev-perl/HTML-Parser/HTML-Parser-3.70.recipe b/dev-perl/HTML-Parser/HTML-Parser-3.70.recipe new file mode 100644 index 000000000..e7ddbaf6f --- /dev/null +++ b/dev-perl/HTML-Parser/HTML-Parser-3.70.recipe @@ -0,0 +1,20 @@ +#dev-perl/XML-Parser +DESCRIPTION="HTML-Entities - Encode or decode strings with HTML entities" +HOMEPAGE="http://search.cpan.org/~gaas/HTML-Parser/" +SRC_URI="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.70.tar.gz" +REVISION="1" +# only tested on gcc4 +STATUS_HAIKU="stable" +DEPEND="" +CHECKSUM_MD5="efe7699f5ece3a230d730a3682359c08" + +BUILD { + cd HTML-Parser-3.70 + perl Makefile.PL + make +} + +INSTALL { + cd HTML-Parser-3.70 + make install DESTDIR="${DESTDIR}" +} diff --git a/dev-util/buildsystem/buildsystem-1.0-HEAD.recipe b/dev-util/buildsystem/buildsystem-1.0-HEAD.recipe new file mode 100644 index 000000000..7a2f6bd08 --- /dev/null +++ b/dev-util/buildsystem/buildsystem-1.0-HEAD.recipe @@ -0,0 +1,18 @@ +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" +STATUS_HAIKU="stable" + +BUILD { + cd buildsystem-1.0-HEAD + make +} + +INSTALL { + cd buildsystem-1.0-HEAD + make install PREFIX=/boot/common/ +} + +LICENSE="MIT" +COPYRIGHT="2009 - 2013 The NetSurf Browser project" diff --git a/media-libs/libnsbmp/libnsbmp-0.1.0-HEAD.recipe b/media-libs/libnsbmp/libnsbmp-0.1.0-HEAD.recipe new file mode 100644 index 000000000..e392561f2 --- /dev/null +++ b/media-libs/libnsbmp/libnsbmp-0.1.0-HEAD.recipe @@ -0,0 +1,19 @@ +DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats" +HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/" +SRC_URI="git://git.netsurf-browser.org/libnsbmp.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/buildsystem >= 0.0.1" + +BUILD { + cd libnsbmp-0.1.0-HEAD + make PREFIX=/boot/common +} + +INSTALL { + cd libnsbmp-0.1.0-HEAD + make install PREFIX=/boot/common +} + +LICENSE="MIT" +COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox" diff --git a/media-libs/libnsgif/libnsgif-0.1.0-HEAD.recipe b/media-libs/libnsgif/libnsgif-0.1.0-HEAD.recipe new file mode 100644 index 000000000..9075a54e4 --- /dev/null +++ b/media-libs/libnsgif/libnsgif-0.1.0-HEAD.recipe @@ -0,0 +1,19 @@ +DESCRIPTION="Libnsgif is a decoding library for the GIF image file format" +HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/" +SRC_URI="git://git.netsurf-browser.org/libnsgif.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/buildsystem >= 0.0.1" + +BUILD { + cd libnsgif-0.1.0-HEAD + make PREFIX=/boot/common +} + +INSTALL { + cd libnsgif-0.1.0-HEAD + make install PREFIX=/boot/common +} + +LICENSE="MIT" +COPYRIGHT="2004 Richard Wilson, 2008 - 2013 Sean Fox" diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.0-HEAD.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.0-HEAD.recipe new file mode 100644 index 000000000..69d217a5a --- /dev/null +++ b/media-libs/libsvgtiny/libsvgtiny-0.1.0-HEAD.recipe @@ -0,0 +1,20 @@ +DESCRIPTION="Libsvgtiny is an implementation of SVG Tiny written in C" +HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny" +SRC_URI="git://git.netsurf-browser.org/libsvgtiny.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="dev-util/gperf >= 3.0.4 + dev-libs/libwapcaplet >= 0.1.1-HEAD + net-libs/libdom >= 0" +#CHECKSUM_MD5="" +BUILD { + cd libsvgtiny-0-HEAD + make PREFIX=/boot/common +} + +INSTALL { + cd libsvgtiny-0-HEAD + make install PREFIX=/boot/common +} +LICENSE="MIT" +COPYRIGHT="2003-2012 The NetSurf Developers" diff --git a/net-libs/hubbub/hubbub-0.2.0-HEAD.recipe b/net-libs/hubbub/hubbub-0.2.0-HEAD.recipe new file mode 100644 index 000000000..949484858 --- /dev/null +++ b/net-libs/hubbub/hubbub-0.2.0-HEAD.recipe @@ -0,0 +1,19 @@ +DESCRIPTION="Hubbub is an HTML5 compliant parsing library" +HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" +SRC_URI="git://git.netsurf-browser.org/libhubbub.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPENDS="dev-util/buildsystem >= 0.0.1" + +BUILD { + cd hubbub-0.2.0-HEAD + make PREFIX=/boot/common +} + +INSTALL { + cd hubbub-0.2.0-HEAD + make install PREFIX=/boot/common +} + +LICENSE="MIT" +COPYRIGHT="2007 - 2013 J-M Bell" diff --git a/net-libs/libdom/libdom-0.0.1-HEAD.recipe b/net-libs/libdom/libdom-0.0.1-HEAD.recipe new file mode 100644 index 000000000..f114cd6c2 --- /dev/null +++ b/net-libs/libdom/libdom-0.0.1-HEAD.recipe @@ -0,0 +1,19 @@ +DESCRIPTION="LibDOM is an implementation of the W3C DOM" +HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/" +SRC_URI="git://git.netsurf-browser.org/libdom.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="net-libs/hubbub >= 0.2.0-HEAD" + +BUILD { + cd libdom-0.0.1-HEAD + make PREFIX=/boot/common +} + +INSTALL { + cd libdom-0.0.1-HEAD + make install PREFIX=/boot/common +} + +LICENSE="MIT" +COPYRIGHT="2007 - 2013 J-M Bell" diff --git a/www-client/netsurf/netsurf-3.1-HEAD.recipe b/www-client/netsurf/netsurf-3.1-HEAD.recipe new file mode 100644 index 000000000..9bfd94afd --- /dev/null +++ b/www-client/netsurf/netsurf-3.1-HEAD.recipe @@ -0,0 +1,32 @@ +DESCRIPTION="NetSurf is a multi-platform web browser" +HOMEPAGE="http://www.netsurf-browser.org/" +SRC_URI="git://git.netsurf-browser.org/netsurf.git" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="media-libs/libmng > 1.0.10 + dev-libs/pkgconfig >= 0.25 + net-misc/curl >= 7.21.6 + media-libs/libpng >= 1.5.7 + media-libs/jpeg >= 8d + media-libs/libwebp >= 0.1.3 + media-libs/lcms >= 2.1 + media-libs/libsvgtiny >= 0.HEAD + media-libs/libnsbmp >= 0.0.3 + media-libs/libnsgif >= 0.0.3 + dev-libs/libcss >= 0.1.2 + dev-perl/HTML-Entities >= 3.70 + " + +BUILD { + cd netsurf-3.1-HEAD + make +} + +INSTALL { + cd netsurf-3.1-HEAD + make install +} + +LICENSE="MIT + GNU GPL v2" +COPYRIGHT="2003 - 2013 The NetSurf Browser project" From 31c3ecec745711fbeedb42aee3606c2964cf936a Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Fri, 26 Jul 2013 16:16:32 -0600 Subject: [PATCH 487/587] Update paladin patch to remove liblocale references resolves issue #9 (cherry picked from commit 0bad405391f42dbc854e5e1ea00ea4d731f2ed08) --- haiku-apps/paladin/patches/paladin-1.3.patch | 21 ++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/haiku-apps/paladin/patches/paladin-1.3.patch b/haiku-apps/paladin/patches/paladin-1.3.patch index d9838e614..4d79e9feb 100644 --- a/haiku-apps/paladin/patches/paladin-1.3.patch +++ b/haiku-apps/paladin/patches/paladin-1.3.patch @@ -114,3 +114,24 @@ diff -urN Paladin-1.3.src/SymbolFinder/Makefile Paladin-1.3.src.gcc2hybrid/Symbo + +## include the makefile-engine +include $(BUILDHOME)/etc/makefile-engine +diff -urN Paladin-1.3.src/Paladin/buildhaikugcc2.sh Paladin-1.3.src/Paladin/buildhaikugcc2.sh- +--- Paladin-1.3.src/Paladin/buildhaikugcc2.sh 2013-07-19 18:41:25.292028416 +0200 ++++ Paladin-1.3.src/Paladin/buildhaikugcc2.sh- 2013-07-19 18:38:29.508035072 +0200 +@@ -1,5 +1,5 @@ + #!/bin/sh + +-gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lpcre -llocale ++gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lpcre + xres -o Paladin Paladin.rsrc + mimeset -all Paladin + +diff -urN Paladin-1.3.src/Paladin/buildhaikugcc4.sh Paladin-1.3.src/Paladin/buildhaikugcc4.sh- +--- Paladin-1.3.src/Paladin/buildhaikugcc4.sh 2013-07-19 18:41:14.299368448 +0200 ++++ Paladin-1.3.src/Paladin/buildhaikugcc4.sh- 2013-07-19 18:38:34.475004928 +0200 +@@ -1,5 +1,5 @@ + #!/bin/sh + +-gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lsupc++ -lstdc++ -lpcre -llocale ++gcc -pipe -D_ZETA_TS_FIND_DIR_ -o Paladin AboutWindow.cpp AddNewFileWindow.cpp AppDebug.cpp DebugTools.cpp ErrorWindow.cpp FileActions.cpp FileUtils.cpp FindOpenFileWindow.cpp Globals.cpp GroupRenameWindow.cpp LibWindow.cpp Makemake.cpp Paladin.cpp PrefsWindow.cpp Project.cpp ProjectList.cpp ProjectPath.cpp ProjectSettingsWindow.cpp ProjectWindow.cpp RunArgsWindow.cpp StartWindow.cpp TemplateManager.cpp TemplateWindow.cpp TerminalWindow.cpp AsciiWindow.cpp CodeLib.cpp CodeLibWindow.cpp LicenseManager.cpp VRegWindow.cpp BuildSystem/BuildInfo.cpp BuildSystem/ErrorParser.cpp BuildSystem/FileFactory.cpp BuildSystem/ProjectBuilder.cpp BuildSystem/SourceFile.cpp BuildSystem/SourceType.cpp BuildSystem/SourceTypeC.cpp BuildSystem/SourceTypeLex.cpp BuildSystem/SourceTypeLib.cpp BuildSystem/SourceTypeResource.cpp BuildSystem/SourceTypeRez.cpp BuildSystem/SourceTypeShell.cpp BuildSystem/SourceTypeYacc.cpp BuildSystem/StatCache.cpp ThirdParty/AutoTextControl.cpp ThirdParty/BeIDEProject.cpp ThirdParty/BitmapButton.cpp ThirdParty/CRegex.cpp ThirdParty/ClickableStringView.cpp ThirdParty/DListView.cpp ThirdParty/DNode.cpp ThirdParty/DPath.cpp ThirdParty/DWindow.cpp ThirdParty/DelayedMessenger.cpp ThirdParty/GetTextWindow.cpp ThirdParty/LaunchHelper.cpp ThirdParty/PathBox.cpp ThirdParty/Settings.cpp ThirdParty/StringInputWindow.cpp ThirdParty/TextFile.cpp ThirdParty/TypedRefFilter.cpp SourceControl/GitSourceControl.cpp SourceControl/HgSourceControl.cpp SourceControl/SCMImportWindow.cpp SourceControl/SCMImporter.cpp SourceControl/SCMManager.cpp SourceControl/SCMOutputWindow.cpp SourceControl/SVNSourceControl.cpp SourceControl/SourceControl.cpp -I ./BuildSystem -I ./ -I ./ThirdParty -I ./SourceControl -lbe -lroot -ltracker -ltranslation -lsupc++ -lstdc++ -lpcre + xres -o Paladin Paladin.rsrc + mimeset -all Paladin From a946574571fa1c586bbd9834e486d7fad32eb3a4 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 17 Sep 2013 00:57:42 +0200 Subject: [PATCH 488/587] CMake 2.8.11 fixes our build problems on Haiku (2.8.10 did not build). Add bep file for this new version, which also merges most of our changes from the previous patch. (cherry picked from commit 725e6e5eae07bfe05ead25cac8efa04716fef4f7) --- dev-util/cmake/cmake-2.8.11.2.recipe | 33 +++ dev-util/cmake/patches/cmake-2.8.11.2.patch | 229 ++++++++++++++++++++ 2 files changed, 262 insertions(+) create mode 100644 dev-util/cmake/cmake-2.8.11.2.recipe create mode 100644 dev-util/cmake/patches/cmake-2.8.11.2.patch diff --git a/dev-util/cmake/cmake-2.8.11.2.recipe b/dev-util/cmake/cmake-2.8.11.2.recipe new file mode 100644 index 000000000..11538c89b --- /dev/null +++ b/dev-util/cmake/cmake-2.8.11.2.recipe @@ -0,0 +1,33 @@ +DESCRIPTION="cmake - Cross platform Make" +HOMEPAGE="http://www.cmake.org" +SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz" +#CHECKSUM_MD5="" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd cmake-2.8.11.2 + # cmake appends the prefix to mandir and datadir + # so using ../../ to back that part out but for some reason + # the doc was also picking up /boot, so had to back it out 3 times + # this seems to work but might still need some further adjusting +# sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=/data/cmake \ + --docdir=/documentation/doc/CMake \ + --mandir=/documentation/man + make +} + +INSTALL { + cd cmake-2.8.11.2 + make install +} + +TEST { + cd cmake-2.8.11.2 + make test +} + +LICENSE="CMake" +COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/patches/cmake-2.8.11.2.patch b/dev-util/cmake/patches/cmake-2.8.11.2.patch new file mode 100644 index 000000000..1af677725 --- /dev/null +++ b/dev-util/cmake/patches/cmake-2.8.11.2.patch @@ -0,0 +1,229 @@ +diff -urN cmake-2.8.11.2-orig/Modules/Platform/Haiku.cmake cmake-2.8.11.2/Modules/Platform/Haiku.cmake +--- cmake-2.8.11.2-orig/Modules/Platform/Haiku.cmake 2012-12-03 12:11:47.804519936 -0800 ++++ cmake-2.8.11.2/Modules/Platform/Haiku.cmake 2012-12-03 12:02:17.652738560 -0800 +@@ -1,20 +1,25 @@ ++set(HAIKU 1) ++set(UNIX 1) ++ ++set(CMAKE_DL_LIBS "") +-set(BEOS 1) +- +-set(CMAKE_DL_LIBS root be) +-set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC") +-set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE") + set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") ++set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") +-set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") + set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") + set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") ++set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") + set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") ++set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") ++ ++list(APPEND CMAKE_SYSTEM_PREFIX_PATH ++ /boot/common/non-packaged ++ /boot/common ++ /boot/system ++ ) ++list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ++ /boot/common/non-packaged/lib ++ /boot/common/lib ++ /boot/develop/lib/x86 ++ ) +- +-include(Platform/UnixPaths) +-list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) +-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) +-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) + list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) + list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) + +diff -urN cmake-2.8.11.2-orig/Source/cmExportCommand.cxx cmake-2.8.11.2/Source/cmExportCommand.cxx +--- cmake-2.8.11.2-orig/Source/cmExportCommand.cxx 2012-11-27 05:26:33.039059456 -0800 ++++ cmake-2.8.11.2/Source/cmExportCommand.cxx 2012-12-03 12:02:17.665059328 -0800 +@@ -20,7 +20,8 @@ + #include "cmExportBuildFileGenerator.h" + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + cmExportCommand::cmExportCommand() +@@ -305,14 +306,15 @@ + const char* hash) + { + #if defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) != ++ B_OK) + { + return; + } +- dir.Append("cmake/packages"); +- dir.Append(package.c_str()); +- std::string fname = dir.Path(); ++ std::string fname = dir; ++ fname += "/cmake/packages/"; ++ fname += package; + #else + const char* home = cmSystemTools::GetEnv("HOME"); + if(!home) +diff -urN cmake-2.8.11.2-orig/Source/cmFindPackageCommand.cxx cmake-2.8.11.2/Source/cmFindPackageCommand.cxx +--- cmake-2.8.11.2-orig/Source/cmFindPackageCommand.cxx 2012-11-27 05:26:33.059768832 -0800 ++++ cmake-2.8.11.2/Source/cmFindPackageCommand.cxx 2012-12-03 12:02:17.666107904 -0800 +@@ -19,7 +19,9 @@ + #endif + + #if defined(__HAIKU__) +-#include ++#include ++#include ++#include + #endif + + void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, +@@ -1583,12 +1585,13 @@ + #if defined(_WIN32) && !defined(__CYGWIN__) + this->LoadPackageRegistryWinUser(); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == ++ B_OK) + { +- dir.Append("cmake/packages"); +- dir.Append(this->Name.c_str()); +- this->LoadPackageRegistryDir(dir.Path()); ++ strlcat(dir, "/cmake/packages/", sizeof(dir)); ++ strlcat(dir, this->Name.c_str(), sizeof(dir)); ++ this->LoadPackageRegistryDir(dir); + } + #else + if(const char* home = cmSystemTools::GetEnv("HOME")) +diff -urN cmake-2.8.11.2-orig/Source/cmLocalGenerator.cxx cmake-2.8.11.2/Source/cmLocalGenerator.cxx +--- cmake-2.8.11.2-orig/Source/cmLocalGenerator.cxx 2012-11-27 05:26:33.035389440 -0800 ++++ cmake-2.8.11.2/Source/cmLocalGenerator.cxx 2012-12-03 12:02:17.672399360 -0800 +@@ -37,7 +37,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + cmLocalGenerator::cmLocalGenerator() +@@ -354,12 +355,12 @@ + prefix = prefix_win32.c_str(); + } + #elif defined(__HAIKU__) ++ char dir[B_PATH_NAME_LENGTH]; + if (!prefix) + { +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- prefix = dir.Path(); ++ prefix = dir; + } + else + { +diff -urN cmake-2.8.11.2-orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8.11.2/Source/CPack/cmCPackGenerator.cxx +--- cmake-2.8.11.2-orig/Source/CPack/cmCPackGenerator.cxx 2012-11-27 05:26:32.015466496 -0800 ++++ cmake-2.8.11.2/Source/CPack/cmCPackGenerator.cxx 2012-12-03 12:02:17.677904384 -0800 +@@ -27,7 +27,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + //---------------------------------------------------------------------- +@@ -1265,10 +1266,10 @@ + this->InstallPath += "-"; + this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- this->InstallPath = dir.Path(); ++ this->InstallPath = dir; + } + else + { +diff -urN cmake-2.8.11.2-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8.11.2/Tests/ComplexOneConfig/Library/CMakeLists.txt +--- cmake-2.8.11.2-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-11-27 05:26:34.013369344 -0800 ++++ cmake-2.8.11.2/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-12-03 12:02:42.181665792 -0800 +@@ -51,7 +51,7 @@ + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-if(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") + endif() + get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) +diff -urN cmake-2.8.11.2-orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.11.2/Utilities/cmcurl/CMake/CurlTests.c +--- cmake-2.8.11.2-orig/Utilities/cmcurl/CMake/CurlTests.c 2012-11-27 05:26:34.045350912 -0800 ++++ cmake-2.8.11.2/Utilities/cmcurl/CMake/CurlTests.c 2012-12-03 12:02:42.189005824 -0800 +@@ -38,7 +38,7 @@ + # define PLATFORM_AIX_V3 + #endif + +-#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) ++#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) + #error "O_NONBLOCK does not work on this platform" + #endif + int socket; +diff -urN cmake-2.8.11.2-orig/Utilities/cmcurl/select.c cmake-2.8.11.2/Utilities/cmcurl/select.c +--- cmake-2.8.11.2-orig/Utilities/cmcurl/select.c 2012-11-27 05:26:34.055312384 -0800 ++++ cmake-2.8.11.2/Utilities/cmcurl/select.c 2012-12-03 12:02:42.189792256 -0800 +@@ -39,7 +39,7 @@ + #error "We can't compile without select() support!" + #endif + +-#if defined(__BEOS__) && !defined(__HAIKU__) ++#if defined(__BEOS__) + /* BeOS has FD_SET defined in socket.h */ + #include + #endif +diff -urN cmake-2.8.11.2-orig/Utilities/cmzlib/zconf.h cmake-2.8.11.2/Utilities/cmzlib/zconf.h +--- cmake-2.8.11.2-orig/Utilities/cmzlib/zconf.h 2012-11-27 05:26:34.022020096 -0800 ++++ cmake-2.8.11.2/Utilities/cmzlib/zconf.h 2012-12-03 12:02:42.190578688 -0800 +@@ -237,7 +237,7 @@ + # endif + #endif + +-#if defined (__BEOS__) && !defined (__HAIKU__) ++#if defined (__BEOS__) + # ifdef ZLIB_DLL + # ifdef ZLIB_INTERNAL + # define ZEXPORT __declspec(dllexport) +diff -urN cmake-2.8.11.2-orig/Utilities/cmzlib/zutil.h cmake-2.8.11.2/Utilities/cmzlib/zutil.h +--- cmake-2.8.11.2-orig/Utilities/cmzlib/zutil.h 2012-11-27 05:26:34.022806528 -0800 ++++ cmake-2.8.11.2/Utilities/cmzlib/zutil.h 2012-12-03 12:02:42.195559424 -0800 +@@ -147,12 +147,6 @@ + # define OS_CODE 0x0f + #endif + +-/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ +-/* many BeOS workarounds are no longer needed in Haiku */ +-#if defined(__HAIKU__) && defined(__BEOS__) +-#undef __BEOS__ +-#endif +- + #if defined(_BEOS_) || defined(RISCOS) + # define fdopen(fd,mode) NULL /* No fdopen() */ + #endif From a87953b83435385df31d659de95f7d1f9b5aaab1 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 27 Jul 2013 16:11:19 +0200 Subject: [PATCH 489/587] Update patches for cmake 2.8.11 and 2.8-git to include some of our changes that are not merged yet. (cherry picked from commit d2acf18c1eedf3f1970767384aea94c00f8cc94e) Conflicts: dev-util/cmake/patches/cmake-2.8-git.patch --- dev-util/cmake/patches/cmake-2.8.11.2.patch | 52 ++++++++++++++------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/dev-util/cmake/patches/cmake-2.8.11.2.patch b/dev-util/cmake/patches/cmake-2.8.11.2.patch index 1af677725..6b3bd2f94 100644 --- a/dev-util/cmake/patches/cmake-2.8.11.2.patch +++ b/dev-util/cmake/patches/cmake-2.8.11.2.patch @@ -1,4 +1,40 @@ diff -urN cmake-2.8.11.2-orig/Modules/Platform/Haiku.cmake cmake-2.8.11.2/Modules/Platform/Haiku.cmake +--- cmake-2.8.11.2-orig/Modules/FindFreetype.cmake 2012-11-27 13:26:32.037486592 +0000 ++++ cmake-2.8.11.2/Modules/FindFreetype.cmake 2013-02-10 23:15:25.000000000 +0000 +@@ -46,20 +46,22 @@ + HINTS + ENV FREETYPE_DIR + PATHS ++ /boot/develop/headers + /usr/local/X11R6 + /usr/local/X11 + /usr/freeware +- PATH_SUFFIXES include/freetype2 include ++ PATH_SUFFIXES include/freetype2 include 3rdparty + ) + + find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h + HINTS + ENV FREETYPE_DIR + PATHS ++ /boot/develop/headers + /usr/local/X11R6 + /usr/local/X11 + /usr/freeware +- PATH_SUFFIXES include/freetype2 include ++ PATH_SUFFIXES include/freetype2 include 3rdparty/freetype2 3rdparty + ) + + find_library(FREETYPE_LIBRARY +@@ -68,6 +70,7 @@ + ENV FREETYPE_DIR + PATH_SUFFIXES lib + PATHS ++ /boot/system/lib + /usr/local/X11R6 + /usr/local/X11 + /usr/freeware + --- cmake-2.8.11.2-orig/Modules/Platform/Haiku.cmake 2012-12-03 12:11:47.804519936 -0800 +++ cmake-2.8.11.2/Modules/Platform/Haiku.cmake 2012-12-03 12:02:17.652738560 -0800 @@ -1,20 +1,25 @@ @@ -211,19 +247,3 @@ diff -urN cmake-2.8.11.2-orig/Utilities/cmzlib/zconf.h cmake-2.8.11.2/Utilities/ # ifdef ZLIB_DLL # ifdef ZLIB_INTERNAL # define ZEXPORT __declspec(dllexport) -diff -urN cmake-2.8.11.2-orig/Utilities/cmzlib/zutil.h cmake-2.8.11.2/Utilities/cmzlib/zutil.h ---- cmake-2.8.11.2-orig/Utilities/cmzlib/zutil.h 2012-11-27 05:26:34.022806528 -0800 -+++ cmake-2.8.11.2/Utilities/cmzlib/zutil.h 2012-12-03 12:02:42.195559424 -0800 -@@ -147,12 +147,6 @@ - # define OS_CODE 0x0f - #endif - --/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ --/* many BeOS workarounds are no longer needed in Haiku */ --#if defined(__HAIKU__) && defined(__BEOS__) --#undef __BEOS__ --#endif -- - #if defined(_BEOS_) || defined(RISCOS) - # define fdopen(fd,mode) NULL /* No fdopen() */ - #endif From 2b21de463d0ca248b6afd5df0c7621183cca6b72 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Tue, 30 Jul 2013 17:29:19 -0600 Subject: [PATCH 490/587] Fix typo in install section of quicklaunch bep Resolves issue #10 (cherry picked from commit 4c151a4713d870b3a86c4896c1b27e63769f9f30) --- haiku-apps/quicklaunch/quicklaunch-0.9.5.bep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.5.bep b/haiku-apps/quicklaunch/quicklaunch-0.9.5.bep index 27f4b715a..a98dae242 100644 --- a/haiku-apps/quicklaunch/quicklaunch-0.9.5.bep +++ b/haiku-apps/quicklaunch/quicklaunch-0.9.5.bep @@ -23,7 +23,7 @@ INSTALL { mkdir -p $DESTDIR`finddir B_USER_DESKBAR_DIRECTORY`/Applications ln -sf `finddir B_APPS_DIRECTORY`/QuickLaunch/QuickLaunch \ $DESTDIR`finddir B_USER_DESKBAR_DIRECTORY`/Applications - if [-z "$DESTDIR" ] + if [ -z "$DESTDIR" ] then cd `finddir B_APPS_DIRECTORY`/QuickLaunch desklink --remove=QuickLaunch From e6c80c4f2aa72e239345e3aa07dfa31ba7c0fc65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 14 Aug 2013 11:16:26 +0200 Subject: [PATCH 491/587] Ubuntu Font Family (cherry picked from commit 154ecc4acce16d25bbd0380e758d473672fede10) --- media-fonts/ubuntu/ubuntu-0.80.bep | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 media-fonts/ubuntu/ubuntu-0.80.bep diff --git a/media-fonts/ubuntu/ubuntu-0.80.bep b/media-fonts/ubuntu/ubuntu-0.80.bep new file mode 100644 index 000000000..5a0da9f2c --- /dev/null +++ b/media-fonts/ubuntu/ubuntu-0.80.bep @@ -0,0 +1,32 @@ +DESCRIPTION="Font family from Ubunu operating system" +HOMEPAGE="http://font.ubuntu.com" +SRC_URI="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd ubuntu-font-family-0.80 +} +INSTALL { + cd ubuntu-font-family-0.80 + FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ubuntu + mkdir -p ${FONTDIR} + cp Ubuntu-B.ttf ${FONTDIR} + cp Ubuntu-BI.ttf ${FONTDIR} + cp Ubuntu-C.ttf ${FONTDIR} + cp Ubuntu-L.ttf ${FONTDIR} + cp Ubuntu-LI.ttf ${FONTDIR} + cp Ubuntu-M.ttf ${FONTDIR} + cp Ubuntu-MI.ttf ${FONTDIR} + cp Ubuntu-R.ttf ${FONTDIR} + cp Ubuntu-RI.ttf ${FONTDIR} + cp UbuntuMono-B.ttf ${FONTDIR} + cp UbuntuMono-BI.ttf ${FONTDIR} + cp UbuntuMono-R.ttf ${FONTDIR} + cp UbuntuMono-RI.ttf ${FONTDIR} + cp README.txt ${FONTDIR}/ubuntu-fonts-readme.txt + cp LICENCE.txt ${FONTDIR}/ubuntu-fonts-licence.txt +} + +LICENSE="Artistic" +COPYRIGHT="Canonical Ltd." From 36e1819c3c1e2c099f5fcb1188a1835e9702ed81 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 18 Aug 2013 20:09:47 -0500 Subject: [PATCH 492/587] pkgconfig: Add 0.28, fix build (tested on gcc4) (cherry picked from commit 7bea1e79b984171950f16ff483e277ed5b5d15b6) --- .../pkgconfig/patches/pkgconfig-0.28.patch | 50 +++++++++++++++++++ dev-util/pkgconfig/pkgconfig-0.28.bep | 30 +++++++++++ 2 files changed, 80 insertions(+) create mode 100644 dev-util/pkgconfig/patches/pkgconfig-0.28.patch create mode 100644 dev-util/pkgconfig/pkgconfig-0.28.bep diff --git a/dev-util/pkgconfig/patches/pkgconfig-0.28.patch b/dev-util/pkgconfig/patches/pkgconfig-0.28.patch new file mode 100644 index 000000000..43c38a66d --- /dev/null +++ b/dev-util/pkgconfig/patches/pkgconfig-0.28.patch @@ -0,0 +1,50 @@ +diff -Naur pkg-config-0.28/glib/configure.ac pkg-config-0.28-haiku/glib/configure.ac +--- pkg-config-0.28/glib/configure.ac 2012-10-13 09:35:36.033030144 -0500 ++++ pkg-config-0.28-haiku/glib/configure.ac 2013-08-18 19:05:41.008388608 -0500 +@@ -288,7 +288,6 @@ + AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""]) + AC_LANG_RESTORE + +-AM_PROG_CC_STDC + AM_PROG_CC_C_O + AC_PROG_INSTALL + +@@ -1031,38 +1030,6 @@ + AC_CHECK_FUNCS(getprotobyname_r endservent if_nametoindex) + AC_CHECK_HEADERS([netdb.h wspiapi.h arpa/nameser_compat.h]) + +-if test $glib_native_win32 = no; then +- # We can't just use AC_CHECK_FUNC/AC_CHECK_LIB here. Bug 586150 +- NETWORK_LIBS="" +- AC_MSG_CHECKING([for res_query]) +- AC_TRY_LINK([#include +- #include +- #include +- #include +- ],[ +- res_query("test", 0, 0, (void *)0, 0); +- ],[AC_MSG_RESULT([yes])], +- [save_libs="$LIBS" +- LIBS="-lresolv $LIBS" +- AC_TRY_LINK([#include +- #include +- #include +- #include +- ],[ +- res_query("test", 0, 0, (void *)0, 0); +- ],[AC_MSG_RESULT([in -lresolv]) +- NETWORK_LIBS="-lresolv $NETWORK_LIBS"], +- [LIBS="-lbind $save_libs" +- AC_TRY_LINK([#include ], +- [res_query("test", 0, 0, (void *)0, 0);], +- [AC_MSG_RESULT([in -lbind]) +- NETWORK_LIBS="-lbind $NETWORK_LIBS"], +- [AC_MSG_ERROR(not found)])]) +- LIBS="$save_libs"]) +- AC_CHECK_FUNC(socket, :, AC_CHECK_LIB(socket, socket, +- [NETWORK_LIBS="-lsocket $NETWORK_LIBS"], +- [AC_MSG_ERROR(Could not find socket())])) +-fi + AC_SUBST(NETWORK_LIBS) + + AC_CHECK_HEADER([linux/netlink.h], diff --git a/dev-util/pkgconfig/pkgconfig-0.28.bep b/dev-util/pkgconfig/pkgconfig-0.28.bep new file mode 100644 index 000000000..631471ba4 --- /dev/null +++ b/dev-util/pkgconfig/pkgconfig-0.28.bep @@ -0,0 +1,30 @@ +DESCRIPTION="pkgconfig" +HOMEPAGE="http://pkg-config.freedesktop.org/wiki/" +SRC_URI="http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" +CHECKSUM_MD5="aa3c86e67551adc3ac865160e34a2a0d" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + # because we patched configure.ac... + cd pkg-config-0.28/glib + autoreconf -i -f + cd .. + # do the needful... + autoreconf -i -f + COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ + --docdir=$COMMON_DOCS/doc/pkg-config \ + --mandir=$COMMON_DOCS/man \ + --disable-host-tool \ + --with-internal-glib + make +} + +INSTALL { + cd pkg-config-0.28 + make install +} +LICENSE="GNU GPL v2" +COPYRIGHT="1998, 2001-2006 Red Hat Inc." From 295b38ef1d39b4eed48b65b1bcc110d1aff10513 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sun, 18 Aug 2013 22:58:09 -0500 Subject: [PATCH 493/587] libsdl2: Add SDL2 port. Marked unstable * Small number of changes to get it building * Very unstable, but getting there. * split sdl 2.0 from libsdl to libsdl2. The reasoning behind this is that libsdl uses -lsdl, while libsdl 2.x uses -lsdl2. (SDL2 breaks a lot of binary compat I guess) * Remove old sdl2 bep's in libsdl.. these never worked well. * libsdl 2.0.0 seems to build with gcc2 and gcc4 (yay) * libsdl 2.0.0 patch pushed upstream in SDL bug #2046 * Thanks to the gsoc students for their hard work! (cherry picked from commit d7e59f63c118354c92b823f728accb4f69602c74) Conflicts: media-libs/libsdl2/libsdl2-2.0.0.bep --- media-libs/libsdl2/libsdl2-2.0.0.bep | 28 +++++++++++++++++++ .../libsdl2/patches/libsdl2-2.0.0.patch | 26 +++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 media-libs/libsdl2/libsdl2-2.0.0.bep create mode 100644 media-libs/libsdl2/patches/libsdl2-2.0.0.patch diff --git a/media-libs/libsdl2/libsdl2-2.0.0.bep b/media-libs/libsdl2/libsdl2-2.0.0.bep new file mode 100644 index 000000000..6175dca16 --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.0.0.bep @@ -0,0 +1,28 @@ +DESCRIPTION="Simple Direct Media Layer 2" +HOMEPAGE="http://www.libsdl.org/" +SRC_URI="http://www.libsdl.org/release/SDL2-2.0.0.tar.gz" +CHECKSUM_MD5="beec89afb6edcc6f0abc4114f2e6bcf7" +REVISION="1" +STATUS_HAIKU="unstable" +DEPEND="pkgconfig >= 0.9.0" +BUILD { + cd SDL2-2.0.0 + MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man + LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` + DATADIR=`finddir B_COMMON_DATA_DIRECTORY` + mkdir build_haiku + cd build_haiku + ../configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --libdir=$LIBDIR \ + --mandir=$MANDIR \ + --datadir=$DATADIR \ + --enable-shared + make +} + +INSTALL { + cd SDL2-2.0.0/build_haiku + make install +} +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/libsdl2/patches/libsdl2-2.0.0.patch b/media-libs/libsdl2/patches/libsdl2-2.0.0.patch new file mode 100644 index 000000000..51471a4ba --- /dev/null +++ b/media-libs/libsdl2/patches/libsdl2-2.0.0.patch @@ -0,0 +1,26 @@ +diff -Naur SDL2-2.0.0/include/begin_code.h SDL2-2.0.0-haiku/include/begin_code.h +--- SDL2-2.0.0/include/begin_code.h 2013-08-11 21:57:54.011796480 -0500 ++++ SDL2-2.0.0-haiku/include/begin_code.h 2013-08-18 21:04:46.580386816 -0500 +@@ -36,7 +36,9 @@ + /* Some compilers use a special export keyword */ + #ifndef DECLSPEC + # if defined(__BEOS__) || defined(__HAIKU__) +-# if defined(__GNUC__) ++# if defined(__GNUC__) && __GNUC__ >= 4 ++# define DECLSPEC __attribute__ ((visibility("default"))) ++# elif defined(__GNUC__) && __GNUC__ >= 2 + # define DECLSPEC __declspec(dllexport) + # else + # define DECLSPEC __declspec(export) +diff -Naur SDL2-2.0.0/src/main/beos/SDL_BApp.h SDL2-2.0.0-haiku/src/main/beos/SDL_BApp.h +--- SDL2-2.0.0/src/main/beos/SDL_BApp.h 2013-08-11 21:57:54.058982400 -0500 ++++ SDL2-2.0.0-haiku/src/main/beos/SDL_BApp.h 2013-08-18 21:05:04.364642304 -0500 +@@ -371,7 +371,7 @@ + + + /* Members */ +- vector _window_map; /* Keeps track of SDL_Windows by index-id*/ ++ std::vector _window_map; /* Keeps track of SDL_Windows by index-id*/ + + display_mode *_saved_mode; + BGLView *_current_context; From b0e932557c3e24117721844c7e98d0a1517c1ccd Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 19 Aug 2013 15:23:25 -0500 Subject: [PATCH 494/587] libsdl2: Rename to libsdl 2.0.0 * As per our mailing list discussion, package management will support multiple versions of the same package being installed at the same time, so this *should* work like this in theory. * Adjust patch to match 1:1 SDL changes accepted upstream. --- .../libsdl-2.0.0.bep} | 2 +- .../patches/libsdl-2.0.0.patch} | 29 ++++++++++++++----- 2 files changed, 22 insertions(+), 9 deletions(-) rename media-libs/{libsdl2/libsdl2-2.0.0.bep => libsdl/libsdl-2.0.0.bep} (93%) rename media-libs/{libsdl2/patches/libsdl2-2.0.0.patch => libsdl/patches/libsdl-2.0.0.patch} (53%) diff --git a/media-libs/libsdl2/libsdl2-2.0.0.bep b/media-libs/libsdl/libsdl-2.0.0.bep similarity index 93% rename from media-libs/libsdl2/libsdl2-2.0.0.bep rename to media-libs/libsdl/libsdl-2.0.0.bep index 6175dca16..6f7de2ebd 100644 --- a/media-libs/libsdl2/libsdl2-2.0.0.bep +++ b/media-libs/libsdl/libsdl-2.0.0.bep @@ -1,4 +1,4 @@ -DESCRIPTION="Simple Direct Media Layer 2" +DESCRIPTION="Simple Direct Media Layer" 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/patches/libsdl2-2.0.0.patch b/media-libs/libsdl/patches/libsdl-2.0.0.patch similarity index 53% rename from media-libs/libsdl2/patches/libsdl2-2.0.0.patch rename to media-libs/libsdl/patches/libsdl-2.0.0.patch index 51471a4ba..dae2a97bf 100644 --- a/media-libs/libsdl2/patches/libsdl2-2.0.0.patch +++ b/media-libs/libsdl/patches/libsdl-2.0.0.patch @@ -1,20 +1,33 @@ diff -Naur SDL2-2.0.0/include/begin_code.h SDL2-2.0.0-haiku/include/begin_code.h --- SDL2-2.0.0/include/begin_code.h 2013-08-11 21:57:54.011796480 -0500 -+++ SDL2-2.0.0-haiku/include/begin_code.h 2013-08-18 21:04:46.580386816 -0500 -@@ -36,7 +36,9 @@ ++++ SDL2-2.0.0-haiku/include/begin_code.h 2013-08-19 15:12:06.654049280 -0500 +@@ -35,13 +35,7 @@ + /* Some compilers use a special export keyword */ #ifndef DECLSPEC - # if defined(__BEOS__) || defined(__HAIKU__) +-# if defined(__BEOS__) || defined(__HAIKU__) -# if defined(__GNUC__) -+# if defined(__GNUC__) && __GNUC__ >= 4 -+# define DECLSPEC __attribute__ ((visibility("default"))) +-# define DECLSPEC __declspec(dllexport) +-# else +-# define DECLSPEC __declspec(export) +-# endif +-# elif defined(__WIN32__) ++# if defined(__WIN32__) + # ifdef __BORLANDC__ + # ifdef BUILD_SDL + # define DECLSPEC +@@ -54,6 +48,8 @@ + # else + # if defined(__GNUC__) && __GNUC__ >= 4 + # define DECLSPEC __attribute__ ((visibility("default"))) +# elif defined(__GNUC__) && __GNUC__ >= 2 - # define DECLSPEC __declspec(dllexport) ++# define DECLSPEC __declspec(dllexport) # else - # define DECLSPEC __declspec(export) + # define DECLSPEC + # endif diff -Naur SDL2-2.0.0/src/main/beos/SDL_BApp.h SDL2-2.0.0-haiku/src/main/beos/SDL_BApp.h --- SDL2-2.0.0/src/main/beos/SDL_BApp.h 2013-08-11 21:57:54.058982400 -0500 -+++ SDL2-2.0.0-haiku/src/main/beos/SDL_BApp.h 2013-08-18 21:05:04.364642304 -0500 ++++ SDL2-2.0.0-haiku/src/main/beos/SDL_BApp.h 2013-08-19 15:10:50.412876800 -0500 @@ -371,7 +371,7 @@ From 80d36572c04b2820eb6bf2a258648d9f55699a8f Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 17 Sep 2013 01:14:53 +0200 Subject: [PATCH 495/587] Cleanup fallout from cherry-picks (renaming .bep to .recipe). --- app-emulation/qemu/{qemu-0.15.1.bep => qemu-0.15.1.recipe} | 0 ...libwapcaplet-0.2.0-HEAD.bep => libwapcaplet-0.2.0-HEAD.recipe} | 0 dev-util/pkgconfig/{pkgconfig-0.28.bep => pkgconfig-0.28.recipe} | 0 .../{quicklaunch-0.9.5.bep => quicklaunch-0.9.5.recipe} | 0 .../ubertuber/{ubertuber-0.9.5.bep => ubertuber-0.9.5.recipe} | 0 media-fonts/ubuntu/{ubuntu-0.80.bep => ubuntu-0.80.recipe} | 0 media-libs/libsdl/{libsdl-2.0.0.bep => libsdl-2.0.0.recipe} | 0 .../fatsort/{fatsort-0.9.17.269.bep => fatsort-0.9.17.269.recipe} | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename app-emulation/qemu/{qemu-0.15.1.bep => qemu-0.15.1.recipe} (100%) rename dev-libs/libwapcaplet/{libwapcaplet-0.2.0-HEAD.bep => libwapcaplet-0.2.0-HEAD.recipe} (100%) rename dev-util/pkgconfig/{pkgconfig-0.28.bep => pkgconfig-0.28.recipe} (100%) rename haiku-apps/quicklaunch/{quicklaunch-0.9.5.bep => quicklaunch-0.9.5.recipe} (100%) rename haiku-apps/ubertuber/{ubertuber-0.9.5.bep => ubertuber-0.9.5.recipe} (100%) rename media-fonts/ubuntu/{ubuntu-0.80.bep => ubuntu-0.80.recipe} (100%) rename media-libs/libsdl/{libsdl-2.0.0.bep => libsdl-2.0.0.recipe} (100%) rename sys-fs/fatsort/{fatsort-0.9.17.269.bep => fatsort-0.9.17.269.recipe} (100%) diff --git a/app-emulation/qemu/qemu-0.15.1.bep b/app-emulation/qemu/qemu-0.15.1.recipe similarity index 100% rename from app-emulation/qemu/qemu-0.15.1.bep rename to app-emulation/qemu/qemu-0.15.1.recipe diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0-HEAD.bep b/dev-libs/libwapcaplet/libwapcaplet-0.2.0-HEAD.recipe similarity index 100% rename from dev-libs/libwapcaplet/libwapcaplet-0.2.0-HEAD.bep rename to dev-libs/libwapcaplet/libwapcaplet-0.2.0-HEAD.recipe diff --git a/dev-util/pkgconfig/pkgconfig-0.28.bep b/dev-util/pkgconfig/pkgconfig-0.28.recipe similarity index 100% rename from dev-util/pkgconfig/pkgconfig-0.28.bep rename to dev-util/pkgconfig/pkgconfig-0.28.recipe diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.5.bep b/haiku-apps/quicklaunch/quicklaunch-0.9.5.recipe similarity index 100% rename from haiku-apps/quicklaunch/quicklaunch-0.9.5.bep rename to haiku-apps/quicklaunch/quicklaunch-0.9.5.recipe diff --git a/haiku-apps/ubertuber/ubertuber-0.9.5.bep b/haiku-apps/ubertuber/ubertuber-0.9.5.recipe similarity index 100% rename from haiku-apps/ubertuber/ubertuber-0.9.5.bep rename to haiku-apps/ubertuber/ubertuber-0.9.5.recipe diff --git a/media-fonts/ubuntu/ubuntu-0.80.bep b/media-fonts/ubuntu/ubuntu-0.80.recipe similarity index 100% rename from media-fonts/ubuntu/ubuntu-0.80.bep rename to media-fonts/ubuntu/ubuntu-0.80.recipe diff --git a/media-libs/libsdl/libsdl-2.0.0.bep b/media-libs/libsdl/libsdl-2.0.0.recipe similarity index 100% rename from media-libs/libsdl/libsdl-2.0.0.bep rename to media-libs/libsdl/libsdl-2.0.0.recipe diff --git a/sys-fs/fatsort/fatsort-0.9.17.269.bep b/sys-fs/fatsort/fatsort-0.9.17.269.recipe similarity index 100% rename from sys-fs/fatsort/fatsort-0.9.17.269.bep rename to sys-fs/fatsort/fatsort-0.9.17.269.recipe From 655a5e7f16a969511d03a270422c8ae9d22c179a Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 17 Sep 2013 12:08:37 +0200 Subject: [PATCH 496/587] Rename some merged recipe files to conform to version syntax. --- .../libcss/{libcss-0.2.0-HEAD.recipe => libcss-0.2.0_HEAD.recipe} | 0 ...erutils-0.1.2-HEAD.recipe => libparserutils-0.1.2_HEAD.recipe} | 0 ...wapcaplet-0.2.0-HEAD.recipe => libwapcaplet-0.2.0_HEAD.recipe} | 0 .../{buildsystem-1.0-HEAD.recipe => buildsystem-1.0_HEAD.recipe} | 0 .../{libnsbmp-0.1.0-HEAD.recipe => libnsbmp-0.1.0_HEAD.recipe} | 0 .../{libnsgif-0.1.0-HEAD.recipe => libnsgif-0.1.0_HEAD.recipe} | 0 ...{libsvgtiny-0.1.0-HEAD.recipe => libsvgtiny-0.1.0_HEAD.recipe} | 0 .../hubbub/{hubbub-0.2.0-HEAD.recipe => hubbub-0.2.0_HEAD.recipe} | 0 .../libdom/{libdom-0.0.1-HEAD.recipe => libdom-0.0.1_HEAD.recipe} | 0 .../netsurf/{netsurf-3.1-HEAD.recipe => netsurf-3.1_HEAD.recipe} | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename dev-libs/libcss/{libcss-0.2.0-HEAD.recipe => libcss-0.2.0_HEAD.recipe} (100%) rename dev-libs/libparserutils/{libparserutils-0.1.2-HEAD.recipe => libparserutils-0.1.2_HEAD.recipe} (100%) rename dev-libs/libwapcaplet/{libwapcaplet-0.2.0-HEAD.recipe => libwapcaplet-0.2.0_HEAD.recipe} (100%) rename dev-util/buildsystem/{buildsystem-1.0-HEAD.recipe => buildsystem-1.0_HEAD.recipe} (100%) rename media-libs/libnsbmp/{libnsbmp-0.1.0-HEAD.recipe => libnsbmp-0.1.0_HEAD.recipe} (100%) rename media-libs/libnsgif/{libnsgif-0.1.0-HEAD.recipe => libnsgif-0.1.0_HEAD.recipe} (100%) rename media-libs/libsvgtiny/{libsvgtiny-0.1.0-HEAD.recipe => libsvgtiny-0.1.0_HEAD.recipe} (100%) rename net-libs/hubbub/{hubbub-0.2.0-HEAD.recipe => hubbub-0.2.0_HEAD.recipe} (100%) rename net-libs/libdom/{libdom-0.0.1-HEAD.recipe => libdom-0.0.1_HEAD.recipe} (100%) rename www-client/netsurf/{netsurf-3.1-HEAD.recipe => netsurf-3.1_HEAD.recipe} (100%) diff --git a/dev-libs/libcss/libcss-0.2.0-HEAD.recipe b/dev-libs/libcss/libcss-0.2.0_HEAD.recipe similarity index 100% rename from dev-libs/libcss/libcss-0.2.0-HEAD.recipe rename to dev-libs/libcss/libcss-0.2.0_HEAD.recipe diff --git a/dev-libs/libparserutils/libparserutils-0.1.2-HEAD.recipe b/dev-libs/libparserutils/libparserutils-0.1.2_HEAD.recipe similarity index 100% rename from dev-libs/libparserutils/libparserutils-0.1.2-HEAD.recipe rename to dev-libs/libparserutils/libparserutils-0.1.2_HEAD.recipe diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0-HEAD.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_HEAD.recipe similarity index 100% rename from dev-libs/libwapcaplet/libwapcaplet-0.2.0-HEAD.recipe rename to dev-libs/libwapcaplet/libwapcaplet-0.2.0_HEAD.recipe diff --git a/dev-util/buildsystem/buildsystem-1.0-HEAD.recipe b/dev-util/buildsystem/buildsystem-1.0_HEAD.recipe similarity index 100% rename from dev-util/buildsystem/buildsystem-1.0-HEAD.recipe rename to dev-util/buildsystem/buildsystem-1.0_HEAD.recipe diff --git a/media-libs/libnsbmp/libnsbmp-0.1.0-HEAD.recipe b/media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe similarity index 100% rename from media-libs/libnsbmp/libnsbmp-0.1.0-HEAD.recipe rename to media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe diff --git a/media-libs/libnsgif/libnsgif-0.1.0-HEAD.recipe b/media-libs/libnsgif/libnsgif-0.1.0_HEAD.recipe similarity index 100% rename from media-libs/libnsgif/libnsgif-0.1.0-HEAD.recipe rename to media-libs/libnsgif/libnsgif-0.1.0_HEAD.recipe diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.0-HEAD.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.0_HEAD.recipe similarity index 100% rename from media-libs/libsvgtiny/libsvgtiny-0.1.0-HEAD.recipe rename to media-libs/libsvgtiny/libsvgtiny-0.1.0_HEAD.recipe diff --git a/net-libs/hubbub/hubbub-0.2.0-HEAD.recipe b/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe similarity index 100% rename from net-libs/hubbub/hubbub-0.2.0-HEAD.recipe rename to net-libs/hubbub/hubbub-0.2.0_HEAD.recipe diff --git a/net-libs/libdom/libdom-0.0.1-HEAD.recipe b/net-libs/libdom/libdom-0.0.1_HEAD.recipe similarity index 100% rename from net-libs/libdom/libdom-0.0.1-HEAD.recipe rename to net-libs/libdom/libdom-0.0.1_HEAD.recipe diff --git a/www-client/netsurf/netsurf-3.1-HEAD.recipe b/www-client/netsurf/netsurf-3.1_HEAD.recipe similarity index 100% rename from www-client/netsurf/netsurf-3.1-HEAD.recipe rename to www-client/netsurf/netsurf-3.1_HEAD.recipe From 6bb30b537ffc629fe127408ae81567410ac8f36f Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 17 Sep 2013 08:56:36 -0700 Subject: [PATCH 497/587] Adjusted libsdl so that header files get included, but it's including them twice now? --- media-libs/libsdl/libsdl-1.2.15.recipe | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index 905be02c3..3110135c7 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -62,6 +62,8 @@ INSTALL() cp build/.libs/libSDLmain.a $developDir/lib/libSDLmain.a cp build/.libs/libSDLmain.la $developDir/lib/libSDLmain.la + cp include/* $includeDir + prepareInstalledDevelLibs \ libSDL \ libSDLmain @@ -74,9 +76,9 @@ INSTALL() TEST() { - cd SDL-1.2.15/test - ./configure - make + cd test + runConfigure ./configure + make $jobArgs echo testvidoinfo testvidinfo echo testgl From 1fb835d2776339844357397b024ed9a8350b615b Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 17 Sep 2013 08:59:57 -0700 Subject: [PATCH 498/587] WIP .recipe for sdl_image-1.2.12 --- media-libs/sdl_image/sdl_image-1.2.12.recipe | 61 ++++++++++++++------ 1 file changed, 43 insertions(+), 18 deletions(-) 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 f430b555d..ec29341d5 100644 --- a/media-libs/sdl_image/sdl_image-1.2.12.recipe +++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe @@ -1,37 +1,62 @@ +SUMMARY="Simple Direct Media Layer Image Library" DESCRIPTION="Simple Direct Media Layer Image Library" 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" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libsdl >= 1.2.14 - media-libs/jpeg >= 8b - media-libs/libpng >= 1.2.46 - media-libs/tiff >= 3.8.2 - media-libs/giflib >= 4.1.6 - media-libs/libwebp >= 0.1.3" +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + lib:sdl_image = $portVersion compat >= 1.2 + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + devel:libsdl + lib:libjpeg + lib:libpng + lib:libtiff +# lib:giflib +# lib:libwebp + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtool + cmd:make + cmd:pkg_config + " + +SOURCE_DIR="SDL_image-1.2.12" + BUILD() { - cd SDL_image-1.2.12 libtoolize --force --copy --install aclocal --install -I acinclude ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + + echo ------------------ + sdl-config --version + echo ------------------ + + runConfigure ./configure \ --enable-bmp --enable-lbm --enable-pcx \ --enable-pnm --enable-tga --enable-xcf --enable-xpm --enable-xv \ - --enable-gif --enable-jpg --disable-jpg-shared \ - --libdir=$LIBDIR \ - --mandir=$MANDIR + --enable-gif --enable-jpg --disable-jpg-shared make } INSTALL() { - cd SDL_image-1.2.12 make install } - -LICENSE="Zlib" -COPYRIGHT="1997-2012 Sam Lantinga" From 7555134eec9d43957af13ca2c2b30bd57b3d343f Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 17 Sep 2013 09:07:57 -0700 Subject: [PATCH 499/587] Mark sdl_image-1.2.12 as not working --- media-libs/sdl_image/sdl_image-1.2.12.recipe | 2 +- 1 file changed, 1 insertion(+), 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 ec29341d5..16d56d46c 100644 --- a/media-libs/sdl_image/sdl_image-1.2.12.recipe +++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe @@ -7,7 +7,7 @@ REVISION="1" LICENSE="Zlib" COPYRIGHT="1997-2012 Sam Lantinga" -ARCHITECTURES="x86 x86_gcc2" +ARCHITECTURES="?x86 ?x86_gcc2" PROVIDES=" lib:sdl_image = $portVersion compat >= 1.2 From c5a67e1536e294e0defb62fd8c2486b4e019341c Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 17 Sep 2013 13:31:28 -0700 Subject: [PATCH 500/587] Updated arabeyes_fonts .recipe so that it now builds into an .hpkg --- .../arabeyes_fonts/arabeyes_fonts-1.1.recipe | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe index ee6aef5cd..ba5dc7a30 100644 --- a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe +++ b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe @@ -1,28 +1,42 @@ DESCRIPTION="Arabeyes Arabic TrueType fonts" +SUMMARY="Arabeyes Arabic TrueType fonts" 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" -STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="11000a74da50b461b374f711392f1d46" +LICENSE="GNU GPL v2" +COPYRIGHT="2003-2007 Arabeyes.org + 2002-2005 Free Software Foundation" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="arabeyes_fonts = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + cmd:tar + coreutils + " + +SOURCE_DIR="ae_fonts1-1.1" + BUILD() { - cd ae_fonts1-1.1 + tar xvjf $portDir/download/ae_fonts1_ttf_1.1.tar.bz2 } INSTALL() { cd ae_fonts1-1.1 - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/arabeyes + FONTDIR=$fontsDir/arabeyes mkdir -p ${FONTDIR} - cp -r AAHS ${FONTDIR}/ - cp -r AGA ${FONTDIR}/ - cp -r FS ${FONTDIR}/ - cp -r Kasr ${FONTDIR}/ - cp -r MCS ${FONTDIR}/ - cp -r Shmookh ${FONTDIR}/ + cp -rd AAHS ${FONTDIR}/ + cp -rd AGA ${FONTDIR}/ + cp -rd FS ${FONTDIR}/ + cp -rd Kasr ${FONTDIR}/ + cp -rd MCS ${FONTDIR}/ + cp -rd Shmookh ${FONTDIR}/ } -LICENSE="GNU GPL v2" -COPYRIGHT="2003-2007 Arabeyes.org - 2002-2005 Free Software Foundation" From fab40efb9b4831ce09aac859f0c32dec019f8e54 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 17 Sep 2013 13:35:50 -0700 Subject: [PATCH 501/587] Remove old ubuntu font recipe, now renamed to ubuntu_font_family --- media-fonts/ubuntu/ubuntu-0.80.recipe | 32 --------------------------- 1 file changed, 32 deletions(-) delete mode 100644 media-fonts/ubuntu/ubuntu-0.80.recipe diff --git a/media-fonts/ubuntu/ubuntu-0.80.recipe b/media-fonts/ubuntu/ubuntu-0.80.recipe deleted file mode 100644 index 5a0da9f2c..000000000 --- a/media-fonts/ubuntu/ubuntu-0.80.recipe +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION="Font family from Ubunu operating system" -HOMEPAGE="http://font.ubuntu.com" -SRC_URI="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd ubuntu-font-family-0.80 -} -INSTALL { - cd ubuntu-font-family-0.80 - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ubuntu - mkdir -p ${FONTDIR} - cp Ubuntu-B.ttf ${FONTDIR} - cp Ubuntu-BI.ttf ${FONTDIR} - cp Ubuntu-C.ttf ${FONTDIR} - cp Ubuntu-L.ttf ${FONTDIR} - cp Ubuntu-LI.ttf ${FONTDIR} - cp Ubuntu-M.ttf ${FONTDIR} - cp Ubuntu-MI.ttf ${FONTDIR} - cp Ubuntu-R.ttf ${FONTDIR} - cp Ubuntu-RI.ttf ${FONTDIR} - cp UbuntuMono-B.ttf ${FONTDIR} - cp UbuntuMono-BI.ttf ${FONTDIR} - cp UbuntuMono-R.ttf ${FONTDIR} - cp UbuntuMono-RI.ttf ${FONTDIR} - cp README.txt ${FONTDIR}/ubuntu-fonts-readme.txt - cp LICENCE.txt ${FONTDIR}/ubuntu-fonts-licence.txt -} - -LICENSE="Artistic" -COPYRIGHT="Canonical Ltd." From 557c0696af2e887ef5fff7b4f3c443166baa61f2 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 17 Sep 2013 14:31:01 -0700 Subject: [PATCH 502/587] Updated .recipe for arabeyes_fonts so that it builds to a .hpkg --- media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe index ba5dc7a30..ce25c8d8e 100644 --- a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe +++ b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe @@ -1,5 +1,5 @@ -DESCRIPTION="Arabeyes Arabic TrueType fonts" 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" @@ -39,4 +39,3 @@ INSTALL() cp -rd MCS ${FONTDIR}/ cp -rd Shmookh ${FONTDIR}/ } - From 0f4c0805308d1c956e0808ee77401908ce21ee7e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 17 Sep 2013 14:31:44 -0700 Subject: [PATCH 503/587] Updated .recipe for courier_prime so that it builds to a .hpkg --- .../courier_prime/courier_prime-1.0.recipe | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/media-fonts/courier_prime/courier_prime-1.0.recipe b/media-fonts/courier_prime/courier_prime-1.0.recipe index 26fa8a9fb..9f41b8a26 100644 --- a/media-fonts/courier_prime/courier_prime-1.0.recipe +++ b/media-fonts/courier_prime/courier_prime-1.0.recipe @@ -1,23 +1,36 @@ -DESCRIPTION="It's Courier, just better." +SUMMARY="It's Courier, just better." +DESCRIPTION="Courier Prime is optimized for 12 point size, and matches the metrics of Courier and Courier Final Draft, so you can often swap it out one-for-one." HOMEPAGE="http://quoteunquoteapps.com/courierprime/" SRC_URI="http://quoteunquoteapps.com/downloads/courier-prime.zip" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="cf79336ce1cf439560a5364ab7856738" +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2013 Quote-Unquote Apps" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES=" + courier_prime = $portVersion + " + +REQUIRES="" + +BUILD_REQUIRES="" + +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="Courier Prime" + BUILD() { - echo "No building required." + true } INSTALL() { - cd "Courier Prime" - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/courier-prime + FONTDIR=$fontsDir/courier-prime mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR}/ cp Read\ me.txt ${FONTDIR}/README.txt } - -LICENSE="SIL Open Font License v1.1" -COPYRIGHT="2013 Quote-Unquote Apps" From 94d2ab817b842dafc6e04504b823fa6b64d56a37 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 18 Sep 2013 22:03:37 +0200 Subject: [PATCH 504/587] Fix one more broken port name --- .../HTML_Parser-3.70.recipe} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dev-perl/{HTML-Parser/HTML-Parser-3.70.recipe => HTML_Parser/HTML_Parser-3.70.recipe} (100%) diff --git a/dev-perl/HTML-Parser/HTML-Parser-3.70.recipe b/dev-perl/HTML_Parser/HTML_Parser-3.70.recipe similarity index 100% rename from dev-perl/HTML-Parser/HTML-Parser-3.70.recipe rename to dev-perl/HTML_Parser/HTML_Parser-3.70.recipe From 0279d9aa339e03c1c8972342e626c7cc85682eb7 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 19 Sep 2013 00:08:03 +0200 Subject: [PATCH 505/587] Add missing group declaration to openssh recipe --- net-misc/openssh/openssh-6.0p1.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index e290a249f..7bb7085e7 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -4,7 +4,7 @@ LICENSE="OpenSSH" COPYRIGHT="2005-2012 Tatu Ylonen et al." SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz" CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b" -REVISION="7" +REVISION="8" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="openssh-6.0p1.patch" @@ -68,6 +68,7 @@ sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/o PACKAGE_USERS=" sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\" " +PACKAGE_GROUPS="sshd" SOURCE_DIR="$portVersionedName" From b9cce3c7bc920251685a3b30611e12f73603672e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Sep 2013 23:15:20 -0700 Subject: [PATCH 506/587] Added initial portaudio .recipe by AdrianArroyoCalle --- media-libs/portaudio/portaudio-19.recipe | 71 ++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 media-libs/portaudio/portaudio-19.recipe diff --git a/media-libs/portaudio/portaudio-19.recipe b/media-libs/portaudio/portaudio-19.recipe new file mode 100644 index 000000000..675e2d86a --- /dev/null +++ b/media-libs/portaudio/portaudio-19.recipe @@ -0,0 +1,71 @@ +DESCRIPTION="Port Audio is a free, cross-platform, audio I/O library" +SUMMARY="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" +LICENSE="MIT" +COPYRIGHT="1999-2011 Ross Bencina and Phil Burk" + +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + portaudio$secondaryArchSuffix = $portVersion + lib:libportaudio$secondaryArchSuffix = 19 + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:cmake + cmd:gcc + cmd:ld + cmd:make + " + +BUILD_REQUIRES=" + cmd:gcc + cmd:cmake + cmd:make + " + +SOURCE_DIR="portaudio" + +BUILD() +{ + cmake . + make +} + +INSTALL() +{ + mkdir -p $libDir + cp bin/Win32/libportaudio.so $libDir + mkdir -p $developDir/lib + #cp bin/Win32/libportaudio.so $developDir/lib/ + cp bin/Win32/libportaudio_static.a $developDir/lib/ + mkdir -p $includeDir + cp include/* $includeDir + + prepareInstalledDevelLibs \ + libportaudio + + fixPkgconfig + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + devel:libportaudio = 19 + devel:libportaudio_static = 19 + " + +REQUIRES_devel=" + libportaudio == $portVersion base + " From ef9920939f48fc00c98ebb9965763232ce862df8 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Sep 2013 15:52:01 -0700 Subject: [PATCH 507/587] Initial .recipe to build a working dos2unix and unix2dos --- app-text/dos2unix/dos2unix-1.0.recipe | 37 ++++++++++++++++++++------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/app-text/dos2unix/dos2unix-1.0.recipe b/app-text/dos2unix/dos2unix-1.0.recipe index dba72d456..aba387621 100644 --- a/app-text/dos2unix/dos2unix-1.0.recipe +++ b/app-text/dos2unix/dos2unix-1.0.recipe @@ -1,20 +1,39 @@ -DESCRIPTION="dos2unix and unix2dos end of line file converters." +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://www.programmersheaven.com/download/3118/download.aspx" -SRC_URI="svn+http://ports.haiku-files.org/svn/haikuports/trunk/app-text/dos2unix" +SRC_URI="http://ports-space.haiku-files.org/source/dos2unix-1.0.zip" +CHECKSUM_MD5="76c4991341219d71072474255714b010" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +COPYRIGHT="Public Domain" +LICENSE="Public Domain" + +ARCHITECTURES="x86 x86_gcc2 x86_64" + +PROVIDES=" + dos2unix = 1.0 compat >= 1 + cmd:dos2unix + cmd:unix2dos + " + +REQUIRES=" + lib:libroot >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:gcc + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd dos2unix-1.0 gcc -O -o dos2unix DOS2UNIX.C gcc -O -o unix2dos UNIX2DOS.C } INSTALL() { - cd dos2unix-1.0 - mkdir -p ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY` - cp dos2unix ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/dos2unix - cp unix2dos ${DESTDIR}`finddir B_COMMON_BIN_DIRECTORY`/unix2dos + mkdir -p $binDir + cp dos2unix $binDir/dos2unix + cp unix2dos $binDir/unix2dos } From b47f5c725878be7d7e18cd3ee996ff70bd52ef5f Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 19 Sep 2013 15:58:57 -0700 Subject: [PATCH 508/587] Updated lcms to 2.5, removed older 2.x lcms recipes --- media-libs/lcms/lcms-2.0a.recipe | 30 ------------- media-libs/lcms/lcms-2.1.recipe | 30 ------------- media-libs/lcms/lcms-2.5.recipe | 73 ++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 60 deletions(-) delete mode 100644 media-libs/lcms/lcms-2.0a.recipe delete mode 100644 media-libs/lcms/lcms-2.1.recipe create mode 100644 media-libs/lcms/lcms-2.5.recipe diff --git a/media-libs/lcms/lcms-2.0a.recipe b/media-libs/lcms/lcms-2.0a.recipe deleted file mode 100644 index ac5ed7205..000000000 --- a/media-libs/lcms/lcms-2.0a.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="lcms - Little cms intends to be a small-footprint, speed optimized color management engine" -HOMEPAGE="http://littlecms.com/" -SRC_URI="http://sourceforge.net/projects/lcms/files/lcms/2.0/lcms2-2.0a.tar.gz/download" -CHECKSUM_MD5="c4f115462a7a5b306c247d018d7a8982" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd lcms-2.0 - libtoolize --force --copy --install - aclocal - automake - autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - CFLAGS=-O0 - make -} - -INSTALL() -{ - cd lcms-2.0 - make install -} -LICENSE="MIT" -COPYRIGHT="2007 Marti Maria" diff --git a/media-libs/lcms/lcms-2.1.recipe b/media-libs/lcms/lcms-2.1.recipe deleted file mode 100644 index 653e69863..000000000 --- a/media-libs/lcms/lcms-2.1.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="lcms - Little cms intends to be a small-footprint, speed optimized color management engine" -HOMEPAGE="http://littlecms.com/" -SRC_URI="http://downloads.sourceforge.net/project/lcms/lcms/2.1/lcms2-2.1.tar.gz" -CHECKSUM_MD5="08036edb115ad74456dfa20b1998b5f4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd lcms2-2.1 - libtoolize --force --copy --install - aclocal - automake - autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - CFLAGS=-O0 - make -} - -INSTALL() -{ - cd lcms2-2.1 - make install -} -LICENSE="MIT" -COPYRIGHT="2007 Marti Maria" diff --git a/media-libs/lcms/lcms-2.5.recipe b/media-libs/lcms/lcms-2.5.recipe new file mode 100644 index 000000000..d119d7fd1 --- /dev/null +++ b/media-libs/lcms/lcms-2.5.recipe @@ -0,0 +1,73 @@ +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." +HOMEPAGE="http://littlecms.com/" +SRC_URI="http://downloads.sourceforge.net/project/lcms/lcms/2.5/lcms2-2.5.tar.gz" +CHECKSUM_MD5="396d106600251441ff195fcaa277d10b" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2007 Marti Maria" + +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + lcms = 2.5 compat >= 2 + lib:liblcms2 + cmd:jpgicc + cmd:linkicc + cmd:psicc + cmd:tificc + cmd:transicc + " + +REQUIRES=" + lib:libroot + lib:libjpeg + lib:libtiff + lib:libz" + +BUILD_REQUIRES="" + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:make + " +SOURCE_DIR="lcms2-2.5" + +BUILD() +{ + libtoolize --force --copy --install + aclocal + automake + autoconf + + runConfigure ./configure CFLAGS=-O0 + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs liblcms2 + + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package --------------------------------------- + +PROVIDES_devel=" + lcms_devel = $portVersion + devel:lcms = 2.5 compat >= 2 + devel:liblcms2 = 2.0.1 compat >= 2 + " +REQUIRES_devel=" + lcms == $portVersion base + " From 17890aeb57347c71ba48385c972d3658cea9394e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 20 Sep 2013 22:05:04 -0700 Subject: [PATCH 509/587] Updated flac to 1.3.0, removed flac 1.2.1 --- media-libs/flac/flac-1.2.1.recipe | 37 ---------- media-libs/flac/flac-1.3.0.recipe | 93 ++++++++++++++++++++++++ media-libs/flac/patches/flac-1.2.1.patch | 11 --- 3 files changed, 93 insertions(+), 48 deletions(-) delete mode 100644 media-libs/flac/flac-1.2.1.recipe create mode 100644 media-libs/flac/flac-1.3.0.recipe delete mode 100644 media-libs/flac/patches/flac-1.2.1.patch diff --git a/media-libs/flac/flac-1.2.1.recipe b/media-libs/flac/flac-1.2.1.recipe deleted file mode 100644 index df7717403..000000000 --- a/media-libs/flac/flac-1.2.1.recipe +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION="flac - Free Lossless Audio Codec" -HOMEPAGE="http://flac.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/project/flac/flac-src/flac-1.2.1-src/flac-1.2.1.tar.gz" -CHECKSUM_MD5="153c8b15a54da428d1f0fadc756c22c7" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="gettext >= 0.17" -BUILD() -{ - cd flac-1.2.1 - haikuporter -b libiconv-1.13.1 - cp -a `haikuporter -t`/dev-libs/libiconv/work/libiconv-1.13.1/srcm4/. m4 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' src/libFLAC/M* - sed -i 's/m4datadir = $(datadir)\/aclocal/m4datadir = `finddir B_COMMON_DATA_DIRECTORY`\/aclocal/g' src/libFLAC++/M* - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS \ - --docdir=$COMMON_DOCS/doc/flac \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL() -{ - cd flac-1.2.1 - make install -} - -LICENSE="GNU LGPL v2.1 - GNU GPL v2 - BSD (3-clause)" -COPYRIGHT="2000-2007 Josh Coalson" diff --git a/media-libs/flac/flac-1.3.0.recipe b/media-libs/flac/flac-1.3.0.recipe new file mode 100644 index 000000000..c434d147a --- /dev/null +++ b/media-libs/flac/flac-1.3.0.recipe @@ -0,0 +1,93 @@ +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." +HOMEPAGE="http://flac.sourceforge.net/" +SRC_URI="http://downloads.xiph.org/releases/flac/flac-1.3.0.tar.xz" +CHECKSUM_MD5="13b5c214cee8373464d3d65dee362cdd" +REVISION="1" + +LICENSE="GNU LGPL v2.1 + GNU GPL v2 + BSD (3-clause) + " + +COPYRIGHT="2000-2007 Josh Coalson" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + libFLAC = 1.3.0 compat >= 1 + cmd:flac + cmd:metaflac + lib:libFLAC++ + lib:libFLAC + " + +REQUIRES=" + haiku + lib:libiconv + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:gcc + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:ld + cmd:make + cmd:gawk + cmd:perl + devel:libiconv + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libFLAC + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir + +} + +TEST() +{ + test_grabbag.sh + test_streams.sh + test_libFLAC.sh + test_wrapper.sh + test_bins.sh + test_libFLAC++.sh + test_compression.sh + test_metaflac.sh + test_flac.sh + test_seeking.sh +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libFLAC_devel = $portVersion + devel:libFLAC = 8.3.0 compat >= 8 + devel:libFLAC++ = 8.3.0 compat >= 8 + " + +REQUIRES_devel=" + libFLAC == $portVersion + " diff --git a/media-libs/flac/patches/flac-1.2.1.patch b/media-libs/flac/patches/flac-1.2.1.patch deleted file mode 100644 index be91dfc97..000000000 --- a/media-libs/flac/patches/flac-1.2.1.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN flac-1.2.1/examples/cpp/encode/file/main.cpp flac-1.2.1-haiku/examples/cpp/encode/file/main.cpp ---- flac-1.2.1/examples/cpp/encode/file/main.cpp 2007-09-13 15:58:03.004718592 +0000 -+++ flac-1.2.1-haiku/examples/cpp/encode/file/main.cpp 2010-09-20 12:47:33.520617984 +0000 -@@ -30,6 +30,7 @@ - - #include - #include -+#include - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" - From 15d1ef31fced4e7121f92edd35d472994c229077 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 21 Sep 2013 10:20:33 -0700 Subject: [PATCH 510/587] Updated .recipe for vorbis_tools-1.4.0 so that it now builds --- .../patches/vorbis_tools-1.2.0.patch | 29 -------- .../vorbis_tools/vorbis_tools-1.2.0.recipe | 26 ------- .../vorbis_tools/vorbis_tools-1.4.0.recipe | 71 +++++++++++++++---- 3 files changed, 56 insertions(+), 70 deletions(-) delete mode 100644 media-sound/vorbis_tools/patches/vorbis_tools-1.2.0.patch delete mode 100644 media-sound/vorbis_tools/vorbis_tools-1.2.0.recipe diff --git a/media-sound/vorbis_tools/patches/vorbis_tools-1.2.0.patch b/media-sound/vorbis_tools/patches/vorbis_tools-1.2.0.patch deleted file mode 100644 index 5ce4810d9..000000000 --- a/media-sound/vorbis_tools/patches/vorbis_tools-1.2.0.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -urN vorbis-tools-1.2.0/configure.ac vorbis-tools-1.2.0-haiku/configure.ac ---- vorbis-tools-1.2.0/configure.ac 2008-03-03 05:37:31.000000000 +0000 -+++ vorbis-tools-1.2.0-haiku/configure.ac 2009-09-15 06:49:02.000000000 +0000 -@@ -155,6 +155,7 @@ - - SOCKET_LIBS= - AC_CHECK_LIB(socket, socket, SOCKET_LIBS="-lsocket") -+AC_CHECK_LIB(network, socket, SOCKET_LIBS="-lnetwork") - AC_CHECK_LIB(nsl, gethostbyname, SOCKET_LIBS="-lnsl $SOCKET_LIBS") - - -diff -urN vorbis-tools-1.2.0/oggenc/oggenc.c vorbis-tools-1.2.0-haiku/oggenc/oggenc.c ---- vorbis-tools-1.2.0/oggenc/oggenc.c 2008-03-03 05:37:27.000000000 +0000 -+++ vorbis-tools-1.2.0-haiku/oggenc/oggenc.c 2009-09-15 06:55:48.000000000 +0000 -@@ -262,12 +262,12 @@ - { - /* Create a filename from existing filename, replacing extension with .ogg or .oga */ - char *start, *end; -- -+ char *extension = (opt.with_skeleton) ? ".oga" : ".ogg"; - start = infiles[i]; -+ - end = strrchr(infiles[i], '.'); - end = end?end:(start + strlen(infiles[i])+1); - -- char *extension = (opt.with_skeleton) ? ".oga" : ".ogg"; - out_fn = malloc(end - start + 5); - strncpy(out_fn, start, end-start); - out_fn[end-start] = 0; diff --git a/media-sound/vorbis_tools/vorbis_tools-1.2.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.2.0.recipe deleted file mode 100644 index ae10bc5fc..000000000 --- a/media-sound/vorbis_tools/vorbis_tools-1.2.0.recipe +++ /dev/null @@ -1,26 +0,0 @@ -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.2.0.tar.gz" -CHECKSUM_MD5="df976d24e51ef3d87cd462edf747bf9a" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" -BUILD() -{ - cd vorbis-tools-1.2.0 - libtoolize --force --copy --install - aclocal -I m4 - automake - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd vorbis-tools-1.2.0 - make install -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2000-2005 Michael Smith, Stan Seibert and other contributers" 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 d16c1b2f3..f3e3e3430 100644 --- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe +++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe @@ -1,32 +1,73 @@ +SUMMARY="vorbis-tools - 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" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libvorbis >= 1.3.1 - media-libs/flac >= 1.2.1 - media-libs/libao >= 1.0.0 - media-libs/speex >1.2" +LICENSE="GNU GPL v2" +COPYRIGHT="2000-2005 Michael Smith, Stan Seibert and other contributers" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + vorbis_tools = 1.4.0 compat >= 1 + cmd:oggenc + cmd:oggdec + cmd:ogginfo + cmd:vcut + cmd:vorbiscomment + " + +REQUIRES=" + haiku + lib:libvorbis + lib:libflac + lib:speex + lib:libao + lib:libogg + lib:libvorbis + lib:libcurl + lib:libvorbisfile + lib:libvorbisenc + lib:libFLAC + " + +BUILD_REQUIRES=" + " + +SOURCE_DIR="vorbis-tools-$portVersion" + +BUILD_PREREQUIRES=" + cmd:gcc + 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" + +PATCH() +{ + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac +} + BUILD() { - cd vorbis-tools-1.4.0 libtoolize --force --copy --install aclocal -I m4 automake autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=$COMMON_DOCS/man - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd vorbis-tools-1.4.0 make install } - -LICENSE="GNU GPL v2" -COPYRIGHT="2000-2008 Michael Smith, Stan Seibert and other contributers" From e0fe8e2a81100b29af6733664dbc1b2e53013547 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 23 Sep 2013 01:02:56 -0700 Subject: [PATCH 511/587] Adjusted libsdl-1.2.15 and sdl_image-1.2.12, libsdl-1.2.15 builds but files aren't showing up as expected, so sdl_image fails to detect SDL headers --- media-libs/libsdl/additional-files/sdl-config | 77 ------------------- media-libs/libsdl/libsdl-1.2.15.recipe | 26 +++---- media-libs/sdl_image/sdl_image-1.2.12.recipe | 16 ++-- 3 files changed, 15 insertions(+), 104 deletions(-) delete mode 100644 media-libs/libsdl/additional-files/sdl-config diff --git a/media-libs/libsdl/additional-files/sdl-config b/media-libs/libsdl/additional-files/sdl-config deleted file mode 100644 index 7e19ca3a8..000000000 --- a/media-libs/libsdl/additional-files/sdl-config +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh - -libDir=`finddir B_SYSTEM_LIB_DIRECTORY` - -# Determine which GCC we're running -if [ -f "$libDir"/libsupc++.so ] ; then - HAIKU_GCC_VERSION=4 -else - HAIKU_GCC_VERSION=2 -fi - -SETGCC_OUTPUT=`setgcc` -CURRENT_COMPILER=${SETGCC_OUTPUT: -1:1} - -if [ $CURRENT_COMPILER == $HAIKU_GCC_VERSION ] ; then - libdir=`finddir B_COMMON_LIB_DIRECTORY` -else - libdir=`finddir B_COMMON_LIB_DIRECTORY`/gcc$CURRENT_COMPILER -fi - -prefix=/boot/common -exec_prefix=${prefix} -exec_prefix_set=no - -#usage="\ -#Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" -usage="\ -Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]" - -if test $# -eq 0; then - echo "${usage}" 1>&2 - exit 1 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | LC_ALL="C" sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; - --prefix) - echo $prefix - ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo $exec_prefix - ;; - --version) - echo 1.2.15 - ;; - --cflags) - echo -I${prefix}/include/SDL -D_GNU_SOURCE=1 - ;; -# --libs) -# echo -L$libdir -lSDL -# ;; -# --static-libs) - --libs|--static-libs) - echo -L$libdir -lSDL -liconv -lGL -lroot -lbe -lmedia -lgame -ldevice -ltextencoding - ;; - *) - echo "${usage}" 1>&2 - exit 1 - ;; - esac - shift -done diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index 3110135c7..1886daaeb 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -11,11 +11,12 @@ ARCHITECTURES="x86 x86_gcc2" PROVIDES=" cmd:sdl_config = portVersion compat >= 1.2 + lib:libsdl = $portVersion compat >= 1.2 lib:libSDL = $portVersion compat >= 1.2 lib:libSDL_1.2 = 0.11.4 compat >= 0.11 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" lib:libpng @@ -23,7 +24,7 @@ BUILD_REQUIRES=" lib:libtiff " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:gcc @@ -32,38 +33,29 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="SDL-1.2.15" +SOURCE_DIR="SDL-$portVersion" PATCH() { sed -i 's/AM_PATH_ALSA(0.9.0, have_alsa=yes, have_alsa=no)/have_alsa=no/' configure.in sed -i 's/AM_PATH_ESD(0.2.8, have_esd=yes, have_esd=no)/have_esd=no/' configure.in echo "AC_CONFIG_MACRO_DIR([acinclude])" >> configure.in - libtoolize --force --copy --install - aclocal -I acinclude - autoconf } BUILD() { - runConfigure ./configure + libtoolize --force --copy --install + aclocal -I acinclude + autoconf + runConfigure ./configure --includedir=$includeDir make $jobArgs } INSTALL() { make install - - # devel package - mkdir -p $developDir/lib - cp build/.libs/libSDL.a $developDir/lib/libSDL.a - cp build/.libs/libSDL.la $developDir/lib/libSDL.la - cp build/.libs/libSDLmain.a $developDir/lib/libSDLmain.a - cp build/.libs/libSDLmain.la $developDir/lib/libSDLmain.la - - cp include/* $includeDir - + # devel package prepareInstalledDevelLibs \ libSDL \ libSDLmain 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 16d56d46c..f92bf15ef 100644 --- a/media-libs/sdl_image/sdl_image-1.2.12.recipe +++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe @@ -3,22 +3,22 @@ DESCRIPTION="Simple Direct Media Layer Image Library" 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" -REVISION="1" +REVISION="2" LICENSE="Zlib" COPYRIGHT="1997-2012 Sam Lantinga" -ARCHITECTURES="?x86 ?x86_gcc2" +ARCHITECTURES="x86 x86_gcc2" PROVIDES=" lib:sdl_image = $portVersion compat >= 1.2 " REQUIRES=" - haiku >= $haikuVersion + haiku + devel:libSDL " BUILD_REQUIRES=" - devel:libsdl lib:libjpeg lib:libpng lib:libtiff @@ -27,7 +27,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:gcc @@ -35,6 +35,7 @@ BUILD_PREREQUIRES=" cmd:libtool cmd:make cmd:pkg_config + cmd:sdl_config " SOURCE_DIR="SDL_image-1.2.12" @@ -44,11 +45,6 @@ BUILD() libtoolize --force --copy --install aclocal --install -I acinclude ./autogen.sh - - echo ------------------ - sdl-config --version - echo ------------------ - runConfigure ./configure \ --enable-bmp --enable-lbm --enable-pcx \ --enable-pnm --enable-tga --enable-xcf --enable-xpm --enable-xv \ From 095dbe87c38694fa5fd5b12a3e676ecc2101ace9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 25 Sep 2013 15:14:24 +0000 Subject: [PATCH 512/587] Update freetype to 2.5.0.1 --- media-libs/freetype/freetype-2.5.0.1.recipe | 69 ++++++++++++++++++++ media-libs/libsdl/libsdl-1.2.15.recipe | 1 + media-libs/sdl_image/sdl_image-1.2.12.recipe | 3 +- 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 media-libs/freetype/freetype-2.5.0.1.recipe diff --git a/media-libs/freetype/freetype-2.5.0.1.recipe b/media-libs/freetype/freetype-2.5.0.1.recipe new file mode 100644 index 000000000..7a2ed0d8b --- /dev/null +++ b/media-libs/freetype/freetype-2.5.0.1.recipe @@ -0,0 +1,69 @@ +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." +HOMEPAGE="http://www.freetype.org" +LICENSE="FreeType" +COPYRIGHT="1996-2012 David Turner, Robert Wilhelm, Werner Lemberg, et al." +SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.1.tar.bz2" +CHECKSUM_MD5="c72e9010b1d986d556fc0b2b5fcbf31a" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + freetype$secondaryArchSuffix = $portVersion + lib:libfreetype$secondaryArchSuffix = 6.8.1 compat >= 6 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix >= 1 + lib:libpng$secondaryArchSuffix + devel:libbz2 + " +BUILD_REQUIRES=" + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + devel:libpng + " + +BUILD() +{ + ./autogen.sh + runConfigure ./configure --without-png + make $jobArgs +} + +INSTALL() +{ + mkdir -p /packages/freetype-2.5.0.1-1/.self/develop/headers/freetype2/freetype/cache + mkdir -p /packages/freetype-2.5.0.1-1/.self/develop/headers/freetype2/freetype/internal + make install + + prepareInstalledDevelLibs libfreetype + fixPkgconfig + + # devel package + packageEntries devel \ + $binDir \ + $dataRootDir/aclocal \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + freetype${secondaryArchSuffix}_devel = $portVersion + cmd:freetype_config${secondaryArchSuffix} = $portVersion + devel:libfreetype${secondaryArchSuffix} = 6.8.1 compat >= 6 + " +REQUIRES_devel=" + freetype${secondaryArchSuffix} == $portVersion base + " diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index 1886daaeb..9f8c5ea79 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -10,6 +10,7 @@ COPYRIGHT="1997-2012 Sam Lantinga" ARCHITECTURES="x86 x86_gcc2" PROVIDES=" + libsdl = $portVersion compat >= 1.2 cmd:sdl_config = portVersion compat >= 1.2 lib:libsdl = $portVersion compat >= 1.2 lib:libSDL = $portVersion compat >= 1.2 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 f92bf15ef..ffb93cc00 100644 --- a/media-libs/sdl_image/sdl_image-1.2.12.recipe +++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe @@ -15,10 +15,11 @@ PROVIDES=" REQUIRES=" haiku - devel:libSDL + libsdl " BUILD_REQUIRES=" + devel:libsdl lib:libjpeg lib:libpng lib:libtiff From 27c3268a4c88109920265ab389cc1a8c68f820db Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 28 Sep 2013 16:49:20 +0200 Subject: [PATCH 513/587] jam: Fix first source URL --- sys-devel/jam/jam-2.5_2012_10_12.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 23ed78d22..7479d30b2 100644 --- a/sys-devel/jam/jam-2.5_2012_10_12.recipe +++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe @@ -19,7 +19,7 @@ HOMEPAGE="http://www.perforce.com/jam/jam.html" LICENSE="Jam" COPYRIGHT="1993-2003 Christopher Seiwald" SRC_URI=" - git+file://$portBaseDir/../binutils/work-2.17_130421/sources/binutils-2.17_130421#278de7bc9243876c2e08f8d6a243d510c5000462 + git+file://$portBaseDir/../binutils/download/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462 git+git://github.com/haiku/BuildtoolsPM.git#278de7bc9243876c2e08f8d6a243d510c5000462 " REVISION="1" From 7c1de0c5f79f9d78ede819ad3435a8f74fd2ef47 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 30 Sep 2013 16:49:22 +0200 Subject: [PATCH 514/587] Get Vim 7.3 recipe working. --- app-editors/vim/licenses/Vim | 76 ++ .../{vim-7.3.patch => vim-7.3.patchset} | 782 ++++++------------ app-editors/vim/vim-7.3.recipe | 61 +- 3 files changed, 382 insertions(+), 537 deletions(-) create mode 100644 app-editors/vim/licenses/Vim rename app-editors/vim/patches/{vim-7.3.patch => vim-7.3.patchset} (89%) diff --git a/app-editors/vim/licenses/Vim b/app-editors/vim/licenses/Vim new file mode 100644 index 000000000..e445bcb9a --- /dev/null +++ b/app-editors/vim/licenses/Vim @@ -0,0 +1,76 @@ +I) There are no restrictions on distributing unmodified copies of Vim except + that they must include this license text. You can also distribute + unmodified parts of Vim, likewise unrestricted except that they must + include this license text. You are also allowed to include executables + that you made from the unmodified Vim sources, plus your own usage + examples and Vim scripts. + +II) It is allowed to distribute a modified (or extended) version of Vim, + including executables and/or source code, when the following four + conditions are met: + 1) This license text must be included unmodified. + 2) The modified Vim must be distributed in one of the following five ways: + a) If you make changes to Vim yourself, you must clearly describe in + the distribution how to contact you. When the maintainer asks you + (in any way) for a copy of the modified Vim you distributed, you + must make your changes, including source code, available to the + maintainer without fee. The maintainer reserves the right to + include your changes in the official version of Vim. What the + maintainer will do with your changes and under what license they + will be distributed is negotiable. If there has been no negotiation + then this license, or a later version, also applies to your changes. + The current maintainer is Bram Moolenaar . If this + changes it will be announced in appropriate places (most likely + vim.sf.net, www.vim.org and/or comp.editors). When it is completely + impossible to contact the maintainer, the obligation to send him + your changes ceases. Once the maintainer has confirmed that he has + received your changes they will not have to be sent again. + b) If you have received a modified Vim that was distributed as + mentioned under a) you are allowed to further distribute it + unmodified, as mentioned at I). If you make additional changes the + text under a) applies to those changes. + c) Provide all the changes, including source code, with every copy of + the modified Vim you distribute. This may be done in the form of a + context diff. You can choose what license to use for new code you + add. The changes and their license must not restrict others from + making their own changes to the official version of Vim. + d) When you have a modified Vim which includes changes as mentioned + under c), you can distribute it without the source code for the + changes if the following three conditions are met: + - The license that applies to the changes permits you to distribute + the changes to the Vim maintainer without fee or restriction, and + permits the Vim maintainer to include the changes in the official + version of Vim without fee or restriction. + - You keep the changes for at least three years after last + distributing the corresponding modified Vim. When the maintainer + or someone who you distributed the modified Vim to asks you (in + any way) for the changes within this period, you must make them + available to him. + - You clearly describe in the distribution how to contact you. This + contact information must remain valid for at least three years + after last distributing the corresponding modified Vim, or as long + as possible. + e) When the GNU General Public License (GPL) applies to the changes, + you can distribute the modified Vim under the GNU GPL version 2 or + any later version. + 3) A message must be added, at least in the output of the ":version" + command and in the intro screen, such that the user of the modified Vim + is able to see that it was modified. When distributing as mentioned + under 2)e) adding the message is only required for as far as this does + not conflict with the license used for the changes. + 4) The contact information as required under 2)a) and 2)d) must not be + removed or changed, except that the person himself can make + corrections. + +III) If you distribute a modified version of Vim, you are encouraged to use + the Vim license for your changes and make them available to the + maintainer, including the source code. The preferred way to do this is + by e-mail or by uploading the files to a server and e-mailing the URL. + If the number of changes is small (e.g., a modified Makefile) e-mailing a + context diff will do. The e-mail address to be used is + + +IV) It is not allowed to remove this license from the distribution of the Vim + sources, parts of it or from a modified version. You may use this + license for previous Vim releases instead of the license that they came + with, at your option. diff --git a/app-editors/vim/patches/vim-7.3.patch b/app-editors/vim/patches/vim-7.3.patchset similarity index 89% rename from app-editors/vim/patches/vim-7.3.patch rename to app-editors/vim/patches/vim-7.3.patchset index 09e8c002c..f297d4fc1 100644 --- a/app-editors/vim/patches/vim-7.3.patch +++ b/app-editors/vim/patches/vim-7.3.patchset @@ -1,7 +1,14 @@ -diff -Naur vim73/Makefile vim73.haiku/Makefile ---- vim73/Makefile 2010-08-15 12:23:34.047710208 +0000 -+++ vim73.haiku/Makefile 2010-08-20 23:30:35.620756992 +0000 -@@ -196,6 +196,15 @@ +From b97ce2e9738d5704064d1f1e44294a453cbf040c Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 30 Sep 2013 16:06:53 +0200 +Subject: Reformat the existing haikuports patch to git format. + + +diff --git a/Makefile b/Makefile +index bf2b309..7902c56 100644 +--- a/Makefile ++++ b/Makefile +@@ -196,6 +196,15 @@ DOSBIN_S = dosbin_s # - Rename the executables to vimos2.exe, xxdos2.exe and teeos2.exe and copy # them to here. # - "make os2bin". @@ -17,7 +24,7 @@ diff -Naur vim73/Makefile vim73.haiku/Makefile VIMVER = vim-$(MAJOR).$(MINOR) VERSION = $(MAJOR)$(MINOR) -@@ -576,3 +585,37 @@ +@@ -576,3 +585,37 @@ html: dist dist/$(COMMENT_HTML) farsi: dist dist/$(COMMENT_FARSI) -rm -f dist/farsi$(VERSION).zip zip -9 -rD -z dist/farsi$(VERSION).zip farsi < dist/$(COMMENT_FARSI) @@ -55,10 +62,11 @@ diff -Naur vim73/Makefile vim73.haiku/Makefile + echo "URL: http://www.vim.org/" >> $(DESCRIPTION) + cd dist/boot && zip -9 -r -z -y ../$(PACKAGE_NAME).zip * $(COMMENT) < $(COMMENT) + -diff -Naur vim73/runtime/doc/eval.txt vim73.haiku/runtime/doc/eval.txt ---- vim73/runtime/doc/eval.txt 2010-08-15 14:23:20.045088768 +0200 -+++ vim73.haiku/runtime/doc/eval.txt 2012-09-15 21:37:50.934019072 +0200 -@@ -6081,7 +6081,7 @@ +diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt +index 5403551..6f79962 100644 +--- a/runtime/doc/eval.txt ++++ b/runtime/doc/eval.txt +@@ -6081,7 +6081,7 @@ arp Compiled with ARP support (Amiga). autocmd Compiled with autocommand support. |autocommand| balloon_eval Compiled with |balloon-eval| support. balloon_multiline GUI supports multiline balloons. @@ -67,7 +75,7 @@ diff -Naur vim73/runtime/doc/eval.txt vim73.haiku/runtime/doc/eval.txt browse Compiled with |:browse| support, and browse() will work. builtin_terms Compiled with some builtin terminals. -@@ -6133,6 +6133,7 @@ +@@ -6133,6 +6133,7 @@ gui_mac Compiled with Macintosh GUI. gui_motif Compiled with Motif GUI. gui_photon Compiled with Photon GUI. gui_win32 Compiled with MS Windows Win32 GUI. @@ -75,10 +83,11 @@ diff -Naur vim73/runtime/doc/eval.txt vim73.haiku/runtime/doc/eval.txt gui_win32s idem, and Win32s system being used (Windows 3.1) gui_running Vim is running in the GUI, or it will start soon. hangul_input Compiled with Hangul input support. |hangul| -diff -Naur vim73/runtime/doc/gui.txt vim73.haiku/runtime/doc/gui.txt ---- vim73/runtime/doc/gui.txt 2010-08-15 14:23:20.046661632 +0200 -+++ vim73.haiku/runtime/doc/gui.txt 2012-09-16 21:58:25.748158976 +0200 -@@ -97,6 +97,7 @@ +diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt +index f9bbf78..7649e35 100644 +--- a/runtime/doc/gui.txt ++++ b/runtime/doc/gui.txt +@@ -97,6 +97,7 @@ Recommended place for your personal GUI initializations: OS/2 $HOME/.gvimrc or $VIM/.gvimrc MS-DOS and Win32 $HOME/_gvimrc or $VIM/_gvimrc Amiga s:.gvimrc or $VIM/.gvimrc @@ -86,10 +95,11 @@ diff -Naur vim73/runtime/doc/gui.txt vim73.haiku/runtime/doc/gui.txt There are a number of options which only have meaning in the GUI version of Vim. These are 'guicursor', 'guifont', 'guipty' and 'guioptions'. They are -diff -Naur vim73/runtime/doc/help.txt vim73.haiku/runtime/doc/help.txt ---- vim73/runtime/doc/help.txt 2010-08-15 14:23:20.047448064 +0200 -+++ vim73.haiku/runtime/doc/help.txt 2012-09-16 22:03:00.902823936 +0200 -@@ -155,6 +155,7 @@ +diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt +index 4860eb2..be4c464 100644 +--- a/runtime/doc/help.txt ++++ b/runtime/doc/help.txt +@@ -155,6 +155,7 @@ GUI ~ |gui_w16.txt| Windows 3.1 GUI |gui_w32.txt| Win32 GUI |gui_x11.txt| X11 GUI @@ -97,7 +107,7 @@ diff -Naur vim73/runtime/doc/help.txt vim73.haiku/runtime/doc/help.txt Interfaces ~ |if_cscop.txt| using Cscope with Vim -@@ -181,7 +182,7 @@ +@@ -181,7 +182,7 @@ Versions ~ Remarks about specific systems ~ |os_390.txt| OS/390 Unix |os_amiga.txt| Amiga @@ -106,10 +116,11 @@ diff -Naur vim73/runtime/doc/help.txt vim73.haiku/runtime/doc/help.txt |os_dos.txt| MS-DOS and MS-Windows NT/95 common items |os_mac.txt| Macintosh |os_mint.txt| Atari MiNT -diff -Naur vim73/runtime/doc/options.txt vim73.haiku/runtime/doc/options.txt ---- vim73/runtime/doc/options.txt 2010-08-15 14:23:21.051642368 +0200 -+++ vim73.haiku/runtime/doc/options.txt 2012-05-28 12:06:04.016777216 +0200 -@@ -3528,7 +3528,8 @@ +diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt +index 1282a90..1fdbdd0 100644 +--- a/runtime/doc/options.txt ++++ b/runtime/doc/options.txt +@@ -3528,7 +3528,8 @@ A jump table for the options with a short description can be found at |Q_op|. 'guitablabel' can be used to change the text in the labels. When 'e' is missing a non-GUI tab pages line may be used. The GUI tabs are only supported on some systems, currently @@ -119,7 +130,7 @@ diff -Naur vim73/runtime/doc/options.txt vim73.haiku/runtime/doc/options.txt *'go-f'* 'f' Foreground: Don't use fork() to detach the GUI from the shell where it was started. Use this for programs that wait for the -@@ -5567,7 +5568,12 @@ +@@ -5567,7 +5568,12 @@ A jump table for the options with a short description can be found at |Q_op|. $VIM/vimfiles, $VIMRUNTIME, $VIM/vimfiles/after, @@ -133,7 +144,7 @@ diff -Naur vim73/runtime/doc/options.txt vim73.haiku/runtime/doc/options.txt global {not in Vi} This is a list of directories which will be searched for runtime -@@ -6920,6 +6926,7 @@ +@@ -6920,6 +6926,7 @@ A jump table for the options with a short description can be found at |Q_op|. in the GUI: "builtin_gui" on Amiga: "amiga" on BeOS: "beos-ansi" @@ -141,337 +152,11 @@ diff -Naur vim73/runtime/doc/options.txt vim73.haiku/runtime/doc/options.txt on Mac: "mac-ansi" on MiNT: "vt52" on MS-DOS: "pcterm" -diff -Naur vim73/runtime/doc/os_haiku.txt vim73.haiku/runtime/doc/os_haiku.txt ---- vim73/runtime/doc/os_haiku.txt 1970-01-01 01:00:00.000000000 +0100 -+++ vim73.haiku/runtime/doc/os_haiku.txt 2012-09-17 20:45:04.675807232 +0200 -@@ -0,0 +1,323 @@ -+*os_haiku.txt* For Vim version 7.4. Last change: 2012 May 28 -+ -+ -+ VIM REFERENCE MANUAL by Bram Moolenaar -+ -+// TODO - bring to correspondence with Haiku circumstances! -+ -+ *Haiku* -+This is a port of Vim 7.4 to the Haiku A4 or later. -+ -+This file contains the particularities for the Haiku version of Vim. For -+matters not discussed in this file, Vim behaves very much like the Unix -+|os_unix.txt| version. -+ -+ 1. General |beos-general| -+ 2. Compiling Vim |beos-compiling| -+ 3. Timeout in the Terminal |beos-timeout| -+ 4. Unicode vs. Latin1 |beos-unicode| -+ 5. The BeOS GUI |beos-gui| -+ 6. The $VIM directory |beos-vimdir| -+ 6+. The $BE_USER_SETTINGS directory |haiku-user-settings-dir| -+ 7. Drag & Drop |beos-dragndrop| -+ 8. Single Launch vs. Multiple -+ Launch |beos-launch| -+ 9. Fonts |beos-fonts| -+10. The meta key modifier |beos-meta| -+11. Mouse key mappings |beos-mouse| -+12. Color names |beos-colors| -+13. Compiling with Perl |beos-perl| -+ -+ -+1. General *beos-general* -+ -+The default syntax highlighting mostly works with different foreground colors -+to highlight items. This works best if you set your Terminal window to a -+darkish background and light letters. Some middle-grey background (for -+instance (r,g,b)=(168,168,168)) with black letters also works nicely. If you -+use the default light background and dark letters, it may look better to -+simply reverse the notion of foreground and background color settings. To do -+this, add this to your .vimrc file (where may need to be replaced with -+the escape character): > -+ -+ :if &term == "beos-ansi" -+ : set t_AB=[3%dm -+ : set t_AF=[4%dm -+ :endif -+ -+ -+2. Compiling Vim *beos-compiling* -+ -+From the Advanced Access Preview Release (AAPR) on, Vim can be configured with -+the standard configure script. To get the compiler and its flags right, use -+the following command-line in the shell (you can cut and paste it in one go): -+ -+CC=$BE_C_COMPILER CFLAGS="$BE_DEFAULT_C_FLAGS -O7" \ -+ ./configure --prefix=/boot/home/config -+ -+$BE_C_COMPILER is usually "mwcc", $BE_DEFAULT_C_FLAGS is usually "-I- -I." -+ -+When configure has run, and you wish to enable GUI support, you must edit the -+config.mk file so that the lines with GUI_xxx refer to $(BEOSGUI_xxx) instead -+of $(NONE_xxx). -+Alternatively you can make this change in the Makefile; it will have a -+more permanent effect. Search for "NONE_". -+ -+After compilation you need to add the resources to the binary. Add the -+following few lines near the end (before the line with "exit $exit_value") of -+the link.sh script to do this automatically. -+ -+ rmattr BEOS:TYPE vim -+ copyres os_beos.rsrc vim -+ mimeset vim -+ -+Also, create a dummy file "strip": -+ -+ #!/bin/sh -+ mimeset $1 -+ exit 0 -+ -+You will need it when using "make install" to install Vim. -+ -+Now type "make" to compile Vim, then "make install" to install it. -+ -+If you want to install Vim by hand, you must copy Vim to $HOME/config/bin, and -+create a bunch of symlinks to it ({g,r,rg}{vim,ex,view}). Furthermore you must -+copy Vim's configuration files to $HOME/config/share/vim: -+vim-5.0s/{*.vim,doc,syntax}. For completeness, you should also copy the nroff -+manual pages to $HOME/config/man/man1. Don't forget ctags/ctags and xxd/xxd! -+ -+Obviously, you need the unlimited linker to actually link Vim. See -+http://www.metrowerks.com for purchasing the CodeWarrior compiler for BeOS. -+There are currently no other linkers that can do the job. -+ -+This won't be able to include the Perl or Python interfaces even if -+you have the appropriate files installed. |beos-perl| -+ -+ -+3. Timeout in the Terminal *beos-timeout* -+ -+Because some POSIX/UNIX features are still missing[1], there is no direct OS -+support for read-with-timeout in the Terminal. This would mean that you cannot -+use :mappings of more than one character, unless you also :set notimeout. -+|'timeout'| -+ -+To circumvent this problem, I added a workaround to provide the necessary -+input with timeout by using an extra thread which reads ahead one character. -+As a side effect, it also makes Vim recognize when the Terminal window -+resizes. -+ -+Function keys are not supported in the Terminal since they produce very -+indistinctive character sequences. -+ -+These problems do not exist in the GUI. -+ -+[1]: there is no select() on file descriptors; also the termios VMIN and VTIME -+settings do not seem to work properly. This has been the case since DR7 at -+least and still has not been fixed as of PR2. -+ -+ *beos-unicode* -+4. Unicode vs. Latin1 *beos-utf8* -+ -+BeOS uses Unicode and UTF-8 for text strings (16-bit characters encoded to -+8-bit characters). Vim assumes ISO-Latin1 or other 8-bit character codes. -+This does not produce the desired results for non-ASCII characters. Try the -+command :digraphs to see. If they look messed up, use :set isprint=@ to -+(slightly) improve the display of ISO-Latin1 characters 128-255. This works -+better in the GUI, depending on which font you use (below). -+ -+You may also use the /boot/bin/xtou command to convert UTF-8 files from (xtou -+-f iso1 filename) or to (xtou -t iso1 filename) ISO-Latin1 characters. -+ -+ -+5. The BeOS GUI *beos-gui* -+ -+The BeOS GUI is no longer included. It was not maintained for a while and -+most likely didn't work. If you want to work on this: get the Vim 6.x version -+and merge it back in. -+ -+ -+6. The $VIM directory *beos-vimdir* -+ -+$VIM is the symbolic name for the place where Vims support files are stored. -+The default value for $VIM is set at compile time and can be determined with > -+ -+ :version -+ -+The normal value is /boot/home/config/share/vim. If you don't like it you can -+set the VIM environment variable to override this, or set 'helpfile' in your -+.vimrc: > -+ -+ :if version >= 500 -+ : set helpfile=~/vim/vim54/doc/help.txt -+ : syntax on -+ :endif -+ -+ -+6a. The $USER_SETTINGS_DIR directory *haiku-user-settings-dir* -+ -+ -+7. Drag & Drop *beos-dragndrop* -+ -+You can drop files and directories on either the Vim icon (starts a new Vim -+session, unless you use the File Types application to set Vim to be "Single -+Launch") or on the Vim window (starts editing the files). Dropping a folder -+sets Vim's current working directory. |:cd| |:pwd| If you drop files or -+folders with either SHIFT key pressed, Vim changes directory to the folder -+that contains the first item dropped. When starting Vim, there is no need to -+press shift: Vim behaves as if you do. -+ -+Files dropped set the current argument list. |argument-list| -+ -+ -+8. Single Launch vs. Multiple Launch *beos-launch* -+ -+As distributed Vim's Application Flags (as seen in the FileTypes preference) -+are set to Multiple Launch. If you prefer, you can set them to Single Launch -+instead. Attempts to start a second copy of Vim will cause the first Vim to -+open the files instead. This works from the Tracker but also from the command -+line. In the latter case, non-file (option) arguments are not supported. -+ -+NB: Only the GUI version has a BApplication (and hence Application Flags). -+This section does not apply to the GUI-less version, should you compile one. -+ -+ -+9. Fonts *beos-fonts* -+ -+Set fonts with > -+ -+ :set guifont=Courier10_BT/Roman/10 -+ -+where the first part is the font family, the second part the style, and the -+third part the size. You can use underscores instead of spaces in family and -+style. -+ -+Best results are obtained with monospaced fonts (such as Courier). Vim -+attempts to use all fonts in B_FIXED_SPACING mode but apparently this does not -+work for proportional fonts (despite what the BeBook says). -+ -+Vim also tries to use the B_ISO8859_1 encoding, also known as ISO Latin 1. -+This also does not work for all fonts. It does work for Courier, but not for -+ProFontISOLatin1/Regular (strangely enough). You can verify this by giving the > -+ -+ :digraphs -+ -+command, which lists a bunch of characters with their ISO Latin 1 encoding. -+If, for instance, there are "box" characters among them, or the last character -+isn't a dotted-y, then for this font the encoding does not work. -+ -+If the font you specify is unavailable, you get the system fixed font. -+ -+Standard fixed-width system fonts are: -+ -+ ProFontISOLatin1/Regular -+ Courier10_BT/Roman -+ Courier10_BT/Italic -+ Courier10_BT/Bold -+ Courier10_BT/Bold_Italic -+ -+Standard proportional system fonts are: -+ -+ Swis721_BT/Roman -+ Swis721_BT/Italic -+ Swis721_BT/Bold -+ Swis721_BT/Bold_Italic -+ Dutch801_Rm_BT/Roman -+ Dutch801_Rm_BT/Italic -+ Dutch801_Rm_BT/Bold -+ Dutch801_Rm_BT/Bold_Italic -+ Baskerville/Roman -+ Baskerville/Italic -+ Baskerville/Bold -+ Baskerville/Bold_Italic -+ SymbolProp_BT/Regular -+ -+Try some of them, just for fun. -+ -+ -+10. The meta key modifier *beos-meta* -+ -+The META key modifier is obtained by the left or right OPTION keys. This is -+because the ALT (aka COMMAND) keys are not passed to applications. -+ -+ -+11. Mouse key mappings *beos-mouse* -+ -+Vim calls the various mouse buttons LeftMouse, MiddleMouse and RightMouse. If -+you use the default Mouse preference settings these names indeed correspond to -+reality. Vim uses this mapping: -+ -+ Button 1 -> LeftMouse, -+ Button 2 -> RightMouse, -+ Button 3 -> MiddleMouse. -+ -+If your mouse has fewer than 3 buttons you can provide your own mapping from -+mouse clicks with modifier(s) to other mouse buttons. See the file -+vim-5.x/macros/swapmous.vim for an example. |gui-mouse-mapping| -+ -+ -+12. Color names *beos-colors* -+ -+Vim has a number of color names built-in. Additional names are read from the -+file $VIMRUNTIME/rgb.txt, if present. This file is basically the color -+database from X. Names used from this file are cached for efficiency. -+ -+ -+13. Compiling with Perl *beos-perl* -+ -+Compiling with Perl support enabled is slightly tricky. The Metrowerks -+compiler has some strange ideas where to search for include files. Since -+several include files with Perl have the same names as some Vim header -+files, the wrong ones get included. To fix this, run the following Perl -+script while in the vim-5.0/src directory: > -+ -+ preproc.pl > perl.h -+ -+ #!/bin/env perl -+ # Simple #include expander, just good enough for the Perl header files. -+ -+ use strict; -+ use IO::File; -+ use Config; -+ -+ sub doinclude -+ { -+ my $filename = $_[0]; -+ my $fh = new IO::File($filename, "r"); -+ if (defined $fh) { -+ print "/* Start of $filename */\n"; -+ -+ while (<$fh>) { -+ if (/^#include "(.*)"/) { -+ doinclude($1); -+ print "/* Back in $filename */\n"; -+ } else { -+ print $_; -+ } -+ } -+ print "/* End of $filename */\n"; -+ -+ undef $fh; -+ } else { -+ print "/* Cannot open $filename */\n"; -+ print "#include \"$filename\"\n"; -+ } -+ } -+ -+ chdir $Config{installarchlib}."/CORE"; -+ doinclude "perl.h"; -+ -+It expands the "perl.h" header file, using only other Perl header files. -+ -+Now you can configure & make Vim with the --enable-perlinterp option. -+Be warned though that this adds about 616 kilobytes to the size of Vim! -+Without Perl, Vim with default features and GUI is about 575K, with Perl -+it is about 1191K. -+ -+-Olaf Seibert -+ -+[Note: these addresses no longer work:] -+ -+http://polder.ubc.kun.nl/~rhialto/be -+ -+ vim:tw=78:ts=8:ft=help:norl: -diff -Naur vim73/runtime/doc/starting.txt vim73.haiku/runtime/doc/starting.txt ---- vim73/runtime/doc/starting.txt 2010-08-15 14:23:22.056360960 +0200 -+++ vim73.haiku/runtime/doc/starting.txt 2012-09-16 22:03:00.965476352 +0200 -@@ -756,6 +756,7 @@ +diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt +index 0632e8c..87c2181 100644 +--- a/runtime/doc/starting.txt ++++ b/runtime/doc/starting.txt +@@ -756,6 +756,7 @@ accordingly. Vim proceeds in this order: OS/2 $HOME/.vimrc or $VIM/.vimrc (or _vimrc) MS-DOS and Win32 $HOME/_vimrc or $VIM/_vimrc Amiga s:.vimrc or $VIM/.vimrc @@ -479,7 +164,7 @@ diff -Naur vim73/runtime/doc/starting.txt vim73.haiku/runtime/doc/starting.txt If Vim was started with "-u filename", the file "filename" is used. All following initializations until 4. are skipped. -@@ -791,6 +792,7 @@ +@@ -791,6 +792,7 @@ accordingly. Vim proceeds in this order: "$VIM/.vimrc" (for OS/2 and Amiga) (*) "$HOME/_vimrc" (for MS-DOS and Win32) (*) "$VIM/_vimrc" (for MS-DOS and Win32) (*) @@ -487,7 +172,7 @@ diff -Naur vim73/runtime/doc/starting.txt vim73.haiku/runtime/doc/starting.txt Note: For Unix, OS/2 and Amiga, when ".vimrc" does not exist, "_vimrc" is also tried, in case an MS-DOS compatible file system is used. For MS-DOS and Win32 ".vimrc" is checked -@@ -880,6 +882,7 @@ +@@ -880,6 +882,7 @@ sessions. Put it in a place so that it will be found by 3b: ~/.vimrc (Unix and OS/2) s:.vimrc (Amiga) $VIM\_vimrc (MS-DOS and Win32) @@ -495,10 +180,11 @@ diff -Naur vim73/runtime/doc/starting.txt vim73.haiku/runtime/doc/starting.txt Note that creating a vimrc file will cause the 'compatible' option to be off by default. See |compatible-default|. -diff -Naur vim73/runtime/doc/vi_diff.txt vim73.haiku/runtime/doc/vi_diff.txt ---- vim73/runtime/doc/vi_diff.txt 2010-08-15 14:23:23.066322432 +0200 -+++ vim73.haiku/runtime/doc/vi_diff.txt 2012-05-13 20:55:51.593494016 +0200 -@@ -139,6 +139,7 @@ +diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt +index 5d6706b..074acb6 100644 +--- a/runtime/doc/vi_diff.txt ++++ b/runtime/doc/vi_diff.txt +@@ -139,6 +139,7 @@ Support for different systems. - Atari MiNT - VMS - BeOS @@ -506,7 +192,7 @@ diff -Naur vim73/runtime/doc/vi_diff.txt vim73.haiku/runtime/doc/vi_diff.txt - Macintosh - Risc OS - IBM OS/390 -@@ -163,7 +164,7 @@ +@@ -163,7 +164,7 @@ Graphical User Interface (GUI). |gui| define your own menus. Better support for CTRL/SHIFT/ALT keys in combination with special keys and mouse. Supported for various platforms, such as X11 (with Motif and Athena interfaces), GTK, Win32 @@ -515,9 +201,10 @@ diff -Naur vim73/runtime/doc/vi_diff.txt vim73.haiku/runtime/doc/vi_diff.txt Multiple windows and buffers. |windows.txt| Vim can split the screen into several windows, each editing a -diff -Naur vim73/runtime/gvimrc_example.vim vim73.haiku/runtime/gvimrc_example.vim ---- vim73/runtime/gvimrc_example.vim 2010-05-15 11:03:31.008650752 +0000 -+++ vim73.haiku/runtime/gvimrc_example.vim 2010-08-20 23:25:03.942407680 +0000 +diff --git a/runtime/gvimrc_example.vim b/runtime/gvimrc_example.vim +index 5a5197e..e7e2538 100644 +--- a/runtime/gvimrc_example.vim ++++ b/runtime/gvimrc_example.vim @@ -9,6 +9,7 @@ " for Amiga: s:.gvimrc " for MS-DOS and Win32: $VIM\_gvimrc @@ -526,9 +213,10 @@ diff -Naur vim73/runtime/gvimrc_example.vim vim73.haiku/runtime/gvimrc_example.v " Make external commands work through a pipe instead of a pseudo-tty "set noguipty -diff -Naur vim73/runtime/vimrc_example.vim vim73.haiku/runtime/vimrc_example.vim ---- vim73/runtime/vimrc_example.vim 2010-05-15 11:03:57.023855104 +0000 -+++ vim73.haiku/runtime/vimrc_example.vim 2010-08-20 23:25:41.794034176 +0000 +diff --git a/runtime/vimrc_example.vim b/runtime/vimrc_example.vim +index b35100c..f5518d1 100644 +--- a/runtime/vimrc_example.vim ++++ b/runtime/vimrc_example.vim @@ -8,6 +8,7 @@ " for Amiga: s:.vimrc " for MS-DOS and Win32: $VIM\_vimrc @@ -537,10 +225,11 @@ diff -Naur vim73/runtime/vimrc_example.vim vim73.haiku/runtime/vimrc_example.vim " When started as "evim", evim.vim will already have done these settings. if v:progname =~? "evim" -diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile ---- vim73/src/Makefile 2010-08-15 12:56:15.017301504 +0000 -+++ vim73.haiku/src/Makefile 2010-08-20 23:27:51.707264512 +0000 -@@ -1242,6 +1242,23 @@ +diff --git a/src/Makefile b/src/Makefile +index e582eed..985dfd2 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -1242,6 +1242,23 @@ NEXTAW_BUNDLE = # too: #EXTRA_LIBS = /usr/openwin/lib/libXmu.sa -lm @@ -564,7 +253,7 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile # PHOTON GUI PHOTONGUI_SRC = gui.c gui_photon.c pty.c PHOTONGUI_OBJ = objects/gui.o objects/gui_photon.o objects/pty.o -@@ -2458,6 +2475,9 @@ +@@ -2458,6 +2475,9 @@ objects/gui_at_sb.o: gui_at_sb.c objects/gui_athena.o: gui_athena.c $(CCC) -o $@ gui_athena.c @@ -574,7 +263,7 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile objects/gui_beval.o: gui_beval.c $(CCC) -o $@ gui_beval.c -@@ -2585,6 +2605,9 @@ +@@ -2585,6 +2605,9 @@ objects/option.o: option.c objects/os_beos.o: os_beos.c $(CCC) -o $@ os_beos.c @@ -584,7 +273,7 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile objects/os_qnx.o: os_qnx.c $(CCC) -o $@ os_qnx.c -@@ -2738,6 +2761,56 @@ +@@ -2738,6 +2761,56 @@ $(APPDIR)/Contents: ############################################################################### @@ -641,10 +330,11 @@ diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile ### (automatically generated by 'make depend') ### Dependencies: objects/blowfish.o: blowfish.c vim.h auto/config.h feature.h os_unix.h \ -diff -Naur vim73/src/configure.in vim73.haiku/src/configure.in ---- vim73/src/configure.in 2010-08-13 14:15:17.029884416 +0000 -+++ vim73.haiku/src/configure.in 2010-08-20 23:24:07.536870912 +0000 -@@ -69,11 +69,13 @@ +diff --git a/src/configure.in b/src/configure.in +index 152313b..9161849 100644 +--- a/src/configure.in ++++ b/src/configure.in +@@ -69,11 +69,13 @@ fi OS_EXTRA_SRC=""; OS_EXTRA_OBJ="" @@ -660,7 +350,7 @@ diff -Naur vim73/src/configure.in vim73.haiku/src/configure.in *) BEOS=no; AC_MSG_RESULT(no);; esac -@@ -1406,7 +1408,7 @@ +@@ -1406,7 +1408,7 @@ AC_ARG_ENABLE(netbeans, if test "$enable_netbeans" = "yes"; then AC_MSG_RESULT(no) dnl On Solaris we need the socket and nsl library. @@ -669,7 +359,7 @@ diff -Naur vim73/src/configure.in vim73.haiku/src/configure.in AC_CHECK_LIB(nsl, gethostbyname) AC_MSG_CHECKING(whether compiling netbeans integration is possible) AC_TRY_LINK([ -@@ -1614,11 +1616,11 @@ +@@ -1614,11 +1616,11 @@ else fi fi @@ -683,7 +373,7 @@ diff -Naur vim73/src/configure.in vim73.haiku/src/configure.in dnl Canonicalize the --enable-gui= argument so that it can be easily compared. dnl Do not use character classes for portability with old tools. -@@ -1632,10 +1634,24 @@ +@@ -1632,10 +1634,24 @@ SKIP_MOTIF=YES SKIP_ATHENA=YES SKIP_NEXTAW=YES SKIP_PHOTON=YES @@ -709,7 +399,7 @@ diff -Naur vim73/src/configure.in vim73.haiku/src/configure.in SKIP_PHOTON= case "$enable_gui_canon" in no) AC_MSG_RESULT(no GUI support) -@@ -1786,6 +1802,7 @@ +@@ -1786,6 +1802,7 @@ if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then SKIP_ATHENA=YES; SKIP_NEXTAW=YES; SKIP_PHOTON=YES; @@ -717,7 +407,7 @@ diff -Naur vim73/src/configure.in vim73.haiku/src/configure.in SKIP_CARBON=YES fi -@@ -2277,6 +2294,11 @@ +@@ -2277,6 +2294,11 @@ if test "x$GUITYPE:$enable_fontset" = "xGTK:yes"; then enable_fontset="no" fi @@ -729,10 +419,11 @@ diff -Naur vim73/src/configure.in vim73.haiku/src/configure.in if test -z "$SKIP_PHOTON"; then GUITYPE=PHOTONGUI fi -diff -Naur vim73/src/eval.c vim73.haiku/src/eval.c ---- vim73/src/eval.c 2010-08-09 20:12:14.062128128 +0000 -+++ vim73.haiku/src/eval.c 2010-08-20 22:32:14.677642240 +0000 -@@ -11722,6 +11722,9 @@ +diff --git a/src/eval.c b/src/eval.c +index fc01006..44c02e9 100644 +--- a/src/eval.c ++++ b/src/eval.c +@@ -11722,6 +11722,9 @@ f_has(argvars, rettv) #ifdef __BEOS__ "beos", #endif @@ -742,7 +433,7 @@ diff -Naur vim73/src/eval.c vim73.haiku/src/eval.c #ifdef MSDOS # ifdef DJGPP "dos32", -@@ -11894,6 +11897,9 @@ +@@ -11894,6 +11897,9 @@ f_has(argvars, rettv) #ifdef FEAT_GUI_GNOME "gui_gnome", #endif @@ -752,10 +443,11 @@ diff -Naur vim73/src/eval.c vim73.haiku/src/eval.c #ifdef FEAT_GUI_MAC "gui_mac", #endif -diff -Naur vim73/src/ex_docmd.c vim73.haiku/src/ex_docmd.c ---- vim73/src/ex_docmd.c 2010-08-07 14:59:47.016252928 +0000 -+++ vim73.haiku/src/ex_docmd.c 2010-08-20 22:33:08.046923776 +0000 -@@ -6841,6 +6841,7 @@ +diff --git a/src/ex_docmd.c b/src/ex_docmd.c +index b338ed5..07f631b 100644 +--- a/src/ex_docmd.c ++++ b/src/ex_docmd.c +@@ -6841,6 +6841,7 @@ ex_shell(eap) || (defined(FEAT_GUI_GTK) && defined(FEAT_DND)) \ || defined(FEAT_GUI_MSWIN) \ || defined(FEAT_GUI_MAC) \ @@ -763,9 +455,10 @@ diff -Naur vim73/src/ex_docmd.c vim73.haiku/src/ex_docmd.c || defined(PROTO) /* -diff -Naur vim73/src/feature.h vim73.haiku/src/feature.h ---- vim73/src/feature.h 2010-07-27 19:45:42.064749568 +0000 -+++ vim73.haiku/src/feature.h 2010-08-20 22:38:17.466354176 +0000 +diff --git a/src/feature.h b/src/feature.h +index ea79758..577e7c0 100644 +--- a/src/feature.h ++++ b/src/feature.h @@ -659,6 +659,14 @@ /* #define FEAT_MBYTE_IME */ # endif @@ -826,10 +519,11 @@ diff -Naur vim73/src/feature.h vim73.haiku/src/feature.h # define FEAT_GUI_TEXTDIALOG #endif -diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c ---- vim73/src/gui.c 2010-08-08 13:01:18.035651584 +0000 -+++ vim73.haiku/src/gui.c 2010-08-20 23:05:36.517210112 +0000 -@@ -59,7 +59,7 @@ +diff --git a/src/gui.c b/src/gui.c +index 87930c6..537bd7b 100644 +--- a/src/gui.c ++++ b/src/gui.c +@@ -59,7 +59,7 @@ static int can_update_cursor = TRUE; /* can display the cursor */ gui_start() { char_u *old_term; @@ -838,7 +532,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c # define MAY_FORK int dofork = TRUE; #endif -@@ -275,7 +275,7 @@ +@@ -275,7 +275,7 @@ gui_init_check() gui.menu_width = 0; # endif #endif @@ -847,7 +541,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c gui.toolbar_height = 0; #endif #if defined(FEAT_FOOTER) && defined(FEAT_GUI_MOTIF) -@@ -1167,10 +1167,10 @@ +@@ -1167,10 +1167,10 @@ gui_position_components(total_width) text_area_y += gui.tabline_height; #endif @@ -860,7 +554,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c gui_mch_set_toolbar_pos(0, text_area_y, gui.menu_width, gui.toolbar_height); # endif -@@ -1178,6 +1178,13 @@ +@@ -1178,6 +1178,13 @@ gui_position_components(total_width) } #endif @@ -874,7 +568,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c text_area_width = gui.num_cols * gui.char_width + gui.border_offset * 2; text_area_height = gui.num_rows * gui.char_height + gui.border_offset * 2; -@@ -1249,7 +1256,7 @@ +@@ -1249,7 +1256,7 @@ gui_get_base_height() # endif # endif # if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) \ @@ -883,7 +577,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c if (gui_has_tabline()) base_height += gui.tabline_height; # endif -@@ -1292,7 +1299,11 @@ +@@ -1292,7 +1299,11 @@ gui_resize_shell(pixel_width, pixel_height) again: busy = TRUE; @@ -896,7 +590,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c out_flush(); gui.num_cols = (pixel_width - gui_get_base_width()) / gui.char_width; -@@ -1314,7 +1325,11 @@ +@@ -1314,7 +1325,11 @@ again: || gui.num_rows != Rows || gui.num_cols != Columns) shell_resized(); @@ -909,7 +603,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c gui_update_cursor(FALSE, TRUE); #if defined(FEAT_XIM) && !defined(FEAT_GUI_GTK) xim_set_status_area(); -@@ -4055,9 +4070,9 @@ +@@ -4055,9 +4070,9 @@ gui_update_scrollbars(force) y += gui.menu_height; #endif @@ -921,7 +615,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c y += gui.toolbar_height; # else # ifdef FEAT_GUI_MSWIN -@@ -4066,7 +4081,8 @@ +@@ -4066,7 +4081,8 @@ gui_update_scrollbars(force) # endif #endif @@ -931,7 +625,7 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c if (gui_has_tabline()) y += gui.tabline_height; #endif -@@ -4811,7 +4827,8 @@ +@@ -4811,7 +4827,8 @@ ex_gui(eap) } #if ((defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32) \ @@ -941,9 +635,10 @@ diff -Naur vim73/src/gui.c vim73.haiku/src/gui.c /* * This is shared between Athena, Motif and GTK. */ -diff -Naur vim73/src/gui.h vim73.haiku/src/gui.h ---- vim73/src/gui.h 2010-07-17 19:40:58.051642368 +0000 -+++ vim73.haiku/src/gui.h 2010-08-20 23:07:23.085983232 +0000 +diff --git a/src/gui.h b/src/gui.h +index 149603c..9feee3a 100644 +--- a/src/gui.h ++++ b/src/gui.h @@ -33,6 +33,10 @@ # include #endif @@ -964,7 +659,7 @@ diff -Naur vim73/src/gui.h vim73.haiku/src/gui.h # define HAVE_DROP_FILE #endif -@@ -216,6 +220,9 @@ +@@ -216,6 +220,9 @@ typedef struct GuiScrollbar scroll_shift is set to the number of shifts to reduce the count. */ #endif @@ -974,7 +669,7 @@ diff -Naur vim73/src/gui.h vim73.haiku/src/gui.h #ifdef FEAT_GUI_MAC ControlHandle id; /* A handle to the scrollbar */ #endif -@@ -412,7 +419,7 @@ +@@ -412,7 +419,7 @@ typedef struct Gui #if defined(FEAT_GUI_TABLINE) \ && (defined(FEAT_GUI_W32) || defined(FEAT_GUI_MOTIF) \ @@ -983,7 +678,7 @@ diff -Naur vim73/src/gui.h vim73.haiku/src/gui.h int tabline_height; #endif -@@ -421,7 +428,7 @@ +@@ -421,7 +428,7 @@ typedef struct Gui #endif #if defined(FEAT_TOOLBAR) \ @@ -992,7 +687,7 @@ diff -Naur vim73/src/gui.h vim73.haiku/src/gui.h int toolbar_height; /* height of the toolbar */ #endif -@@ -442,6 +449,14 @@ +@@ -442,6 +449,14 @@ typedef struct Gui guicolor_T currSpColor; /* Current special text color */ #endif @@ -1007,9 +702,11 @@ diff -Naur vim73/src/gui.h vim73.haiku/src/gui.h #ifdef FEAT_GUI_MAC WindowPtr VimWindow; MenuHandle MacOSHelpMenu; /* Help menu provided by the MacOS */ -diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc ---- vim73/src/gui_beos.cc 1970-01-01 00:00:00.000000000 +0000 -+++ vim73.haiku/src/gui_beos.cc 2010-08-20 23:43:35.727711744 +0000 +diff --git a/src/gui_beos.cc b/src/gui_beos.cc +new file mode 100644 +index 0000000..ceafd40 +--- /dev/null ++++ b/src/gui_beos.cc @@ -0,0 +1,4868 @@ +/* vi:set ts=8 sts=4 sw=4: + * @@ -5879,10 +5576,11 @@ diff -Naur vim73/src/gui_beos.cc vim73.haiku/src/gui_beos.cc +} + +#endif //FEAT_GUI_TABLINE -+ -diff -Naur vim73/src/gui_beos.h vim73.haiku/src/gui_beos.h ---- vim73/src/gui_beos.h 1970-01-01 00:00:00.000000000 +0000 -+++ vim73.haiku/src/gui_beos.h 2010-08-20 22:25:02.562298880 +0000 +diff --git a/src/gui_beos.h b/src/gui_beos.h +new file mode 100644 +index 0000000..7f323cd +--- /dev/null ++++ b/src/gui_beos.h @@ -0,0 +1,51 @@ +/* vi:set ts=8 sts=4 sw=4: + * @@ -5935,9 +5633,10 @@ diff -Naur vim73/src/gui_beos.h vim73.haiku/src/gui_beos.h +typedef struct VimScrollBar VimScrollBar; + +#endif -diff -Naur vim73/src/misc1.c vim73.haiku/src/misc1.c ---- vim73/src/misc1.c 2010-08-15 11:24:05.015466496 +0000 -+++ vim73.haiku/src/misc1.c 2010-08-20 22:43:17.718798848 +0000 +diff --git a/src/misc1.c b/src/misc1.c +index fd178c9..b8c838a 100644 +--- a/src/misc1.c ++++ b/src/misc1.c @@ -14,6 +14,10 @@ #include "vim.h" #include "version.h" @@ -5949,7 +5648,7 @@ diff -Naur vim73/src/misc1.c vim73.haiku/src/misc1.c static char_u *vim_version_dir __ARGS((char_u *vimdir)); static char_u *remove_tail __ARGS((char_u *p, char_u *pend, char_u *name)); static int copy_indent __ARGS((int size, char_u *src)); -@@ -3902,7 +3906,18 @@ +@@ -3902,7 +3906,18 @@ vim_getenv(name, mustfree) vimruntime = (STRCMP(name, "VIMRUNTIME") == 0); if (!vimruntime && STRCMP(name, "VIM") != 0) @@ -5969,10 +5668,11 @@ diff -Naur vim73/src/misc1.c vim73.haiku/src/misc1.c /* * When expanding $VIMRUNTIME fails, try using $VIM/vim or $VIM. -diff -Naur vim73/src/normal.c vim73.haiku/src/normal.c ---- vim73/src/normal.c 2010-07-31 13:25:19.021233664 +0000 -+++ vim73.haiku/src/normal.c 2010-08-20 22:44:36.301203456 +0000 -@@ -2599,6 +2599,7 @@ +diff --git a/src/normal.c b/src/normal.c +index b76e40d..d8ef2f1 100644 +--- a/src/normal.c ++++ b/src/normal.c +@@ -2599,6 +2599,7 @@ do_mouse(oap, c, dir, count, fixindent) * shift-left button -> right button * alt-left button -> alt-right button */ @@ -5980,7 +5680,7 @@ diff -Naur vim73/src/normal.c vim73.haiku/src/normal.c if (mouse_model_popup()) { if (which_button == MOUSE_RIGHT -@@ -2613,13 +2614,14 @@ +@@ -2613,13 +2614,14 @@ do_mouse(oap, c, dir, count, fixindent) if (!is_click) return FALSE; #endif @@ -5997,7 +5697,7 @@ diff -Naur vim73/src/normal.c vim73.haiku/src/normal.c if (gui.in_use) { jump_flags = 0; -@@ -5385,7 +5387,8 @@ +@@ -5385,7 +5387,8 @@ nv_clear(cap) { if (!checkclearop(cap->oap)) { @@ -6007,7 +5707,7 @@ diff -Naur vim73/src/normal.c vim73.haiku/src/normal.c /* * Right now, the BeBox doesn't seem to have an easy way to detect * window resizing, so we cheat and make the user detect it -@@ -5393,6 +5396,7 @@ +@@ -5393,6 +5396,7 @@ nv_clear(cap) */ ui_get_shellsize(); #endif @@ -6015,9 +5715,10 @@ diff -Naur vim73/src/normal.c vim73.haiku/src/normal.c #ifdef FEAT_SYN_HL /* Clear all syntax states to force resyncing. */ syn_stack_free_all(curwin->w_s); -diff -Naur vim73/src/option.h vim73.haiku/src/option.h ---- vim73/src/option.h 2010-07-25 14:15:02.038535168 +0000 -+++ vim73.haiku/src/option.h 2010-08-20 22:45:31.003407872 +0000 +diff --git a/src/option.h b/src/option.h +index 0f697c2..a4121b9 100644 +--- a/src/option.h ++++ b/src/option.h @@ -9,7 +9,8 @@ /* * option.h: definition of global variables for settable options @@ -6028,14 +5729,15 @@ diff -Naur vim73/src/option.h vim73.haiku/src/option.h /* * Default values for 'errorformat'. * The "%f|%l| %m" one is used for when the contents of the quickfix window is -@@ -1095,3 +1096,4 @@ +@@ -1095,3 +1096,4 @@ enum , WV_WRAP , WV_COUNT /* must be the last one */ }; +#endif //_OPTION_H_ -diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c ---- vim73/src/os_beos.c 2010-05-15 11:04:09.032768000 +0000 -+++ vim73.haiku/src/os_beos.c 2010-08-20 23:15:48.089915392 +0000 +diff --git a/src/os_beos.c b/src/os_beos.c +index 10135aa..e46c1ca 100644 +--- a/src/os_beos.c ++++ b/src/os_beos.c @@ -23,8 +23,8 @@ #define thread_id int #endif @@ -6047,7 +5749,7 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c sem_id character_present; sem_id character_wanted; thread_id read_thread_id; -@@ -50,7 +50,7 @@ +@@ -50,7 +50,7 @@ read_thread(void *dummy) for (;;) { if (acquire_sem(character_wanted) != B_NO_ERROR) break; @@ -6056,7 +5758,7 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c release_sem(character_present); } -@@ -70,13 +70,18 @@ +@@ -70,13 +70,18 @@ beos_cleanup_read_thread(void) #endif @@ -6076,7 +5778,7 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c beos_select(int nbits, struct fd_set *rbits, struct fd_set *wbits, -@@ -84,7 +89,11 @@ +@@ -84,7 +89,11 @@ beos_select(int nbits, struct timeval *timeout) { bigtime_t tmo; @@ -6089,7 +5791,7 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c if (nbits == 0) { /* select is purely being used for delay */ snooze(timeout->tv_sec * 1e6 + timeout->tv_usec); -@@ -153,13 +162,15 @@ +@@ -153,13 +162,15 @@ beos_select(int nbits, acquired = acquire_sem(character_present); if (acquired == B_NO_ERROR) { if (charcount > 0) { @@ -6106,7 +5808,7 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c #if !TRY_ABORT release_sem(character_wanted); #endif -@@ -183,7 +194,7 @@ +@@ -183,7 +194,7 @@ beos_select(int nbits, if (acquired == B_TIMED_OUT) acquire_sem(character_present); if (charcount > 0) { @@ -6115,7 +5817,7 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c return 1; } return 0; -@@ -192,6 +203,19 @@ +@@ -192,6 +203,19 @@ beos_select(int nbits, } #endif @@ -6135,9 +5837,10 @@ diff -Naur vim73/src/os_beos.c vim73.haiku/src/os_beos.c +#endif /* __BEOS__ */ + -diff -Naur vim73/src/os_beos.h vim73.haiku/src/os_beos.h ---- vim73/src/os_beos.h 2010-05-15 11:04:11.065273856 +0000 -+++ vim73.haiku/src/os_beos.h 2010-08-20 23:16:40.791937024 +0000 +diff --git a/src/os_beos.h b/src/os_beos.h +index 260834e..c6da995 100644 +--- a/src/os_beos.h ++++ b/src/os_beos.h @@ -20,6 +20,18 @@ #undef BEOS_DR8 #define BEOS_PR_OR_BETTER @@ -6159,9 +5862,11 @@ diff -Naur vim73/src/os_beos.h vim73.haiku/src/os_beos.h +#endif -#include /* for typedefs and #defines only */ -diff -Naur vim73/src/os_beos.rdef vim73.haiku/src/os_beos.rdef ---- vim73/src/os_beos.rdef 1970-01-01 00:00:00.000000000 +0000 -+++ vim73.haiku/src/os_beos.rdef 2010-05-02 14:29:42.040894464 +0000 +diff --git a/src/os_beos.rdef b/src/os_beos.rdef +new file mode 100644 +index 0000000..004ed05 +--- /dev/null ++++ b/src/os_beos.rdef @@ -0,0 +1,205 @@ +/* + * Vim.rdef @@ -6368,10 +6073,11 @@ diff -Naur vim73/src/os_beos.rdef vim73.haiku/src/os_beos.rdef + $"FF17F6CF36F92F1B9E631E8B8F3FBC0000000049454E44AE426082" +}; + -diff -Naur vim73/src/os_unix.c vim73.haiku/src/os_unix.c ---- vim73/src/os_unix.c 2010-08-08 13:14:04.061079552 +0000 -+++ vim73.haiku/src/os_unix.c 2010-08-20 22:41:48.458489856 +0000 -@@ -1131,7 +1131,7 @@ +diff --git a/src/os_unix.c b/src/os_unix.c +index a82c65d..823fa74 100644 +--- a/src/os_unix.c ++++ b/src/os_unix.c +@@ -1131,7 +1131,7 @@ sigcont_handler SIGDEFARG(sigarg) mch_suspend() { /* BeOS does have SIGTSTP, but it doesn't work. */ @@ -6380,7 +6086,7 @@ diff -Naur vim73/src/os_unix.c vim73.haiku/src/os_unix.c out_flush(); /* needed to make cursor visible on some systems */ settmode(TMODE_COOK); out_flush(); /* needed to disable mouse on some systems */ -@@ -2017,6 +2017,11 @@ +@@ -2017,6 +2017,11 @@ mch_settitle(title, icon) if (gui.in_use) type = 1; # endif @@ -6392,7 +6098,7 @@ diff -Naur vim73/src/os_unix.c vim73.haiku/src/os_unix.c #endif /* -@@ -2041,7 +2046,7 @@ +@@ -2041,7 +2046,7 @@ mch_settitle(title, icon) # endif set_x11_title(title); /* x11 */ #endif @@ -6401,7 +6107,7 @@ diff -Naur vim73/src/os_unix.c vim73.haiku/src/os_unix.c || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC) else gui_mch_settitle(title, icon); -@@ -3088,7 +3093,9 @@ +@@ -3088,7 +3093,9 @@ mch_exit(r) ml_close_all(TRUE); /* remove all memfiles */ may_core_dump(); #ifdef FEAT_GUI @@ -6411,7 +6117,7 @@ diff -Naur vim73/src/os_unix.c vim73.haiku/src/os_unix.c gui_exit(r); #endif -@@ -3918,7 +3925,7 @@ +@@ -3918,7 +3925,7 @@ mch_call_shell(cmd, options) if (!pipe_error) /* pty or pipe opened or not used */ { @@ -6420,10 +6126,11 @@ diff -Naur vim73/src/os_unix.c vim73.haiku/src/os_unix.c beos_cleanup_read_thread(); # endif -diff -Naur vim73/src/os_unix.h vim73.haiku/src/os_unix.h ---- vim73/src/os_unix.h 2010-05-23 14:16:14.034865152 +0200 -+++ vim73.haiku/src/os_unix.h 2011-02-21 23:18:13.038797312 +0100 -@@ -388,6 +388,8 @@ +diff --git a/src/os_unix.h b/src/os_unix.h +index 5fd28af..a371c4e 100644 +--- a/src/os_unix.h ++++ b/src/os_unix.h +@@ -388,6 +388,8 @@ typedef struct dsc$descriptor DESC; #define DFLT_ERRORFILE "errors.err" @@ -6432,7 +6139,7 @@ diff -Naur vim73/src/os_unix.h vim73.haiku/src/os_unix.h #ifdef OS2 # define DFLT_RUNTIMEPATH "$HOME/vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME/vimfiles/after" #else -@@ -402,6 +404,8 @@ +@@ -402,6 +404,8 @@ typedef struct dsc$descriptor DESC; # endif #endif @@ -6441,9 +6148,34 @@ diff -Naur vim73/src/os_unix.h vim73.haiku/src/os_unix.h #ifdef OS2 /* * Try several directories to put the temp files. -diff -Naur vim73/src/proto/gui_beos.pro vim73.haiku/src/proto/gui_beos.pro ---- vim73/src/proto/gui_beos.pro 1970-01-01 00:00:00.000000000 +0000 -+++ vim73.haiku/src/proto/gui_beos.pro 2010-08-20 23:42:00.825229312 +0000 +diff --git a/src/proto.h b/src/proto.h +index 40fb2a9..036bb72 100644 +--- a/src/proto.h ++++ b/src/proto.h +@@ -59,7 +59,7 @@ extern int _stricoll __ARGS((char *a, char *b)); + # ifdef VMS + # include "os_vms.pro" + # endif +-# ifdef __BEOS__ ++# if defined(__BEOS__) || defined(__HAIKU__) + # include "os_beos.pro" + # endif + # ifdef RISCOS +@@ -239,6 +239,9 @@ extern char_u *vimpty_getenv __ARGS((const char_u *string)); /* from pty.c */ + extern char *vim_SelFile __ARGS((Widget toplevel, char *prompt, char *init_path, int (*show_entry)(), int x, int y, guicolor_T fg, guicolor_T bg, guicolor_T scroll_fg, guicolor_T scroll_bg)); + # endif + # endif ++# ifdef FEAT_GUI_BEOS ++# include "gui_beos.pro" ++# endif + # ifdef FEAT_GUI_MAC + # include "gui_mac.pro" + # endif +diff --git a/src/proto/gui_beos.pro b/src/proto/gui_beos.pro +new file mode 100644 +index 0000000..b74cd20 +--- /dev/null ++++ b/src/proto/gui_beos.pro @@ -0,0 +1,90 @@ +/* gui_beos.cc - hand crafted */ +void gui_mch_prepare __ARGS((int *argc, char **argv)); @@ -6535,40 +6267,21 @@ diff -Naur vim73/src/proto/gui_beos.pro vim73.haiku/src/proto/gui_beos.pro +int gui_mch_showing_tabline __ARGS((void)); +void gui_mch_update_tabline __ARGS((void)); +void gui_mch_set_curtab __ARGS((int nr)); -diff -Naur vim73/src/proto/os_beos.pro vim73.haiku/src/proto/os_beos.pro ---- vim73/src/proto/os_beos.pro 1970-01-01 00:00:00.000000000 +0000 -+++ vim73.haiku/src/proto/os_beos.pro 2009-05-16 16:18:36.066846720 +0000 +diff --git a/src/proto/os_beos.pro b/src/proto/os_beos.pro +new file mode 100644 +index 0000000..c537101 +--- /dev/null ++++ b/src/proto/os_beos.pro @@ -0,0 +1,4 @@ +/* os_beos.c */ +void beos_cleanup_read_thread __ARGS((void)); +int beos_select __ARGS((int nbits, struct fd_set *rbits, struct fd_set *wbits, struct fd_set *ebits, struct timeval *timeout)); +/* vim: set ft=c : */ -diff -Naur vim73/src/proto.h vim73.haiku/src/proto.h ---- vim73/src/proto.h 2010-07-17 15:28:51.056623104 +0000 -+++ vim73.haiku/src/proto.h 2010-08-20 22:46:57.833617920 +0000 -@@ -59,7 +59,7 @@ - # ifdef VMS - # include "os_vms.pro" - # endif --# ifdef __BEOS__ -+# if defined(__BEOS__) || defined(__HAIKU__) - # include "os_beos.pro" - # endif - # ifdef RISCOS -@@ -239,6 +239,9 @@ - extern char *vim_SelFile __ARGS((Widget toplevel, char *prompt, char *init_path, int (*show_entry)(), int x, int y, guicolor_T fg, guicolor_T bg, guicolor_T scroll_fg, guicolor_T scroll_bg)); - # endif - # endif -+# ifdef FEAT_GUI_BEOS -+# include "gui_beos.pro" -+# endif - # ifdef FEAT_GUI_MAC - # include "gui_mac.pro" - # endif -diff -Naur vim73/src/pty.c vim73.haiku/src/pty.c ---- vim73/src/pty.c 2010-07-24 18:23:01.037748736 +0000 -+++ vim73.haiku/src/pty.c 2010-08-20 22:48:03.131858432 +0000 -@@ -353,7 +353,7 @@ +diff --git a/src/pty.c b/src/pty.c +index 944eccf..a5c5d59 100644 +--- a/src/pty.c ++++ b/src/pty.c +@@ -353,7 +353,7 @@ OpenPTY(ttyn) static char PtyProto[] = "/dev/ptym/ptyXY"; static char TtyProto[] = "/dev/pty/ttyXY"; # else @@ -6577,10 +6290,11 @@ diff -Naur vim73/src/pty.c vim73.haiku/src/pty.c static char PtyProto[] = "/dev/pt/XY"; static char TtyProto[] = "/dev/tt/XY"; # else -diff -Naur vim73/src/screen.c vim73.haiku/src/screen.c ---- vim73/src/screen.c 2010-08-13 13:21:27.004194304 +0000 -+++ vim73.haiku/src/screen.c 2010-08-20 22:54:49.930349056 +0000 -@@ -7917,6 +7917,10 @@ +diff --git a/src/screen.c b/src/screen.c +index 380eb8b..b696b68 100644 +--- a/src/screen.c ++++ b/src/screen.c +@@ -7917,6 +7917,10 @@ retry: win_new_shellsize(); /* fit the windows in the new sized shell */ @@ -6591,7 +6305,7 @@ diff -Naur vim73/src/screen.c vim73.haiku/src/screen.c comp_col(); /* recompute columns for shown command and ruler */ /* -@@ -8160,6 +8164,9 @@ +@@ -8160,6 +8164,9 @@ give_up: } #endif @@ -6601,7 +6315,7 @@ diff -Naur vim73/src/screen.c vim73.haiku/src/screen.c entered = FALSE; --RedrawingDisabled; -@@ -9023,6 +9030,9 @@ +@@ -9023,6 +9030,9 @@ screen_ins_lines(off, row, line_count, end, wp) clip_scroll_selection(-line_count); #endif @@ -6611,7 +6325,7 @@ diff -Naur vim73/src/screen.c vim73.haiku/src/screen.c #ifdef FEAT_GUI /* Don't update the GUI cursor here, ScreenLines[] is invalid until the * scrolling is actually carried out. */ -@@ -9075,6 +9085,10 @@ +@@ -9075,6 +9085,10 @@ screen_ins_lines(off, row, line_count, end, wp) } } @@ -6622,7 +6336,7 @@ diff -Naur vim73/src/screen.c vim73.haiku/src/screen.c screen_stop_highlight(); windgoto(cursor_row, 0); -@@ -9244,6 +9258,9 @@ +@@ -9244,6 +9258,9 @@ screen_del_lines(off, row, line_count, end, force, wp) clip_scroll_selection(line_count); #endif @@ -6632,7 +6346,7 @@ diff -Naur vim73/src/screen.c vim73.haiku/src/screen.c #ifdef FEAT_GUI /* Don't update the GUI cursor here, ScreenLines[] is invalid until the * scrolling is actually carried out. */ -@@ -9303,6 +9320,10 @@ +@@ -9303,6 +9320,10 @@ screen_del_lines(off, row, line_count, end, force, wp) } } @@ -6643,10 +6357,11 @@ diff -Naur vim73/src/screen.c vim73.haiku/src/screen.c screen_stop_highlight(); #ifdef FEAT_VERTSPLIT -diff -Naur vim73/src/structs.h vim73.haiku/src/structs.h ---- vim73/src/structs.h 2010-08-07 14:59:27.033292288 +0000 -+++ vim73.haiku/src/structs.h 2010-08-20 22:56:00.936640512 +0000 -@@ -2330,6 +2330,13 @@ +diff --git a/src/structs.h b/src/structs.h +index 884d6a9..690cf4d 100644 +--- a/src/structs.h ++++ b/src/structs.h +@@ -2330,6 +2330,13 @@ struct VimMenu HMENU submenu_id; /* If this is submenu, add children here */ HWND tearoff_handle; /* hWnd of tearoff if created */ #endif @@ -6660,10 +6375,11 @@ diff -Naur vim73/src/structs.h vim73.haiku/src/structs.h #ifdef FEAT_GUI_MAC /* MenuHandle id; */ /* short index; */ /* the item index within the father menu */ -diff -Naur vim73/src/term.c vim73.haiku/src/term.c ---- vim73/src/term.c 2010-07-25 13:30:31.000262144 +0000 -+++ vim73.haiku/src/term.c 2010-08-20 22:56:43.414711808 +0000 -@@ -1436,6 +1436,11 @@ +diff --git a/src/term.c b/src/term.c +index 8c42662..bd6c7b7 100644 +--- a/src/term.c ++++ b/src/term.c +@@ -1436,6 +1436,11 @@ static struct builtin_term builtin_termcaps[] = # define DEFAULT_TERM (char_u *)"beos-ansi" #endif @@ -6675,10 +6391,11 @@ diff -Naur vim73/src/term.c vim73.haiku/src/term.c #ifndef DEFAULT_TERM # define DEFAULT_TERM (char_u *)"dumb" #endif -diff -Naur vim73/src/ui.c vim73.haiku/src/ui.c ---- vim73/src/ui.c 2010-08-08 13:17:30.061865984 +0000 -+++ vim73.haiku/src/ui.c 2010-08-20 22:57:17.743440384 +0000 -@@ -269,7 +269,7 @@ +diff --git a/src/ui.c b/src/ui.c +index 9a04476..0886244 100644 +--- a/src/ui.c ++++ b/src/ui.c +@@ -269,7 +269,7 @@ ui_suspend() mch_suspend(); } @@ -6687,7 +6404,7 @@ diff -Naur vim73/src/ui.c vim73.haiku/src/ui.c /* * When the OS can't really suspend, call this function to start a shell. * This is never called in the GUI. -@@ -3000,7 +3000,7 @@ +@@ -3000,7 +3000,7 @@ mouse_find_win(rowp, colp) #if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MAC) \ || defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MSWIN) \ @@ -6696,10 +6413,11 @@ diff -Naur vim73/src/ui.c vim73.haiku/src/ui.c /* * Translate window coordinates to buffer position without any side effects */ -diff -Naur vim73/src/version.c vim73.haiku/src/version.c ---- vim73/src/version.c 2010-08-01 13:45:48.052953088 +0000 -+++ vim73.haiku/src/version.c 2010-08-20 22:58:43.417333248 +0000 -@@ -949,6 +949,9 @@ +diff --git a/src/version.c b/src/version.c +index 79522a4..298b0e6 100644 +--- a/src/version.c ++++ b/src/version.c +@@ -949,6 +949,9 @@ list_version() MSG_PUTS(_("with X11-Athena GUI.")); # endif # else @@ -6709,7 +6427,7 @@ diff -Naur vim73/src/version.c vim73.haiku/src/version.c # ifdef FEAT_GUI_PHOTON MSG_PUTS(_("with Photon GUI.")); # else -@@ -966,6 +969,7 @@ +@@ -966,6 +969,7 @@ list_version() # endif # endif # endif @@ -6717,9 +6435,10 @@ diff -Naur vim73/src/version.c vim73.haiku/src/version.c # endif # endif # endif -diff -Naur vim73/src/vim.h vim73.haiku/src/vim.h ---- vim73/src/vim.h 2010-07-29 18:46:39.058720256 +0000 -+++ vim73.haiku/src/vim.h 2010-08-20 23:00:06.199753728 +0000 +diff --git a/src/vim.h b/src/vim.h +index b9ce325..aaa407a 100644 +--- a/src/vim.h ++++ b/src/vim.h @@ -115,6 +115,7 @@ || defined(FEAT_GUI_MAC) \ || defined(FEAT_GUI_W32) \ @@ -6737,7 +6456,7 @@ diff -Naur vim73/src/vim.h vim73.haiku/src/vim.h # include "os_beos.h" # define __ARGS(x) x #endif -@@ -1903,6 +1904,9 @@ +@@ -1903,6 +1904,9 @@ typedef struct VimClipboard int_u format; /* Vim's own special clipboard format */ int_u format_raw; /* Vim's raw text clipboard format */ # endif @@ -6747,3 +6466,6 @@ diff -Naur vim73/src/vim.h vim73.haiku/src/vim.h } VimClipboard; #else typedef int VimClipboard; /* This is required for the prototypes. */ +-- +1.8.3.4 + diff --git a/app-editors/vim/vim-7.3.recipe b/app-editors/vim/vim-7.3.recipe index d4a2297e0..507f4fd26 100644 --- a/app-editors/vim/vim-7.3.recipe +++ b/app-editors/vim/vim-7.3.recipe @@ -1,22 +1,69 @@ -DESCRIPTION="Vim is highly configurable text editor." +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. + " HOMEPAGE="http://www.vim.org" SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2" +COPYRIGHT="Bram Moleenar et al." +LICENSE="Vim" REVISION="1" CHECKSUM_MD5="5b9510a17074e2b37d8bb38ae09edbf2" -STATUS_HAIKU="unstable" -DEPEND="" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + vim = $portVersion + cmd:ex = $portVersion + cmd:gview = $portVersion + cmd:gvim = $portVersion + cmd:gvimdiff = $portVersion + cmd:rgview = $portVersion + cmd:rgvim = $portVersion + cmd:rview = $portVersion + cmd:rvim = $portVersion + cmd:vim = $portVersion + cmd:vimdiff = $portVersion + cmd:vimtutor = $portVersion + cmd:view = $portVersion + cmd:xxd = $portVersion +" +REQUIRES=" + haiku + lib:libncurses +" +BUILD_REQUIRES=" + ncurses_devel +" +BUILD_PREREQUIRES=" + cmd:make + cmd:autoconf + cmd:gcc +" + +SOURCE_DIR="vim73" +PATCHES=" + vim-7.3.patchset +" + BUILD() { - cd vim73 cd src make autoconf cd ../ - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-features=big - make + runConfigure ./configure --with-features=big + make $jobArgs } INSTALL() { - cd vim73 make install } From d922c33596e16e44e816b9659277c9418a8ad21b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 30 Sep 2013 21:21:47 +0200 Subject: [PATCH 515/587] Add recipe for GNU which. * This should replace our current shell script version which won't work when /etc/profile isn't sourced. --- sys-apps/which/patches/which-2.20.patchset | 0 sys-apps/which/which-2.20.recipe | 38 ++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 sys-apps/which/patches/which-2.20.patchset create mode 100644 sys-apps/which/which-2.20.recipe diff --git a/sys-apps/which/patches/which-2.20.patchset b/sys-apps/which/patches/which-2.20.patchset new file mode 100644 index 000000000..e69de29bb diff --git a/sys-apps/which/which-2.20.recipe b/sys-apps/which/which-2.20.recipe new file mode 100644 index 000000000..dff494944 --- /dev/null +++ b/sys-apps/which/which-2.20.recipe @@ -0,0 +1,38 @@ +SUMMARY="Prints out location of specified executables that are in your path" +HOMEPAGE="http://carlo17.home.xs4all.nl/which/" +COPYRIGHT="Free Software Foundation" +LICENSE="GNU GPL v2" +SRC_URI="http://ftp.gnu.org/gnu/which/which-2.20.tar.gz" +CHECKSUM_MD5="95be0501a466e515422cde4af46b2744" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + which = $portVersion + cmd:which = $portVersion +" +REQUIRES=" + haiku >= $haikuVersion +" +BUILD_REQUIRES=" +" +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:make +" + +BUILD() +{ + runConfigure ./configure --disable-dependency-tracking + make $jobArgs +} + +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. +" From 5da538784093b083df54967ac3165514319ab24d Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 30 Sep 2013 21:54:36 +0200 Subject: [PATCH 516/587] Bump revisions of zlib and libsolv to allow updating them. --- dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe | 2 +- sys-libs/zlib/zlib-1.2.8.recipe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe index a397968fd..846d14650 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe @@ -4,7 +4,7 @@ LICENSE="BSD (3-clause)" COPYRIGHT="2007-2013, Novell Inc." HOMEPAGE="http://github.com/openSUSE/libsolv" SRC_URI="git+git://github.com/weinhold/libsolv.git#ef4a8778ef567224feb35019b711507ae1d6e7c3" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" diff --git a/sys-libs/zlib/zlib-1.2.8.recipe b/sys-libs/zlib/zlib-1.2.8.recipe index 27a19b121..140c26b76 100644 --- a/sys-libs/zlib/zlib-1.2.8.recipe +++ b/sys-libs/zlib/zlib-1.2.8.recipe @@ -5,7 +5,7 @@ COPYRIGHT="1995-2005 Jean-loup Gailly and Mark Adler" LICENSE="Zlib" SRC_URI="http://zlib.net/zlib-1.2.8.tar.gz" CHECKSUM_MD5="44d667c142d7cda120332623eab69f40" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" From f0cda2a5a40becb75cbf86ef34ca3f70443489ca Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 1 Oct 2013 10:47:50 +0200 Subject: [PATCH 517/587] Cleanup cmake-2.8.11.2 recipe and patch * Some tests are not passing, so marking the port as broken for now. * Make sure the patch is actually used when building. --- dev-util/cmake/cmake-2.8.11.2.recipe | 69 +++++-- ...2.8.11.2.patch => cmake-2.8.11.2.patchset} | 193 +++++++++--------- 2 files changed, 148 insertions(+), 114 deletions(-) rename dev-util/cmake/patches/{cmake-2.8.11.2.patch => cmake-2.8.11.2.patchset} (61%) diff --git a/dev-util/cmake/cmake-2.8.11.2.recipe b/dev-util/cmake/cmake-2.8.11.2.recipe index 11538c89b..fac218e1c 100644 --- a/dev-util/cmake/cmake-2.8.11.2.recipe +++ b/dev-util/cmake/cmake-2.8.11.2.recipe @@ -1,33 +1,58 @@ -DESCRIPTION="cmake - Cross platform Make" +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. + " HOMEPAGE="http://www.cmake.org" +LICENSE="CMake" +COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved." SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz" -#CHECKSUM_MD5="" +CHECKSUM_MD5="6f5d7b8e7534a5d9e1a7664ba63cf882" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD { - cd cmake-2.8.11.2 - # cmake appends the prefix to mandir and datadir - # so using ../../ to back that part out but for some reason - # the doc was also picking up /boot, so had to back it out 3 times - # this seems to work but might still need some further adjusting -# sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=/data/cmake \ - --docdir=/documentation/doc/CMake \ - --mandir=/documentation/man - make +ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + cmake = $portVersion compat >= 2.8 + cmd:cmake = $portVersion compat >= 2.8 + cmd:cpack = $portVersion compat >= 2.8 + cmd:ctest = $portVersion compat >= 2.8 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + lib:libncurses + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + ncurses_devel + cmd:gcc + cmd:grep + cmd:ld + cmd:libtool + cmd:make + cmd:sed + " +PATCHES="cmake-2.8.11.2.patchset" + +BUILD() +{ + ./configure --prefix=$prefix \ + --datadir=/$relativeDataDir/cmake \ + --docdir=/$relativeDocDir \ + --mandir=/$relativeManDir + make $jobArgs } -INSTALL { - cd cmake-2.8.11.2 +INSTALL() +{ make install } -TEST { - cd cmake-2.8.11.2 +TEST() +{ make test } -LICENSE="CMake" -COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/patches/cmake-2.8.11.2.patch b/dev-util/cmake/patches/cmake-2.8.11.2.patchset similarity index 61% rename from dev-util/cmake/patches/cmake-2.8.11.2.patch rename to dev-util/cmake/patches/cmake-2.8.11.2.patchset index 6b3bd2f94..4c04451fc 100644 --- a/dev-util/cmake/patches/cmake-2.8.11.2.patch +++ b/dev-util/cmake/patches/cmake-2.8.11.2.patchset @@ -1,61 +1,66 @@ -diff -urN cmake-2.8.11.2-orig/Modules/Platform/Haiku.cmake cmake-2.8.11.2/Modules/Platform/Haiku.cmake ---- cmake-2.8.11.2-orig/Modules/FindFreetype.cmake 2012-11-27 13:26:32.037486592 +0000 -+++ cmake-2.8.11.2/Modules/FindFreetype.cmake 2013-02-10 23:15:25.000000000 +0000 -@@ -46,20 +46,22 @@ - HINTS - ENV FREETYPE_DIR - PATHS -+ /boot/develop/headers +From 9e15fe26a3a573bbe68face114d682b98a45c875 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 1 Oct 2013 10:36:36 +0200 +Subject: Convert existing patch to patchset format. + + * This will need cleanup, but it will do for now. + +diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake +index 1df2399..2a68616 100644 +--- a/Modules/FindFreetype.cmake ++++ b/Modules/FindFreetype.cmake +@@ -50,6 +50,7 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h /usr/local/X11R6 /usr/local/X11 /usr/freeware -- PATH_SUFFIXES include/freetype2 include -+ PATH_SUFFIXES include/freetype2 include 3rdparty ++ /boot/common/develop/headers + PATH_SUFFIXES include/freetype2 include ) - find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h - HINTS - ENV FREETYPE_DIR - PATHS -+ /boot/develop/headers +@@ -61,6 +62,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h /usr/local/X11R6 /usr/local/X11 /usr/freeware -- PATH_SUFFIXES include/freetype2 include -+ PATH_SUFFIXES include/freetype2 include 3rdparty/freetype2 3rdparty ++ /boot/common/develop/headers + PATH_SUFFIXES include/freetype2 include ) - find_library(FREETYPE_LIBRARY -@@ -68,6 +70,7 @@ - ENV FREETYPE_DIR - PATH_SUFFIXES lib - PATHS -+ /boot/system/lib +@@ -74,6 +76,7 @@ find_library(FREETYPE_LIBRARY /usr/local/X11R6 /usr/local/X11 /usr/freeware - ---- cmake-2.8.11.2-orig/Modules/Platform/Haiku.cmake 2012-12-03 12:11:47.804519936 -0800 -+++ cmake-2.8.11.2/Modules/Platform/Haiku.cmake 2012-12-03 12:02:17.652738560 -0800 ++ /boot/develop/lib + ) + + # set the user variables +diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake +index 8987783..3236b58 100644 +--- a/Modules/Platform/Haiku.cmake ++++ b/Modules/Platform/Haiku.cmake @@ -1,20 +1,25 @@ +-set(BEOS 1) +set(HAIKU 1) +set(UNIX 1) -+ -+set(CMAKE_DL_LIBS "") --set(BEOS 1) -- + -set(CMAKE_DL_LIBS root be) -set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC") -set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE") ++set(CMAKE_DL_LIBS "") set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") -+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") -set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") ++set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") +set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") +set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") -+ + +-include(Platform/UnixPaths) +-list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) +-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) +-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) +list(APPEND CMAKE_SYSTEM_PREFIX_PATH + /boot/common/non-packaged + /boot/common @@ -66,19 +71,41 @@ diff -urN cmake-2.8.11.2-orig/Modules/Platform/Haiku.cmake cmake-2.8.11.2/Module + /boot/common/lib + /boot/develop/lib/x86 + ) -- --include(Platform/UnixPaths) --list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) --list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) --list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) --list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) --list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) -diff -urN cmake-2.8.11.2-orig/Source/cmExportCommand.cxx cmake-2.8.11.2/Source/cmExportCommand.cxx ---- cmake-2.8.11.2-orig/Source/cmExportCommand.cxx 2012-11-27 05:26:33.039059456 -0800 -+++ cmake-2.8.11.2/Source/cmExportCommand.cxx 2012-12-03 12:02:17.665059328 -0800 +diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx +index 7cc1522..5d66522 100644 +--- a/Source/CPack/cmCPackGenerator.cxx ++++ b/Source/CPack/cmCPackGenerator.cxx +@@ -26,7 +26,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + //---------------------------------------------------------------------- +@@ -1263,10 +1264,10 @@ const char* cmCPackGenerator::GetInstallPath() + this->InstallPath += "-"; + this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- this->InstallPath = dir.Path(); ++ this->InstallPath = dir; + } + else + { +diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx +index 1cc1754..fcb66a7 100644 +--- a/Source/cmExportCommand.cxx ++++ b/Source/cmExportCommand.cxx @@ -20,7 +20,8 @@ #include "cmExportBuildFileGenerator.h" @@ -89,7 +116,7 @@ diff -urN cmake-2.8.11.2-orig/Source/cmExportCommand.cxx cmake-2.8.11.2/Source/c #endif cmExportCommand::cmExportCommand() -@@ -305,14 +306,15 @@ +@@ -305,14 +306,15 @@ void cmExportCommand::StorePackageRegistryDir(std::string const& package, const char* hash) { #if defined(__HAIKU__) @@ -110,9 +137,10 @@ diff -urN cmake-2.8.11.2-orig/Source/cmExportCommand.cxx cmake-2.8.11.2/Source/c #else const char* home = cmSystemTools::GetEnv("HOME"); if(!home) -diff -urN cmake-2.8.11.2-orig/Source/cmFindPackageCommand.cxx cmake-2.8.11.2/Source/cmFindPackageCommand.cxx ---- cmake-2.8.11.2-orig/Source/cmFindPackageCommand.cxx 2012-11-27 05:26:33.059768832 -0800 -+++ cmake-2.8.11.2/Source/cmFindPackageCommand.cxx 2012-12-03 12:02:17.666107904 -0800 +diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx +index aa3a73d..a09958b 100644 +--- a/Source/cmFindPackageCommand.cxx ++++ b/Source/cmFindPackageCommand.cxx @@ -19,7 +19,9 @@ #endif @@ -124,7 +152,7 @@ diff -urN cmake-2.8.11.2-orig/Source/cmFindPackageCommand.cxx cmake-2.8.11.2/Sou #endif void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, -@@ -1583,12 +1585,13 @@ +@@ -1584,12 +1586,13 @@ void cmFindPackageCommand::AddPrefixesUserRegistry() #if defined(_WIN32) && !defined(__CYGWIN__) this->LoadPackageRegistryWinUser(); #elif defined(__HAIKU__) @@ -143,9 +171,10 @@ diff -urN cmake-2.8.11.2-orig/Source/cmFindPackageCommand.cxx cmake-2.8.11.2/Sou } #else if(const char* home = cmSystemTools::GetEnv("HOME")) -diff -urN cmake-2.8.11.2-orig/Source/cmLocalGenerator.cxx cmake-2.8.11.2/Source/cmLocalGenerator.cxx ---- cmake-2.8.11.2-orig/Source/cmLocalGenerator.cxx 2012-11-27 05:26:33.035389440 -0800 -+++ cmake-2.8.11.2/Source/cmLocalGenerator.cxx 2012-12-03 12:02:17.672399360 -0800 +diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx +index ee5b9d8..ba8faf3 100644 +--- a/Source/cmLocalGenerator.cxx ++++ b/Source/cmLocalGenerator.cxx @@ -37,7 +37,8 @@ #include @@ -156,7 +185,7 @@ diff -urN cmake-2.8.11.2-orig/Source/cmLocalGenerator.cxx cmake-2.8.11.2/Source/ #endif cmLocalGenerator::cmLocalGenerator() -@@ -354,12 +355,12 @@ +@@ -354,12 +355,12 @@ void cmLocalGenerator::GenerateInstallRules() prefix = prefix_win32.c_str(); } #elif defined(__HAIKU__) @@ -172,37 +201,11 @@ diff -urN cmake-2.8.11.2-orig/Source/cmLocalGenerator.cxx cmake-2.8.11.2/Source/ } else { -diff -urN cmake-2.8.11.2-orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8.11.2/Source/CPack/cmCPackGenerator.cxx ---- cmake-2.8.11.2-orig/Source/CPack/cmCPackGenerator.cxx 2012-11-27 05:26:32.015466496 -0800 -+++ cmake-2.8.11.2/Source/CPack/cmCPackGenerator.cxx 2012-12-03 12:02:17.677904384 -0800 -@@ -27,7 +27,8 @@ - #include - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - //---------------------------------------------------------------------- -@@ -1265,10 +1266,10 @@ - this->InstallPath += "-"; - this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); - #elif defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) - { -- this->InstallPath = dir.Path(); -+ this->InstallPath = dir; - } - else - { -diff -urN cmake-2.8.11.2-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8.11.2/Tests/ComplexOneConfig/Library/CMakeLists.txt ---- cmake-2.8.11.2-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-11-27 05:26:34.013369344 -0800 -+++ cmake-2.8.11.2/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-12-03 12:02:42.181665792 -0800 -@@ -51,7 +51,7 @@ +diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt +index 5c43052..f00cbd6 100644 +--- a/Tests/ComplexOneConfig/Library/CMakeLists.txt ++++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt +@@ -51,7 +51,7 @@ define_property( FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" ) set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) @@ -211,10 +214,11 @@ diff -urN cmake-2.8.11.2-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmak set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") endif() get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) -diff -urN cmake-2.8.11.2-orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.11.2/Utilities/cmcurl/CMake/CurlTests.c ---- cmake-2.8.11.2-orig/Utilities/cmcurl/CMake/CurlTests.c 2012-11-27 05:26:34.045350912 -0800 -+++ cmake-2.8.11.2/Utilities/cmcurl/CMake/CurlTests.c 2012-12-03 12:02:42.189005824 -0800 -@@ -38,7 +38,7 @@ +diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c +index d74a4f0..c5ba7c2 100644 +--- a/Utilities/cmcurl/CMake/CurlTests.c ++++ b/Utilities/cmcurl/CMake/CurlTests.c +@@ -38,7 +38,7 @@ main () # define PLATFORM_AIX_V3 #endif @@ -223,9 +227,10 @@ diff -urN cmake-2.8.11.2-orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.11.2/ #error "O_NONBLOCK does not work on this platform" #endif int socket; -diff -urN cmake-2.8.11.2-orig/Utilities/cmcurl/select.c cmake-2.8.11.2/Utilities/cmcurl/select.c ---- cmake-2.8.11.2-orig/Utilities/cmcurl/select.c 2012-11-27 05:26:34.055312384 -0800 -+++ cmake-2.8.11.2/Utilities/cmcurl/select.c 2012-12-03 12:02:42.189792256 -0800 +diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/select.c +index 51adbcf..82f9dc2 100644 +--- a/Utilities/cmcurl/select.c ++++ b/Utilities/cmcurl/select.c @@ -39,7 +39,7 @@ #error "We can't compile without select() support!" #endif @@ -235,9 +240,10 @@ diff -urN cmake-2.8.11.2-orig/Utilities/cmcurl/select.c cmake-2.8.11.2/Utilities /* BeOS has FD_SET defined in socket.h */ #include #endif -diff -urN cmake-2.8.11.2-orig/Utilities/cmzlib/zconf.h cmake-2.8.11.2/Utilities/cmzlib/zconf.h ---- cmake-2.8.11.2-orig/Utilities/cmzlib/zconf.h 2012-11-27 05:26:34.022020096 -0800 -+++ cmake-2.8.11.2/Utilities/cmzlib/zconf.h 2012-12-03 12:02:42.190578688 -0800 +diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h +index 6eb52d1..7a3b6fd 100644 +--- a/Utilities/cmzlib/zconf.h ++++ b/Utilities/cmzlib/zconf.h @@ -237,7 +237,7 @@ # endif #endif @@ -247,3 +253,6 @@ diff -urN cmake-2.8.11.2-orig/Utilities/cmzlib/zconf.h cmake-2.8.11.2/Utilities/ # ifdef ZLIB_DLL # ifdef ZLIB_INTERNAL # define ZEXPORT __declspec(dllexport) +-- +1.8.3.4 + From 401f2a18da228d46bc5b9dc8990cca4cb6a6ea55 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 1 Oct 2013 12:30:14 +0200 Subject: [PATCH 518/587] Add sqlite 3.8.0.2 recipe. * Latest release from sqlite. * This fixes the libraries location as previous versions of the package did not have them in the right place, also fixes the pkg-config script location. * I could not rebuild the older recipes, apparently the source archive was moved on sqlite server, and they don't link to it anymore. --- dev-db/sqlite/sqlite-3.8.0.2.recipe | 50 +++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 dev-db/sqlite/sqlite-3.8.0.2.recipe diff --git a/dev-db/sqlite/sqlite-3.8.0.2.recipe b/dev-db/sqlite/sqlite-3.8.0.2.recipe new file mode 100644 index 000000000..78528a4df --- /dev/null +++ b/dev-db/sqlite/sqlite-3.8.0.2.recipe @@ -0,0 +1,50 @@ +SUMMARY="A 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." +HOMEPAGE="http://www.sqlite.org/" +SRC_URI="http://www.sqlite.org/2013/sqlite-autoconf-3080002.tar.gz" +CHECKSUM_MD5="6d6cc639a4da04fbbdda7b1a1a01b386" +REVISION="1" +ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES="sqlite = $portVersion compat >= 3 + cmd:sqlite3 = $portVersion compat >= 3 + lib:libsqlite = $portVersion compat >= 3 + devel:libsqlite3 = $portVersion compat >= 3 + lib:libsqlite3 = $portVersion compat >= 3 + " +REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +SOURCE_DIR="sqlite-autoconf-3080002" + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLib libsqlite3 + fixPkgconfig +} + +LICENSE="SQLite" +COPYRIGHT="Public Domain" From 574085e273894f9bf9579d1b7908d5442205870b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 2 Oct 2013 09:00:55 +0200 Subject: [PATCH 519/587] Turn distcc into recipe format. * Not tested, a bug in haikuporter prevents from building it * the tests fail on haiku because a path is hardcoded to /usr/include in them. an upstream issue has been opened. --- sys-devel/distcc/distcc-3.1-1.build | 5 - sys-devel/distcc/distcc-3.1-1.install | 2 - sys-devel/distcc/distcc-3.1-1.patch | 100 ---------- sys-devel/distcc/distcc-3.1-1.test | 2 - sys-devel/distcc/distcc-3.1.recipe | 75 +++++++ sys-devel/distcc/patches/distcc-3.1.patchset | 197 +++++++++++++++++++ 6 files changed, 272 insertions(+), 109 deletions(-) delete mode 100644 sys-devel/distcc/distcc-3.1-1.build delete mode 100644 sys-devel/distcc/distcc-3.1-1.install delete mode 100644 sys-devel/distcc/distcc-3.1-1.patch delete mode 100644 sys-devel/distcc/distcc-3.1-1.test create mode 100644 sys-devel/distcc/distcc-3.1.recipe create mode 100644 sys-devel/distcc/patches/distcc-3.1.patchset diff --git a/sys-devel/distcc/distcc-3.1-1.build b/sys-devel/distcc/distcc-3.1-1.build deleted file mode 100644 index 0a84ee52d..000000000 --- a/sys-devel/distcc/distcc-3.1-1.build +++ /dev/null @@ -1,5 +0,0 @@ -cd distcc-3.1 -libtoolize --force --copy --install -./autogen.sh -./configure LDFLAGS=-L/boot/common/lib/python2.6/config --prefix=`finddir B_COMMON_DIRECTORY` -make diff --git a/sys-devel/distcc/distcc-3.1-1.install b/sys-devel/distcc/distcc-3.1-1.install deleted file mode 100644 index 4d4fb9d59..000000000 --- a/sys-devel/distcc/distcc-3.1-1.install +++ /dev/null @@ -1,2 +0,0 @@ -cd distcc-3.1 -make install diff --git a/sys-devel/distcc/distcc-3.1-1.patch b/sys-devel/distcc/distcc-3.1-1.patch deleted file mode 100644 index 465069fcf..000000000 --- a/sys-devel/distcc/distcc-3.1-1.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -Naur distcc-3.1/Makefile.in distcc-3.1-haiku/Makefile.in ---- distcc-3.1/Makefile.in 2008-12-02 21:50:31.066060288 +0000 -+++ distcc-3.1-haiku/Makefile.in 2011-05-21 01:10:21.995098624 +0000 -@@ -554,7 +554,7 @@ - - # The include-server is a python app, so we use Python's build system. We pass - # the distcc version, the source location, the CPP flags (for location of the --# includes), and the build location. -+# includes), LD flags and the build location. - include-server: - if test -z "$(INCLUDESERVER_PYTHON)"; then \ - echo "Not building $@: No suitable python found"; \ -@@ -564,6 +564,7 @@ - SRCDIR="$(srcdir)" \ - CFLAGS="$(CFLAGS) $(PYTHON_CFLAGS)" \ - CPPFLAGS="$(CPPFLAGS)" \ -+ LDFLAGS="$(LDFLAGS)" \ - $(INCLUDESERVER_PYTHON) "$(srcdir)/include_server/setup.py" \ - build \ - --build-base="$(include_server_builddir)" \ -diff -Naur distcc-3.1/configure.ac distcc-3.1-haiku/configure.ac ---- distcc-3.1/configure.ac 2008-12-02 21:50:31.066846720 +0000 -+++ distcc-3.1-haiku/configure.ac 2011-05-21 01:10:34.207618048 +0000 -@@ -329,9 +329,12 @@ - # only looks in /etc/hosts), so we only look for -lsocket if we need - # it. - AC_SEARCH_LIBS(gethostent, [nsl]) --AC_SEARCH_LIBS(setsockopt, [socket]) -+AC_SEARCH_LIBS(setsockopt, [socket network]) - AC_SEARCH_LIBS(hstrerror, [resolv]) - AC_SEARCH_LIBS(inet_aton, [resolv]) -+AC_SEARCH_LIBS(strsep, [bsd]) -+AC_SEARCH_LIBS(wait3, [bsd]) -+AC_SEARCH_LIBS(wait4, [bsd]) - - if test x"$with_included_popt" != x"yes" && test x"$with_included_popt" != xno - then -@@ -379,6 +382,7 @@ - AC_CHECK_FUNCS([getrusage strsignal gettimeofday]) - AC_CHECK_FUNCS([getaddrinfo getnameinfo inet_ntop inet_ntoa]) - AC_CHECK_FUNCS([strndup strsep mmap strlcpy]) -+AC_CHECK_FUNCS([nice]) - - AC_CHECK_FUNCS([getloadavg]) - -@@ -471,6 +475,8 @@ - AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [define if you have struct sockaddr_storage]),, - [#include ]) - -+AC_CHECK_MEMBERS([struct rusage.ru_minflt, struct rusage.ru_majflt]) -+ - AC_ARG_WITH(avahi, - AC_HELP_STRING([--without-avahi], [build without avahi])) - -diff -Naur distcc-3.1/src/daemon.c distcc-3.1-haiku/src/daemon.c ---- distcc-3.1/src/daemon.c 2008-12-02 21:50:25.053739520 +0000 -+++ distcc-3.1-haiku/src/daemon.c 2011-05-21 01:11:07.709361664 +0000 -@@ -172,15 +172,19 @@ - if ((ret = dcc_set_lifetime()) != 0) - dcc_exit(ret); - -+#ifdef HAVE_NICE - /* do this before giving away root */ - if (nice(opt_niceness) == -1) { - rs_log_warning("nice %d failed: %s", opt_niceness, - strerror(errno)); - /* continue anyhow */ - } -+#endif - -+#ifndef __HAIKU__ - if ((ret = dcc_discard_root()) != 0) - dcc_exit(ret); -+#endif - - /* Discard privileges before opening log so that if it's created, it has - * the right ownership. */ -diff -Naur distcc-3.1/src/exec.c distcc-3.1-haiku/src/exec.c ---- distcc-3.1/src/exec.c 2008-12-02 21:50:24.054263808 +0000 -+++ distcc-3.1-haiku/src/exec.c 2011-05-21 01:10:57.257687552 +0000 -@@ -488,12 +488,19 @@ - * critique_status(). */ - rs_trace("%s child %ld terminated with status %#x", - what, (long) ret_pid, *wait_status); -+#if defined HAVE_RUSAGE_RU_MINFLT && defined HAVE_RUSAGE_RU_MAJFLT - rs_log_info("%s times: user %ld.%06lds, system %ld.%06lds, " - "%ld minflt, %ld majflt", - what, - ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec, - ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec, - ru.ru_minflt, ru.ru_majflt); -+#else -+ rs_log_info("%s times: user %ld.%06lds, system %ld.%06lds", -+ what, -+ ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec, -+ ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec); -+#endif - - return 0; - } diff --git a/sys-devel/distcc/distcc-3.1-1.test b/sys-devel/distcc/distcc-3.1-1.test deleted file mode 100644 index 6bd69d58d..000000000 --- a/sys-devel/distcc/distcc-3.1-1.test +++ /dev/null @@ -1,2 +0,0 @@ -cd distcc-3.1 -make check diff --git a/sys-devel/distcc/distcc-3.1.recipe b/sys-devel/distcc/distcc-3.1.recipe new file mode 100644 index 000000000..7815c3934 --- /dev/null +++ b/sys-devel/distcc/distcc-3.1.recipe @@ -0,0 +1,75 @@ +SUMMARY="Distribute compilation of C code across several machines on a network" +HOMEPAGE="http://distcc.org/" +COPYRIGHT="Copyright (C) 2002, 2003, 2004 by Martin Pool + Portions Copyright 2005 Google Inc." +LICENSE="GNU GPL v2" +SRC_URI="http://distcc.googlecode.com/files/distcc-3.1.tar.bz2" +CHECKSUM_MD5="a1a9d3853df7133669fffec2a9aab9f3" +REVISION="1" +ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + distcc = $portVersion + cmd:distcc = $portVersion + cmd:distccd = $portVersion + cmd:distccmon_text = $portVersion + cmd:lsdistcc = $portVersion + cmd:pump =$portVersion + " +GLOBAL_WRITABLE_FILES=" + settings/default/distcc keep-old + settings/distcc/hosts keep-old + settings/distcc/clients.allow keep-old + settings/distcc/commands.allow.sh keep-old + " + +REQUIRES=" + haiku + lib:libpython2.6 + " + +# second part only for tests. Where to put that ? +BUILD_REQUIRES=" + devel:libpython2.6 + " +BUILD_PREREQUIRES=" + cmd:libtoolize + cmd:which + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:gdb + cmd:g++ + cmd:make + " + +PATCHES="distcc-3.1.patchset" + +BUILD() +{ + libtoolize --copy --force --install + ./autogen.sh + runConfigure ./configure \ + LDFLAGS=-L/boot/common/lib/python2.6/config + make $jobArgs +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check RESTRICTED_PATH=/sources/distcc-3.3:/boot/common/develop/tools/bin:/bin +} + +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 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/distcc/patches/distcc-3.1.patchset b/sys-devel/distcc/patches/distcc-3.1.patchset new file mode 100644 index 000000000..7c0ad6f32 --- /dev/null +++ b/sys-devel/distcc/patches/distcc-3.1.patchset @@ -0,0 +1,197 @@ +From 0bd21201f254f5d040d88af9a99198109899d2d8 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 30 Sep 2013 21:16:54 +0200 +Subject: Convert existing patch to git patchset. + + +diff --git a/Makefile.in b/Makefile.in +index 073482e..2759efa 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -554,7 +554,7 @@ distccmon-gnome@EXEEXT@: $(mon_obj) $(gnome_obj) + + # The include-server is a python app, so we use Python's build system. We pass + # the distcc version, the source location, the CPP flags (for location of the +-# includes), and the build location. ++# includes), LD flags and the build location. + include-server: + if test -z "$(INCLUDESERVER_PYTHON)"; then \ + echo "Not building $@: No suitable python found"; \ +@@ -564,6 +564,7 @@ include-server: + SRCDIR="$(srcdir)" \ + CFLAGS="$(CFLAGS) $(PYTHON_CFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" \ ++ LDFLAGS="$(LDFLAGS)" \ + $(INCLUDESERVER_PYTHON) "$(srcdir)/include_server/setup.py" \ + build \ + --build-base="$(include_server_builddir)" \ +diff --git a/configure.ac b/configure.ac +index 757dbe3..8456596 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -329,9 +329,12 @@ AC_CHECK_TYPES([in_port_t, in_addr_t], , , + # only looks in /etc/hosts), so we only look for -lsocket if we need + # it. + AC_SEARCH_LIBS(gethostent, [nsl]) +-AC_SEARCH_LIBS(setsockopt, [socket]) ++AC_SEARCH_LIBS(setsockopt, [socket network]) + AC_SEARCH_LIBS(hstrerror, [resolv]) + AC_SEARCH_LIBS(inet_aton, [resolv]) ++AC_SEARCH_LIBS(strsep, [bsd]) ++AC_SEARCH_LIBS(wait3, [bsd]) ++AC_SEARCH_LIBS(wait4, [bsd]) + + if test x"$with_included_popt" != x"yes" && test x"$with_included_popt" != xno + then +@@ -379,6 +382,7 @@ AC_CHECK_FUNCS([snprintf vsnprintf vasprintf asprintf getcwd getwd mkdtemp]) + AC_CHECK_FUNCS([getrusage strsignal gettimeofday]) + AC_CHECK_FUNCS([getaddrinfo getnameinfo inet_ntop inet_ntoa]) + AC_CHECK_FUNCS([strndup strsep mmap strlcpy]) ++AC_CHECK_FUNCS([nice]) + + AC_CHECK_FUNCS([getloadavg]) + +@@ -471,6 +475,8 @@ AC_CHECK_MEMBER([struct sockaddr_storage.ss_family], + AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [define if you have struct sockaddr_storage]),, + [#include ]) + ++AC_CHECK_MEMBERS([struct rusage.ru_minflt, struct rusage.ru_majflt]) ++ + AC_ARG_WITH(avahi, + AC_HELP_STRING([--without-avahi], [build without avahi])) + +diff --git a/src/daemon.c b/src/daemon.c +index 5b06971..cdfd452 100644 +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -172,15 +172,19 @@ int main(int argc, char *argv[]) + if ((ret = dcc_set_lifetime()) != 0) + dcc_exit(ret); + ++#ifdef HAVE_NICE + /* do this before giving away root */ + if (nice(opt_niceness) == -1) { + rs_log_warning("nice %d failed: %s", opt_niceness, + strerror(errno)); + /* continue anyhow */ + } ++#endif + ++#ifndef __HAIKU__ + if ((ret = dcc_discard_root()) != 0) + dcc_exit(ret); ++#endif + + /* Discard privileges before opening log so that if it's created, it has + * the right ownership. */ +diff --git a/src/exec.c b/src/exec.c +index 8d2df86..bd92d4f 100644 +--- a/src/exec.c ++++ b/src/exec.c +@@ -488,12 +488,19 @@ int dcc_collect_child(const char *what, pid_t pid, + * critique_status(). */ + rs_trace("%s child %ld terminated with status %#x", + what, (long) ret_pid, *wait_status); ++#if defined HAVE_RUSAGE_RU_MINFLT && defined HAVE_RUSAGE_RU_MAJFLT + rs_log_info("%s times: user %ld.%06lds, system %ld.%06lds, " + "%ld minflt, %ld majflt", + what, + ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec, + ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec, + ru.ru_minflt, ru.ru_majflt); ++#else ++ rs_log_info("%s times: user %ld.%06lds, system %ld.%06lds", ++ what, ++ ru.ru_utime.tv_sec, (long) ru.ru_utime.tv_usec, ++ ru.ru_stime.tv_sec, (long) ru.ru_stime.tv_usec); ++#endif + + return 0; + } +-- +1.8.3.4 + + +From c7121172e07205189fe1b10e49ab0256863ba1a2 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 1 Oct 2013 17:26:29 +0200 +Subject: C89 fixes for gcc2 compatibility + + +diff --git a/src/compile.c b/src/compile.c +index 2fc60b7..15bc8ad 100644 +--- a/src/compile.c ++++ b/src/compile.c +@@ -89,6 +89,8 @@ int dcc_discrepancy_filename(char **filename) + return 0; + } else if (str_endswith(include_server_port_suffix, + include_server_port)) { ++ int slash_pos; ++ + /* We're going to make a longer string from include_server_port: one + * that replaces include_server_port_suffix with discrepancy_suffix. */ + int delta = strlen(discrepancy_suffix) - +@@ -100,7 +102,7 @@ int dcc_discrepancy_filename(char **filename) + return EXIT_OUT_OF_MEMORY; + } + strcpy(*filename, include_server_port); +- int slash_pos = strlen(include_server_port) ++ slash_pos = strlen(include_server_port) + - strlen(include_server_port_suffix); + /* Because include_server_port_suffix is a suffix of include_server_port + * we expect to find a '/' at slash_pos in filename. */ +@@ -119,8 +121,9 @@ int dcc_discrepancy_filename(char **filename) + **/ + static int dcc_read_number_discrepancies(const char *discrepancy_filename) + { +- if (!discrepancy_filename) return 0; + struct stat stat_record; ++ ++ if (!discrepancy_filename) return 0; + if (stat(discrepancy_filename, &stat_record) == 0) { + size_t size = stat_record.st_size; + /* Does size fit in an 'int'? */ +diff --git a/src/emaillog.c b/src/emaillog.c +index fdb5e37..971e229 100644 +--- a/src/emaillog.c ++++ b/src/emaillog.c +@@ -107,12 +107,13 @@ int dcc_add_file_to_log_email(const char *description, + void dcc_maybe_send_email(void) { + int child_pid = 0; + const char *whom_to_blame; ++ char *will_send_message_to; ++ char *cant_send_message_to; ++ + if ((whom_to_blame = getenv("DISTCC_EMAILLOG_WHOM_TO_BLAME")) + == NULL) { + whom_to_blame = dcc_emaillog_whom_to_blame; + } +- char *will_send_message_to; +- char *cant_send_message_to; + + if (should_send_email == 0) return; + if (never_send_email) return; +diff --git a/src/lsdistcc.c b/src/lsdistcc.c +index 2cbca66..50f10c8 100644 +--- a/src/lsdistcc.c ++++ b/src/lsdistcc.c +@@ -920,6 +920,8 @@ int detect_distcc_servers(const char **argv, int argc, int opti, + const char *default_format = DEFAULT_FORMAT; + const char **sformat = &default_format; + const char *domain_name; ++ struct rlimit rlim = {0, 0}; ++ + if (opt_domain) { + if (dcc_get_dns_domain(&domain_name)) { + fprintf(stderr, "Can't get domain name\n"); +@@ -942,7 +944,6 @@ int detect_distcc_servers(const char **argv, int argc, int opti, + * We'll ideally use n + 2 fds in our poll loop, so ask for n + 10 + * fds total. + */ +- struct rlimit rlim = {0, 0}; + getrlimit(RLIMIT_NOFILE, &rlim); + if (rlim.rlim_cur < (rlim_t)n + 10) { + rlim.rlim_cur = (rlim_t)n + 10; +-- +1.8.3.4 + From 548c1faf891a5846420e9dd412270090f8fd0dea Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 2 Oct 2013 04:40:47 -0700 Subject: [PATCH 520/587] Initial .recipe files for libsdl2 and sdl2_ttf, not working yet, but libsdl2 builds --- media-libs/libsdl/libsdl-2.0.0.recipe | 28 ------- .../{libsdl => libsdl2}/libsdl-2.0_hg.recipe | 0 .../libsdl-2.0_hg_cmake.recipe | 0 media-libs/libsdl2/libsdl2-2.0.0.recipe | 82 +++++++++++++++++++ .../patches/libsdl-2.0.0.patch | 0 media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe | 47 +++++++++++ 6 files changed, 129 insertions(+), 28 deletions(-) delete mode 100644 media-libs/libsdl/libsdl-2.0.0.recipe rename media-libs/{libsdl => libsdl2}/libsdl-2.0_hg.recipe (100%) rename media-libs/{libsdl => libsdl2}/libsdl-2.0_hg_cmake.recipe (100%) create mode 100644 media-libs/libsdl2/libsdl2-2.0.0.recipe rename media-libs/{libsdl => libsdl2}/patches/libsdl-2.0.0.patch (100%) create mode 100644 media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe diff --git a/media-libs/libsdl/libsdl-2.0.0.recipe b/media-libs/libsdl/libsdl-2.0.0.recipe deleted file mode 100644 index 6f7de2ebd..000000000 --- a/media-libs/libsdl/libsdl-2.0.0.recipe +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org/" -SRC_URI="http://www.libsdl.org/release/SDL2-2.0.0.tar.gz" -CHECKSUM_MD5="beec89afb6edcc6f0abc4114f2e6bcf7" -REVISION="1" -STATUS_HAIKU="unstable" -DEPEND="pkgconfig >= 0.9.0" -BUILD { - cd SDL2-2.0.0 - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - DATADIR=`finddir B_COMMON_DATA_DIRECTORY` - mkdir build_haiku - cd build_haiku - ../configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - --datadir=$DATADIR \ - --enable-shared - make -} - -INSTALL { - cd SDL2-2.0.0/build_haiku - make install -} -LICENSE="Zlib" -COPYRIGHT="1997-2012 Sam Lantinga" diff --git a/media-libs/libsdl/libsdl-2.0_hg.recipe b/media-libs/libsdl2/libsdl-2.0_hg.recipe similarity index 100% rename from media-libs/libsdl/libsdl-2.0_hg.recipe rename to media-libs/libsdl2/libsdl-2.0_hg.recipe diff --git a/media-libs/libsdl/libsdl-2.0_hg_cmake.recipe b/media-libs/libsdl2/libsdl-2.0_hg_cmake.recipe similarity index 100% rename from media-libs/libsdl/libsdl-2.0_hg_cmake.recipe rename to media-libs/libsdl2/libsdl-2.0_hg_cmake.recipe diff --git a/media-libs/libsdl2/libsdl2-2.0.0.recipe b/media-libs/libsdl2/libsdl2-2.0.0.recipe new file mode 100644 index 000000000..1810acaa7 --- /dev/null +++ b/media-libs/libsdl2/libsdl2-2.0.0.recipe @@ -0,0 +1,82 @@ +SUMMARY="Simple Direct Media Layer 2.0" +DESCRIPTION="SDL 2.0" +HOMEPAGE="http://www.libsdl.org/" +SRC_URI="http://www.libsdl.org/release/SDL2-2.0.0.tar.gz" +CHECKSUM_MD5="beec89afb6edcc6f0abc4114f2e6bcf7" +REVISION="1" +LICENSE="Zlib" +COPYRIGHT="1997-2013 Sam Lantinga" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + lib:libsdl2 = $portVersion compat >= 2.0 + cmd:sdl2_config = $portVersion compat >= 2.0 + lib:libsdl2 = $portVersion compat >= 2.0 + lib:libSDL2 = $portVersion compat >= 2.0 + lib:libSDL2_2.0 = 0.0.0 compat >= 0.12 + " + +REQUIRES=" + haiku + lib:libGL + lib:libroot + lib:libbe + lib:libmedia + lib:libgame + lib:libdevice + lib:libtextencoding + " + +BUILD_REQUIRES=" + lib:libpng + lib:libjpeg + lib:libtiff + " + +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc + cmd:ld + " + +SOURCE_DIR="SDL2-$portVersion" + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + # devel package + prepareInstalledDevelLibs \ + libSDL2 \ + libSDL2main \ + libSDL2_test + + fixPkgconfig + + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------- +PROVIDES_devel=" + cmd:sdl2_config = $portVersion compat >= 2.0 + devel:libSDL2_2.0 = 0.0.0 compat >= 0 + devel:libSDL2 = 0.0.0 compat >= 0 + devel:libSDL2main = 0.12.0 compat >= 0 + devel:libSDL2_test = 0.0.0 compat >= 0 + " + +REQUIRES_devel=" + libsdl2 == $portVersion base + " + diff --git a/media-libs/libsdl/patches/libsdl-2.0.0.patch b/media-libs/libsdl2/patches/libsdl-2.0.0.patch similarity index 100% rename from media-libs/libsdl/patches/libsdl-2.0.0.patch rename to media-libs/libsdl2/patches/libsdl-2.0.0.patch diff --git a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe new file mode 100644 index 000000000..a8ded08ac --- /dev/null +++ b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe @@ -0,0 +1,47 @@ +SUMMARY="Simple Direct Media Layer Image Library" +DESCRIPTION="SDL" +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" +LICENSE="Zlib" +COPYRIGHT="1997-2013 Sam Lantinga" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + lib:SDL2_ttf + " + +REQUIRES=" + lib:libsdl2 + " + +BUILD_REQUIRES=" + cmd:autoconf + cmd:libtool + cmd:aclocal + cmd:make + cmd:gcc + " + +BUILD_PREREQUIRES=" + " + +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 +} + +INSTALL() +{ + make install +} From 0e43116c20c64c8b0dece5aaad190256e1cef470 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 2 Oct 2013 14:15:10 +0200 Subject: [PATCH 521/587] Update libxslt recipe so it works with newer haikuporter * Still missing _devel package extraction. --- dev-libs/libxslt/libxslt-1.1.28.recipe | 53 +++++++++++++++++++------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/dev-libs/libxslt/libxslt-1.1.28.recipe b/dev-libs/libxslt/libxslt-1.1.28.recipe index cd1fe0251..983a2cece 100644 --- a/dev-libs/libxslt/libxslt-1.1.28.recipe +++ b/dev-libs/libxslt/libxslt-1.1.28.recipe @@ -1,32 +1,57 @@ -DESCRIPTION="XSLT C library developed for the GNOME project" +SUMMARY="XSLT C library developed for the GNOME project" HOMEPAGE="http://www.xmlsoft.org/" +LICENSE="MIT" +COPYRIGHT="2001-2002 Daniel Veillard. All Rights Reserved." SRC_URI="ftp://xmlsoft.org/libxml2/libxslt-1.1.28.tar.gz" CHECKSUM_MD5="9667bf6f9310b957254fdcf6596600b7" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="?x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libxslt$secondaryArchSuffix = $portVersion + lib:libxslt$secondaryArchSuffix = $portVersion + " + +BUILD_REQUIRES=" + devel:libxml2$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:automake + cmd:libtoolize + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:sed + " + BUILD() { - cd libxslt-1.1.28 libtoolize --force --copy --install aclocal autoconf - sed -i 's/$(datadir)\/aclocal/`finddir B_COMMON_DATA_DIRECTORY`\/aclocal/' Makefile* automake - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=$COMMON_DOCS \ - --docdir=$COMMON_DOCS/doc \ - --mandir=$COMMON_DOCS/man - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd libxslt-1.1.28 make install + + prepareInstalledDevelLibs libxslt + fixPkgconfig } -LICENSE="MIT" -COPYRIGHT="2001-2002 Daniel Veillard. All Rights Reserved." +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. + " From 3166a9f6733f145b685ca45efb29086f45be8804 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 2 Oct 2013 18:54:13 +0200 Subject: [PATCH 522/587] Convert unrar recipe to new format. --- ...unrar-4.2.4.patch => unrar-4.2.4.patchset} | 126 ++++++++++-------- app-arch/unrar/unrar-4.2.4.recipe | 27 +++- 2 files changed, 94 insertions(+), 59 deletions(-) rename app-arch/unrar/patches/{unrar-4.2.4.patch => unrar-4.2.4.patchset} (67%) diff --git a/app-arch/unrar/patches/unrar-4.2.4.patch b/app-arch/unrar/patches/unrar-4.2.4.patchset similarity index 67% rename from app-arch/unrar/patches/unrar-4.2.4.patch rename to app-arch/unrar/patches/unrar-4.2.4.patchset index bd12da35b..f2e6779cf 100644 --- a/app-arch/unrar/patches/unrar-4.2.4.patch +++ b/app-arch/unrar/patches/unrar-4.2.4.patchset @@ -1,7 +1,14 @@ -diff -aur unrar/arcread.cpp unrar.4.2.4.haiku/arcread.cpp ---- unrar/arcread.cpp 2012-06-09 15:21:04.066584576 +0200 -+++ unrar.4.2.4.haiku/arcread.cpp 2013-01-17 21:57:19.749207552 +0100 -@@ -666,7 +666,7 @@ +From 8f6a22fb6cb4dcaf80049a7c82973251ffd07f80 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Wed, 2 Oct 2013 18:45:05 +0200 +Subject: Convert existing patch to patchset format. + + +diff --git a/arcread.cpp b/arcread.cpp +index a524a96..19cca29 100644 +--- a/arcread.cpp ++++ b/arcread.cpp +@@ -666,7 +666,7 @@ void Archive::ConvertUnknownHeader() { if (*s=='/' || *s=='\\') *s=CPATHDIVIDER; @@ -10,10 +17,11 @@ diff -aur unrar/arcread.cpp unrar.4.2.4.haiku/arcread.cpp if ((byte)*s<32 || (byte)*s>127) *s='_'; #endif -diff -aur unrar/consio.cpp unrar.4.2.4.haiku/consio.cpp ---- unrar/consio.cpp 2012-06-09 15:21:04.000524288 +0200 -+++ unrar.4.2.4.haiku/consio.cpp 2013-01-21 22:23:37.662437888 +0100 -@@ -141,7 +141,7 @@ +diff --git a/consio.cpp b/consio.cpp +index 42b72a6..90d22c9 100644 +--- a/consio.cpp ++++ b/consio.cpp +@@ -141,7 +141,7 @@ void GetPasswordText(wchar *Str,uint MaxLength) SetConsoleMode(hConOut,ConOutMode); #else char StrA[MAXPASSWORD]; @@ -22,10 +30,11 @@ diff -aur unrar/consio.cpp unrar.4.2.4.haiku/consio.cpp fgets(StrA,ASIZE(StrA)-1,stdin); #else strncpyz(StrA,getpass(""),ASIZE(StrA)); -diff -aur unrar/extract.cpp unrar.4.2.4.haiku/extract.cpp ---- unrar/extract.cpp 2012-06-09 15:21:04.002097152 +0200 -+++ unrar.4.2.4.haiku/extract.cpp 2013-01-17 21:42:21.914620416 +0100 -@@ -311,7 +311,7 @@ +diff --git a/extract.cpp b/extract.cpp +index ddd71a0..adccadf 100644 +--- a/extract.cpp ++++ b/extract.cpp +@@ -311,7 +311,7 @@ bool CmdExtract::ExtractCurrentFile(CommandData *Cmd,Archive &Arc,size_t HeaderS bool WideName=false; #endif @@ -34,10 +43,11 @@ diff -aur unrar/extract.cpp unrar.4.2.4.haiku/extract.cpp if (WideName) { // Prepare UTF-8 name for OS X. Since we are sure that destination -diff -aur unrar/file.cpp unrar.4.2.4.haiku/file.cpp ---- unrar/file.cpp 2012-06-09 15:21:04.002621440 +0200 -+++ unrar.4.2.4.haiku/file.cpp 2013-01-21 22:12:02.543162368 +0100 -@@ -304,6 +304,8 @@ +diff --git a/file.cpp b/file.cpp +index dcf4e61..7a26155 100644 +--- a/file.cpp ++++ b/file.cpp +@@ -304,6 +304,8 @@ void File::Write(const void *Data,size_t Size) hFile=stderr; #endif break; @@ -46,10 +56,11 @@ diff -aur unrar/file.cpp unrar.4.2.4.haiku/file.cpp } #endif while (1) -diff -aur unrar/find.cpp unrar.4.2.4.haiku/find.cpp ---- unrar/find.cpp 2012-06-09 15:21:04.003145728 +0200 -+++ unrar.4.2.4.haiku/find.cpp 2013-01-17 21:43:25.860618752 +0100 -@@ -104,7 +104,7 @@ +diff --git a/find.cpp b/find.cpp +index 7ba14c0..0f7c3c0 100644 +--- a/find.cpp ++++ b/find.cpp +@@ -104,7 +104,7 @@ bool FindFile::Next(struct FindData *fd,bool GetSymLink) } } *fd->NameW=0; @@ -58,7 +69,7 @@ diff -aur unrar/find.cpp unrar.4.2.4.haiku/find.cpp if (!LowAscii(fd->Name)) UtfToWide(fd->Name,fd->NameW,sizeof(fd->NameW)); #elif defined(UNICODE_SUPPORTED) -@@ -170,7 +170,7 @@ +@@ -170,7 +170,7 @@ bool FindFile::FastFind(const char *FindMask,const wchar *FindMaskW,FindData *fd strcpy(fd->Name,FindMask); *fd->NameW=0; @@ -67,10 +78,11 @@ diff -aur unrar/find.cpp unrar.4.2.4.haiku/find.cpp if (!LowAscii(fd->Name)) UtfToWide(fd->Name,fd->NameW,sizeof(fd->NameW)); #elif defined(UNICODE_SUPPORTED) -diff -aur unrar/makefile.unix unrar.4.2.4.haiku/makefile.unix ---- unrar/makefile.unix 2012-05-15 07:31:03.004980736 +0200 -+++ unrar.4.2.4.haiku/makefile.unix 2013-01-21 22:17:15.800325632 +0100 -@@ -7,7 +7,11 @@ +diff --git a/makefile.unix b/makefile.unix +index bd06092..b5e3815 100644 +--- a/makefile.unix ++++ b/makefile.unix +@@ -7,7 +7,11 @@ CXXFLAGS=-O2 LIBFLAGS=-fPIC DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE STRIP=strip @@ -83,7 +95,7 @@ diff -aur unrar/makefile.unix unrar.4.2.4.haiku/makefile.unix # Linux using LCC #CXX=lcc -@@ -114,12 +118,14 @@ +@@ -114,12 +118,14 @@ install: install-unrar uninstall: uninstall-unrar clean: @@ -100,7 +112,7 @@ diff -aur unrar/makefile.unix unrar.4.2.4.haiku/makefile.unix sfx: WHAT=SFX_MODULE sfx: clean $(OBJECTS) -@@ -144,3 +150,29 @@ +@@ -144,3 +150,29 @@ install-lib: uninstall-lib: rm -f $(DESTDIR)/lib/libunrar.so @@ -130,9 +142,10 @@ diff -aur unrar/makefile.unix unrar.4.2.4.haiku/makefile.unix + echo "URL: http://www.rarlab.com/" >> $(DESCRIPTION) + cd dist && zip -9 -r -z -y $(PACKAGE_NAME).zip common $(COMMENT) < $(COMMENT) + -diff -aur unrar/os.hpp unrar.4.2.4.haiku/os.hpp ---- unrar/os.hpp 2012-06-09 15:21:04.005767168 +0200 -+++ unrar.4.2.4.haiku/os.hpp 2013-01-21 22:25:04.170655744 +0100 +diff --git a/os.hpp b/os.hpp +index 21488a8..ae2d0be 100644 +--- a/os.hpp ++++ b/os.hpp @@ -134,8 +134,9 @@ #define NM 1024 @@ -162,9 +175,10 @@ diff -aur unrar/os.hpp unrar.4.2.4.haiku/os.hpp #if defined(__sparc) || defined(sparc) || defined(__hpux) #ifndef BIG_ENDIAN #define BIG_ENDIAN -diff -aur unrar/raros.hpp unrar.4.2.4.haiku/raros.hpp ---- unrar/raros.hpp 2012-06-09 15:21:04.006553600 +0200 -+++ unrar.4.2.4.haiku/raros.hpp 2013-01-16 19:50:06.066060288 +0100 +diff --git a/raros.hpp b/raros.hpp +index ce853bd..b63d0f0 100644 +--- a/raros.hpp ++++ b/raros.hpp @@ -29,7 +29,7 @@ #endif #endif @@ -174,10 +188,11 @@ diff -aur unrar/raros.hpp unrar.4.2.4.haiku/raros.hpp #define _UNIX #define _BEOS #endif -diff -aur unrar/rartypes.hpp unrar.4.2.4.haiku/rartypes.hpp ---- unrar/rartypes.hpp 2012-06-09 15:21:04.006815744 +0200 -+++ unrar.4.2.4.haiku/rartypes.hpp 2013-01-19 23:12:46.715653120 +0100 -@@ -7,6 +7,7 @@ +diff --git a/rartypes.hpp b/rartypes.hpp +index a2d8b44..d8249b1 100644 +--- a/rartypes.hpp ++++ b/rartypes.hpp +@@ -7,6 +7,7 @@ typedef unsigned int uint; // 32 bits or more #define PRESENT_INT32 // undefine if signed 32 bits is not available @@ -185,7 +200,7 @@ diff -aur unrar/rartypes.hpp unrar.4.2.4.haiku/rartypes.hpp typedef unsigned int uint32; // 32 bits exactly typedef signed int int32; // signed 32 bits exactly -@@ -20,6 +21,7 @@ +@@ -20,6 +21,7 @@ typedef signed __int64 int64; // signed 64 bits typedef unsigned long long uint64; // unsigned 64 bits typedef signed long long int64; // signed 64 bits #endif @@ -193,10 +208,11 @@ diff -aur unrar/rartypes.hpp unrar.4.2.4.haiku/rartypes.hpp #if defined(_WIN_ALL) || defined(__GNUC__) || defined(__sgi) || defined(_AIX) || defined(__sun) || defined(__hpux) || defined(_OSF_SOURCE) -diff -aur unrar/rarvm.cpp unrar.4.2.4.haiku/rarvm.cpp ---- unrar/rarvm.cpp 2012-06-09 15:21:04.007077888 +0200 -+++ unrar.4.2.4.haiku/rarvm.cpp 2013-01-21 22:12:02.605814784 +0100 -@@ -792,6 +792,8 @@ +diff --git a/rarvm.cpp b/rarvm.cpp +index 8b85800..1f06581 100644 +--- a/rarvm.cpp ++++ b/rarvm.cpp +@@ -792,6 +792,8 @@ void RarVM::Optimize(VM_PreparedProgram *Prg) case VM_CMP: Cmd->OpCode=Cmd->ByteMode ? VM_CMPB:VM_CMPD; continue; @@ -205,7 +221,7 @@ diff -aur unrar/rarvm.cpp unrar.4.2.4.haiku/rarvm.cpp } if ((VM_CmdFlags[Cmd->OpCode] & VMCF_CHFLAGS)==0) continue; -@@ -835,6 +837,8 @@ +@@ -835,6 +837,8 @@ void RarVM::Optimize(VM_PreparedProgram *Prg) case VM_NEG: Cmd->OpCode=Cmd->ByteMode ? VM_NEGB:VM_NEGD; continue; @@ -214,7 +230,7 @@ diff -aur unrar/rarvm.cpp unrar.4.2.4.haiku/rarvm.cpp } } } -@@ -1102,6 +1106,8 @@ +@@ -1102,6 +1106,8 @@ void RarVM::ExecuteStandardFilter(VM_StandardFilters FilterType) SET_VALUE(false,&Mem[VM_GLOBALMEMADDR+0x20],DataSize); } break; @@ -223,10 +239,11 @@ diff -aur unrar/rarvm.cpp unrar.4.2.4.haiku/rarvm.cpp } } -diff -aur unrar/unicode.cpp unrar.4.2.4.haiku/unicode.cpp ---- unrar/unicode.cpp 2012-06-09 15:21:04.010747904 +0200 -+++ unrar.4.2.4.haiku/unicode.cpp 2013-01-17 21:41:15.856686592 +0100 -@@ -13,7 +13,7 @@ +diff --git a/unicode.cpp b/unicode.cpp +index a3022d2..3e29127 100644 +--- a/unicode.cpp ++++ b/unicode.cpp +@@ -13,7 +13,7 @@ bool WideToChar(const wchar *Src,char *Dest,size_t DestSize) if (WideCharToMultiByte(CP_ACP,0,Src,-1,Dest,(int)DestSize,NULL,NULL)==0) RetCode=false; @@ -235,7 +252,7 @@ diff -aur unrar/unicode.cpp unrar.4.2.4.haiku/unicode.cpp WideToUtf(Src,Dest,DestSize); #elif defined(MBFUNCTIONS) -@@ -73,7 +73,7 @@ +@@ -73,7 +73,7 @@ bool CharToWide(const char *Src,wchar *Dest,size_t DestSize) if (MultiByteToWideChar(CP_ACP,0,Src,-1,Dest,(int)DestSize)==0) RetCode=false; @@ -244,9 +261,11 @@ diff -aur unrar/unicode.cpp unrar.4.2.4.haiku/unicode.cpp UtfToWide(Src,Dest,DestSize); #elif defined(MBFUNCTIONS) -diff -aur unrar/unrar.rdef unrar.4.2.4.haiku/unrar.rdef ---- unrar/unrar.rdef 1970-01-01 01:00:00.000000000 +0100 -+++ unrar.4.2.4.haiku/unrar.rdef 2013-01-16 20:43:32.898629632 +0100 +diff --git a/unrar.rdef b/unrar.rdef +new file mode 100644 +index 0000000..ab085d2 +--- /dev/null ++++ b/unrar.rdef @@ -0,0 +1,13 @@ + +resource app_signature "application/x-vnd.Roshal-UnRAR"; @@ -261,3 +280,6 @@ diff -aur unrar/unrar.rdef unrar.4.2.4.haiku/unrar.rdef + short_info = "4.2.4", + long_info = "4.2.4 Alexander Roshal" +}; +-- +1.8.3.4 + diff --git a/app-arch/unrar/unrar-4.2.4.recipe b/app-arch/unrar/unrar-4.2.4.recipe index 0fecb8745..661ff0454 100644 --- a/app-arch/unrar/unrar-4.2.4.recipe +++ b/app-arch/unrar/unrar-4.2.4.recipe @@ -1,21 +1,34 @@ -DESCRIPTION="unrar" +SUMMARY="Uncompress rar files" HOMEPAGE="http://www.rarlab.com/" SRC_URI="http://www.rarlab.com/rar/unrarsrc-4.2.4.tar.gz" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="x86_gcc2 x86" CHECKSUM_MD5="8ea9d1b4139474b282d76e627a2de3e4" + +PROVIDES=" + unrar = $portVersion + cmd:unrar = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:make + cmd:g++ + " + +SOURCE_DIR="unrar" BUILD() { - cd unrar - make -f makefile.unix DESTDIR=`finddir B_COMMON_DIRECTORY` + LDFLAGS=-lbsd make -f makefile.unix DESTDIR=$prefix } INSTALL() { - cd unrar - make -f makefile.unix DESTDIR=`finddir B_COMMON_DIRECTORY` install + make -f makefile.unix DESTDIR=$prefix install } LICENSE="UnRAR" COPYRIGHT="Alexander Roshal" +DESCRIPTION="Uncompress rar files" From d7f7105b2a6dc4df3b1fffd2a9fb02ed88fd2208 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 2 Oct 2013 21:09:04 +0200 Subject: [PATCH 523/587] Fix the recipes for SDL, SDL-image and SDL-ttf * sdl-config return the right path for --lib * fix dependencies, provides, and more policy warnings. --- media-libs/libsdl/libsdl-1.2.15.recipe | 6 +-- media-libs/sdl_image/sdl_image-1.2.12.recipe | 8 ++- media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe | 55 +++++++++++++++----- 3 files changed, 51 insertions(+), 18 deletions(-) diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index 9f8c5ea79..befa1a03d 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -11,7 +11,6 @@ ARCHITECTURES="x86 x86_gcc2" PROVIDES=" libsdl = $portVersion compat >= 1.2 - cmd:sdl_config = portVersion compat >= 1.2 lib:libsdl = $portVersion compat >= 1.2 lib:libSDL = $portVersion compat >= 1.2 lib:libSDL_1.2 = 0.11.4 compat >= 0.11 @@ -58,13 +57,14 @@ INSTALL() # devel package prepareInstalledDevelLibs \ - libSDL \ + libSDL libSDL-1.2 \ libSDLmain fixPkgconfig + fixDevelopLibDirReferences $binDir/sdl-config packageEntries devel \ - $developDir + $developDir $binDir/sdl-config } TEST() 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 ffb93cc00..766d0d14a 100644 --- a/media-libs/sdl_image/sdl_image-1.2.12.recipe +++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe @@ -10,12 +10,15 @@ COPYRIGHT="1997-2012 Sam Lantinga" ARCHITECTURES="x86 x86_gcc2" PROVIDES=" - lib:sdl_image = $portVersion compat >= 1.2 + sdl_image =$portVersion + lib:libSDL_image_1.2 = $portVersion compat >= 1.2 + devel:libSDL_image = $portVersion compat >= 1.2 " REQUIRES=" haiku libsdl + lib:libjpeg " BUILD_REQUIRES=" @@ -56,4 +59,7 @@ BUILD() INSTALL() { make install + + fixPkgconfig + prepareInstalledDevelLib libSDL_image } 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 8e2d5fb59..103b3fa53 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -1,33 +1,60 @@ -DESCRIPTION="Simple Direct Media Layer Image Library" -HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf" +SUMMARY="Simple Direct Media Layer Image Library" +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" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libsdl >= 1.2.12 - dev-util/pkgconfig >= 0.9" +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + sdl_ttf = $portVersion + lib:libSDL_ttf = $portVersion + devel:libSDL_ttf + lib:libSDL_ttf_2.0 = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + libsdl >= 1.2.12 + lib:libfreetype + lib:libz + " + +BUILD_PREREQUIRES=" + cmd:libtoolize + cmd:aclocal + cmd:automake + cmd:autoconf + cmd:gcc + cmd:sdl_config + cmd:make +" + +SOURCE_DIR="SDL_ttf-$portVersion" BUILD() { - cd SDL_ttf-2.0.11 rm -f acinclude.m4 libtoolize --copy --force --install aclocal --install -I acinclude - echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR + runConfigure ./configure make } INSTALL() { - cd SDL_ttf-2.0.11 make install + + fixPkgconfig + prepareInstalledDevelLib libSDL_ttf } LICENSE="Zlib" COPYRIGHT="1997-2012 Sam Lantinga" - +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. + " From bdf9b9767575c5b173aed9d79e3cb77b640fa62f Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 2 Oct 2013 08:48:10 -0700 Subject: [PATCH 524/587] Renamed libsdl2 patch so that it matches and gets used. --- media-libs/libsdl2/libsdl2-2.0.0.recipe | 6 ++++-- .../patches/{libsdl-2.0.0.patch => libsdl2-2.0.0.patch} | 0 2 files changed, 4 insertions(+), 2 deletions(-) rename media-libs/libsdl2/patches/{libsdl-2.0.0.patch => libsdl2-2.0.0.patch} (100%) diff --git a/media-libs/libsdl2/libsdl2-2.0.0.recipe b/media-libs/libsdl2/libsdl2-2.0.0.recipe index 1810acaa7..3846f145c 100644 --- a/media-libs/libsdl2/libsdl2-2.0.0.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.0.recipe @@ -1,5 +1,5 @@ SUMMARY="Simple Direct Media Layer 2.0" -DESCRIPTION="SDL 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." HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL2-2.0.0.tar.gz" CHECKSUM_MD5="beec89afb6edcc6f0abc4114f2e6bcf7" @@ -45,6 +45,8 @@ BUILD_PREREQUIRES=" SOURCE_DIR="SDL2-$portVersion" +PATCHES="libsdl2-2.0.0.patch" + BUILD() { runConfigure ./configure @@ -60,7 +62,7 @@ INSTALL() libSDL2 \ libSDL2main \ libSDL2_test - + fixPkgconfig packageEntries devel \ diff --git a/media-libs/libsdl2/patches/libsdl-2.0.0.patch b/media-libs/libsdl2/patches/libsdl2-2.0.0.patch similarity index 100% rename from media-libs/libsdl2/patches/libsdl-2.0.0.patch rename to media-libs/libsdl2/patches/libsdl2-2.0.0.patch From 260d1dd74dc4c5268571f1014d420e8cbb3f7f17 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 2 Oct 2013 13:16:22 -0700 Subject: [PATCH 525/587] Added missing $ --- media-libs/libsdl/libsdl-1.2.15.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index befa1a03d..a11346b8f 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -141,7 +141,7 @@ TEST() # ----- devel package ------------------------ PROVIDES_devel=" - cmd:sdl_config = portVersion compat >= 1.2 + cmd:sdl_config = $portVersion compat >= 1.2 devel:libSDL_1.2 = 0.11.4 compat >= 0.11 devel:libSDL = 0.11.4 compat >= 0.11 devel:libSDLmain = 0.11.4 compat >= 0.11 From 1de22da1c61ced034462d9f61938f2f0040ecdf1 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 2 Oct 2013 22:52:43 +0200 Subject: [PATCH 526/587] Fix libdsk recipe. --- app-emulation/libdsk/libdsk-1.3.3.recipe | 61 +++++++++++++++++++----- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/app-emulation/libdsk/libdsk-1.3.3.recipe b/app-emulation/libdsk/libdsk-1.3.3.recipe index 7ff988b9b..849cc6970 100644 --- a/app-emulation/libdsk/libdsk-1.3.3.recipe +++ b/app-emulation/libdsk/libdsk-1.3.3.recipe @@ -1,30 +1,65 @@ -DESCRIPTION="LibDSK is a library for manipulating disk image files" +SUMMARY="LibDSK is a library for manipulating disk image files" HOMEPAGE="http://www.seasip.demon.co.uk/Unix/LibDsk/" SRC_URI="http://www.seasip.info/Unix/LibDsk/libdsk-1.3.3.tar.gz" REVISION="1" -STATUS_HAIKU="untested" -DEPEND="" -#CHECKSUM_MD5="" +ARCHITECTURES="x86 x86_gcc2" +CHECKSUM_MD5="2cce41b4b1325d697183e34afcae2a9c" + +PROVIDES=" + libdsk = $portVersion + lib:libdsk = $portVersion + devel:libdsk + cmd:apriboot + cmd:dskdump + cmd:dskform + cmd:dskid + cmd:dskscan + cmd:dsktrans + cmd:dskutil + cmd:md3serial + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libz + " + +BUILD_PREREQUIRES=" + cmd:libtoolize + cmd:autoconf + cmd:make + cmd:gcc + " BUILD() { - cd libdsk-1.3.3 # Need to update the libtools in the package to build shared libraries - libtoolize - # We need a makefile to run make distclean... - ./configure --prefix=/boot/common - # Make sure autotools know about the updated libtools... - make distclean - # ... and run configure again - ./configure --prefix=/boot/common + libtoolize --install --copy --force + autoconf + runConfigure ./configure make } INSTALL() { - cd libdsk-1.3.3 make install + + prepareInstalledDevelLib libdsk } 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. + " From c1ed31ee9c24da1ec6254d62154888cee923fc02 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 2 Oct 2013 22:54:04 +0200 Subject: [PATCH 527/587] Fix search pathes for CMake 2.8.11.2. * This is only tested on gcc2 hybrids, help welcome testing it on other archs. --- .../cmake/patches/cmake-2.8.11.2.patchset | 59 ++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/dev-util/cmake/patches/cmake-2.8.11.2.patchset b/dev-util/cmake/patches/cmake-2.8.11.2.patchset index 4c04451fc..a79df203d 100644 --- a/dev-util/cmake/patches/cmake-2.8.11.2.patchset +++ b/dev-util/cmake/patches/cmake-2.8.11.2.patchset @@ -1,4 +1,4 @@ -From 9e15fe26a3a573bbe68face114d682b98a45c875 Mon Sep 17 00:00:00 2001 +From 7832e4b405ad774c3dae10607707745677723f66 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 1 Oct 2013 10:36:36 +0200 Subject: Convert existing patch to patchset format. @@ -256,3 +256,60 @@ index 6eb52d1..7a3b6fd 100644 -- 1.8.3.4 + +From 305991d869191c373398acc9605d29a92bf2b069 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Wed, 2 Oct 2013 15:22:57 +0200 +Subject: Fix include and lib search pathes + + * For gcc2, look in the legacy (no arch) direcotry. + * For gcc4, look inthe the platform dir (currently hardcoded to x86) + * This was tested only on gcc2hybrid. I'm not sure it matches other +platforms. + +diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake +index 3236b58..dfb3526 100644 +--- a/Modules/Platform/Haiku.cmake ++++ b/Modules/Platform/Haiku.cmake +@@ -10,18 +10,33 @@ set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") + set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") + set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") + ++# FIXME need to detect if we are on gcc4 or gcc4hybrid, the path are different ++if(CMAKE_C_COMPILER_VERSION VERSION_LESS 3.0.0) ++ # Use gcc2 libs ++ set(__HAIKU_LIBDIR_SUFFIX "") ++else() ++ # Use gcc4 libs ++ set(__HAIKU_LIBDIR_SUFFIX "/x86") ++endif() ++ + list(APPEND CMAKE_SYSTEM_PREFIX_PATH + /boot/common/non-packaged + /boot/common + /boot/system + ) + list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES +- /boot/common/non-packaged/lib +- /boot/common/lib +- /boot/develop/lib/x86 ++ /boot/common/non-packaged/lib${__HAIKU_LIBDIR_SUFFIX} ++ /boot/common/develop/lib${__HAIKU_LIBDIR_SUFFIX} ++ /boot/system/develop/lib${__HAIKU_LIBDIR_SUFFIX} ++ ) ++list(APPEND CMAKE_SYSTEM_INCLUDE_PATH ++ /boot/common/develop/headers${__HAIKU_LIBDIR_SUFFIX} ++ /boot/system/develop/headers${__HAIKU_LIBDIR_SUFFIX} ++ ) ++list(APPEND CMAKE_SYSTEM_LIBRARY_PATH ++ /boot/common/develop/lib${__HAIKU_LIBDIR_SUFFIX} ++ /boot/system/develop/lib${__HAIKU_LIBDIR_SUFFIX} + ) +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) + + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH +-- +1.8.3.4 + From 60b97d2276122b384336c5480127cb4147dc27cc Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 2 Oct 2013 23:02:57 +0000 Subject: [PATCH 528/587] mesa: Add new Mesa-9.3 package * For now, we're using git as 9.3 is unreleased. * Long term, 9.3 should contain the code containing the Haiku OpenGL kit. * For now, it's pointed at my personal repo. This will be adjusted once the basics are in upstream Mesa. --- sys-libs/mesa/mesa-9.3.recipe | 83 +++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 sys-libs/mesa/mesa-9.3.recipe diff --git a/sys-libs/mesa/mesa-9.3.recipe b/sys-libs/mesa/mesa-9.3.recipe new file mode 100644 index 000000000..8778be96a --- /dev/null +++ b/sys-libs/mesa/mesa-9.3.recipe @@ -0,0 +1,83 @@ +SUMMARY="Multi-platform GL implementation" +DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics. + +Mesa fills the role of the Haiku OpenGL kit. +" + +HOMEPAGE="http://www.mesa3d.org/" +COPYRIGHT="1999-2013 Brian Paul All Rights Reserved." +LICENSE="MIT" +# We use kallisti5's personal github repo for now, +# this will become the official mesa repo in time +SRC_URI="git://github.com/kallisti5/mesa.git" +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=" + mesa$secondaryArchSuffix = $portVersion compat >= 9.3 + lib:libGL$secondaryArchSuffix = $portVersion compat >= 9.3 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + libxml2_python + cmd:bison + cmd:find + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:scons + cmd:sed + " + #cmd:llvm-config + +SOURCE_DIR="Mesa-$portVersion" + +BUILD() +{ + if [ -n "$secondaryArchSuffix" ]; then + export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture" + fi + scons $jobArgs build=release +} + +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 + + # devel package + packageEntries devel \ + $developDir + # swpipe renderer package + #packageEntries swpipe \ + # $addOnsDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + mesa${secondaryArchSuffix}_devel = $portVersion + " + +REQUIRES_devel=" + mesa$secondaryArchSuffix == $portVersion base + " From 6419a8dc1df2a22987627024edb3b74dbb55866c Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 3 Oct 2013 03:23:21 +0000 Subject: [PATCH 529/587] mesa: Add softpipe add-on package * mesa_swpipe package depends on mesa --- sys-libs/mesa/mesa-9.3.recipe | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/sys-libs/mesa/mesa-9.3.recipe b/sys-libs/mesa/mesa-9.3.recipe index 8778be96a..217e9d151 100644 --- a/sys-libs/mesa/mesa-9.3.recipe +++ b/sys-libs/mesa/mesa-9.3.recipe @@ -64,12 +64,16 @@ INSTALL() mkdir -p $libDir cp $(find $mesaBuildDir -name 'libGL.so') $libDir + # Our rendering add-ons + mkdir -p $addOnsDir/opengl + cp $(find $mesaBuildDir -name 'libswpipe.so') $addOnsDir/opengl/Softpipe + # devel package packageEntries devel \ $developDir # swpipe renderer package - #packageEntries swpipe \ - # $addOnsDir + packageEntries swpipe \ + $addOnsDir } # ----- devel package ------------------------------------------------------- @@ -81,3 +85,13 @@ PROVIDES_devel=" REQUIRES_devel=" mesa$secondaryArchSuffix == $portVersion base " + +# ----- swpipe package ------------------------------------------------------- + +PROVIDES_swpipe=" + mesa${secondaryArchSuffix}_swpipe = $portVersion + " + +REQUIRED_swpipe=" + mesa$secondaryArchSuffix == $portVersion base + " From 2a68df098603f34bdc645702f11ec60bf91f7b1a Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 3 Oct 2013 09:31:22 +0200 Subject: [PATCH 530/587] Merge work on CMake 2.8.5 to 2.8.11 * The testsuite does not deadlock anymore * However, we only get 49% passing tests. Still some workto do there. --- dev-util/cmake/cmake-2.8.11.2.recipe | 13 +- .../cmake/patches/cmake-2.8.11.2.patchset | 270 ++++++++++++++++++ 2 files changed, 279 insertions(+), 4 deletions(-) diff --git a/dev-util/cmake/cmake-2.8.11.2.recipe b/dev-util/cmake/cmake-2.8.11.2.recipe index fac218e1c..26ecd2641 100644 --- a/dev-util/cmake/cmake-2.8.11.2.recipe +++ b/dev-util/cmake/cmake-2.8.11.2.recipe @@ -11,23 +11,24 @@ COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved." SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz" CHECKSUM_MD5="6f5d7b8e7534a5d9e1a7664ba63cf882" REVISION="1" -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" PROVIDES=" cmake = $portVersion compat >= 2.8 cmd:cmake = $portVersion compat >= 2.8 + cmd:ccmake = $portVersion compat >= 2.8 cmd:cpack = $portVersion compat >= 2.8 cmd:ctest = $portVersion compat >= 2.8 " REQUIRES=" haiku >= $haikuVersion + lib:libncurses " BUILD_REQUIRES=" - lib:libncurses + devel:libncurses " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion - ncurses_devel cmd:gcc cmd:grep cmd:ld @@ -49,10 +50,14 @@ BUILD() INSTALL() { make install + + # No way to tell this to configure... + mv $prefix/share/aclocal $dataDir + rmdir $prefix/share } TEST() { - make test + make test VERBOSE=1 } diff --git a/dev-util/cmake/patches/cmake-2.8.11.2.patchset b/dev-util/cmake/patches/cmake-2.8.11.2.patchset index a79df203d..7998b985a 100644 --- a/dev-util/cmake/patches/cmake-2.8.11.2.patchset +++ b/dev-util/cmake/patches/cmake-2.8.11.2.patchset @@ -313,3 +313,273 @@ index 3236b58..dfb3526 100644 -- 1.8.3.4 + +From be0844f3d3b16856732f3336053896df077d3317 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Thu, 3 Oct 2013 08:40:31 +0200 +Subject: Merge changes from our CMake 2.8.5 patchset + + * This one had already been modified for better PM support. + * Also includes some cleanups, which we should upstream + +diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake +index a2bf0c0..770e93a 100644 +--- a/Modules/FindLua51.cmake ++++ b/Modules/FindLua51.cmake +@@ -54,7 +54,7 @@ find_library(LUA_LIBRARY + + if(LUA_LIBRARY) + # include the math library for Unix +- if(UNIX AND NOT APPLE AND NOT BEOS) ++ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) + find_library(LUA_MATH_LIBRARY m) + set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") + # For Windows and Mac, don't need to explicitly include the math library +diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake +index dfb3526..2f8125d 100644 +--- a/Modules/Platform/Haiku.cmake ++++ b/Modules/Platform/Haiku.cmake +@@ -1,3 +1,8 @@ ++# process only once ++if(HAIKU) ++ return() ++endif() ++ + set(HAIKU 1) + set(UNIX 1) + +@@ -10,34 +15,110 @@ set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") + set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") + set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") + +-# FIXME need to detect if we are on gcc4 or gcc4hybrid, the path are different +-if(CMAKE_C_COMPILER_VERSION VERSION_LESS 3.0.0) +- # Use gcc2 libs +- set(__HAIKU_LIBDIR_SUFFIX "") +-else() +- # Use gcc4 libs +- set(__HAIKU_LIBDIR_SUFFIX "/x86") ++# Determine, if the C or C++ compiler is configured for a secondary ++# architecture. If so, that will change the search paths we set below. We check ++# whether the compiler's library search paths contain a ++# "/boot/system/develop/lib//", which we assume to be the secondary ++# architecture specific subdirectory and extract the name of the architecture ++# accordingly. ++set(__HAIKU_COMPILER ${CMAKE_C_COMPILER}) ++ ++if("${__HAIKU_COMPILER}" STREQUAL "") ++ set(__HAIKU_COMPILER ${CMAKE_CXX_COMPILER}) + endif() + ++execute_process( ++ COMMAND ${__HAIKU_COMPILER} -print-search-dirs ++ COMMAND sed -ne "/^libraries:/!d; s,libraries: =*\\(.*\\):,\\1,; s,:,\\n,gp" ++ COMMAND sed -ne "/\\/boot\\/system\\/develop\\/lib\\/[^\\/]*\\/$/!d; s,.*/\\([^/]*\\)/$,\\1,; p" ++ OUTPUT_VARIABLE CMAKE_HAIKU_SECONDARY_ARCH) ++string(STRIP "${CMAKE_HAIKU_SECONDARY_ARCH}" ++ CMAKE_HAIKU_SECONDARY_ARCH) ++ ++if("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "") ++ set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "") ++ unset(CMAKE_HAIKU_SECONDARY_ARCH) ++else() ++ set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "/${CMAKE_HAIKU_SECONDARY_ARCH}") ++ ++ # Override CMAKE_*LIBRARY_ARCHITECTURE. This will cause FIND_LIBRARY to search ++ # the libraries in the correct subdirectory first. It still isn't completely ++ # correct, since the parent directories shouldn't be searched at all. The ++ # primary architecture library might still be found, if there isn't one ++ # installed for the secondary architecture or it is installed in a less ++ # specific location. ++ set(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) ++ set(CMAKE_C_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) ++ set(CMAKE_CXX_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) ++endif("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "") ++ + list(APPEND CMAKE_SYSTEM_PREFIX_PATH + /boot/common/non-packaged + /boot/common + /boot/system + ) +-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES +- /boot/common/non-packaged/lib${__HAIKU_LIBDIR_SUFFIX} +- /boot/common/develop/lib${__HAIKU_LIBDIR_SUFFIX} +- /boot/system/develop/lib${__HAIKU_LIBDIR_SUFFIX} ++ ++LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES ++ /boot/common/non-packaged/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/common/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/system/develop/headers/os ++ /boot/system/develop/headers/os/app ++ /boot/system/develop/headers/os/device ++ /boot/system/develop/headers/os/drivers ++ /boot/system/develop/headers/os/game ++ /boot/system/develop/headers/os/interface ++ /boot/system/develop/headers/os/kernel ++ /boot/system/develop/headers/os/locale ++ /boot/system/develop/headers/os/mail ++ /boot/system/develop/headers/os/media ++ /boot/system/develop/headers/os/midi ++ /boot/system/develop/headers/os/midi2 ++ /boot/system/develop/headers/os/net ++ /boot/system/develop/headers/os/opengl ++ /boot/system/develop/headers/os/storage ++ /boot/system/develop/headers/os/support ++ /boot/system/develop/headers/os/translation ++ /boot/system/develop/headers/os/add-ons/graphics ++ /boot/system/develop/headers/os/add-ons/input_server ++ /boot/system/develop/headers/os/add-ons/screen_saver ++ /boot/system/develop/headers/os/add-ons/tracker ++ /boot/system/develop/headers/os/be_apps/Deskbar ++ /boot/system/develop/headers/os/be_apps/NetPositive ++ /boot/system/develop/headers/os/be_apps/Tracker ++ /boot/system/develop/headers/3rdparty ++ /boot/system/develop/headers/bsd ++ /boot/system/develop/headers/glibc ++ /boot/system/develop/headers/gnu ++ /boot/system/develop/headers/posix ++ /boot/system/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ ) ++IF (CMAKE_HAIKU_SECONDARY_ARCH) ++ LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES ++ /boot/system/develop/headers ++ ) ++ENDIF (CMAKE_HAIKU_SECONDARY_ARCH) ++ ++LIST(APPEND CMAKE_HAIKU_C_INCLUDE_DIRECTORIES ++ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES} + ) +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH +- /boot/common/develop/headers${__HAIKU_LIBDIR_SUFFIX} +- /boot/system/develop/headers${__HAIKU_LIBDIR_SUFFIX} ++ ++LIST(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES ++ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES}) ++ ++LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES}) ++ ++LIST(APPEND CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES ++ /boot/common/non-packaged/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/common/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ++ /boot/system/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} + ) +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH +- /boot/common/develop/lib${__HAIKU_LIBDIR_SUFFIX} +- /boot/system/develop/lib${__HAIKU_LIBDIR_SUFFIX} ++ ++LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ++ ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES} + ) + ++LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES}) ++ + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH + "Install path prefix, prepended onto install directories." FORCE) +diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx +index 322a6a2..2aaedec 100644 +--- a/Source/cmCTest.cxx ++++ b/Source/cmCTest.cxx +@@ -53,14 +53,10 @@ + #include + #include + +-#if defined(__BEOS__) ++#if defined(__BEOS__) || defined(__HAIKU__) + #include /* disable_debugger() API. */ + #endif + +-#if defined(__HAIKU__) +-#include /* disable_debugger() API. */ +-#endif +- + + #define DEBUGOUT std::cout << __LINE__ << " "; std::cout + #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr +diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx +index a09958b..6dd2f49 100644 +--- a/Source/cmFindPackageCommand.cxx ++++ b/Source/cmFindPackageCommand.cxx +@@ -1590,9 +1590,10 @@ void cmFindPackageCommand::AddPrefixesUserRegistry() + if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == + B_OK) + { +- strlcat(dir, "/cmake/packages/", sizeof(dir)); +- strlcat(dir, this->Name.c_str(), sizeof(dir)); +- this->LoadPackageRegistryDir(dir); ++ std::string fname = dir; ++ fname += "/cmake/packages/"; ++ fname += Name; ++ this->LoadPackageRegistryDir(fname); + } + #else + if(const char* home = cmSystemTools::GetEnv("HOME")) +diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx +index 8b25d60..51dba3c 100644 +--- a/Source/kwsys/SystemTools.cxx ++++ b/Source/kwsys/SystemTools.cxx +@@ -152,11 +152,6 @@ public: + #define _chdir chdir + #endif + +-#if defined(__HAIKU__) +-#include +-#include +-#endif +- + #if defined(__BEOS__) && !defined(__ZETA__) + #include + #include +diff --git a/Source/kwsys/testDynamicLoader.cxx b/Source/kwsys/testDynamicLoader.cxx +index 61c1572..fc0215e 100644 +--- a/Source/kwsys/testDynamicLoader.cxx ++++ b/Source/kwsys/testDynamicLoader.cxx +@@ -15,14 +15,10 @@ + #include KWSYS_HEADER(ios/iostream) + #include KWSYS_HEADER(stl/string) + +-#if defined(__BEOS__) ++#if defined(__BEOS__) || defined(__HAIKU__) + #include /* disable_debugger() API. */ + #endif + +-#if defined(__HAIKU__) +-#include /* disable_debugger() API. */ +-#endif +- + // Work-around CMake dependency scanning limitation. This must + // duplicate the above list of headers. + #if 0 +diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt +index 5c43052..f00cbd6 100644 +--- a/Tests/Complex/Library/CMakeLists.txt ++++ b/Tests/Complex/Library/CMakeLists.txt +@@ -51,7 +51,7 @@ define_property( + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-if(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") + endif() + get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) +diff --git a/Utilities/cmzlib/zutil.h b/Utilities/cmzlib/zutil.h +index 74ef1f8..3053cd8 100644 +--- a/Utilities/cmzlib/zutil.h ++++ b/Utilities/cmzlib/zutil.h +@@ -147,12 +147,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ + # define OS_CODE 0x0f + #endif + +-/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ +-/* many BeOS workarounds are no longer needed in Haiku */ +-#if defined(__HAIKU__) && defined(__BEOS__) +-#undef __BEOS__ +-#endif +- + #if defined(_BEOS_) || defined(RISCOS) + # define fdopen(fd,mode) NULL /* No fdopen() */ + #endif +-- +1.8.3.4 + From c2a04a95c902fc097f86541a1188cd53a3e283cf Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 3 Oct 2013 10:10:30 +0200 Subject: [PATCH 531/587] WIP for ninja. * Fails to build, the python bootstrap tools seems to be generating some build rules twice. * Not enough experience with Python to solve this, so leaving the package as broken. --- dev-util/ninja/ninja-1.4.0.recipe | 59 +++++++++++++++++++++ dev-util/ninja/patches/ninja-1.4.0.patchset | 51 ++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 dev-util/ninja/ninja-1.4.0.recipe create mode 100644 dev-util/ninja/patches/ninja-1.4.0.patchset diff --git a/dev-util/ninja/ninja-1.4.0.recipe b/dev-util/ninja/ninja-1.4.0.recipe new file mode 100644 index 000000000..cf93d8c50 --- /dev/null +++ b/dev-util/ninja/ninja-1.4.0.recipe @@ -0,0 +1,59 @@ +SUMMARY="A small build system similar to make." +HOMEPAGE="http://martine.github.io/ninja/" +LICENSE="Apache v2" +COPYRIGHT="2011 Google Inc." +SRC_URI="git://github.com/martine/ninja.git#v1.4.0" +REVISION="1" +ARCHITECTURES="!x86_gcc2 !x86" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + ninja$secondaryArchSuffix = $portVersion + cmd:ninja = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:python + cmd:g++$secondaryArchSuffix + cmd:gcc$secondaryArchSuffix + cmd:as$secondaryArchSuffix +" + +PATCHES="ninja-1.4.0.patchset" + +BUILD() +{ + python ./bootstrap.py +} + +INSTALL() +{ + cp ninja $binDir +} + +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. + " diff --git a/dev-util/ninja/patches/ninja-1.4.0.patchset b/dev-util/ninja/patches/ninja-1.4.0.patchset new file mode 100644 index 000000000..1a86057a9 --- /dev/null +++ b/dev-util/ninja/patches/ninja-1.4.0.patchset @@ -0,0 +1,51 @@ +From 2fa2d0ca09ffb589f08dc11330f91364228f0bdd Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Thu, 3 Oct 2013 10:06:13 +0200 +Subject: Add minimal Haiku support + + +diff --git a/platform_helper.py b/platform_helper.py +index b7447a1..bf7a99e 100644 +--- a/platform_helper.py ++++ b/platform_helper.py +@@ -19,7 +19,7 @@ import sys + + def platforms(): + return ['linux', 'darwin', 'freebsd', 'openbsd', 'solaris', 'sunos5', +- 'mingw', 'msvc', 'gnukfreebsd8', 'bitrig'] ++ 'mingw', 'msvc', 'gnukfreebsd8', 'bitrig', 'haiku'] + + class Platform( object ): + def __init__( self, platform): +@@ -43,6 +43,8 @@ class Platform( object ): + self._platform = 'msvc' + elif self._platform.startswith('bitrig'): + self._platform = 'bitrig' ++ elif self._platform.startswith('haiku'): ++ self._platform = 'haiku' + + def platform(self): + return self._platform +@@ -73,3 +75,6 @@ class Platform( object ): + + def is_bitrig(self): + return self._platform == 'bitrig' ++ ++ def is_haiku(self): ++ return self._platform == 'haiku' +diff --git a/src/util.cc b/src/util.cc +index 6ba3c6c..7142d13 100644 +--- a/src/util.cc ++++ b/src/util.cc +@@ -310,7 +310,7 @@ int GetProcessorCount() { + #endif + } + +-#if defined(_WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(__HAIKU__) + double GetLoadAverage() { + // TODO(nicolas.despres@gmail.com): Find a way to implement it on Windows. + // Remember to also update Usage() when this is fixed. +-- +1.8.3.4 + From 207669151880753a48f30a1767d698d0711898e2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 2 Oct 2013 23:33:19 +0200 Subject: [PATCH 532/587] autoconf: Fix hard-coded perl path Also update the documentation wrt. the removal of /boot/system. --- sys-devel/autoconf/autoconf-2.69.recipe | 4 +- .../autoconf/patches/autoconf-2.69.patchset | 47 ++++++++++++++++++- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index cae7adb52..d754e0e88 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -13,7 +13,7 @@ LICENSE=" " SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz" CHECKSUM_MD5="82d05e03b93e45f5a39b828dc9c6c29b" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES='autoconf-2.69.patchset' @@ -59,7 +59,7 @@ BUILD() # as that requires help2man, which isn't available touch man/*.1 - PERL="perl" M4="m4" SED="sed" \ + PERL="/bin/env perl" M4="m4" SED="sed" \ runConfigure ./configure make $jobArgs } diff --git a/sys-devel/autoconf/patches/autoconf-2.69.patchset b/sys-devel/autoconf/patches/autoconf-2.69.patchset index 7f4291cce..a95094865 100644 --- a/sys-devel/autoconf/patches/autoconf-2.69.patchset +++ b/sys-devel/autoconf/patches/autoconf-2.69.patchset @@ -1,4 +1,4 @@ -From ccbda3789e69e557a8fa284916613f623aa0d2c5 Mon Sep 17 00:00:00 2001 +From 3c6f6a572d4cf01a29db436929e435e0499387df Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 16 Sep 2013 22:37:49 +0200 Subject: Bypass checks for autoconf git checkout @@ -35,3 +35,48 @@ index 1c7af03..41e4030 100644 -- 1.8.3.4 + +From 66a0514f74a0e29994e3d42a10b5f4b1162aaa27 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Wed, 2 Oct 2013 16:18:53 +0200 +Subject: Install prefix is now /boot/system + + +diff --git a/INSTALL b/INSTALL +index d60e29a..f386627 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -247,10 +247,10 @@ directory contains several dysfunctional programs; working variants of + these programs are available in '/usr/bin'. So, if you need '/usr/ucb' + in your 'PATH', put it _after_ '/usr/bin'. + +- On Haiku, software installed for all users goes in '/boot/common', ++ On Haiku, software installed for all users goes in '/boot/system', + not '/usr/local'. It is recommended to use the following options: + +- ./configure --prefix=/boot/common ++ ./configure --prefix=/boot/system + + Specifying the System Type + ========================== +diff --git a/doc/install.texi b/doc/install.texi +index 4c2ffb5..c1a987b 100644 +--- a/doc/install.texi ++++ b/doc/install.texi +@@ -287,11 +287,11 @@ directory contains several dysfunctional programs; working variants + of these programs are available in @code{/usr/bin}. So, if you need + @code{/usr/ucb} in your @env{PATH}, put it @emph{after} @code{/usr/bin}. + +-On Haiku, software installed for all users goes in @file{/boot/common}, ++On Haiku, software installed for all users goes in @file{/boot/system}, + not @file{/usr/local}. It is recommended to use the following options: + + @example +-./configure --prefix=/boot/common ++./configure --prefix=/boot/system + @end example + + @node System Type +-- +1.8.3.4 + From d4aec8f5bf5e1a56c32f8240cb225fb5d37aa0ce Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 2 Oct 2013 23:58:47 +0200 Subject: [PATCH 533/587] bison: Fix hard-coded m4 path --- sys-devel/bison/bison-2.4.3.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe index 8691d5460..1263bfbda 100644 --- a/sys-devel/bison/bison-2.4.3.recipe +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -16,7 +16,7 @@ COPYRIGHT="1992-2010 Free Software Foundation, Inc." LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.3.tar.gz" CHECKSUM_MD5="ea45c778b36bdc7a720096819e292a73" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="bison-2.4.3.patch" @@ -29,6 +29,7 @@ PROVIDES=" " REQUIRES=" haiku >= $haikuVersion + cmd:m4 " BUILD_REQUIRES=" " @@ -47,7 +48,7 @@ BUILD() { # bison looks for m4 in an absolute path, but uses that only within # its own testsuite, so we let it be ... - runConfigure ./configure \ + M4=$portPackageLinksDir/cmd~m4/bin/m4 runConfigure ./configure \ --disable-rpath --with-gnu-ld make $jobArgs } From a3314a8e466d1b223f7c5463925b31c8ed93f5ed Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 3 Oct 2013 00:20:13 +0200 Subject: [PATCH 534/587] libsolv: Update version (removal of common) --- .../libsolv-0.3.0_haiku_2013_10_01.recipe | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe 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 new file mode 100644 index 000000000..46e61e7ea --- /dev/null +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe @@ -0,0 +1,81 @@ +SUMMARY="Library for solving packages and reading repositories" +DESCRIPTION="Library for solving packages and reading repositories." +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2013, Novell Inc." +HOMEPAGE="http://github.com/openSUSE/libsolv" +SRC_URI="git+git://github.com/weinhold/libsolv.git#01ed09a3e1f4637f72d4239fe3724fcafa39be94" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libsolv$secondaryArchSuffix = $portVersion + lib:libsolv$secondaryArchSuffix = $portVersion + lib:libsolvext$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libexpat$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libexpat$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:cmake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:sed + " + +PATCH() +{ + sed -i 's,${CMAKE_INSTALL_PREFIX}/bin',$binDir, CMakeLists.txt + sed -i 's,${CMAKE_INSTALL_PREFIX}/include',$includeDir, \ + src/CMakeLists.txt ext/CMakeLists.txt +} + +BUILD() +{ + rm -rf build + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix -DLIB=$relativeLibDir .. + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + # set up the develop directory correctly + prepareInstalledDevelLibs libsolv libsolvext + + # move cmake files + mkdir -p $dataDir + mv $prefix/share/cmake $dataDir + rmdir $prefix/share + + # We don't want the executables. + rm -r $prefix/bin + + # devel package + packageEntries devel \ + $dataDir \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libsolv${secondaryArchSuffix}_devel = $portVersion + devel:libsolv${secondaryArchSuffix} = $portVersion + devel:libsolvext${secondaryArchSuffix} = $portVersion + " +REQUIRES_devel=" + libsolv${secondaryArchSuffix} == $portVersion base + " From e71ec85844475903a12fb5eaf97165b0a3d0ca19 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 3 Oct 2013 00:24:16 +0200 Subject: [PATCH 535/587] mercurial: Fix hard-coded python path --- dev-vcs/mercurial/mercurial-2.2.2.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe index e82fc9db5..231c8fabd 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2005-2012 Matt Mackall et al." LICENSE="GNU GPL v2" SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz" CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="mercurial-2.2.2.patch" @@ -16,7 +16,7 @@ PROVIDES=" " REQUIRES=" haiku_devel >= $haikuVersion - python + cmd:python cmd:nano lib:libintl " @@ -24,7 +24,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion - python + cmd:python cmd:aclocal cmd:autoconf cmd:gcc @@ -38,12 +38,12 @@ SOURCE_DIR="$portVersionedName" BUILD() { - python setup.py build --force + $portPackageLinksDir/cmd~python/bin/python setup.py build --force } INSTALL() { - python setup.py install \ + $portPackageLinksDir/cmd~python/bin/python setup.py install \ --prefix="$prefix" \ --install-headers="$includedir" \ --force From 5a93af78e76e930fecd0a0424dbbd1937f454f62 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 3 Oct 2013 01:02:31 +0200 Subject: [PATCH 536/587] groff: Fix hard-coded perl path --- sys-apps/groff/groff-1.20.1.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe index bd7da6844..66cbd7eb0 100644 --- a/sys-apps/groff/groff-1.20.1.recipe +++ b/sys-apps/groff/groff-1.20.1.recipe @@ -5,7 +5,7 @@ SRC_URI="http://ftp.gnu.org/gnu/groff/groff-1.20.1.tar.gz" CHECKSUM_MD5="48fa768dd6fdeb7968041dd5ae8e2b02" LICENSE="GNU GPL v3" COPYRIGHT="2003-2009 Free Software Foundation, Inc." -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" @@ -77,6 +77,7 @@ BUILD() aclocal -I m4 autoconf sed -i s@docdir='$(datadir)/doc/groff/'@docdir=$docDir/@g Ma* + PERLPATH="/bin/env perl" \ runConfigure ./configure make $jobArgs } From be99af36ec3f9a967e1d301177455129091b78dc Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 3 Oct 2013 03:11:34 +0200 Subject: [PATCH 537/587] man: Fix hard-coded paths Also declare all the used commands correctly in REQUIRES. --- sys-apps/man/man-1.6g.recipe | 47 +++++-- sys-apps/man/patches/man-1.6g.patch | 123 ----------------- sys-apps/man/patches/man-1.6g.patchset | 184 +++++++++++++++++++++++++ 3 files changed, 222 insertions(+), 132 deletions(-) delete mode 100644 sys-apps/man/patches/man-1.6g.patch create mode 100644 sys-apps/man/patches/man-1.6g.patchset diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe index 9301e1365..2a0a618aa 100644 --- a/sys-apps/man/man-1.6g.recipe +++ b/sys-apps/man/man-1.6g.recipe @@ -5,10 +5,10 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz" CHECKSUM_MD5="ba154d5796928b841c9c69f0ae376660" LICENSE="GNU GPL v2" COPYRIGHT="1989-2012 Free Software Foundation, Inc." -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" -PATCHES="man-1.6g.patch" +PATCHES="man-1.6g.patchset" PROVIDES=" man = $portVersion compat >= 1.6 @@ -22,19 +22,36 @@ PROVIDES=" REQUIRES=" haiku >= $haikuVersion + cmd:awk + cmd:bzip2 + cmd:cat + cmd:cmp + cmd:eqn cmd:groff cmd:gunzip - cmd:bzip2 + cmd:less + cmd:nroff + cmd:refer + cmd:tbl cmd:zcat " BUILD_REQUIRES=" + cmd:awk + cmd:bzip2 + cmd:cat + cmd:cmp + cmd:eqn + cmd:groff + cmd:gunzip + cmd:less + cmd:nroff + cmd:pic + cmd:refer + cmd:tbl + cmd:zcat " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion - cmd:groff - cmd:gunzip - cmd:bzip2 - cmd:zcat cmd:gcc cmd:ld cmd:make @@ -49,8 +66,20 @@ SOURCE_DIR="$portVersionedName" BUILD() { - groff=/packages/$portVersionedName/cmd:groff/bin/groff \ - ./configure -prefix=$prefix \ + awk=$portPackageLinksDir/cmd~awk/bin/awk \ + bzip2=$portPackageLinksDir/cmd~bzip2/bin/bzip2 \ + cat=$portPackageLinksDir/cmd~cat/bin/cat \ + cmp=$portPackageLinksDir/cmd~cmp/bin/cmp \ + eqn=$portPackageLinksDir/cmd~eqn/bin/eqn \ + groff=$portPackageLinksDir/cmd~groff/bin/groff \ + gunzip=$portPackageLinksDir/cmd~gunzip/bin/gunzip \ + nroff=$portPackageLinksDir/cmd~nroff/bin/nroff \ + less=$portPackageLinksDir/cmd~less/bin/less \ + pic=$portPackageLinksDir/cmd~pic/bin/pic \ + refer=$portPackageLinksDir/cmd~refer/bin/refer \ + tbl=$portPackageLinksDir/cmd~tbl/bin/tbl \ + zcat=$portPackageLinksDir/cmd~zcat/bin/zcat \ + LIBS=-lbe ./configure -prefix=$prefix \ -bindir=$binDir \ -sbindir=$sbinDir \ -confdir=$sysconfDir \ diff --git a/sys-apps/man/patches/man-1.6g.patch b/sys-apps/man/patches/man-1.6g.patch deleted file mode 100644 index e80018211..000000000 --- a/sys-apps/man/patches/man-1.6g.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff -ur man-1.6g.orig/configure man-1.6g/configure ---- man-1.6g.orig/configure 2010-12-31 21:28:46.004194304 +0100 -+++ man-1.6g/configure 2013-04-24 15:24:06.851968000 +0200 -@@ -411,7 +411,7 @@ - do - if test -f $j/$i - then -- eval F$i=$j/$i -+ eval F$i=$i - break - fi - done -@@ -455,7 +455,7 @@ - do - if test -f $j/$i - then -- eval F$i=$j/$i -+ eval F$i=$i - break - fi - done -@@ -468,7 +468,7 @@ - do - if test -f $j/$i - then -- eval Fg$i=$j/$i -+ eval Fg$i=$i - break - fi - done -@@ -1026,7 +1026,7 @@ - do - if test -f $j/$i - then -- eval F$i=$j/$i -+ eval F$i=$i - if [ x$compress = x ]; then compress=$j/$i; fi - break - fi -@@ -1124,7 +1124,7 @@ - do - if test -f $j/$i - then -- eval F$i=$j/$i -+ eval F$i=$i - break - fi - done -@@ -1368,6 +1368,11 @@ - s,@man_config_file@,$man_config_file, - s,@manpathoption@,$manpathoption, - s/@sections@/$sections/ -+s,@haikuSystemManDir@,`finddir B_SYSTEM_DOCUMENTATION_DIRECTORY`/man, -+s,@haikuCommonManDir@,`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man, -+s,@haikuCommonNonPackagedManDir@,`finddir B_COMMON_NONPACKAGED_DOCUMENTATION_DIRECTORY`/man, -+s,@haikuUserManDir@,`finddir B_USER_DOCUMENTATION_DIRECTORY`/man, -+s,@haikuUserNonPackagedManDir@,`finddir B_USER_NONPACKAGED_DOCUMENTATION_DIRECTORY`/man, - ' $infile.in >> $infile - done - EOS -diff -ur man-1.6g.orig/man2html/Makefile.in man-1.6g/man2html/Makefile.in ---- man-1.6g.orig/man2html/Makefile.in 2010-12-31 21:28:46.008912896 +0100 -+++ man-1.6g/man2html/Makefile.in 2013-04-24 15:25:28.619970560 +0200 -@@ -2,8 +2,8 @@ - CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes - OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o - EXEEXT = @EXEEXT@ --bindir = $(DESTDIR)$(PREFIX)/usr/bin --mandir = $(DESTDIR)$(PREFIX)@mandir@ -+bindir = $(DESTDIR)@bindir@ -+mandir = $(DESTDIR)@mandir@ - vardir = $(DESTDIR)$(PREFIX)/var - httpdir = $(DESTDIR)$(PREFIX)/home/httpd - cgiowner = nobody -diff -ur man-1.6g.orig/src/Makefile.in man-1.6g/src/Makefile.in ---- man-1.6g.orig/src/Makefile.in 2010-12-31 21:28:46.004718592 +0100 -+++ man-1.6g/src/Makefile.in 2013-04-24 13:18:00.114032640 +0200 -@@ -30,6 +30,8 @@ - - LIBOBJS = @LIBOBJS@ - -+LIBS = @LIBS@ -+ - all: man$(EXEEXT) man.conf apropos whatis makewhatis - - MANOBJS = man.o manfile.o manpath.o man-config.o man-getopt.o \ -diff -ur man-1.6g.orig/src/man.conf.in man-1.6g/src/man.conf.in ---- man-1.6g.orig/src/man.conf.in 2010-10-26 02:22:24.006553600 +0200 -+++ man-1.6g/src/man.conf.in 2013-04-24 14:34:03.149946368 +0200 -@@ -36,11 +36,11 @@ - # - # Every automatically generated MANPATH includes these fields - # --MANPATH /usr/man --MANPATH /usr/share/man --MANPATH /usr/local/man --MANPATH /usr/local/share/man --MANPATH /usr/X11R6/man -+MANPATH @haikuUserNonPackagedManDir@ -+MANPATH @haikuUserManDir@ -+MANPATH @haikuCommonNonPackagedManDir@ -+MANPATH @haikuCommonManDir@ -+MANPATH @haikuSystemManDir@ - # - # Uncomment if you want to include one of these by default - # -@@ -58,15 +58,7 @@ - # in the mandatory manpath already, but will keep man from statting - # lots of other nearby files and directories. - # --MANPATH_MAP /bin /usr/share/man --MANPATH_MAP /sbin /usr/share/man --MANPATH_MAP /usr/bin /usr/share/man --MANPATH_MAP /usr/sbin /usr/share/man --MANPATH_MAP /usr/local/bin /usr/local/share/man --MANPATH_MAP /usr/local/sbin /usr/local/share/man --MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man --MANPATH_MAP /usr/bin/X11 /usr/X11R6/man --MANPATH_MAP /usr/bin/mh /usr/share/man -+MANPATH_MAP /bin @haikuSystemManDir@ - # - # NOAUTOPATH keeps man from automatically adding directories that look like - # manual page directories to the path. diff --git a/sys-apps/man/patches/man-1.6g.patchset b/sys-apps/man/patches/man-1.6g.patchset new file mode 100644 index 000000000..6fefdfc58 --- /dev/null +++ b/sys-apps/man/patches/man-1.6g.patchset @@ -0,0 +1,184 @@ +From 6cf4a0ec87d16e849eb8b2ec9563f75e5ef0c802 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Thu, 3 Oct 2013 02:20:36 +0200 +Subject: Set correct default man page search paths + + +diff --git a/configure b/configure +index 4928ae0..72f37a5 100755 +--- a/configure ++++ b/configure +@@ -1368,6 +1368,10 @@ s,@man_config_dir@,$man_config_dir, + s,@man_config_file@,$man_config_file, + s,@manpathoption@,$manpathoption, + s/@sections@/$sections/ ++s,@haikuSystemManDir@,`finddir B_SYSTEM_DOCUMENTATION_DIRECTORY`/man, ++s,@haikuSystemNonPackagedManDir@,`finddir B_SYSTEM_NONPACKAGED_DOCUMENTATION_DIRECTORY`/man, ++s,@haikuUserManDir@,`finddir B_USER_DOCUMENTATION_DIRECTORY`/man, ++s,@haikuUserNonPackagedManDir@,`finddir B_USER_NONPACKAGED_DOCUMENTATION_DIRECTORY`/man, + ' $infile.in >> $infile + done + EOS +diff --git a/src/man.conf.in b/src/man.conf.in +index ce73ffc..346230f 100644 +--- a/src/man.conf.in ++++ b/src/man.conf.in +@@ -36,11 +36,10 @@ + # + # Every automatically generated MANPATH includes these fields + # +-MANPATH /usr/man +-MANPATH /usr/share/man +-MANPATH /usr/local/man +-MANPATH /usr/local/share/man +-MANPATH /usr/X11R6/man ++MANPATH @haikuUserNonPackagedManDir@ ++MANPATH @haikuUserManDir@ ++MANPATH @haikuSystemNonPackagedManDir@ ++MANPATH @haikuSystemManDir@ + # + # Uncomment if you want to include one of these by default + # +@@ -58,15 +57,7 @@ MANPATH /usr/X11R6/man + # in the mandatory manpath already, but will keep man from statting + # lots of other nearby files and directories. + # +-MANPATH_MAP /bin /usr/share/man +-MANPATH_MAP /sbin /usr/share/man +-MANPATH_MAP /usr/bin /usr/share/man +-MANPATH_MAP /usr/sbin /usr/share/man +-MANPATH_MAP /usr/local/bin /usr/local/share/man +-MANPATH_MAP /usr/local/sbin /usr/local/share/man +-MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man +-MANPATH_MAP /usr/bin/X11 /usr/X11R6/man +-MANPATH_MAP /usr/bin/mh /usr/share/man ++MANPATH_MAP /bin @haikuSystemManDir@ + # + # NOAUTOPATH keeps man from automatically adding directories that look like + # manual page directories to the path. +-- +1.8.3.4 + + +From 9e1bfb921e27bbe735ad965c72de53c2f5183d0d Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Thu, 3 Oct 2013 02:21:37 +0200 +Subject: src/Makefile.in: Add missing LIBS + + +diff --git a/src/Makefile.in b/src/Makefile.in +index 0b08305..4df0661 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -30,6 +30,8 @@ LDFLAGS ?= -s + + LIBOBJS = @LIBOBJS@ + ++LIBS = @LIBS@ ++ + all: man$(EXEEXT) man.conf apropos whatis makewhatis + + MANOBJS = man.o manfile.o manpath.o man-config.o man-getopt.o \ +-- +1.8.3.4 + + +From 7444be20edf578bb159e26e1e808470377709802 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Thu, 3 Oct 2013 02:22:08 +0200 +Subject: man2html/Makefile.in: Fix mandir and bindir + + +diff --git a/man2html/Makefile.in b/man2html/Makefile.in +index b41eaba..0c87919 100644 +--- a/man2html/Makefile.in ++++ b/man2html/Makefile.in +@@ -2,8 +2,8 @@ CC = @CC@ + CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes + OBJECTS = man2html.o cgibase.o abbrev.o strdefs.o + EXEEXT = @EXEEXT@ +-bindir = $(DESTDIR)$(PREFIX)/usr/bin +-mandir = $(DESTDIR)$(PREFIX)@mandir@ ++bindir = $(DESTDIR)@bindir@ ++mandir = $(DESTDIR)@mandir@ + vardir = $(DESTDIR)$(PREFIX)/var + httpdir = $(DESTDIR)$(PREFIX)/home/httpd + cgiowner = nobody +-- +1.8.3.4 + + +From 914beae0b7420f8bddf3b2b89883c3a561c9c30e Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Thu, 3 Oct 2013 02:22:33 +0200 +Subject: configure: Support presetting env vars for commands + + +diff --git a/configure b/configure +index 72f37a5..c838d25 100755 +--- a/configure ++++ b/configure +@@ -406,6 +406,11 @@ if test "$ans" = "false" + then + for i in more less cmp cat awk gawk mawk + do ++ if eval "test \"x\$$i\" != x" ++ then ++ eval F$i=\$$i ++ continue ++ fi + eval F$i="missing" + for j in $DEFPATH + do +@@ -450,6 +455,11 @@ then + else + for i in nroff groff geqn gtbl col vgrind grefer grap gpic more less lynx cmp cat awk gawk mawk + do ++ if eval "test \"x\$$i\" != x" ++ then ++ eval F$i=\$$i ++ continue ++ fi + eval F$i="missing" + for j in $DEFPATH + do +@@ -464,6 +474,11 @@ else + do + if test `eval echo \\$Fg$i` = "missing" + then ++ if eval "test \"x\$$i\" != x" ++ then ++ eval Fg$i=\$$i ++ continue ++ fi + for j in $DEFPATH + do + if test -f $j/$i +@@ -1021,6 +1036,12 @@ then + compress= + for i in xz lzma bzip2 gzip bzip tzip pack compress freeze yabba + do ++ if eval "test \"x\$$i\" != x" ++ then ++ eval F$i=\$$i ++ if [ x$compress = x ]; then eval compress=\$$i; fi ++ continue ++ fi + eval F$i=missing + for j in $DEFPATH + do +@@ -1119,6 +1140,11 @@ fi + UNCOMPRESSORS="unxz unlzma gunzip bzip2 pcat zcat fcat unyabba" + for i in $UNCOMPRESSORS + do ++ if eval "test \"x\$$i\" != x" ++ then ++ eval F$i=\$$i ++ continue ++ fi + eval F$i=missing + for j in $DEFPATH + do +-- +1.8.3.4 + From d3ac62aeeeb2d8636f3f197d08e0627dce0d27fd Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 3 Oct 2013 18:23:16 +0200 Subject: [PATCH 538/587] cvs: Fix hard-coded perl paths, build with external zlib --- dev-vcs/cvs/cvs-1.12.13.1.recipe | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe index 2ba8d7a70..90733f849 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.recipe +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -17,7 +17,7 @@ LICENSE="GNU GPL v1 GNU LGPL v2" SRC_URI="ftp://ftp.ru.debian.org/gentoo-distfiles/distfiles/cvs-1.12.13.1.tar.bz2" CHECKSUM_MD5="cfd07b224956daaed53fb3063bece1bf" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="cvs-1.12.13.1.patch" @@ -31,9 +31,11 @@ PROVIDES=" REQUIRES=" haiku >= $haikuVersion cmd:nano + cmd:perl lib:libz " BUILD_REQUIRES=" + cmd:perl devel:libz >= 1.1.4 " BUILD_PREREQUIRES=" @@ -50,7 +52,9 @@ SOURCE_DIR="$portVersionedName" BUILD() { libtoolize --force --copy --install - runConfigure ./configure --enable-rootcommit + PERL=$portPackageLinksDir/cmd~perl/bin/perl \ + runConfigure ./configure --enable-rootcommit \ + --with-external-zlib make $jobArgs } From fc08c3ad251d8668dad5186a62a31d6f0f2b9f80 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 3 Oct 2013 18:46:38 +0200 Subject: [PATCH 539/587] openssl: Fix hard-coded perl paths --- dev-libs/openssl/openssl-1.0.0j.recipe | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dev-libs/openssl/openssl-1.0.0j.recipe b/dev-libs/openssl/openssl-1.0.0j.recipe index 51aba46a2..90b2d83e7 100644 --- a/dev-libs/openssl/openssl-1.0.0j.recipe +++ b/dev-libs/openssl/openssl-1.0.0j.recipe @@ -22,7 +22,7 @@ COPYRIGHT=" 1995-1998 Eric Young 1998-2012 The OpenSSL Project. " -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -62,11 +62,18 @@ BUILD_PREREQUIRES=" cmd:sed " +PATCH() +{ + # fix hard-coded perl path + sed -i 's,/usr/bin/perl,/bin/env perl,g' apps/tsget +} + BUILD() { # Fix hardcoded directory for manpages sed -i "s@MANDIR=.*\$@MANDIR=$manDir@g" Make* + PERL="/bin/env perl" \ ./config --prefix=$prefix --libdir=$relativeLibDir \ --openssldir=$dataRootDir/ssl \ zlib shared From 29c2d2eabc471c1275cec003035cabbd551269d1 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 3 Oct 2013 23:09:51 +0200 Subject: [PATCH 540/587] Update recipes for Caya * Caya itself is building * The protocol add-ons aren't yet --- haiku-apps/caya/caya-0.HEAD.recipe | 36 --- haiku-apps/caya/caya-293.recipe | 63 +++++ haiku-apps/caya/patches/caya-293.patchset | 0 .../caya_gpl_protocols-36.recipe | 38 ++- ...D.patch => caya_gpl_protocols-36.patchset} | 255 +++++++++--------- 5 files changed, 224 insertions(+), 168 deletions(-) delete mode 100644 haiku-apps/caya/caya-0.HEAD.recipe create mode 100644 haiku-apps/caya/caya-293.recipe create mode 100644 haiku-apps/caya/patches/caya-293.patchset rename haiku-apps/caya_gpl_protocols/patches/{caya_gpl_protocols-0.HEAD.patch => caya_gpl_protocols-36.patchset} (64%) diff --git a/haiku-apps/caya/caya-0.HEAD.recipe b/haiku-apps/caya/caya-0.HEAD.recipe deleted file mode 100644 index 4dd066ba6..000000000 --- a/haiku-apps/caya/caya-0.HEAD.recipe +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION="Caya is a multiprotocol IM client." -HOMEPAGE="http://dev.osdrawer.net/projects/caya" -SRC_URI="svn+http://svn.osdrawer.net/caya/trunk" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/expat >= 2.0.1" -#CHECKSUM_MD5="" -BUILD() -{ - cd caya-0.HEAD - ./configure - jam -} - -INSTALL() -{ - cd caya-0.HEAD - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - mkdir -p ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - - ARCH=`readlink /boot/develop/abi/current |sed -e s!/!-!g` - cp generated/distro-haiku-${ARCH}-debug/Caya ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya - cp generated/distro-haiku-${ARCH}-debug/aim ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp smileys/*.gif smileys/settings.xml ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/smileys - cp application/CayaProtocol.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - cp application/CayaConstants.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ - cp application/CayaProtocolMessages.h ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/include/caya/ -} - -LICENSE="MIT" -COPYRIGHT="2009-2011 Andrea Anzani - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes - 2011-2012 Casalinuovo Dario" diff --git a/haiku-apps/caya/caya-293.recipe b/haiku-apps/caya/caya-293.recipe new file mode 100644 index 000000000..c75d6c0ed --- /dev/null +++ b/haiku-apps/caya/caya-293.recipe @@ -0,0 +1,63 @@ +SUMMARY="Caya is a multiprotocol IM client." +HOMEPAGE="http://dev.osdrawer.net/projects/caya" +SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#293" +REVISION="1" +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + caya = $portVersion + lib:libexpat + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + devel:libexpat + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:jam + cmd:which + " + +PATCH() +{ + mkdir -p $sourceDir/generated/objects-haiku-x86-gcc2-debug/application + echo $portVersion > $sourceDir/generated/objects-haiku-x86-gcc2-debug/application/svn_revision +} + +BUILD() +{ + ./configure + jam +} + +INSTALL() +{ + mkdir -p $appsDir/Caya + mkdir -p $appsDir/Caya/smileys + mkdir -p $appsDir/Caya/protocols + mkdir -p $includeDir/caya/ + + cp generated/distro-haiku-*-debug/Caya $appsDir/Caya + cp generated/distro-haiku-*-debug/aim $appsDir/Caya/protocols + cp smileys/*.gif smileys/settings.xml $appsDir/Caya/smileys + cp application/CayaProtocol.h $includeDir/caya/ + cp application/CayaConstants.h $includeDir/caya/ + cp application/CayaProtocolMessages.h $includeDir/caya/ +} + +LICENSE="MIT" +COPYRIGHT=" + 2009-2011 Andrea Anzani + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes + 2011-2012 Casalinuovo Dario + " +DESCRIPTION=" + Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, + google talk, and facebook. + " diff --git a/haiku-apps/caya/patches/caya-293.patchset b/haiku-apps/caya/patches/caya-293.patchset new file mode 100644 index 000000000..e69de29bb 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 52bc7407e..79fc2deed 100644 --- a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe +++ b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe @@ -1,21 +1,37 @@ -DESCRIPTION="GPL Plugins for Caya, protocols MSN and XMPP" +SUMMARY="MSN and XMPPprotocols for Caya" HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#36" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="caya" -#CHECKSUM_MD5="" -MESSAGE="This port only builds with gcc4." +SUPPLEMENTS="caya" +ARCHITECTURES="!x86 !x86_gcc2" + +PROVIDES=" + caya_gpl_protocols = $portVersion + " +REQUIRES=" + caya + " + +BUILD_REQUIRES=" + caya + " + +BUILD_PREREQUIRES=" + cmd:jam + cmd:gcc + cmd:which + " + +PATCH="caya_gpl_protocol-36.patchset" + BUILD() { - cd caya-gpl-protocols-36 - ./configure + includeDir=$includeDir ./configure jam } INSTALL() { - cd caya-gpl-protocols-36 mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols @@ -28,4 +44,8 @@ LICENSE="GNU GPL v2" 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. + " diff --git a/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch b/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-36.patchset similarity index 64% rename from haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch rename to haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-36.patchset index a45bd230b..efb75e7f2 100644 --- a/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-0.HEAD.patch +++ b/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-36.patchset @@ -1,21 +1,72 @@ -Index: libs/libmsn/msnobject.cpp -=================================================================== ---- libs/libmsn/msnobject.cpp (revision 36) -+++ libs/libmsn/msnobject.cpp (working copy) -@@ -30,7 +30,7 @@ - { - void MSNObject::addMSNObject(std::string filename, int Type) +From 2fcbc23eca1e8c07e03ecffcbb4ecbfce71b3757 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Thu, 3 Oct 2013 22:52:00 +0200 +Subject: Import gcc2 compatibility fixes. + + +diff --git a/libs/libgloox/connectionbosh.cpp b/libs/libgloox/connectionbosh.cpp +index f0a1124..c433564 100644 +--- a/libs/libgloox/connectionbosh.cpp ++++ b/libs/libgloox/connectionbosh.cpp +@@ -303,7 +303,7 @@ namespace gloox + + bool ci_equal( char ch1, char ch2 ) + { +- return std::toupper( (unsigned char)ch1 ) == std::toupper( (unsigned char)ch2 ); ++ return toupper( (unsigned char)ch1 ) == toupper( (unsigned char)ch2 ); + } + + std::string::size_type ci_find( const std::string& str1, const std::string& str2 ) +diff --git a/libs/libgloox/gloox.h b/libs/libgloox/gloox.h +index b86462e..8186d20 100644 +--- a/libs/libgloox/gloox.h ++++ b/libs/libgloox/gloox.h +@@ -1214,7 +1214,7 @@ namespace gloox + /** + * A multimap of strings. + */ +- typedef std::multimap StringMultiMap; ++ typedef std::multimap StringMultiMap; + + class StanzaExtension; + /** +diff --git a/libs/libgloox/parser.cpp b/libs/libgloox/parser.cpp +index a72fbdc..5884624 100644 +--- a/libs/libgloox/parser.cpp ++++ b/libs/libgloox/parser.cpp +@@ -141,7 +141,7 @@ namespace gloox + { + if( pos + needle.length() <= data.length() ) { -- std::ifstream::pos_type size; -+ std::streampos size; - char * memblock; - SHA_CTX ctx; - unsigned char digest[SHA_DIGEST_LENGTH]; -Index: libs/libmsn/Jamfile -=================================================================== ---- libs/libmsn/Jamfile (revision 36) -+++ libs/libmsn/Jamfile (working copy) -@@ -2,6 +2,7 @@ +- if( !data.compare( pos, needle.length(), needle ) ) ++ if( !data.compare(pos, needle.length(), needle ) ) + { + pos += needle.length() - 1; + return ForwardFound; +diff --git a/libs/libgloox/siprofileft.cpp b/libs/libgloox/siprofileft.cpp +index 4836efd..aeafac4 100644 +--- a/libs/libgloox/siprofileft.cpp ++++ b/libs/libgloox/siprofileft.cpp +@@ -84,11 +84,11 @@ namespace gloox + DataFormField* dff = df.addField( DataFormField::TypeListSingle, "stream-method" ); + StringMultiMap sm; + if( streamTypes & FTTypeS5B ) +- sm.insert( std::make_pair( "s5b", XMLNS_BYTESTREAMS ) ); ++ sm.insert( std::make_pair( "s5b", XMLNS_BYTESTREAMS ) ); + if( streamTypes & FTTypeIBB ) +- sm.insert( std::make_pair( "ibb", XMLNS_IBB ) ); ++ sm.insert( std::make_pair( "ibb", XMLNS_IBB ) ); + if( streamTypes & FTTypeOOB ) +- sm.insert( std::make_pair( "oob", XMLNS_IQ_OOB ) ); ++ sm.insert( std::make_pair( "oob", XMLNS_IQ_OOB ) ); + dff->setOptions( sm ); + feature->addChild( df.tag() ); + +diff --git a/libs/libmsn/Jamfile b/libs/libmsn/Jamfile +index ec7bd45..02a1dc4 100644 +--- a/libs/libmsn/Jamfile ++++ b/libs/libmsn/Jamfile +@@ -2,6 +2,7 @@ SubDir TOP libs libmsn ; SubDirSysHdrs [ FDirName $(TOP) ] ; SubDirSysHdrs [ FDirName $(TOP) libs ] ; @@ -23,10 +74,10 @@ Index: libs/libmsn/Jamfile SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ; -Index: libs/libmsn/connection.h -=================================================================== ---- libs/libmsn/connection.h (revision 36) -+++ libs/libmsn/connection.h (working copy) +diff --git a/libs/libmsn/connection.h b/libs/libmsn/connection.h +index c469460..c92539b 100644 +--- a/libs/libmsn/connection.h ++++ b/libs/libmsn/connection.h @@ -29,6 +29,7 @@ #include #include @@ -35,11 +86,46 @@ Index: libs/libmsn/connection.h #ifdef _MSC_VER #pragma warning( disable : 4290 ) -Index: libs/libmsn/util.cpp -=================================================================== ---- libs/libmsn/util.cpp (revision 36) -+++ libs/libmsn/util.cpp (working copy) -@@ -146,8 +146,8 @@ +diff --git a/libs/libmsn/message.cpp b/libs/libmsn/message.cpp +index aedf463..26eebd0 100644 +--- a/libs/libmsn/message.cpp ++++ b/libs/libmsn/message.cpp +@@ -124,7 +124,7 @@ namespace MSN + { + std::string color = this->getFormatInfo()["CO"]; + assert(color.size() <= 6 && color.size() >= 0); +- color.insert(0U, 6 - color.size(), '0'); ++ color.insert((size_t)0, (size_t)(6 - color.size()), '0'); + int r = 0, g = 0, b = 0; + + b = strtol(color.substr(0, 2).c_str(), NULL, 16); +@@ -167,7 +167,7 @@ namespace MSN + + void Message::setColor(std::string color) + { +- color.insert(0U, 6 - color.size(), '0'); ++ color.insert((size_t)0, (size_t)(6 - color.size()), '0'); + int r = 0, g = 0, b = 0; + + r = strtol(color.substr(0, 2).c_str(), NULL, 16); +diff --git a/libs/libmsn/msnobject.cpp b/libs/libmsn/msnobject.cpp +index 4a83221..8192c3a 100644 +--- a/libs/libmsn/msnobject.cpp ++++ b/libs/libmsn/msnobject.cpp +@@ -30,7 +30,7 @@ namespace MSN + { + void MSNObject::addMSNObject(std::string filename, int Type) + { +- std::ifstream::pos_type size; ++ std::streampos size; + char * memblock; + SHA_CTX ctx; + unsigned char digest[SHA_DIGEST_LENGTH]; +diff --git a/libs/libmsn/util.cpp b/libs/libmsn/util.cpp +index b2f843f..5e73f54 100644 +--- a/libs/libmsn/util.cpp ++++ b/libs/libmsn/util.cpp +@@ -146,8 +146,8 @@ namespace MSN it1 != s1.end() && it2 != s2.end(); ++it1, ++it2) { @@ -50,7 +136,7 @@ Index: libs/libmsn/util.cpp } size_t size1 = s1.size(), size2 = s2.size(); return (int) (size1 - size2); -@@ -358,11 +358,11 @@ +@@ -358,11 +358,11 @@ namespace MSN int FileSize(const char* sFileName) { std::ifstream f; @@ -66,32 +152,10 @@ Index: libs/libmsn/util.cpp return static_cast(f.tellg() - begin_pos); } -Index: libs/libmsn/message.cpp -=================================================================== ---- libs/libmsn/message.cpp (revision 36) -+++ libs/libmsn/message.cpp (working copy) -@@ -124,7 +124,7 @@ - { - std::string color = this->getFormatInfo()["CO"]; - assert(color.size() <= 6 && color.size() >= 0); -- color.insert(0U, 6 - color.size(), '0'); -+ color.insert((size_t)0, (size_t)(6 - color.size()), '0'); - int r = 0, g = 0, b = 0; - - b = strtol(color.substr(0, 2).c_str(), NULL, 16); -@@ -167,7 +167,7 @@ - - void Message::setColor(std::string color) - { -- color.insert(0U, 6 - color.size(), '0'); -+ color.insert((size_t)0, (size_t)(6 - color.size()), '0'); - int r = 0, g = 0, b = 0; - - r = strtol(color.substr(0, 2).c_str(), NULL, 16); -Index: libs/libyahoo2/yahoo_httplib.c -=================================================================== ---- libs/libyahoo2/yahoo_httplib.c (revision 36) -+++ libs/libyahoo2/yahoo_httplib.c (working copy) +diff --git a/libs/libyahoo2/yahoo_httplib.c b/libs/libyahoo2/yahoo_httplib.c +index 049f6e7..d2f6a53 100755 +--- a/libs/libyahoo2/yahoo_httplib.c ++++ b/libs/libyahoo2/yahoo_httplib.c @@ -29,19 +29,7 @@ #include #include @@ -112,7 +176,7 @@ Index: libs/libyahoo2/yahoo_httplib.c #include #if HAVE_UNISTD_H -@@ -374,7 +362,6 @@ +@@ -374,7 +362,6 @@ void yahoo_http_get(int id, const char *url, const char *cookies, int http11, void yahoo_http_head(int id, const char *url, const char *cookies, int len, char *payload, yahoo_get_fd_callback callback, void *data) { @@ -120,69 +184,11 @@ Index: libs/libyahoo2/yahoo_httplib.c char host[255]; int port = 80; char path[255]; -Index: libs/libgloox/parser.cpp -=================================================================== ---- libs/libgloox/parser.cpp (revision 36) -+++ libs/libgloox/parser.cpp (working copy) -@@ -141,7 +141,7 @@ - { - if( pos + needle.length() <= data.length() ) - { -- if( !data.compare( pos, needle.length(), needle ) ) -+ if( !data.compare(pos, needle.length(), needle ) ) - { - pos += needle.length() - 1; - return ForwardFound; -Index: libs/libgloox/siprofileft.cpp -=================================================================== ---- libs/libgloox/siprofileft.cpp (revision 36) -+++ libs/libgloox/siprofileft.cpp (working copy) -@@ -84,11 +84,11 @@ - DataFormField* dff = df.addField( DataFormField::TypeListSingle, "stream-method" ); - StringMultiMap sm; - if( streamTypes & FTTypeS5B ) -- sm.insert( std::make_pair( "s5b", XMLNS_BYTESTREAMS ) ); -+ sm.insert( std::make_pair( "s5b", XMLNS_BYTESTREAMS ) ); - if( streamTypes & FTTypeIBB ) -- sm.insert( std::make_pair( "ibb", XMLNS_IBB ) ); -+ sm.insert( std::make_pair( "ibb", XMLNS_IBB ) ); - if( streamTypes & FTTypeOOB ) -- sm.insert( std::make_pair( "oob", XMLNS_IQ_OOB ) ); -+ sm.insert( std::make_pair( "oob", XMLNS_IQ_OOB ) ); - dff->setOptions( sm ); - feature->addChild( df.tag() ); - -Index: libs/libgloox/connectionbosh.cpp -=================================================================== ---- libs/libgloox/connectionbosh.cpp (revision 36) -+++ libs/libgloox/connectionbosh.cpp (working copy) -@@ -303,7 +303,7 @@ - - bool ci_equal( char ch1, char ch2 ) - { -- return std::toupper( (unsigned char)ch1 ) == std::toupper( (unsigned char)ch2 ); -+ return toupper( (unsigned char)ch1 ) == toupper( (unsigned char)ch2 ); - } - - std::string::size_type ci_find( const std::string& str1, const std::string& str2 ) -Index: libs/libgloox/gloox.h -=================================================================== ---- libs/libgloox/gloox.h (revision 36) -+++ libs/libgloox/gloox.h (working copy) -@@ -1214,7 +1214,7 @@ - /** - * A multimap of strings. - */ -- typedef std::multimap StringMultiMap; -+ typedef std::multimap StringMultiMap; - - class StanzaExtension; - /** -Index: protocols/msn/MSN.cpp -=================================================================== ---- protocols/msn/MSN.cpp (revision 36) -+++ protocols/msn/MSN.cpp (working copy) -@@ -52,7 +52,7 @@ +diff --git a/protocols/msn/MSN.cpp b/protocols/msn/MSN.cpp +index 087b949..e987c27 100644 +--- a/protocols/msn/MSN.cpp ++++ b/protocols/msn/MSN.cpp +@@ -52,7 +52,7 @@ const char* kProtocolName = "MSN Protocol"; const uint32 kAvatarCheckMessage = 'AVMs'; struct pollfd* kPollSockets = NULL; @@ -191,7 +197,7 @@ Index: protocols/msn/MSN.cpp bool isSSL; bool isConnected; SSL *ssl; -@@ -718,7 +718,7 @@ +@@ -718,7 +718,7 @@ void MSNP::registerSocket(void *s, int reading, int writing, bool isSSL) return; } @@ -200,11 +206,11 @@ Index: protocols/msn/MSN.cpp if (kSocketsSsl == NULL) { Error("Memory Error!!\n", NULL); return; -Index: protocols/xmpp/Jamfile -=================================================================== ---- protocols/xmpp/Jamfile (revision 36) -+++ protocols/xmpp/Jamfile (working copy) -@@ -2,6 +2,7 @@ +diff --git a/protocols/xmpp/Jamfile b/protocols/xmpp/Jamfile +index 34351ec..3848ff7 100644 +--- a/protocols/xmpp/Jamfile ++++ b/protocols/xmpp/Jamfile +@@ -2,6 +2,7 @@ SubDir TOP protocols xmpp ; SubDirSysHdrs [ FDirName $(TOP) ] ; SubDirSysHdrs [ FDirName $(TOP) libs ] ; @@ -212,3 +218,6 @@ Index: protocols/xmpp/Jamfile SubDirSysHdrs [ FDirName $(OPENSSL_INCLUDE_DIR) ] ; SubDirSysHdrs [ FDirName $(CAYA_INCLUDE_DIR) ] ; +-- +1.8.3.4 + From 90490ce5919c5532b5036f53e30c51da6ef85420 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 5 Oct 2013 14:33:14 +0200 Subject: [PATCH 541/587] Get Caya protocol add-ons to work again. --- haiku-apps/caya/caya-293.recipe | 9 +- haiku-apps/caya/patches/caya-293.patchset | 49 ++++++++ .../caya_gpl_protocols-36.recipe | 28 ++--- .../patches/caya_gpl_protocols-36.patchset | 109 +++++++++++++++++- 4 files changed, 174 insertions(+), 21 deletions(-) diff --git a/haiku-apps/caya/caya-293.recipe b/haiku-apps/caya/caya-293.recipe index c75d6c0ed..fbf25e70e 100644 --- a/haiku-apps/caya/caya-293.recipe +++ b/haiku-apps/caya/caya-293.recipe @@ -1,7 +1,7 @@ SUMMARY="Caya is a multiprotocol IM client." HOMEPAGE="http://dev.osdrawer.net/projects/caya" SRC_URI="svn+http://svn.osdrawer.net/caya/trunk#293" -REVISION="1" +REVISION="2" ARCHITECTURES="x86 x86_gcc2" PROVIDES=" @@ -23,14 +23,10 @@ BUILD_PREREQUIRES=" cmd:which " -PATCH() +BUILD() { mkdir -p $sourceDir/generated/objects-haiku-x86-gcc2-debug/application echo $portVersion > $sourceDir/generated/objects-haiku-x86-gcc2-debug/application/svn_revision -} - -BUILD() -{ ./configure jam } @@ -45,6 +41,7 @@ INSTALL() cp generated/distro-haiku-*-debug/Caya $appsDir/Caya cp generated/distro-haiku-*-debug/aim $appsDir/Caya/protocols cp smileys/*.gif smileys/settings.xml $appsDir/Caya/smileys + cp application/Caya.h $includeDir/caya/ cp application/CayaProtocol.h $includeDir/caya/ cp application/CayaConstants.h $includeDir/caya/ cp application/CayaProtocolMessages.h $includeDir/caya/ diff --git a/haiku-apps/caya/patches/caya-293.patchset b/haiku-apps/caya/patches/caya-293.patchset index e69de29bb..05202ecd3 100644 --- a/haiku-apps/caya/patches/caya-293.patchset +++ b/haiku-apps/caya/patches/caya-293.patchset @@ -0,0 +1,49 @@ +From abd4aac88a07ea0a9967be553833a121bf98ccf9 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 13:17:26 +0200 +Subject: Fix gcc4 detection + + +diff --git a/build/jam/CheckRules b/build/jam/CheckRules +index 6fbc213..294fab7 100644 +--- a/build/jam/CheckRules ++++ b/build/jam/CheckRules +@@ -14,7 +14,7 @@ rule CheckGccPlatform + # /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus + # gcc 2 platform. This is not entirely correct, but should be good enough + # for the time being. +- local haveLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ; ++ local haveLibStdC++.R4 = [ Glob /boot/system/develop/tools/lib : libstdc++.r4.so ] ; + if ! $(haveLibStdC++.R4) { + IS_GCC4_PLATFORM = 1 ; + Echo Using GCC4 platform ; +-- +1.8.3.4 + + +From db90c28cb36b59a010abec5406f77c1c4135f378 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 13:19:23 +0200 +Subject: Let haikuporter compute the version + + * The .svn dir isn't available in the chroot, so there is no way it can +be used to detect the SVN revision. + +diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules +index 292a2a5..314c4d7 100644 +--- a/build/jam/MainBuildRules ++++ b/build/jam/MainBuildRules +@@ -368,9 +368,7 @@ rule CreateSVNRevisionFile file + { + # CreateSVNRevisionFile + +- local svnEntries = entries ; +- SEARCH on $(svnEntries) = [ FDirName $(TOP) .svn ] ; +- Depends $(file) : $(svnEntries) ; ++ # Let haikuporter do it as the .svn dir is removed on checkout + } + + actions CreateSVNRevisionFile +-- +1.8.3.4 + 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 79fc2deed..cb9dd4d2c 100644 --- a/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe +++ b/haiku-apps/caya_gpl_protocols/caya_gpl_protocols-36.recipe @@ -2,27 +2,27 @@ SUMMARY="MSN and XMPPprotocols for Caya" HOMEPAGE="http://dev.osdrawer.net/projects/caya-gpl-protocols" SRC_URI="svn+http://svn.osdrawer.net/caya-gpl-protocols/trunk#36" REVISION="1" -SUPPLEMENTS="caya" -ARCHITECTURES="!x86 !x86_gcc2" +ARCHITECTURES="x86 x86_gcc2" +#SUPPLEMENTS="caya" PROVIDES=" caya_gpl_protocols = $portVersion " -REQUIRES=" - caya - " - +SUPPLEMENTS="caya" BUILD_REQUIRES=" caya + lib:libssl + devel:libssl + devel:libz " - BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:jam cmd:gcc cmd:which " -PATCH="caya_gpl_protocol-36.patchset" +PATCHES="caya_gpl_protocols-36.patchset" BUILD() { @@ -32,12 +32,12 @@ BUILD() INSTALL() { - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/msn ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/gtalk ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/facebook ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/jabber ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols - cp generated/distro-haiku-x86-gcc4-debug/yahoo ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Caya/protocols + mkdir -p $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/msn $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/gtalk $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/facebook $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/jabber $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/yahoo $appsDir/Caya/protocols } LICENSE="GNU GPL v2" diff --git a/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-36.patchset b/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-36.patchset index efb75e7f2..f928bb875 100644 --- a/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-36.patchset +++ b/haiku-apps/caya_gpl_protocols/patches/caya_gpl_protocols-36.patchset @@ -1,4 +1,4 @@ -From 2fcbc23eca1e8c07e03ecffcbb4ecbfce71b3757 Mon Sep 17 00:00:00 2001 +From 9be75f010b3e37caf04d79ede962676731c6ded9 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 3 Oct 2013 22:52:00 +0200 Subject: Import gcc2 compatibility fixes. @@ -221,3 +221,110 @@ index 34351ec..3848ff7 100644 -- 1.8.3.4 + +From 26bcbc64e44c24a09085fa6d4d86bf05e2213035 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 14:01:13 +0200 +Subject: Fixes for directory moves in PM-Haiku + + +diff --git a/build/jam/CheckRules b/build/jam/CheckRules +index ac2e326..334eee2 100644 +--- a/build/jam/CheckRules ++++ b/build/jam/CheckRules +@@ -14,7 +14,7 @@ rule CheckGccPlatform + # /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus + # gcc 2 platform. This is not entirely correct, but should be good enough + # for the time being. +- local haveLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ; ++ local haveLibStdC++.R4 = [ Glob /boot/system/develop/tools/lib : libstdc++.r4.so ] ; + if ! $(haveLibStdC++.R4) { + IS_GCC4_PLATFORM = 1 ; + Echo Using GCC4 platform ; +diff --git a/configure b/configure +index 6879cee..55a6251 100755 +--- a/configure ++++ b/configure +@@ -122,22 +122,21 @@ MIMESET = ${mimesetbin} ; + SETVERSION = ${setversionbin} ; + COPYATTR = ${copyattrbin} ; + +-COMMON_DIRECTORY = $(finddir B_COMMON_DIRECTORY) ; +-COMMON_BIN_DIRECTORY = $(finddir B_COMMON_BIN_DIRECTORY) ; +-COMMON_INCLUDE_DIRECTORY = $(finddir B_COMMON_DIRECTORY)/include ; +-COMMON_LIB_DIRECTORY = $(finddir B_COMMON_LIB_DIRECTORY) ; +-COMMON_SERVERS_DIRECTORY = $(finddir B_COMMON_SERVERS_DIRECTORY) ; +-COMMON_ADDONS_DIRECTORY = $(finddir B_COMMON_ADDONS_DIRECTORY) ; +-COMMON_DEVELOP_DIRECTORY = $(finddir B_COMMON_DEVELOP_DIRECTORY) ; ++COMMON_BIN_DIRECTORY = $binDir ; ++COMMON_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ; ++COMMON_LIB_DIRECTORY = $libDir ; ++COMMON_SERVERS_DIRECTORY = $(finddir B_SYSTEM_SERVERS_DIRECTORY) ; ++COMMON_ADDONS_DIRECTORY = $(finddir B_SYSTEM_ADDONS_DIRECTORY) ; ++COMMON_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ; + USER_CONFIG_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY) ; +-USER_INCLUDE_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY)/include ; ++USER_INCLUDE_DIRECTORY = $includeDir ; + SYSTEM_DIRECTORY = $(finddir B_SYSTEM_DIRECTORY) ; +-SYSTEM_LIB_DIRECTORY = $(finddir B_SYSTEM_LIB_DIRECTORY) ; ++SYSTEM_LIB_DIRECTORY = $libDir ; + BEOS_PREFERENCES_DIRECTORY = $(finddir B_BEOS_PREFERENCES_DIRECTORY) ; + PREFERENCES_DIRECTORY = $(finddir B_PREFERENCES_DIRECTORY) ; + USER_PREFERENCES_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY)/be/Preferences ; +-APPS_DIRECTORY = $(finddir B_APPS_DIRECTORY) ; +-CAYA_DIRECTORY = $(finddir B_APPS_DIRECTORY)/Caya ; ++APPS_DIRECTORY = $appsDir ; ++CAYA_DIRECTORY = $appsDir/Caya ; + + DEFINES += ${defines} ; + EOF +-- +1.8.3.4 + + +From 31ebae4d014682f95d0e1cc0d0ec6444619d59f2 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 14:12:42 +0200 +Subject: Use BeOS broken prototype for string::compare + + * Our C++ lib has the args in the wrong order + +diff --git a/libs/libgloox/parser.cpp b/libs/libgloox/parser.cpp +index 5884624..5a406d2 100644 +--- a/libs/libgloox/parser.cpp ++++ b/libs/libgloox/parser.cpp +@@ -141,7 +141,7 @@ namespace gloox + { + if( pos + needle.length() <= data.length() ) + { +- if( !data.compare(pos, needle.length(), needle ) ) ++ if( !data.compare(needle, pos, needle.length()) ) + { + pos += needle.length() - 1; + return ForwardFound; +-- +1.8.3.4 + + +From 53370d0138ccb68d6fb4eb7b06ae1493fab140b7 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 14:31:20 +0200 +Subject: Fix lib directory so configure script finds OpenSSL + + +diff --git a/configure b/configure +index 55a6251..ca177ba 100755 +--- a/configure ++++ b/configure +@@ -124,7 +124,7 @@ COPYATTR = ${copyattrbin} ; + + COMMON_BIN_DIRECTORY = $binDir ; + COMMON_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ; +-COMMON_LIB_DIRECTORY = $libDir ; ++COMMON_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ; + COMMON_SERVERS_DIRECTORY = $(finddir B_SYSTEM_SERVERS_DIRECTORY) ; + COMMON_ADDONS_DIRECTORY = $(finddir B_SYSTEM_ADDONS_DIRECTORY) ; + COMMON_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ; +-- +1.8.3.4 + From 3694c8d378053db9e0623ab8d63288e9373b149e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 5 Oct 2013 15:56:10 +0200 Subject: [PATCH 542/587] Do not put the headers in a subdirectory * This makes CMake unable to find them * There is no use for this as there is only a single header file --- app-arch/bzip2/bzip2-1.0.6.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe index 6146ddffe..9a16b40a6 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="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" @@ -59,7 +59,7 @@ INSTALL() rmdir $prefix/man # move headers - bzip2IncludeDir=$includeDir/bzip2 + bzip2IncludeDir=$includeDir mkdir -p $bzip2IncludeDir mv $prefix/include/* $bzip2IncludeDir rmdir $prefix/include From e8f770289844ae315e1c48d799ed0884b09c9df3 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 5 Oct 2013 17:25:22 +0200 Subject: [PATCH 543/587] Cleanuup the cmake patchset for upstream submission. --- .../cmake/patches/cmake-2.8.11.2.patchset | 780 ++++++++---------- 1 file changed, 365 insertions(+), 415 deletions(-) diff --git a/dev-util/cmake/patches/cmake-2.8.11.2.patchset b/dev-util/cmake/patches/cmake-2.8.11.2.patchset index 7998b985a..75f921368 100644 --- a/dev-util/cmake/patches/cmake-2.8.11.2.patchset +++ b/dev-util/cmake/patches/cmake-2.8.11.2.patchset @@ -1,44 +1,41 @@ -From 7832e4b405ad774c3dae10607707745677723f66 Mon Sep 17 00:00:00 2001 +From a88d3007575ab7e79d80d955022d6eb1755e6245 Mon Sep 17 00:00:00 2001 From: Adrien Destugues -Date: Tue, 1 Oct 2013 10:36:36 +0200 -Subject: Convert existing patch to patchset format. +Date: Sat, 5 Oct 2013 16:26:02 +0200 +Subject: Several fixes to Haiku platform module - * This will need cleanup, but it will do for now. + * Do not define BEOS anymore (this includes workarounds which we don't + need most of the time in Haiku, so we prefer opt-in IF(HAIKU) in the + cmake files instead). + * On the other hand, do define UNIX (we are trying to be compliant) and + HAIKU (there is still a number of things we don't do like the + average UNIX clone) + * Do not use UnixPaths, as our filesystem hierarchy isn't anything like + what it expects. + * Do not use -nostart, which the compiler doesn't know about anymore. + This used to be an Haiku extension to gcc, and is equivalent to + -shared which is the default gcc option. + * While "dl" functions are provided in libroot, this is always + implicitly linked so there is no need to tell cmake about it. + * Forcing position-independent code is not needed, so remove it. + * On the other hand, include appropriate linker options for executables + and shared libraries. + * Support for the two available compilers in Haiku (gcc2 and gcc4) and + pick the right headers and libraries according to the currently + selected one. + * With the adoption of the package manager, the directory layout was + changed. Tell cmake where to look for header files and libraries. -diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake -index 1df2399..2a68616 100644 ---- a/Modules/FindFreetype.cmake -+++ b/Modules/FindFreetype.cmake -@@ -50,6 +50,7 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h - /usr/local/X11R6 - /usr/local/X11 - /usr/freeware -+ /boot/common/develop/headers - PATH_SUFFIXES include/freetype2 include - ) - -@@ -61,6 +62,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h - /usr/local/X11R6 - /usr/local/X11 - /usr/freeware -+ /boot/common/develop/headers - PATH_SUFFIXES include/freetype2 include - ) - -@@ -74,6 +76,7 @@ find_library(FREETYPE_LIBRARY - /usr/local/X11R6 - /usr/local/X11 - /usr/freeware -+ /boot/develop/lib - ) - - # set the user variables diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake -index 8987783..3236b58 100644 +index 8987783..2f8125d 100644 --- a/Modules/Platform/Haiku.cmake +++ b/Modules/Platform/Haiku.cmake -@@ -1,20 +1,25 @@ +@@ -1,22 +1,123 @@ -set(BEOS 1) ++# process only once ++if(HAIKU) ++ return() ++endif() ++ +set(HAIKU 1) +set(UNIX 1) @@ -54,311 +51,7 @@ index 8987783..3236b58 100644 +set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") +set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") - --include(Platform/UnixPaths) --list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) --list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) --list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) --list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) --list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) -+list(APPEND CMAKE_SYSTEM_PREFIX_PATH -+ /boot/common/non-packaged -+ /boot/common -+ /boot/system -+ ) -+list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -+ /boot/common/non-packaged/lib -+ /boot/common/lib -+ /boot/develop/lib/x86 -+ ) - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) - -diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx -index 7cc1522..5d66522 100644 ---- a/Source/CPack/cmCPackGenerator.cxx -+++ b/Source/CPack/cmCPackGenerator.cxx -@@ -26,7 +26,8 @@ - #include - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - //---------------------------------------------------------------------- -@@ -1263,10 +1264,10 @@ const char* cmCPackGenerator::GetInstallPath() - this->InstallPath += "-"; - this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); - #elif defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) - { -- this->InstallPath = dir.Path(); -+ this->InstallPath = dir; - } - else - { -diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx -index 1cc1754..fcb66a7 100644 ---- a/Source/cmExportCommand.cxx -+++ b/Source/cmExportCommand.cxx -@@ -20,7 +20,8 @@ - #include "cmExportBuildFileGenerator.h" - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - cmExportCommand::cmExportCommand() -@@ -305,14 +306,15 @@ void cmExportCommand::StorePackageRegistryDir(std::string const& package, - const char* hash) - { - #if defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) != -+ B_OK) - { - return; - } -- dir.Append("cmake/packages"); -- dir.Append(package.c_str()); -- std::string fname = dir.Path(); -+ std::string fname = dir; -+ fname += "/cmake/packages/"; -+ fname += package; - #else - const char* home = cmSystemTools::GetEnv("HOME"); - if(!home) -diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx -index aa3a73d..a09958b 100644 ---- a/Source/cmFindPackageCommand.cxx -+++ b/Source/cmFindPackageCommand.cxx -@@ -19,7 +19,9 @@ - #endif - - #if defined(__HAIKU__) --#include -+#include -+#include -+#include - #endif - - void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, -@@ -1584,12 +1586,13 @@ void cmFindPackageCommand::AddPrefixesUserRegistry() - #if defined(_WIN32) && !defined(__CYGWIN__) - this->LoadPackageRegistryWinUser(); - #elif defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == -+ B_OK) - { -- dir.Append("cmake/packages"); -- dir.Append(this->Name.c_str()); -- this->LoadPackageRegistryDir(dir.Path()); -+ strlcat(dir, "/cmake/packages/", sizeof(dir)); -+ strlcat(dir, this->Name.c_str(), sizeof(dir)); -+ this->LoadPackageRegistryDir(dir); - } - #else - if(const char* home = cmSystemTools::GetEnv("HOME")) -diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx -index ee5b9d8..ba8faf3 100644 ---- a/Source/cmLocalGenerator.cxx -+++ b/Source/cmLocalGenerator.cxx -@@ -37,7 +37,8 @@ - #include - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - cmLocalGenerator::cmLocalGenerator() -@@ -354,12 +355,12 @@ void cmLocalGenerator::GenerateInstallRules() - prefix = prefix_win32.c_str(); - } - #elif defined(__HAIKU__) -+ char dir[B_PATH_NAME_LENGTH]; - if (!prefix) - { -- BPath dir; -- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) -+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) - { -- prefix = dir.Path(); -+ prefix = dir; - } - else - { -diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt -index 5c43052..f00cbd6 100644 ---- a/Tests/ComplexOneConfig/Library/CMakeLists.txt -+++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt -@@ -51,7 +51,7 @@ define_property( - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" - ) - set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) --if(NOT BEOS AND NOT WIN32) # No libm on BeOS. -+if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. - set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") - endif() - get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) -diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c -index d74a4f0..c5ba7c2 100644 ---- a/Utilities/cmcurl/CMake/CurlTests.c -+++ b/Utilities/cmcurl/CMake/CurlTests.c -@@ -38,7 +38,7 @@ main () - # define PLATFORM_AIX_V3 - #endif - --#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) -+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) - #error "O_NONBLOCK does not work on this platform" - #endif - int socket; -diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/select.c -index 51adbcf..82f9dc2 100644 ---- a/Utilities/cmcurl/select.c -+++ b/Utilities/cmcurl/select.c -@@ -39,7 +39,7 @@ - #error "We can't compile without select() support!" - #endif - --#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) - /* BeOS has FD_SET defined in socket.h */ - #include - #endif -diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h -index 6eb52d1..7a3b6fd 100644 ---- a/Utilities/cmzlib/zconf.h -+++ b/Utilities/cmzlib/zconf.h -@@ -237,7 +237,7 @@ - # endif - #endif - --#if defined (__BEOS__) && !defined (__HAIKU__) -+#if defined (__BEOS__) - # ifdef ZLIB_DLL - # ifdef ZLIB_INTERNAL - # define ZEXPORT __declspec(dllexport) --- -1.8.3.4 - - -From 305991d869191c373398acc9605d29a92bf2b069 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Wed, 2 Oct 2013 15:22:57 +0200 -Subject: Fix include and lib search pathes - - * For gcc2, look in the legacy (no arch) direcotry. - * For gcc4, look inthe the platform dir (currently hardcoded to x86) - * This was tested only on gcc2hybrid. I'm not sure it matches other -platforms. - -diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake -index 3236b58..dfb3526 100644 ---- a/Modules/Platform/Haiku.cmake -+++ b/Modules/Platform/Haiku.cmake -@@ -10,18 +10,33 @@ set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") - set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") - set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") - -+# FIXME need to detect if we are on gcc4 or gcc4hybrid, the path are different -+if(CMAKE_C_COMPILER_VERSION VERSION_LESS 3.0.0) -+ # Use gcc2 libs -+ set(__HAIKU_LIBDIR_SUFFIX "") -+else() -+ # Use gcc4 libs -+ set(__HAIKU_LIBDIR_SUFFIX "/x86") -+endif() + - list(APPEND CMAKE_SYSTEM_PREFIX_PATH - /boot/common/non-packaged - /boot/common - /boot/system - ) - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /boot/common/non-packaged/lib -- /boot/common/lib -- /boot/develop/lib/x86 -+ /boot/common/non-packaged/lib${__HAIKU_LIBDIR_SUFFIX} -+ /boot/common/develop/lib${__HAIKU_LIBDIR_SUFFIX} -+ /boot/system/develop/lib${__HAIKU_LIBDIR_SUFFIX} -+ ) -+list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -+ /boot/common/develop/headers${__HAIKU_LIBDIR_SUFFIX} -+ /boot/system/develop/headers${__HAIKU_LIBDIR_SUFFIX} -+ ) -+list(APPEND CMAKE_SYSTEM_LIBRARY_PATH -+ /boot/common/develop/lib${__HAIKU_LIBDIR_SUFFIX} -+ /boot/system/develop/lib${__HAIKU_LIBDIR_SUFFIX} - ) --list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) --list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) - - if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH --- -1.8.3.4 - - -From be0844f3d3b16856732f3336053896df077d3317 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Thu, 3 Oct 2013 08:40:31 +0200 -Subject: Merge changes from our CMake 2.8.5 patchset - - * This one had already been modified for better PM support. - * Also includes some cleanups, which we should upstream - -diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake -index a2bf0c0..770e93a 100644 ---- a/Modules/FindLua51.cmake -+++ b/Modules/FindLua51.cmake -@@ -54,7 +54,7 @@ find_library(LUA_LIBRARY - - if(LUA_LIBRARY) - # include the math library for Unix -- if(UNIX AND NOT APPLE AND NOT BEOS) -+ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) - find_library(LUA_MATH_LIBRARY m) - set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") - # For Windows and Mac, don't need to explicitly include the math library -diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake -index dfb3526..2f8125d 100644 ---- a/Modules/Platform/Haiku.cmake -+++ b/Modules/Platform/Haiku.cmake -@@ -1,3 +1,8 @@ -+# process only once -+if(HAIKU) -+ return() -+endif() -+ - set(HAIKU 1) - set(UNIX 1) - -@@ -10,34 +15,110 @@ set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") - set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") - set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") - --# FIXME need to detect if we are on gcc4 or gcc4hybrid, the path are different --if(CMAKE_C_COMPILER_VERSION VERSION_LESS 3.0.0) -- # Use gcc2 libs -- set(__HAIKU_LIBDIR_SUFFIX "") --else() -- # Use gcc4 libs -- set(__HAIKU_LIBDIR_SUFFIX "/x86") +# Determine, if the C or C++ compiler is configured for a secondary +# architecture. If so, that will change the search paths we set below. We check +# whether the compiler's library search paths contain a @@ -369,8 +62,8 @@ index dfb3526..2f8125d 100644 + +if("${__HAIKU_COMPILER}" STREQUAL "") + set(__HAIKU_COMPILER ${CMAKE_CXX_COMPILER}) - endif() - ++endif() ++ +execute_process( + COMMAND ${__HAIKU_COMPILER} -print-search-dirs + COMMAND sed -ne "/^libraries:/!d; s,libraries: =*\\(.*\\):,\\1,; s,:,\\n,gp" @@ -396,15 +89,11 @@ index dfb3526..2f8125d 100644 + set(CMAKE_CXX_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) +endif("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "") + - list(APPEND CMAKE_SYSTEM_PREFIX_PATH - /boot/common/non-packaged - /boot/common - /boot/system - ) --list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /boot/common/non-packaged/lib${__HAIKU_LIBDIR_SUFFIX} -- /boot/common/develop/lib${__HAIKU_LIBDIR_SUFFIX} -- /boot/system/develop/lib${__HAIKU_LIBDIR_SUFFIX} ++list(APPEND CMAKE_SYSTEM_PREFIX_PATH ++ /boot/common/non-packaged ++ /boot/common ++ /boot/system ++ ) + +LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES + /boot/common/non-packaged/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} @@ -448,10 +137,7 @@ index dfb3526..2f8125d 100644 + +LIST(APPEND CMAKE_HAIKU_C_INCLUDE_DIRECTORIES + ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES} - ) --list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- /boot/common/develop/headers${__HAIKU_LIBDIR_SUFFIX} -- /boot/system/develop/headers${__HAIKU_LIBDIR_SUFFIX} ++ ) + +LIST(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES + ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES}) @@ -462,51 +148,133 @@ index dfb3526..2f8125d 100644 + /boot/common/non-packaged/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} + /boot/common/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} + /boot/system/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} - ) --list(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- /boot/common/develop/lib${__HAIKU_LIBDIR_SUFFIX} -- /boot/system/develop/lib${__HAIKU_LIBDIR_SUFFIX} ++ ) + +LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES + ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES} - ) ++ ) +-include(Platform/UnixPaths) +-list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) +-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) +-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) +LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES}) -+ + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH - "Install path prefix, prepended onto install directories." FORCE) -diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx -index 322a6a2..2aaedec 100644 ---- a/Source/cmCTest.cxx -+++ b/Source/cmCTest.cxx -@@ -53,14 +53,10 @@ - #include - #include +-- +1.8.3.4 + + +From c34471ea6e9b64d962ba385df0f1dee078b8ba77 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 16:31:36 +0200 +Subject: Remove use of B_COMMON_DIRECTORY + + * The common directory was removed in Haiku. Applications are now + installed in the system directory. + +diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx +index 7cc1522..de394a6 100644 +--- a/Source/CPack/cmCPackGenerator.cxx ++++ b/Source/CPack/cmCPackGenerator.cxx +@@ -26,7 +26,8 @@ + #include --#if defined(__BEOS__) -+#if defined(__BEOS__) || defined(__HAIKU__) - #include /* disable_debugger() API. */ + #if defined(__HAIKU__) +-#include ++#include ++#include #endif --#if defined(__HAIKU__) --#include /* disable_debugger() API. */ --#endif -- + //---------------------------------------------------------------------- +@@ -1263,14 +1264,14 @@ const char* cmCPackGenerator::GetInstallPath() + this->InstallPath += "-"; + this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_SYSTEM_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- this->InstallPath = dir.Path(); ++ this->InstallPath = dir; + } + else + { +- this->InstallPath = "/boot/common"; ++ this->InstallPath = "/boot/system"; + } + #else + this->InstallPath = "/usr/local/"; +diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx +index 1cc1754..fcb66a7 100644 +--- a/Source/cmExportCommand.cxx ++++ b/Source/cmExportCommand.cxx +@@ -20,7 +20,8 @@ + #include "cmExportBuildFileGenerator.h" - #define DEBUGOUT std::cout << __LINE__ << " "; std::cout - #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + cmExportCommand::cmExportCommand() +@@ -305,14 +306,15 @@ void cmExportCommand::StorePackageRegistryDir(std::string const& package, + const char* hash) + { + #if defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK) ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) != ++ B_OK) + { + return; + } +- dir.Append("cmake/packages"); +- dir.Append(package.c_str()); +- std::string fname = dir.Path(); ++ std::string fname = dir; ++ fname += "/cmake/packages/"; ++ fname += package; + #else + const char* home = cmSystemTools::GetEnv("HOME"); + if(!home) diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx -index a09958b..6dd2f49 100644 +index aa3a73d..6dd2f49 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx -@@ -1590,9 +1590,10 @@ void cmFindPackageCommand::AddPrefixesUserRegistry() - if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == - B_OK) - { -- strlcat(dir, "/cmake/packages/", sizeof(dir)); -- strlcat(dir, this->Name.c_str(), sizeof(dir)); -- this->LoadPackageRegistryDir(dir); +@@ -19,7 +19,9 @@ + #endif + + #if defined(__HAIKU__) +-#include ++#include ++#include ++#include + #endif + + void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, +@@ -1584,12 +1586,14 @@ void cmFindPackageCommand::AddPrefixesUserRegistry() + #if defined(_WIN32) && !defined(__CYGWIN__) + this->LoadPackageRegistryWinUser(); + #elif defined(__HAIKU__) +- BPath dir; +- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK) +- { +- dir.Append("cmake/packages"); +- dir.Append(this->Name.c_str()); +- this->LoadPackageRegistryDir(dir.Path()); ++ char dir[B_PATH_NAME_LENGTH]; ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == ++ B_OK) ++ { + std::string fname = dir; + fname += "/cmake/packages/"; + fname += Name; @@ -514,6 +282,55 @@ index a09958b..6dd2f49 100644 } #else if(const char* home = cmSystemTools::GetEnv("HOME")) +diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx +index ee5b9d8..1369dab 100644 +--- a/Source/cmLocalGenerator.cxx ++++ b/Source/cmLocalGenerator.cxx +@@ -37,7 +37,8 @@ + #include + + #if defined(__HAIKU__) +-#include ++#include ++#include + #endif + + cmLocalGenerator::cmLocalGenerator() +@@ -354,16 +355,16 @@ void cmLocalGenerator::GenerateInstallRules() + prefix = prefix_win32.c_str(); + } + #elif defined(__HAIKU__) ++ char dir[B_PATH_NAME_LENGTH]; + if (!prefix) + { +- BPath dir; +- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) ++ if (find_directory(B_SYSTEM_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) + { +- prefix = dir.Path(); ++ prefix = dir; + } + else + { +- prefix = "/boot/common"; ++ prefix = "/boot/system"; + } + } + #else +-- +1.8.3.4 + + +From bdcc8b10fde413e121e4a043210a5a477db51232 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 16:33:52 +0200 +Subject: Remove useless preprocessor checks + + * Haiku does not define __BEOS__ anymore, so there is no need to guard + these BeOS specific workaround for Haiku. + * The workaround themselves are not needed for Haiku as it has much + better POSIX compatibility than BeOS did. + diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 8b25d60..51dba3c 100644 --- a/Source/kwsys/SystemTools.cxx @@ -530,39 +347,45 @@ index 8b25d60..51dba3c 100644 #if defined(__BEOS__) && !defined(__ZETA__) #include #include -diff --git a/Source/kwsys/testDynamicLoader.cxx b/Source/kwsys/testDynamicLoader.cxx -index 61c1572..fc0215e 100644 ---- a/Source/kwsys/testDynamicLoader.cxx -+++ b/Source/kwsys/testDynamicLoader.cxx -@@ -15,14 +15,10 @@ - #include KWSYS_HEADER(ios/iostream) - #include KWSYS_HEADER(stl/string) - --#if defined(__BEOS__) -+#if defined(__BEOS__) || defined(__HAIKU__) - #include /* disable_debugger() API. */ +diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c +index d74a4f0..c5ba7c2 100644 +--- a/Utilities/cmcurl/CMake/CurlTests.c ++++ b/Utilities/cmcurl/CMake/CurlTests.c +@@ -38,7 +38,7 @@ main () + # define PLATFORM_AIX_V3 #endif --#if defined(__HAIKU__) --#include /* disable_debugger() API. */ --#endif -- - // Work-around CMake dependency scanning limitation. This must - // duplicate the above list of headers. - #if 0 -diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt -index 5c43052..f00cbd6 100644 ---- a/Tests/Complex/Library/CMakeLists.txt -+++ b/Tests/Complex/Library/CMakeLists.txt -@@ -51,7 +51,7 @@ define_property( - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" - ) - set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) --if(NOT BEOS AND NOT WIN32) # No libm on BeOS. -+if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. - set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") - endif() - get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) +-#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) ++#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) + #error "O_NONBLOCK does not work on this platform" + #endif + int socket; +diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/select.c +index 51adbcf..82f9dc2 100644 +--- a/Utilities/cmcurl/select.c ++++ b/Utilities/cmcurl/select.c +@@ -39,7 +39,7 @@ + #error "We can't compile without select() support!" + #endif + +-#if defined(__BEOS__) && !defined(__HAIKU__) ++#if defined(__BEOS__) + /* BeOS has FD_SET defined in socket.h */ + #include + #endif +diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h +index 6eb52d1..7a3b6fd 100644 +--- a/Utilities/cmzlib/zconf.h ++++ b/Utilities/cmzlib/zconf.h +@@ -237,7 +237,7 @@ + # endif + #endif + +-#if defined (__BEOS__) && !defined (__HAIKU__) ++#if defined (__BEOS__) + # ifdef ZLIB_DLL + # ifdef ZLIB_INTERNAL + # define ZEXPORT __declspec(dllexport) diff --git a/Utilities/cmzlib/zutil.h b/Utilities/cmzlib/zutil.h index 74ef1f8..3053cd8 100644 --- a/Utilities/cmzlib/zutil.h @@ -583,3 +406,130 @@ index 74ef1f8..3053cd8 100644 -- 1.8.3.4 + +From b961fef182ea636dfd6411d2c82eac25349888f5 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 16:58:24 +0200 +Subject: Guard references to libm for Haiku + + * The math functionality is defined in libroot, and needs no compiler + or linker flags. + +diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake +index a2bf0c0..770e93a 100644 +--- a/Modules/FindLua51.cmake ++++ b/Modules/FindLua51.cmake +@@ -54,7 +54,7 @@ find_library(LUA_LIBRARY + + if(LUA_LIBRARY) + # include the math library for Unix +- if(UNIX AND NOT APPLE AND NOT BEOS) ++ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) + find_library(LUA_MATH_LIBRARY m) + set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") + # For Windows and Mac, don't need to explicitly include the math library +diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt +index 5c43052..f00cbd6 100644 +--- a/Tests/Complex/Library/CMakeLists.txt ++++ b/Tests/Complex/Library/CMakeLists.txt +@@ -51,7 +51,7 @@ define_property( + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-if(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") + endif() + get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) +diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt +index 5c43052..f00cbd6 100644 +--- a/Tests/ComplexOneConfig/Library/CMakeLists.txt ++++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt +@@ -51,7 +51,7 @@ define_property( + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-if(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") + endif() + get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) +-- +1.8.3.4 + + +From 8f80d0a8eeab5c84580df671da838935244ab821 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 16:59:25 +0200 +Subject: Include files cleanup + + * No need to use a different path from the BeOS one, which still works. + +diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx +index 322a6a2..2aaedec 100644 +--- a/Source/cmCTest.cxx ++++ b/Source/cmCTest.cxx +@@ -53,14 +53,10 @@ + #include + #include + +-#if defined(__BEOS__) ++#if defined(__BEOS__) || defined(__HAIKU__) + #include /* disable_debugger() API. */ + #endif + +-#if defined(__HAIKU__) +-#include /* disable_debugger() API. */ +-#endif +- + + #define DEBUGOUT std::cout << __LINE__ << " "; std::cout + #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr +diff --git a/Source/kwsys/testDynamicLoader.cxx b/Source/kwsys/testDynamicLoader.cxx +index 61c1572..fc0215e 100644 +--- a/Source/kwsys/testDynamicLoader.cxx ++++ b/Source/kwsys/testDynamicLoader.cxx +@@ -15,14 +15,10 @@ + #include KWSYS_HEADER(ios/iostream) + #include KWSYS_HEADER(stl/string) + +-#if defined(__BEOS__) ++#if defined(__BEOS__) || defined(__HAIKU__) + #include /* disable_debugger() API. */ + #endif + +-#if defined(__HAIKU__) +-#include /* disable_debugger() API. */ +-#endif +- + // Work-around CMake dependency scanning limitation. This must + // duplicate the above list of headers. + #if 0 +-- +1.8.3.4 + + +From 05430f6597e12ac70218e34829f2805568f50194 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 17:01:03 +0200 +Subject: FindSDL: Fix broken include paths + + * I asked the CMake community about this, and they couldn't even figure +out how this worked even on other platforms. + +diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake +index fec142e..6adec1f 100644 +--- a/Modules/FindSDL.cmake ++++ b/Modules/FindSDL.cmake +@@ -70,7 +70,7 @@ + find_path(SDL_INCLUDE_DIR SDL.h + HINTS + ENV SDLDIR +- PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include ++ PATH_SUFFIXES SDL SDL12 SDL11 + ) + + # SDL-1.1 is the name used by FreeBSD ports... +-- +1.8.3.4 + From 620303182f35579a229d9f33403625865c5fbbe6 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 5 Oct 2013 22:51:58 +0200 Subject: [PATCH 544/587] More fixes from CMake reviewer * Avoid using sed to do regex matching when cmake has built-in equivalents * Simplify checks for empty variables (they resolve to false) * Rewrite the history so each commit can be applied individually without breaking any functionality --- .../cmake/patches/cmake-2.8.11.2.patchset | 129 ++++++++---------- 1 file changed, 60 insertions(+), 69 deletions(-) diff --git a/dev-util/cmake/patches/cmake-2.8.11.2.patchset b/dev-util/cmake/patches/cmake-2.8.11.2.patchset index 75f921368..004c417ca 100644 --- a/dev-util/cmake/patches/cmake-2.8.11.2.patchset +++ b/dev-util/cmake/patches/cmake-2.8.11.2.patchset @@ -1,4 +1,4 @@ -From a88d3007575ab7e79d80d955022d6eb1755e6245 Mon Sep 17 00:00:00 2001 +From 2e3be20216cac12e4e6ace37d132bdc0b5b68b21 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 5 Oct 2013 16:26:02 +0200 Subject: Several fixes to Haiku platform module @@ -24,9 +24,25 @@ Subject: Several fixes to Haiku platform module selected one. * With the adoption of the package manager, the directory layout was changed. Tell cmake where to look for header files and libraries. + * As we don't define BEOS anymore, enable the workaround we still need + for HAIKU as well. This is the lack of a libm (it is part of the + implicitly linked in libroot) +diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake +index a2bf0c0..770e93a 100644 +--- a/Modules/FindLua51.cmake ++++ b/Modules/FindLua51.cmake +@@ -54,7 +54,7 @@ find_library(LUA_LIBRARY + + if(LUA_LIBRARY) + # include the math library for Unix +- if(UNIX AND NOT APPLE AND NOT BEOS) ++ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) + find_library(LUA_MATH_LIBRARY m) + set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") + # For Windows and Mac, don't need to explicitly include the math library diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake -index 8987783..2f8125d 100644 +index 8987783..825f851 100644 --- a/Modules/Platform/Haiku.cmake +++ b/Modules/Platform/Haiku.cmake @@ -1,22 +1,123 @@ @@ -60,19 +76,19 @@ index 8987783..2f8125d 100644 +# accordingly. +set(__HAIKU_COMPILER ${CMAKE_C_COMPILER}) + -+if("${__HAIKU_COMPILER}" STREQUAL "") ++if(NOT __HAIKU_COMPILER) + set(__HAIKU_COMPILER ${CMAKE_CXX_COMPILER}) +endif() + +execute_process( + COMMAND ${__HAIKU_COMPILER} -print-search-dirs -+ COMMAND sed -ne "/^libraries:/!d; s,libraries: =*\\(.*\\):,\\1,; s,:,\\n,gp" -+ COMMAND sed -ne "/\\/boot\\/system\\/develop\\/lib\\/[^\\/]*\\/$/!d; s,.*/\\([^/]*\\)/$,\\1,; p" -+ OUTPUT_VARIABLE CMAKE_HAIKU_SECONDARY_ARCH) -+string(STRIP "${CMAKE_HAIKU_SECONDARY_ARCH}" -+ CMAKE_HAIKU_SECONDARY_ARCH) ++ OUTPUT_VARIABLE _HAIKU_SEARCH_DIRS ++ OUTPUT_STRIP_TRAILING_WHITESPACE) + -+if("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "") ++string(REGEX MATCH ".*\nlibraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/(:[^\n]*)?\n.*" _dummy "\n${_HAIKU_SEARCH_DIRS}\n") ++set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_2}") ++ ++if(NOT CMAKE_HAIKU_SECONDARY_ARCH) + set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "") + unset(CMAKE_HAIKU_SECONDARY_ARCH) +else() @@ -87,7 +103,7 @@ index 8987783..2f8125d 100644 + set(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) + set(CMAKE_C_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) + set(CMAKE_CXX_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) -+endif("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "") ++endif() + +list(APPEND CMAKE_SYSTEM_PREFIX_PATH + /boot/common/non-packaged @@ -166,11 +182,37 @@ index 8987783..2f8125d 100644 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH +diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt +index 5c43052..f00cbd6 100644 +--- a/Tests/Complex/Library/CMakeLists.txt ++++ b/Tests/Complex/Library/CMakeLists.txt +@@ -51,7 +51,7 @@ define_property( + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-if(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") + endif() + get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) +diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt +index 5c43052..f00cbd6 100644 +--- a/Tests/ComplexOneConfig/Library/CMakeLists.txt ++++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt +@@ -51,7 +51,7 @@ define_property( + FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + ) + set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) +-if(NOT BEOS AND NOT WIN32) # No libm on BeOS. ++if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. + set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") + endif() + get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) -- 1.8.3.4 -From c34471ea6e9b64d962ba385df0f1dee078b8ba77 Mon Sep 17 00:00:00 2001 +From e1f3d70eb59d4e87438c2b792a0d64dc2805218d Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 5 Oct 2013 16:31:36 +0200 Subject: Remove use of B_COMMON_DIRECTORY @@ -247,7 +289,7 @@ index 1cc1754..fcb66a7 100644 const char* home = cmSystemTools::GetEnv("HOME"); if(!home) diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx -index aa3a73d..6dd2f49 100644 +index aa3a73d..1d6530f 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -19,7 +19,9 @@ @@ -275,9 +317,9 @@ index aa3a73d..6dd2f49 100644 + if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == + B_OK) + { -+ std::string fname = dir; -+ fname += "/cmake/packages/"; -+ fname += Name; ++ std::string fname = dir; ++ fname += "/cmake/packages/"; ++ fname += Name; + this->LoadPackageRegistryDir(fname); } #else @@ -321,7 +363,7 @@ index ee5b9d8..1369dab 100644 1.8.3.4 -From bdcc8b10fde413e121e4a043210a5a477db51232 Mon Sep 17 00:00:00 2001 +From a2d6be58cf08774f05427d90de2c0ed7179d16e3 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 5 Oct 2013 16:33:52 +0200 Subject: Remove useless preprocessor checks @@ -407,58 +449,7 @@ index 74ef1f8..3053cd8 100644 1.8.3.4 -From b961fef182ea636dfd6411d2c82eac25349888f5 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sat, 5 Oct 2013 16:58:24 +0200 -Subject: Guard references to libm for Haiku - - * The math functionality is defined in libroot, and needs no compiler - or linker flags. - -diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake -index a2bf0c0..770e93a 100644 ---- a/Modules/FindLua51.cmake -+++ b/Modules/FindLua51.cmake -@@ -54,7 +54,7 @@ find_library(LUA_LIBRARY - - if(LUA_LIBRARY) - # include the math library for Unix -- if(UNIX AND NOT APPLE AND NOT BEOS) -+ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) - find_library(LUA_MATH_LIBRARY m) - set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") - # For Windows and Mac, don't need to explicitly include the math library -diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt -index 5c43052..f00cbd6 100644 ---- a/Tests/Complex/Library/CMakeLists.txt -+++ b/Tests/Complex/Library/CMakeLists.txt -@@ -51,7 +51,7 @@ define_property( - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" - ) - set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) --if(NOT BEOS AND NOT WIN32) # No libm on BeOS. -+if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. - set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") - endif() - get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) -diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt -index 5c43052..f00cbd6 100644 ---- a/Tests/ComplexOneConfig/Library/CMakeLists.txt -+++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt -@@ -51,7 +51,7 @@ define_property( - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" - ) - set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) --if(NOT BEOS AND NOT WIN32) # No libm on BeOS. -+if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. - set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") - endif() - get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) --- -1.8.3.4 - - -From 8f80d0a8eeab5c84580df671da838935244ab821 Mon Sep 17 00:00:00 2001 +From abc2262574468318d404a9d4271a818926aab507 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 5 Oct 2013 16:59:25 +0200 Subject: Include files cleanup @@ -509,7 +500,7 @@ index 61c1572..fc0215e 100644 1.8.3.4 -From 05430f6597e12ac70218e34829f2805568f50194 Mon Sep 17 00:00:00 2001 +From b932917065447fbd619e642a67ab294a17ffc97c Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 5 Oct 2013 17:01:03 +0200 Subject: FindSDL: Fix broken include paths From 68d27172b2e68db85312ecd8c686eca8c2095ecc Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 5 Oct 2013 23:18:55 +0200 Subject: [PATCH 545/587] Recipe for Lua. * It's failing to do prepareInstalledDevelLib, I don't know why. --- dev-lang/lua/lua-5.1.4.recipe | 46 ++++++-- .../{lua-5.1.4.patch => lua-5.1.4.patchset} | 111 ++++++++++-------- 2 files changed, 102 insertions(+), 55 deletions(-) rename dev-lang/lua/patches/{lua-5.1.4.patch => lua-5.1.4.patchset} (74%) diff --git a/dev-lang/lua/lua-5.1.4.recipe b/dev-lang/lua/lua-5.1.4.recipe index 1ac5dddbe..faba3c981 100644 --- a/dev-lang/lua/lua-5.1.4.recipe +++ b/dev-lang/lua/lua-5.1.4.recipe @@ -1,23 +1,51 @@ -DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language." +SUMMARY="Lua is a powerful, fast, light-weight, embeddable scripting language." HOMEPAGE="http://www.lua.org" SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz" CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150" REVISION="3" -STATUS_HAIKU="stable" -DEPEND="pkgconfig >= 0.25" +ARCHITECTURES="!x86 !x86_gcc2" + +PROVIDES=" + lua = $portVersion compat = 5.1 + cmd:lua = $portVersion compat = 5.1 + cmd:luac = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:pkg_config + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:make + cmd:gcc + " + +PATCHES="lua-5.1.4.patchset" BUILD() { - cd lua-5.1.4 make haiku } INSTALL() { - cd lua-5.1.4 - make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \ - INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man" - mkdir -p ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig - cp etc/lua.pc ${DESTDIR}`finddir B_COMMON_LIB_DIRECTORY`/pkgconfig/lua.pc + make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir" \ + INSTALL_INC="$includeDir" INSTALL_LMOD="$dataDir/lua/$V" + mkdir -p $libDir/pkgconfig + cp etc/lua.pc $libDir/pkgconfig/lua.pc + + prepareInstalledDevelLib liblua + fixPkgconfig } LICENSE="MIT" COPYRIGHT="1994-2009, 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. + " diff --git a/dev-lang/lua/patches/lua-5.1.4.patch b/dev-lang/lua/patches/lua-5.1.4.patchset similarity index 74% rename from dev-lang/lua/patches/lua-5.1.4.patch rename to dev-lang/lua/patches/lua-5.1.4.patchset index 38b6ddd2a..1f9a71385 100644 --- a/dev-lang/lua/patches/lua-5.1.4.patch +++ b/dev-lang/lua/patches/lua-5.1.4.patchset @@ -1,7 +1,14 @@ -diff -urN lua-5.1.4/Makefile lua-5.1.4-haiku/Makefile ---- lua-5.1.4/Makefile 2008-08-12 00:40:48.066322432 +0000 -+++ lua-5.1.4-haiku/Makefile 2011-05-03 22:29:07.568328192 +0000 -@@ -13,11 +13,11 @@ +From 80ca93a71df5709617854121b54a0fcfca61f188 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 5 Oct 2013 22:01:42 +0200 +Subject: Import existing haikuport patch. + + +diff --git a/Makefile b/Makefile +index 6e78f66..8b8fbfc 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,11 +13,11 @@ INSTALL_TOP= /usr/local INSTALL_BIN= $(INSTALL_TOP)/bin INSTALL_INC= $(INSTALL_TOP)/include INSTALL_LIB= $(INSTALL_TOP)/lib @@ -15,7 +22,7 @@ diff -urN lua-5.1.4/Makefile lua-5.1.4-haiku/Makefile INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V # How to install. If your install program does not support "-p", then you -@@ -38,12 +38,12 @@ +@@ -38,12 +38,12 @@ RANLIB= ranlib # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= # Convenience platforms targets. @@ -30,10 +37,11 @@ diff -urN lua-5.1.4/Makefile lua-5.1.4-haiku/Makefile TO_MAN= lua.1 luac.1 # Lua version and release. -diff -urN lua-5.1.4/src/Makefile lua-5.1.4-haiku/src/Makefile ---- lua-5.1.4/src/Makefile 2008-01-19 19:37:58.066584576 +0000 -+++ lua-5.1.4-haiku/src/Makefile 2011-05-03 22:08:17.191627264 +0000 -@@ -20,9 +20,10 @@ +diff --git a/src/Makefile b/src/Makefile +index e4a3cd6..4cfea30 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -20,9 +20,10 @@ MYLIBS= # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= @@ -45,7 +53,7 @@ diff -urN lua-5.1.4/src/Makefile lua-5.1.4-haiku/src/Makefile CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ lundump.o lvm.o lzio.o -@@ -36,7 +37,7 @@ +@@ -36,7 +37,7 @@ LUAC_T= luac LUAC_O= luac.o print.o ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) @@ -54,7 +62,7 @@ diff -urN lua-5.1.4/src/Makefile lua-5.1.4-haiku/src/Makefile ALL_A= $(LUA_A) default: $(PLAT) -@@ -57,6 +58,9 @@ +@@ -57,6 +58,9 @@ $(LUA_T): $(LUA_O) $(LUA_A) $(LUAC_T): $(LUAC_O) $(LUA_A) $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) @@ -64,7 +72,7 @@ diff -urN lua-5.1.4/src/Makefile lua-5.1.4-haiku/src/Makefile clean: $(RM) $(ALL_T) $(ALL_O) -@@ -95,6 +99,9 @@ +@@ -95,6 +99,9 @@ freebsd: generic: $(MAKE) all MYCFLAGS= @@ -74,9 +82,10 @@ diff -urN lua-5.1.4/src/Makefile lua-5.1.4-haiku/src/Makefile linux: $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" -diff -urN lua-5.1.4/src/lcode.c lua-5.1.4-haiku/src/lcode.c ---- lua-5.1.4/src/lcode.c 2007-12-28 15:32:23.000262144 +0000 -+++ lua-5.1.4-haiku/src/lcode.c 2011-05-03 22:06:13.312999936 +0000 +diff --git a/src/lcode.c b/src/lcode.c +index cff626b..679cb9c 100644 +--- a/src/lcode.c ++++ b/src/lcode.c @@ -1,5 +1,5 @@ /* -** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $ @@ -84,7 +93,7 @@ diff -urN lua-5.1.4/src/lcode.c lua-5.1.4-haiku/src/lcode.c ** Code generator for Lua ** See Copyright Notice in lua.h */ -@@ -544,10 +544,6 @@ +@@ -544,10 +544,6 @@ void luaK_goiftrue (FuncState *fs, expdesc *e) { pc = NO_JUMP; /* always true; do nothing */ break; } @@ -95,7 +104,7 @@ diff -urN lua-5.1.4/src/lcode.c lua-5.1.4-haiku/src/lcode.c case VJMP: { invertjump(fs, e); pc = e->u.s.info; -@@ -572,10 +568,6 @@ +@@ -572,10 +568,6 @@ static void luaK_goiffalse (FuncState *fs, expdesc *e) { pc = NO_JUMP; /* always false; do nothing */ break; } @@ -106,9 +115,10 @@ diff -urN lua-5.1.4/src/lcode.c lua-5.1.4-haiku/src/lcode.c case VJMP: { pc = e->u.s.info; break; -diff -urN lua-5.1.4/src/ldblib.c lua-5.1.4-haiku/src/ldblib.c ---- lua-5.1.4/src/ldblib.c 2008-01-21 13:11:21.000262144 +0000 -+++ lua-5.1.4-haiku/src/ldblib.c 2011-05-03 22:06:13.322699264 +0000 +diff --git a/src/ldblib.c b/src/ldblib.c +index 67de122..2027eda 100644 +--- a/src/ldblib.c ++++ b/src/ldblib.c @@ -1,5 +1,5 @@ /* -** $Id: ldblib.c,v 1.104.1.3 2008/01/21 13:11:21 roberto Exp $ @@ -116,7 +126,7 @@ diff -urN lua-5.1.4/src/ldblib.c lua-5.1.4-haiku/src/ldblib.c ** Interface from Lua to its debug API ** See Copyright Notice in lua.h */ -@@ -45,6 +45,7 @@ +@@ -45,6 +45,7 @@ static int db_setmetatable (lua_State *L) { static int db_getfenv (lua_State *L) { @@ -124,9 +134,10 @@ diff -urN lua-5.1.4/src/ldblib.c lua-5.1.4-haiku/src/ldblib.c lua_getfenv(L, 1); return 1; } -diff -urN lua-5.1.4/src/liolib.c lua-5.1.4-haiku/src/liolib.c ---- lua-5.1.4/src/liolib.c 2008-01-18 17:47:43.001572864 +0000 -+++ lua-5.1.4-haiku/src/liolib.c 2011-05-03 22:06:13.346292224 +0000 +diff --git a/src/liolib.c b/src/liolib.c +index e79ed1c..649f9a5 100644 +--- a/src/liolib.c ++++ b/src/liolib.c @@ -1,5 +1,5 @@ /* -** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $ @@ -134,7 +145,7 @@ diff -urN lua-5.1.4/src/liolib.c lua-5.1.4-haiku/src/liolib.c ** Standard I/O (and system) library ** See Copyright Notice in lua.h */ -@@ -276,7 +276,10 @@ +@@ -276,7 +276,10 @@ static int read_number (lua_State *L, FILE *f) { lua_pushnumber(L, d); return 1; } @@ -146,9 +157,10 @@ diff -urN lua-5.1.4/src/liolib.c lua-5.1.4-haiku/src/liolib.c } -diff -urN lua-5.1.4/src/llex.c lua-5.1.4-haiku/src/llex.c ---- lua-5.1.4/src/llex.c 2007-12-27 13:02:25.001835008 +0000 -+++ lua-5.1.4-haiku/src/llex.c 2011-05-03 22:06:13.368050176 +0000 +diff --git a/src/llex.c b/src/llex.c +index 6dc3193..88c6790 100644 +--- a/src/llex.c ++++ b/src/llex.c @@ -1,5 +1,5 @@ /* -** $Id: llex.c,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $ @@ -156,7 +168,7 @@ diff -urN lua-5.1.4/src/llex.c lua-5.1.4-haiku/src/llex.c ** Lexical Analyzer ** See Copyright Notice in lua.h */ -@@ -118,8 +118,10 @@ +@@ -118,8 +118,10 @@ TString *luaX_newstring (LexState *ls, const char *str, size_t l) { lua_State *L = ls->L; TString *ts = luaS_newlstr(L, str, l); TValue *o = luaH_setstr(L, ls->fs->h, ts); /* entry for `str' */ @@ -168,9 +180,10 @@ diff -urN lua-5.1.4/src/llex.c lua-5.1.4-haiku/src/llex.c return ts; } -diff -urN lua-5.1.4/src/loadlib.c lua-5.1.4-haiku/src/loadlib.c ---- lua-5.1.4/src/loadlib.c 2008-08-06 13:29:28.002621440 +0000 -+++ lua-5.1.4-haiku/src/loadlib.c 2011-05-03 22:06:13.391380992 +0000 +diff --git a/src/loadlib.c b/src/loadlib.c +index 0d401eb..6158c53 100644 +--- a/src/loadlib.c ++++ b/src/loadlib.c @@ -1,5 +1,5 @@ /* -** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $ @@ -178,7 +191,7 @@ diff -urN lua-5.1.4/src/loadlib.c lua-5.1.4-haiku/src/loadlib.c ** Dynamic library loader for Lua ** See Copyright Notice in lua.h ** -@@ -639,7 +639,7 @@ +@@ -639,7 +639,7 @@ LUALIB_API int luaopen_package (lua_State *L) { lua_pushvalue(L, -1); lua_replace(L, LUA_ENVIRONINDEX); /* create `loaders' table */ @@ -187,9 +200,10 @@ diff -urN lua-5.1.4/src/loadlib.c lua-5.1.4-haiku/src/loadlib.c /* fill it with pre-defined loaders */ for (i=0; loaders[i] != NULL; i++) { lua_pushcfunction(L, loaders[i]); -diff -urN lua-5.1.4/src/lstrlib.c lua-5.1.4-haiku/src/lstrlib.c ---- lua-5.1.4/src/lstrlib.c 2008-07-11 17:27:21.004194304 +0000 -+++ lua-5.1.4-haiku/src/lstrlib.c 2011-05-03 22:06:13.411303936 +0000 +diff --git a/src/lstrlib.c b/src/lstrlib.c +index 1b4763d..7a03489 100644 +--- a/src/lstrlib.c ++++ b/src/lstrlib.c @@ -1,5 +1,5 @@ /* -** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $ @@ -197,7 +211,7 @@ diff -urN lua-5.1.4/src/lstrlib.c lua-5.1.4-haiku/src/lstrlib.c ** Standard library for string operations and pattern-matching ** See Copyright Notice in lua.h */ -@@ -754,6 +754,7 @@ +@@ -754,6 +754,7 @@ static void addintlen (char *form) { static int str_format (lua_State *L) { @@ -205,7 +219,7 @@ diff -urN lua-5.1.4/src/lstrlib.c lua-5.1.4-haiku/src/lstrlib.c int arg = 1; size_t sfl; const char *strfrmt = luaL_checklstring(L, arg, &sfl); -@@ -768,7 +769,8 @@ +@@ -768,7 +769,8 @@ static int str_format (lua_State *L) { else { /* format item */ char form[MAX_FORMAT]; /* to store the format (`%...') */ char buff[MAX_ITEM]; /* to store the formatted item */ @@ -215,9 +229,10 @@ diff -urN lua-5.1.4/src/lstrlib.c lua-5.1.4-haiku/src/lstrlib.c strfrmt = scanformat(L, strfrmt, form); switch (*strfrmt++) { case 'c': { -diff -urN lua-5.1.4/src/luaconf.h lua-5.1.4-haiku/src/luaconf.h ---- lua-5.1.4/src/luaconf.h 2008-02-11 16:25:08.004980736 +0000 -+++ lua-5.1.4-haiku/src/luaconf.h 2011-05-03 22:08:17.243793920 +0000 +diff --git a/src/luaconf.h b/src/luaconf.h +index e2cb261..9f28f41 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h @@ -33,6 +33,13 @@ #define LUA_WIN #endif @@ -245,9 +260,10 @@ diff -urN lua-5.1.4/src/luaconf.h lua-5.1.4-haiku/src/luaconf.h #define LUA_LDIR LUA_ROOT "share/lua/5.1/" #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" #define LUA_PATH_DEFAULT \ -diff -urN lua-5.1.4/src/lvm.c lua-5.1.4-haiku/src/lvm.c ---- lua-5.1.4/src/lvm.c 2007-12-28 15:32:23.005242880 +0000 -+++ lua-5.1.4-haiku/src/lvm.c 2011-05-03 22:06:13.432537600 +0000 +diff --git a/src/lvm.c b/src/lvm.c +index ee3256a..8aeafda 100644 +--- a/src/lvm.c ++++ b/src/lvm.c @@ -1,5 +1,5 @@ /* -** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $ @@ -255,7 +271,7 @@ diff -urN lua-5.1.4/src/lvm.c lua-5.1.4-haiku/src/lvm.c ** Lua virtual machine ** See Copyright Notice in lua.h */ -@@ -133,6 +133,7 @@ +@@ -133,6 +133,7 @@ void luaV_gettable (lua_State *L, const TValue *t, TValue *key, StkId val) { void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) { int loop; @@ -263,7 +279,7 @@ diff -urN lua-5.1.4/src/lvm.c lua-5.1.4-haiku/src/lvm.c for (loop = 0; loop < MAXTAGLOOP; loop++) { const TValue *tm; if (ttistable(t)) { /* `t' is a table? */ -@@ -152,7 +153,9 @@ +@@ -152,7 +153,9 @@ void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) { callTM(L, tm, t, key, val); return; } @@ -274,3 +290,6 @@ diff -urN lua-5.1.4/src/lvm.c lua-5.1.4-haiku/src/lvm.c } luaG_runerror(L, "loop in settable"); } +-- +1.8.3.4 + From 4b45335372e54d73b6c6cee6df2390a56279edd3 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Oct 2013 10:38:59 +0200 Subject: [PATCH 546/587] Fix problem with lua recipes * The problem I had yesterday was a missing soname for the so libraries. This make packageInstalledDevelLib silently fail. --- dev-lang/lua/lua-5.1.4.recipe | 7 +- dev-lang/lua/lua-5.2.1.recipe | 40 +++++- dev-lang/lua/patches/lua-5.1.4.patchset | 6 +- .../{lua-5.2.1.patch => lua-5.2.1.patchset} | 130 +++++++++++------- 4 files changed, 122 insertions(+), 61 deletions(-) rename dev-lang/lua/patches/{lua-5.2.1.patch => lua-5.2.1.patchset} (60%) diff --git a/dev-lang/lua/lua-5.1.4.recipe b/dev-lang/lua/lua-5.1.4.recipe index faba3c981..853e92677 100644 --- a/dev-lang/lua/lua-5.1.4.recipe +++ b/dev-lang/lua/lua-5.1.4.recipe @@ -3,20 +3,19 @@ HOMEPAGE="http://www.lua.org" SRC_URI="http://www.lua.org/ftp/lua-5.1.4.tar.gz" CHECKSUM_MD5="d0870f2de55d59c1c8419f36e8fac150" REVISION="3" -ARCHITECTURES="!x86 !x86_gcc2" +ARCHITECTURES="x86 x86_gcc2" PROVIDES=" lua = $portVersion compat = 5.1 cmd:lua = $portVersion compat = 5.1 cmd:luac = $portVersion + lib:liblua = $portVersion compat = 5.2 + devel:liblua = $portVersion compat = 5.2 " REQUIRES=" haiku >= $haikuVersion " -BUILD_REQUIRES=" - cmd:pkg_config - " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion cmd:make diff --git a/dev-lang/lua/lua-5.2.1.recipe b/dev-lang/lua/lua-5.2.1.recipe index e2c970227..3f089d918 100644 --- a/dev-lang/lua/lua-5.2.1.recipe +++ b/dev-lang/lua/lua-5.2.1.recipe @@ -1,20 +1,46 @@ -DESCRIPTION="Lua is a powerful, fast, light-weight, embeddable scripting language." +SUMMARY="Lua is a powerful, fast, light-weight, embeddable scripting language." HOMEPAGE="http://www.lua.org" -SRC_URI="http://www.lua.org/ftp/lua-5.2.1.tar.gz" +SRC_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz" CHECKSUM_MD5="ae08f641b45d737d12d30291a5e5f6e3" REVISION="3" -STATUS_HAIKU="stable" +ARCHITECTURES="x86 x86_gcc2" +PROVIDES=" + lua = $portVersion compat = 5.2 + cmd:lua = $portVersion compat = 5.2 + cmd:luac = $portVersion + lib:liblua = $portVersion compat = 5.2 + devel:liblua = $portVersion compat = 5.2 + " + +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:make + cmd:gcc + " + +PATCHES="lua-$portVersion.patchset" BUILD() { - cd lua-5.2.1 make haiku } INSTALL() { - cd lua-5.2.1 - make install INSTALL_TOP="${DESTDIR}`finddir B_COMMON_DIRECTORY`" \ - INSTALL_MAN="${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man" + make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir" \ + INSTALL_INC="$includeDir" INSTALL_LMOD="$dataDir/lua/$V" + + prepareInstalledDevelLib liblua } 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. + " diff --git a/dev-lang/lua/patches/lua-5.1.4.patchset b/dev-lang/lua/patches/lua-5.1.4.patchset index 1f9a71385..c5bf0f4f4 100644 --- a/dev-lang/lua/patches/lua-5.1.4.patchset +++ b/dev-lang/lua/patches/lua-5.1.4.patchset @@ -1,4 +1,4 @@ -From 80ca93a71df5709617854121b54a0fcfca61f188 Mon Sep 17 00:00:00 2001 +From 5944289e129f60d26f71646bc4e3404f93de138f Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 5 Oct 2013 22:01:42 +0200 Subject: Import existing haikuport patch. @@ -38,7 +38,7 @@ index 6e78f66..8b8fbfc 100644 # Lua version and release. diff --git a/src/Makefile b/src/Makefile -index e4a3cd6..4cfea30 100644 +index e4a3cd6..86bd1ce 100644 --- a/src/Makefile +++ b/src/Makefile @@ -20,9 +20,10 @@ MYLIBS= @@ -67,7 +67,7 @@ index e4a3cd6..4cfea30 100644 $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) +$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -o $@ -shared -fPIC $(MYLDFLAGS) $? $(LIBS) ++ $(CC) -o $@ -shared -fPIC -Wl,-soname=liblua.so.$V $(MYLDFLAGS) $? $(LIBS) + clean: $(RM) $(ALL_T) $(ALL_O) diff --git a/dev-lang/lua/patches/lua-5.2.1.patch b/dev-lang/lua/patches/lua-5.2.1.patchset similarity index 60% rename from dev-lang/lua/patches/lua-5.2.1.patch rename to dev-lang/lua/patches/lua-5.2.1.patchset index ea654fad3..80b575808 100644 --- a/dev-lang/lua/patches/lua-5.2.1.patch +++ b/dev-lang/lua/patches/lua-5.2.1.patchset @@ -1,7 +1,14 @@ -diff -ru lua-5.2.1/Makefile lua-5.2.1.patched/Makefile ---- lua-5.2.1/Makefile 2012-05-17 16:05:54.032768000 +0200 -+++ lua-5.2.1.patched/Makefile 2012-08-12 16:50:24.994574336 +0200 -@@ -36,12 +36,12 @@ +From 4130bdecfcb78e60b64a8ade8689aa02158eda46 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 6 Oct 2013 10:13:45 +0200 +Subject: Import existing patch. + + +diff --git a/Makefile b/Makefile +index bd9515f..22d3a62 100644 +--- a/Makefile ++++ b/Makefile +@@ -36,12 +36,12 @@ RM= rm -f # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= # Convenience platforms targets. @@ -16,9 +23,55 @@ diff -ru lua-5.2.1/Makefile lua-5.2.1.patched/Makefile TO_MAN= lua.1 luac.1 # Lua version and release. -diff -ru lua-5.2.1/src/luaconf.h lua-5.2.1.patched/src/luaconf.h ---- lua-5.2.1/src/luaconf.h 2012-05-11 16:14:42.025690112 +0200 -+++ lua-5.2.1.patched/src/luaconf.h 2012-08-12 16:56:30.385875968 +0200 +diff --git a/src/Makefile b/src/Makefile +index 8c9ee67..2f7065c 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -26,9 +26,10 @@ MYOBJS= + + # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + +-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris ++PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ + ltm.o lundump.o lvm.o lzio.o +@@ -43,7 +44,7 @@ LUAC_T= luac + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -65,6 +66,9 @@ $(LUA_T): $(LUA_O) $(LUA_A) + $(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -o $@ -shared -fPIC $(LDFLAGS) $? $(LIBS) ++ + clean: + $(RM) $(ALL_T) $(ALL_O) + +@@ -102,6 +106,9 @@ freebsd: + + generic: $(ALL) + ++haiku: ++ $(MAKE) all MUCFLAGS=-DLUA_USE_HAIKU LIBS= ++ + linux: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline -lncurses" + +diff --git a/src/luaconf.h b/src/luaconf.h +index e4335df..cef74a7 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h @@ -40,6 +40,13 @@ @@ -45,47 +98,30 @@ diff -ru lua-5.2.1/src/luaconf.h lua-5.2.1.patched/src/luaconf.h #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR #define LUA_PATH_DEFAULT \ -diff -ru lua-5.2.1/src/Makefile lua-5.2.1.patched/src/Makefile ---- lua-5.2.1/src/Makefile 2012-03-09 17:32:16.029884416 +0100 -+++ lua-5.2.1.patched/src/Makefile 2012-08-12 16:52:43.662437888 +0200 -@@ -26,9 +26,10 @@ - - # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= - --PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris -+PLATS= aix ansi bsd freebsd generic haiku linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ - lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ - ltm.o lundump.o lvm.o lzio.o -@@ -43,7 +44,7 @@ - LUAC_O= luac.o - - ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) - ALL_A= $(LUA_A) - - # Targets start here. -@@ -65,6 +66,9 @@ - $(LUAC_T): $(LUAC_O) $(LUA_A) +-- +1.8.3.4 + + +From 5fbc99c965898e393a34cff6bfb14b29dc77426b Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 6 Oct 2013 10:25:23 +0200 +Subject: Set the library soname + + * prepareInstalledDevelLib will fail if there is no soname. + +diff --git a/src/Makefile b/src/Makefile +index 2f7065c..b279d4b 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -67,7 +67,7 @@ $(LUAC_T): $(LUAC_O) $(LUA_A) $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -o $@ -shared -fPIC $(LDFLAGS) $? $(LIBS) -+ + $(LUA_SO): $(CORE_O) $(LIB_O) +- $(CC) -o $@ -shared -fPIC $(LDFLAGS) $? $(LIBS) ++ $(CC) -o $@ -shared -fPIC -Wl,-soname=liblua.so.$V $(LDFLAGS) $? $(LIBS) + clean: $(RM) $(ALL_T) $(ALL_O) - -@@ -102,6 +106,9 @@ - - generic: $(ALL) - -+haiku: -+ $(MAKE) all MUCFLAGS=-DLUA_USE_HAIKU LIBS= -+ - linux: - $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline -lncurses" - +-- +1.8.3.4 + From ccff7343c57a5807cd1fb12d3f0d872c0bfc9eaa Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Oct 2013 11:21:20 +0200 Subject: [PATCH 547/587] Make libdsk recipe work in hybrid mode as well. --- app-emulation/libdsk/libdsk-1.3.3.recipe | 28 ++++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/app-emulation/libdsk/libdsk-1.3.3.recipe b/app-emulation/libdsk/libdsk-1.3.3.recipe index 849cc6970..1bfc83d9d 100644 --- a/app-emulation/libdsk/libdsk-1.3.3.recipe +++ b/app-emulation/libdsk/libdsk-1.3.3.recipe @@ -3,12 +3,18 @@ HOMEPAGE="http://www.seasip.demon.co.uk/Unix/LibDsk/" SRC_URI="http://www.seasip.info/Unix/LibDsk/libdsk-1.3.3.tar.gz" REVISION="1" ARCHITECTURES="x86 x86_gcc2" +SECONDARY_ARCHITECTURES="x86 x86_gcc2" CHECKSUM_MD5="2cce41b4b1325d697183e34afcae2a9c" PROVIDES=" - libdsk = $portVersion - lib:libdsk = $portVersion - devel:libdsk + libdsk$secondaryArchSuffix = $portVersion + lib:libdsk$secondaryArchSuffix = $portVersion + devel:libdsk$secondaryArchSuffix = $portVersion + " + + +if [ -z "$secondaryArchSuffix" ]; then +PROVIDES="$PROVIDES cmd:apriboot cmd:dskdump cmd:dskform @@ -18,17 +24,20 @@ PROVIDES=" cmd:dskutil cmd:md3serial " +fi REQUIRES=" - haiku >= $haikuVersion - lib:libz + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:libtoolize cmd:autoconf cmd:make - cmd:gcc + cmd:gcc$secondaryArchSuffix " BUILD() @@ -37,13 +46,18 @@ BUILD() libtoolize --install --copy --force autoconf runConfigure ./configure - make + make $jobArgs } INSTALL() { make install + # remove command for secondary architecture + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + fi + prepareInstalledDevelLib libdsk } From c28973cab4532f1555f0373a46a94eb358ac5584 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Oct 2013 22:06:16 +0200 Subject: [PATCH 548/587] Caya has moved to github * gpl protocol addons are merged in the same repo now. --- haiku-apps/caya/caya-2013.07.31.recipe | 71 ++++++++++ .../caya/patches/caya-2013.07.31.patchset | 124 ++++++++++++++++++ 2 files changed, 195 insertions(+) create mode 100644 haiku-apps/caya/caya-2013.07.31.recipe create mode 100644 haiku-apps/caya/patches/caya-2013.07.31.patchset diff --git a/haiku-apps/caya/caya-2013.07.31.recipe b/haiku-apps/caya/caya-2013.07.31.recipe new file mode 100644 index 000000000..0a68638f9 --- /dev/null +++ b/haiku-apps/caya/caya-2013.07.31.recipe @@ -0,0 +1,71 @@ +SUMMARY="Caya is a multiprotocol IM client." +HOMEPAGE="http://dev.osdrawer.net/projects/caya" +SRC_URI="git+https://github.com/Barrett17/Caya.git#00440a3ffcafe58360638ed35c2be1e50bb63c65" +REVISION="2" +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + caya = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libz + lib:libexpat + lib:libssl + " +BUILD_REQUIRES=" + devel:libexpat + devel:libssl + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:jam + cmd:which + cmd:tr + " + +#PATCHES="caya-$portVersion.patchset" +BUILD() +{ + mkdir -p $sourceDir/generated/objects-haiku-x86-gcc2-debug/application + echo $portVersion | tr -d . > $sourceDir/generated/objects-haiku-x86-gcc2-debug/application/svn_revision + ./configure + jam +} + +INSTALL() +{ + mkdir -p $appsDir/Caya + mkdir -p $appsDir/Caya/smileys + mkdir -p $appsDir/Caya/protocols + mkdir -p $includeDir/caya/ + + cp generated/distro-haiku-*-debug/Caya $appsDir/Caya + cp generated/distro-haiku-*-debug/aim $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/msn $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/gtalk $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/facebook $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/jabber $appsDir/Caya/protocols + cp generated/distro-haiku-*-debug/yahoo $appsDir/Caya/protocols + cp smileys/*.gif smileys/settings.xml $appsDir/Caya/smileys + cp application/Caya.h $includeDir/caya/ + cp application/CayaProtocol.h $includeDir/caya/ + cp application/CayaConstants.h $includeDir/caya/ + cp application/CayaProtocolMessages.h $includeDir/caya/ +} + +LICENSE="MIT" +COPYRIGHT=" + 2009-2011 Andrea Anzani + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes + 2011-2012 Casalinuovo Dario + " +DESCRIPTION=" + Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, + google talk, and facebook. + " diff --git a/haiku-apps/caya/patches/caya-2013.07.31.patchset b/haiku-apps/caya/patches/caya-2013.07.31.patchset new file mode 100644 index 000000000..f052287fc --- /dev/null +++ b/haiku-apps/caya/patches/caya-2013.07.31.patchset @@ -0,0 +1,124 @@ +From e3fab9c91f8ee9f702c65a8a30da98519457133f Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 6 Oct 2013 21:59:49 +0200 +Subject: Merge previous patches for Caya and Caya protocols + + * The repos have been merged + * The protocols can now use Caya files directly instead of liooking in +the system + +diff --git a/Jamrules b/Jamrules +index bee60b3..d40d6f5 100644 +--- a/Jamrules ++++ b/Jamrules +@@ -51,12 +51,6 @@ CheckGccPlatform ; + # Echo "** Caya needs Curl" ; + #} + +-CheckCaya ; +-if ! $(HAVE_CAYA) { +- Echo "** Caya library is needed!" ; +- Exit 1 ; +-} +- + CheckOpenSSL ; + if ! $(HAVE_OPENSSL) { + Echo "** MSN, Jabber, GoogleTalk and Facebook protocols are disabled for lack of OpenSSL" ; +diff --git a/build/jam/CheckRules b/build/jam/CheckRules +index a444159..173b67b 100644 +--- a/build/jam/CheckRules ++++ b/build/jam/CheckRules +@@ -14,7 +14,7 @@ rule CheckGccPlatform + # /boot/develop/lib/x86 to judge whether this is a BeOS compatible and thus + # gcc 2 platform. This is not entirely correct, but should be good enough + # for the time being. +- local haveLibStdC++.R4 = [ Glob /boot/develop/lib/x86 : libstdc++.r4.so ] ; ++ local haveLibStdC++.R4 = [ Glob /boot/system/develop/tools/lib : libstdc++.r4.so ] ; + if ! $(haveLibStdC++.R4) { + IS_GCC4_PLATFORM = 1 ; + Echo Using GCC4 platform ; +@@ -102,32 +102,3 @@ rule CheckLibYahoo2 + HAVE_LIBYAHOO2 = $(haveLibs) ; + } + } +- +-rule CheckCaya +-{ +- # CheckCaya +- # Check for Caya and defined HAVE_CAYA according, it also defines +- # CAYA_INCLUDE_DIR and CAYA_LIBRARY_DIR with location of respectively +- # include and library files. +- +- HAVE_CAYA = ; +- CAYA_INCLUDE_DIR = ; +- CAYA_LIBRARY_DIR = ; +- +- local haveHeaders = [ Glob $(COMMON_INCLUDE_DIRECTORY)/caya : CayaProtocol.h ] ; +- if $(haveHeaders) { +- CAYA_INCLUDE_DIR = $(COMMON_INCLUDE_DIRECTORY)/caya ; +- +-# local haveLibs = [ Glob $(COMMON_LIB_DIRECTORY) : libinfopopper.so ] ; +-# if $(haveLibs) { +-# CAYA_LIBRARY_DIR = $(COMMON_LIB_DIRECTORY) ; +- +- Echo Caya Headers: $(CAYA_INCLUDE_DIR) ; +-# Echo Caya Libs: $(CAYA_LIBRARY_DIR) ; +-# } +- +-# HAVE_CAYA = $(haveLibs) ; +- } +- +- HAVE_CAYA = $(haveHeaders) ; +-} +diff --git a/configure b/configure +index 6879cee..ca177ba 100755 +--- a/configure ++++ b/configure +@@ -122,22 +122,21 @@ MIMESET = ${mimesetbin} ; + SETVERSION = ${setversionbin} ; + COPYATTR = ${copyattrbin} ; + +-COMMON_DIRECTORY = $(finddir B_COMMON_DIRECTORY) ; +-COMMON_BIN_DIRECTORY = $(finddir B_COMMON_BIN_DIRECTORY) ; +-COMMON_INCLUDE_DIRECTORY = $(finddir B_COMMON_DIRECTORY)/include ; +-COMMON_LIB_DIRECTORY = $(finddir B_COMMON_LIB_DIRECTORY) ; +-COMMON_SERVERS_DIRECTORY = $(finddir B_COMMON_SERVERS_DIRECTORY) ; +-COMMON_ADDONS_DIRECTORY = $(finddir B_COMMON_ADDONS_DIRECTORY) ; +-COMMON_DEVELOP_DIRECTORY = $(finddir B_COMMON_DEVELOP_DIRECTORY) ; ++COMMON_BIN_DIRECTORY = $binDir ; ++COMMON_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ; ++COMMON_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ; ++COMMON_SERVERS_DIRECTORY = $(finddir B_SYSTEM_SERVERS_DIRECTORY) ; ++COMMON_ADDONS_DIRECTORY = $(finddir B_SYSTEM_ADDONS_DIRECTORY) ; ++COMMON_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ; + USER_CONFIG_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY) ; +-USER_INCLUDE_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY)/include ; ++USER_INCLUDE_DIRECTORY = $includeDir ; + SYSTEM_DIRECTORY = $(finddir B_SYSTEM_DIRECTORY) ; +-SYSTEM_LIB_DIRECTORY = $(finddir B_SYSTEM_LIB_DIRECTORY) ; ++SYSTEM_LIB_DIRECTORY = $libDir ; + BEOS_PREFERENCES_DIRECTORY = $(finddir B_BEOS_PREFERENCES_DIRECTORY) ; + PREFERENCES_DIRECTORY = $(finddir B_PREFERENCES_DIRECTORY) ; + USER_PREFERENCES_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY)/be/Preferences ; +-APPS_DIRECTORY = $(finddir B_APPS_DIRECTORY) ; +-CAYA_DIRECTORY = $(finddir B_APPS_DIRECTORY)/Caya ; ++APPS_DIRECTORY = $appsDir ; ++CAYA_DIRECTORY = $appsDir/Caya ; + + DEFINES += ${defines} ; + EOF +diff --git a/protocols/Jamfile b/protocols/Jamfile +index 48298ae..95482a6 100644 +--- a/protocols/Jamfile ++++ b/protocols/Jamfile +@@ -1,5 +1,7 @@ + SubDir TOP protocols ; + ++CAYA_INCLUDE_DIR = $(TOP) application ; ++ + # Include all the components. + SubInclude TOP protocols aim ; + SubInclude TOP protocols xmpp ; +-- +1.8.3.4 + From 36152b0fa2759dac342d9f65118d550bafc3a15a Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 10 Oct 2013 13:55:10 +0200 Subject: [PATCH 549/587] libxslt: extract a devel package --- dev-libs/libxslt/libxslt-1.1.28.recipe | 28 ++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dev-libs/libxslt/libxslt-1.1.28.recipe b/dev-libs/libxslt/libxslt-1.1.28.recipe index 983a2cece..3af348ce2 100644 --- a/dev-libs/libxslt/libxslt-1.1.28.recipe +++ b/dev-libs/libxslt/libxslt-1.1.28.recipe @@ -4,19 +4,30 @@ LICENSE="MIT" COPYRIGHT="2001-2002 Daniel Veillard. All Rights Reserved." SRC_URI="ftp://xmlsoft.org/libxml2/libxslt-1.1.28.tar.gz" CHECKSUM_MD5="9667bf6f9310b957254fdcf6596600b7" -REVISION="1" -ARCHITECTURES="?x86_gcc2 ?x86" +REVISION="2" +ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libxslt$secondaryArchSuffix = $portVersion lib:libxslt$secondaryArchSuffix = $portVersion + lib:libexslt$secondaryArchSuffix = $portVersion + cmd:xslt_config$secondaryArchSuffix = $portVersion + cmd:xsltproc$secondaryArchSuffix = $portVersion " +REQUIRES=" + haiku${secondaryArchSuffix} >= $haikuVersion + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " BUILD_REQUIRES=" devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:autoconf cmd:automake cmd:libtoolize @@ -41,7 +52,11 @@ INSTALL() make install prepareInstalledDevelLibs libxslt + prepareInstalledDevelLibs libexslt fixPkgconfig + + # devel package + packageEntries devel $developDir } DESCRIPTION=" @@ -55,3 +70,12 @@ DESCRIPTION=" the command line processing tool. This library is free software and can be reused in commercial applications. " + +PROVIDES_devel=" + libxslt${secondaryArchSuffix}_devel = $portVersion + devel:libxslt${secondaryArchSuffix} = $portVersion compat >= 1 + devel:libexslt${secondaryArchSuffix} = $portVersion compat >= 1 + " +REQUIRES_devel=" + libxslt${secondaryArchSuffix} == $portVersion base + " From 0a0c6e28e6de1476157d46ac5079dd2ceafe1186 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 10 Oct 2013 14:13:21 +0200 Subject: [PATCH 550/587] Fix build. --- media-libs/freetype/freetype-2.5.0.1.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/media-libs/freetype/freetype-2.5.0.1.recipe b/media-libs/freetype/freetype-2.5.0.1.recipe index 7a2ed0d8b..4d98521c2 100644 --- a/media-libs/freetype/freetype-2.5.0.1.recipe +++ b/media-libs/freetype/freetype-2.5.0.1.recipe @@ -24,6 +24,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake @@ -43,8 +44,8 @@ BUILD() INSTALL() { - mkdir -p /packages/freetype-2.5.0.1-1/.self/develop/headers/freetype2/freetype/cache - mkdir -p /packages/freetype-2.5.0.1-1/.self/develop/headers/freetype2/freetype/internal + mkdir -p $includeDir/freetype2/freetype/cache + mkdir -p $includeDir/freetype2/freetype/internal make install prepareInstalledDevelLibs libfreetype From 562057d4273358f087808b327b86dac9c6ed479b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 10 Oct 2013 16:56:18 +0200 Subject: [PATCH 551/587] Fix dependencies following removal of common dir * This changed package mounting rules so we have to be stricter in what the packages depend on. * Also make sqlite3.8 recipe hybrid-compatible. --- dev-db/sqlite/sqlite-3.8.0.2.recipe | 59 +++++++++++++++++++++------ dev-libs/libxml2/libxml2-2.8.0.recipe | 4 +- 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/dev-db/sqlite/sqlite-3.8.0.2.recipe b/dev-db/sqlite/sqlite-3.8.0.2.recipe index 78528a4df..255f1a9c6 100644 --- a/dev-db/sqlite/sqlite-3.8.0.2.recipe +++ b/dev-db/sqlite/sqlite-3.8.0.2.recipe @@ -1,27 +1,43 @@ -SUMMARY="A 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." +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. + " HOMEPAGE="http://www.sqlite.org/" SRC_URI="http://www.sqlite.org/2013/sqlite-autoconf-3080002.tar.gz" CHECKSUM_MD5="6d6cc639a4da04fbbdda7b1a1a01b386" REVISION="1" -ARCHITECTURES="?x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" +LICENSE="SQLite" +COPYRIGHT="Public Domain" -PROVIDES="sqlite = $portVersion compat >= 3 - cmd:sqlite3 = $portVersion compat >= 3 - lib:libsqlite = $portVersion compat >= 3 - devel:libsqlite3 = $portVersion compat >= 3 - lib:libsqlite3 = $portVersion compat >= 3 +PROVIDES=" + sqlite$secondaryArchSuffix = $portVersion compat >= 3 + lib:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:sqlite3 = $portVersion compat >= 3 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion " -REQUIRES="haiku >= $haikuVersion" BUILD_REQUIRES=" " BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake - cmd:gcc - cmd:ld + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make " @@ -44,7 +60,24 @@ INSTALL() prepareInstalledDevelLib libsqlite3 fixPkgconfig + + # devel package + packageEntries devel \ + $developDir + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi } -LICENSE="SQLite" -COPYRIGHT="Public Domain" +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + sqlite${secondaryArchSuffix}_devel = $portVersion + devel:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0 + " +REQUIRES_devel=" + sqlite$secondaryArchSuffix == $portVersion base + " diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe index fed120d18..32c97981f 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.recipe +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -4,7 +4,7 @@ LICENSE="MIT" COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz" CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -44,6 +44,8 @@ fi BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_devel >= $haikuVersion + lib:libicudata$secondaryArchSuffix cmd:aclocal cmd:autoconf cmd:automake From 52368e65586a31068d7d9af06f20d6b5f2385da1 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 11 Oct 2013 03:10:28 +0000 Subject: [PATCH 552/587] llvm: Add llvm-3.2 recipe * llvm-3.3 needs some patching but can use a lot of the 3.2 recipe. * No -devel as llvm's whole goal is -devel (like gcc) --- sys-devel/llvm/llvm-3.2.recipe | 64 +++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 17 deletions(-) diff --git a/sys-devel/llvm/llvm-3.2.recipe b/sys-devel/llvm/llvm-3.2.recipe index 14a31f213..c88cb43ce 100644 --- a/sys-devel/llvm/llvm-3.2.recipe +++ b/sys-devel/llvm/llvm-3.2.recipe @@ -1,28 +1,58 @@ -DESCRIPTION="LLVM is a collection of modular and reuseable compiler and toolchain technologies." +SUMMARY="Modular and reuseable compiler and toolchain technologies." +DESCRIPTION="LLVM is a collection of modular and reuseable compiler and and toolchain technologies." HOMEPAGE="http://www.llvm.org/" -SRC_URI="http://llvm.org/releases/3.2/llvm-3.2.src.tar.gz" +LICENSE="UIUC" +COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign" +SRC_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.gz" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" CHECKSUM_MD5="71610289bbc819e3e15fdd562809a2d7" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + llvm$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:python + cmd:sed + " + +SOURCE_DIR="llvm-${portVersion}.src" + +PATCH() +{ + find . -type f -exec sed -i 's/\/usr\/bin\/env/\/bin\/env/g' "{}" \; +} + BUILD() { - if [ ! -L /usr ]; then - ln -s /boot/system/ /usr - fi - cd llvm-3.2.src - cp -r /boot/common/data/libtool/config/. autoconf/ - cp -r /boot/common/data/libtool/config/. projects/sample/autoconf/ - ./configure --enable-optimized --prefix=`finddir B_COMMON_DIRECTORY` - make + # Haiku C++ requires rtti in a lot of central system components + # such as Mesa + export REQUIRES_RTTI=1 + runConfigure ./configure --enable-optimized + make $jobArgs } INSTALL() { - cd llvm-3.2.src make install } - -LICENSE="UIUC" -COPYRIGHT="2003-2012 University of Illinois at Urbana-Champaign" From 0ac12f52b4a0631a0262e60e760ebfba1a92eeef Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 11 Oct 2013 03:13:44 +0000 Subject: [PATCH 553/587] mesa: Update Mesa 9.3-dev recipe * One more small bug needs fixed in upstream mesa (libGL.so is getting -fno-rtti which breaks our C++ code) --- sys-libs/mesa/mesa-9.3.recipe | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys-libs/mesa/mesa-9.3.recipe b/sys-libs/mesa/mesa-9.3.recipe index 217e9d151..480e35fa3 100644 --- a/sys-libs/mesa/mesa-9.3.recipe +++ b/sys-libs/mesa/mesa-9.3.recipe @@ -7,9 +7,7 @@ Mesa fills the role of the Haiku OpenGL kit. HOMEPAGE="http://www.mesa3d.org/" COPYRIGHT="1999-2013 Brian Paul All Rights Reserved." LICENSE="MIT" -# We use kallisti5's personal github repo for now, -# this will become the official mesa repo in time -SRC_URI="git://github.com/kallisti5/mesa.git" +SRC_URI="git://anongit.freedesktop.org/mesa/mesa" REVISION="1" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -31,6 +29,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion libxml2_python + llvm >= 3.2 cmd:bison cmd:find cmd:flex @@ -39,7 +38,6 @@ BUILD_PREREQUIRES=" cmd:scons cmd:sed " - #cmd:llvm-config SOURCE_DIR="Mesa-$portVersion" @@ -49,6 +47,7 @@ BUILD() export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture" fi scons $jobArgs build=release + #scons $jobArgs build=debug } INSTALL() From 0aa29ecc71a4bd197422b0711ae65e84e5aaaff2 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 11 Oct 2013 23:43:41 +0000 Subject: [PATCH 554/587] Perl is required for building nasm --- dev-lang/nasm/nasm-2.08.01.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-lang/nasm/nasm-2.08.01.recipe b/dev-lang/nasm/nasm-2.08.01.recipe index 6c7a54ba6..7c47d5cab 100644 --- a/dev-lang/nasm/nasm-2.08.01.recipe +++ b/dev-lang/nasm/nasm-2.08.01.recipe @@ -24,6 +24,7 @@ BUILD_PREREQUIRES=" cmd:gcc cmd:ld cmd:make + cmd:perl " SOURCE_DIR="$portVersionedName" From 2b1174e9bb27c861ef7a4a71bd47104355e3acea Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Fri, 4 Oct 2013 22:29:20 -0400 Subject: [PATCH 555/587] Update Vision to r946. - Fixes a logging-related regression on PM-enabled builds. --- .../vision/patches/vision-0.9.7-gcc2.patch | 16 ++++++++++ .../vision/patches/vision-0.9.7-gcc4.patch | 29 ++++++++++--------- ...7.r944.recipe => vision-0.9.7.r946.recipe} | 6 ++-- 3 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 haiku-apps/vision/patches/vision-0.9.7-gcc2.patch rename haiku-apps/vision/{vision-0.9.7.r944.recipe => vision-0.9.7.r946.recipe} (84%) diff --git a/haiku-apps/vision/patches/vision-0.9.7-gcc2.patch b/haiku-apps/vision/patches/vision-0.9.7-gcc2.patch new file mode 100644 index 000000000..081346c85 --- /dev/null +++ b/haiku-apps/vision/patches/vision-0.9.7-gcc2.patch @@ -0,0 +1,16 @@ +Index: Makefile +=================================================================== +--- Vision/Makefile (revision 946) ++++ Vision/Makefile (working copy) +@@ -84,10 +84,7 @@ + + LDFLAGS := $(REG_LIBS) -nodefaultlibs + +-ifeq ($(wildcard /boot/common/include/infopopper/InfoPopper.h), ) +-else +- CFLAGS += -DUSE_INFOPOPPER=1 +-endif ++CFLAGS += -DUSE_INFOPOPPER=1 + + DEP := gcc -MM -DBEOS_BUILD + diff --git a/haiku-apps/vision/patches/vision-0.9.7-gcc4.patch b/haiku-apps/vision/patches/vision-0.9.7-gcc4.patch index 86e32352a..37997208f 100644 --- a/haiku-apps/vision/patches/vision-0.9.7-gcc4.patch +++ b/haiku-apps/vision/patches/vision-0.9.7-gcc4.patch @@ -1,22 +1,25 @@ -Index: Vision/Makefile +Index: Makefile =================================================================== ---- Vision/Makefile (revision 908) +--- Vision/Makefile (revision 946) +++ Vision/Makefile (working copy) @@ -21,7 +21,7 @@ BUILD_TYPE := Release - + # system libs -REG_LIBS := -lbe -ltranslation -ltextencoding -ltracker -lnetwork -lroot +REG_LIBS := -lbe -ltranslation -ltextencoding -ltracker -lnetwork -lroot -lstdc++ - + # lua LUA_LIBS := -L./src/lua/lib -llua -llualib -@@ -71,7 +71,7 @@ - CFLAGS += -DBUILD_DATE=\"$(BUILDDATE)\" - CFLAGS += -fno-pic - CFLAGS += -ffast-math --CFLAGS += -march=pentium -mcpu=pentiumpro -+CFLAGS += -march=pentium - CFLAGS += -Wall -W -Wno-multichar -Wpointer-arith - CFLAGS += -Wwrite-strings -Woverloaded-virtual - CFLAGS += -Wconversion -Wpointer-arith +@@ -84,10 +84,7 @@ + + LDFLAGS := $(REG_LIBS) -nodefaultlibs + +-ifeq ($(wildcard /boot/common/include/infopopper/InfoPopper.h), ) +-else +- CFLAGS += -DUSE_INFOPOPPER=1 +-endif ++CFLAGS += -DUSE_INFOPOPPER=1 + + DEP := gcc -MM -DBEOS_BUILD + diff --git a/haiku-apps/vision/vision-0.9.7.r944.recipe b/haiku-apps/vision/vision-0.9.7.r946.recipe similarity index 84% rename from haiku-apps/vision/vision-0.9.7.r944.recipe rename to haiku-apps/vision/vision-0.9.7.r946.recipe index 79cdf2ed1..8434bb1e4 100644 --- a/haiku-apps/vision/vision-0.9.7.r944.recipe +++ b/haiku-apps/vision/vision-0.9.7.r946.recipe @@ -1,13 +1,15 @@ SUMMARY="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#944" +SRC_URI="svn://svn.code.sf.net/p/vision/code/branches/0.9.7#946" LICENSE="MPL v1.1" COPYRIGHT="1999-2010 The Vision Team" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" -if [ $targetArchitecture != x86_gcc2 ]; then +if [ $targetArchitecture == x86_gcc2 ]; then + PATCHES="vision-0.9.7-gcc2.patch" +else PATCHES="vision-0.9.7-gcc4.patch" fi From 4243b61edf6deaf1431b75ef1c12be31dbb329b8 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 12 Oct 2013 00:57:30 -0700 Subject: [PATCH 556/587] Fixed lame so that files end up in proper .hpkgs --- media-sound/lame/lame-3.99.5.recipe | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe index 1ab59c9c1..9d6217bfc 100644 --- a/media-sound/lame/lame-3.99.5.recipe +++ b/media-sound/lame/lame-3.99.5.recipe @@ -6,29 +6,29 @@ SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar CHECKSUM_MD5="84835b313d4a8b68f5349816d33e07ce" LICENSE="GNU LGPL v2" COPYRIGHT="1998-2012 Mike Cheng et al." -REVISION="1" +REVISION="2" ARCHITECTURES="x86 x86_gcc2" PROVIDES=" lame = $portVersion compat >= 1 cmd:lame = $portVersion compat >= 1 lib:libmp3lame = $portVersion compat >= 0.0.0 - devel:libmp3lame = $portVersion compat >= 1 " -REQUIRES="haiku >= $haikuVersion" +REQUIRES=" + haiku + lib:libiconv + " BUILD_REQUIRES=" haiku_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:automake cmd:gcc -# cmd:gettext cmd:ld cmd:libtoolize cmd:make cmd:m4 cmd:sed - lib:libiconv$secondaryArchSuffic >= 2 devel:libiconv " @@ -67,30 +67,25 @@ BUILD() INSTALL() { - make install $jobArgs - + make install + # prepare devel/lib prepareInstalledDevelLibs libmp3lame fixPkgconfig # devel package packageEntries devel \ - $binDir/lame \ - $developDir \ - $manDir/man1 + $developDir } # ----- devel package ------------------------------------------------------- PROVIDES_devel=" lame_devel = $portVersion - cmd:lame = $portVersion compat >= 3 - lib:libmp3lame = $portVersion compat >= 0.0.0 devel:libmp3lame = 0.0.0 compat >= 0 " REQUIRES_devel=" libmp3lame == $portVersion base lib:libiconv >= 2 - lib:libroot >= $haikuVersion + lib:libroot " - From 8f2d48b59f95b14cd16195c88932a1758503d151 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 12 Oct 2013 03:17:13 -0700 Subject: [PATCH 557/587] Add libGLU dependency to libsdl --- media-libs/libsdl/libsdl-1.2.15.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index a11346b8f..94990c4f0 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -17,6 +17,7 @@ PROVIDES=" " REQUIRES=" haiku + lib:libGLU " BUILD_REQUIRES=" lib:libpng From bd759f30b2b7181acf983f58dbf25736ff072f20 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 12 Oct 2013 15:51:18 -0700 Subject: [PATCH 558/587] Fix recipe for libmad. --- media-libs/libmad/libmad-0.15.1b.recipe | 64 +++++++++++++++++++------ 1 file changed, 50 insertions(+), 14 deletions(-) diff --git a/media-libs/libmad/libmad-0.15.1b.recipe b/media-libs/libmad/libmad-0.15.1b.recipe index 6fa4adfb6..cae468cd4 100644 --- a/media-libs/libmad/libmad-0.15.1b.recipe +++ b/media-libs/libmad/libmad-0.15.1b.recipe @@ -1,30 +1,66 @@ -DESCRIPTION="libmad - Mpeg Audio Decoder library" +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." HOMEPAGE="http://mad.sourceforge.net/" SRC_URI="ftp://ftp.mars.org/pub/mpeg/libmad-0.15.1b.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" CHECKSUM_MD5="1be543bc30c56fb6bea1d7bf6a64e66c" -DEPEND="" +LICENSE="GNU GPL v2" +COPYRIGHT="2000-2004 Underbit Technologies, Inc." +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + libmad$secondaryArchSuffix = $portVersion + lib:libmad$secondaryArchSuffix = 0.2.1 compat >= 0 + " + +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + BUILD() { - cd libmad-0.15.1b + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac libtoolize --force --copy --install aclocal sed -i 's/$optimize -fforce-mem/$optimize/g' configure.ac autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd libmad-0.15.1b make install + + prepareInstalledDevelLibs libmad + fixPkgconfig + + #devel Package + packageEntries devel \ + $developDir } -LICENSE="GNU GPL v2" -COPYRIGHT="2000-2004 Underbit Technologies, Inc." +# ----- devel package ------------------------------------ + +PROVIDES_devel=" + libmad$secondaryArchSuffix_devel = $portVersion + devel:libmad$secondaryArchSuffix = 0.2.1 compat >= 0 + " +REQUIRES_devel=" + libmad$secondaryArchSuffix == $portVersion + " From 6b6aa2267554431f139bead77b1a5c4e1fc698b7 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 12 Oct 2013 17:59:50 -0700 Subject: [PATCH 559/587] Fixed sdl_image. TODO: update again once libtiff and libwebp are fixed --- media-libs/sdl_image/sdl_image-1.2.12.recipe | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 766d0d14a..8ebbdc8a9 100644 --- a/media-libs/sdl_image/sdl_image-1.2.12.recipe +++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe @@ -40,6 +40,10 @@ BUILD_PREREQUIRES=" cmd:make cmd:pkg_config cmd:sdl_config + devel:libpng + devel:libjpeg +# devel:libtiff +# devel:libwebp " SOURCE_DIR="SDL_image-1.2.12" @@ -62,4 +66,16 @@ INSTALL() fixPkgconfig prepareInstalledDevelLib libSDL_image + + packageEntries devel \ + $developDir } + +PROVIDES_devel=" + devel:SDL_image = 0.8.4 compat >= 0 + devel:libSDL_image = 0.8.4 compat >= 0 + " + +REQUIRES_devel=" + sdl_image == $portVersion base + " From 6fe62a9436addc6a59731639ed6ace9f9d9d1bc9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 12 Oct 2013 18:00:56 -0700 Subject: [PATCH 560/587] Fixed sdl_ttf. --- media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe | 41 +++++++++++++++++------- 1 file changed, 29 insertions(+), 12 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 103b3fa53..1d452a8c8 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -1,8 +1,20 @@ +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" 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" +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" + REVISION="1" + ARCHITECTURES="x86 x86_gcc2" PROVIDES=" @@ -20,6 +32,7 @@ REQUIRES=" " BUILD_PREREQUIRES=" + haiku_devel cmd:libtoolize cmd:aclocal cmd:automake @@ -27,15 +40,16 @@ BUILD_PREREQUIRES=" cmd:gcc cmd:sdl_config cmd:make -" + cmd:freetype_config + devel:libz + " SOURCE_DIR="SDL_ttf-$portVersion" BUILD() { - rm -f acinclude.m4 libtoolize --copy --force --install aclocal --install -I acinclude - ./autogen.sh + autoconf runConfigure ./configure make } @@ -46,15 +60,18 @@ INSTALL() fixPkgconfig prepareInstalledDevelLib libSDL_ttf + + fixPkgconfig + packageEntries devel \ + $developDir } -LICENSE="Zlib" -COPYRIGHT="1997-2012 Sam Lantinga" -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. +PROVIDES_devel=" + devel:SDL_ttf = 0.10.1 compat >= 0 + devel:libSDL_ttf = 0.10.1 compat >= 0 " + +REQUIRES_devel=" + sdl_ttf == $portVersion base + " + From ffe772416d3bff64f97d3376f1df506e3b4feeb5 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 13 Oct 2013 11:38:06 +0200 Subject: [PATCH 561/587] Recipe for bnetapi-based webkit * Feedback welcome! --- .../haikuwebkit-1.1.3_2013_10_11.recipe | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe 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 new file mode 100644 index 000000000..d9ffa6c1f --- /dev/null +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe @@ -0,0 +1,96 @@ +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 + WebKit Apple + MIT + " +SRC_URI="git+https://github.com/haiku/haiku-webkit.git#0a2867a628bbe7cf59127b49b7d66b661eac961c" +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:libjavascriptcore$secondaryArchSuffix = $portVersion + lib:libwebcore$secondaryArchSuffix = $portVersion + lib:libwebkit$secondaryArchSuffix = $portVersion + lib:libwtf$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: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 + " + +SOURCE_DIR="haiku-webkit-lastgood" + +BUILD() +{ + Tools/haiku/generate-build-info.sh . $portVersion $portVersion \ + > Source/WebKit/haiku/API/BuildInfo.h + perl Tools/Scripts/build-webkit --haiku --no-webkit2 \ + -cmakearg="-DCMAKE_INSTALL_PREFIX=$prefix -DLIB_SUFFIX=/`echo $secondaryArchSuffix | tr -d _`" +} + +INSTALL() +{ + cd WebKitBuild/Release + make install + + 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 9325bbe02f7fa71d09843910f3e702dceec14ad6 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 13 Oct 2013 01:23:13 -0700 Subject: [PATCH 562/587] Add libogg and nasm into recipe for flac, also declare devel:flac --- media-libs/flac/flac-1.3.0.recipe | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/media-libs/flac/flac-1.3.0.recipe b/media-libs/flac/flac-1.3.0.recipe index c434d147a..d274dbb07 100644 --- a/media-libs/flac/flac-1.3.0.recipe +++ b/media-libs/flac/flac-1.3.0.recipe @@ -25,6 +25,7 @@ PROVIDES=" REQUIRES=" haiku lib:libiconv + lib:libogg " BUILD_REQUIRES=" @@ -32,6 +33,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" haiku_devel + cmd:nasm cmd:gcc cmd:libtoolize cmd:aclocal @@ -42,6 +44,7 @@ BUILD_PREREQUIRES=" cmd:gawk cmd:perl devel:libiconv + devel:libogg " BUILD() @@ -84,6 +87,7 @@ TEST() PROVIDES_devel=" libFLAC_devel = $portVersion + devel:flac = 8.3.0 compat >= 8 devel:libFLAC = 8.3.0 compat >= 8 devel:libFLAC++ = 8.3.0 compat >= 8 " From 6234e1407ac59815661812f1ccb4970250b61d4c Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 13 Oct 2013 01:23:57 -0700 Subject: [PATCH 563/587] Fixed recipe for sdl_net. --- media-libs/sdl_net/sdl_net-1.2.8.recipe | 64 ++++++++++++++++++++----- 1 file changed, 51 insertions(+), 13 deletions(-) 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 c43a9b14d..d2fa6fa7f 100644 --- a/media-libs/sdl_net/sdl_net-1.2.8.recipe +++ b/media-libs/sdl_net/sdl_net-1.2.8.recipe @@ -1,29 +1,67 @@ +SUMMARY="This is a small simple cross-platform networking library for SDL" DESCRIPTION="Simple Direct Media Layer Net Library" 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" +LICENSE="Zlib" +COPYRIGHT="1997-2012 Sam Lantinga" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + sdl_net =$portVersion + lib:libSDL_net_1.2 = $portVersion compat >= 1.2 + devel:libSDL_net = $portVersion compat >= 1.2 + " + +REQUIRES=" + haiku + libsdl + " + +BUILD_REQUIRES=" + devel:libsdl + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtool + cmd:make + cmd:pkg_config + cmd:sdl_config + " + +SOURCE_DIR="SDL_net-$portVersion" BUILD() { - cd SDL_net-1.2.8 + libtoolize --force --copy --install aclocal --force --install -I acinclude - libtoolize -fci - ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR + autoconf + runConfigure ./configure make } INSTALL() { - cd SDL_net-1.2.8 make install + + fixPkgconfig + prepareInstalledDevelLib libSDL_net + + fixPkgconfig + packageEntries devel \ + $developDir } -LICENSE="Zlib" -COPYRIGHT="1997-2012 Sam Lantinga" +PROVIDES_devel=" + devel:SDL_net = 0.8.0 compat >= 0 + devel:libSDL_net = 0.8.0 compat >= 0 + " + +REQUIRES_devel=" + sdl_net == $portVersion base + " From 474d6b724ad6547cf741e0f36a50c1e39cc03c06 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 13 Oct 2013 02:48:59 -0700 Subject: [PATCH 564/587] Fixed sdl_mixer recipe. --- media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 84 +++++++++++++++----- 1 file changed, 64 insertions(+), 20 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 18c50b697..19e265b7a 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -1,36 +1,80 @@ +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" 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" -STATUS_HAIKU="stable" -DEPEND="libsdl >= 1.2.14 - media-libs/flac >= 1.2.1 - media-libs/libmad >= 0.15.1 - media-libs/libvorbis >= 1.3.1 - media-libs/libmikmod >= 3.1.11 - media-libs/libogg >= 1.2.0 - media-libs/smpeg >= 0.4.5" +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + sdl_net =$portVersion + lib:libSDL_mixer_1.2 = $portVersion compat >= 1.2 + devel:libSDL_mixer = $portVersion compat >= 1.2 + " + +REQUIRES=" + haiku + libsdl + flac + libmad + libvorbis + libogg +# libmikmod +# smpeg + " + +BUILD_REQUIRES=" + devel:libsdl + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtool + cmd:make + cmd:pkg_config + cmd:sdl_config + devel:libogg + devel:flac + devel:libmad + devel:libvorbis + devel:libogg +# devel:libmikmod +# devel:smpeg + " + +SOURCE_DIR="SDL_mixer-$portVersion" BUILD() { - cd SDL_mixer-1.2.12 libtoolize --force --copy --install - aclocal --install -I acinclude - ./autogen.sh - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - --enable-music-midi + aclocal --force --install -I acinclude + autoconf + runConfigure ./configure make } INSTALL() { - cd SDL_mixer-1.2.12 make install + + prepareInstalledDevelLib libSDL_mixer + fixPkgconfig + + packageEntries devel \ + $developDir } -LICENSE="Zlib" -COPYRIGHT="1997-2012 Sam Lantinga" + +PROVIDES_devel=" + devel:SDL_mixer = 0.0.0 compat >= 0 + devel:libSDL_mixer = 0.0.0 compat >= 0 + " + +REQUIRES_devel=" + sdl_mixer == $portVersion base + " From b49430524d282b0b0b0557cb4660e7d6b6283912 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 13 Oct 2013 02:50:08 -0700 Subject: [PATCH 565/587] Fixed sdl_net recipe. --- media-libs/sdl_net/sdl_net-1.2.8.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 d2fa6fa7f..82459fe0d 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,5 @@ -SUMMARY="This is a small simple cross-platform networking library for SDL" -DESCRIPTION="Simple Direct Media Layer Net Library" +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" @@ -49,10 +49,10 @@ INSTALL() { make install - fixPkgconfig + prepareInstalledDevelLib libSDL_net - fixPkgconfig + packageEntries devel \ $developDir } From 410e403f23ec791f4be798bfe846fa0371245e91 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 13 Oct 2013 02:52:16 -0700 Subject: [PATCH 566/587] Removed stray fixPkgconfig from sdl_ttf recipe. --- media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe | 3 +-- 1 file changed, 1 insertion(+), 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 1d452a8c8..bad25b15d 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -58,10 +58,9 @@ INSTALL() { make install - fixPkgconfig prepareInstalledDevelLib libSDL_ttf - fixPkgconfig + packageEntries devel \ $developDir } From c8f460d0973b9b87271a6379a0509412fc23694a Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 13 Oct 2013 03:20:03 -0700 Subject: [PATCH 567/587] WIP recipes for smpeg and taglib, both still need a bit more work. --- media-libs/smpeg/smpeg-0.4.5.recipe | 97 +++++++++++++++++++++------ media-libs/taglib/taglib-1.9.1.recipe | 36 ++++++++++ 2 files changed, 112 insertions(+), 21 deletions(-) create mode 100644 media-libs/taglib/taglib-1.9.1.recipe diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe index 87e4d3872..b15205392 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -1,33 +1,88 @@ -DESCRIPTION="smpeg" +SUMMARY="smpeg" +DESCRIPTION="smpeg is an mpeg decoding library, which runs on just about any platform. It comes with a sample decoder, plaympeg." HOMEPAGE="http://www.icculus.org/smpeg" -SRC_URI="svn://svn.icculus.org/smpeg/trunk/" +SRC_URI="svn://svn.icculus.org/smpeg/tags/release_0_4_5" +LICENSE="GNU LGPL v2" +COPYRIGHT="1999-2004 Sam Lantinga, Joe Tennies." REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" + + +#BUILD() +#{ +# cd smpeg-0.4.5 +# rm -f acinclude.m4 +# rm -f aclocal.m4 +# echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" +# libtoolize --copy --force --install +# aclocal --install -I acinclude +# automake --foreign --add-missing +# autoconf +# MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man +# LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` +# ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ +# --libdir=$LIBDIR \ +# --mandir=$MANDIR \ +# --datadir=`finddir B_COMMON_DATA_DIRECTORY` +# make +#} + + +ARCHITECTURES="?x86 ?x86_gcc2" + +PROVIDES=" + smpeg = 0.4.5 compat >= 0 + cmd:smpeg + cmd:plaympeg + " + +REQUIRES=" + haiku + lib:libogg + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:gcc + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:ld + cmd:make + " + BUILD() { - cd smpeg-0.4.5 - rm -f acinclude.m4 - rm -f aclocal.m4 - echo "AC_CONFIG_MACRO_DIR([acinclude]) > configure.in" - libtoolize --copy --force --install - aclocal --install -I acinclude - automake --foreign --add-missing + libtoolize --force --copy --install + aclocal autoconf - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd smpeg-0.4.5 make install + + prepareInstalledDevelLibs libFLAC + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir + } -LICENSE="GNU LGPL v2" -COPYRIGHT="1999-2004 Sam Lantinga, Joe Tennies." +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + smpeg_devel = $portVersion + devel:smpeg = 0.4.5 compat >= 0 + " + +REQUIRES_devel=" + smpeg == $portVersion base + " diff --git a/media-libs/taglib/taglib-1.9.1.recipe b/media-libs/taglib/taglib-1.9.1.recipe new file mode 100644 index 000000000..8e017a001 --- /dev/null +++ b/media-libs/taglib/taglib-1.9.1.recipe @@ -0,0 +1,36 @@ +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" +COPYRIGHT="2002-2013 Scott Wheeler" +LICENSE="GNU LGPL v2 + MPL v1.1 + " +REVISION="1" + +ARCHITECTURES="?x86 ?x86_gcc2 ?x86_64" + +PROVIDES=" + taglib = $portVersion + " +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + haiku_devel + cmd:gcc + cmd:cmake + cmd:make + " +SOURCE_DIR="$portVersionedName" + +BUILD() +{ + cmake . + make +} + +INSTALL() +{ + make install +} From 651257405191c232fb8fab604459d20754c85877 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 13 Oct 2013 10:03:39 -0700 Subject: [PATCH 568/587] Change common to system in apr-util recipe. --- dev-libs/apr_util/apr_util-1.4.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 49ba1edb0..0696004a9 100644 --- a/dev-libs/apr_util/apr_util-1.4.1.recipe +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -63,7 +63,7 @@ BUILD() cd ../.. # TODO: fix this hack! - cp /boot/common/bin/libtool . + cp /boot/system/bin/libtool . ln -sfn $sourceDir/libtool /libtool runConfigure ./configure \ From 5c0c10ac00989423a245fdf993c0ffd67ef6d4d0 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 13 Oct 2013 22:44:13 +0200 Subject: [PATCH 569/587] Fix ninja recipe * Workaround bug in python to get the build working * Mark the recipe as working. --- dev-util/ninja/ninja-1.4.0.recipe | 4 ++- dev-util/ninja/patches/ninja-1.4.0.patchset | 33 ++++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dev-util/ninja/ninja-1.4.0.recipe b/dev-util/ninja/ninja-1.4.0.recipe index cf93d8c50..dad0224b6 100644 --- a/dev-util/ninja/ninja-1.4.0.recipe +++ b/dev-util/ninja/ninja-1.4.0.recipe @@ -4,7 +4,7 @@ LICENSE="Apache v2" COPYRIGHT="2011 Google Inc." SRC_URI="git://github.com/martine/ninja.git#v1.4.0" REVISION="1" -ARCHITECTURES="!x86_gcc2 !x86" +ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86" PROVIDES=" @@ -18,6 +18,7 @@ REQUIRES=" BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_devel >= $haikuVersion cmd:python cmd:g++$secondaryArchSuffix cmd:gcc$secondaryArchSuffix @@ -33,6 +34,7 @@ BUILD() INSTALL() { + mkdir -p $binDir cp ninja $binDir } diff --git a/dev-util/ninja/patches/ninja-1.4.0.patchset b/dev-util/ninja/patches/ninja-1.4.0.patchset index 1a86057a9..44356c8b4 100644 --- a/dev-util/ninja/patches/ninja-1.4.0.patchset +++ b/dev-util/ninja/patches/ninja-1.4.0.patchset @@ -1,4 +1,4 @@ -From 2fa2d0ca09ffb589f08dc11330f91364228f0bdd Mon Sep 17 00:00:00 2001 +From d5b906ba41f20ba28ea7044c8933c069dd915616 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 3 Oct 2013 10:06:13 +0200 Subject: Add minimal Haiku support @@ -49,3 +49,34 @@ index 6ba3c6c..7142d13 100644 -- 1.8.3.4 + +From ae6f3e8c5b4d18198ef0c798c4609ac9607ea16f Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 13 Oct 2013 22:39:03 +0200 +Subject: Disable has_re2c test + + * The test triggers some bug in our python port, leading to a corrupted +build.ninja file (first 40 lines are written twice to the file). + * re2c is not needed when just building ninja anyway. + +diff --git a/configure.py b/configure.py +index 9fe3be8..61ac9dd 100755 +--- a/configure.py ++++ b/configure.py +@@ -241,12 +241,7 @@ if not platform.is_windows() and not platform.is_solaris(): + + n.comment('the depfile parser and ninja lexers are generated using re2c.') + def has_re2c(): +- import subprocess +- try: +- proc = subprocess.Popen(['re2c', '-V'], stdout=subprocess.PIPE) +- return int(proc.communicate()[0], 10) >= 1103 +- except OSError: +- return False ++ return False + if has_re2c(): + n.rule('re2c', + command='re2c -b -i --no-generation-date -o $out $in', +-- +1.8.3.4 + From d50f282a6546b2fd92171d7a0dcf20ab95342759 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 14 Oct 2013 10:06:53 +0200 Subject: [PATCH 570/587] Add command line length limit to Ninja generator * If we don't do that, ninja will fail building WebKit because of a too long command line * CMake will use a "response file" to forward arguments when the command line gets over the limit (with a safety margin) --- dev-util/cmake/cmake-2.8.11.2.recipe | 2 +- .../cmake/patches/cmake-2.8.11.2.patchset | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dev-util/cmake/cmake-2.8.11.2.recipe b/dev-util/cmake/cmake-2.8.11.2.recipe index 26ecd2641..2c10c2503 100644 --- a/dev-util/cmake/cmake-2.8.11.2.recipe +++ b/dev-util/cmake/cmake-2.8.11.2.recipe @@ -10,7 +10,7 @@ LICENSE="CMake" COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved." SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.11.2.tar.gz" CHECKSUM_MD5="6f5d7b8e7534a5d9e1a7664ba63cf882" -REVISION="1" +REVISION="2" ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" PROVIDES=" diff --git a/dev-util/cmake/patches/cmake-2.8.11.2.patchset b/dev-util/cmake/patches/cmake-2.8.11.2.patchset index 004c417ca..11b7db37d 100644 --- a/dev-util/cmake/patches/cmake-2.8.11.2.patchset +++ b/dev-util/cmake/patches/cmake-2.8.11.2.patchset @@ -524,3 +524,26 @@ index fec142e..6adec1f 100644 -- 1.8.3.4 + +From ff28e08e29c0d54d794185ada1ddf496b41285e0 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 14 Oct 2013 09:35:02 +0200 +Subject: Enable command-line length limitation on Haiku. + + +diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx +index 7e48cd7..3d15900 100644 +--- a/Source/cmNinjaNormalTargetGenerator.cxx ++++ b/Source/cmNinjaNormalTargetGenerator.cxx +@@ -563,7 +563,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() + cmSystemTools::GetEnv(forceRspFile) == 0) { + #ifdef _WIN32 + commandLineLengthLimit = 8000 - linkRuleLength; +-#elif defined(__linux) || defined(__APPLE__) ++#elif defined(__linux) || defined(__APPLE__) || defined(__HAIKU__) + // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac + commandLineLengthLimit = ((int)sysconf(_SC_ARG_MAX))-linkRuleLength-1000; + #else +-- +1.8.3.4 + From 33dd0d8744e512642c39b9235bc73727d1e9b105 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 14 Oct 2013 20:16:12 +0200 Subject: [PATCH 571/587] distcc: adjust for /boot/common removal. --- sys-devel/distcc/distcc-3.1.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys-devel/distcc/distcc-3.1.recipe b/sys-devel/distcc/distcc-3.1.recipe index 7815c3934..5333ce91c 100644 --- a/sys-devel/distcc/distcc-3.1.recipe +++ b/sys-devel/distcc/distcc-3.1.recipe @@ -5,7 +5,7 @@ COPYRIGHT="Copyright (C) 2002, 2003, 2004 by Martin Pool LICENSE="GNU GPL v2" SRC_URI="http://distcc.googlecode.com/files/distcc-3.1.tar.bz2" CHECKSUM_MD5="a1a9d3853df7133669fffec2a9aab9f3" -REVISION="1" +REVISION="2" ARCHITECTURES="?x86_gcc2 ?x86" PROVIDES=" @@ -24,15 +24,15 @@ GLOBAL_WRITABLE_FILES=" " REQUIRES=" - haiku + haiku >= $haikuVersion lib:libpython2.6 " -# second part only for tests. Where to put that ? BUILD_REQUIRES=" devel:libpython2.6 " BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion cmd:libtoolize cmd:which cmd:aclocal @@ -50,7 +50,7 @@ BUILD() libtoolize --copy --force --install ./autogen.sh runConfigure ./configure \ - LDFLAGS=-L/boot/common/lib/python2.6/config + LDFLAGS=-L/boot/system/lib/python2.6/config make $jobArgs } @@ -61,7 +61,7 @@ INSTALL() TEST() { - make check RESTRICTED_PATH=/sources/distcc-3.3:/boot/common/develop/tools/bin:/bin + make check RESTRICTED_PATH=/sources/distcc-3.1:/boot/system/develop/tools/bin:/bin } DESCRIPTION=" From 2e1cc4c3cc8e52d5bccd4b04e997744efcafca71 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 14 Oct 2013 21:23:47 +0000 Subject: [PATCH 572/587] Updated curl to 7.33.0. --- net-misc/curl/curl-7.33.0.recipe | 115 +++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 net-misc/curl/curl-7.33.0.recipe diff --git a/net-misc/curl/curl-7.33.0.recipe b/net-misc/curl/curl-7.33.0.recipe new file mode 100644 index 000000000..52c364ca9 --- /dev/null +++ b/net-misc/curl/curl-7.33.0.recipe @@ -0,0 +1,115 @@ +SUMMARY="A commandline-tool and library for downloading data from URLs" +HOMEPAGE="http://curl.haxx.se" +COPYRIGHT="1996-2013, Daniel Stenberg, . All rights reserved." +LICENSE="Curl" +SRC_URI="http://curl.haxx.se/download/curl-7.33.0.tar.bz2" +CHECKSUM_MD5="57409d6bf0bd97053b8378dbe0cadcef" +REVISION="1" +ARCHITECTURES="?x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PATCHES="" + +PROVIDES=" + curl$secondaryArchSuffix = $portVersion + lib:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:curl = $portVersion compat >= 7.16 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + ca_root_certificates + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + certsInstallDir="$portPackageLinksDir/ca_root_certificates" + certsDir="$certsInstallDir/$relativeDataRootDir/ssl" + + libtoolize --force --copy --install + autoconf + runConfigure ./configure \ + --enable-ipv6 \ + --with-ca-bundle="$certsDir/CARootCertificates.pem" + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs libcurl + fixPkgconfig + + # fix curl-config + fixDevelopLibDirReferences $binDir/curl-config + sed -i -e "s,--libexecdir=$developLibDir,--libexecdir=$libExecDir,g" \ + -e "s,--libdir=$developLibDir,--libdir=$libDir,g" $binDir/curl-config + + # install html documentation for curl + mkdir -p "$docDir" + install -c -m 644 "docs/curl.html" "$docDir" + + # install html development documentation for libcurl + mkdir -p "$developDocDir" + for h in docs/libcurl/*.html; do + install -c -m 644 "$h" "$developDocDir" + done + + # devel package + packageEntries devel \ + $binDir/curl-config \ + $developDir \ + $manDir/man3 + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi +} + +TEST() +{ + make check +} + +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. + " + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + curl${secondaryArchSuffix}_devel = $portVersion + cmd:curl_config$secondaryArchSuffix = $portVersion compat >= 7.16 + devel:libcurl$secondaryArchSuffix = 4.2.0 compat >= 4 + " +REQUIRES_devel=" + curl$secondaryArchSuffix == $portVersion base + " From 176643052cbec90cb53f07d3870b940cc75be24b Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 14 Oct 2013 23:20:23 +0000 Subject: [PATCH 573/587] Fixed cdrtools-3.01~a17 to use B_SYSTEM_* instead of B_COMMON_* --- app-cdr/cdrtools/cdrtools-3.01~a17.recipe | 2 +- app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe index a4a6c2763..5d78afffe 100644 --- a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe +++ b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe @@ -25,7 +25,7 @@ LICENSE=" SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a17.tar.bz2" CHECKSUM_MD5="4cef9db0cf15a770c52d65b00bbee2db" REVISION="1" -ARCHITECTURES="?x86_gcc2 ?x86" +ARCHITECTURES="x86_gcc2 x86" PATCHES='cdrtools-3.01~a17.patch' diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch b/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch index 09df8a6de..8fca82f12 100644 --- a/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch +++ b/app-cdr/cdrtools/patches/cdrtools-3.01~a17.patch @@ -6,7 +6,7 @@ diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Def DEFINCDIRS= $(SRCROOT)/include -LDPATH= -L/opt/schily/lib -+LDPATH= -L$(shell finddir B_COMMON_LIB_DIRECTORY) ++LDPATH= -L$(shell finddir B_SYSTEM_LIB_DIRECTORY) #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) -RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib +RUNPATH= -R$(INS_BASE)/lib @@ -17,7 +17,7 @@ diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Def # ########################################################################### -INS_BASE= /boot/opt/schily -+INS_BASE= $(shell finddir B_COMMON_DIRECTORY) ++INS_BASE= $(shell finddir B_SYSTEM_DIRECTORY) INS_KBASE= / INS_RBASE= / # From fcf626fff3f05fbf3ec8e7827e23c92f384b3def Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 14 Oct 2013 23:21:04 +0000 Subject: [PATCH 574/587] Update cdrtools to 3.01~a18 --- app-cdr/cdrtools/cdrtools-3.01~a18.recipe | 157 ++++++++++++++++ .../cdrtools/patches/cdrtools-3.01~a18.patch | 170 ++++++++++++++++++ 2 files changed, 327 insertions(+) create mode 100644 app-cdr/cdrtools/cdrtools-3.01~a18.recipe create mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01~a18.patch diff --git a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe new file mode 100644 index 000000000..ba3601c7e --- /dev/null +++ b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe @@ -0,0 +1,157 @@ +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. + +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 + " +HOMEPAGE="http://cdrecord.berlios.de" +COPYRIGHT=" + 1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs) + 1995-2013 J. Schilling (cdrecord) + " +LICENSE=" + GNU GPL v2 + CDDL v1 + " +SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a18.tar.bz2" +CHECKSUM_MD5="4cef9db0cf15a770c52d65b00bbee2db" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PATCHES='cdrtools-3.01~a18.patch' + +PROVIDES=" + cdrtools = $portVersion compat >= 3 + cmd:devdump = $portVersion compat >= 3 + cmd:rscsi = $portVersion compat >= 3 + cmd:scgcheck = $portVersion compat >= 3 + cmd:mkisofs = $portVersion compat >= 3 + cmd:btcflash = $portVersion compat >= 3 + cmd:scgskeleton = $portVersion compat >= 3 + cmd:isovfy = $portVersion compat >= 3 + cmd:readcd = $portVersion compat >= 3 + cmd:isodebug = $portVersion compat >= 3 + cmd:cdda2mp3 = $portVersion compat >= 3 + cmd:cdda2ogg = $portVersion compat >= 3 + cmd:cdda2wav = $portVersion compat >= 3 + cmd:mkhybrid = $portVersion compat >= 3 + cmd:cdrecord = $portVersion compat >= 3 + cmd:isodump = $portVersion compat >= 3 + cmd:isoinfo = $portVersion compat >= 3 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +GLOBAL_WRITABLE_FILES=" + settings/cdrecord keep-old + settings/rscsi keep-old + " + +SOURCE_DIR="cdrtools-3.01" + +patchInsdir() +{ + # Usage: patchInsdir ... + oldDir=$1 + newDir=$2 + shift 2 + + sed -i "s,^INSDIR=\s*$oldDir,INSDIR= $newDir," $@ +} + +PATCH() +{ + allMakefiles="$(find . -name Makefile\*) $(find . -name \*.mk)" + + patchInsdir bin $relativeBinDir $allMakefiles + patchInsdir sbin $relativeBinDir $allMakefiles + patchInsdir share/doc $relativeDocDir $allMakefiles + patchInsdir include $relativeIncludeDir $allMakefiles + patchInsdir lib $relativeLibDir $allMakefiles + patchInsdir etc/default settings $allMakefiles + + sed -i "s,/etc/default,$sysconfDir," \ + btcflash/btcflash.1 \ + cdda2wav/cdda2mp3 \ + cdda2wav/cdda2ogg \ + cdda2wav/cdda2*.1 \ + cdrecord/COPYING \ + cdrecord/README.* \ + cdrecord/auinfo.c \ + cdrecord/cdrecord.1 \ + doc/*.man \ + doc/*.ps \ + include/schily/deflts.h \ + libcdrdeflt/cdrdeflt.c \ + libcdrdeflt/cdrdeflt.h \ + mkisofs/diag/isoinfo.8 \ + readcd/readcd.1 \ + rscsi/rscsi.1 \ + rscsi/rscsi.c \ + scgskeleton/scgskeleton.1 +} + +BUILD() +{ + make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \ + RUNPATH="" DEFMANBASE=$relativeDocumentationDir + # not multi-job safe +} + +INSTALL() +{ + make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \ + RUNPATH="" DEFMANBASE=$relativeDocumentationDir install + + # The whole lib folder only contains static libraries (even in several + # subdirectories). + mkdir -p $developLibDir + mv $libDir/* $developLibDir/ + rmdir $libDir + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + cdrtools_devel = $portVersion + devel:libcdrdeflt = $portVersion compat >= 3 + devel:libedc_ecc = $portVersion compat >= 3 + devel:libedc_ecc_dec = $portVersion compat >= 3 + devel:libdeflt = $portVersion compat >= 3 + devel:libfile = $portVersion compat >= 3 + devel:libfind = $portVersion compat >= 3 + devel:libhfs = $portVersion compat >= 3 + devel:libmdigest = $portVersion compat >= 3 + devel:libparanoia = $portVersion compat >= 3 + devel:librscg = $portVersion compat >= 3 + devel:libscg = $portVersion compat >= 3 + devel:libsiconv = $portVersion compat >= 3 + devel:libscgcmd = $portVersion compat >= 3 + devel:libschily = $portVersion compat >= 3 + " +REQUIRES_devel=" + cdrtools == $portVersion + " diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01~a18.patch b/app-cdr/cdrtools/patches/cdrtools-3.01~a18.patch new file mode 100644 index 000000000..8fca82f12 --- /dev/null +++ b/app-cdr/cdrtools/patches/cdrtools-3.01~a18.patch @@ -0,0 +1,170 @@ +diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +--- cdrtools-3.01/DEFAULTS/Defaults.haiku ++++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +@@ -29,16 +29,16 @@ + CWARNOPTS= + + DEFINCDIRS= $(SRCROOT)/include +-LDPATH= -L/opt/schily/lib ++LDPATH= -L$(shell finddir B_SYSTEM_LIB_DIRECTORY) + #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) +-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib ++RUNPATH= -R$(INS_BASE)/lib + + ########################################################################### + # + # Installation config stuff + # + ########################################################################### +-INS_BASE= /boot/opt/schily ++INS_BASE= $(shell finddir B_SYSTEM_DIRECTORY) + INS_KBASE= / + INS_RBASE= / + # +diff -urN cdrtools-3.01/RULES/x86_64-haiku-cc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul +--- cdrtools-3.01/RULES/x86_64-haiku-cc.rul 1970-01-01 00:00:00.000000000 +0000 ++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul 2012-12-08 19:24:57.418643968 +0000 +@@ -0,0 +1,54 @@ ++#ident "@(#)bepc-haiku-cc.rul 1.3 09/02/05 " ++########################################################################### ++# Written 1996 by J. Schilling ++########################################################################### ++# ++# Platform dependent MACROS for Haiku, a BeOS like OS ++# ++########################################################################### ++# Copyright (c) J. Schilling ++########################################################################### ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License, Version 1.0 only ++# (the "License"). You may not use this file except in compliance ++# with the License. ++# ++# See the file CDDL.Schily.txt in this distribution for details. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file CDDL.Schily.txt from this distribution. ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/rules.prg ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul ++ ++# ++# XXX Old BeOS needs libroot.so to get [efg]cvt() ++# XXX New BeOS seems to have this in libc and in addition we include ++# XXX strtod.c for floating point conversion on OS without such code. ++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been ++# XXX removed and printing floating numbers will work with old/new BeOS ++# ++#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS ++OSDEFS += ++ ++KDEFINES= -DKERNEL -D_KERNEL ++ ++#CONFFLAGS= i586 ++ ++LIB_PREFIX= lib ++LIB_SUFFIX= .a ++SHL_SUFFIX= .so ++ ++#LIB_SOCKET= -lsocket -lbind ++LIB_SOCKET= -lnetwork ++LIB_MATH= ++LIB_KVM= ++ ++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) ++LDOPTS= $(LIBS_PATH) $(LDPATH) ++ ++LORDER= echo ++TSORT= cat ++ ++LN= /bin/ln -s +diff -urN cdrtools-3.01/RULES/x86_64-haiku-gcc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul +--- cdrtools-3.01/RULES/x86_64-haiku-gcc.rul 1970-01-01 00:00:00.000000000 +0000 ++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul 2012-12-08 19:24:57.421265408 +0000 +@@ -0,0 +1,54 @@ ++#ident "@(#)bepc-haiku-gcc.rul 1.3 09/02/05 " ++########################################################################### ++# Written 1996 by J. Schilling ++########################################################################### ++# ++# Platform dependent MACROS for Haiku, a BeOS like OS ++# ++########################################################################### ++# Copyright (c) J. Schilling ++########################################################################### ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License, Version 1.0 only ++# (the "License"). You may not use this file except in compliance ++# with the License. ++# ++# See the file CDDL.Schily.txt in this distribution for details. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file CDDL.Schily.txt from this distribution. ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/rules.prg ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul ++ ++# ++# XXX Old BeOS needs libroot.so to get [efg]cvt() ++# XXX New BeOS seems to have this in libc and in addition we include ++# XXX strtod.c for floating point conversion on OS without such code. ++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been ++# XXX removed and printing floating numbers will work with old/new BeOS ++# ++#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS ++OSDEFS += ++ ++KDEFINES= -DKERNEL -D_KERNEL ++ ++#CONFFLAGS= i586 ++ ++LIB_PREFIX= lib ++LIB_SUFFIX= .a ++SHL_SUFFIX= .so ++ ++#LIB_SOCKET= -lsocket -lbind ++LIB_SOCKET= -lnetwork ++LIB_MATH= ++LIB_KVM= ++ ++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) ++LDOPTS= $(LIBS_PATH) $(LDPATH) ++ ++LORDER= echo ++TSORT= cat ++ ++LN= /bin/ln -s +diff -up cdrtools-3.01/libscg/scsi-beos.c.orig cdrtools-3.01/libscg/scsi-beos.c +--- cdrtools-3.01/libscg/scsi-beos.c.orig 2009-06-30 12:34:03.022282240 -0600 ++++ cdrtools-3.01/libscg/scsi-beos.c 2012-07-19 18:25:01.146800640 -0600 +@@ -292,7 +292,11 @@ scgo_havebus(scgp, busno) + char buf[128]; + + if (busno < 8) ++#ifdef __HAIKU__ ++ js_snprintf(buf, sizeof (buf), "/dev/disk/scsi/%d", busno); ++#else + js_snprintf(buf, sizeof (buf), "/dev/bus/scsi/%d", busno); ++#endif + else + #ifdef __HAIKU__ + js_snprintf(buf, sizeof (buf), "/dev/disk/atapi/%d", busno-8); +@@ -320,9 +324,15 @@ scgo_fileno(scgp, busno, tgt, tlun) + return (f->fd); + } + if (busno < 8) { ++#ifdef __HAIKU__ ++ js_snprintf(buf, sizeof (buf), ++ "/dev/disk/scsi/%d/%d/%d/raw", ++ busno, tgt, tlun); ++#else + js_snprintf(buf, sizeof (buf), + "/dev/bus/scsi/%d/%d/%d/raw", + busno, tgt, tlun); ++#endif + } else { + char *tgtstr = (tgt == 0) ? "master" : (tgt == 1) ? "slave" : "dummy"; + js_snprintf(buf, sizeof (buf), From c461f8b99e158ca2ffb1b538903cecdc8efe4037 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 14 Oct 2013 23:47:49 +0000 Subject: [PATCH 575/587] Corrected checksum for cdrtools-3.01~a18 --- app-cdr/cdrtools/cdrtools-3.01~a18.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe index ba3601c7e..60aa374fd 100644 --- a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe +++ b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe @@ -23,7 +23,7 @@ LICENSE=" CDDL v1 " SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-3.01a18.tar.bz2" -CHECKSUM_MD5="4cef9db0cf15a770c52d65b00bbee2db" +CHECKSUM_MD5="cf3e5dc49c654a87c20b9fa55eb84ed4" REVISION="1" ARCHITECTURES="x86_gcc2 x86" From d437f843f4a8707c9aa82f23aec1ee045d365008 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 14 Oct 2013 03:04:45 -0700 Subject: [PATCH 576/587] Fixed sdl_sound recipe. --- media-libs/sdl_sound/sdl_sound-1.0.3.recipe | 73 +++++++++++++++++---- 1 file changed, 60 insertions(+), 13 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 4f5b773e0..76e780272 100644 --- a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe +++ b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe @@ -1,26 +1,73 @@ -DESCRIPTION="sdl-sound" +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" +COPYRIGHT="2001-2009 Ryan C. Gordon" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/libogg >= 1.1.4" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + sdl_sound =$portVersion + cmd:playsound = $portVersion compat >= 2 + cmd:playsound_simple = $portVersion compat >= 2 + lib:libSDL_sound_1.0 = $portVersion compat >= 1.0 + " + +REQUIRES=" + haiku + libsdl + " + +BUILD_REQUIRES=" + devel:libsdl + devel:libogg + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtool + cmd:make + cmd:pkg_config + cmd:sdl_config + " + +SOURCE_DIR="SDL_sound-$portVersion" + BUILD() { - cd sdl-sound-1.0.3 - libtoolize --copy --force --install + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in + libtoolize --force --copy --install ./bootstrap - MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man - LIBDIR=`finddir B_COMMON_LIB_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --libdir=$LIBDIR \ - --mandir=$MANDIR + aclocal --force --install -I acinclude + autoconf + runConfigure ./configure make } INSTALL() { - cd sdl-sound-1.0.3 make install + + prepareInstalledDevelLib libSDL_sound + fixPkgconfig + + packageEntries devel \ + $developDir } -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2001-2009 Ryan C. Gordon" + +PROVIDES_devel=" + devel:SDL_sound = 0.8.0 compat >= 0 + devel:libSDL_sound = 0.8.0 compat >= 0 +# devel:libSDL_sound = $portVersion compat >= 1.0 + devel:sdl_sound = 0.0.0 compat >= 0 + " + +REQUIRES_devel=" + sdl_sound == $portVersion base + " From 5f55e99f0f3df5482eb57039a1d7622e411c828e Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 14 Oct 2013 11:56:21 -0700 Subject: [PATCH 577/587] Updated sdl_gfx to 2.0.24. --- media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe | 84 ++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe new file mode 100644 index 000000000..a8eefad7c --- /dev/null +++ b/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe @@ -0,0 +1,84 @@ +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." +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" +LICENSE="Zlib" +COPYRIGHT="1999-2012 A. Schiffler" + +REVISION="1" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + sdl_gfx = $portVersion compat >= 2 + lib:libSDL_gfx = 14.9.1 compat >= 14 + " + +REQUIRES=" + haiku + libsdl + " + +BUILD_REQUIRES=" + devel:libsdl + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtool + cmd:make + cmd:pkg_config + cmd:sdl_config + " + +SOURCE_DIR="SDL_gfx-$portVersion" + +#BUILD_PACKAGE_ACTIVATION_PHASE = "TEST" + +BUILD() +{ + ./autogen.sh + libtoolize --force --copy --install + aclocal --force --install -I acinclude + autoconf + automake + runConfigure ./configure + make +} + +INSTALL() +{ + make install + + prepareInstalledDevelLib libSDL_gfx + fixPkgconfig + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + devel:SDL_gfx = 14.9.1 compat >= 0 + devel:libSDL_gfx = 14.9.1 compat >= 0 + devel:libSDL_gfx = $portVersion compat >= 2.0 + devel:sdl_gfx = 14.9.1 compat >= 0 + " + +REQUIRES_devel=" + sdl_gfx == $portVersion base + " + + +TEST() +{ + cd Test + runConfigure ./configure +# fails to configure due to missing sdl_gfx + make + ls +} From 032e7377394cb200629c7b3dcc987d3b3e90e8df Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 15 Oct 2013 19:19:20 +0000 Subject: [PATCH 578/587] Some cleanup of the libsdl2 recipe --- media-libs/libsdl2/libsdl2-2.0.0.recipe | 29 ++++++++++++++----------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/media-libs/libsdl2/libsdl2-2.0.0.recipe b/media-libs/libsdl2/libsdl2-2.0.0.recipe index 3846f145c..f7ef6f199 100644 --- a/media-libs/libsdl2/libsdl2-2.0.0.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.0.recipe @@ -10,11 +10,9 @@ COPYRIGHT="1997-2013 Sam Lantinga" ARCHITECTURES="x86 x86_gcc2" PROVIDES=" + libsdl2 = $portVersion compat >= 2.0 lib:libsdl2 = $portVersion compat >= 2.0 - cmd:sdl2_config = $portVersion compat >= 2.0 - lib:libsdl2 = $portVersion compat >= 2.0 - lib:libSDL2 = $portVersion compat >= 2.0 - lib:libSDL2_2.0 = 0.0.0 compat >= 0.12 + lib:libsdl2_2.0 = 0.0.0 compat >= 0.12 " REQUIRES=" @@ -26,14 +24,18 @@ REQUIRES=" lib:libgame lib:libdevice lib:libtextencoding - " - -BUILD_REQUIRES=" lib:libpng lib:libjpeg lib:libtiff " +BUILD_REQUIRES=" + haiku_devel + devel:libpng + devel:libjpeg +# devel:libtiff + " + BUILD_PREREQUIRES=" cmd:autoconf cmd:libtool @@ -64,18 +66,19 @@ INSTALL() libSDL2_test fixPkgconfig + fixDevelopLibDirReferences $binDir/sdl2-config packageEntries devel \ - $developDir + $developDir $binDir/sdl2-config $dataDir } # ----- devel package ------------------------------------- PROVIDES_devel=" - cmd:sdl2_config = $portVersion compat >= 2.0 - devel:libSDL2_2.0 = 0.0.0 compat >= 0 - devel:libSDL2 = 0.0.0 compat >= 0 - devel:libSDL2main = 0.12.0 compat >= 0 - devel:libSDL2_test = 0.0.0 compat >= 0 + cmd:sdl2_config = $portVersion compat >= 2.0 + devel:libsdl2_2.0 = 0.12.0 compat >= 0 + devel:libsdl2 = 0.12.0 compat >= 0 + devel:libsdl2main = 0.12.0 compat >= 0 + devel:libsdl2_test = 0.12.0 compat >= 0 " REQUIRES_devel=" From 3a223e0fddfeb235c77900b5e33124d789f98f12 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 15 Oct 2013 19:21:55 +0000 Subject: [PATCH 579/587] First pass at .recipe files for tiff, it's got a few policy issues to fix still --- media-libs/tiff/tiff-3.9.6.recipe | 111 ++++++++++++++++++++++++++--- media-libs/tiff/tiff-4.0.2.recipe | 112 +++++++++++++++++++++++++++--- 2 files changed, 205 insertions(+), 18 deletions(-) diff --git a/media-libs/tiff/tiff-3.9.6.recipe b/media-libs/tiff/tiff-3.9.6.recipe index 1305cc483..695872366 100644 --- a/media-libs/tiff/tiff-3.9.6.recipe +++ b/media-libs/tiff/tiff-3.9.6.recipe @@ -1,24 +1,117 @@ -DESCRIPTION="Tiff library" +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." HOMEPAGE="http://www.libtiff.org" SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.6.tar.gz" CHECKSUM_MD5="6920f3bf628d791d49f268b83612ed23" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +LICENSE="MIT" +COPYRIGHT="1988-1997 Sam Leffler + 1991-1997 Silicon Graphics, Inc." + +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + tiff$secondaryArchSuffix = $portVersion compat >= 3 + lib:libtiff$secondaryArchSuffix = $portVersion compat >= 3 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libGL + lib:libjpeg + lib:libz + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + BUILD() { - cd tiff-3.9.6 + aclocal libtoolize --force --copy --install - aclocal -I m4 + automake --add-missing autoconf autoheader - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd tiff-3.9.6 make install + + prepareInstalledDevelLibs libtiff + + # devel package + packageEntries devel \ + $developDir + + # tools package + if [ -z "$secondaryArchSuffix" ]; then + packageEntries tools \ + $binDir \ + $documentationDir + fi + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi } + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + tiff${secondaryArchSuffix}_devel = $portVersion compat >= 3 + devel:libtiff$secondaryArchSuffix = $portVersion compat >= 3 + " +REQUIRES_devel=" + tiff$secondaryArchSuffix == $portVersion base + " + +# ----- tools package ------------------------------------------------------- + +if [ -z "$secondaryArchSuffix" ]; then + SUMMARY_tools="The TIFF tools" + PROVIDES_tools=" + tiff_tools = $portVersion compat >= 3 + cmd:bmp2tiff = $portVersion compat >= 3 + cmd:fax2ps = $portVersion compat >= 3 + cmd:fax2tiff = $portVersion compat >= 3 + cmd:gif2tiff = $portVersion compat >= 3 + cmd:pal2rgb = $portVersion compat >= 3 + cmd:ppm2tiff = $portVersion compat >= 3 + cmd:ras2tiff = $portVersion compat >= 3 + cmd:raw2tiff = $portVersion compat >= 3 + cmd:rgb2ycbcr = $portVersion compat >= 3 + cmd:thumbnail = $portVersion compat >= 3 + cmd:tiff2bw = $portVersion compat >= 3 + cmd:tiff2pdf = $portVersion compat >= 3 + cmd:tiff2ps = $portVersion compat >= 3 + cmd:tiff2rgba = $portVersion compat >= 3 + cmd:tiffcmp = $portVersion compat >= 3 + cmd:tiffcp = $portVersion compat >= 3 + cmd:tiffcrop = $portVersion compat >= 3 + cmd:tiffdither = $portVersion compat >= 3 + cmd:tiffdump = $portVersion compat >= 3 + cmd:tiffinfo = $portVersion compat >= 3 + cmd:tiffmedian = $portVersion compat >= 3 + cmd:tiffset = $portVersion compat >= 3 + cmd:tiffsplit = $portVersion compat >= 3 + " + REQUIRES_tools=" + haiku >= $haikuVersion + tiff == $portVersion base + " +fi diff --git a/media-libs/tiff/tiff-4.0.2.recipe b/media-libs/tiff/tiff-4.0.2.recipe index c625630a0..8008c97d6 100644 --- a/media-libs/tiff/tiff-4.0.2.recipe +++ b/media-libs/tiff/tiff-4.0.2.recipe @@ -1,24 +1,118 @@ -DESCRIPTION="Tiff library" +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." HOMEPAGE="http://www.libtiff.org" SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.2.tar.gz" CHECKSUM_MD5="04a08fa1e07e696e820a0c3f32465a13" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +LICENSE="MIT" +COPYRIGHT="1988-1997 Sam Leffler + 1991-1997 Silicon Graphics, Inc." + +REVISION="1" +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PROVIDES=" + tiff$secondaryArchSuffix = $portVersion compat >= 4 + lib:libtiff$secondaryArchSuffix = $portVersion compat >= 4 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libGL + lib:libjpeg + lib:libz + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + BUILD() { - cd tiff-4.0.2 + aclocal libtoolize --force --copy --install - aclocal -I m4 + automake --add-missing autoconf autoheader - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + runConfigure ./configure +# --enable-shared + make $jobArgs } INSTALL() { - cd tiff-4.0.2 make install + + prepareInstalledDevelLibs libtiff + + # devel package + packageEntries devel \ + $developDir + + # tools package + if [ -z "$secondaryArchSuffix" ]; then + packageEntries tools \ + $binDir \ + $documentationDir + fi + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + rm -rf $documentationDir + fi } + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + tiff${secondaryArchSuffix}_devel = $portVersion compat >= 4 + devel:libtiff$secondaryArchSuffix = $portVersion compat >= 4 + " +REQUIRES_devel=" + tiff$secondaryArchSuffix == $portVersion base + " + +# ----- tools package ------------------------------------------------------- + +if [ -z "$secondaryArchSuffix" ]; then + SUMMARY_tools="The TIFF tools" + PROVIDES_tools=" + tiff_tools = $portVersion compat >= 4 + cmd:bmp2tiff = $portVersion compat >= 4 + cmd:fax2ps = $portVersion compat >= 4 + cmd:fax2tiff = $portVersion compat >= 4 + cmd:gif2tiff = $portVersion compat >= 4 + cmd:pal2rgb = $portVersion compat >= 4 + cmd:ppm2tiff = $portVersion compat >= 4 + cmd:ras2tiff = $portVersion compat >= 4 + cmd:raw2tiff = $portVersion compat >= 4 + cmd:rgb2ycbcr = $portVersion compat >= 4 + cmd:thumbnail = $portVersion compat >= 4 + cmd:tiff2bw = $portVersion compat >= 4 + cmd:tiff2pdf = $portVersion compat >= 4 + cmd:tiff2ps = $portVersion compat >= 4 + cmd:tiff2rgba = $portVersion compat >= 4 + cmd:tiffcmp = $portVersion compat >= 4 + cmd:tiffcp = $portVersion compat >= 4 + cmd:tiffcrop = $portVersion compat >= 4 + cmd:tiffdither = $portVersion compat >= 4 + cmd:tiffdump = $portVersion compat >= 4 + cmd:tiffinfo = $portVersion compat >= 4 + cmd:tiffmedian = $portVersion compat >= 4 + cmd:tiffset = $portVersion compat >= 4 + cmd:tiffsplit = $portVersion compat >= 4 + " + REQUIRES_tools=" + haiku >= $haikuVersion + tiff == $portVersion base + " +fi From 5f73e41ecf37ef0f178b3ccdcc104eb05cb9ff54 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 8 Oct 2013 22:20:05 +0200 Subject: [PATCH 580/587] Upgrade perl to 5.18.1. * perl-5.18.1 doesn't exhibit cpan-related problems seen with 5.10.1 * adjusted @INC such that perl modules installed to ~/config (or ~/config/non-packaged) are picked up by a perl installed into /system, too * drop public libperl.so and link perl using an rpath instead * no longer link every module built by ExtUtils::MakeMaker against libperl.so, as that isn't required for Haiku at all * adjust ExtUtils::MakeMaker to not use -rpath when linking dynamic perl modules that require other libraries --- dev-lang/perl/patches/perl-5.18.1.patchset | 440 +++++++++++++++++++++ dev-lang/perl/perl-5.18.1.recipe | 142 +++++++ 2 files changed, 582 insertions(+) create mode 100644 dev-lang/perl/patches/perl-5.18.1.patchset create mode 100644 dev-lang/perl/perl-5.18.1.recipe diff --git a/dev-lang/perl/patches/perl-5.18.1.patchset b/dev-lang/perl/patches/perl-5.18.1.patchset new file mode 100644 index 000000000..f398c718b --- /dev/null +++ b/dev-lang/perl/patches/perl-5.18.1.patchset @@ -0,0 +1,440 @@ +From be9f5432f2e203796f88746f7afba0aeffd68e80 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:52:03 +0200 +Subject: Tell perl that BFS has a link count of 1 + + +diff --git a/cpan/File-Temp/lib/File/Temp.pm b/cpan/File-Temp/lib/File/Temp.pm +index ac57c26..759690c 100644 +--- a/cpan/File-Temp/lib/File/Temp.pm ++++ b/cpan/File-Temp/lib/File/Temp.pm +@@ -2051,7 +2051,8 @@ sub unlink0 { + # On NFS the link count may still be 1 but we can't know that + # we are on NFS. Since we can't be sure, we'll defer it + +- return 1 if $fh[3] == 0 || $^O eq 'cygwin'; ++ # On haiku, the link count seems to be always 1 (at least for BFS) ++ return 1 if $fh[3] == 0 || $^O eq 'cygwin' || $^O eq 'haiku'; + } + # fall-through if we can't unlink now + _deferred_unlink($fh, $path, 0); +-- +1.8.3.4 + + +From a9a3d6f11b692bd1ed41d6b4db0eddaed8dd1866 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:52:53 +0200 +Subject: Haiku defines, but does not implement O_EXLOCK + + +diff --git a/cpan/File-Temp/t/lock.t b/cpan/File-Temp/t/lock.t +index ff8c7f9..4364bf6 100644 +--- a/cpan/File-Temp/t/lock.t ++++ b/cpan/File-Temp/t/lock.t +@@ -8,7 +8,8 @@ use Fcntl; + BEGIN { + # see if we have O_EXLOCK + eval { &Fcntl::O_EXLOCK; }; +- if ($@) { ++ if ($@ || $^O eq 'haiku') { ++ # haiku doesn't implement O_EXLOCK yet (but it defines the value) + plan skip_all => 'Do not seem to have O_EXLOCK'; + } else { + plan tests => 4; +-- +1.8.3.4 + + +From f1773730e2f1facb18d6ae04819b19462c4608d6 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:53:40 +0200 +Subject: haiku sets all its specifics via Configure + + +diff --git a/hints/haiku.sh b/hints/haiku.sh +index fa8ebe5..0f09f53 100644 +--- a/hints/haiku.sh ++++ b/hints/haiku.sh +@@ -1,44 +1 @@ +-# Haiku hints file +-# $Id$ +- +-case "$prefix" in +-'') prefix="/boot/common" ;; +-*) ;; # pass the user supplied value through +-esac +- +-libpth='/boot/home/config/lib /boot/common/lib /system/lib' +-usrinc='/boot/develop/headers/posix' +-locinc='/boot/home/config/include /boot/common/include /boot/develop/headers' +- +-libc='/system/lib/libroot.so' +-libs='-lnetwork' +- +-# Use Haiku's malloc() by default. +-case "$usemymalloc" in +-'') usemymalloc='n' ;; +-esac +- +-# Haiku generally supports hard links, but the default file system (BFS) +-# doesn't. So better avoid using hard links. +-d_link='undef' +-dont_use_nlink='define' +- +-# The array syserrlst[] is useless for the most part. +-# Large negative numbers really kind of suck in arrays. +-d_syserrlst='undef' +- +-# Haiku uses gcc. +-cc="gcc" +-ld='gcc' +- +-# The runtime loader library path variable is LIBRARY_PATH. +-case "$ldlibpthname" in +-'') ldlibpthname=LIBRARY_PATH ;; +-esac +- +-# as of alpha 4.1 (at the latest) some symbols are versioned, +-# confusing the nm lookup +-case "$usenm" in +-'') usenm='undef' ;; +-esac +- ++# haiku sets all its specifics via Configure +-- +1.8.3.4 + + +From bb18899b292205e42ed85f89df3ad7daa9e2d47f Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:54:15 +0200 +Subject: Tell perl that Haiku needs haikuish.h installed as well + + +diff --git a/installperl b/installperl +index e64b1c3..8ae20cc 100755 +--- a/installperl ++++ b/installperl +@@ -379,6 +379,11 @@ elsif ($Is_Cygwin) { # On Cygwin symlink it to CORE to make Makefile happy + + # AIX needs perl.exp installed as well. + push(@corefiles,'perl.exp') if $^O eq 'aix'; ++ if ($^O eq 'haiku') { ++ # Haiku needs haikuish.h installed as well. ++ mkpath("$installarchlib/CORE/haiku", $opts{verbose}, 0777); ++ push(@corefiles,'haiku/haikuish.h'); ++ } + } + foreach my $file (@corefiles) { + # HP-UX (at least) needs to maintain execute permissions +-- +1.8.3.4 + + +From 8e32e14b24e65adc0b8add62672314eb64bc2e08 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:55:13 +0200 +Subject: Fix handling of exit codes on Haiku + + +diff --git a/t/run/exit.t b/t/run/exit.t +index 02e57c6..e836410 100644 +--- a/t/run/exit.t ++++ b/t/run/exit.t +@@ -55,18 +55,18 @@ is( ${^CHILD_ERROR_NATIVE}, $native_success, 'Normal exit ${^CHILD_ERROR_NATIVE + if (!$vms_exit_mode) { + my $posix_ok = eval { require POSIX; }; + my $wait_macros_ok = defined &POSIX::WIFEXITED; +- eval { POSIX::WIFEXITED(${^CHILD_ERROR_NATIVE}) }; ++ eval { POSIX::WIFEXITED($?) }; + $wait_macros_ok = 0 if $@; + $exit = run('exit 42'); + is( $exit >> 8, 42, 'Non-zero exit' ); + is( $exit, $?, 'Non-zero exit $?' ); +- isnt( !${^CHILD_ERROR_NATIVE}, 0, 'Non-zero exit ${^CHILD_ERROR_NATIVE}' ); ++ isnt( ${^CHILD_ERROR_NATIVE}, 0, 'Non-zero exit ${^CHILD_ERROR_NATIVE}' ); + SKIP: { + skip("No POSIX", 3) unless $posix_ok; + skip("No POSIX wait macros", 3) unless $wait_macros_ok; +- ok(POSIX::WIFEXITED(${^CHILD_ERROR_NATIVE}), "WIFEXITED"); +- ok(!POSIX::WIFSIGNALED(${^CHILD_ERROR_NATIVE}), "WIFSIGNALED"); +- is(POSIX::WEXITSTATUS(${^CHILD_ERROR_NATIVE}), 42, "WEXITSTATUS"); ++ ok(POSIX::WIFEXITED($?), "WIFEXITED"); ++ ok(!POSIX::WIFSIGNALED($?), "WIFSIGNALED"); ++ is(POSIX::WEXITSTATUS($?), 42, "WEXITSTATUS"); + } + + SKIP: { +@@ -85,9 +85,9 @@ if (!$vms_exit_mode) { + SKIP: { + skip("No POSIX", 3) unless $posix_ok; + skip("No POSIX wait macros", 3) unless $wait_macros_ok; +- ok(!POSIX::WIFEXITED(${^CHILD_ERROR_NATIVE}), "WIFEXITED"); +- ok(POSIX::WIFSIGNALED(${^CHILD_ERROR_NATIVE}), "WIFSIGNALED"); +- is(POSIX::WTERMSIG(${^CHILD_ERROR_NATIVE}), 15, "WTERMSIG"); ++ ok(!POSIX::WIFEXITED($?), "WIFEXITED"); ++ ok(POSIX::WIFSIGNALED($?), "WIFSIGNALED"); ++ is(POSIX::WTERMSIG($?), 15, "WTERMSIG"); + } + } + +-- +1.8.3.4 + + +From 34f6f83c4c67ae7c189838b302381269d3e35417 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 15:00:44 +0200 +Subject: Fix include path of errno.h + + +diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL +index b707911..7999ae4 100644 +--- a/ext/Errno/Errno_pm.PL ++++ b/ext/Errno/Errno_pm.PL +@@ -143,7 +143,7 @@ sub get_files { + $file{$linux_errno_h} = 1; + } elsif ($^O eq 'haiku') { + # hidden in a special place +- $file{'/boot/develop/headers/posix/errno.h'} = 1; ++ $file{'/boot/system/develop/headers/posix/errno.h'} = 1; + + } elsif ($^O eq 'vos') { + # avoid problem where cpp returns non-POSIX pathnames +-- +1.8.3.4 + + +From 07b425953d11e647417216986124c7730b78fdf8 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sat, 28 Sep 2013 13:46:42 +0200 +Subject: Adjust ExtUtils::MakeMaker for PM-Haiku. + +* MakeMaker-projects trying to install into 'site-perl' while specifying + PREFIX would end up using a wrong 'site-perl' prefix. +* Split MM_Haiku.pm off MM_BeOS.pm, implementing Haiku-specific overrides + for MakeMaker. + +diff --git a/cpan/ExtUtils-MakeMaker/MANIFEST b/cpan/ExtUtils-MakeMaker/MANIFEST +index 72feb7d..8eb81f3 100644 +--- a/cpan/ExtUtils-MakeMaker/MANIFEST ++++ b/cpan/ExtUtils-MakeMaker/MANIFEST +@@ -48,6 +48,7 @@ lib/ExtUtils/MM_BeOS.pm + lib/ExtUtils/MM_Cygwin.pm + lib/ExtUtils/MM_Darwin.pm + lib/ExtUtils/MM_DOS.pm ++lib/ExtUtils/MM_Haiku.pm + lib/ExtUtils/MM_MacOS.pm + lib/ExtUtils/MM_NW5.pm + lib/ExtUtils/MM_OS2.pm +diff --git a/cpan/ExtUtils-MakeMaker/NOTES b/cpan/ExtUtils-MakeMaker/NOTES +index cb29aec..bfa628c 100644 +--- a/cpan/ExtUtils-MakeMaker/NOTES ++++ b/cpan/ExtUtils-MakeMaker/NOTES +@@ -80,9 +80,9 @@ The MM_* hierarchy + + MM_Win95 MM_NW5 + \ / +-MM_BeOS MM_Cygwin MM_OS2 MM_VMS MM_Win32 MM_DOS MM_UWIN +- \ | | | / / / +- ------------------------------------------------ ++MM_BeOS MM_Cygwin MM_OS2 MM_VMS MM_Win32 MM_DOS MM_UWIN MM_Haiku ++ \ | | | / / / / ++ -------------------------------------------------------- + | | + MM_Unix | + | | +diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm +index 26ed594..dfeea45 100644 +--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm +@@ -59,7 +59,8 @@ if( $^O eq 'MSWin32' ) { + $Is{UWIN} = $^O =~ /^uwin(-nt)?$/; + $Is{Cygwin} = $^O eq 'cygwin'; + $Is{NW5} = $Config{osname} eq 'NetWare'; # intentional +-$Is{BeOS} = ($^O =~ /beos/i or $^O eq 'haiku'); ++$Is{BeOS} = $^O =~ /beos/i; ++$Is{Haiku} = $^O eq 'haiku'; + $Is{DOS} = $^O eq 'dos'; + if( $Is{NW5} ) { + $^O = 'NetWare'; +diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +new file mode 100644 +index 0000000..81e5f99 +--- /dev/null ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +@@ -0,0 +1,70 @@ ++package ExtUtils::MM_Haiku; ++ ++use strict; ++ ++=head1 NAME ++ ++ExtUtils::MM_Haiku - methods to override UN*X behaviour in ExtUtils::MakeMaker ++ ++=head1 SYNOPSIS ++ ++ use ExtUtils::MM_Haiku; # Done internally by ExtUtils::MakeMaker if needed ++ ++=head1 DESCRIPTION ++ ++See ExtUtils::MM_Unix for a documentation of the methods provided ++there. This package overrides the implementation of these methods, not ++the semantics. ++ ++=over 4 ++ ++=cut ++ ++use ExtUtils::MakeMaker::Config; ++use File::Spec; ++require ExtUtils::MM_Any; ++require ExtUtils::MM_Unix; ++ ++our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); ++our $VERSION = '6.66'; ++ ++ ++=item os_flavor ++ ++Haiku is Haiku. ++ ++=cut ++ ++sub os_flavor { ++ return('Haiku'); ++} ++ ++=head3 init_INSTALL_from_PREFIX ++ ++ $mm->init_INSTALL_from_PREFIX; ++ ++=cut ++ ++sub init_INSTALL_from_PREFIX { ++ my $self = shift; ++ ++ # If a prefix has been given from outside, the default implementation ++ # will set PERLPREFIX, SITEPREFIX and VENDORPREFIX to identical values, ++ # but due to the way how Haiku's package management works, PERLPREFIX ++ # and VENDORPREFIX are not writable at all (as they're being populated ++ # from installed packages via package-fs). SITEPREFIX, however needs to ++ # be set to a path which can be written to (since site packages are ++ # expected to be installed "manually") - so we make sure it points ++ # to a 'non-packaged'-folder: ++ my $prefixGiven = $self->{PREFIX}; ++ $self->SUPER::init_INSTALL_from_PREFIX(); ++ if ($prefixGiven) { ++ $self->{SITEPREFIX} = '$(PREFIX)/non-packaged'; ++ } ++} ++ ++=back ++ ++1; ++__END__ ++ +-- +1.8.3.4 + + +From bc56c719ac4967a336e7a6d5b5f9024cea43666e Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Tue, 8 Oct 2013 22:16:37 +0200 +Subject: Avoid using -rpath for dynamic modules. + + +diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +index 81e5f99..25ace13 100644 +--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +@@ -65,6 +65,33 @@ sub init_INSTALL_from_PREFIX { + + =back + ++=head3 init_others ++ ++ $MM->init_others(); ++ ++Initializes the macro definitions having to do with compiling and ++linking used by tools_other() and places them in the $MM object. ++ ++If there is no description, its the same as the parameter to ++WriteMakefile() documented in ExtUtils::MakeMaker. ++ ++=cut ++ ++sub init_others { ++ my $self = shift; ++ ++ $self->SUPER::init_others(); ++ ++ # Don't use run-time paths for libraries required by dynamic ++ # modules on Haiku, as that wouldn't work should a library be moved ++ # (for instance because the package has been activated somewhere else). ++ $self->{LD_RUN_PATH} = ""; ++ ++ return; ++} ++ ++=back ++ + 1; + __END__ + +-- +1.8.3.4 + + +From 2055f36154580d1c613b3897251540bcde40333d Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Tue, 8 Oct 2013 22:17:26 +0200 +Subject: Add script sitecustomize.pl for setting up @INC as we need it. + + +diff --git a/sitecustomize.pl b/sitecustomize.pl +new file mode 100644 +index 0000000..a321e51 +--- /dev/null ++++ b/sitecustomize.pl +@@ -0,0 +1,36 @@ ++#! perl ++ ++use Config; ++ ++# Remove all compiled-in paths referring to Perl's installation dir ++# and replace them with a static set of paths that implement the intended ++# searching order: ++my @ourINC = ( ++ "/boot/home/config/lib/perl5/$Config{version}/$Config{archname}", ++ "/boot/home/config/lib/perl5/$Config{version}", ++ "/boot/home/config/non-packaged/lib/perl5/site_perl/$Config{version}/$Config{archname}", ++ "/boot/home/config/non-packaged/lib/perl5/site_perl/$Config{version}", ++ "/boot/home/config/lib/perl5/vendor_perl/$Config{version}/$Config{archname}", ++ "/boot/home/config/lib/perl5/vendor_perl/$Config{version}", ++ "/boot/home/config/lib/perl5/vendor_perl", ++ "/boot/system/lib/perl5/$Config{version}/$Config{archname}", ++ "/boot/system/lib/perl5/$Config{version}", ++ "/boot/system/non-packaged/lib/perl5/site_perl/$Config{version}/$Config{archname}", ++ "/boot/system/non-packaged/lib/perl5/site_perl/$Config{version}", ++ "/boot/system/lib/perl5/vendor_perl/$Config{version}/$Config{archname}", ++ "/boot/system/lib/perl5/vendor_perl/$Config{version}", ++ "/boot/system/lib/perl5/vendor_perl", ++); ++my @newINC; ++my $removedPerlPaths; ++foreach my $inc (@INC) { ++ if ($inc =~ m[^/packages/perl-$Config{version}-\d+/.self/]o) { ++ if (! $removedPerlPaths) { ++ push @newINC, @ourINC; ++ $removedPerlPaths = 1; ++ } ++ next; ++ } ++ push @newINC, $inc; ++} ++@INC = @newINC; +-- +1.8.3.4 + diff --git a/dev-lang/perl/perl-5.18.1.recipe b/dev-lang/perl/perl-5.18.1.recipe new file mode 100644 index 000000000..a005b7b66 --- /dev/null +++ b/dev-lang/perl/perl-5.18.1.recipe @@ -0,0 +1,142 @@ +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 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'. + " +HOMEPAGE="http://www.perl.org/" +COPYRIGHT="1993-2009 Larry Wall and others" +LICENSE="GNU GPL v1 + Artistic (Perl)" +SRC_URI="http://www.cpan.org/src/perl-5.18.1.tar.gz" +CHECKSUM_MD5="304cb5bd18e48c44edd6053337d3386d" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="perl-5.18.1.patchset" + +PROVIDES=" + # assume that any perl commands are backwards compatible to version 5. + perl = $portVersion compat >= 5 + cmd:a2p = $portVersion compat >= 5 + cmd:c2ph = $portVersion compat >= 5 + cmd:config_data = $portVersion compat >= 5 + cmd:corelist = $portVersion compat >= 5 + cmd:cpan = $portVersion compat >= 5 + cmd:cpan2dist = $portVersion compat >= 5 + cmd:cpanp = $portVersion compat >= 5 + cmd:cpanp_run_perl = $portVersion compat >= 5 + cmd:dprofpp = $portVersion compat >= 5 + cmd:enc2xs = $portVersion compat >= 5 + cmd:find2perl = $portVersion compat >= 5 + cmd:h2ph = $portVersion compat >= 5 + cmd:h2xs = $portVersion compat >= 5 + cmd:instmodsh = $portVersion compat >= 5 + cmd:json_pp = $portVersion compat >= 5 + cmd:libnetcfg = $portVersion compat >= 5 + cmd:perl = $portVersion compat >= 5 + cmd:perl$portVersion = $portVersion compat >= 5 + cmd:perlbug = $portVersion compat >= 5 + cmd:perldoc = $portVersion compat >= 5 + cmd:perlivp = $portVersion compat >= 5 + cmd:perlthanks = $portVersion compat >= 5 + cmd:piconv = $portVersion compat >= 5 + cmd:pl2pm = $portVersion compat >= 5 + cmd:pod2html = $portVersion compat >= 5 + cmd:pod2latex = $portVersion compat >= 5 + cmd:pod2man = $portVersion compat >= 5 + cmd:pod2text = $portVersion compat >= 5 + cmd:pod2usage = $portVersion compat >= 5 + cmd:podchecker = $portVersion compat >= 5 + cmd:podselect = $portVersion compat >= 5 + cmd:prove = $portVersion compat >= 5 + cmd:psed = $portVersion compat >= 5 + cmd:pstruct = $portVersion compat >= 5 + cmd:ptar = $portVersion compat >= 5 + cmd:ptardiff = $portVersion compat >= 5 + cmd:ptargrep = $portVersion compat >= 5 + cmd:s2p = $portVersion compat >= 5 + cmd:shasum = $portVersion compat >= 5 + cmd:splain = $portVersion compat >= 5 + cmd:xsubpp = $portVersion compat >= 5 + cmd:zipdetails = $portVersion compat >= 5 + # vendor_perl refers to the path to packaged perl modules, which includes + # the full perl version, so it isn't backwards compatible to anything else. + vendor_perl = $portVersion + # It is unclear which kind of backwards compatibility libperl.so + # implements, so we assume none. + lib:libperl = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:ld + cmd:make + cmd:sed + " + +perlArchName="$(uname -m)-haiku" + +GLOBAL_WRITABLE_FILES=" + non-packaged/lib/perl5/site_perl/$portVersion/sitecustomize.pl auto-merge + " + +SOURCE_DIR="$portVersionedName" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +BUILD() +{ + ./Configure \ + -Dprefix=$prefix \ + -Dprivlib=$prefix/lib/perl5/$portVersion \ + -Dsiteprefix=$prefix/non-packaged \ + -Dsitelib=$prefix/non-packaged/lib/perl5/site_perl/$portVersion \ + -Dvendorprefix=$prefix \ + -Dvendorlib=$prefix/lib/perl5/vendor_perl/$portVersion \ + -Dcf_email=zooey@hirschkaefer.de \ + -Uusenm -Duseshrplib -Uusemymalloc \ + -Dlibpth="$(finddir B_USER_DEVELOP_DIRECTORY)/lib $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib" \ + -Dusrinc="$(finddir B_SYSTEM_DEVELOP_DIRECTORY)/headers/posix" \ + -Dlocinc="$(finddir B_USER_CONFIG_DIRECTORY)/develop/headers $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/headers" \ + -Dlibc="'$(finddir B_SYSTEM_LIB_DIRECTORY)/libroot.so'" \ + -Dlibs=-lnetwork -Dcc=gcc -Dld=gcc \ + -Ud_link -Ddont_use_nlink -Ud_syserrlst \ + -Dldlibpthname=LIBRARY_PATH -Dstartperl="#! perl" \ + -Dccdlflags="-Wl,-rpath=$libDir/perl5/$portVersion/$perlArchName/CORE" \ + -Dusesitecustomize \ + -de + + # force-remove path from sed + sed -i -e 's/LOC_SED\s*"\/bin\/sed/LOC_SED "sed/' config.h + + make $jobArgs +} + +INSTALL() +{ + make install + chmod a+x $binDir/{perl,psed,pstruct,perlthanks} + + # copy script into site_perl that takes care of massaging @INC into what we need. + cp sitecustomize.pl $prefix/non-packaged/lib/perl5/site_perl/$portVersion/ +} + +TEST() +{ + make test +} From 120bdddb06573c4af2929bf82f9804ee4256162c Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 12 Oct 2013 13:05:28 +0200 Subject: [PATCH 581/587] Add patch to perl that adjusts CPAN's can_write_to_libdirs(). --- dev-lang/perl/patches/perl-5.18.1.patchset | 48 ++++++++++++++++++---- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/dev-lang/perl/patches/perl-5.18.1.patchset b/dev-lang/perl/patches/perl-5.18.1.patchset index f398c718b..4a3fac242 100644 --- a/dev-lang/perl/patches/perl-5.18.1.patchset +++ b/dev-lang/perl/patches/perl-5.18.1.patchset @@ -1,4 +1,4 @@ -From be9f5432f2e203796f88746f7afba0aeffd68e80 Mon Sep 17 00:00:00 2001 +From f0e56e8de699304c16cf84ddad23e70a8d4f1113 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:52:03 +0200 Subject: Tell perl that BFS has a link count of 1 @@ -22,7 +22,7 @@ index ac57c26..759690c 100644 1.8.3.4 -From a9a3d6f11b692bd1ed41d6b4db0eddaed8dd1866 Mon Sep 17 00:00:00 2001 +From eeb73e685719100cbaf14aa80936acf629b09358 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:52:53 +0200 Subject: Haiku defines, but does not implement O_EXLOCK @@ -46,7 +46,7 @@ index ff8c7f9..4364bf6 100644 1.8.3.4 -From f1773730e2f1facb18d6ae04819b19462c4608d6 Mon Sep 17 00:00:00 2001 +From ab08a333ba288c781badc4ad0918f478eccb623c Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:53:40 +0200 Subject: haiku sets all its specifics via Configure @@ -106,7 +106,7 @@ index fa8ebe5..0f09f53 100644 1.8.3.4 -From bb18899b292205e42ed85f89df3ad7daa9e2d47f Mon Sep 17 00:00:00 2001 +From 1e0db8890d721318e8f6ed2b7af01f7a2b1530f4 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:54:15 +0200 Subject: Tell perl that Haiku needs haikuish.h installed as well @@ -132,7 +132,7 @@ index e64b1c3..8ae20cc 100755 1.8.3.4 -From 8e32e14b24e65adc0b8add62672314eb64bc2e08 Mon Sep 17 00:00:00 2001 +From 13c237d527f3fab4420db9098e9da75c7e2d9a03 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:55:13 +0200 Subject: Fix handling of exit codes on Haiku @@ -183,7 +183,7 @@ index 02e57c6..e836410 100644 1.8.3.4 -From 34f6f83c4c67ae7c189838b302381269d3e35417 Mon Sep 17 00:00:00 2001 +From dc2c883ce7880715e3528ffb8fe3468816b4ccdf Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 15:00:44 +0200 Subject: Fix include path of errno.h @@ -206,7 +206,7 @@ index b707911..7999ae4 100644 1.8.3.4 -From 07b425953d11e647417216986124c7730b78fdf8 Mon Sep 17 00:00:00 2001 +From 53e43eb85a7666f85e081bee43be542ce733d95d Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 28 Sep 2013 13:46:42 +0200 Subject: Adjust ExtUtils::MakeMaker for PM-Haiku. @@ -339,7 +339,7 @@ index 0000000..81e5f99 1.8.3.4 -From bc56c719ac4967a336e7a6d5b5f9024cea43666e Mon Sep 17 00:00:00 2001 +From bd31bc50a49c6b4585666656b73b9dc2d9928c61 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 8 Oct 2013 22:16:37 +0200 Subject: Avoid using -rpath for dynamic modules. @@ -387,7 +387,7 @@ index 81e5f99..25ace13 100644 1.8.3.4 -From 2055f36154580d1c613b3897251540bcde40333d Mon Sep 17 00:00:00 2001 +From da2d4b88e05f8291e5f190824537c72cb24a43e8 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 8 Oct 2013 22:17:26 +0200 Subject: Add script sitecustomize.pl for setting up @INC as we need it. @@ -438,3 +438,33 @@ index 0000000..a321e51 -- 1.8.3.4 + +From 14526efbb024588a8e83a5010ff963ab67fc8c01 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Wed, 9 Oct 2013 20:29:38 +0200 +Subject: Fix initialization check for CPAN. + +* On Haiku, only the site-lib directories will ever be writable, + as the others read-only. This avoids CPAN asking for a way to + circumvent unwritable lib dirs. + +diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm +index b099b04..55bf194 100644 +--- a/cpan/CPAN/lib/CPAN/FirstTime.pm ++++ b/cpan/CPAN/lib/CPAN/FirstTime.pm +@@ -2010,6 +2010,12 @@ sub _print_urllist { + } + + sub _can_write_to_libdirs { ++ if ($^O eq 'haiku') { ++ # on Haiku, the other dirs are never writable, as they are ++ # being populated by packagefs ++ return -w $Config{installsitelib} ++ && -w $Config{installsitearch} ++ } + return -w $Config{installprivlib} + && -w $Config{installarchlib} + && -w $Config{installsitelib} +-- +1.8.3.4 + From dbe19c31bad95994a402260fbfa8234918a202b9 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 12 Oct 2013 13:06:44 +0200 Subject: [PATCH 582/587] Add arch-specific directory to GLOBAL_WRITABLE_FILES. * We need to make sure the arch-specific site directory exists, as otherwise CPAN's initialization code will believe that it can't write to library directories and ask the user to pick a method of circumventing this. --- dev-lang/perl/perl-5.18.1.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-lang/perl/perl-5.18.1.recipe b/dev-lang/perl/perl-5.18.1.recipe index a005b7b66..fbdf7710c 100644 --- a/dev-lang/perl/perl-5.18.1.recipe +++ b/dev-lang/perl/perl-5.18.1.recipe @@ -93,7 +93,8 @@ BUILD_PREREQUIRES=" perlArchName="$(uname -m)-haiku" GLOBAL_WRITABLE_FILES=" - non-packaged/lib/perl5/site_perl/$portVersion/sitecustomize.pl auto-merge + non-packaged/lib/perl5/site_perl/$portVersion/sitecustomize.pl keep-old + non-packaged/lib/perl5/site_perl/$portVersion/$perlArchName directory keep-old " SOURCE_DIR="$portVersionedName" From ce92af62578bde1877a192d1fb4aec71bc3ebf3b Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 15 Oct 2013 11:44:01 +0200 Subject: [PATCH 583/587] Apply several fixes to python. * Adjust site-packages to be writable (by moving it into non-packaged hierarch). * Add vendor-packages directory, where packaged python modules shall be installed. * Add support for automatically installing modules into vendor directory when HAIKU_USE_VENDOR_DIRECTORIES is set. * Drop references to 'common'-hierarchy. --- ...thon-2.6.8.patch => python-2.6.8.patchset} | 502 ++++++++++++------ dev-lang/python/python-2.6.8.recipe | 15 +- 2 files changed, 366 insertions(+), 151 deletions(-) rename dev-lang/python/patches/{python-2.6.8.patch => python-2.6.8.patchset} (63%) diff --git a/dev-lang/python/patches/python-2.6.8.patch b/dev-lang/python/patches/python-2.6.8.patchset similarity index 63% rename from dev-lang/python/patches/python-2.6.8.patch rename to dev-lang/python/patches/python-2.6.8.patchset index 7e0bb5548..3485525c2 100644 --- a/dev-lang/python/patches/python-2.6.8.patch +++ b/dev-lang/python/patches/python-2.6.8.patchset @@ -1,84 +1,14 @@ -diff -urN orig/Python-2.6.8/configure.in Python-2.6.8/configure.in ---- orig/Python-2.6.8/configure.in 2012-04-10 17:32:11.008650752 +0200 -+++ Python-2.6.8/configure.in 2013-05-04 00:18:11.912523264 +0200 -@@ -745,7 +745,7 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; -- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) -+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -@@ -753,6 +753,9 @@ - FreeBSD*) - SOVERSION=`echo $SOVERSION|cut -d "." -f 1` - ;; -+ Haiku*) -+ RUNSHARED=LIBRARY_PATH=`pwd`:${LIBRARY_PATH} -+ ;; - esac - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; -@@ -823,7 +826,7 @@ - AC_SUBST(LN) - if test -z "$LN" ; then - case $ac_sys_system in -- BeOS*) LN="ln -s";; -+ BeOS*|Haiku*) LN="ln -s";; - CYGWIN*) LN="ln -s";; - atheos*) LN="ln -s";; - *) LN=ln;; -@@ -1829,7 +1832,7 @@ - fi - fi - ;; -- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; -+ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; - BSD/OS*/4*) LDSHARED="gcc -shared";; - FreeBSD*) - if [[ "`$CC -dM -E - +Date: Sat, 12 Oct 2013 17:37:25 +0200 +Subject: applying patch python-2.6.8.patch + + +diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py +index aeb6b74..2edcc48 100644 +--- a/Lib/distutils/command/build_ext.py ++++ b/Lib/distutils/command/build_ext.py +@@ -234,9 +234,13 @@ class build_ext (Command): # for extensions under Linux or Solaris with a shared Python library, # Python's library directory must be appended to library_dirs @@ -93,10 +23,11 @@ diff -urN orig/Python-2.6.8/Lib/distutils/command/build_ext.py Python-2.6.8/Lib/ and sysconfig.get_config_var('Py_ENABLE_SHARED')): if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): # building third party extensions -diff -urN orig/Python-2.6.8/Lib/distutils/sysconfig.py Python-2.6.8/Lib/distutils/sysconfig.py ---- orig/Python-2.6.8/Lib/distutils/sysconfig.py 2012-04-10 17:32:04.014942208 +0200 -+++ Python-2.6.8/Lib/distutils/sysconfig.py 2013-05-04 00:31:41.977534976 +0200 -@@ -85,7 +85,8 @@ +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 46d23ec..5354cf1 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -85,7 +85,8 @@ def get_python_inc(plat_specific=0, prefix=None): # Include is located in the srcdir inc_dir = os.path.join(srcdir, "Include") return inc_dir @@ -106,9 +37,11 @@ diff -urN orig/Python-2.6.8/Lib/distutils/sysconfig.py Python-2.6.8/Lib/distutil elif os.name == "nt": return os.path.join(prefix, "include") elif os.name == "mac": -diff -urN orig/Python-2.6.8/Lib/plat-haiku1/IN.py Python-2.6.8/Lib/plat-haiku1/IN.py ---- orig/Python-2.6.8/Lib/plat-haiku1/IN.py 1970-01-01 01:00:00.000000000 +0100 -+++ Python-2.6.8/Lib/plat-haiku1/IN.py 2013-05-04 00:18:11.917766144 +0200 +diff --git a/Lib/plat-haiku1/IN.py b/Lib/plat-haiku1/IN.py +new file mode 100644 +index 0000000..362cb41 +--- /dev/null ++++ b/Lib/plat-haiku1/IN.py @@ -0,0 +1,327 @@ +# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h + @@ -437,9 +370,11 @@ diff -urN orig/Python-2.6.8/Lib/plat-haiku1/IN.py Python-2.6.8/Lib/plat-haiku1/I +def _FDMSKNO(fd): return ((fd) / NFDBITS) + +def _FDBITNO(fd): return ((fd) % NFDBITS) -diff -urN orig/Python-2.6.8/Lib/plat-haiku1/regen Python-2.6.8/Lib/plat-haiku1/regen ---- orig/Python-2.6.8/Lib/plat-haiku1/regen 1970-01-01 01:00:00.000000000 +0100 -+++ Python-2.6.8/Lib/plat-haiku1/regen 2013-05-04 00:18:11.918552576 +0200 +diff --git a/Lib/plat-haiku1/regen b/Lib/plat-haiku1/regen +new file mode 100644 +index 0000000..d9da80c +--- /dev/null ++++ b/Lib/plat-haiku1/regen @@ -0,0 +1,7 @@ +#! /bin/sh + @@ -448,10 +383,11 @@ diff -urN orig/Python-2.6.8/Lib/plat-haiku1/regen Python-2.6.8/Lib/plat-haiku1/r + +set -v +python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h -diff -urN orig/Python-2.6.8/Lib/test/test_fileio.py Python-2.6.8/Lib/test/test_fileio.py ---- orig/Python-2.6.8/Lib/test/test_fileio.py 2012-04-10 17:32:07.061865984 +0200 -+++ Python-2.6.8/Lib/test/test_fileio.py 2013-05-04 00:18:11.920911872 +0200 -@@ -152,6 +152,7 @@ +diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py +index 7eeef7b..b1938fd 100644 +--- a/Lib/test/test_fileio.py ++++ b/Lib/test/test_fileio.py +@@ -152,6 +152,7 @@ class OtherFileTests(unittest.TestCase): self.assertEquals(f.writable(), True) if sys.platform != "darwin" and \ 'bsd' not in sys.platform and \ @@ -459,10 +395,11 @@ diff -urN orig/Python-2.6.8/Lib/test/test_fileio.py Python-2.6.8/Lib/test/test_f not sys.platform.startswith('sunos'): # Somehow /dev/tty appears seekable on some BSDs self.assertEquals(f.seekable(), False) -diff -urN orig/Python-2.6.8/Makefile.pre.in Python-2.6.8/Makefile.pre.in ---- orig/Python-2.6.8/Makefile.pre.in 2012-04-10 17:32:08.065798144 +0200 -+++ Python-2.6.8/Makefile.pre.in 2013-05-04 00:18:11.922222592 +0200 -@@ -90,7 +90,7 @@ +diff --git a/Makefile.pre.in b/Makefile.pre.in +index ce4fbdc..aba9464 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -90,7 +90,7 @@ BINDIR= @bindir@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ @@ -471,10 +408,11 @@ diff -urN orig/Python-2.6.8/Makefile.pre.in Python-2.6.8/Makefile.pre.in SCRIPTDIR= $(prefix)/lib # Detailed destination directories -diff -urN orig/Python-2.6.8/Modules/bz2module.c Python-2.6.8/Modules/bz2module.c ---- orig/Python-2.6.8/Modules/bz2module.c 2012-04-10 17:32:09.049545216 +0200 -+++ Python-2.6.8/Modules/bz2module.c 2013-05-04 00:18:11.923533312 +0200 -@@ -9,7 +9,7 @@ +diff --git a/Modules/bz2module.c b/Modules/bz2module.c +index cfd8d71..89d9002 100644 +--- a/Modules/bz2module.c ++++ b/Modules/bz2module.c +@@ -9,7 +9,7 @@ Copyright (c) 2002 Python Software Foundation; All Rights Reserved #include "Python.h" #include @@ -483,10 +421,11 @@ diff -urN orig/Python-2.6.8/Modules/bz2module.c Python-2.6.8/Modules/bz2module.c #include "structmember.h" #ifdef WITH_THREAD -diff -urN orig/Python-2.6.8/Modules/resource.c Python-2.6.8/Modules/resource.c ---- orig/Python-2.6.8/Modules/resource.c 2012-04-10 17:32:10.008388608 +0200 -+++ Python-2.6.8/Modules/resource.c 2013-05-04 00:18:11.926679040 +0200 -@@ -86,6 +86,7 @@ +diff --git a/Modules/resource.c b/Modules/resource.c +index 9993b93..f8befde 100644 +--- a/Modules/resource.c ++++ b/Modules/resource.c +@@ -86,6 +86,7 @@ resource_getrusage(PyObject *self, PyObject *args) PyFloat_FromDouble(doubletime(ru.ru_utime))); PyStructSequence_SET_ITEM(result, 1, PyFloat_FromDouble(doubletime(ru.ru_stime))); @@ -494,7 +433,7 @@ diff -urN orig/Python-2.6.8/Modules/resource.c Python-2.6.8/Modules/resource.c PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss)); PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss)); PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss)); -@@ -100,7 +101,7 @@ +@@ -100,7 +101,7 @@ resource_getrusage(PyObject *self, PyObject *args) PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); @@ -503,10 +442,11 @@ diff -urN orig/Python-2.6.8/Modules/resource.c Python-2.6.8/Modules/resource.c if (PyErr_Occurred()) { Py_DECREF(result); return NULL; -diff -urN orig/Python-2.6.8/Modules/socketmodule.c Python-2.6.8/Modules/socketmodule.c ---- orig/Python-2.6.8/Modules/socketmodule.c 2012-04-10 17:32:10.017825792 +0200 -+++ Python-2.6.8/Modules/socketmodule.c 2013-05-04 00:18:11.929824768 +0200 -@@ -4661,7 +4661,9 @@ +diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c +index a28116c..62c5813 100644 +--- a/Modules/socketmodule.c ++++ b/Modules/socketmodule.c +@@ -4661,7 +4661,9 @@ init_socket(void) #ifndef __BEOS__ /* We have incomplete socket support. */ PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW); @@ -517,10 +457,11 @@ diff -urN orig/Python-2.6.8/Modules/socketmodule.c Python-2.6.8/Modules/socketmo #if defined(SOCK_RDM) PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); #endif -diff -urN orig/Python-2.6.8/Modules/socketmodule.h Python-2.6.8/Modules/socketmodule.h ---- orig/Python-2.6.8/Modules/socketmodule.h 2012-04-10 17:32:10.024379392 +0200 -+++ Python-2.6.8/Modules/socketmodule.h 2013-05-04 00:18:11.930349056 +0200 -@@ -47,6 +47,10 @@ +diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h +index 9b85773..8e35a64 100644 +--- a/Modules/socketmodule.h ++++ b/Modules/socketmodule.h +@@ -47,6 +47,10 @@ typedef int socklen_t; # undef AF_NETLINK #endif @@ -531,10 +472,11 @@ diff -urN orig/Python-2.6.8/Modules/socketmodule.h Python-2.6.8/Modules/socketmo #ifdef HAVE_BLUETOOTH_BLUETOOTH_H #include #include -diff -urN orig/Python-2.6.8/Modules/spwdmodule.c Python-2.6.8/Modules/spwdmodule.c ---- orig/Python-2.6.8/Modules/spwdmodule.c 2012-04-10 17:32:10.051904512 +0200 -+++ Python-2.6.8/Modules/spwdmodule.c 2013-05-04 00:18:11.932446208 +0200 -@@ -79,7 +79,9 @@ +diff --git a/Modules/spwdmodule.c b/Modules/spwdmodule.c +index 957de58..69be5bb 100644 +--- a/Modules/spwdmodule.c ++++ b/Modules/spwdmodule.c +@@ -79,7 +79,9 @@ static PyObject *mkspent(struct spwd *p) SETS(setIndex++, p->sp_namp); SETS(setIndex++, p->sp_pwdp); @@ -544,9 +486,10 @@ diff -urN orig/Python-2.6.8/Modules/spwdmodule.c Python-2.6.8/Modules/spwdmodule SETI(setIndex++, p->sp_min); SETI(setIndex++, p->sp_max); SETI(setIndex++, p->sp_warn); -diff -urN orig/Python-2.6.8/Python/bltinmodule.c Python-2.6.8/Python/bltinmodule.c ---- orig/Python-2.6.8/Python/bltinmodule.c 2012-04-10 17:32:11.066060288 +0200 -+++ Python-2.6.8/Python/bltinmodule.c 2013-05-04 00:18:11.936378368 +0200 +diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c +index 57d9df8..83c9a2e 100644 +--- a/Python/bltinmodule.c ++++ b/Python/bltinmodule.c @@ -18,7 +18,7 @@ */ #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) @@ -556,10 +499,108 @@ diff -urN orig/Python-2.6.8/Python/bltinmodule.c Python-2.6.8/Python/bltinmodule const char *Py_FileSystemDefaultEncoding = "utf-8"; #else const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ -diff -urN orig/Python-2.6.8/setup.py Python-2.6.8/setup.py ---- orig/Python-2.6.8/setup.py 2012-04-10 17:32:11.008388608 +0200 -+++ Python-2.6.8/setup.py 2013-05-04 00:18:11.938737664 +0200 -@@ -428,6 +428,15 @@ +diff --git a/Tools/scripts/h2py.py b/Tools/scripts/h2py.py +index 63e7336..65cd21f 100755 +--- a/Tools/scripts/h2py.py ++++ b/Tools/scripts/h2py.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /bin/env python + + # Read #define's and translate to Python code. + # Handle #include statements. +@@ -50,7 +50,7 @@ except KeyError: + searchdirs=os.environ['INCLUDE'].split(';') + except KeyError: + try: +- if sys.platform.find("beos") == 0: ++ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: + searchdirs=os.environ['BEINCLUDES'].split(';') + elif sys.platform.startswith("atheos"): + searchdirs=os.environ['C_INCLUDE_PATH'].split(':') +diff --git a/configure.in b/configure.in +index f3d34f2..aedd433 100644 +--- a/configure.in ++++ b/configure.in +@@ -745,7 +745,7 @@ if test $enable_shared = "yes"; then + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) ++ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} +@@ -753,6 +753,9 @@ if test $enable_shared = "yes"; then + FreeBSD*) + SOVERSION=`echo $SOVERSION|cut -d "." -f 1` + ;; ++ Haiku*) ++ RUNSHARED=LIBRARY_PATH=`pwd`:${LIBRARY_PATH} ++ ;; + esac + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +@@ -823,7 +826,7 @@ AC_PROG_INSTALL + AC_SUBST(LN) + if test -z "$LN" ; then + case $ac_sys_system in +- BeOS*) LN="ln -s";; ++ BeOS*|Haiku*) LN="ln -s";; + CYGWIN*) LN="ln -s";; + atheos*) LN="ln -s";; + *) LN=ln;; +@@ -1829,7 +1832,7 @@ then + fi + fi + ;; +- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; ++ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; + BSD/OS*/4*) LDSHARED="gcc -shared";; + FreeBSD*) + if [[ "`$CC -dM -E - +Date: Sun, 13 Oct 2013 17:01:30 +0200 +Subject: Adjust package folders for Python modules. + +* move standard site-packaged into non-packaged hierarchy, as it has to + be writable +* rename directory for packaged python modules to 'vendor-packages' +* add support for automatically switching to 'vendor-packages' directory + when environment variable 'HAIKU_USE_VENDOR_DIRECTORIES' is set + +diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py +index 44c7692..ff8c01e 100644 +--- a/Lib/distutils/command/install.py ++++ b/Lib/distutils/command/install.py +@@ -97,6 +97,34 @@ INSTALL_SCHEMES = { + 'scripts': '$userbase/bin', + 'data' : '$userbase', + }, ++ 'haiku': { ++ 'purelib': '$base/non-packaged/lib/python$py_version_short/site-packages', ++ 'platlib': '$platbase/non-packaged/lib/python$py_version_short/site-packages', ++ 'headers': '$base/non-packaged/develop/headers/python$py_version_short/$dist_name', ++ 'scripts': '$base/non-packaged/bin', ++ 'data' : '$base/non-packaged', ++ }, ++ 'haiku_vendor': { ++ 'purelib': '$base/lib/python$py_version_short/vendor-packages', ++ 'platlib': '$platbase/lib/python$py_version_short/vendor-packages', ++ 'headers': '$base/develop/headers/python$py_version_short/$dist_name', ++ 'scripts': '$base/bin', ++ 'data' : '$base', ++ }, ++ 'haiku_home': { ++ 'purelib': '$base/lib/python', ++ 'platlib': '$base/lib/python', ++ 'headers': '$base/develop/headers/python/$dist_name', ++ 'scripts': '$base/bin', ++ 'data' : '$base', ++ }, ++ 'haiku_user': { ++ 'purelib': '$usersite', ++ 'platlib': '$usersite', ++ 'headers': '$userbase/develop/headers/python$py_version_short/$dist_name', ++ 'scripts': '$userbase/bin', ++ 'data' : '$userbase', ++ }, + } - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') + # The keys to an installation scheme; if any new types of files are to be +@@ -430,10 +458,16 @@ class install (Command): + raise DistutilsPlatformError( + "User base directory is not specified") + self.install_base = self.install_platbase = self.install_userbase +- self.select_scheme("unix_user") ++ if sys.platform.startswith('haiku'): ++ self.select_scheme("haiku_user") ++ else: ++ self.select_scheme("unix_user") + elif self.home is not None: + self.install_base = self.install_platbase = self.home +- self.select_scheme("unix_home") ++ if sys.platform.startswith('haiku'): ++ self.select_scheme("haiku_home") ++ else: ++ self.select_scheme("unix_home") + else: + if self.prefix is None: + if self.exec_prefix is not None: +@@ -449,7 +483,13 @@ class install (Command): + + self.install_base = self.prefix + self.install_platbase = self.exec_prefix +- self.select_scheme("unix_prefix") ++ if sys.platform.startswith('haiku'): ++ if os.environ.get('HAIKU_USE_VENDOR_DIRECTORIES') == '1': ++ self.select_scheme("haiku_vendor") ++ else: ++ self.select_scheme("haiku") ++ else: ++ self.select_scheme("unix_prefix") + + # finalize_unix () + +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 5354cf1..017a94c 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -120,12 +120,20 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): + prefix = plat_specific and EXEC_PREFIX or PREFIX + + if os.name == "posix": +- libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) +- if standard_lib: +- return libpython ++ if sys.platform.startswith('haiku'): ++ if standard_lib: ++ return os.path.join(prefix, ++ "lib", "python" + get_python_version()) ++ return os.path.join(prefix, "non-packaged", ++ "lib", "python" + get_python_version(), ++ "site-packages") + else: +- return os.path.join(libpython, "site-packages") ++ libpython = os.path.join(prefix, ++ "lib", "python" + get_python_version()) ++ if standard_lib: ++ return libpython ++ else: ++ return os.path.join(libpython, "site-packages") + + elif os.name == "nt": + if standard_lib: +diff --git a/Lib/site.py b/Lib/site.py +index 66c56c2..304f994 100644 +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -241,6 +241,11 @@ def addusersitepackages(known_paths): + USER_SITE = os.path.join(USER_BASE, + "Python" + sys.version[0] + sys.version[2], + "site-packages") ++ elif sys.platform.startswith('haiku'): ++ USER_BASE = env_base if env_base else joinuser("~", "non-packaged") ++ USER_SITE = os.path.join(USER_BASE, "lib", ++ "python" + sys.version[:3], ++ "site-packages") + else: + USER_BASE = env_base if env_base else joinuser("~", ".local") + USER_SITE = os.path.join(USER_BASE, "lib", +@@ -264,6 +269,13 @@ def addsitepackages(known_paths): + + if sys.platform in ('os2emx', 'riscos'): + sitedirs.append(os.path.join(prefix, "Lib", "site-packages")) ++ elif sys.platform.startswith('haiku'): ++ sitedirs.append(os.path.join(prefix, "non-packaged", "lib", ++ "python" + sys.version[:3], ++ "site-packages")) ++ sitedirs.append(os.path.join(prefix, "lib", ++ "python" + sys.version[:3], ++ "vendor-packages")) + elif os.sep == '/': + sitedirs.append(os.path.join(prefix, "lib", + "python" + sys.version[:3], +-- +1.8.3.4 + + +From 17c8d2590189838ef19b08fb0ce7976d03b1cabc Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 13 Oct 2013 17:06:48 +0200 +Subject: Drop references to common hierarchy. + + +diff --git a/setup.py b/setup.py +index 930a368..41a16a2 100644 +--- a/setup.py ++++ b/setup.py +@@ -429,13 +429,9 @@ class PyBuildExt(build_ext): + inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) + + if platform == 'haiku1': +- inc_dirs += ['/boot/common/non-packaged/develop/headers', +- '/boot/common/develop/headers', +- '/boot/system/develop/headers/posix', ++ inc_dirs += ['/boot/system/develop/headers/posix', + '/boot/system/develop/headers'] +- lib_dirs += ['/boot/common/non-packaged/develop/lib', +- '/boot/common/develop/lib', +- '/boot/system/develop/lib'] ++ lib_dirs += ['/boot/system/develop/lib'] + + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) + if platform in ['osf1', 'unixware7', 'openunix8']: +-- +1.8.3.4 + diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe index 20217cdbe..3ed5318e0 100644 --- a/dev-lang/python/python-2.6.8.recipe +++ b/dev-lang/python/python-2.6.8.recipe @@ -9,10 +9,10 @@ LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tar.bz2" CHECKSUM_MD5="c6e0420a21d8b23dee8b0195c9b9a125" -REVISION="5" +REVISION="6" ARCHITECTURES="x86_gcc2 x86 x86_64" -PATCHES="python-2.6.8.patch" +PATCHES="python-2.6.8.patchset" PROVIDES=" python = $portVersion compat >= 2.6 @@ -59,6 +59,10 @@ BUILD_PREREQUIRES=" SOURCE_DIR="Python-2.6.8" +GLOBAL_WRITABLE_FILES=" + non-packaged/lib/python2.6/site-packages directory keep-old + " + PATCH() { echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in @@ -89,6 +93,13 @@ INSTALL() make install prepareInstalledDevelLibs libpython2.6 + + mkdir -p $prefix/lib/python2.6/vendor-packages + echo 'This directory contains packaged python modules.' \ + >$prefix/lib/python2.6/vendor-packages/README + + mkdir -p $prefix/non-packaged/lib/python2.6 + mv $prefix/lib/python2.6/site-packages $prefix/non-packaged/lib/python2.6/ } TEST() From 00030aa4de8e59d8da742e0c9338a358dbe7ac35 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 15 Oct 2013 11:50:00 +0200 Subject: [PATCH 584/587] Add automatic vendor modules suppport to perl. * Adjust MakeMaker to automatically switch to vendor directories if HAIKU_USE_VENDOR_DIRECTORIES is set. --- dev-lang/perl/patches/perl-5.18.1.patchset | 96 +++++++++++++++++++--- 1 file changed, 86 insertions(+), 10 deletions(-) diff --git a/dev-lang/perl/patches/perl-5.18.1.patchset b/dev-lang/perl/patches/perl-5.18.1.patchset index 4a3fac242..67640828a 100644 --- a/dev-lang/perl/patches/perl-5.18.1.patchset +++ b/dev-lang/perl/patches/perl-5.18.1.patchset @@ -1,4 +1,4 @@ -From f0e56e8de699304c16cf84ddad23e70a8d4f1113 Mon Sep 17 00:00:00 2001 +From 4bef2ada1d8a38b4dff88f0659a3b9e181bf1950 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:52:03 +0200 Subject: Tell perl that BFS has a link count of 1 @@ -22,7 +22,7 @@ index ac57c26..759690c 100644 1.8.3.4 -From eeb73e685719100cbaf14aa80936acf629b09358 Mon Sep 17 00:00:00 2001 +From e54a8f98abfea2be3eec53b4bbe2cbaaf9f39139 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:52:53 +0200 Subject: Haiku defines, but does not implement O_EXLOCK @@ -46,7 +46,7 @@ index ff8c7f9..4364bf6 100644 1.8.3.4 -From ab08a333ba288c781badc4ad0918f478eccb623c Mon Sep 17 00:00:00 2001 +From 30f81dcecdfb9c49ad8824314348cd23ef43ec0f Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:53:40 +0200 Subject: haiku sets all its specifics via Configure @@ -106,7 +106,7 @@ index fa8ebe5..0f09f53 100644 1.8.3.4 -From 1e0db8890d721318e8f6ed2b7af01f7a2b1530f4 Mon Sep 17 00:00:00 2001 +From 187343906d2ed78aa5e5b4b3a6cfb7ad199c726f Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:54:15 +0200 Subject: Tell perl that Haiku needs haikuish.h installed as well @@ -132,7 +132,7 @@ index e64b1c3..8ae20cc 100755 1.8.3.4 -From 13c237d527f3fab4420db9098e9da75c7e2d9a03 Mon Sep 17 00:00:00 2001 +From 936c1f0486788b814578ea469f4441d1755dac71 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 14:55:13 +0200 Subject: Fix handling of exit codes on Haiku @@ -183,7 +183,7 @@ index 02e57c6..e836410 100644 1.8.3.4 -From dc2c883ce7880715e3528ffb8fe3468816b4ccdf Mon Sep 17 00:00:00 2001 +From c8c19c0e4b6493dd5122749ba0f0d7d8b1b89117 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 22 Sep 2013 15:00:44 +0200 Subject: Fix include path of errno.h @@ -206,7 +206,7 @@ index b707911..7999ae4 100644 1.8.3.4 -From 53e43eb85a7666f85e081bee43be542ce733d95d Mon Sep 17 00:00:00 2001 +From 46ed1ae1bc678bda0d0fe3efb589847798afab58 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sat, 28 Sep 2013 13:46:42 +0200 Subject: Adjust ExtUtils::MakeMaker for PM-Haiku. @@ -339,7 +339,7 @@ index 0000000..81e5f99 1.8.3.4 -From bd31bc50a49c6b4585666656b73b9dc2d9928c61 Mon Sep 17 00:00:00 2001 +From f9458e30c41213d315721183c9f10c3605812f57 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 8 Oct 2013 22:16:37 +0200 Subject: Avoid using -rpath for dynamic modules. @@ -387,7 +387,7 @@ index 81e5f99..25ace13 100644 1.8.3.4 -From da2d4b88e05f8291e5f190824537c72cb24a43e8 Mon Sep 17 00:00:00 2001 +From 5d6dde9cb0022bdeee490b383ff1991eacc3b9cc Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 8 Oct 2013 22:17:26 +0200 Subject: Add script sitecustomize.pl for setting up @INC as we need it. @@ -439,7 +439,7 @@ index 0000000..a321e51 1.8.3.4 -From 14526efbb024588a8e83a5010ff963ab67fc8c01 Mon Sep 17 00:00:00 2001 +From f33151a4535dd22acaae24d4b16da3115b6cef64 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 9 Oct 2013 20:29:38 +0200 Subject: Fix initialization check for CPAN. @@ -468,3 +468,79 @@ index b099b04..55bf194 100644 -- 1.8.3.4 + +From 6fbbb6e99558e992f373cddd6ae02a3656ad7ce0 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 13 Oct 2013 17:32:50 +0200 +Subject: Add support for HAIKU_USE_VENDOR_DIRECTORIES. + +* Adjust MakeMaker to automatically switch to vendor directories if + requested via HAIKU_USE_VENDOR_DIRECTORIES. + +diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +index 25ace13..0be8c3d 100644 +--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +@@ -29,21 +29,20 @@ our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); + our $VERSION = '6.66'; + + +-=item os_flavor +- +-Haiku is Haiku. +- +-=cut +- + sub os_flavor { + return('Haiku'); + } + +-=head3 init_INSTALL_from_PREFIX ++sub init_main { ++ my $self = shift; + +- $mm->init_INSTALL_from_PREFIX; ++ # switch to vendor directories if requested. ++ if ($ENV{'HAIKU_USE_VENDOR_DIRECTORIES'} eq '1') { ++ $self->{INSTALLDIRS} ||= 'vendor'; ++ } + +-=cut ++ $self->SUPER::init_main(); ++} + + sub init_INSTALL_from_PREFIX { + my $self = shift; +@@ -63,20 +62,6 @@ sub init_INSTALL_from_PREFIX { + } + } + +-=back +- +-=head3 init_others +- +- $MM->init_others(); +- +-Initializes the macro definitions having to do with compiling and +-linking used by tools_other() and places them in the $MM object. +- +-If there is no description, its the same as the parameter to +-WriteMakefile() documented in ExtUtils::MakeMaker. +- +-=cut +- + sub init_others { + my $self = shift; + +@@ -90,8 +75,6 @@ sub init_others { + return; + } + +-=back +- + 1; + __END__ + +-- +1.8.3.4 + From 4087da0126582269d286e4a1bcc2ae36fc6755c3 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 15 Oct 2013 11:53:54 +0200 Subject: [PATCH 585/587] Adjust git to use vendor directories. * Add new package git_remote_helpers, which provides a python module. * Add requires for vendor_perl, as providing a vendor perl module requires a specific perl version. * Declare settings directory. --- dev-vcs/git/git-1.8.3.4.recipe | 21 ++++++++++++++++++--- dev-vcs/git/patches/git-1.8.3.4.patchset | 5 ++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe index 2d0f6e0a3..29cdc9ed1 100644 --- a/dev-vcs/git/git-1.8.3.4.recipe +++ b/dev-vcs/git/git-1.8.3.4.recipe @@ -24,11 +24,10 @@ CHECKSUM_MD5_2="86fd812754d25201fd72c7476045dfec" SRC_URI_3="http://git-core.googlecode.com/files/git-htmldocs-1.8.3.4.tar.gz" CHECKSUM_MD5_3="be01cc4be1b946b053b69d12b422854a" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" - PROVIDES=" git = $portVersion compat >= 1.8 cmd:git = $portVersion compat >= 1.8 @@ -53,6 +52,9 @@ PROVIDES_email=" git_email = $portVersion compat >= 1.8 cmd:git_send_email = $portVersion compat >= 1.8 " +PROVIDES_remote_helpers=" + git_remote_helpers = $portVersion compat >= 1.8 + " PROVIDES_source=" git_source = $portVersion compat >= 1.8 " @@ -65,7 +67,7 @@ REQUIRES=" haiku >= $haikuVersion cmd:man cmd:nano - cmd:perl + cmd:perl >= 5 cmd:python lib:libcurl lib:libexpat @@ -74,6 +76,7 @@ REQUIRES=" lib:libpcre lib:libssl lib:libz + vendor_perl " REQUIRES_arch=" haiku >= $haikuVersion @@ -91,6 +94,10 @@ REQUIRES_email=" haiku >= $haikuVersion git == $portVersion base " +REQUIRES_remote_helpers=" + haiku >= $haikuVersion + git == $portVersion base + " REQUIRES_svn=" haiku >= $haikuVersion git == $portVersion base @@ -122,6 +129,10 @@ BUILD_PREREQUIRES=" cmd:tar " +USER_SETTINGS_FILES=" + settings/git directory + " + makeGit() { make prefix=$prefix \ @@ -224,6 +235,10 @@ INSTALL() documentation/man/man1/git-send-email.1 \ lib/git-core/git-send-email + pythonDir=python$(python -c 'import sys; print("%i.%i" % sys.version_info[:2])') + packageEntries remote_helpers \ + lib/$pythonDir + packageEntries svn \ documentation/packages/git/html/git-svn.html \ documentation/man/man1/git-svn.1 \ diff --git a/dev-vcs/git/patches/git-1.8.3.4.patchset b/dev-vcs/git/patches/git-1.8.3.4.patchset index 696703282..bf8e01dda 100644 --- a/dev-vcs/git/patches/git-1.8.3.4.patchset +++ b/dev-vcs/git/patches/git-1.8.3.4.patchset @@ -1,4 +1,4 @@ -From c35cdc07a85b42e2c90b12dc6b824133ad2b6452 Mon Sep 17 00:00:00 2001 +From 8ad851dd7da047374242cc025bf16852f8829da0 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 08:07:25 +0200 Subject: git-web--browse.sh: use "open" on Haiku @@ -23,7 +23,7 @@ index 1d72ec7..e3f254c 100755 1.8.3.4 -From 4627da2e350c3bc0dcff780db2c8fdce1aedf52e Mon Sep 17 00:00:00 2001 +From 8f777b37b553698d5497b2742a01bfc4139c6b63 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 21:03:59 +0200 Subject: On Haiku use the user settings directory instead of HOME @@ -75,4 +75,3 @@ index 04ff148..8668534 100644 char *git_path_submodule(const char *path, const char *fmt, ...) -- 1.8.3.4 - From d679195b5a1bc0bed50feaf7a0585e8a0ce9eae2 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 15 Oct 2013 12:04:55 +0200 Subject: [PATCH 586/587] Bump revision of scons and mercurial. * These provide a python module, so they need to be rebuilt in order to get those modules moved into the vendor-packages directory. --- dev-util/scons/scons-2.2.0.recipe | 2 +- dev-vcs/mercurial/mercurial-2.2.2.recipe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/scons/scons-2.2.0.recipe b/dev-util/scons/scons-2.2.0.recipe index 1059924b6..000be6c55 100644 --- a/dev-util/scons/scons-2.2.0.recipe +++ b/dev-util/scons/scons-2.2.0.recipe @@ -5,7 +5,7 @@ LICENSE="MIT" COPYRIGHT="2001-2012 The SCons Foundation" SRC_URI="http://superb-dca3.dl.sourceforge.net/project/scons/scons/2.2.0/scons-2.2.0.tar.gz" CHECKSUM_MD5="f737f474a02d08156c821bd2d4d4b632" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="scons-2.2.0.patchset" diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe index 231c8fabd..8439a5fa0 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2005-2012 Matt Mackall et al." LICENSE="GNU GPL v2" SRC_URI="http://mercurial.selenic.com/release/mercurial-2.2.2.tar.gz" CHECKSUM_MD5="9f59b5d71969cbb2671702cd2a7a5a11" -REVISION="4" +REVISION="5" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="mercurial-2.2.2.patch" From c69048fe8642a8794e16df1989f869cee3cc7c15 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Tue, 15 Oct 2013 21:35:13 +0200 Subject: [PATCH 587/587] Ensure config-directory exists before using it. --- dev-vcs/git/patches/git-1.8.3.4.patchset | 40 ++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dev-vcs/git/patches/git-1.8.3.4.patchset b/dev-vcs/git/patches/git-1.8.3.4.patchset index bf8e01dda..d7aed2420 100644 --- a/dev-vcs/git/patches/git-1.8.3.4.patchset +++ b/dev-vcs/git/patches/git-1.8.3.4.patchset @@ -1,4 +1,4 @@ -From 8ad851dd7da047374242cc025bf16852f8829da0 Mon Sep 17 00:00:00 2001 +From 54aaa3773f83a1706140ef842e537b5dc5f37568 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 08:07:25 +0200 Subject: git-web--browse.sh: use "open" on Haiku @@ -23,7 +23,7 @@ index 1d72ec7..e3f254c 100755 1.8.3.4 -From 8f777b37b553698d5497b2742a01bfc4139c6b63 Mon Sep 17 00:00:00 2001 +From e42686b933c0999c3c83cac79ceff073ce2bbc32 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 13 Aug 2013 21:03:59 +0200 Subject: On Haiku use the user settings directory instead of HOME @@ -75,3 +75,39 @@ index 04ff148..8668534 100644 char *git_path_submodule(const char *path, const char *fmt, ...) -- 1.8.3.4 + + +From 80ed8e810eaebbecf10a20bac95c1e43fc14d2d5 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Tue, 15 Oct 2013 21:34:09 +0200 +Subject: Ensure config-directory exists before using it. + + +diff --git a/config.c b/config.c +index 7a85ebd..10be1af 100644 +--- a/config.c ++++ b/config.c +@@ -1343,6 +1343,7 @@ int git_config_set_multivar_in_file(const char *config_filename, + int ret; + struct lock_file *lock = NULL; + char *filename_buf = NULL; ++ char *config_dir = NULL; + + /* parse-key returns negative; flip the sign to feed exit(3) */ + ret = 0 - git_config_parse_key(key, &store.key, &store.baselen); +@@ -1354,6 +1355,12 @@ int git_config_set_multivar_in_file(const char *config_filename, + if (!config_filename) + config_filename = filename_buf = git_pathdup("config"); + ++ config_dir = xstrdup(config_filename); ++ * find_last_dir_sep(config_dir) = '\0'; ++ if (access(config_dir, F_OK) != 0) ++ mkdir(config_dir, 0755); ++ free(config_dir); ++ + /* + * The lock serves a purpose in addition to locking: the new + * contents of .git/config will be written into it. +-- +1.8.3.4 +